@napi-rs/cli 3.0.0-alpha.6 → 3.0.0-alpha.60

package/dist/api/templates/wasi-worker-template.js

@@ -0,0 +1,122 @@
+export const WASI_WORKER_TEMPLATE = `import fs from "node:fs";
+import { createRequire } from "node:module";
+import { parse } from "node:path";
+import { WASI } from "node:wasi";
+import { parentPort, Worker } from "node:worker_threads";
+
+const require = createRequire(import.meta.url);
+
+const { instantiateNapiModuleSync, MessageHandler, getDefaultContext } = require("@napi-rs/wasm-runtime");
+
+if (parentPort) {
+  parentPort.on("message", (data) => {
+    globalThis.onmessage({ data });
+  });
+}
+
+Object.assign(globalThis, {
+  self: globalThis,
+  require,
+  Worker,
+  importScripts: function (f) {
+    ;(0, eval)(fs.readFileSync(f, "utf8") + "//# sourceURL=" + f);
+  },
+  postMessage: function (msg) {
+    if (parentPort) {
+      parentPort.postMessage(msg);
+    }
+  },
+});
+
+const emnapiContext = getDefaultContext();
+
+const __rootDir = parse(process.cwd()).root;
+
+const handler = new MessageHandler({
+  onLoad({ wasmModule, wasmMemory }) {
+    const wasi = new WASI({
+      version: 'preview1',
+      env: process.env,
+      preopens: {
+        [__rootDir]: __rootDir,
+      },
+    });
+
+    return instantiateNapiModuleSync(wasmModule, {
+      childThread: true,
+      wasi,
+      context: emnapiContext,
+      overwriteImports(importObject) {
+        importObject.env = {
+          ...importObject.env,
+          ...importObject.napi,
+          ...importObject.emnapi,
+          memory: wasmMemory
+        };
+      },
+    });
+  },
+});
+
+globalThis.onmessage = function (e) {
+  handler.handle(e);
+};
+`;
+export const createWasiBrowserWorkerBinding = (fs) => {
+    const fsImport = fs
+        ? `import { instantiateNapiModuleSync, MessageHandler, WASI, createFsProxy } from '@napi-rs/wasm-runtime'
+import { memfsExported as __memfsExported } from '@napi-rs/wasm-runtime/fs'
+
+const fs = createFsProxy(__memfsExported)`
+        : `import { instantiateNapiModuleSync, MessageHandler, WASI } from '@napi-rs/wasm-runtime'`;
+    const wasiCreation = fs
+        ? `const wasi = new WASI({
+      fs,
+      preopens: {
+        '/': '/',
+      },
+      print: function () {
+        // eslint-disable-next-line no-console
+        console.log.apply(console, arguments)
+      },
+      printErr: function() {
+        // eslint-disable-next-line no-console
+        console.error.apply(console, arguments)
+      },
+    })`
+        : `const wasi = new WASI({
+      print: function () {
+        // eslint-disable-next-line no-console
+        console.log.apply(console, arguments)
+      },
+      printErr: function() {
+        // eslint-disable-next-line no-console
+        console.error.apply(console, arguments)
+      },
+    })`;
+    return `${fsImport}
+
+const handler = new MessageHandler({
+  onLoad({ wasmModule, wasmMemory }) {
+    ${wasiCreation}
+    return instantiateNapiModuleSync(wasmModule, {
+      childThread: true,
+      wasi,
+      overwriteImports(importObject) {
+        importObject.env = {
+          ...importObject.env,
+          ...importObject.napi,
+          ...importObject.emnapi,
+          memory: wasmMemory,
+        }
+      },
+    })
+  },
+})
+
+globalThis.onmessage = function (e) {
+  handler.handle(e)
+}
+`;
+};
+//# sourceMappingURL=wasi-worker-template.js.map

