@noir-lang/noir_codegen 1.0.0-beta.7-d692001.nightly → 1.0.0-beta.7-077bb6d.nightly

package/lib/utils/abi_type_with_generics.d.ts

@@ -58,7 +58,7 @@ export type AbiTypeWithGenerics = {
  * Maps an ABI type to an ABI type with generics.
  * This performs pure type conversion, and does not generate any bindings.
  */
-export declare function mapAbiTypeToAbiTypeWithGenerics(abiType: AbiType, allTypes: AbiTypeWithGenerics[]): AbiTypeWithGenerics;
+export declare function mapAbiTypeToAbiTypeWithGenerics(abiType: AbiType): AbiTypeWithGenerics;
 /**
  * Finds the structs in an ABI type.
  * This won't explore nested structs.

package/lib/utils/abi_type_with_generics.js

@@ -13,60 +13,44 @@ export class BindingId {
  * Maps an ABI type to an ABI type with generics.
  * This performs pure type conversion, and does not generate any bindings.
  */
-export function mapAbiTypeToAbiTypeWithGenerics(abiType, allTypes) {
-    let returnedType;
+export function mapAbiTypeToAbiTypeWithGenerics(abiType) {
     switch (abiType.kind) {
         case 'field':
         case 'boolean':
         case 'string':
         case 'integer':
-            returnedType = abiType;
-            break;
-        case 'array': {
-            const type = mapAbiTypeToAbiTypeWithGenerics(abiType.type, allTypes);
-            returnedType = {
+            return abiType;
+        case 'array':
+            return {
                 kind: 'array',
                 length: abiType.length,
-                type,
+                type: mapAbiTypeToAbiTypeWithGenerics(abiType.type),
             };
-            break;
-        }
         case 'struct': {
             const structType = {
                 path: abiType.path,
-                fields: abiType.fields.map(function (field) {
-                    const type = mapAbiTypeToAbiTypeWithGenerics(field.type, allTypes);
-                    return {
-                        name: field.name,
-                        type,
-                    };
-                }),
+                fields: abiType.fields.map((field) => ({
+                    name: field.name,
+                    type: mapAbiTypeToAbiTypeWithGenerics(field.type),
+                })),
                 generics: [],
             };
-            returnedType = {
+            return {
                 kind: 'struct',
                 structType,
                 args: [],
             };
-            break;
         }
         case 'tuple':
-            returnedType = {
+            return {
                 kind: 'tuple',
-                fields: abiType.fields.map(function (field) {
-                    const type = mapAbiTypeToAbiTypeWithGenerics(field, allTypes);
-                    allTypes.push(type);
-                    return type;
-                }),
+                fields: abiType.fields.map(mapAbiTypeToAbiTypeWithGenerics),
             };
-            break;
         default: {
             const exhaustiveCheck = abiType;
             throw new Error(`Unhandled abi type: ${exhaustiveCheck}`);
         }
     }
-    allTypes.push(returnedType);
-    return returnedType;
 }
 /**
  * Finds the structs in an ABI type.

package/lib/utils/typings_generator.js

@@ -58,11 +58,13 @@ export class TypingsGenerator {
         // Map all the types used in the ABIs to the demonomorphized types
         for (const { abi, circuitName, artifact } of circuits) {
             const params = abi.parameters.map((param) => {
-                const type = mapAbiTypeToAbiTypeWithGenerics(param.type, this.allTypes);
+                const type = mapAbiTypeToAbiTypeWithGenerics(param.type);
+                this.allTypes.push(type);
                 return { name: param.name, type };
             });
             if (abi.return_type) {
-                const returnType = mapAbiTypeToAbiTypeWithGenerics(abi.return_type.abi_type, this.allTypes);
+                const returnType = mapAbiTypeToAbiTypeWithGenerics(abi.return_type.abi_type);
+                this.allTypes.push(returnType);
                 this.demonomorphizedAbis.push({ circuitName, params, returnType, artifact });
             }
             else {

package/package.json

@@ -3,7 +3,7 @@
   "contributors": [
     "The Noir Team <team@noir-lang.org>"
   ],
-  "version": "1.0.0-beta.7-d692001.nightly",
+  "version": "1.0.0-beta.7-077bb6d.nightly",
   "packageManager": "yarn@4.5.2",
   "license": "(MIT OR Apache-2.0)",
   "type": "module",
@@ -17,7 +17,7 @@
     "url": "https://github.com/noir-lang/noir/issues"
   },
   "dependencies": {
-    "@noir-lang/types": "1.0.0-beta.7-d692001.nightly",
+    "@noir-lang/types": "1.0.0-beta.7-077bb6d.nightly",
     "glob": "^11.0.2",
     "ts-command-line-args": "^2.5.1"
   },
@@ -35,7 +35,7 @@
     "dev": "tsc-multi --watch",
     "build": "tsc",
     "test": "yarn test:codegen && yarn test:node && yarn test:clean",
-    "test:codegen": "${NARGO:-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'",
@@ -46,7 +46,7 @@
     "clean": "rm -rf ./lib"
   },
   "devDependencies": {
-    "@noir-lang/noir_js": "1.0.0-beta.7-d692001.nightly",
+    "@noir-lang/noir_js": "1.0.0-beta.7-077bb6d.nightly",
     "@types/chai": "^4",
     "@types/mocha": "^10.0.10",
     "@types/node": "^22.13.10",