@napi-rs/cli 3.0.0-alpha.2 → 3.0.0-alpha.4

package/dist/api/build.js

@@ -90,7 +90,8 @@ class Builder {
         debug('  %i', `cargo ${this.args.join(' ')}`);
         const controller = new AbortController();
         const buildTask = new Promise((resolve, reject) => {
-            const buildProcess = spawn('cargo', this.args, {
+            const command = process.env.CARGO ?? (this.options.useCross ? 'cross' : 'cargo');
+            const buildProcess = spawn(command, this.args, {
                 env: {
                     ...process.env,
                     ...this.envs,
@@ -287,6 +288,9 @@ class Builder {
         if (this.options.targetDir) {
             this.args.push('--target-dir', this.options.targetDir);
         }
+        if (this.options.profile) {
+            this.args.push('--profile', this.options.profile);
+        }
         if (this.options.cargoOptions?.length) {
             this.args.push(...this.options.cargoOptions);
         }
@@ -331,7 +335,9 @@ class Builder {
         if (!srcName || !destName) {
             return;
         }
-        const src = join(this.targetDir, this.target.triple, this.options.release ? 'release' : 'debug', srcName);
+        const profile = this.options.profile ?? (this.options.release ? 'release' : 'debug');
+        const src = join(this.targetDir, this.target.triple, profile, srcName);
+        debug(`Copy artifact from: [${src}]`);
         const dest = join(this.outputDir, destName);
         try {
             if (await fileExists(dest)) {

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'
@@ -94,6 +94,14 @@ jobs:
           - host: windows-latest
             target: 'aarch64-pc-windows-msvc'
             build: yarn build --platform --target aarch64-pc-windows-msvc
+          - host: ubuntu-latest
+            target: 'riscv64gc-unknown-linux-gnu'
+            setup: |
+              sudo apt-get update
+              sudo apt-get install gcc-riscv64-linux-gnu -y
+            build: |
+              yarn build --platform --target riscv64gc-unknown-linux-gnu
+              riscv64-linux-gnu-strip *.node
 
     name: stable - \${{ matrix.settings.target }} - node@18
     runs-on: \${{ matrix.settings.host }}
@@ -106,7 +114,6 @@ jobs:
         if: \${{ !matrix.settings.docker }}
         with:
           node-version: 18
-          check-latest: true
           cache: yarn
 
       - name: Install
@@ -150,7 +157,6 @@ jobs:
         if: matrix.settings.target == 'i686-pc-windows-msvc'
         with:
           node-version: 18
-          check-latest: true
           cache: yarn
           architecture: x86
 
@@ -237,7 +243,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:
@@ -247,7 +253,6 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: \${{ matrix.node }}
-          check-latest: true
           cache: 'yarn'
 
       - name: 'Install dependencies'
@@ -273,7 +278,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14', '16', '18']
+        node: ['16', '18']
     runs-on: ubuntu-latest
 
     steps:
@@ -283,7 +288,6 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: \${{ matrix.node }}
-          check-latest: true
           cache: 'yarn'
 
       - name: 'Install dependencies'
@@ -309,7 +313,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14', '16', '18']
+        node: ['16', '18']
     runs-on: ubuntu-latest
 
     steps:
@@ -319,7 +323,6 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: \${{ matrix.node }}
-          check-latest: true
           cache: 'yarn'
 
       - name: 'Install dependencies'
@@ -347,7 +350,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14', '16', '18']
+        node: ['16', '18']
     runs-on: ubuntu-latest
 
     steps:
@@ -368,7 +371,7 @@ jobs:
           yarn config set supportedArchitectures.cpu "arm64"
           yarn config set supportedArchitectures.libc "glibc"
           yarn install
-      
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
         with:
@@ -433,7 +436,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14', '16', '18']
+        node: ['16', '18']
     runs-on: ubuntu-latest
 
     steps:
@@ -483,7 +486,6 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          check-latest: true
           cache: yarn
 
       - name: 'Install dependencies'
@@ -493,15 +495,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
@@ -529,7 +531,6 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          check-latest: true
           cache: 'yarn'
 
       - name: 'Install dependencies'

package/dist/api/templates/js-binding.js

@@ -1,124 +1,257 @@
-/* eslint-disable @typescript-eslint/switch-exhaustiveness-check */
-function loadNapiModule(binaryName, packageName) {
-    const { existsSync, readFileSync } = require('fs');
-    const { join } = require('path');
-    const { platform, arch } = process;
-    const candidates = [];
-    function isMusl() {
-        // For Node 10
-        if (!process.report || typeof process.report.getReport !== 'function') {
-            try {
-                const lddPath = require('child_process')
-                    .execSync('which ldd')
-                    .toString()
-                    .trim();
-                return readFileSync(lddPath, 'utf8').includes('musl');
-            }
-            catch (e) {
-                return true;
-            }
+export function createJsBinding(localName, pkgName) {
+    return `// prettier-ignore
+/* tslint:disable */
+/* eslint-disable */
+
+/* auto-generated by NAPI-RS */
+
+const { existsSync, readFileSync } = require('fs')
+const { join } = require('path')
+
+const { platform, arch } = process
+
+let nativeBinding = null
+let localFileExisted = false
+let loadError = null
+
+function isMusl() {
+  // For Node 10
+  if (!process.report || typeof process.report.getReport !== 'function') {
+    try {
+      const lddPath = require('child_process').execSync('which ldd').toString().trim()
+      return readFileSync(lddPath, 'utf8').includes('musl')
+    } catch (e) {
+      return true
+    }
+  } else {
+    const { glibcVersionRuntime } = process.report.getReport().header
+    return !glibcVersionRuntime
+  }
+}
+
+switch (platform) {
+  case 'android':
+    switch (arch) {
+      case 'arm64':
+        localFileExisted = existsSync(join(__dirname, '${localName}.android-arm64.node'))
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./${localName}.android-arm64.node')
+          } else {
+            nativeBinding = require('${pkgName}-android-arm64')
+          }
+        } catch (e) {
+          loadError = e
         }
-        else {
-            // @ts-expect-error
-            const { glibcVersionRuntime } = process.report.getReport().header;
-            return !glibcVersionRuntime;
+        break
+      case 'arm':
+        localFileExisted = existsSync(join(__dirname, '${localName}.android-arm-eabi.node'))
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./${localName}.android-arm-eabi.node')
+          } else {
+            nativeBinding = require('${pkgName}-android-arm-eabi')
+          }
+        } catch (e) {
+          loadError = e
         }
+        break
+      default:
+        throw new Error(\`Unsupported architecture on Android \${arch}\`)
     }
-    switch (platform) {
-        case 'android':
-            switch (arch) {
-                case 'arm64':
-                    candidates.push('android-arm64');
-                    break;
-                case 'arm':
-                    candidates.push('android-arm-eabi');
-                    break;
-            }
-            break;
-        case 'win32':
-            switch (arch) {
-                case 'x64':
-                    candidates.push('win32-x64-msvc');
-                    break;
-                case 'ia32':
-                    candidates.push('win32-ia32-msvc');
-                    break;
-                case 'arm64':
-                    candidates.push('win32-arm64-msvc');
-                    break;
-            }
-            break;
-        case 'darwin':
-            candidates.push('darwin-universal');
-            switch (arch) {
-                case 'x64':
-                    candidates.push('darwin-x64');
-                    break;
-                case 'arm64':
-                    candidates.push('darwin-arm64');
-                    break;
-            }
-            break;
-        case 'freebsd':
-            if (arch === 'x64') {
-                candidates.push('freebsd-x64');
-            }
-            break;
-        case 'linux':
-            switch (arch) {
-                case 'x64':
-                    if (isMusl()) {
-                        candidates.push('linux-x64-musl');
-                    }
-                    else {
-                        candidates.push('linux-x64-gnu');
-                    }
-                    break;
-                case 'arm64':
-                    if (isMusl()) {
-                        candidates.push('linux-arm64-musl');
-                    }
-                    else {
-                        candidates.push('linux-arm64-gnu');
-                    }
-                    break;
-                case 'arm':
-                    candidates.push('linux-arm-gnueabihf');
-                    break;
-            }
-            break;
+    break
+  case 'win32':
+    switch (arch) {
+      case 'x64':
+        localFileExisted = existsSync(
+          join(__dirname, '${localName}.win32-x64-msvc.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./${localName}.win32-x64-msvc.node')
+          } else {
+            nativeBinding = require('${pkgName}-win32-x64-msvc')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'ia32':
+        localFileExisted = existsSync(
+          join(__dirname, '${localName}.win32-ia32-msvc.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./${localName}.win32-ia32-msvc.node')
+          } else {
+            nativeBinding = require('${pkgName}-win32-ia32-msvc')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'arm64':
+        localFileExisted = existsSync(
+          join(__dirname, '${localName}.win32-arm64-msvc.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./${localName}.win32-arm64-msvc.node')
+          } else {
+            nativeBinding = require('${pkgName}-win32-arm64-msvc')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(\`Unsupported architecture on Windows: \${arch}\`)
     }
-    let nativeBinding;
-    let loadError;
-    for (const suffix of candidates) {
-        const localPath = join(__dirname, `${binaryName}.${suffix}.node`);
-        const pkgPath = `${packageName}-${suffix}`;
+    break
+  case 'darwin':
+    localFileExisted = existsSync(join(__dirname, '${localName}.darwin-universal.node'))
+    try {
+      if (localFileExisted) {
+        nativeBinding = require('./${localName}.darwin-universal.node')
+      } else {
+        nativeBinding = require('${pkgName}-darwin-universal')
+      }
+      break
+    } catch {}
+    switch (arch) {
+      case 'x64':
+        localFileExisted = existsSync(join(__dirname, '${localName}.darwin-x64.node'))
         try {
-            if (existsSync(localPath)) {
-                nativeBinding = require(localPath);
+          if (localFileExisted) {
+            nativeBinding = require('./${localName}.darwin-x64.node')
+          } else {
+            nativeBinding = require('${pkgName}-darwin-x64')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'arm64':
+        localFileExisted = existsSync(
+          join(__dirname, '${localName}.darwin-arm64.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./${localName}.darwin-arm64.node')
+          } else {
+            nativeBinding = require('${pkgName}-darwin-arm64')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(\`Unsupported architecture on macOS: \${arch}\`)
+    }
+    break
+  case 'freebsd':
+    if (arch !== 'x64') {
+      throw new Error(\`Unsupported architecture on FreeBSD: \${arch}\`)
+    }
+    localFileExisted = existsSync(join(__dirname, '${localName}.freebsd-x64.node'))
+    try {
+      if (localFileExisted) {
+        nativeBinding = require('./${localName}.freebsd-x64.node')
+      } else {
+        nativeBinding = require('${pkgName}-freebsd-x64')
+      }
+    } catch (e) {
+      loadError = e
+    }
+    break
+  case 'linux':
+    switch (arch) {
+      case 'x64':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, '${localName}.linux-x64-musl.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./${localName}.linux-x64-musl.node')
+            } else {
+              nativeBinding = require('${pkgName}-linux-x64-musl')
             }
-            else {
-                nativeBinding = require(pkgPath);
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, '${localName}.linux-x64-gnu.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./${localName}.linux-x64-gnu.node')
+            } else {
+              nativeBinding = require('${pkgName}-linux-x64-gnu')
             }
+          } catch (e) {
+            loadError = e
+          }
         }
-        catch (e) {
-            loadError = e;
-            continue;
+        break
+      case 'arm64':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, '${localName}.linux-arm64-musl.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./${localName}.linux-arm64-musl.node')
+            } else {
+              nativeBinding = require('${pkgName}-linux-arm64-musl')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, '${localName}.linux-arm64-gnu.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./${localName}.linux-arm64-gnu.node')
+            } else {
+              nativeBinding = require('${pkgName}-linux-arm64-gnu')
+            }
+          } catch (e) {
+            loadError = e
+          }
         }
-        loadError = null;
-        break;
-    }
-    if (!nativeBinding) {
-        if (loadError) {
-            throw loadError;
+        break
+      case 'arm':
+        localFileExisted = existsSync(
+          join(__dirname, '${localName}.linux-arm-gnueabihf.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./${localName}.linux-arm-gnueabihf.node')
+          } else {
+            nativeBinding = require('${pkgName}-linux-arm-gnueabihf')
+          }
+        } catch (e) {
+          loadError = e
         }
-        throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`);
+        break
+      default:
+        throw new Error(\`Unsupported architecture on Linux: \${arch}\`)
     }
-    return nativeBinding;
+    break
+  default:
+    throw new Error(\`Unsupported OS: \${platform}, architecture: \${arch}\`)
+}
+
+if (!nativeBinding) {
+  if (loadError) {
+    throw loadError
+  }
+  throw new Error(\`Failed to load native binding\`)
 }
-export function createJsBinding(localName, pkgName) {
-    return `${loadNapiModule.toString()}
 
-module.exports = loadNapiModule('${localName}', '${pkgName}')
 `;
 }

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

@@ -15,12 +15,11 @@ export const createPackageJson = ({ name, binaryName, targets, license, engineRe
     ]
   },
   "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/commands/artifacts.js

@@ -1,7 +1,7 @@
 import { Command } from 'clipanion';
 import { collectArtifacts } from '../api/artifacts.js';
 import { BaseArtifactsCommand } from '../def/artifacts.js';
-export class ArtifactsCommand extends BaseArtifactsCommand {
+class ArtifactsCommand extends BaseArtifactsCommand {
     static usage = Command.Usage({
         description: 'Copy artifacts from Github Actions into specified dir',
         examples: [
@@ -17,3 +17,4 @@ e.g: index.linux-x64-gnu.node --> ./npm/linux-x64-gnu/index.node`,
         await collectArtifacts(this.getOptions());
     }
 }
+export { ArtifactsCommand };

package/dist/commands/help.js

@@ -4,9 +4,10 @@ import { Command } from 'clipanion';
  *
  * Paths: `-h`, `--help`
  */
-export class HelpCommand extends Command {
+class HelpCommand extends Command {
     static paths = [[`-h`], [`--help`]];
     async execute() {
         await this.context.stdout.write(this.cli.usage());
     }
 }
+export { HelpCommand };

package/dist/def/artifacts.js

@@ -1,7 +1,7 @@
 // This file is generated by codegen/index.ts
 // Do not edit this file manually
 import { Command, Option } from 'clipanion';
-export class BaseArtifactsCommand extends Command {
+class BaseArtifactsCommand extends Command {
     static paths = [['artifacts']];
     static usage = Command.Usage({
         description: 'Copy artifacts from Github Actions into npm packages and ready to publish',
@@ -27,6 +27,7 @@ export class BaseArtifactsCommand extends Command {
         };
     }
 }
+export { BaseArtifactsCommand };
 export function applyDefaultArtifactsOptions(options) {
     return {
         cwd: process.cwd(),

package/dist/def/build.d.ts

@@ -20,7 +20,9 @@ export declare abstract class BaseBuildCommand extends Command {
     verbose?: boolean;
     bin?: string;
     package?: string;
+    profile?: string;
     crossCompile?: boolean;
+    useCross?: boolean;
     watch?: boolean;
     features?: string[];
     allFeatures?: boolean;
@@ -44,7 +46,9 @@ export declare abstract class BaseBuildCommand extends Command {
         verbose: boolean | undefined;
         bin: string | undefined;
         package: string | undefined;
+        profile: string | undefined;
         crossCompile: boolean | undefined;
+        useCross: boolean | undefined;
         watch: boolean | undefined;
         features: string[] | undefined;
         allFeatures: boolean | undefined;
@@ -127,10 +131,18 @@ export interface BuildOptions {
      * Build the specified library or the one at cwd
      */
     package?: string;
+    /**
+     * Build artifacts with the specified profile
+     */
+    profile?: string;
     /**
      * [experimental] cross-compile for the specified target with `cargo-xwin` on windows and `cargo-zigbuild` on other platform
      */
     crossCompile?: boolean;
+    /**
+     * [experimental] use [cross](https://github.com/cross-rs/cross) instead of `cargo`
+     */
+    useCross?: boolean;
     /**
      * watch the crate changes and build continiously with `cargo-watch` crates
      */