feat: Add dependency resolver for noir_wasm and implement FileManager for consistency with native interface

.vscode/settings.json

@@ -18,5 +18,12 @@
     },
     "[javascript]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "jestrunner.projectPath": "./",
+    "jestrunner.debugOptions": {
+        "runtimeArgs": ["--experimental-vm-modules"],
+        "env": {
+            "NODE_NO_WARNINGS": 1
+        }
     }
 }

compiler/wasm/.eslintrc.js

@@ -1,3 +1,3 @@
 module.exports = {
-  extends: ["../../.eslintrc.js"],
+  extends: ['../../.eslintrc.js'],
 };

compiler/wasm/.gitignore

@@ -1 +1,3 @@
 noir-script/target
+dist
+build

compiler/wasm/.mocharc.json

@@ -1,7 +1,14 @@
 {
-  "extension": [
-    "ts"
-  ],
-  "spec": "test/node/**/*.test.ts",
-  "require": "ts-node/register"
-}
+    "require": "ts-node/register",
+    "extensions": [
+      "ts"
+    ],
+    "spec": [
+      "**/!(browser)/*.test.ts"
+    ],
+    "node-option": [
+      "experimental-specifier-resolution=node",
+      "loader=ts-node/esm"
+    ]
+  }
+

compiler/wasm/Cargo.toml

@@ -33,3 +33,8 @@ getrandom = { workspace = true, features = ["js"] }
 
 [build-dependencies]
 build-data.workspace = true
+
+# `wasm-opt` is on by default in for the release profile, but it can be
+# disabled by setting it to `false`
+[package.metadata.wasm-pack.profile.release]
+wasm-opt = false

compiler/wasm/package.json

@@ -5,25 +5,31 @@
   ],
   "version": "0.22.0",
   "license": "(MIT OR Apache-2.0)",
-  "main": "./nodejs/noir_wasm.js",
-  "types": "./web/noir_wasm.d.ts",
-  "module": "./web/noir_wasm.js",
+  "main": "dist/main.js",
+  "types": "dist/types",
+  "exports": {
+    "node": "./dist/node/main.js",
+    "default": "./dist/web/main.js",
+    "import": "./dist/web/main.js",
+    "require": "./dist/node/main.js"
+  },
   "files": [
-    "nodejs",
-    "web",
+    "dist",
     "package.json"
   ],
-  "sideEffects": false,
   "repository": {
     "type": "git",
     "url": "https://github.com/noir-lang/noir.git"
   },
   "scripts": {
-    "build": "bash ./build.sh",
+    "serve": "webpack serve",
+    "build:fixtures": "cd public/fixtures && cd simple && nargo compile && cd ../with-deps && nargo compile && cd ../noir-contract && nargo compile && cd ../",
+    "build:webpack": "webpack",
+    "build": "yarn build:webpack && yarn build:fixtures",
     "test": "yarn test:node && yarn test:browser",
-    "test:node": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\"}' mocha",
+    "test:node": "NODE_NO_WARNINGS=1 $(yarn bin mocha) --config ./.mocharc.json",
     "test:browser": "web-test-runner",
-    "clean": "chmod u+w web nodejs || true && rm -rf ./nodejs ./web ./target ./result",
+    "clean": "rm -rf ./build ./target ./dist public/fixtures/simple/target public/fixtures/with-deps/target public/fixtures/noir-contract/target",
     "nightly:version": "jq --arg new_version \"-$(git rev-parse --short HEAD)$1\" '.version = .version + $new_version' package.json > package-tmp.json && mv package-tmp.json package.json",
     "publish": "echo 📡 publishing `$npm_package_name` && yarn npm publish",
     "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0",
@@ -32,9 +38,57 @@
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4-fix.0",
+    "@jest/globals": "^29.7.0",
+    "@ltd/j-toml": "^1.38.0",
+    "@types/babel__preset-env": "^7",
+    "@types/chai": "^4",
+    "@types/chai-as-promised": "^7.1.8",
+    "@types/lodash.capitalize": "^4",
+    "@types/lodash.compact": "^3",
+    "@types/lodash.times": "^4",
+    "@types/lodash.upperfirst": "^4",
+    "@types/mocha": "^10.0.6",
+    "@types/mocha-each": "^2",
+    "@types/node": "^20.10.0",
+    "@types/pako": "^2",
+    "@types/path-browserify": "^1",
+    "@types/readable-stream": "^4",
+    "@types/sinon": "^17",
+    "@wasm-tool/wasm-pack-plugin": "^1.7.0",
     "@web/dev-server-esbuild": "^0.3.6",
     "@web/test-runner": "^0.15.3",
     "@web/test-runner-playwright": "^0.10.0",
-    "mocha": "^10.2.0"
+    "assert": "^2.1.0",
+    "browserify-fs": "^1.0.0",
+    "buffer": "^6.0.3",
+    "chai": "^4.3.10",
+    "copy-webpack-plugin": "^11.0.0",
+    "cross-env": "^7.0.3",
+    "file-loader": "^6.2.0",
+    "html-webpack-plugin": "^5.5.4",
+    "lodash.capitalize": "^4.2.1",
+    "lodash.compact": "^3.0.1",
+    "lodash.times": "^4.3.2",
+    "lodash.upperfirst": "^4.3.1",
+    "memfs": "^4.6.0",
+    "mocha": "^10.2.0",
+    "mocha-each": "^2.0.1",
+    "pako": "^2.1.0",
+    "path-browserify": "^1.0.1",
+    "playwright": "^1.40.1",
+    "process": "^0.11.10",
+    "readable-stream": "^4.4.2",
+    "sinon": "^17.0.1",
+    "text-encoding": "^0.7.0",
+    "ts-loader": "^9.5.1",
+    "ts-node": "^10.9.1",
+    "tsconfig-paths": "^4.2.0",
+    "typescript": "~5.2.2",
+    "unzipit": "^1.4.3",
+    "url": "^0.11.3",
+    "util": "^0.12.5",
+    "webpack": "^5.49.0",
+    "webpack-cli": "^4.7.2",
+    "webpack-dev-server": "^4.15.1"
   }
 }

