@napi-rs/cli 3.0.0-alpha.3 → 3.0.0-alpha.30

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 || (NapiVersion = {}));
+    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);
@@ -52,8 +54,9 @@ function toEngineRequirement(versions) {
         req += `${i === 0 ? '' : ' || '}>= ${v.major}.${v.minor}.${v.patch}`;
         requirements.push(req);
     });
-    return requirements.join(' && ');
+    return requirements.join(' ');
 }
 export function napiEngineRequirement(napiVersion) {
     return toEngineRequirement(requiredNodeVersions(napiVersion));
 }
+//# sourceMappingURL=version.js.map

package/dist/utils/version.js.map

@@ -0,0 +1 @@
+{"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.3",
+  "version": "3.0.0-alpha.30",
   "description": "Cli tools for napi-rs",
   "author": "LongYinan <lynweklm@gmail.com>",
   "homepage": "https://github.com/napi-rs/napi-rs",
@@ -67,24 +67,51 @@
     "url": "https://github.com/napi-rs/napi-rs/issues"
   },
   "dependencies": {
-    "@octokit/rest": "^19.0.7",
-    "clipanion": "^3.2.0",
-    "colorette": "^2.0.19",
+    "@napi-rs/cross-toolchain": "^0.0.14",
+    "@octokit/rest": "^20.0.2",
+    "@tybys/wasm-util": "0.8.0",
+    "clipanion": "^3.2.1",
+    "colorette": "^2.0.20",
     "debug": "^4.3.4",
-    "inquirer": "^9.1.5",
+    "emnapi": "0.45.0",
+    "inquirer": "^9.2.12",
     "js-yaml": "^4.1.0",
     "lodash-es": "^4.17.21",
-    "typanion": "^3.12.1"
+    "semver": "^7.5.4",
+    "toml": "^3.0.0",
+    "typanion": "^3.14.0"
   },
   "devDependencies": {
-    "@types/inquirer": "^9.0.3",
-    "@types/js-yaml": "^4.0.5",
-    "@types/lodash-es": "^4.17.6",
-    "ava": "^5.2.0",
-    "esbuild": "^0.17.14",
-    "prettier": "^2.8.7",
+    "@emnapi/core": "^0.45.0",
+    "@emnapi/runtime": "^0.45.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.10.5",
+    "ava": "^6.0.0",
+    "env-paths": "^3.0.0",
+    "esbuild": "^0.19.8",
+    "prettier": "^3.1.0",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.4"
+    "tslib": "^2.6.2",
+    "typescript": "^5.3.2"
+  },
+  "peerDependencies": {
+    "@emnapi/runtime": "^0.45.0",
+    "@tybys/wasm-util": "^0.8.0",
+    "emnapi": "^0.45.0"
+  },
+  "peerDependenciesMeta": {
+    "@emnapi/runtime": {
+      "optional": true
+    },
+    "@tybys/wasm-util": {
+      "optional": true
+    },
+    "emnapi": {
+      "optional": true
+    }
   },
   "funding": {
     "type": "github",
@@ -94,7 +121,15 @@
     "codegen": "node --loader ts-node/esm/transpile-only ./codegen/index.ts",
     "build": "tsc && yarn build:cjs",
     "build:cjs": "node ./esbuild.mjs",
-    "test": "ava"
+    "test": "node --loader ts-node/esm/transpile-only ../node_modules/ava/entrypoints/cli.mjs"
+  },
+  "ava": {
+    "extensions": {
+      "ts": "module"
+    },
+    "files": [
+      "**/__tests__/**/*.spec.ts"
+    ]
   },
-  "gitHead": "b5c3c0575559f9c99d7747f3163476afe7e89a6c"
+  "gitHead": "1392954c32a08d38ca6110899c8b9ce39da1f57e"
 }

package/src/api/artifacts.ts

@@ -1,4 +1,4 @@
-import { join, parse, resolve } from 'path'
+import { join, parse } from 'node:path'
 
 import * as colors from 'colorette'
 
@@ -20,30 +20,33 @@ const debug = debugFactory('artifacts')
 export async function collectArtifacts(userOptions: ArtifactsOptions) {
   const options = applyDefaultArtifactsOptions(userOptions)
 
-  const packageJsonPath = resolve(options.cwd, options.packageJsonPath)
+  const packageJsonPath = join(options.cwd, options.packageJsonPath)
   const { targets, binaryName } = 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) => {
           debug.info(`Read [${colors.yellowBright(filePath)}]`)
           const sourceContent = await readFileAsync(filePath)
           const parsedName = parse(filePath)
-          const [_binaryName, platformArchABI] = parsedName.name.split('.')
+          const terms = parsedName.name.split('.')
+          const platformArchABI = terms.pop()!
+          const _binaryName = terms.join('.')
+
           if (_binaryName !== binaryName) {
             debug.warn(
               `[${_binaryName}] is not matched with [${binaryName}], skip`,
@@ -77,17 +80,58 @@ 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`,
+    )
+    debug.info(
+      `Move wasi cjs 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),
+    )
+  }
 }
 
 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
 }