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

package/dist/def/universalize.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 BaseUniversalizeCommand extends Command {
+class BaseUniversalizeCommand extends Command {
     static paths = [['universalize']];
     static usage = Command.Usage({
         description: 'Combile built binaries into one universal binary',
@@ -23,6 +23,7 @@ export class BaseUniversalizeCommand extends Command {
         };
     }
 }
+export { BaseUniversalizeCommand };
 export function applyDefaultUniversalizeOptions(options) {
     return {
         cwd: process.cwd(),

package/dist/def/version.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 BaseVersionCommand extends Command {
+class BaseVersionCommand extends Command {
     static paths = [['version']];
     static usage = Command.Usage({
         description: 'Update version in created npm packages',
@@ -23,6 +23,7 @@ export class BaseVersionCommand extends Command {
         };
     }
 }
+export { BaseVersionCommand };
 export function applyDefaultVersionOptions(options) {
     return {
         cwd: process.cwd(),

package/dist/index.cjs

@@ -4247,7 +4247,7 @@ var require_dist_node2 = __commonJS({
         parse: parse3
       });
     }
-    var VERSION = "7.0.3";
+    var VERSION = "7.0.5";
     var userAgent = `octokit-endpoint.js/${VERSION} ${universalUserAgent.getUserAgent()}`;
     var DEFAULTS = {
       method: "GET",
@@ -9749,9 +9749,9 @@ var require_encoding = __commonJS({
   }
 });
 
-// ../node_modules/node-fetch/lib/index.js
+// ../node_modules/@octokit/request/node_modules/node-fetch/lib/index.js
 var require_lib4 = __commonJS({
-  "../node_modules/node-fetch/lib/index.js"(exports2, module2) {
+  "../node_modules/@octokit/request/node_modules/node-fetch/lib/index.js"(exports2, module2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     function _interopDefault(ex) {
@@ -10810,7 +10810,9 @@ var require_lib4 = __commonJS({
           if (signal && signal.aborted) {
             return;
           }
-          destroyStream(response.body, err);
+          if (response && response.body) {
+            destroyStream(response.body, err);
+          }
         });
         if (parseInt(process.version.substring(1)) < 14) {
           req.on("socket", function(s) {
@@ -11157,7 +11159,7 @@ var require_dist_node5 = __commonJS({
     var isPlainObject2 = require_is_plain_object();
     var nodeFetch = _interopDefault(require_lib4());
     var requestError = require_dist_node4();
-    var VERSION = "6.2.2";
+    var VERSION = "6.2.3";
     function getBufferResponse(response) {
       return response.arrayBuffer();
     }
@@ -11309,7 +11311,7 @@ var require_dist_node6 = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     var request = require_dist_node5();
     var universalUserAgent = require_dist_node();
-    var VERSION = "5.0.4";
+    var VERSION = "5.0.5";
     function _buildMessageForResponseErrors(data) {
       return `Request failed due to following response errors:
 ` + data.errors.map((e) => ` - ${e.message}`).join("\n");
@@ -11456,7 +11458,7 @@ var require_dist_node8 = __commonJS({
     var request = require_dist_node5();
     var graphql = require_dist_node6();
     var authToken = require_dist_node7();
-    var VERSION = "4.1.0";
+    var VERSION = "4.2.0";
     var Octokit2 = class {
       constructor(options = {}) {
         const hook = new beforeAfterHook.Collection();
@@ -13042,7 +13044,8 @@ var AVAILABLE_TARGETS = [
   "i686-pc-windows-msvc",
   "armv7-unknown-linux-gnueabihf",
   "armv7-linux-androideabi",
-  "universal-apple-darwin"
+  "universal-apple-darwin",
+  "riscv64gc-unknown-linux-gnu"
 ];
 var DEFAULT_TARGETS = [
   "x86_64-apple-darwin",
@@ -13050,19 +13053,22 @@ var DEFAULT_TARGETS = [
   "x86_64-unknown-linux-gnu"
 ];
 var TARGET_LINKER = {
-  "aarch64-unknown-linux-musl": "aarch64-linux-musl-gcc"
+  "aarch64-unknown-linux-musl": "aarch64-linux-musl-gcc",
+  "riscv64gc-unknown-linux-gnu": "riscv64-linux-gnu-gcc"
 };
 var CpuToNodeArch = {
   x86_64: "x64",
   aarch64: "arm64",
   i686: "ia32",
-  armv7: "arm"
+  armv7: "arm",
+  riscv64gc: "riscv64"
 };
 var NodeArchToCpu = {
   x64: "x86_64",
   arm64: "aarch64",
   ia32: "i686",
-  arm: "armv7"
+  arm: "armv7",
+  riscv64: "riscv64gc"
 };
 var SysToNodePlatform = {
   linux: "linux",
@@ -18833,6 +18839,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 }}
@@ -18845,7 +18859,6 @@ jobs:
         if: \${{ !matrix.settings.docker }}
         with:
           node-version: 18
-          check-latest: true
           cache: yarn
 
       - name: Install
@@ -18889,7 +18902,6 @@ jobs:
         if: matrix.settings.target == 'i686-pc-windows-msvc'
         with:
           node-version: 18
-          check-latest: true
           cache: yarn
           architecture: x86
 
@@ -18986,7 +18998,6 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: \${{ matrix.node }}
-          check-latest: true
           cache: 'yarn'
 
       - name: 'Install dependencies'
@@ -19022,7 +19033,6 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: \${{ matrix.node }}
-          check-latest: true
           cache: 'yarn'
 
       - name: 'Install dependencies'
@@ -19058,7 +19068,6 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: \${{ matrix.node }}
-          check-latest: true
           cache: 'yarn'
 
       - name: 'Install dependencies'
@@ -19107,7 +19116,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:
@@ -19222,7 +19231,6 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          check-latest: true
           cache: yarn
 
       - name: 'Install dependencies'
@@ -19268,7 +19276,6 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          check-latest: true
           cache: 'yarn'
 
       - name: 'Install dependencies'
@@ -19429,116 +19436,261 @@ var createPackageJson = ({ name, binaryName, targets, license, engineRequirement
 };
 
 // dist/api/templates/js-binding.js
-function loadNapiModule(binaryName, packageName) {
-  const { existsSync: existsSync2, readFileSync } = require("fs");
-  const { join: join7 } = require("path");
-  const { platform: platform2, arch } = process;
-  const candidates = [];
-  function isMusl() {
-    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;
+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 (platform2) {
-    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");
+}
+
+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 {
-            candidates.push("linux-x64-gnu");
+            nativeBinding = require('${pkgName}-android-arm64')
           }
-          break;
-        case "arm64":
-          if (isMusl()) {
-            candidates.push("linux-arm64-musl");
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'arm':
+        localFileExisted = existsSync(join(__dirname, '${localName}.android-arm-eabi.node'))
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./${localName}.android-arm-eabi.node')
           } else {
-            candidates.push("linux-arm64-gnu");
+            nativeBinding = require('${pkgName}-android-arm-eabi')
           }
-          break;
-        case "arm":
-          candidates.push("linux-arm-gnueabihf");
-          break;
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(\`Unsupported architecture on Android \${arch}\`)
+    }
+    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}\`)
+    }
+    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;
-  }
-  let nativeBinding;
-  let loadError;
-  for (const suffix of candidates) {
-    const localPath = join7(__dirname, `${binaryName}.${suffix}.node`);
-    const pkgPath = `${packageName}-${suffix}`;
+      break
+    } catch {}
+    switch (arch) {
+      case 'x64':
+        localFileExisted = existsSync(join(__dirname, '${localName}.darwin-x64.node'))
+        try {
+          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 (existsSync2(localPath)) {
-        nativeBinding = require(localPath);
+      if (localFileExisted) {
+        nativeBinding = require('./${localName}.freebsd-x64.node')
       } else {
-        nativeBinding = require(pkgPath);
+        nativeBinding = require('${pkgName}-freebsd-x64')
       }
     } catch (e) {
-      loadError = e;
-      continue;
-    }
-    loadError = null;
-    break;
-  }
-  if (!nativeBinding) {
-    if (loadError) {
-      throw loadError;
+      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')
+            }
+          } 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
+          }
+        }
+        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
+          }
+        }
+        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
+        }
+        break
+      default:
+        throw new Error(\`Unsupported architecture on Linux: \${arch}\`)
     }
-    throw new Error(`Unsupported OS: ${platform2}, architecture: ${arch}`);
+    break
+  default:
+    throw new Error(\`Unsupported OS: \${platform}, architecture: \${arch}\`)
+}
+
+if (!nativeBinding) {
+  if (loadError) {
+    throw loadError
   }
-  return nativeBinding;
+  throw new Error(\`Failed to load native binding\`)
 }
-function createJsBinding(localName, pkgName) {
-  return `${loadNapiModule.toString()}
 
-module.exports = loadNapiModule('${localName}', '${pkgName}')
 `;
 }
 
@@ -19609,7 +19761,8 @@ var Builder = class {
     debug3("  %i", `cargo ${this.args.join(" ")}`);
     const controller = new AbortController();
     const buildTask = new Promise((resolve8, reject) => {
-      const buildProcess = (0, import_child_process4.spawn)("cargo", this.args, {
+      const command = process.env.CARGO ?? (this.options.useCross ? "cross" : "cargo");
+      const buildProcess = (0, import_child_process4.spawn)(command, this.args, {
         env: {
           ...process.env,
           ...this.envs
@@ -19774,6 +19927,9 @@ var Builder = class {
     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);
     }
@@ -19808,7 +19964,9 @@ var Builder = class {
     if (!srcName || !destName) {
       return;
     }
-    const src = (0, import_path2.join)(this.targetDir, this.target.triple, this.options.release ? "release" : "debug", srcName);
+    const profile = this.options.profile ?? (this.options.release ? "release" : "debug");
+    const src = (0, import_path2.join)(this.targetDir, this.target.triple, profile, srcName);
+    debug3(`Copy artifact from: [${src}]`);
     const dest = (0, import_path2.join)(this.outputDir, destName);
     try {
       if (await fileExists(dest)) {

package/dist/utils/ci.js

@@ -83,4 +83,13 @@ export const CIConfig = {
         ],
         test: false,
     },
+    'riscv64gc-unknown-linux-gnu': {
+        host: 'ubuntu-latest',
+        build_setup: [
+            'sudo apt-get update',
+            'sudo apt-get install g++-riscv64-linux-gnu gcc-riscv64-linux-gnu -y',
+        ],
+        // No official nodejs docker image for riscv64
+        test: false,
+    },
 };

package/dist/utils/target.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" resolution-mode="require"/>
-export declare const AVAILABLE_TARGETS: readonly ["aarch64-apple-darwin", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "aarch64-pc-windows-msvc", "x86_64-apple-darwin", "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-unknown-freebsd", "i686-pc-windows-msvc", "armv7-unknown-linux-gnueabihf", "armv7-linux-androideabi", "universal-apple-darwin"];
+export declare const AVAILABLE_TARGETS: readonly ["aarch64-apple-darwin", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "aarch64-pc-windows-msvc", "x86_64-apple-darwin", "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-unknown-freebsd", "i686-pc-windows-msvc", "armv7-unknown-linux-gnueabihf", "armv7-linux-androideabi", "universal-apple-darwin", "riscv64gc-unknown-linux-gnu"];
 export type TargetTriple = (typeof AVAILABLE_TARGETS)[number];
 export declare const DEFAULT_TARGETS: readonly ["x86_64-apple-darwin", "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu"];
 export declare const TARGET_LINKER: Record<string, string>;
-type NodeJSArch = 'arm' | 'arm64' | 'ia32' | 'mips' | 'mipsel' | 'ppc' | 'ppc64' | 's390' | 's390x' | 'x32' | 'x64' | 'universal';
+type NodeJSArch = 'arm' | 'arm64' | 'ia32' | 'mips' | 'mipsel' | 'ppc' | 'ppc64' | 'riscv64' | 's390' | 's390x' | 'x32' | 'x64' | 'universal';
 export declare const NodeArchToCpu: Record<string, string>;
 export declare const UniArchsByPlatform: Partial<Record<NodeJS.Platform, NodeJSArch[]>>;
 export interface Target {

package/dist/utils/target.js

@@ -14,6 +14,7 @@ export const AVAILABLE_TARGETS = [
     'armv7-unknown-linux-gnueabihf',
     'armv7-linux-androideabi',
     'universal-apple-darwin',
+    'riscv64gc-unknown-linux-gnu',
 ];
 export const DEFAULT_TARGETS = [
     'x86_64-apple-darwin',
@@ -22,18 +23,21 @@ export const DEFAULT_TARGETS = [
 ];
 export const TARGET_LINKER = {
     'aarch64-unknown-linux-musl': 'aarch64-linux-musl-gcc',
+    'riscv64gc-unknown-linux-gnu': 'riscv64-linux-gnu-gcc',
 };
 const CpuToNodeArch = {
     x86_64: 'x64',
     aarch64: 'arm64',
     i686: 'ia32',
     armv7: 'arm',
+    riscv64gc: 'riscv64',
 };
 export const NodeArchToCpu = {
     x64: 'x86_64',
     arm64: 'aarch64',
     ia32: 'i686',
     arm: 'armv7',
+    riscv64: 'riscv64gc',
 };
 const SysToNodePlatform = {
     linux: 'linux',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/cli",
-  "version": "3.0.0-alpha.3",
+  "version": "3.0.0-alpha.4",
   "description": "Cli tools for napi-rs",
   "author": "LongYinan <lynweklm@gmail.com>",
   "homepage": "https://github.com/napi-rs/napi-rs",
@@ -79,12 +79,12 @@
   "devDependencies": {
     "@types/inquirer": "^9.0.3",
     "@types/js-yaml": "^4.0.5",
-    "@types/lodash-es": "^4.17.6",
+    "@types/lodash-es": "^4.17.7",
     "ava": "^5.2.0",
-    "esbuild": "^0.17.14",
+    "esbuild": "^0.17.16",
     "prettier": "^2.8.7",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.4"
+    "typescript": "^5.0.4"
   },
   "funding": {
     "type": "github",
@@ -96,5 +96,5 @@
     "build:cjs": "node ./esbuild.mjs",
     "test": "ava"
   },
-  "gitHead": "b5c3c0575559f9c99d7747f3163476afe7e89a6c"
+  "gitHead": "0302e564faad54dcfe6c91c9a7f26749a6a0d8e8"
 }