@napi-rs/cli 3.0.0-alpha.77 → 3.0.0-alpha.79

package/dist/index.cjs

@@ -412,16 +412,29 @@ function parseMetadata(manifestPath) {
   if (!import_node_fs2.default.existsSync(manifestPath)) {
     throw new Error(`No crate found in manifest: ${manifestPath}`);
   }
-  const cmd = `cargo metadata --manifest-path ${manifestPath} --format-version 1 --no-deps`;
-  try {
-    const output = (0, import_node_child_process2.execSync)(cmd, {
-      encoding: "utf-8"
+  const { stdout, stderr, status, error } = (0, import_node_child_process2.spawnSync)("cargo", [
+    "metadata",
+    "--manifest-path",
+    manifestPath,
+    "--format-version",
+    "1",
+    "--no-deps"
+  ], { encoding: "utf-8" });
+  if (error) {
+    throw new Error("cargo metadata failed to run", { cause: error });
+  }
+  if (status !== 0) {
+    const simpleMessage = `cargo metadata exited with code ${status}`;
+    throw new Error(`${simpleMessage} and error message:
+
+${stderr}`, {
+      cause: new Error(simpleMessage)
     });
-    return JSON.parse(output);
+  }
+  try {
+    return JSON.parse(stdout);
   } catch (e) {
-    throw new Error(`Failed to parse cargo metadata output by command: ${cmd}`, {
-      cause: e
-    });
+    throw new Error("Failed to parse cargo metadata JSON", { cause: e });
   }
 }
 
@@ -662,6 +675,11 @@ function apply(func, thisArg, args) {
 }
 var apply_default = apply;
 
+// ../node_modules/lodash-es/noop.js
+function noop() {
+}
+var noop_default = noop;
+
 // ../node_modules/lodash-es/_copyArray.js
 function copyArray(source, array) {
   var index = -1, length = source.length;
@@ -740,6 +758,49 @@ function arrayEach(array, iteratee) {
 }
 var arrayEach_default = arrayEach;
 
+// ../node_modules/lodash-es/_baseFindIndex.js
+function baseFindIndex(array, predicate, fromIndex, fromRight) {
+  var length = array.length, index = fromIndex + (fromRight ? 1 : -1);
+  while (fromRight ? index-- : ++index < length) {
+    if (predicate(array[index], index, array)) {
+      return index;
+    }
+  }
+  return -1;
+}
+var baseFindIndex_default = baseFindIndex;
+
+// ../node_modules/lodash-es/_baseIsNaN.js
+function baseIsNaN(value) {
+  return value !== value;
+}
+var baseIsNaN_default = baseIsNaN;
+
+// ../node_modules/lodash-es/_strictIndexOf.js
+function strictIndexOf(array, value, fromIndex) {
+  var index = fromIndex - 1, length = array.length;
+  while (++index < length) {
+    if (array[index] === value) {
+      return index;
+    }
+  }
+  return -1;
+}
+var strictIndexOf_default = strictIndexOf;
+
+// ../node_modules/lodash-es/_baseIndexOf.js
+function baseIndexOf(array, value, fromIndex) {
+  return value === value ? strictIndexOf_default(array, value, fromIndex) : baseFindIndex_default(array, baseIsNaN_default, fromIndex);
+}
+var baseIndexOf_default = baseIndexOf;
+
+// ../node_modules/lodash-es/_arrayIncludes.js
+function arrayIncludes(array, value) {
+  var length = array == null ? 0 : array.length;
+  return !!length && baseIndexOf_default(array, value, 0) > -1;
+}
+var arrayIncludes_default = arrayIncludes;
+
 // ../node_modules/lodash-es/_isIndex.js
 var MAX_SAFE_INTEGER = 9007199254740991;
 var reIsUint = /^(?:0|[1-9]\d*)$/;
@@ -1504,6 +1565,66 @@ function baseSlice(array, start, end) {
 }
 var baseSlice_default = baseSlice;
 
+// ../node_modules/lodash-es/_castSlice.js
+function castSlice(array, start, end) {
+  var length = array.length;
+  end = end === void 0 ? length : end;
+  return !start && end >= length ? array : baseSlice_default(array, start, end);
+}
+var castSlice_default = castSlice;
+
+// ../node_modules/lodash-es/_hasUnicode.js
+var rsAstralRange = "\\ud800-\\udfff";
+var rsComboMarksRange = "\\u0300-\\u036f";
+var reComboHalfMarksRange = "\\ufe20-\\ufe2f";
+var rsComboSymbolsRange = "\\u20d0-\\u20ff";
+var rsComboRange = rsComboMarksRange + reComboHalfMarksRange + rsComboSymbolsRange;
+var rsVarRange = "\\ufe0e\\ufe0f";
+var rsZWJ = "\\u200d";
+var reHasUnicode = RegExp("[" + rsZWJ + rsAstralRange + rsComboRange + rsVarRange + "]");
+function hasUnicode(string) {
+  return reHasUnicode.test(string);
+}
+var hasUnicode_default = hasUnicode;
+
+// ../node_modules/lodash-es/_asciiToArray.js
+function asciiToArray(string) {
+  return string.split("");
+}
+var asciiToArray_default = asciiToArray;
+
+// ../node_modules/lodash-es/_unicodeToArray.js
+var rsAstralRange2 = "\\ud800-\\udfff";
+var rsComboMarksRange2 = "\\u0300-\\u036f";
+var reComboHalfMarksRange2 = "\\ufe20-\\ufe2f";
+var rsComboSymbolsRange2 = "\\u20d0-\\u20ff";
+var rsComboRange2 = rsComboMarksRange2 + reComboHalfMarksRange2 + rsComboSymbolsRange2;
+var rsVarRange2 = "\\ufe0e\\ufe0f";
+var rsAstral = "[" + rsAstralRange2 + "]";
+var rsCombo = "[" + rsComboRange2 + "]";
+var rsFitz = "\\ud83c[\\udffb-\\udfff]";
+var rsModifier = "(?:" + rsCombo + "|" + rsFitz + ")";
+var rsNonAstral = "[^" + rsAstralRange2 + "]";
+var rsRegional = "(?:\\ud83c[\\udde6-\\uddff]){2}";
+var rsSurrPair = "[\\ud800-\\udbff][\\udc00-\\udfff]";
+var rsZWJ2 = "\\u200d";
+var reOptMod = rsModifier + "?";
+var rsOptVar = "[" + rsVarRange2 + "]?";
+var rsOptJoin = "(?:" + rsZWJ2 + "(?:" + [rsNonAstral, rsRegional, rsSurrPair].join("|") + ")" + rsOptVar + reOptMod + ")*";
+var rsSeq = rsOptVar + reOptMod + rsOptJoin;
+var rsSymbol = "(?:" + [rsNonAstral + rsCombo + "?", rsCombo, rsRegional, rsSurrPair, rsAstral].join("|") + ")";
+var reUnicode = RegExp(rsFitz + "(?=" + rsFitz + ")|" + rsSymbol + rsSeq, "g");
+function unicodeToArray(string) {
+  return string.match(reUnicode) || [];
+}
+var unicodeToArray_default = unicodeToArray;
+
+// ../node_modules/lodash-es/_stringToArray.js
+function stringToArray(string) {
+  return hasUnicode_default(string) ? unicodeToArray_default(string) : asciiToArray_default(string);
+}
+var stringToArray_default = stringToArray;
+
 // ../node_modules/lodash-es/_stackClear.js
 function stackClear() {
   this.__data__ = new ListCache_default();
@@ -2384,6 +2505,17 @@ function baseIteratee(value) {
 }
 var baseIteratee_default = baseIteratee;
 
+// ../node_modules/lodash-es/_arrayAggregator.js
+function arrayAggregator(array, setter, iteratee, accumulator) {
+  var index = -1, length = array == null ? 0 : array.length;
+  while (++index < length) {
+    var value = array[index];
+    setter(accumulator, value, iteratee(value), array);
+  }
+  return accumulator;
+}
+var arrayAggregator_default = arrayAggregator;
+
 // ../node_modules/lodash-es/_createBaseFor.js
 function createBaseFor(fromRight) {
   return function(object, iteratee, keysFunc) {
@@ -2433,6 +2565,24 @@ var createBaseEach_default = createBaseEach;
 var baseEach = createBaseEach_default(baseForOwn_default);
 var baseEach_default = baseEach;
 
+// ../node_modules/lodash-es/_baseAggregator.js
+function baseAggregator(collection, setter, iteratee, accumulator) {
+  baseEach_default(collection, function(value, key, collection2) {
+    setter(accumulator, value, iteratee(value), collection2);
+  });
+  return accumulator;
+}
+var baseAggregator_default = baseAggregator;
+
+// ../node_modules/lodash-es/_createAggregator.js
+function createAggregator(setter, initializer) {
+  return function(collection, iteratee) {
+    var func = isArray_default(collection) ? arrayAggregator_default : baseAggregator_default, accumulator = initializer ? initializer() : {};
+    return func(collection, setter, baseIteratee_default(iteratee, 2), accumulator);
+  };
+}
+var createAggregator_default = createAggregator;
+
 // ../node_modules/lodash-es/_assignMergeValue.js
 function assignMergeValue(object, key, value) {
   if (value !== void 0 && !eq_default(object[key], value) || value === void 0 && !(key in object)) {
@@ -2531,6 +2681,18 @@ function baseMerge(object, source, srcIndex, customizer, stack) {
 }
 var baseMerge_default = baseMerge;
 
+// ../node_modules/lodash-es/_arrayIncludesWith.js
+function arrayIncludesWith(array, value, comparator) {
+  var index = -1, length = array == null ? 0 : array.length;
+  while (++index < length) {
+    if (comparator(value, array[index])) {
+      return true;
+    }
+  }
+  return false;
+}
+var arrayIncludesWith_default = arrayIncludesWith;
+
 // ../node_modules/lodash-es/last.js
 function last(array) {
   var length = array == null ? 0 : array.length;
@@ -2548,18 +2710,48 @@ function baseMap(collection, iteratee) {
 }
 var baseMap_default = baseMap;
 
+// ../node_modules/lodash-es/groupBy.js
+var objectProto17 = Object.prototype;
+var hasOwnProperty14 = objectProto17.hasOwnProperty;
+var groupBy = createAggregator_default(function(result, value, key) {
+  if (hasOwnProperty14.call(result, key)) {
+    result[key].push(value);
+  } else {
+    baseAssignValue_default(result, key, [value]);
+  }
+});
+var groupBy_default = groupBy;
+
 // ../node_modules/lodash-es/_parent.js
 function parent(object, path2) {
   return path2.length < 2 ? object : baseGet_default(object, baseSlice_default(path2, 0, -1));
 }
 var parent_default = parent;
 
+// ../node_modules/lodash-es/isEqual.js
+function isEqual(value, other) {
+  return baseIsEqual_default(value, other);
+}
+var isEqual_default = isEqual;
+
 // ../node_modules/lodash-es/isNil.js
 function isNil(value) {
   return value == null;
 }
 var isNil_default = isNil;
 
+// ../node_modules/lodash-es/_baseIsRegExp.js
+var regexpTag5 = "[object RegExp]";
+function baseIsRegExp(value) {
+  return isObjectLike_default(value) && baseGetTag_default(value) == regexpTag5;
+}
+var baseIsRegExp_default = baseIsRegExp;
+
+// ../node_modules/lodash-es/isRegExp.js
+var nodeIsRegExp = nodeUtil_default && nodeUtil_default.isRegExp;
+var isRegExp = nodeIsRegExp ? baseUnary_default(nodeIsRegExp) : baseIsRegExp_default;
+var isRegExp_default = isRegExp;
+
 // ../node_modules/lodash-es/merge.js
 var merge = createAssigner_default(function(object, source, srcIndex) {
   baseMerge_default(object, source, srcIndex);
@@ -2791,6 +2983,86 @@ var sortBy = baseRest_default(function(collection, iteratees) {
 });
 var sortBy_default = sortBy;
 
+// ../node_modules/lodash-es/split.js
+var MAX_ARRAY_LENGTH = 4294967295;
+function split(string, separator, limit) {
+  if (limit && typeof limit != "number" && isIterateeCall_default(string, separator, limit)) {
+    separator = limit = void 0;
+  }
+  limit = limit === void 0 ? MAX_ARRAY_LENGTH : limit >>> 0;
+  if (!limit) {
+    return [];
+  }
+  string = toString_default(string);
+  if (string && (typeof separator == "string" || separator != null && !isRegExp_default(separator))) {
+    separator = baseToString_default(separator);
+    if (!separator && hasUnicode_default(string)) {
+      return castSlice_default(stringToArray_default(string), 0, limit);
+    }
+  }
+  return string.split(separator, limit);
+}
+var split_default = split;
+
+// ../node_modules/lodash-es/_createSet.js
+var INFINITY3 = 1 / 0;
+var createSet = !(Set_default && 1 / setToArray_default(new Set_default([, -0]))[1] == INFINITY3) ? noop_default : function(values) {
+  return new Set_default(values);
+};
+var createSet_default = createSet;
+
+// ../node_modules/lodash-es/_baseUniq.js
+var LARGE_ARRAY_SIZE2 = 200;
+function baseUniq(array, iteratee, comparator) {
+  var index = -1, includes = arrayIncludes_default, length = array.length, isCommon = true, result = [], seen = result;
+  if (comparator) {
+    isCommon = false;
+    includes = arrayIncludesWith_default;
+  } else if (length >= LARGE_ARRAY_SIZE2) {
+    var set = iteratee ? null : createSet_default(array);
+    if (set) {
+      return setToArray_default(set);
+    }
+    isCommon = false;
+    includes = cacheHas_default;
+    seen = new SetCache_default();
+  } else {
+    seen = iteratee ? [] : result;
+  }
+  outer:
+    while (++index < length) {
+      var value = array[index], computed = iteratee ? iteratee(value) : value;
+      value = comparator || value !== 0 ? value : 0;
+      if (isCommon && computed === computed) {
+        var seenIndex = seen.length;
+        while (seenIndex--) {
+          if (seen[seenIndex] === computed) {
+            continue outer;
+          }
+        }
+        if (iteratee) {
+          seen.push(computed);
+        }
+        result.push(value);
+      } else if (!includes(seen, computed, comparator)) {
+        if (seen !== result) {
+          seen.push(computed);
+        }
+        result.push(value);
+      }
+    }
+  return result;
+}
+var baseUniq_default = baseUniq;
+
+// ../node_modules/lodash-es/unionWith.js
+var unionWith = baseRest_default(function(arrays) {
+  var comparator = last_default(arrays);
+  comparator = typeof comparator == "function" ? comparator : void 0;
+  return baseUniq_default(baseFlatten_default(arrays, 1, isArrayLikeObject_default, true), void 0, comparator);
+});
+var unionWith_default = unionWith;
+
 // dist/utils/config.js
 async function readNapiConfig(path2, configPath) {
   if (configPath && !await fileExists(configPath)) {
@@ -3009,14 +3281,14 @@ export declare class ExternalObject<T> {
 }
 async function readIntermediateTypeFile(file) {
   const content = await readFileAsync(file, "utf8");
-  const defs = content.split("\n").filter(Boolean).map((line) => {
+  const defs = unionWith_default(content.split("\n").filter(Boolean).map((line) => {
     line = line.trim();
     if (!line.startsWith("{")) {
       const start = line.indexOf(":") + 1;
       line = line.slice(start);
     }
     return JSON.parse(line);
-  });
+  }).filter((def) => !!def.kind), (a, b) => isEqual_default(a, b));
   return defs.sort((a, b) => {
     if (a.kind === TypeDefKind.Struct) {
       if (b.kind === TypeDefKind.Struct) {
@@ -4178,6 +4450,7 @@ const { createRequire } = require('node:module')
 require = createRequire(__filename)
 
 ${createCommonBinding(localName, pkgName)}
+module.exports = nativeBinding
 ${idents.map((ident) => `module.exports.${ident} = nativeBinding.${ident}`).join("\n")}
 `;
 }
@@ -4273,7 +4546,7 @@ function requireNative() {
     try {
       nativeBinding = require(process.env.NAPI_RS_NATIVE_LIBRARY_PATH);
     } catch (err) {
-      loadErrors.push(err);
+      loadErrors.push(err)
     }
   } else if (process.platform === 'android') {
     if (process.arch === 'arm64') {
@@ -4402,10 +4675,10 @@ const __wasi = new __WASI({
   const emnapiInstantiateImport = asyncInit ? `instantiateNapiModule as __emnapiInstantiateNapiModule` : `instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync`;
   const emnapiInstantiateCall = asyncInit ? `await __emnapiInstantiateNapiModule` : `__emnapiInstantiateNapiModuleSync`;
   return `import {
-  ${emnapiInstantiateImport},
+  createOnMessage as __wasmCreateOnMessageForFsProxy,
   getDefaultContext as __emnapiGetDefaultContext,
+  ${emnapiInstantiateImport},
   WASI as __WASI,
-  createOnMessage as __wasmCreateOnMessageForFsProxy,
 } from '@napi-rs/wasm-runtime'
 ${fsImport}
 import __wasmUrl from './${wasiFilename}.wasm?url'
@@ -4466,9 +4739,9 @@ const { WASI: __nodeWASI } = require('node:wasi')
 const { Worker } = require('node:worker_threads')
 
 const {
-  instantiateNapiModuleSync: __emnapiInstantiateNapiModuleSync,
-  getDefaultContext: __emnapiGetDefaultContext,
   createOnMessage: __wasmCreateOnMessageForFsProxy,
+  getDefaultContext: __emnapiGetDefaultContext,
+  instantiateNapiModuleSync: __emnapiInstantiateNapiModuleSync,
 } = require('@napi-rs/wasm-runtime')
 
 const __rootDir = __nodePath.parse(process.cwd()).root
@@ -4541,7 +4814,6 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule
     }
   },
 })
-
 `;
 
 // dist/api/templates/wasi-worker-template.js
@@ -4686,8 +4958,9 @@ async function buildProject(options) {
   if (!pkg) {
     throw new Error("Unable to find crate to build. It seems you are trying to build a crate in a workspace, try using `--package` option to specify the package to build.");
   }
+  const depsNapiPackages = pkg.dependencies.map((p) => metadata.packages.find((c) => c.name === p.name)).filter((c) => c != null && c.dependencies.some((d) => d.name == "napi-derive"));
   const crateDir = (0, import_node_path2.parse)(pkg.manifest_path).dir;
-  const builder = new Builder(options, pkg, cwd, options.target ? parseTriple(options.target) : process.env.CARGO_BUILD_TARGET ? parseTriple(process.env.CARGO_BUILD_TARGET) : getSystemDefaultTarget(), crateDir, resolvePath(options.outputDir ?? crateDir), options.targetDir ?? process.env.CARGO_BUILD_TARGET_DIR ?? metadata.target_directory, await readNapiConfig(resolvePath(options.configPath ?? options.packageJsonPath ?? "package.json"), options.configPath ? resolvePath(options.configPath) : void 0));
+  const builder = new Builder(options, pkg, cwd, options.target ? parseTriple(options.target) : process.env.CARGO_BUILD_TARGET ? parseTriple(process.env.CARGO_BUILD_TARGET) : getSystemDefaultTarget(), crateDir, resolvePath(options.outputDir ?? crateDir), options.targetDir ?? process.env.CARGO_BUILD_TARGET_DIR ?? metadata.target_directory, await readNapiConfig(resolvePath(options.configPath ?? options.packageJsonPath ?? "package.json"), options.configPath ? resolvePath(options.configPath) : void 0), depsNapiPackages);
   return builder.build();
 }
 var Builder = class {
@@ -4699,10 +4972,11 @@ var Builder = class {
   outputDir;
   targetDir;
   config;
+  depsNapiPackages;
   args = [];
   envs = {};
   outputs = [];
-  constructor(options, crate, cwd, target, crateDir, outputDir, targetDir, config) {
+  constructor(options, crate, cwd, target, crateDir, outputDir, targetDir, config, depsNapiPackages) {
     this.options = options;
     this.crate = crate;
     this.cwd = cwd;
@@ -4711,6 +4985,7 @@ var Builder = class {
     this.outputDir = outputDir;
     this.targetDir = targetDir;
     this.config = config;
+    this.depsNapiPackages = depsNapiPackages;
   }
   get cdyLibName() {
     return this.crate.targets.find((t) => t.crate_types.includes("cdylib"))?.name;
@@ -4913,8 +5188,57 @@ var Builder = class {
   }
   setEnvs() {
     this.envs.TYPE_DEF_TMP_PATH = this.getIntermediateTypeFile();
-    this.envs.WASI_REGISTER_TMP_PATH = this.getIntermediateWasiRegisterFile();
-    this.envs.CARGO_CFG_NAPI_RS_CLI_VERSION = CLI_VERSION;
+    if ((0, import_node_fs3.existsSync)(this.envs.TYPE_DEF_TMP_PATH)) {
+      const { depsNapiPackages, crate } = this;
+      let shouldInvalidateSelf = false;
+      const content = (0, import_node_fs3.readFileSync)(this.envs.TYPE_DEF_TMP_PATH, "utf-8");
+      const typedefRaw = content.split("\n").filter((line) => line.trim().length).map((line) => {
+        const [pkgName, ...jsonContents] = split_default(line, ":");
+        return {
+          pkgName,
+          jsonContent: jsonContents.join(":")
+        };
+      });
+      const groupedTypedefRaw = groupBy_default(typedefRaw, ({ pkgName }) => pkgName);
+      const invalidPackages = /* @__PURE__ */ new Set();
+      for (const [pkgName, value] of Object.entries(groupedTypedefRaw)) {
+        const packageInvalidKey = `NAPI_PACKAGE_${pkgName.toUpperCase().replaceAll("-", "_")}_INVALID`;
+        let done = false;
+        for (const { jsonContent } of value) {
+          try {
+            const json = JSON.parse(jsonContent);
+            if (json.done === true) {
+              done = true;
+              break;
+            }
+          } catch {
+            done = false;
+            break;
+          }
+        }
+        if (!done) {
+          process.env[packageInvalidKey] = `${Date.now()}`;
+          shouldInvalidateSelf = true;
+          invalidPackages.add(pkgName);
+        }
+      }
+      const typedefPackages = new Set(Object.keys(groupedTypedefRaw));
+      for (const crate2 of depsNapiPackages) {
+        if (!typedefPackages.has(crate2.name)) {
+          debug3("Set invalid package typedef: %i", crate2.name);
+          shouldInvalidateSelf = true;
+          process.env[`NAPI_PACKAGE_${crate2.name.toUpperCase().replaceAll("-", "_")}_INVALID`] = `${Date.now()}`;
+        }
+      }
+      if (shouldInvalidateSelf) {
+        debug3("Set invalid package typedef: %i", crate.name);
+        process.env[`NAPI_PACKAGE_${crate.name.toUpperCase().replaceAll("-", "_")}_INVALID`] = `${Date.now()}`;
+      }
+      if (invalidPackages.size) {
+        debug3("Clean invalid packages typedef: %O", invalidPackages);
+        (0, import_node_fs3.writeFileSync)(this.envs.TYPE_DEF_TMP_PATH, typedefRaw.filter(({ pkgName }) => !invalidPackages.has(pkgName)).map(({ pkgName, jsonContent }) => `${pkgName}:${jsonContent}`).join("\n"));
+      }
+    }
     let rustflags = process.env.RUSTFLAGS ?? process.env.CARGO_BUILD_RUSTFLAGS ?? "";
     if (this.target.abi?.includes("musl") && !rustflags.includes("target-feature=-crt-static")) {
       rustflags += " -C target-feature=-crt-static";
@@ -5024,9 +5348,6 @@ var Builder = class {
     }
     return `${dtsPath}.tmp`;
   }
-  getIntermediateWasiRegisterFile() {
-    return (0, import_node_path2.join)((0, import_node_os.tmpdir)(), `${this.crate.name}-${(0, import_node_crypto.createHash)("sha256").update(this.crate.manifest_path).update(CLI_VERSION).digest("hex").substring(0, 8)}.napi_wasi_register.tmp`);
-  }
   async postBuild() {
     try {
       debug3(`Try to create output directory:`);
@@ -5041,19 +5362,8 @@ var Builder = class {
     const wasmBinaryName = await this.copyArtifact();
     if (this.cdyLibName) {
       const idents = await this.generateTypeDef();
-      const intermediateWasiRegisterFile = this.envs.WASI_REGISTER_TMP_PATH;
-      const wasiRegisterFunctions = this.config.targets.some((t) => t.platform === "wasi") ? await async function readIntermediateWasiRegisterFile() {
-        const fileContent = await readFileAsync(intermediateWasiRegisterFile, "utf8").catch((err) => {
-          console.warn(`Read ${colors3.yellowBright(intermediateWasiRegisterFile)} failed, reason: ${err.message}`);
-          return ``;
-        });
-        return fileContent.split("\n").map((l) => l.trim()).filter((l) => l.length).map((line) => {
-          const [_, fn] = line.split(":");
-          return fn?.trim();
-        }).filter((fn) => !!fn);
-      }() : [];
       const jsOutput = await this.writeJsBinding(idents);
-      const wasmBindingsOutput = await this.writeWasiBinding(wasiRegisterFunctions, wasmBinaryName ?? "index.wasm", idents);
+      const wasmBindingsOutput = await this.writeWasiBinding(wasmBinaryName ?? "index.wasm", idents);
       if (jsOutput) {
         this.outputs.push(jsOutput);
       }
@@ -5086,7 +5396,7 @@ var Builder = class {
         try {
           const debugWasmModule = new ModuleConfig().generateDwarf(true).generateNameSection(true).generateProducersSection(true).preserveCodeTransform(true).strictValidate(false).parse(await readFileAsync(src));
           const debugWasmBinary = debugWasmModule.emitWasm(true);
-          await writeFileAsync(dest.replace(".wasm", ".debug.wasm"), debugWasmBinary);
+          await writeFileAsync(dest.replace(/\.wasm$/, ".debug.wasm"), debugWasmBinary);
           debug3("Generate release wasm module");
           const releaseWasmModule = new ModuleConfig().generateDwarf(false).generateNameSection(false).generateProducersSection(false).preserveCodeTransform(false).strictValidate(false).onlyStableFeatures(false).parse(debugWasmBinary);
           const releaseWasmBinary = releaseWasmModule.emitWasm(false);
@@ -5178,17 +5488,19 @@ var Builder = class {
       throw new Error("Failed to write js binding file", { cause: e });
     }
   }
-  async writeWasiBinding(wasiRegisterFunctions, distFileName, idents) {
-    if (distFileName && wasiRegisterFunctions.length) {
+  async writeWasiBinding(distFileName, idents) {
+    if (distFileName) {
       const { name, dir } = (0, import_node_path2.parse)(distFileName);
       const bindingPath = (0, import_node_path2.join)(dir, `${this.config.binaryName}.wasi.cjs`);
       const browserBindingPath = (0, import_node_path2.join)(dir, `${this.config.binaryName}.wasi-browser.js`);
       const workerPath = (0, import_node_path2.join)(dir, "wasi-worker.mjs");
       const browserWorkerPath = (0, import_node_path2.join)(dir, "wasi-worker-browser.mjs");
       const browserEntryPath = (0, import_node_path2.join)(dir, "browser.js");
-      const exportsCode = idents.map((ident) => `module.exports.${ident} = __napiModule.exports.${ident}`).join("\n");
+      const exportsCode = `module.exports = __napiModule.exports
+` + idents.map((ident) => `module.exports.${ident} = __napiModule.exports.${ident}`).join("\n");
       await writeFileAsync(bindingPath, createWasiBinding(name, this.config.packageName, this.config.wasm?.initialMemory, this.config.wasm?.maximumMemory) + exportsCode + "\n", "utf8");
-      await writeFileAsync(browserBindingPath, createWasiBrowserBinding(name, this.config.wasm?.initialMemory, this.config.wasm?.maximumMemory, this.config.wasm?.browser?.fs, this.config.wasm?.browser?.asyncInit) + idents.map((ident) => `export const ${ident} = __napiModule.exports.${ident}`).join("\n") + "\n", "utf8");
+      await writeFileAsync(browserBindingPath, createWasiBrowserBinding(name, this.config.wasm?.initialMemory, this.config.wasm?.maximumMemory, this.config.wasm?.browser?.fs, this.config.wasm?.browser?.asyncInit) + `export default __napiModule.exports
+` + idents.map((ident) => `export const ${ident} = __napiModule.exports.${ident}`).join("\n") + "\n", "utf8");
       await writeFileAsync(workerPath, WASI_WORKER_TEMPLATE, "utf8");
       await writeFileAsync(browserWorkerPath, createWasiBrowserWorkerBinding(this.config.wasm?.browser?.fs ?? false), "utf8");
       await writeFileAsync(browserEntryPath, `export * from '${this.config.packageName}-wasm32-wasi'
@@ -6421,10 +6733,10 @@ var createTokenAuth = function createTokenAuth2(token) {
 };
 
 // ../node_modules/@octokit/rest/node_modules/@octokit/core/dist-src/version.js
-var VERSION4 = "6.1.4";
+var VERSION4 = "6.1.5";
 
 // ../node_modules/@octokit/rest/node_modules/@octokit/core/dist-src/index.js
-var noop = () => {
+var noop2 = () => {
 };
 var consoleWarn = console.warn.bind(console);
 var consoleError = console.error.bind(console);
@@ -6497,8 +6809,8 @@ var Octokit = class {
     this.graphql = withCustomRequest(this.request).defaults(requestDefaults);
     this.log = Object.assign(
       {
-        debug: noop,
-        info: noop,
+        debug: noop2,
+        info: noop2,
         warn: consoleWarn,
         error: consoleError
       },

package/dist/utils/metadata.d.ts

@@ -13,6 +13,18 @@ export interface Crate {
     targets: CrateTarget[];
     features: Record<string, string[]>;
     manifest_path: string;
+    dependencies: Array<{
+        name: string;
+        source: string;
+        req: string;
+        kind: string | null;
+        rename: string | null;
+        optional: boolean;
+        uses_default_features: boolean;
+        features: string[];
+        target: string | null;
+        registry: string | null;
+    }>;
 }
 export interface CargoWorkspaceMetadata {
     version: number;

package/dist/utils/metadata.js

@@ -1,20 +1,31 @@
-import { execSync } from 'node:child_process';
+import { spawnSync } from 'node:child_process';
 import fs from 'node:fs';
 export function parseMetadata(manifestPath) {
     if (!fs.existsSync(manifestPath)) {
         throw new Error(`No crate found in manifest: ${manifestPath}`);
     }
-    const cmd = `cargo metadata --manifest-path ${manifestPath} --format-version 1 --no-deps`;
-    try {
-        const output = execSync(cmd, {
-            encoding: 'utf-8',
+    const { stdout, stderr, status, error } = spawnSync('cargo', [
+        'metadata',
+        '--manifest-path',
+        manifestPath,
+        '--format-version',
+        '1',
+        '--no-deps',
+    ], { encoding: 'utf-8' });
+    if (error) {
+        throw new Error('cargo metadata failed to run', { cause: error });
+    }
+    if (status !== 0) {
+        const simpleMessage = `cargo metadata exited with code ${status}`;
+        throw new Error(`${simpleMessage} and error message:\n\n${stderr}`, {
+            cause: new Error(simpleMessage),
         });
-        return JSON.parse(output);
+    }
+    try {
+        return JSON.parse(stdout);
     }
     catch (e) {
-        throw new Error(`Failed to parse cargo metadata output by command: ${cmd}`, {
-            cause: e,
-        });
+        throw new Error('Failed to parse cargo metadata JSON', { cause: e });
     }
 }
 //# sourceMappingURL=metadata.js.map

package/dist/utils/metadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../src/utils/metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC7C,OAAO,EAAE,MAAM,SAAS,CAAA;AAqCxB,MAAM,UAAU,aAAa,CAAC,YAAoB;IAChD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,+BAA+B,YAAY,EAAE,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,GAAG,GAAG,kCAAkC,YAAY,+BAA+B,CAAA;IAEzF,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE;YAC3B,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAA;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAA2B,CAAA;IACrD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CACb,qDAAqD,GAAG,EAAE,EAC1D;YACE,KAAK,EAAE,CAAC;SACT,CACF,CAAA;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../src/utils/metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,MAAM,SAAS,CAAA;AAiDxB,MAAM,UAAU,aAAa,CAAC,YAAoB;IAChD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,+BAA+B,YAAY,EAAE,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,CACjD,OAAO,EACP;QACE,UAAU;QACV,iBAAiB;QACjB,YAAY;QACZ,kBAAkB;QAClB,GAAG;QACH,WAAW;KACZ,EACD,EAAE,QAAQ,EAAE,OAAO,EAAE,CACtB,CAAA;IAED,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,8BAA8B,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;IACnE,CAAC;IACD,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;QACjB,MAAM,aAAa,GAAG,mCAAmC,MAAM,EAAE,CAAA;QACjE,MAAM,IAAI,KAAK,CAAC,GAAG,aAAa,0BAA0B,MAAM,EAAE,EAAE;YAClE,KAAK,EAAE,IAAI,KAAK,CAAC,aAAa,CAAC;SAChC,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAA2B,CAAA;IACrD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,qCAAqC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAA;IACtE,CAAC;AACH,CAAC"}