package/dist/api/templates/wasi-worker-template.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wasi-worker-template.js","sourceRoot":"","sources":["../../../src/api/templates/wasi-worker-template.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,oBAAoB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+DnC,CAAA;AAED,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,EAAW,EAAE,EAAE;IAC5D,MAAM,QAAQ,GAAG,EAAE;QACjB,CAAC,CAAC;;;0CAGoC;QACtC,CAAC,CAAC,yFAAyF,CAAA;IAC7F,MAAM,YAAY,GAAG,EAAE;QACrB,CAAC,CAAC;;;;;;;;;;;;;OAaC;QACH,CAAC,CAAC;;;;;;;;;OASC,CAAA;IACL,OAAO,GAAG,QAAQ;;;;MAId,YAAY;;;;;;;;;;;;;;;;;;;CAmBjB,CAAA;AACD,CAAC,CAAA"}

package/dist/api/universalize.js

@@ -1,5 +1,5 @@
-import { spawnSync } from 'child_process';
-import { join, resolve } from 'path';
+import { spawnSync } from 'node:child_process';
+import { join, resolve } from 'node:path';
 import { applyDefaultUniversalizeOptions, } from '../def/universalize.js';
 import { readNapiConfig } from '../utils/config.js';
 import { debugFactory } from '../utils/log.js';
