@napi-rs/cli 3.0.0-alpha.81 → 3.0.0-alpha.82

package/dist/index.cjs

@@ -201,10 +201,144 @@ var debug = debugFactory("utils");
 
 // dist/utils/misc.js
 var import_node_fs = require("node:fs");
-var import_node_module = require("node:module");
 var import_node_util = require("node:util");
-var require2 = (0, import_node_module.createRequire)(__filename);
-var pkgJson = require2("@napi-rs/cli/package.json");
+
+// package.json
+var package_default = {
+  name: "@napi-rs/cli",
+  version: "3.0.0-alpha.82",
+  description: "Cli tools for napi-rs",
+  author: "LongYinan <lynweklm@gmail.com>",
+  homepage: "https://github.com/napi-rs/napi-rs",
+  license: "MIT",
+  type: "module",
+  engines: {
+    node: ">= 16"
+  },
+  bin: {
+    napi: "./dist/cli.js",
+    "napi-raw": "./cli.mjs"
+  },
+  main: "./dist/index.cjs",
+  module: "./dist/index.js",
+  exports: {
+    ".": {
+      import: {
+        default: "./dist/index.js",
+        types: "./dist/index.d.ts"
+      },
+      require: {
+        default: "./dist/index.cjs",
+        types: "./dist/index.d.ts"
+      }
+    },
+    "./package.json": {
+      import: "./package.json",
+      require: "./package.json"
+    }
+  },
+  files: [
+    "dist",
+    "src"
+  ],
+  keywords: [
+    "cli",
+    "rust",
+    "napi",
+    "n-api",
+    "node-api",
+    "node-addon",
+    "neon"
+  ],
+  maintainers: [
+    {
+      name: "LongYinan",
+      email: "lynweklm@gmail.com",
+      homepage: "https://github.com/Brooooooklyn"
+    },
+    {
+      name: "forehalo",
+      homepage: "https://github.com/forehalo"
+    }
+  ],
+  repository: {
+    type: "git",
+    url: "git+https://github.com/napi-rs/napi-rs.git"
+  },
+  publishConfig: {
+    registry: "https://registry.npmjs.org/",
+    access: "public"
+  },
+  bugs: {
+    url: "https://github.com/napi-rs/napi-rs/issues"
+  },
+  dependencies: {
+    "@inquirer/prompts": "^7.4.0",
+    "@napi-rs/cross-toolchain": "^0.0.19",
+    "@napi-rs/wasm-tools": "^0.0.3",
+    "@octokit/rest": "^22.0.0",
+    clipanion: "^4.0.0-rc.4",
+    colorette: "^2.0.20",
+    debug: "^4.4.0",
+    emnapi: "^1.4.0",
+    "js-yaml": "^4.1.0",
+    "lodash-es": "^4.17.21",
+    semver: "^7.7.1",
+    toml: "^3.0.0",
+    typanion: "^3.14.0",
+    "wasm-sjlj": "^1.0.6"
+  },
+  devDependencies: {
+    "@emnapi/core": "^1.4.0",
+    "@emnapi/runtime": "^1.4.0",
+    "@oxc-node/core": "^0.0.27",
+    "@types/debug": "^4.1.12",
+    "@types/inquirer": "^9.0.7",
+    "@types/js-yaml": "^4.0.9",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^22.13.16",
+    "@types/semver": "^7.7.0",
+    ava: "^6.2.0",
+    "env-paths": "^3.0.0",
+    esbuild: "^0.25.2",
+    prettier: "^3.5.3",
+    tslib: "^2.8.1",
+    typescript: "^5.8.2"
+  },
+  peerDependencies: {
+    "@emnapi/runtime": "^1.1.0",
+    emnapi: "^1.1.0"
+  },
+  peerDependenciesMeta: {
+    "@emnapi/runtime": {
+      optional: true
+    },
+    emnapi: {
+      optional: true
+    }
+  },
+  funding: {
+    type: "github",
+    url: "https://github.com/sponsors/Brooooooklyn"
+  },
+  scripts: {
+    codegen: "node --import @oxc-node/core/register ./codegen/index.ts",
+    build: "tsc && yarn build:cjs",
+    "build:cjs": "node ./esbuild.mjs",
+    test: "node --import @oxc-node/core/register ../node_modules/ava/entrypoints/cli.mjs"
+  },
+  ava: {
+    extensions: {
+      ts: "module"
+    },
+    files: [
+      "**/__tests__/**/*.spec.ts"
+    ]
+  },
+  gitHead: "b3a477cac0284ff60a1c9f0e331993c02f8a8b8f"
+};
+
+// dist/utils/misc.js
 var readFileAsync = (0, import_node_util.promisify)(import_node_fs.readFile);
 var writeFileAsync = (0, import_node_util.promisify)(import_node_fs.writeFile);
 var unlinkAsync = (0, import_node_util.promisify)(import_node_fs.unlink);
