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

package/dist/utils/version.d.ts

@@ -6,6 +6,7 @@ export declare enum NapiVersion {
     Napi5 = 5,
     Napi6 = 6,
     Napi7 = 7,
-    Napi8 = 8
+    Napi8 = 8,
+    Napi9 = 9
 }
 export declare function napiEngineRequirement(napiVersion: NapiVersion): string;

package/dist/utils/version.js

@@ -8,19 +8,21 @@ export var NapiVersion;
     NapiVersion[NapiVersion["Napi6"] = 6] = "Napi6";
     NapiVersion[NapiVersion["Napi7"] = 7] = "Napi7";
     NapiVersion[NapiVersion["Napi8"] = 8] = "Napi8";
+    NapiVersion[NapiVersion["Napi9"] = 9] = "Napi9";
 })(NapiVersion || (NapiVersion = {}));
 /// because node support new napi version in some minor version updates, so we might meet such situation:
 /// `node v10.20.0` supports `napi5` and `napi6`, but `node v12.0.0` only support `napi4`,
-/// by which, we can not tell directly napi version supportness from node version directly.
+/// by which, we can not tell directly napi version supportless from node version directly.
 const NAPI_VERSION_MATRIX = new Map([
-    [NapiVersion.Napi1, '8.6.0'],
-    [NapiVersion.Napi2, '8.10.0 | 9.3.0'],
-    [NapiVersion.Napi3, '6.14.2 | 8.11.2 | 9.11.0'],
-    [NapiVersion.Napi4, '10.16.0 | 11.8.0'],
-    [NapiVersion.Napi5, '10.17.0 | 12.11.0'],
+    [NapiVersion.Napi1, '8.6.0 | 9.0.0 | 10.0.0'],
+    [NapiVersion.Napi2, '8.10.0 | 9.3.0 | 10.0.0'],
+    [NapiVersion.Napi3, '6.14.2 | 8.11.2 | 9.11.0 | 10.0.0'],
+    [NapiVersion.Napi4, '10.16.0 | 11.8.0 | 12.0.0'],
+    [NapiVersion.Napi5, '10.17.0 | 12.11.0 | 13.0.0'],
     [NapiVersion.Napi6, '10.20.0 | 12.17.0 | 14.0.0'],
-    [NapiVersion.Napi7, '10.23.0 | 12.19.0 | 14.12.0'],
-    [NapiVersion.Napi8, '12.22.0 | 14.17.0 | 15.12.0'],
+    [NapiVersion.Napi7, '10.23.0 | 12.19.0 | 14.12.0 | 15.0.0'],
+    [NapiVersion.Napi8, '12.22.0 | 14.17.0 | 15.12.0 | 16.0.0'],
+    [NapiVersion.Napi9, '18.17.0 | 20.3.0 | 21.1.0'],
 ]);
 function parseNodeVersion(v) {
     const matches = v.match(/v?([0-9]+)\.([0-9]+)\.([0-9]+)/i);

package/dist/utils/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,WASX;AATD,WAAY,WAAW;IACrB,+CAAS,CAAA;IACT,+CAAK,CAAA;IACL,+CAAK,CAAA;IACL,+CAAK,CAAA;IACL,+CAAK,CAAA;IACL,+CAAK,CAAA;IACL,+CAAK,CAAA;IACL,+CAAK,CAAA;AACP,CAAC,EATW,WAAW,KAAX,WAAW,QAStB;AAED,yGAAyG;AACzG,0FAA0F;AAC1F,2FAA2F;AAC3F,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAsB;IACvD,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC;IAC5B,CAAC,WAAW,CAAC,KAAK,EAAE,gBAAgB,CAAC;IACrC,CAAC,WAAW,CAAC,KAAK,EAAE,0BAA0B,CAAC;IAC/C,CAAC,WAAW,CAAC,KAAK,EAAE,kBAAkB,CAAC;IACvC,CAAC,WAAW,CAAC,KAAK,EAAE,mBAAmB,CAAC;IACxC,CAAC,WAAW,CAAC,KAAK,EAAE,4BAA4B,CAAC;IACjD,CAAC,WAAW,CAAC,KAAK,EAAE,6BAA6B,CAAC;IAClD,CAAC,WAAW,CAAC,KAAK,EAAE,6BAA6B,CAAC;CACnD,CAAC,CAAA;AAQF,SAAS,gBAAgB,CAAC,CAAS;IACjC,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAA;IAE1D,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,CAAC,CAAC,CAAA;KACrD;IAED,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,OAAO,CAAA;IAEvC,OAAO;QACL,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;QACtB,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;QACtB,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;KACvB,CAAA;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,WAAwB;IACpD,MAAM,WAAW,GAAG,mBAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;IAExD,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAA;KACpC;IAED,OAAO,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;AACrD,CAAC;AAED,SAAS,mBAAmB,CAAC,QAAuB;IAClD,MAAM,YAAY,GAAa,EAAE,CAAA;IACjC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACxB,IAAI,GAAG,GAAG,EAAE,CAAA;QACZ,IAAI,CAAC,KAAK,CAAC,EAAE;YACX,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;YACnC,GAAG,IAAI,KAAK,WAAW,CAAC,KAAK,GAAG,CAAC,EAAE,CAAA;SACpC;QAED,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,EAAE,CAAA;QACpE,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACxB,CAAC,CAAC,CAAA;IAEF,OAAO,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC/B,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,WAAwB;IAC5D,OAAO,mBAAmB,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC,CAAA;AAC/D,CAAC"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/cli",
-  "version": "3.0.0-alpha.6",
+  "version": "3.0.0-alpha.60",
   "description": "Cli tools for napi-rs",
   "author": "LongYinan <lynweklm@gmail.com>",
   "homepage": "https://github.com/napi-rs/napi-rs",
@@ -67,45 +67,46 @@
     "url": "https://github.com/napi-rs/napi-rs/issues"
   },
   "dependencies": {
-    "@octokit/rest": "^20.0.2",
-    "@tybys/wasm-util": "0.8.0",
+    "@napi-rs/cross-toolchain": "^0.0.16",
+    "@napi-rs/wasm-tools": "^0.0.2",
+    "@octokit/rest": "^21.0.0",
     "clipanion": "^3.2.1",
     "colorette": "^2.0.20",
     "debug": "^4.3.4",
-    "emnapi": "0.43.1",
-    "inquirer": "^9.2.11",
+    "emnapi": "^1.2.0",
+    "inquirer": "^10.0.0",
     "js-yaml": "^4.1.0",
     "lodash-es": "^4.17.21",
+    "semver": "^7.5.4",
     "toml": "^3.0.0",
-    "typanion": "^3.14.0"
+    "typanion": "^3.14.0",
+    "wasm-sjlj": "^1.0.5"
   },
   "devDependencies": {
-    "@emnapi/core": "0.43.1",
-    "@emnapi/runtime": "0.43.1",
-    "@types/debug": "^4.1.10",
-    "@types/inquirer": "^9.0.6",
-    "@types/js-yaml": "^4.0.8",
-    "@types/lodash-es": "^4.17.10",
-    "ava": "^5.3.1",
+    "@emnapi/core": "^1.1.0",
+    "@emnapi/runtime": "^1.1.0",
+    "@types/debug": "^4.1.12",
+    "@types/inquirer": "^9.0.7",
+    "@types/js-yaml": "^4.0.9",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^20.11.13",
+    "@types/semver": "^7.5.8",
+    "ava": "^6.1.1",
     "env-paths": "^3.0.0",
-    "esbuild": "^0.19.5",
-    "prettier": "^3.0.3",
-    "ts-node": "^10.9.1",
+    "esbuild": "^0.23.0",
+    "prettier": "^3.2.4",
+    "ts-node": "^10.9.2",
     "tslib": "^2.6.2",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.4"
   },
   "peerDependencies": {
-    "@emnapi/runtime": "0.43.1",
-    "@tybys/wasm-util": "0.8.0",
-    "emnapi": "0.43.1"
+    "@emnapi/runtime": "^1.1.0",
+    "emnapi": "^1.1.0"
   },
   "peerDependenciesMeta": {
     "@emnapi/runtime": {
       "optional": true
     },
-    "@tybys/wasm-util": {
-      "optional": true
-    },
     "emnapi": {
       "optional": true
     }
@@ -128,5 +129,5 @@
       "**/__tests__/**/*.spec.ts"
     ]
   },