compiler/wasm/public/fixtures/deps/lib-c/Nargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "lib_c"
+authors = [""]
+compiler_version = ">=0.18.0"
+type = "lib"
+
+[dependencies]

compiler/wasm/public/fixtures/deps/lib-c/src/lib.nr

@@ -0,0 +1 @@
+mod module;

compiler/wasm/public/fixtures/deps/lib-c/src/module.nr

@@ -0,0 +1 @@
+mod foo;

compiler/wasm/public/fixtures/deps/lib-c/src/module/foo.nr

@@ -0,0 +1,3 @@
+pub fn bar(param: Field) -> Field {
+  dep::std::hash::pedersen_hash([param])
+}

compiler/wasm/public/fixtures/noir-contract/Nargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "test"
+authors = [""]
+compiler_version = ">=0.18.0"
+type = "contract"
+
+[dependencies]
+test = { path = "../deps/lib-c" }

compiler/wasm/public/fixtures/noir-contract/src/main.nr

@@ -0,0 +1,12 @@
+contract TestContract {
+    use dep::test::module::foo;
+
+    fn constructor(param: Field, pub_param: pub Field) -> pub [Field; 2] {
+        [foo::bar(param), param + pub_param]
+    }
+
+    open fn openFunction() -> pub Field {
+        42
+    }
+
+}

compiler/wasm/fixtures/deps/noir-script/Nargo.toml → compiler/wasm/public/fixtures/with-deps/Nargo.toml

@@ -4,4 +4,4 @@ type="bin"
 authors = [""]
 
 [dependencies]
-lib_a = { path="../lib-a" }
+lib_a = { path="../deps/lib-a" }

compiler/wasm/src/index.cts

@@ -0,0 +1,26 @@
+import { FileManager } from './noir/file-manager/file-manager';
+import { createNodejsFileManager } from './noir/file-manager/nodejs-file-manager';
+import { NoirWasmContractCompiler } from './noir/noir-wasm-compiler';
+import { LogData, LogFn } from './utils';
+
+async function compile(fileManager: FileManager, projectPath?: string, logFn?: LogFn) {
+  const cjs = await require('../build/cjs');
+  const compiler = await NoirWasmContractCompiler.new(
+    fileManager,
+    projectPath ?? fileManager.getDataDir(),
+    cjs,
+    new cjs.PathToFileSourceMap(),
+    {
+      log:
+        logFn ??
+        function (msg: string, _data?: LogData) {
+          console.log(msg);
+        },
+    },
+  );
+  return await compiler.compile();
+}
+
+const createFileManager = createNodejsFileManager;
+
+export { compile, createFileManager };

compiler/wasm/src/index.mts

@@ -0,0 +1,27 @@
+import { FileManager } from './noir/file-manager/file-manager';
+import { createNodejsFileManager } from './noir/file-manager/nodejs-file-manager';
+import { NoirWasmContractCompiler } from './noir/noir-wasm-compiler';
+import { LogData, LogFn } from './utils';
+
+async function compile(fileManager: FileManager, projectPath?: string, logFn?: LogFn) {
+  const esm = await import('../build/esm');
+  await esm.default;
+  const compiler = await NoirWasmContractCompiler.new(
+    fileManager,
+    projectPath ?? fileManager.getDataDir(),
+    esm,
+    new esm.PathToFileSourceMap(),
+    {
+      log:
+        logFn ??
+        function (msg: string, _data?: LogData) {
+          console.log(msg);
+        },
+    },
+  );
+  return await compiler.compile();
+}
+
+const createFileManager = createNodejsFileManager;
+
+export { compile, createFileManager };