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

package/dist/api/build.js

@@ -207,6 +207,10 @@ class Builder {
     setEnvs() {
         // type definition intermediate file
         this.envs.TYPE_DEF_TMP_PATH = this.getIntermediateTypeFile();
+        // WASI register intermediate file
+        this.envs.WASI_REGISTER_TMP_PATH = this.getIntermediateWasiRegisterFile();
+        // TODO:
+        //   remove after napi-derive@v3 release
         this.envs.CARGO_CFG_NAPI_RS_CLI_VERSION = CLI_VERSION;
         // RUSTFLAGS
         let rustflags = process.env.RUSTFLAGS ?? process.env.CARGO_BUILD_RUSTFLAGS ?? '';
@@ -222,11 +226,16 @@ class Builder {
         }
         // END RUSTFLAGS
         // LINKER
-        const linker = getTargetLinker(this.target.triple);
-        if (linker &&
-            !process.env.RUSTC_LINKER &&
-            !process.env[`CARGET_TARGET_${targetToEnvVar(this.target.triple)}_LINKER`]) {
-            this.envs.RUSTC_LINKER = linker;
+        const linker = this.options.crossCompile
+            ? void 0
+            : getTargetLinker(this.target.triple);
+        // TODO:
+        //   directly set CARGO_TARGET_<target>_LINKER will cover .cargo/config.toml
+        //   will detect by cargo config when it becomes stable
+        //   see: https://github.com/rust-lang/cargo/issues/9301
+        const linkerEnv = `CARGO_TARGET_${targetToEnvVar(this.target.triple)}_LINKER`;
+        if (linker && !process.env[linkerEnv]) {
+            this.envs[linkerEnv] = linker;
         }
         if (this.target.platform === 'android') {
             const { ANDROID_NDK_LATEST_HOME } = process.env;
@@ -290,6 +299,13 @@ class Builder {
             .digest('hex')
             .substring(0, 8)}.napi_type_def.tmp`);
     }
+    getIntermediateWasiRegisterFile() {
+        return join(tmpdir(), `${this.crate.name}-${createHash('sha256')
+            .update(this.crate.manifest_path)
+            .update(CLI_VERSION)
+            .digest('hex')
+            .substring(0, 8)}.napi_wasi_register.tmp`);
+    }
     async postBuild() {
         try {
             debug(`Try to create output directory:`);

package/dist/api/templates/ci-template.js

@@ -71,7 +71,7 @@ jobs:
               sudo apt-get update
               sudo apt-get install gcc-arm-linux-gnueabihf -y
             build: |
-              yarn build --platform --target armv7-unknown-linux-gnueabihf
+              yarn build --platform --target armv7-unknown-linux-gnueabihf --cross-compile
               arm-linux-gnueabihf-strip *.node
           - host: ubuntu-latest
             target: 'aarch64-linux-android'
@@ -237,7 +237,7 @@ jobs:
             target: 'x86_64-apple-darwin'
           - host: windows-latest
             target: 'x86_64-pc-windows-msvc'
-        node: ['14', '16', '18']
+        node: ['16', '18']
     runs-on: \${{ matrix.settings.host }}
 
     steps:
@@ -273,7 +273,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14', '16', '18']
+        node: ['16', '18']
     runs-on: ubuntu-latest
 
     steps:
@@ -309,7 +309,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14', '16', '18']
+        node: ['16', '18']
     runs-on: ubuntu-latest
 
     steps:
@@ -347,7 +347,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14', '16', '18']
+        node: ['16', '18']
     runs-on: ubuntu-latest
 
     steps:
@@ -433,7 +433,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14', '16', '18']
+        node: ['16', '18']
     runs-on: ubuntu-latest
 
     steps:
@@ -493,15 +493,15 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: bindings-x86_64-apple-darwin
-          path: artifacts
+          path: .
       - name: Download macOS arm64 artifact
         uses: actions/download-artifact@v3
         with:
           name: bindings-aarch64-apple-darwin
-          path: artifacts
+          path: .
 
       - name: Combine binaries
-        run: yarn universal
+        run: yarn napi universalize
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3

package/dist/api/templates/package.json.js

@@ -9,18 +9,17 @@ export const createPackageJson = ({ name, binaryName, targets, license, engineRe
     "node": "${engineRequirement}"
   },
   "napi": {
-    "name": "${binaryName}",
+    "binaryName": "${binaryName}",
     "targets": [
       ${targets.map((t) => `"${t}"`).join(',\n      ')}
     ]
   },
   "scripts": {
-    "test": "yarn build:debug --platform && node -e \\"assert(require('.').sum(1, 2) === 3)\\"",
+    "test": "node -e \\"assert(require('.').sum(1, 2) === 3)\\"",
     "build": "napi build --release --platform --strip",
     "build:debug": "napi build",
     "prepublishOnly": "napi prepublish -t npm",
     "artifacts": "napi artifacts",
-    "universal": "napi universal",
     "version": "napi version"
   },
   "devDependencies": {

package/dist/index.cjs

@@ -12997,7 +12997,7 @@ var import_fs = require("fs");
 var import_module = require("module");
 var import_util = require("util");
 var require2 = (0, import_module.createRequire)(__filename);
-var pkgJson = require2("../../package.json");
+var pkgJson = require2("@napi-rs/cli/package.json");
 var readFileAsync = (0, import_util.promisify)(import_fs.readFile);
 var writeFileAsync = (0, import_util.promisify)(import_fs.writeFile);
 var unlinkAsync = (0, import_util.promisify)(import_fs.unlink);
@@ -13050,8 +13050,6 @@ var DEFAULT_TARGETS = [
   "x86_64-unknown-linux-gnu"
 ];
 var TARGET_LINKER = {
-  "aarch64-unknown-linux-gnu": "aarch64-linux-gnu-gcc",
-  "armv7-unknown-linux-gnueabihf": "arm-linux-gnueabihf-gcc",
   "aarch64-unknown-linux-musl": "aarch64-linux-musl-gcc"
 };
 var CpuToNodeArch = {
@@ -18809,7 +18807,7 @@ jobs:
               sudo apt-get update
               sudo apt-get install gcc-arm-linux-gnueabihf -y
             build: |
-              yarn build --platform --target armv7-unknown-linux-gnueabihf
+              yarn build --platform --target armv7-unknown-linux-gnueabihf --cross-compile
               arm-linux-gnueabihf-strip *.node
           - host: ubuntu-latest
             target: 'aarch64-linux-android'
@@ -18978,7 +18976,7 @@ jobs:
             target: 'x86_64-apple-darwin'
           - host: windows-latest
             target: 'x86_64-pc-windows-msvc'
-        node: ['14', '16', '18']
+        node: ['16', '18']
     runs-on: \${{ matrix.settings.host }}
 
     steps:
@@ -19014,7 +19012,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14', '16', '18']
+        node: ['16', '18']
     runs-on: ubuntu-latest
 
     steps:
@@ -19050,7 +19048,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14', '16', '18']
+        node: ['16', '18']
     runs-on: ubuntu-latest
 
     steps:
@@ -19088,7 +19086,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14', '16', '18']
+        node: ['16', '18']
     runs-on: ubuntu-latest
 
     steps:
@@ -19174,7 +19172,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14', '16', '18']
+        node: ['16', '18']
     runs-on: ubuntu-latest
 
     steps:
@@ -19234,15 +19232,15 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: bindings-x86_64-apple-darwin
-          path: artifacts
+          path: .
       - name: Download macOS arm64 artifact
         uses: actions/download-artifact@v3
         with:
           name: bindings-aarch64-apple-darwin
-          path: artifacts
+          path: .
 
       - name: Combine binaries
-        run: yarn universal
+        run: yarn napi universalize
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3
@@ -19411,18 +19409,17 @@ var createPackageJson = ({ name, binaryName, targets, license, engineRequirement
     "node": "${engineRequirement}"
   },
   "napi": {
-    "name": "${binaryName}",
+    "binaryName": "${binaryName}",
     "targets": [
       ${targets.map((t) => `"${t}"`).join(",\n      ")}
     ]
   },
   "scripts": {
-    "test": "yarn build:debug --platform && node -e \\"assert(require('.').sum(1, 2) === 3)\\"",
+    "test": "node -e \\"assert(require('.').sum(1, 2) === 3)\\"",
     "build": "napi build --release --platform --strip",
     "build:debug": "napi build",
     "prepublishOnly": "napi prepublish -t npm",
     "artifacts": "napi artifacts",
-    "universal": "napi universal",
     "version": "napi version"
   },
   "devDependencies": {
@@ -19713,6 +19710,7 @@ 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;
     let rustflags = process.env.RUSTFLAGS ?? process.env.CARGO_BUILD_RUSTFLAGS ?? "";
     if (this.target.abi?.includes("musl") && !rustflags.includes("target-feature=-crt-static")) {
@@ -19724,9 +19722,10 @@ var Builder = class {
     if (rustflags.length) {
       this.envs.RUSTFLAGS = rustflags;
     }
-    const linker = getTargetLinker(this.target.triple);
-    if (linker && !process.env.RUSTC_LINKER && !process.env[`CARGET_TARGET_${targetToEnvVar(this.target.triple)}_LINKER`]) {
-      this.envs.RUSTC_LINKER = linker;
+    const linker = this.options.crossCompile ? void 0 : getTargetLinker(this.target.triple);
+    const linkerEnv = `CARGO_TARGET_${targetToEnvVar(this.target.triple)}_LINKER`;
+    if (linker && !process.env[linkerEnv]) {
+      this.envs[linkerEnv] = linker;
     }
     if (this.target.platform === "android") {
       const { ANDROID_NDK_LATEST_HOME } = process.env;
@@ -19783,6 +19782,9 @@ var Builder = class {
   getIntermediateTypeFile() {
     return (0, import_path2.join)((0, import_os.tmpdir)(), `${this.crate.name}-${(0, import_crypto.createHash)("sha256").update(this.crate.manifest_path).update(CLI_VERSION).digest("hex").substring(0, 8)}.napi_type_def.tmp`);
   }
+  getIntermediateWasiRegisterFile() {
+    return (0, import_path2.join)((0, import_os.tmpdir)(), `${this.crate.name}-${(0, import_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:`);

package/dist/utils/misc.js

@@ -3,7 +3,12 @@ import { createRequire } from 'module';
 import { promisify } from 'util';
 import { debug } from './log.js';
 const require = createRequire(import.meta.url);
-const pkgJson = require('../../package.json');
+// NOTE:
+//   import pkgJson from '@napi-rs/cli/package.json' assert { type: 'json' }
+//   is experimental feature now, avoid using it.
+//   see: https://nodejs.org/api/esm.html#import-assertions
+// eslint-disable-next-line import/no-extraneous-dependencies
+const pkgJson = require('@napi-rs/cli/package.json');
 export const readFileAsync = promisify(readFile);
 export const writeFileAsync = promisify(writeFile);
 export const unlinkAsync = promisify(unlink);

package/dist/utils/target.js

@@ -21,8 +21,6 @@ export const DEFAULT_TARGETS = [
     'x86_64-unknown-linux-gnu',
 ];
 export const TARGET_LINKER = {
-    'aarch64-unknown-linux-gnu': 'aarch64-linux-gnu-gcc',
-    'armv7-unknown-linux-gnueabihf': 'arm-linux-gnueabihf-gcc',
     'aarch64-unknown-linux-musl': 'aarch64-linux-musl-gcc',
 };
 const CpuToNodeArch = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/cli",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-alpha.3",
   "description": "Cli tools for napi-rs",
   "author": "LongYinan <lynweklm@gmail.com>",
   "homepage": "https://github.com/napi-rs/napi-rs",
@@ -96,5 +96,5 @@
     "build:cjs": "node ./esbuild.mjs",
     "test": "ava"
   },
-  "gitHead": "5daf558ead65b27ffd6b1da318ba91467d7445c3"
+  "gitHead": "b5c3c0575559f9c99d7747f3163476afe7e89a6c"
 }

package/src/api/build.ts

@@ -297,6 +297,10 @@ class Builder {
   private setEnvs() {
     // type definition intermediate file
     this.envs.TYPE_DEF_TMP_PATH = this.getIntermediateTypeFile()
+    // WASI register intermediate file
+    this.envs.WASI_REGISTER_TMP_PATH = this.getIntermediateWasiRegisterFile()
+    // TODO:
+    //   remove after napi-derive@v3 release
     this.envs.CARGO_CFG_NAPI_RS_CLI_VERSION = CLI_VERSION
 
     // RUSTFLAGS
@@ -320,13 +324,18 @@ class Builder {
     // END RUSTFLAGS
 
     // LINKER
-    const linker = getTargetLinker(this.target.triple)
-    if (
-      linker &&
-      !process.env.RUSTC_LINKER &&
-      !process.env[`CARGET_TARGET_${targetToEnvVar(this.target.triple)}_LINKER`]
-    ) {
-      this.envs.RUSTC_LINKER = linker
+    const linker = this.options.crossCompile
+      ? void 0
+      : getTargetLinker(this.target.triple)
+    // TODO:
+    //   directly set CARGO_TARGET_<target>_LINKER will cover .cargo/config.toml
+    //   will detect by cargo config when it becomes stable
+    //   see: https://github.com/rust-lang/cargo/issues/9301
+    const linkerEnv = `CARGO_TARGET_${targetToEnvVar(
+      this.target.triple,
+    )}_LINKER`
+    if (linker && !process.env[linkerEnv]) {
+      this.envs[linkerEnv] = linker
     }
 
     if (this.target.platform === 'android') {
@@ -410,6 +419,17 @@ class Builder {
     )
   }
 
+  private getIntermediateWasiRegisterFile() {
+    return join(
+      tmpdir(),
+      `${this.crate.name}-${createHash('sha256')
+        .update(this.crate.manifest_path)
+        .update(CLI_VERSION)
+        .digest('hex')
+        .substring(0, 8)}.napi_wasi_register.tmp`,
+    )
+  }
+
   private async postBuild() {
     try {
       debug(`Try to create output directory:`)

package/src/api/templates/ci-template.ts

@@ -71,7 +71,7 @@ jobs:
               sudo apt-get update
               sudo apt-get install gcc-arm-linux-gnueabihf -y
             build: |
-              yarn build --platform --target armv7-unknown-linux-gnueabihf
+              yarn build --platform --target armv7-unknown-linux-gnueabihf --cross-compile
               arm-linux-gnueabihf-strip *.node
           - host: ubuntu-latest
             target: 'aarch64-linux-android'
@@ -237,7 +237,7 @@ jobs:
             target: 'x86_64-apple-darwin'
           - host: windows-latest
             target: 'x86_64-pc-windows-msvc'
-        node: ['14', '16', '18']
+        node: ['16', '18']
     runs-on: \${{ matrix.settings.host }}
 
     steps:
@@ -273,7 +273,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14', '16', '18']
+        node: ['16', '18']
     runs-on: ubuntu-latest
 
     steps:
@@ -309,7 +309,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14', '16', '18']
+        node: ['16', '18']
     runs-on: ubuntu-latest
 
     steps:
@@ -347,7 +347,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14', '16', '18']
+        node: ['16', '18']
     runs-on: ubuntu-latest
 
     steps:
@@ -433,7 +433,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14', '16', '18']
+        node: ['16', '18']
     runs-on: ubuntu-latest
 
     steps:
@@ -493,15 +493,15 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: bindings-x86_64-apple-darwin
-          path: artifacts
+          path: .
       - name: Download macOS arm64 artifact
         uses: actions/download-artifact@v3
         with:
           name: bindings-aarch64-apple-darwin
-          path: artifacts
+          path: .
 
       - name: Combine binaries
-        run: yarn universal
+        run: yarn napi universalize
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3

package/src/api/templates/package.json.ts

@@ -23,18 +23,17 @@ export const createPackageJson = ({
     "node": "${engineRequirement}"
   },
   "napi": {
-    "name": "${binaryName}",
+    "binaryName": "${binaryName}",
     "targets": [
       ${targets.map((t) => `"${t}"`).join(',\n      ')}
     ]
   },
   "scripts": {
-    "test": "yarn build:debug --platform && node -e \\"assert(require('.').sum(1, 2) === 3)\\"",
+    "test": "node -e \\"assert(require('.').sum(1, 2) === 3)\\"",
     "build": "napi build --release --platform --strip",
     "build:debug": "napi build",
     "prepublishOnly": "napi prepublish -t npm",
     "artifacts": "napi artifacts",
-    "universal": "napi universal",
     "version": "napi version"
   },
   "devDependencies": {

package/src/utils/misc.ts

@@ -5,7 +5,12 @@ import { promisify } from 'util'
 import { debug } from './log.js'
 
 const require = createRequire(import.meta.url)
-const pkgJson = require('../../package.json')
+// NOTE:
+//   import pkgJson from '@napi-rs/cli/package.json' assert { type: 'json' }
+//   is experimental feature now, avoid using it.
+//   see: https://nodejs.org/api/esm.html#import-assertions
+// eslint-disable-next-line import/no-extraneous-dependencies
+const pkgJson = require('@napi-rs/cli/package.json')
 
 export const readFileAsync = promisify(readFile)
 export const writeFileAsync = promisify(writeFile)

package/src/utils/target.ts

@@ -26,8 +26,6 @@ export const DEFAULT_TARGETS = [
 ] as const
 
 export const TARGET_LINKER: Record<string, string> = {
-  'aarch64-unknown-linux-gnu': 'aarch64-linux-gnu-gcc',
-  'armv7-unknown-linux-gnueabihf': 'arm-linux-gnueabihf-gcc',
   'aarch64-unknown-linux-musl': 'aarch64-linux-musl-gcc',
 }