@@ -216,6 +350,14 @@ async function fileExists(path2) {
   const exists = await statAsync(path2).then(() => true).catch(() => false);
   return exists;
 }
+async function dirExistsAsync(path2) {
+  try {
+    const stats = await statAsync(path2);
+    return stats.isDirectory();
+  } catch {
+    return false;
+  }
+}
 function pick(o, ...keys2) {
   return keys2.reduce((acc, key) => {
     acc[key] = o[key];
@@ -228,10 +370,10 @@ async function updatePackageJson(path2, partial) {
     debug(`File not exists ${path2}`);
     return;
   }
-  const old = require2(path2);
+  const old = require(path2);
   await writeFileAsync(path2, JSON.stringify({ ...old, ...partial }, null, 2));
 }
-var CLI_VERSION = pkgJson.version;
+var CLI_VERSION = package_default.version;
 
 // dist/utils/target.js
 var import_node_child_process = require("node:child_process");
@@ -684,11 +826,6 @@ 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;
@@ -767,49 +904,6 @@ 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*)$/;
@@ -1574,66 +1668,6 @@ 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();
@@ -2514,17 +2548,6 @@ 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) {
@@ -2574,24 +2597,6 @@ 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)) {
@@ -2690,18 +2695,6 @@ 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;
@@ -2719,48 +2712,18 @@ 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);
@@ -2992,86 +2955,6 @@ 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)) {
@@ -3081,9 +2964,9 @@ async function readNapiConfig(path2, configPath) {
     throw new Error(`package.json not found at ${path2}`);
   }
   const content = await readFileAsync(path2, "utf8");
-  let pkgJson2;
+  let pkgJson;
   try {
-    pkgJson2 = JSON.parse(content);
+    pkgJson = JSON.parse(content);
   } catch (e) {
     throw new Error(`Failed to parse package.json at ${path2}`, {
       cause: e
@@ -3100,8 +2983,8 @@ async function readNapiConfig(path2, configPath) {
       });
     }
   }
-  const userNapiConfig = pkgJson2.napi ?? {};
-  if (pkgJson2.napi && separatedConfig) {
+  const userNapiConfig = pkgJson.napi ?? {};
+  if (pkgJson.napi && separatedConfig) {
     const pkgJsonPath = (0, import_colorette.underline)(path2);
     const configPathUnderline = (0, import_colorette.underline)(configPath);
     console.warn((0, import_colorette.yellow)(`Both napi field in ${pkgJsonPath} and [NAPI-RS config](${configPathUnderline}) file are found, the NAPI-RS config file will be used.`));
@@ -3109,9 +2992,9 @@ async function readNapiConfig(path2, configPath) {
   }
   const napiConfig = merge_default({
     binaryName: "index",
-    packageName: pkgJson2.name,
+    packageName: pkgJson.name,
     targets: [],
-    packageJson: pkgJson2,
+    packageJson: pkgJson,
     npmClient: "npm"
   }, omit_default(userNapiConfig, "targets"));
   let targets = userNapiConfig.targets ?? [];
@@ -3236,11 +3119,10 @@ function exportDeclare(ambient) {
   }
   return "export declare";
 }
-async function processTypeDef(intermediateTypeFile, constEnum, header) {
+async function processTypeDef(intermediateTypeFile, constEnum) {
   const exports2 = [];
   const defs = await readIntermediateTypeFile(intermediateTypeFile);
   const groupedDefs = preprocessTypeDef(defs);
-  header = header ?? "";
   const dts = sortBy_default(Array.from(groupedDefs), ([namespace]) => namespace).map(([namespace, defs2]) => {
     if (namespace === TOP_LEVEL_NAMESPACE) {
       return defs2.map((def) => {
@@ -3273,31 +3155,17 @@ async function processTypeDef(intermediateTypeFile, constEnum, header) {
       return declaration;
     }
   }).join("\n\n") + "\n";
-  if (dts.indexOf("ExternalObject<") > -1) {
-    header += `
-export declare class ExternalObject<T> {
-  readonly '': {
-    readonly '': unique symbol
-    [K: symbol]: T
-  }
-}
-`;
-  }
   return {
-    dts: header + dts,
+    dts,
     exports: exports2
   };
 }
 async function readIntermediateTypeFile(file) {
   const content = await readFileAsync(file, "utf8");
-  const defs = unionWith_default(content.split("\n").filter(Boolean).map((line) => {
+  const defs = 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) {
@@ -3439,7 +3307,7 @@ async function collectNodeBinaries(root2) {
 var import_node_child_process4 = require("node:child_process");
 var import_node_crypto = require("node:crypto");
 var import_node_fs3 = require("node:fs");
-var import_node_module2 = require("node:module");
+var import_node_module = require("node:module");
 var import_node_os = require("node:os");
 var import_node_path2 = require("node:path");
 var colors3 = __toESM(require("colorette"), 1);
@@ -4946,13 +4814,10 @@ globalThis.onmessage = function (e) {
 
 // dist/api/build.js
 var debug3 = debugFactory("build");
-var require3 = (0, import_node_module2.createRequire)(__filename);
+var require2 = (0, import_node_module.createRequire)(__filename);
 async function buildProject(options) {
   debug3("napi build command receive options: %O", options);
-  options = {
-    dtsCache: true,
-    ...options
-  };
+  options = { dtsCache: true, ...options };
   const cwd = options.cwd ?? process.cwd();
   const resolvePath = (...paths) => (0, import_node_path2.resolve)(cwd, ...paths);
   const manifestPath = resolvePath(options.manifestPath ?? "Cargo.toml");
@@ -4967,9 +4832,8 @@ 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), depsNapiPackages);
+  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));
   return builder.build();
 }
 var Builder = class {
@@ -4981,11 +4845,10 @@ var Builder = class {
   outputDir;
   targetDir;
   config;
-  depsNapiPackages;
   args = [];
   envs = {};
   outputs = [];
-  constructor(options, crate, cwd, target, crateDir, outputDir, targetDir, config, depsNapiPackages) {
+  constructor(options, crate, cwd, target, crateDir, outputDir, targetDir, config) {
     this.options = options;
     this.crate = crate;
     this.cwd = cwd;
@@ -4994,7 +4857,6 @@ 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;
@@ -5025,7 +4887,7 @@ var Builder = class {
       debug3.warn("You are trying to use both `--cross-compile` and `--use-napi-cross` options, `--cross-compile` will be ignored.");
     }
     try {
-      const { version: version2, download } = require3("@napi-rs/cross-toolchain");
+      const { version: version2, download } = require2("@napi-rs/cross-toolchain");
       const alias = {
         "s390x-unknown-linux-gnu": "s390x-ibm-linux-gnu"
       };
@@ -5089,10 +4951,7 @@ var Builder = class {
       }
       const command = process.env.CARGO ?? (this.options.useCross ? "cross" : "cargo");
       const buildProcess = (0, import_node_child_process4.spawn)(command, this.args, {
-        env: {
-          ...process.env,
-          ...this.envs
-        },
+        env: { ...process.env, ...this.envs },
         stdio: watch ? ["inherit", "inherit", "pipe"] : "inherit",
         cwd: this.cwd,
         signal: controller.signal
@@ -5106,9 +4965,7 @@ var Builder = class {
         }
       });
       buildProcess.once("error", (e) => {
-        reject(new Error(`Build failed with error: ${e.message}`, {
-          cause: e
-        }));
+        reject(new Error(`Build failed with error: ${e.message}`, { cause: e }));
       });
       buildProcess.stderr?.on("data", (data) => {
         const output = data.toString();
@@ -5196,58 +5053,7 @@ var Builder = class {
     return this;
   }
   setEnvs() {
-    this.envs.TYPE_DEF_TMP_PATH = this.getIntermediateTypeFile();
-    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"));
-      }
-    }
+    this.envs.TYPE_DEF_TMP_FOLDER = this.generateIntermediateTypeDefFolder();
     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";
@@ -5283,7 +5089,7 @@ var Builder = class {
       });
     }
     if (this.target.platform === "wasi") {
-      const emnapi = (0, import_node_path2.join)(require3.resolve("emnapi"), "..", "lib", "wasm32-wasi-threads");
+      const emnapi = (0, import_node_path2.join)(require2.resolve("emnapi"), "..", "lib", "wasm32-wasi-threads");
       this.envs.EMNAPI_LINK_DIR = emnapi;
       this.envs.SETJMP_LINK_DIR = import_wasm_sjlj.lib;
       const { WASI_SDK_PATH } = process.env;
@@ -5346,16 +5152,14 @@ var Builder = class {
     }
     return this;
   }
-  getIntermediateTypeFile() {
-    const dtsPath = (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_type_def`);
+  generateIntermediateTypeDefFolder() {
+    let folder = (0, import_node_path2.join)(this.targetDir, "napi-rs", `${this.crate.name}-${(0, import_node_crypto.createHash)("sha256").update(this.crate.manifest_path).update(CLI_VERSION).digest("hex").substring(0, 8)}`);
     if (!this.options.dtsCache) {
-      try {
-        (0, import_node_fs3.unlinkSync)(dtsPath);
-      } catch {
-      }
-      return `${dtsPath}_${Date.now()}.tmp`;
+      (0, import_node_fs3.rmSync)(folder, { recursive: true, force: true });
+      folder += `_${Date.now()}`;
     }
-    return `${dtsPath}.tmp`;
+    mkdirAsync(folder, { recursive: true });
+    return folder;
   }
   async postBuild() {
     try {
@@ -5423,9 +5227,7 @@ var Builder = class {
       });
       return wasmBinaryName ? (0, import_node_path2.join)(this.outputDir, wasmBinaryName) : null;
     } catch (e) {
-      throw new Error("Failed to copy artifact", {
-        cause: e
-      });
+      throw new Error("Failed to copy artifact", { cause: e });
     }
   }
   getArtifactNames() {
@@ -5454,22 +5256,56 @@ var Builder = class {
     return [];
   }
   async generateTypeDef() {
-    if (!await fileExists(this.envs.TYPE_DEF_TMP_PATH)) {
+    const typeDefDir = this.envs.TYPE_DEF_TMP_FOLDER;
+    if (!await dirExistsAsync(typeDefDir)) {
       return [];
     }
     const dest = (0, import_node_path2.join)(this.outputDir, this.options.dts ?? "index.d.ts");
-    const { dts, exports: exports2 } = await processTypeDef(this.envs.TYPE_DEF_TMP_PATH, this.options.constEnum ?? this.config.constEnum ?? true, !this.options.noDtsHeader ? this.options.dtsHeader ?? (this.config.dtsHeaderFile ? await readFileAsync((0, import_node_path2.join)(this.cwd, this.config.dtsHeaderFile), "utf-8").catch(() => {
-      debug3.warn(`Failed to read dts header file ${this.config.dtsHeaderFile}`);
-      return null;
-    }) : null) ?? this.config.dtsHeader ?? DEFAULT_TYPE_DEF_HEADER : "");
+    let header = "";
+    let dts = "";
+    let exports2 = [];
+    if (!this.options.noDtsHeader) {
+      if (this.options.dtsHeader) {
+        header = this.options.dtsHeader;
+      } else if (this.config.dtsHeaderFile) {
+        try {
+          header = await readFileAsync((0, import_node_path2.join)(this.cwd, this.config.dtsHeaderFile), "utf-8");
+        } catch (e) {
+          debug3.warn(`Failed to read dts header file ${this.config.dtsHeaderFile}`, e);
+        }
+      } else {
+        header = DEFAULT_TYPE_DEF_HEADER;
+      }
+    }
+    const files = await readdirAsync(typeDefDir, { withFileTypes: true });
+    if (!files.length) {
+      debug3("No type def files found. Skip generating dts file.");
+      return [];
+    }
+    for (const file of files) {
+      if (!file.isFile()) {
+        continue;
+      }
+      const { dts: fileDts, exports: fileExports } = await processTypeDef((0, import_node_path2.join)(typeDefDir, file.name), this.options.constEnum ?? this.config.constEnum ?? true);
+      dts += fileDts;
+      exports2.push(...fileExports);
+    }
+    if (dts.indexOf("ExternalObject<") > -1) {
+      header += `
+export declare class ExternalObject<T> {
+  readonly '': {
+    readonly '': unique symbol
+    [K: symbol]: T
+  }
+}
+`;
+    }
+    dts = header + dts;
     try {
       debug3("Writing type def to:");
       debug3("  %i", dest);
       await writeFileAsync(dest, dts, "utf-8");
-      this.outputs.push({
-        kind: "dts",
-        path: dest
-      });
+      this.outputs.push({ kind: "dts", path: dest });
     } catch (e) {
       debug3.error("Failed to write type def file");
       debug3.error(e);
@@ -5489,10 +5325,7 @@ var Builder = class {
       debug3("Writing js binding to:");
       debug3("  %i", dest);
       await writeFileAsync(dest, binding, "utf-8");
-      return {
-        kind: "js",
-        path: dest
-      };
+      return { kind: "js", path: dest };
     } catch (e) {
       throw new Error("Failed to write js binding file", { cause: e });
     }
@@ -5515,26 +5348,11 @@ var Builder = class {
       await writeFileAsync(browserEntryPath, `export * from '${this.config.packageName}-wasm32-wasi'
 `);
       return [
-        {
-          kind: "js",
-          path: bindingPath
-        },
-        {
-          kind: "js",
-          path: browserBindingPath
-        },
-        {
-          kind: "js",
-          path: workerPath
-        },
-        {
-          kind: "js",
-          path: browserWorkerPath
-        },
-        {
-          kind: "js",
-          path: browserEntryPath
-        }
+        { kind: "js", path: bindingPath },
+        { kind: "js", path: browserBindingPath },
+        { kind: "js", path: workerPath },
+        { kind: "js", path: browserWorkerPath },
+        { kind: "js", path: browserEntryPath }
       ];
     }
     return [];
@@ -6745,7 +6563,7 @@ var createTokenAuth = function createTokenAuth2(token) {
 var VERSION4 = "7.0.2";
 
 // ../node_modules/@octokit/rest/node_modules/@octokit/core/dist-src/index.js
-var noop2 = () => {
+var noop = () => {
 };
 var consoleWarn = console.warn.bind(console);
 var consoleError = console.error.bind(console);
@@ -6818,8 +6636,8 @@ var Octokit = class {
     this.graphql = withCustomRequest(this.request).defaults(requestDefaults);
     this.log = Object.assign(
       {
-        debug: noop2,
-        info: noop2,
+        debug: noop,
+        info: noop,
         warn: consoleWarn,
         error: consoleError
       },