chore: update build scripts (#50)

Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "acvm-simulator"
+name = "acvm_simulator"
 description = "Typescript wrapper around the ACVM allowing execution of ACIR code"
 version = "0.0.0" # x-release-please-version
 authors = ["The Noir Team <team@noir-lang.org>"]

build.sh

@@ -1,5 +1,35 @@
 #!/usr/bin/env bash
 
+function require_command {
+    if ! command -v "$1" >/dev/null 2>&1; then
+        echo "Error: $1 is required but not installed." >&2
+        exit 1
+    fi
+}
+function check_installed {
+  if ! command -v "$1" >/dev/null 2>&1; then
+    echo "$1 is not installed. Please install it." >&2
+    return 1
+  fi
+  return 0
+}
+function run_or_fail {
+  "$@"
+  local status=$?
+  if [ $status -ne 0 ]; then
+    echo "Command '$*' failed with exit code $status" >&2
+    exit $status
+  fi
+}
+
+require_command toml2json
+require_command jq
+require_command cargo
+require_command wasm-bindgen
+check_installed wasm-opt
+
+export pname=$(toml2json < Cargo.toml | jq -r .package.name)
+
 rm -rf ./outputs >/dev/null 2>&1
 rm -rf ./result >/dev/null 2>&1
 
@@ -10,7 +40,7 @@ else
   echo "Will install package to $out"
 fi
 
-./buildPhaseCargoCommand.sh
-./installPhase.sh
+run_or_fail ./buildPhaseCargoCommand.sh
+run_or_fail ./installPhase.sh
 
 ln -s $out ./result

buildPhaseCargoCommand.sh

@@ -1,17 +1,33 @@
 #!/usr/bin/env bash
 
+function run_or_fail {
+  "$@"
+  local status=$?
+  if [ $status -ne 0 ]; then
+    echo "Command '$*' failed with exit code $status" >&2
+    exit $status
+  fi
+}
+function run_if_available {
+  if command -v "$1" >/dev/null 2>&1; then
+    "$@"
+  else
+    echo "$1 is not installed. Please install it to use this feature." >&2
+  fi
+}
+
 # Clear out the existing build artifacts as these aren't automatically removed by wasm-pack.
 if [ -d ./pkg/ ]; then
     rm -rf ./pkg/
 fi
 
-WASM_BINARY=./target/wasm32-unknown-unknown/release/acvm_simulator.wasm
-NODE_WASM=./pkg/nodejs/acvm_simulator_bg.wasm
-BROWSER_WASM=./pkg/nodejs/acvm_simulator_bg.wasm
+WASM_BINARY=./target/wasm32-unknown-unknown/release/${pname}.wasm
+NODE_WASM=./pkg/nodejs/${pname}_bg.wasm
+BROWSER_WASM=./pkg/nodejs/${pname}_bg.wasm
 
 # Build the new wasm package
-cargo build --lib --release --target wasm32-unknown-unknown
-wasm-bindgen $WASM_BINARY --out-dir ./pkg/nodejs --typescript --target nodejs
-wasm-bindgen $WASM_BINARY --out-dir ./pkg/web --typescript --target web
-wasm-opt $NODE_WASM -o $NODE_WASM -O
-wasm-opt $BROWSER_WASM -o $BROWSER_WASM -O
+run_or_fail cargo build --lib --release --target wasm32-unknown-unknown
+run_or_fail wasm-bindgen $WASM_BINARY --out-dir ./pkg/nodejs --typescript --target nodejs
+run_or_fail wasm-bindgen $WASM_BINARY --out-dir ./pkg/web --typescript --target web
+run_if_available wasm-opt $NODE_WASM -o $NODE_WASM -O
+run_if_available wasm-opt $BROWSER_WASM -o $BROWSER_WASM -O

flake.nix

@@ -95,7 +95,7 @@
       GIT_DIRTY = if (self ? rev) then "false" else "true";
 
       commonArgs = {
-        pname = "acvm-simulator";
+        pname = "acvm_simulator";
         version = "0.0.0"; # x-release-please-version
 
         src = pkgs.lib.cleanSourceWith {
@@ -181,6 +181,7 @@
           which
           git
           jq
+          toml2json
           rustToolchain
           wasm-bindgen-cli
           nodejs