-  "gitHead": "be755a1d51cb164fd0288d32a6b9ae7b4416449c"
+  "gitHead": "ac75ffb7fc6902033924a675d334618f67a39612"
 }

package/src/api/artifacts.ts

@@ -1,4 +1,4 @@
-import { join, parse, resolve } from 'node:path'
+import { join, parse } from 'node:path'
 
 import * as colors from 'colorette'
 
@@ -20,23 +20,24 @@ const debug = debugFactory('artifacts')
 export async function collectArtifacts(userOptions: ArtifactsOptions) {
   const options = applyDefaultArtifactsOptions(userOptions)
 
-  const packageJsonPath = resolve(options.cwd, options.packageJsonPath)
-  const { targets, binaryName } = await readNapiConfig(packageJsonPath)
+  const packageJsonPath = join(options.cwd, options.packageJsonPath)
+  const { targets, binaryName, packageName } =
+    await readNapiConfig(packageJsonPath)
 
   const distDirs = targets.map((platform) =>
-    resolve(options.cwd, options.npmDir, platform.platformArchABI),
+    join(options.cwd, options.npmDir, platform.platformArchABI),
   )
 
   const universalSourceBins = new Set(
     targets
       .filter((platform) => platform.arch === 'universal')
-      .flatMap(
-        (p) => UniArchsByPlatform[p.platform]?.map((a) => `${p.platform}-${a}`),
+      .flatMap((p) =>
+        UniArchsByPlatform[p.platform]?.map((a) => `${p.platform}-${a}`),
       )
       .filter(Boolean) as string[],
   )
 
-  await collectNodeBinaries(resolve(options.cwd, options.outputDir)).then(
+  await collectNodeBinaries(join(options.cwd, options.outputDir)).then(
     (output) =>
       Promise.all(
         output.map(async (filePath) => {
@@ -80,17 +81,88 @@ export async function collectArtifacts(userOptions: ArtifactsOptions) {
         }),
       ),
   )
+
+  const wasiTarget = targets.find((t) => t.platform === 'wasi')
+  if (wasiTarget) {
+    const wasiDir = join(
+      options.cwd,
+      options.npmDir,
+      wasiTarget.platformArchABI,
+    )
+    const cjsFile = join(
+      options.buildOutputDir ?? options.cwd,
+      `${binaryName}.wasi.cjs`,
+    )
+    const workerFile = join(
+      options.buildOutputDir ?? options.cwd,
+      `wasi-worker.mjs`,
+    )
+    const browserEntry = join(
+      options.buildOutputDir ?? options.cwd,
+      `${binaryName}.wasi-browser.js`,
+    )
+    const browserWorkerFile = join(
+      options.buildOutputDir ?? options.cwd,
+      `wasi-worker-browser.mjs`,
+    )
+    debug.info(
+      `Move wasi binding file [${colors.yellowBright(
+        cjsFile,
+      )}] to [${colors.yellowBright(wasiDir)}]`,
+    )
+    await writeFileAsync(
+      join(wasiDir, `${binaryName}.wasi.cjs`),
+      await readFileAsync(cjsFile),
+    )
+    debug.info(
+      `Move wasi worker file [${colors.yellowBright(
+        workerFile,
+      )}] to [${colors.yellowBright(wasiDir)}]`,
+    )
+    await writeFileAsync(
+      join(wasiDir, `wasi-worker.mjs`),
+      await readFileAsync(workerFile),
+    )
+    debug.info(
+      `Move wasi browser entry file [${colors.yellowBright(
+        browserEntry,
+      )}] to [${colors.yellowBright(wasiDir)}]`,
+    )
+    await writeFileAsync(
+      join(wasiDir, `${binaryName}.wasi-browser.js`),
+      // https://github.com/vitejs/vite/issues/8427
+      (await readFileAsync(browserEntry, 'utf8')).replace(
+        `new URL('./wasi-worker-browser.mjs', import.meta.url)`,
+        `new URL('${packageName}-wasm32-wasi/wasi-worker-browser.mjs', import.meta.url)`,
+      ),
+    )
+    debug.info(
+      `Move wasi browser worker file [${colors.yellowBright(
+        browserWorkerFile,
+      )}] to [${colors.yellowBright(wasiDir)}]`,
+    )
+    await writeFileAsync(
+      join(wasiDir, `wasi-worker-browser.mjs`),
+      await readFileAsync(browserWorkerFile),
+    )
+  }
 }
 
 async function collectNodeBinaries(root: string) {
   const files = await readdirAsync(root, { withFileTypes: true })
   const nodeBinaries = files
-    .filter((file) => file.isFile() && file.name.endsWith('.node'))
+    .filter(
+      (file) =>
+        file.isFile() &&
+        (file.name.endsWith('.node') || file.name.endsWith('.wasm')),
+    )
     .map((file) => join(root, file.name))
 
   const dirs = files.filter((file) => file.isDirectory())
   for (const dir of dirs) {
-    nodeBinaries.push(...(await collectNodeBinaries(join(root, dir.name))))
+    if (dir.name !== 'node_modules') {
+      nodeBinaries.push(...(await collectNodeBinaries(join(root, dir.name))))
+    }
   }
   return nodeBinaries
 }