@noir-lang/noir_codegen 0.39.0 → 1.0.0-9c1fafc.nightly

package/lib/main.js

@@ -14,8 +14,8 @@ function main() {
     const programs = files.map((file_path) => {
         const program_name = path.parse(file_path).name;
         const file_contents = fs.readFileSync(file_path).toString();
-        const { abi, bytecode } = JSON.parse(file_contents);
-        return [program_name, { abi, bytecode }];
+        const { abi, bytecode, debug_symbols, file_map } = JSON.parse(file_contents);
+        return [program_name, { abi, bytecode, debug_symbols, file_map }];
     });
     const result = codegen(programs, !cliConfig.externalArtifact, cliConfig.useFixedLengthArrays);
     const outputDir = path.resolve(cliConfig.outDir ?? './codegen');

package/lib/utils/typings_generator.js

@@ -4,9 +4,9 @@ const codegenPrelude = `/* Autogenerated file, do not edit! */
 
 /* eslint-disable */
 
-import { Noir, InputMap, CompiledCircuit, ForeignCallHandler } from "@noir-lang/noir_js"
+import { Noir, type InputMap, type CompiledCircuit, type ForeignCallHandler } from "@noir-lang/noir_js"
 
-export { ForeignCallHandler } from "@noir-lang/noir_js"
+export { type ForeignCallHandler } from "@noir-lang/noir_js"
 `;
 /**
  * Returns the last component of a path, e.g. "foo::bar::baz" -\> "baz"
@@ -238,17 +238,27 @@ ${interfacesCode}`;
 }
 const codegenFunction = (name, function_signature, compiled_program) => {
     const args = function_signature.inputs.map(([name]) => `${name}`).join(', ');
-    const args_with_types = function_signature.inputs.map(([name, type]) => `${name}: ${type}`).join(', ');
+    const args_with_types = function_signature.inputs.map(([name, type]) => `${name}: ${type}`);
+    if (!compiled_program) {
+        args_with_types.push(`${name}_circuit: CompiledCircuit`);
+    }
+    args_with_types.push('foreignCallHandler?: ForeignCallHandler');
+    const args_with_types_joined_by_comma = args_with_types.join(', ');
     const artifact = compiled_program
         ? `export const ${name}_circuit: CompiledCircuit = ${JSON.stringify(compiled_program)};`
         : '';
+    const returnType = function_signature.returnValue;
+    const hasReturnValue = returnType != null;
+    const body = hasReturnValue
+        ? `  const { returnValue } = await program.execute(args, foreignCallHandler);
+  return returnValue as ${returnType};`
+        : `  await program.execute(args, foreignCallHandler);`;
     return `${artifact}
 
-export async function ${name}(${args_with_types}${compiled_program ? '' : `, ${name}_circuit: CompiledCircuit`}, foreignCallHandler?: ForeignCallHandler): Promise<${function_signature.returnValue}> {
+export async function ${name}(${args_with_types_joined_by_comma}): Promise<${hasReturnValue ? returnType : 'void'}> {
   const program = new Noir(${name}_circuit);
   const args: InputMap = { ${args} };
-  const { returnValue } = await program.execute(args, foreignCallHandler);
-  return returnValue as ${function_signature.returnValue};
+${body}
 }
 `;
 };

package/package.json

@@ -3,8 +3,8 @@
   "contributors": [
     "The Noir Team <team@noir-lang.org>"
   ],
-  "version": "0.39.0",
-  "packageManager": "yarn@3.5.1",
+  "version": "1.0.0-9c1fafc.nightly",
+  "packageManager": "yarn@4.5.2",
   "license": "(MIT OR Apache-2.0)",
   "type": "module",
   "homepage": "https://noir-lang.org/",
@@ -17,8 +17,8 @@
     "url": "https://github.com/noir-lang/noir/issues"
   },
   "dependencies": {
-    "@noir-lang/types": "0.39.0",
-    "glob": "^10.3.10",
+    "@noir-lang/types": "1.0.0-9c1fafc.nightly",
+    "glob": "^13.0.6",
     "ts-command-line-args": "^2.5.1"
   },
   "files": [
@@ -35,29 +35,28 @@
     "dev": "tsc-multi --watch",
     "build": "tsc",
     "test": "yarn test:codegen && yarn test:node && yarn test:clean",
-    "test:codegen": "nargo export --program-dir=./test/test_lib && tsx src/main.ts ./test/test_lib/export/** --out-dir ./test/codegen",
+    "test:codegen": "rm -rf ./test/test_lib/export && ${NARGO:-nargo} export --program-dir=./test/test_lib && tsx src/main.ts ./test/test_lib/export/** --out-dir ./test/codegen",
     "test:node": "mocha --timeout 25000 --exit --config ./.mocharc.json",
     "test:clean": "rm -rf ./test/codegen ./test/test_lib/export",
     "prettier": "prettier 'src/**/*.ts'",
     "prettier:fix": "prettier --write 'src/**/*.ts' 'test/**/*.ts'",
-    "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0",
+    "lint": "NODE_NO_WARNINGS=1 eslint . --max-warnings 0",
     "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",
     "clean": "rm -rf ./lib"
   },
   "devDependencies": {
-    "@noir-lang/noir_js": "0.39.0",
-    "@types/chai": "^4",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^20.6.2",
-    "@types/prettier": "^3",
-    "chai": "^4.4.1",
-    "eslint": "^8.57.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "mocha": "^10.2.0",
-    "prettier": "3.2.5",
-    "ts-node": "^10.9.1",
-    "tsx": "^4.6.2",
-    "typescript": "^5.4.2"
+    "@noir-lang/noir_js": "1.0.0-9c1fafc.nightly",
+    "@types/chai": "^5",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^22.20.5",
+    "@types/prettier": "^3.0.0",
+    "chai": "^6.3.0",
+    "eslint": "^10.13.0",
+    "eslint-plugin-prettier": "^5.5.7",
+    "mocha": "^12.0.3",
+    "prettier": "3.9.10",
+    "tsx": "^4.23.15",
+    "typescript": "^6.0.3"
   }
 }