@noir-lang/noir_wasm 0.24.0-16d5f18.nightly → 0.24.0-21fc4b8.nightly

package/dist/node/main.js

@@ -202,19 +202,18 @@ function _assertClass(instance, klass) {
 * This is a method that exposes the same API as `compile`
 * But uses the Context based APi internally
 * @param {string} entry_point
-* @param {boolean | undefined} contracts
 * @param {DependencyGraph | undefined} dependency_graph
 * @param {PathToFileSourceMap} file_source_map
-* @returns {CompileResult}
+* @returns {ProgramCompileResult}
 */
-module.exports.compile_ = function(entry_point, contracts, dependency_graph, file_source_map) {
+module.exports.compile_program_ = function(entry_point, 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;
         _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);
+        wasm.compile_program_(retptr, ptr0, len0, 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];
@@ -228,37 +227,73 @@ module.exports.compile_ = function(entry_point, contracts, dependency_graph, fil
 };
 
 /**
-* @param {string} level
+* This is a method that exposes the same API as `compile`
+* But uses the Context based APi internally
+* @param {string} entry_point
+* @param {DependencyGraph | undefined} dependency_graph
+* @param {PathToFileSourceMap} file_source_map
+* @returns {ContractCompileResult}
 */
-module.exports.init_log_level = function(level) {
-    const ptr0 = passStringToWasm0(level, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
-    const len0 = WASM_VECTOR_LEN;
-    wasm.init_log_level(ptr0, len0);
+module.exports.compile_contract_ = function(entry_point, 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;
+        _assertClass(file_source_map, PathToFileSourceMap);
+        var ptr1 = file_source_map.__destroy_into_raw();
+        wasm.compile_contract_(retptr, ptr0, len0, 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];
+        if (r2) {
+            throw takeObject(r1);
+        }
+        return takeObject(r0);
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+    }
 };
 
 /**
-* @returns {any}
+* @param {string} entry_point
+* @param {DependencyGraph | undefined} dependency_graph
+* @param {PathToFileSourceMap} file_source_map
+* @returns {ProgramCompileResult}
 */
-module.exports.build_info = function() {
-    const ret = wasm.build_info();
-    return takeObject(ret);
+module.exports.compile_program = function(entry_point, 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;
+        _assertClass(file_source_map, PathToFileSourceMap);
+        var ptr1 = file_source_map.__destroy_into_raw();
+        wasm.compile_program(retptr, ptr0, len0, 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];
+        if (r2) {
+            throw takeObject(r1);
+        }
+        return takeObject(r0);
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+    }
 };
 
 /**
 * @param {string} entry_point
-* @param {boolean | undefined} contracts
 * @param {DependencyGraph | undefined} dependency_graph
 * @param {PathToFileSourceMap} file_source_map
-* @returns {CompileResult}
+* @returns {ContractCompileResult}
 */
-module.exports.compile = function(entry_point, contracts, dependency_graph, file_source_map) {
+module.exports.compile_contract = function(entry_point, 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;
         _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);
+        wasm.compile_contract(retptr, ptr0, len0, 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,6 +306,23 @@ module.exports.compile = function(entry_point, contracts, dependency_graph, file
     }
 };
 
+/**
+* @param {string} level
+*/
+module.exports.init_log_level = function(level) {
+    const ptr0 = passStringToWasm0(level, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+    const len0 = WASM_VECTOR_LEN;
+    wasm.init_log_level(ptr0, len0);
+};
+
+/**
+* @returns {any}
+*/
+module.exports.build_info = function() {
+    const ret = wasm.build_info();
+    return takeObject(ret);
+};
+
 function handleError(f, args) {
     try {
         return f.apply(this, args);
@@ -357,7 +409,7 @@ class CompilerContext {
     }
     /**
     * @param {number} program_width
-    * @returns {CompileResult}
+    * @returns {ProgramCompileResult}
     */
     compile_program(program_width) {
         try {
@@ -377,7 +429,7 @@ class CompilerContext {
     }
     /**
     * @param {number} program_width
-    * @returns {CompileResult}
+    * @returns {ContractCompileResult}
     */
     compile_contract(program_width) {
         try {
@@ -476,13 +528,13 @@ module.exports.__wbindgen_is_undefined = function(arg0) {
     return ret;
 };
 
-module.exports.__wbg_constructor_e8767839abf8a966 = function(arg0) {
-    const ret = new Error(takeObject(arg0));
+module.exports.__wbg_constructor_05d6d198f3477d6f = function() {
+    const ret = new Object();
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_constructor_05d6d198f3477d6f = function() {
-    const ret = new Object();
+module.exports.__wbg_constructor_e8767839abf8a966 = function(arg0) {
+    const ret = new Error(takeObject(arg0));
     return addHeapObject(ret);
 };
 
@@ -1159,18 +1211,54 @@ class NoirWasmCompiler {
     /**
      * Compile EntryPoint
      */
+    async compile_program() {
+        console.log(`Compiling at ${this.#package.getEntryPointPath()}`);
+        if (this.#package.getType() !== 'bin') {
+            throw new Error(`Expected to find package type "bin" but found ${this.#package.getType()}`);
+        }
+        await this.#dependencyManager.resolveDependencies();
+        this.#debugLog(`Dependencies: ${this.#dependencyManager.getPackageNames().join(', ')}`);
+        try {
+            const entrypoint = this.#package.getEntryPointPath();
+            const deps = {
+                /* eslint-disable camelcase */
+                root_dependencies: this.#dependencyManager.getEntrypointDependencies(),
+                library_dependencies: this.#dependencyManager.getLibraryDependencies(),
+                /* eslint-enable camelcase */
+            };
+            const packageSources = await this.#package.getSources(this.#fm);
+            const librarySources = (await Promise.all(this.#dependencyManager
+                .getLibraries()
+                .map(async ([alias, library]) => await library.package.getSources(this.#fm, alias)))).flat();
+            [...packageSources, ...librarySources].forEach((sourceFile) => {
+                this.#debugLog(`Adding source ${sourceFile.path}`);
+                this.#sourceMap.add_source_code(sourceFile.path, sourceFile.source);
+            });
+            const result = this.#wasmCompiler.compile_program(entrypoint, deps, this.#sourceMap);
+            return result;
+        }
+        catch (err) {
+            if (err instanceof Error && err.name === 'CompileError') {
+                const logs = await this.#processCompileError(err);
+                for (const log of logs) {
+                    this.#log(log);
+                }
+                throw new Error(logs.join('\n'));
+            }
+            throw err;
+        }
+    }
     /**
      * Compile EntryPoint
      */
-    async compile() {
+    async compile_contract() {
         console.log(`Compiling at ${this.#package.getEntryPointPath()}`);
-        if (!(this.#package.getType() === 'contract' || this.#package.getType() === 'bin')) {
-            throw new Error(`Only supports compiling "contract" and "bin" package types (${this.#package.getType()})`);
+        if (this.#package.getType() !== 'contract') {
+            throw new Error(`Expected to find package type "contract" but found ${this.#package.getType()}`);
         }
         await this.#dependencyManager.resolveDependencies();
         this.#debugLog(`Dependencies: ${this.#dependencyManager.getPackageNames().join(', ')}`);
         try {
-            const isContract = this.#package.getType() === 'contract';
             const entrypoint = this.#package.getEntryPointPath();
             const deps = {
                 /* eslint-disable camelcase */
@@ -1186,10 +1274,7 @@ class NoirWasmCompiler {
                 this.#debugLog(`Adding source ${sourceFile.path}`);
                 this.#sourceMap.add_source_code(sourceFile.path, sourceFile.source);
             });
-            const result = this.#wasmCompiler.compile(entrypoint, isContract, deps, this.#sourceMap);
-            if ((isContract && !('contract' in result)) || (!isContract && !('program' in result))) {
-                throw new Error('Invalid compilation result');
-            }
+            const result = this.#wasmCompiler.compile_contract(entrypoint, deps, this.#sourceMap);
             return result;
         }
         catch (err) {
@@ -12738,7 +12823,7 @@ var exports = __webpack_exports__;
   \***********************/
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.inflateDebugSymbols = exports.createFileManager = exports.compile = void 0;
+exports.inflateDebugSymbols = exports.createFileManager = exports.compile_contract = exports.compile_program = exports.compile = void 0;
 const nodejs_file_manager_1 = __webpack_require__(/*! ./noir/file-manager/nodejs-file-manager */ "./src/noir/file-manager/nodejs-file-manager.ts");
 const noir_wasm_compiler_1 = __webpack_require__(/*! ./noir/noir-wasm-compiler */ "./src/noir/noir-wasm-compiler.ts");
 const debug_1 = __webpack_require__(/*! ./noir/debug */ "./src/noir/debug.ts");
@@ -12755,30 +12840,71 @@ Object.defineProperty(exports, "inflateDebugSymbols", ({ enumerable: true, get:
  * ```typescript
  * // Node.js
  *
- * import { compile, createFileManager } from '@noir-lang/noir_wasm';
+ * import { compile_program, createFileManager } from '@noir-lang/noir_wasm';
+ *
+ * const fm = createFileManager(myProjectPath);
+ * const myCompiledCode = await compile_program(fm);
+ * ```
+ *
+ * ```typescript
+ * // Browser
+ *
+ * import { compile_program, createFileManager } from '@noir-lang/noir_wasm';
+ *
+ * const fm = createFileManager('/');
+ * for (const path of files) {
+ *   await fm.writeFile(path, await getFileAsStream(path));
+ * }
+ * const myCompiledCode = await compile_program(fm);
+ * ```
+ */
+async function compile_program(fileManager, projectPath, logFn, debugLogFn) {
+    const compiler = await setup_compiler(fileManager, projectPath, logFn, debugLogFn);
+    return await compiler.compile_program();
+}
+exports.compile = compile_program;
+exports.compile_program = compile_program;
+/**
+ * Compiles a Noir project
+ *
+ * @param fileManager - The file manager to use
+ * @param projectPath - The path to the project inside the file manager. Defaults to the root of the file manager
+ * @param logFn - A logging function. If not provided, console.log will be used
+ * @param debugLogFn - A debug logging function. If not provided, logFn will be used
+ *
+ * @example
+ * ```typescript
+ * // Node.js
+ *
+ * import { compile_contract, createFileManager } from '@noir-lang/noir_wasm';
  *
  * const fm = createFileManager(myProjectPath);
- * const myCompiledCode = await compile(fm);
+ * const myCompiledCode = await compile_contract(fm);
  * ```
  *
  * ```typescript
  * // Browser
  *
- * import { compile, createFileManager } from '@noir-lang/noir_wasm';
+ * import { compile_contract, createFileManager } from '@noir-lang/noir_wasm';
  *
  * const fm = createFileManager('/');
  * for (const path of files) {
  *   await fm.writeFile(path, await getFileAsStream(path));
  * }
- * const myCompiledCode = await compile(fm);
+ * const myCompiledCode = await compile_contract(fm);
  * ```
  */
-async function compile(fileManager, projectPath, logFn, debugLogFn) {
+async function compile_contract(fileManager, projectPath, logFn, debugLogFn) {
+    const compiler = await setup_compiler(fileManager, projectPath, logFn, debugLogFn);
+    return await compiler.compile_contract();
+}
+exports.compile_contract = compile_contract;
+async function setup_compiler(fileManager, projectPath, logFn, debugLogFn) {
     if (logFn && !debugLogFn) {
         debugLogFn = logFn;
     }
     const cjs = await __webpack_require__(/*! ../build/cjs */ "./build/cjs/index.js");
-    const compiler = await noir_wasm_compiler_1.NoirWasmCompiler.new(fileManager, projectPath ?? fileManager.getDataDir(), cjs, new cjs.PathToFileSourceMap(), {
+    return await noir_wasm_compiler_1.NoirWasmCompiler.new(fileManager, projectPath ?? fileManager.getDataDir(), cjs, new cjs.PathToFileSourceMap(), {
         log: logFn ??
             function (msg, data) {
                 if (data) {
@@ -12798,9 +12924,7 @@ async function compile(fileManager, projectPath, logFn, debugLogFn) {
                 }
             },
     });
-    return await compiler.compile();
 }
-exports.compile = compile;
 const createFileManager = nodejs_file_manager_1.createNodejsFileManager;
 exports.createFileManager = createFileManager;