@@ -16,18 +16,18 @@ const universalizers = {
 export async function universalizeBinaries(userOptions) {
     const options = applyDefaultUniversalizeOptions(userOptions);
     const packageJsonPath = join(options.cwd, options.packageJsonPath);
-    const config = await readNapiConfig(packageJsonPath);
+    const config = await readNapiConfig(packageJsonPath, options.configPath ? resolve(options.cwd, options.configPath) : undefined);
     const target = config.targets.find((t) => t.platform === process.platform && t.arch === 'universal');
     if (!target) {
         throw new Error(`'universal' arch for platform '${process.platform}' not found in config!`);
     }
-    const srcFiles = UniArchsByPlatform[process.platform]?.map((arch) => `${config.binaryName}.${process.platform}-${arch}.node`);
+    const srcFiles = UniArchsByPlatform[process.platform]?.map((arch) => resolve(options.cwd, options.outputDir, `${config.binaryName}.${process.platform}-${arch}.node`));
     if (!srcFiles || !universalizers[process.platform]) {
         throw new Error(`'universal' arch for platform '${process.platform}' not supported.`);
     }
     debug(`Looking up source binaries to combine: `);
     debug('  %O', srcFiles);
-    const srcFileLookup = await Promise.all(srcFiles.map((f) => fileExists(resolve(options.cwd, options.outputDir, f))));
+    const srcFileLookup = await Promise.all(srcFiles.map((f) => fileExists(f)));
     const notFoundFiles = srcFiles.filter((_, i) => !srcFileLookup[i]);
     if (notFoundFiles.length) {
         throw new Error(`Some binary files were not found: ${JSON.stringify(notFoundFiles)}`);

package/dist/api/universalize.js.map

@@ -1 +1 @@
-{"version":3,"file":"universalize.js","sourceRoot":"","sources":["../../src/api/universalize.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"universalize.js","sourceRoot":"","sources":["../../src/api/universalize.ts"],"names":[],"mappings":"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"}

package/dist/api/version.js

@@ -1,11 +1,11 @@
-import { join, resolve } from 'path';
+import { join, resolve } from 'node:path';
 import { applyDefaultVersionOptions } from '../def/version.js';
 import { readNapiConfig, debugFactory, updatePackageJson, } from '../utils/index.js';
 const debug = debugFactory('version');
 export async function version(userOptions) {
     const options = applyDefaultVersionOptions(userOptions);
     const packageJsonPath = resolve(options.cwd, options.packageJsonPath);
-    const config = await readNapiConfig(packageJsonPath);
+    const config = await readNapiConfig(packageJsonPath, options.configPath ? resolve(options.cwd, options.configPath) : undefined);
     for (const target of config.targets) {
         const pkgDir = resolve(options.cwd, options.npmDir, target.platformArchABI);
         debug(`Update version to %i in [%i]`, config.packageJson.version, pkgDir);

package/dist/api/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/api/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAEpC,OAAO,EAAE,0BAA0B,EAAkB,MAAM,mBAAmB,CAAA;AAC9E,OAAO,EACL,cAAc,EACd,YAAY,EACZ,iBAAiB,GAClB,MAAM,mBAAmB,CAAA;AAE1B,MAAM,KAAK,GAAG,YAAY,CAAC,SAAS,CAAC,CAAA;AAErC,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,WAA2B;IACvD,MAAM,OAAO,GAAG,0BAA0B,CAAC,WAAW,CAAC,CAAA;IACvD,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IAErE,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,eAAe,CAAC,CAAA;IAEpD,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;QACnC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC,CAAA;QAE3E,KAAK,CAAC,8BAA8B,EAAE,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QACzE,MAAM,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,EAAE;YACpD,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,OAAO;SACpC,CAAC,CAAA;KACH;AACH,CAAC"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/api/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEzC,OAAO,EAAE,0BAA0B,EAAkB,MAAM,mBAAmB,CAAA;AAC9E,OAAO,EACL,cAAc,EACd,YAAY,EACZ,iBAAiB,GAClB,MAAM,mBAAmB,CAAA;AAE1B,MAAM,KAAK,GAAG,YAAY,CAAC,SAAS,CAAC,CAAA;AAErC,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,WAA2B;IACvD,MAAM,OAAO,GAAG,0BAA0B,CAAC,WAAW,CAAC,CAAA;IACvD,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IAErE,MAAM,MAAM,GAAG,MAAM,cAAc,CACjC,eAAe,EACf,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAC1E,CAAA;IAED,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACpC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC,CAAA;QAE3E,KAAK,CAAC,8BAA8B,EAAE,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QACzE,MAAM,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,EAAE;YACpD,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,OAAO;SACpC,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}

package/dist/commands/artifacts.js

@@ -6,9 +6,9 @@ export class ArtifactsCommand extends BaseArtifactsCommand {
         description: 'Copy artifacts from Github Actions into specified dir',
         examples: [
             [
-                '$0 artifacts --dir . --dist ./npm',
+                '$0 artifacts --output-dir ./artifacts --dist ./npm',
                 `Copy [binaryName].[platform].node under current dir(.) into packages under npm dir.
-e.g: index.linux-x64-gnu.node --> ./npm/linux-x64-gnu/index.node`,
+e.g: index.linux-x64-gnu.node --> ./npm/linux-x64-gnu/index.linux-x64-gnu.node`,
             ],
         ],
     });

package/dist/commands/artifacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../src/commands/artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAE1D,MAAM,OAAO,gBAAiB,SAAQ,oBAAoB;IACxD,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,WAAW,EAAE,uDAAuD;QACpE,QAAQ,EAAE;YACR;gBACE,mCAAmC;gBACnC;iEACyD;aAC1D;SACF;KACF,CAAC,CAAA;IAEF,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAA;IAE9B,KAAK,CAAC,OAAO;QACX,MAAM,gBAAgB,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;IAC3C,CAAC"}
+{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../src/commands/artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAE1D,MAAM,OAAO,gBAAiB,SAAQ,oBAAoB;IACxD,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,WAAW,EAAE,uDAAuD;QACpE,QAAQ,EAAE;YACR;gBACE,oDAAoD;gBACpD;+EACuE;aACxE;SACF;KACF,CAAC,CAAA;IAEF,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAA;IAE9B,KAAK,CAAC,OAAO;QACX,MAAM,gBAAgB,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;IAC3C,CAAC"}

package/dist/commands/build.js

@@ -1,4 +1,4 @@
-import { execSync } from 'child_process';
+import { execSync } from 'node:child_process';
 import { Option } from 'clipanion';
 import { buildProject } from '../api/build.js';
 import { BaseBuildCommand } from '../def/build.js';

package/dist/commands/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAExC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAElC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEhD,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;AAEnC,MAAM,OAAO,YAAa,SAAQ,gBAAgB;IAChD,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE;QAC7B,WAAW,EACT,yFAAyF;KAC5F,CAAC,CAAA;IAEF,YAAY,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;IAE5B,KAAK,CAAC,OAAO;QACX,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,YAAY,CAAC;YAClC,GAAG,IAAI,CAAC,UAAU,EAAE;YACpB,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAA;QAEF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAA;QAE1B,IAAI,IAAI,CAAC,IAAI,EAAE;YACb,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;gBAC5B,KAAK,CAAC,mCAAmC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;gBACrD,IAAI;oBACF,QAAQ,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE;wBACtC,KAAK,EAAE,SAAS;wBAChB,GAAG,EAAE,IAAI,CAAC,GAAG;qBACd,CAAC,CAAA;iBACH;gBAAC,OAAO,CAAC,EAAE;oBACV,KAAK,CAAC,KAAK,CAAC,8BAA8B,MAAM,CAAC,IAAI,aAAa,CAAC,CAAA;oBACnE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;iBACf;aACF;SACF;IACH,CAAC;CACF"}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAE7C,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAElC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEhD,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;AAEnC,MAAM,OAAO,YAAa,SAAQ,gBAAgB;IAChD,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE;QAC7B,WAAW,EACT,yFAAyF;KAC5F,CAAC,CAAA;IAEF,YAAY,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;IAE5B,KAAK,CAAC,OAAO;QACX,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,YAAY,CAAC;YAClC,GAAG,IAAI,CAAC,UAAU,EAAE;YACpB,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAA;QAEF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAA;QAE1B,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,KAAK,CAAC,mCAAmC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;gBACrD,IAAI,CAAC;oBACH,QAAQ,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE;wBACtC,KAAK,EAAE,SAAS;wBAChB,GAAG,EAAE,IAAI,CAAC,GAAG;qBACd,CAAC,CAAA;gBACJ,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,KAAK,CAAC,KAAK,CAAC,8BAA8B,MAAM,CAAC,IAAI,aAAa,CAAC,CAAA;oBACnE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBAChB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;CACF"}

package/dist/commands/new.js

@@ -1,4 +1,4 @@
-import path from 'path';
+import path from 'node:path';
 import { Option } from 'clipanion';
 import inquirer from 'inquirer';
 import { newProject } from '../api/new.js';
@@ -7,7 +7,7 @@ import { AVAILABLE_TARGETS, debugFactory, DEFAULT_TARGETS, } from '../utils/inde
 import { napiEngineRequirement } from '../utils/version.js';
 const debug = debugFactory('new');
 export class NewCommand extends BaseNewCommand {
-    interactive = Option.Boolean('--interactive,-i', false, {
+    interactive = Option.Boolean('--interactive,-i', true, {
         description: 'Ask project basic information interactively without just using the default.',
     });
     async execute() {
@@ -25,9 +25,13 @@ export class NewCommand extends BaseNewCommand {
     async fetchOptions() {
         const cmdOptions = super.getOptions();
         if (this.interactive) {
+            const targetPath = cmdOptions.path
+                ? cmdOptions.path
+                : await inquirerProjectPath();
+            cmdOptions.path = targetPath;
             return {
                 ...cmdOptions,
-                name: await this.fetchName(path.parse(cmdOptions.path).base),
+                name: await this.fetchName(path.parse(targetPath).base),
                 minNodeApiVersion: await this.fetchNapiVersion(),
                 targets: await this.fetchTargets(),
                 license: await this.fetchLicense(),
@@ -39,14 +43,14 @@ export class NewCommand extends BaseNewCommand {
     }
     async fetchName(defaultName) {
         return (this.$$name ??
-            (await inquirer
+            inquirer
                 .prompt({
                 type: 'input',
                 name: 'name',
                 message: 'Package name (the name field in your package.json file)',
                 default: defaultName,
             })
-                .then(({ name }) => name)));
+                .then(({ name }) => name));
     }
     async fetchLicense() {
         return inquirer
@@ -65,7 +69,7 @@ export class NewCommand extends BaseNewCommand {
             name: 'minNodeApiVersion',
             message: 'Minimum node-api version (with node version requirement)',
             loop: false,
-            choices: new Array(8).fill(0).map((_, i) => ({
+            choices: Array.from({ length: 8 }, (_, i) => ({
                 name: `napi${i + 1} (${napiEngineRequirement(i + 1)})`,
                 value: i + 1,
             })),
@@ -83,8 +87,12 @@ export class NewCommand extends BaseNewCommand {
             type: 'checkbox',
             loop: false,
             message: 'Choose target(s) your crate will be compiled to',
-            default: this.enableDefaultTargets ? DEFAULT_TARGETS : [],
-            choices: AVAILABLE_TARGETS,
+            choices: AVAILABLE_TARGETS.map((target) => ({
+                name: target,
+                value: target,
+                // @ts-expect-error
+                checked: DEFAULT_TARGETS.includes(target),
+            })),
         });
         return targets;
     }
@@ -107,4 +115,18 @@ export class NewCommand extends BaseNewCommand {
         return enableGithubActions;
     }
 }
+async function inquirerProjectPath() {
+    return inquirer
+        .prompt({
+        type: 'input',
+        name: 'path',
+        message: 'Target path to create the project, relative to cwd.',
+    })
+        .then(({ path }) => {
+        if (!path) {
+            return inquirerProjectPath();
+        }
+        return path;
+    });
+}
 //# sourceMappingURL=new.js.map

package/dist/commands/new.js.map

@@ -1 +1 @@
-{"version":3,"file":"new.js","sourceRoot":"","sources":["../../src/commands/new.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"new.js","sourceRoot":"","sources":["../../src/commands/new.ts"],"names":[],"mappings":"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"}

package/dist/def/artifacts.d.ts

@@ -3,14 +3,18 @@ export declare abstract class BaseArtifactsCommand extends Command {
     static paths: string[][];
     static usage: import("clipanion").Usage;
     cwd: string;
+    configPath?: string;
     packageJsonPath: string;
     outputDir: string;
     npmDir: string;
+    buildOutputDir?: string;
     getOptions(): {
         cwd: string;
+        configPath: string | undefined;
         packageJsonPath: string;
         outputDir: string;
         npmDir: string;
+        buildOutputDir: string | undefined;
     };
 }
 /**
@@ -23,6 +27,10 @@ export interface ArtifactsOptions {
      * @default process.cwd()
      */
     cwd?: string;
+    /**
+     * Path to `napi` config json file
+     */
+    configPath?: string;
     /**
      * Path to `package.json`
      *
@@ -32,7 +40,7 @@ export interface ArtifactsOptions {
     /**
      * Path to the folder where all built `.node` files put, same as `--output-dir` of build command
      *
-     * @default './'
+     * @default './artifacts'
      */
     outputDir?: string;
     /**
@@ -41,10 +49,22 @@ export interface ArtifactsOptions {
      * @default 'npm'
      */
     npmDir?: string;
+    /**
+     * Path to the build output dir, only needed when targets contains `wasm32-wasi-*`
+     */
+    buildOutputDir?: string;
 }
 export declare function applyDefaultArtifactsOptions(options: ArtifactsOptions): {
     cwd: string;
+    /**
+     * Path to `napi` config json file
+     */
+    configPath?: string;
     packageJsonPath: string;
     outputDir: string;
     npmDir: string;
+    /**
+     * Path to the build output dir, only needed when targets contains `wasm32-wasi-*`
+     */
+    buildOutputDir?: string;
 };

package/dist/def/artifacts.js

@@ -9,21 +9,29 @@ export class BaseArtifactsCommand extends Command {
     cwd = Option.String('--cwd', process.cwd(), {
         description: 'The working directory of where napi command will be executed in, all other paths options are relative to this path',
     });
+    configPath = Option.String('--config-path,-c', {
+        description: 'Path to `napi` config json file',
+    });
     packageJsonPath = Option.String('--package-json-path', 'package.json', {
         description: 'Path to `package.json`',
     });
-    outputDir = Option.String('--output-dir,-o', './', {
+    outputDir = Option.String('--output-dir,-o,-d', './artifacts', {
         description: 'Path to the folder where all built `.node` files put, same as `--output-dir` of build command',
     });
     npmDir = Option.String('--npm-dir', 'npm', {
         description: 'Path to the folder where the npm packages put',
     });
+    buildOutputDir = Option.String('--build-output-dir', {
+        description: 'Path to the build output dir, only needed when targets contains `wasm32-wasi-*`',
+    });
     getOptions() {
         return {
             cwd: this.cwd,
+            configPath: this.configPath,
             packageJsonPath: this.packageJsonPath,
             outputDir: this.outputDir,
             npmDir: this.npmDir,
+            buildOutputDir: this.buildOutputDir,
         };
     }
 }
@@ -31,7 +39,7 @@ export function applyDefaultArtifactsOptions(options) {
     return {
         cwd: process.cwd(),
         packageJsonPath: 'package.json',
-        outputDir: './',
+        outputDir: './artifacts',
         npmDir: 'npm',
         ...options,
     };

package/dist/def/artifacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../src/def/artifacts.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,iCAAiC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAE3C,MAAM,OAAgB,oBAAqB,SAAQ,OAAO;IACxD,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAA;IAE9B,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,WAAW,EACT,2EAA2E;KAC9E,CAAC,CAAA;IAEF,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE;QAC1C,WAAW,EACT,oHAAoH;KACvH,CAAC,CAAA;IAEF,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE,cAAc,EAAE;QACrE,WAAW,EAAE,wBAAwB;KACtC,CAAC,CAAA;IAEF,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,EAAE,IAAI,EAAE;QACjD,WAAW,EACT,+FAA+F;KAClG,CAAC,CAAA;IAEF,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,EAAE;QACzC,WAAW,EAAE,+CAA+C;KAC7D,CAAC,CAAA;IAEF,UAAU;QACR,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAA;IACH,CAAC;;AAiCH,MAAM,UAAU,4BAA4B,CAAC,OAAyB;IACpE,OAAO;QACL,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;QAClB,eAAe,EAAE,cAAc;QAC/B,SAAS,EAAE,IAAI;QACf,MAAM,EAAE,KAAK;QACb,GAAG,OAAO;KACX,CAAA;AACH,CAAC"}
+{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../src/def/artifacts.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,iCAAiC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAE3C,MAAM,OAAgB,oBAAqB,SAAQ,OAAO;IACxD,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAA;IAE9B,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,WAAW,EACT,2EAA2E;KAC9E,CAAC,CAAA;IAEF,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE;QAC1C,WAAW,EACT,oHAAoH;KACvH,CAAC,CAAA;IAEF,UAAU,GAAY,MAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE;QACtD,WAAW,EAAE,iCAAiC;KAC/C,CAAC,CAAA;IAEF,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE,cAAc,EAAE;QACrE,WAAW,EAAE,wBAAwB;KACtC,CAAC,CAAA;IAEF,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,oBAAoB,EAAE,aAAa,EAAE;QAC7D,WAAW,EACT,+FAA+F;KAClG,CAAC,CAAA;IAEF,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,EAAE;QACzC,WAAW,EAAE,+CAA+C;KAC7D,CAAC,CAAA;IAEF,cAAc,GAAY,MAAM,CAAC,MAAM,CAAC,oBAAoB,EAAE;QAC5D,WAAW,EACT,iFAAiF;KACpF,CAAC,CAAA;IAEF,UAAU;QACR,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,cAAc,EAAE,IAAI,CAAC,cAAc;SACpC,CAAA;IACH,CAAC;;AAyCH,MAAM,UAAU,4BAA4B,CAAC,OAAyB;IACpE,OAAO;QACL,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;QAClB,eAAe,EAAE,cAAc;QAC/B,SAAS,EAAE,aAAa;QACxB,MAAM,EAAE,KAAK;QACb,GAAG,OAAO;KACX,CAAA;AACH,CAAC"}

package/dist/def/build.d.ts

@@ -5,11 +5,13 @@ export declare abstract class BaseBuildCommand extends Command {
     target?: string;
     cwd?: string;
     manifestPath?: string;
+    configPath?: string;
     packageJsonPath?: string;
     targetDir?: string;
     outputDir?: string;
     platform?: boolean;
     jsPackageName?: string;
+    constEnum?: boolean;
     jsBinding?: string;
     noJsBinding?: boolean;
     dts?: string;
@@ -23,6 +25,7 @@ export declare abstract class BaseBuildCommand extends Command {
     profile?: string;
     crossCompile?: boolean;
     useCross?: boolean;
+    useNapiCross?: boolean;
     watch?: boolean;
     features?: string[];
     allFeatures?: boolean;
@@ -31,11 +34,13 @@ export declare abstract class BaseBuildCommand extends Command {
         target: string | undefined;
         cwd: string | undefined;
         manifestPath: string | undefined;
+        configPath: string | undefined;
         packageJsonPath: string | undefined;
         targetDir: string | undefined;
         outputDir: string | undefined;
         platform: boolean | undefined;
         jsPackageName: string | undefined;
+        constEnum: boolean | undefined;
         jsBinding: string | undefined;
         noJsBinding: boolean | undefined;
         dts: string | undefined;
@@ -49,6 +54,7 @@ export declare abstract class BaseBuildCommand extends Command {
         profile: string | undefined;
         crossCompile: boolean | undefined;
         useCross: boolean | undefined;
+        useNapiCross: boolean | undefined;
         watch: boolean | undefined;
         features: string[] | undefined;
         allFeatures: boolean | undefined;
@@ -56,7 +62,7 @@ export declare abstract class BaseBuildCommand extends Command {
     };
 }
 /**
- * Build the napi-rs project
+ * Build the NAPI-RS project
  */
 export interface BuildOptions {
     /**
@@ -71,6 +77,10 @@ export interface BuildOptions {
      * Path to `Cargo.toml`
      */
     manifestPath?: string;
+    /**
+     * Path to `napi` config json file
+     */
+    configPath?: string;
     /**
      * Path to `package.json`
      */
@@ -92,7 +102,11 @@ export interface BuildOptions {
      */
     jsPackageName?: string;
     /**
-     * Path and filename of generated JS binding file. Only works with `--platform` flag. Relative to `--output_dir`.
+     * Whether generate const enum for typescript bindings
+     */
+    constEnum?: boolean;
+    /**
+     * Path and filename of generated JS binding file. Only works with `--platform` flag. Relative to `--output-dir`.
      */
     jsBinding?: string;
     /**
@@ -100,7 +114,7 @@ export interface BuildOptions {
      */
     noJsBinding?: boolean;
     /**
-     * Path and filename of generated type def file. Relative to `--output_dir`
+     * Path and filename of generated type def file. Relative to `--output-dir`
      */
     dts?: string;
     /**
@@ -144,7 +158,11 @@ export interface BuildOptions {
      */
     useCross?: boolean;
     /**
-     * watch the crate changes and build continiously with `cargo-watch` crates
+     * [experimental] use @napi-rs/cross-toolchain to cross-compile Linux arm/arm64/x64 gnu targets.
+     */
+    useNapiCross?: boolean;
+    /**
+     * watch the crate changes and build continuously with `cargo-watch` crates
      */
     watch?: boolean;
     /**

package/dist/def/build.js

@@ -4,7 +4,7 @@ import { Command, Option } from 'clipanion';
 export class BaseBuildCommand extends Command {
     static paths = [['build']];
     static usage = Command.Usage({
-        description: 'Build the napi-rs project',
+        description: 'Build the NAPI-RS project',
     });
     target = Option.String('--target,-t', {
         description: 'Build for the target triple, bypassed to `cargo build --target`',
@@ -15,6 +15,9 @@ export class BaseBuildCommand extends Command {
     manifestPath = Option.String('--manifest-path', {
         description: 'Path to `Cargo.toml`',
     });
+    configPath = Option.String('--config-path,-c', {
+        description: 'Path to `napi` config json file',
+    });
     packageJsonPath = Option.String('--package-json-path', {
         description: 'Path to `package.json`',
     });
@@ -30,14 +33,17 @@ export class BaseBuildCommand extends Command {
     jsPackageName = Option.String('--js-package-name', {
         description: 'Package name in generated js binding file. Only works with `--platform` flag',
     });
+    constEnum = Option.Boolean('--const-enum', {
+        description: 'Whether generate const enum for typescript bindings',
+    });
     jsBinding = Option.String('--js', {
-        description: 'Path and filename of generated JS binding file. Only works with `--platform` flag. Relative to `--output_dir`.',
+        description: 'Path and filename of generated JS binding file. Only works with `--platform` flag. Relative to `--output-dir`.',
     });
     noJsBinding = Option.Boolean('--no-js', {
         description: 'Whether to disable the generation JS binding file. Only works with `--platform` flag.',
     });
     dts = Option.String('--dts', {
-        description: 'Path and filename of generated type def file. Relative to `--output_dir`',
+        description: 'Path and filename of generated type def file. Relative to `--output-dir`',
     });
     dtsHeader = Option.String('--dts-header', {
         description: 'Custom file header for generated type def file. Only works when `typedef` feature enabled.',
@@ -69,8 +75,11 @@ export class BaseBuildCommand extends Command {
     useCross = Option.Boolean('--use-cross', {
         description: '[experimental] use [cross](https://github.com/cross-rs/cross) instead of `cargo`',
     });
+    useNapiCross = Option.Boolean('--use-napi-cross', {
+        description: '[experimental] use @napi-rs/cross-toolchain to cross-compile Linux arm/arm64/x64 gnu targets.',
+    });
     watch = Option.Boolean('--watch,-w', {
-        description: 'watch the crate changes and build continiously with `cargo-watch` crates',
+        description: 'watch the crate changes and build continuously with `cargo-watch` crates',
     });
     features = Option.Array('--features,-F', {
         description: 'Space-separated list of features to activate',
@@ -86,11 +95,13 @@ export class BaseBuildCommand extends Command {
             target: this.target,
             cwd: this.cwd,
             manifestPath: this.manifestPath,
+            configPath: this.configPath,
             packageJsonPath: this.packageJsonPath,
             targetDir: this.targetDir,
             outputDir: this.outputDir,
             platform: this.platform,
             jsPackageName: this.jsPackageName,
+            constEnum: this.constEnum,
             jsBinding: this.jsBinding,
             noJsBinding: this.noJsBinding,
             dts: this.dts,
@@ -104,6 +115,7 @@ export class BaseBuildCommand extends Command {
             profile: this.profile,
             crossCompile: this.crossCompile,
             useCross: this.useCross,
+            useNapiCross: this.useNapiCross,
             watch: this.watch,
             features: this.features,
             allFeatures: this.allFeatures,

package/dist/def/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/def/build.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/def/build.ts"],"names":[],"mappings":"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"}