@napi-rs/cli 3.1.4 → 3.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/cli",
-  "version": "3.1.4",
+  "version": "3.2.0",
   "description": "Cli tools for napi-rs",
   "author": "LongYinan <lynweklm@gmail.com>",
   "homepage": "https://github.com/napi-rs/napi-rs",
@@ -59,36 +59,36 @@
     "url": "https://github.com/napi-rs/napi-rs/issues"
   },
   "dependencies": {
-    "@inquirer/prompts": "^7.4.0",
-    "@napi-rs/cross-toolchain": "^1.0.0",
-    "@napi-rs/wasm-tools": "^1.0.0",
+    "@inquirer/prompts": "^7.8.4",
+    "@napi-rs/cross-toolchain": "^1.0.3",
+    "@napi-rs/wasm-tools": "^1.0.1",
     "@octokit/rest": "^22.0.0",
     "clipanion": "^4.0.0-rc.4",
     "colorette": "^2.0.20",
-    "debug": "^4.4.0",
-    "emnapi": "^1.4.0",
-    "es-toolkit": "^1.39.8",
+    "debug": "^4.4.1",
+    "emnapi": "^1.5.0",
+    "es-toolkit": "^1.39.10",
     "find-up": "^7.0.0",
     "js-yaml": "^4.1.0",
-    "semver": "^7.7.1",
+    "semver": "^7.7.2",
     "typanion": "^3.14.0"
   },
   "devDependencies": {
-    "@emnapi/core": "^1.4.0",
-    "@emnapi/runtime": "^1.4.0",
+    "@emnapi/core": "^1.5.0",
+    "@emnapi/runtime": "^1.5.0",
     "@oxc-node/core": "^0.0.32",
-    "@std/toml": "npm:@jsr/std__toml@^1.0.8",
+    "@std/toml": "npm:@jsr/std__toml@^1.0.10",
     "@types/debug": "^4.1.12",
-    "@types/inquirer": "^9.0.7",
+    "@types/inquirer": "^9.0.9",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^22.13.16",
-    "@types/semver": "^7.7.0",
-    "ava": "^6.2.0",
+    "@types/node": "^24.3.1",
+    "@types/semver": "^7.7.1",
+    "ava": "^6.4.1",
     "env-paths": "^3.0.0",
-    "prettier": "^3.5.3",
-    "tsdown": "^0.14.0",
+    "prettier": "^3.6.2",
+    "tsdown": "^0.15.0",
     "tslib": "^2.8.1",
-    "typescript": "^5.8.2"
+    "typescript": "^5.9.2"
   },
   "peerDependencies": {
     "@emnapi/runtime": "^1.1.0",

package/src/api/artifacts.ts

@@ -1,4 +1,4 @@
-import { join, parse } from 'node:path'
+import { join, resolve, parse } from 'node:path'
 
 import * as colors from 'colorette'
 
@@ -20,9 +20,12 @@ const debug = debugFactory('artifacts')
 export async function collectArtifacts(userOptions: ArtifactsOptions) {
   const options = applyDefaultArtifactsOptions(userOptions)
 
-  const packageJsonPath = join(options.cwd, options.packageJsonPath)
-  const { targets, binaryName, packageName } =
-    await readNapiConfig(packageJsonPath)
+  const resolvePath = (...paths: string[]) => resolve(options.cwd, ...paths)
+  const packageJsonPath = resolvePath(options.packageJsonPath)
+  const { targets, binaryName, packageName } = await readNapiConfig(
+    packageJsonPath,
+    options.configPath ? resolvePath(options.configPath) : undefined,
+  )
 
   const distDirs = targets.map((platform) =>
     join(options.cwd, options.npmDir, platform.platformArchABI),

package/src/api/build.ts

@@ -82,9 +82,7 @@ export async function buildProject(rawOptions: BuildOptions) {
     )
   }
   const config = await readNapiConfig(
-    resolvePath(
-      options.configPath ?? options.packageJsonPath ?? 'package.json',
-    ),
+    resolvePath(options.packageJsonPath ?? 'package.json'),
     options.configPath ? resolvePath(options.configPath) : undefined,
   )
 

package/src/api/new.ts

@@ -180,6 +180,7 @@ async function filterTargetsInGithubActions(
     'aarch64-unknown-linux-musl',
     'armv7-unknown-linux-gnueabihf',
     'armv7-unknown-linux-musleabihf',
+    'loongarch64-unknown-linux-gnu',
     'riscv64gc-unknown-linux-gnu',
     'powerpc64le-unknown-linux-gnu',
     's390x-unknown-linux-gnu',

package/src/api/pre-publish.ts

@@ -165,10 +165,26 @@ export async function prePublish(userOptions: PrePublishOptions) {
       }
 
       if (!options.skipOptionalPublish) {
-        execSync(`${npmClient} publish`, {
-          cwd: pkgDir,
-          env: process.env,
-        })
+        try {
+          const output = execSync(`${npmClient} publish`, {
+            cwd: pkgDir,
+            env: process.env,
+            stdio: 'pipe',
+          })
+          process.stdout.write(output)
+        } catch (e) {
+          if (
+            e instanceof Error &&
+            e.message.includes(
+              'You cannot publish over the previously published versions',
+            )
+          ) {
+            console.info(e.message)
+            debug.warn(`${pkgDir} has been published, skipping`)
+          } else {
+            throw e
+          }
+        }
       }
 
       if (options.ghRelease && repo && owner) {

package/src/api/templates/js-binding.ts

@@ -132,7 +132,7 @@ const isMuslFromChildProcess = () => {
 function requireNative() {
   if (process.env.NAPI_RS_NATIVE_LIBRARY_PATH) {
     try {
-      nativeBinding = require(process.env.NAPI_RS_NATIVE_LIBRARY_PATH);
+      return require(process.env.NAPI_RS_NATIVE_LIBRARY_PATH);
     } catch (err) {
       loadErrors.push(err)
     }
@@ -190,6 +190,12 @@ function requireNative() {
       } else {
         ${requireTuple('linux-arm-gnueabihf', 10)}
       }
+    } else if (process.arch === 'loong64') {
+      if (isMusl()) {
+        ${requireTuple('linux-loong64-musl', 10)}
+      } else {
+        ${requireTuple('linux-loong64-gnu', 10)}
+      }
     } else if (process.arch === 'riscv64') {
       if (isMusl()) {
         ${requireTuple('linux-riscv64-musl', 10)}
@@ -221,22 +227,32 @@ function requireNative() {
 nativeBinding = requireNative()
 
 if (!nativeBinding || process.env.NAPI_RS_FORCE_WASI) {
+  let wasiBinding = null
+  let wasiBindingError = null
   try {
-    nativeBinding = require('./${localName}.wasi.cjs')
+    wasiBinding = require('./${localName}.wasi.cjs')
+    nativeBinding = wasiBinding
   } catch (err) {
     if (process.env.NAPI_RS_FORCE_WASI) {
-      loadErrors.push(err)
+      wasiBindingError = err
     }
   }
   if (!nativeBinding) {
     try {
-      nativeBinding = require('${pkgName}-wasm32-wasi')
+      wasiBinding = require('${pkgName}-wasm32-wasi')
+      nativeBinding = wasiBinding
     } catch (err) {
       if (process.env.NAPI_RS_FORCE_WASI) {
+        wasiBindingError.cause = err
         loadErrors.push(err)
       }
     }
   }
+  if (process.env.NAPI_RS_FORCE_WASI === 'error' && !wasiBinding) {
+    const error = new Error('WASI binding not found and NAPI_RS_FORCE_WASI is set to error')
+    error.cause = wasiBindingError
+    throw error
+  }
 }
 
 if (!nativeBinding) {
@@ -245,7 +261,12 @@ if (!nativeBinding) {
       \`Cannot find native binding. \` +
         \`npm has a bug related to optional dependencies (https://github.com/npm/cli/issues/4828). \` +
         'Please try \`npm i\` again after removing both package-lock.json and node_modules directory.',
-      { cause: loadErrors }
+      {
+        cause: loadErrors.reduce((err, cur) => {
+          cur.cause = err
+          return cur
+        }),
+      },
     )
   }
   throw new Error(\`Failed to load native binding\`)

package/src/commands/new.ts

@@ -76,6 +76,7 @@ export class NewCommand extends BaseNewCommand {
     return select({
       message: 'Minimum node-api version (with node version requirement)',
       loop: false,
+      pageSize: 10,
       choices: Array.from({ length: 8 }, (_, i) => ({
         name: `napi${i + 1} (${napiEngineRequirement(i + 1)})`,
         value: i + 1,

package/src/utils/__tests__/__snapshots__/target.spec.ts.md

@@ -128,6 +128,13 @@ Generated by [AVA](https://avajs.dev).
         platformArchABI: 'darwin-universal',
         triple: 'universal-apple-darwin',
       },
+      {
+        abi: 'gnu',
+        arch: 'loong64',
+        platform: 'linux',
+        platformArchABI: 'linux-loong64-gnu',
+        triple: 'loongarch64-unknown-linux-gnu',
+      },
       {
         abi: 'gnu',
         arch: 'riscv64',

package/src/utils/misc.ts

@@ -1,30 +1,30 @@
 import {
   readFile,
   writeFile,
+  unlink,
   copyFile,
   mkdir,
-  unlink,
   stat,
   readdir,
-} from 'node:fs'
-import { promisify } from 'node:util'
+  access,
+} from 'node:fs/promises'
 
 import pkgJson from '../../package.json' with { type: 'json' }
 import { debug } from './log.js'
 
-export const readFileAsync = promisify(readFile)
-export const writeFileAsync = promisify(writeFile)
-export const unlinkAsync = promisify(unlink)
-export const copyFileAsync = promisify(copyFile)
-export const mkdirAsync = promisify(mkdir)
-export const statAsync = promisify(stat)
-export const readdirAsync = promisify(readdir)
+export const readFileAsync = readFile
+export const writeFileAsync = writeFile
+export const unlinkAsync = unlink
+export const copyFileAsync = copyFile
+export const mkdirAsync = mkdir
+export const statAsync = stat
+export const readdirAsync = readdir
 
-export async function fileExists(path: string) {
-  const exists = await statAsync(path)
-    .then(() => true)
-    .catch(() => false)
-  return exists
+export function fileExists(path: string): Promise<boolean> {
+  return access(path).then(
+    () => true,
+    () => false,
+  )
 }
 
 export async function dirExistsAsync(path: string) {

package/src/utils/read-config.ts

@@ -11,9 +11,7 @@ interface MinimalNapiOptions {
 export async function readConfig(options: MinimalNapiOptions) {
   const resolvePath = (...paths: string[]) => resolve(options.cwd, ...paths)
   const config = await readNapiConfig(
-    resolvePath(
-      options.configPath ?? options.packageJsonPath ?? 'package.json',
-    ),
+    resolvePath(options.packageJsonPath ?? 'package.json'),
     options.configPath ? resolvePath(options.configPath) : undefined,
   )
   return config

package/src/utils/target.ts

@@ -26,6 +26,7 @@ export const AVAILABLE_TARGETS = [
   'armv7-unknown-linux-musleabihf',
   'armv7-linux-androideabi',
   'universal-apple-darwin',
+  'loongarch64-unknown-linux-gnu',
   'riscv64gc-unknown-linux-gnu',
   'powerpc64le-unknown-linux-gnu',
   's390x-unknown-linux-gnu',
@@ -44,6 +45,8 @@ export const DEFAULT_TARGETS = [
 
 export const TARGET_LINKER: Record<string, string> = {
   'aarch64-unknown-linux-musl': 'aarch64-linux-musl-gcc',
+  // TODO: Switch to loongarch64-linux-gnu-gcc when available
+  'loongarch64-unknown-linux-gnu': 'loongarch64-linux-gnu-gcc-13',
   'riscv64gc-unknown-linux-gnu': 'riscv64-linux-gnu-gcc',
   'powerpc64le-unknown-linux-gnu': 'powerpc64le-linux-gnu-gcc',
   's390x-unknown-linux-gnu': 's390x-linux-gnu-gcc',
@@ -54,6 +57,7 @@ type NodeJSArch =
   | 'arm'
   | 'arm64'
   | 'ia32'
+  | 'loong64'
   | 'mips'
   | 'mipsel'
   | 'ppc'
@@ -71,6 +75,7 @@ const CpuToNodeArch: Record<string, NodeJSArch> = {
   aarch64: 'arm64',
   i686: 'ia32',
   armv7: 'arm',
+  loongarch64: 'loong64',
   riscv64gc: 'riscv64',
   powerpc64le: 'ppc64',
 }
@@ -80,6 +85,7 @@ export const NodeArchToCpu: Record<string, string> = {
   arm64: 'aarch64',
   ia32: 'i686',
   arm: 'armv7',
+  loong64: 'loongarch64',
   riscv64: 'riscv64gc',
   ppc64: 'powerpc64le',
 }