@noir-lang/noir_wasm 0.20.0-f904ae1.nightly → 0.21.0

package/nodejs/noir_wasm.d.ts

@@ -22,9 +22,10 @@ export function build_info(): any;
 * @param {string} entry_point
 * @param {boolean | undefined} contracts
 * @param {DependencyGraph | undefined} dependency_graph
+* @param {PathToFileSourceMap} file_source_map
 * @returns {CompileResult}
 */
-export function compile(entry_point: string, contracts?: boolean, dependency_graph?: DependencyGraph): CompileResult;
+export function compile(entry_point: string, contracts: boolean | undefined, dependency_graph: DependencyGraph | undefined, file_source_map: PathToFileSourceMap): CompileResult;
 
 export type Diagnostic = {
     message: string;
@@ -81,3 +82,17 @@ export type CompileResult = (
 );
 
 
+/**
+*/
+export class PathToFileSourceMap {
+  free(): void;
+/**
+*/
+  constructor();
+/**
+* @param {string} path
+* @param {string} source_code
+* @returns {boolean}
+*/
+  add_source_code(path: string, source_code: string): boolean;
+}

package/nodejs/noir_wasm.js

@@ -1,7 +1,6 @@
 let imports = {};
 imports['__wbindgen_placeholder__'] = module.exports;
 let wasm;
-const { read_file } = require(`@noir-lang/source-resolver`);
 const { TextDecoder, TextEncoder } = require(`util`);
 
 const heap = new Array(128).fill(undefined);
@@ -240,18 +239,27 @@ module.exports.build_info = function() {
     return takeObject(ret);
 };
 
+function _assertClass(instance, klass) {
+    if (!(instance instanceof klass)) {
+        throw new Error(`expected instance of ${klass.name}`);
+    }
+    return instance.ptr;
+}
 /**
 * @param {string} entry_point
 * @param {boolean | undefined} contracts
 * @param {DependencyGraph | undefined} dependency_graph
+* @param {PathToFileSourceMap} file_source_map
 * @returns {CompileResult}
 */
-module.exports.compile = function(entry_point, contracts, dependency_graph) {
+module.exports.compile = function(entry_point, contracts, dependency_graph, file_source_map) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
         const ptr0 = passStringToWasm0(entry_point, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
         const len0 = WASM_VECTOR_LEN;
-        wasm.compile(retptr, ptr0, len0, isLikeNone(contracts) ? 0xFFFFFF : contracts ? 1 : 0, isLikeNone(dependency_graph) ? 0 : addHeapObject(dependency_graph));
+        _assertClass(file_source_map, PathToFileSourceMap);
+        var ptr1 = file_source_map.__destroy_into_raw();
+        wasm.compile(retptr, ptr0, len0, isLikeNone(contracts) ? 0xFFFFFF : contracts ? 1 : 0, isLikeNone(dependency_graph) ? 0 : addHeapObject(dependency_graph), ptr1);
         var r0 = getInt32Memory0()[retptr / 4 + 0];
         var r1 = getInt32Memory0()[retptr / 4 + 1];
         var r2 = getInt32Memory0()[retptr / 4 + 2];
@@ -271,12 +279,56 @@ function handleError(f, args) {
         wasm.__wbindgen_export_3(addHeapObject(e));
     }
 }
+/**
+*/
+class PathToFileSourceMap {
+
+    static __wrap(ptr) {
+        ptr = ptr >>> 0;
+        const obj = Object.create(PathToFileSourceMap.prototype);
+        obj.__wbg_ptr = ptr;
+
+        return obj;
+    }
+
+    __destroy_into_raw() {
+        const ptr = this.__wbg_ptr;
+        this.__wbg_ptr = 0;
+
+        return ptr;
+    }
+
+    free() {
+        const ptr = this.__destroy_into_raw();
+        wasm.__wbg_pathtofilesourcemap_free(ptr);
+    }
+    /**
+    */
+    constructor() {
+        const ret = wasm.pathtofilesourcemap_new();
+        return PathToFileSourceMap.__wrap(ret);
+    }
+    /**
+    * @param {string} path
+    * @param {string} source_code
+    * @returns {boolean}
+    */
+    add_source_code(path, source_code) {
+        const ptr0 = passStringToWasm0(path, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+        const len0 = WASM_VECTOR_LEN;
+        const ptr1 = passStringToWasm0(source_code, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+        const len1 = WASM_VECTOR_LEN;
+        const ret = wasm.pathtofilesourcemap_add_source_code(this.__wbg_ptr, ptr0, len0, ptr1, len1);
+        return ret !== 0;
+    }
+}
+module.exports.PathToFileSourceMap = PathToFileSourceMap;
 
 module.exports.__wbindgen_object_drop_ref = function(arg0) {
     takeObject(arg0);
 };
 
-module.exports.__wbg_constructor_2f52aa89ce97ba46 = function(arg0) {
+module.exports.__wbg_constructor_35233efb35960b52 = function(arg0) {
     const ret = new Error(takeObject(arg0));
     return addHeapObject(ret);
 };
@@ -286,19 +338,11 @@ module.exports.__wbindgen_is_undefined = function(arg0) {
     return ret;
 };
 
-module.exports.__wbg_constructor_1292ee4141d8f79d = function() {
+module.exports.__wbg_constructor_0fbcf25c6da50731 = function() {
     const ret = new Object();
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_readfile_698fcfe83a414130 = function() { return handleError(function (arg0, arg1, arg2) {
-    const ret = read_file(getStringFromWasm0(arg1, arg2));
-    const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
-    const len1 = WASM_VECTOR_LEN;
-    getInt32Memory0()[arg0 / 4 + 1] = len1;
-    getInt32Memory0()[arg0 / 4 + 0] = ptr1;
-}, arguments) };
-
 module.exports.__wbindgen_string_new = function(arg0, arg1) {
     const ret = getStringFromWasm0(arg0, arg1);
     return addHeapObject(ret);

package/nodejs/noir_wasm_bg.wasm.d.ts

@@ -5,7 +5,10 @@ export function acir_read_bytes(a: number, b: number): number;
 export function acir_write_bytes(a: number, b: number): void;
 export function init_log_level(a: number, b: number): void;
 export function build_info(): number;
-export function compile(a: number, b: number, c: number, d: number, e: number): void;
+export function __wbg_pathtofilesourcemap_free(a: number): void;
+export function pathtofilesourcemap_new(): number;
+export function pathtofilesourcemap_add_source_code(a: number, b: number, c: number, d: number, e: number): number;
+export function compile(a: number, b: number, c: number, d: number, e: number, f: number): void;
 export function __wbindgen_export_0(a: number): number;
 export function __wbindgen_export_1(a: number, b: number, c: number): number;
 export function __wbindgen_add_to_stack_pointer(a: number): number;

package/package.json

@@ -3,7 +3,7 @@
   "collaborators": [
     "The Noir Team <team@noir-lang.org>"
   ],
-  "version": "0.20.0-f904ae1.nightly",
+  "version": "0.21.0",
   "license": "(MIT OR Apache-2.0)",
   "main": "./nodejs/noir_wasm.js",
   "types": "./web/noir_wasm.d.ts",
@@ -30,9 +30,6 @@
     "build:nix": "nix build -L .#noir_wasm",
     "install:from:nix": "yarn clean && yarn build:nix && cp -rL ./result/noir_wasm/nodejs ./ && cp -rL ./result/noir_wasm/web ./"
   },
-  "peerDependencies": {
-    "@noir-lang/source-resolver": "0.20.0-f904ae1.nightly"
-  },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4-fix.0",
     "@web/dev-server-esbuild": "^0.3.6",

package/web/noir_wasm.d.ts

@@ -22,9 +22,10 @@ export function build_info(): any;
 * @param {string} entry_point
 * @param {boolean | undefined} contracts
 * @param {DependencyGraph | undefined} dependency_graph
+* @param {PathToFileSourceMap} file_source_map
 * @returns {CompileResult}
 */
-export function compile(entry_point: string, contracts?: boolean, dependency_graph?: DependencyGraph): CompileResult;
+export function compile(entry_point: string, contracts: boolean | undefined, dependency_graph: DependencyGraph | undefined, file_source_map: PathToFileSourceMap): CompileResult;
 
 export type Diagnostic = {
     message: string;
@@ -81,6 +82,20 @@ export type CompileResult = (
 );
 
 
+/**
+*/
+export class PathToFileSourceMap {
+  free(): void;
+/**
+*/
+  constructor();
+/**
+* @param {string} path
+* @param {string} source_code
+* @returns {boolean}
+*/
+  add_source_code(path: string, source_code: string): boolean;
+}
 
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
 
@@ -90,7 +105,10 @@ export interface InitOutput {
   readonly acir_write_bytes: (a: number, b: number) => void;
   readonly init_log_level: (a: number, b: number) => void;
   readonly build_info: () => number;
-  readonly compile: (a: number, b: number, c: number, d: number, e: number) => void;
+  readonly __wbg_pathtofilesourcemap_free: (a: number) => void;
+  readonly pathtofilesourcemap_new: () => number;
+  readonly pathtofilesourcemap_add_source_code: (a: number, b: number, c: number, d: number, e: number) => number;
+  readonly compile: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
   readonly __wbindgen_export_0: (a: number) => number;
   readonly __wbindgen_export_1: (a: number, b: number, c: number) => number;
   readonly __wbindgen_add_to_stack_pointer: (a: number) => number;

package/web/noir_wasm.js

@@ -1,5 +1,3 @@
-import { read_file } from '@noir-lang/source-resolver';
-
 let wasm;
 
 const heap = new Array(128).fill(undefined);
@@ -238,18 +236,27 @@ export function build_info() {
     return takeObject(ret);
 }
 
+function _assertClass(instance, klass) {
+    if (!(instance instanceof klass)) {
+        throw new Error(`expected instance of ${klass.name}`);
+    }
+    return instance.ptr;
+}
 /**
 * @param {string} entry_point
 * @param {boolean | undefined} contracts
 * @param {DependencyGraph | undefined} dependency_graph
+* @param {PathToFileSourceMap} file_source_map
 * @returns {CompileResult}
 */
-export function compile(entry_point, contracts, dependency_graph) {
+export function compile(entry_point, contracts, dependency_graph, file_source_map) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
         const ptr0 = passStringToWasm0(entry_point, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
         const len0 = WASM_VECTOR_LEN;
-        wasm.compile(retptr, ptr0, len0, isLikeNone(contracts) ? 0xFFFFFF : contracts ? 1 : 0, isLikeNone(dependency_graph) ? 0 : addHeapObject(dependency_graph));
+        _assertClass(file_source_map, PathToFileSourceMap);
+        var ptr1 = file_source_map.__destroy_into_raw();
+        wasm.compile(retptr, ptr0, len0, isLikeNone(contracts) ? 0xFFFFFF : contracts ? 1 : 0, isLikeNone(dependency_graph) ? 0 : addHeapObject(dependency_graph), ptr1);
         var r0 = getInt32Memory0()[retptr / 4 + 0];
         var r1 = getInt32Memory0()[retptr / 4 + 1];
         var r2 = getInt32Memory0()[retptr / 4 + 2];
@@ -269,6 +276,49 @@ function handleError(f, args) {
         wasm.__wbindgen_export_3(addHeapObject(e));
     }
 }
+/**
+*/
+export class PathToFileSourceMap {
+
+    static __wrap(ptr) {
+        ptr = ptr >>> 0;
+        const obj = Object.create(PathToFileSourceMap.prototype);
+        obj.__wbg_ptr = ptr;
+
+        return obj;
+    }
+
+    __destroy_into_raw() {
+        const ptr = this.__wbg_ptr;
+        this.__wbg_ptr = 0;
+
+        return ptr;
+    }
+
+    free() {
+        const ptr = this.__destroy_into_raw();
+        wasm.__wbg_pathtofilesourcemap_free(ptr);
+    }
+    /**
+    */
+    constructor() {
+        const ret = wasm.pathtofilesourcemap_new();
+        return PathToFileSourceMap.__wrap(ret);
+    }
+    /**
+    * @param {string} path
+    * @param {string} source_code
+    * @returns {boolean}
+    */
+    add_source_code(path, source_code) {
+        const ptr0 = passStringToWasm0(path, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+        const len0 = WASM_VECTOR_LEN;
+        const ptr1 = passStringToWasm0(source_code, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+        const len1 = WASM_VECTOR_LEN;
+        const ret = wasm.pathtofilesourcemap_add_source_code(this.__wbg_ptr, ptr0, len0, ptr1, len1);
+        return ret !== 0;
+    }
+}
 
 async function __wbg_load(module, imports) {
     if (typeof Response === 'function' && module instanceof Response) {
@@ -307,7 +357,7 @@ function __wbg_get_imports() {
     imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
         takeObject(arg0);
     };
-    imports.wbg.__wbg_constructor_2f52aa89ce97ba46 = function(arg0) {
+    imports.wbg.__wbg_constructor_35233efb35960b52 = function(arg0) {
         const ret = new Error(takeObject(arg0));
         return addHeapObject(ret);
     };
@@ -315,17 +365,10 @@ function __wbg_get_imports() {
         const ret = getObject(arg0) === undefined;
         return ret;
     };
-    imports.wbg.__wbg_constructor_1292ee4141d8f79d = function() {
+    imports.wbg.__wbg_constructor_0fbcf25c6da50731 = function() {
         const ret = new Object();
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_readfile_698fcfe83a414130 = function() { return handleError(function (arg0, arg1, arg2) {
-        const ret = read_file(getStringFromWasm0(arg1, arg2));
-        const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
-        const len1 = WASM_VECTOR_LEN;
-        getInt32Memory0()[arg0 / 4 + 1] = len1;
-        getInt32Memory0()[arg0 / 4 + 0] = ptr1;
-    }, arguments) };
     imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
         const ret = getStringFromWasm0(arg0, arg1);
         return addHeapObject(ret);

package/web/noir_wasm_bg.wasm.d.ts

@@ -5,7 +5,10 @@ export function acir_read_bytes(a: number, b: number): number;
 export function acir_write_bytes(a: number, b: number): void;
 export function init_log_level(a: number, b: number): void;
 export function build_info(): number;
-export function compile(a: number, b: number, c: number, d: number, e: number): void;
+export function __wbg_pathtofilesourcemap_free(a: number): void;
+export function pathtofilesourcemap_new(): number;
+export function pathtofilesourcemap_add_source_code(a: number, b: number, c: number, d: number, e: number): number;
+export function compile(a: number, b: number, c: number, d: number, e: number, f: number): void;
 export function __wbindgen_export_0(a: number): number;
 export function __wbindgen_export_1(a: number, b: number, c: number): number;
 export function __wbindgen_add_to_stack_pointer(a: number): number;