@napi-rs/cli 3.5.1 → 3.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/cli",
-  "version": "3.5.1",
+  "version": "3.6.1",
   "description": "Cli tools for napi-rs",
   "author": "LongYinan <lynweklm@gmail.com>",
   "homepage": "https://napi.rs/",
@@ -66,7 +66,7 @@
     "@octokit/rest": "^22.0.1",
     "clipanion": "^4.0.0-rc.4",
     "colorette": "^2.0.20",
-    "emnapi": "^1.7.1",
+    "emnapi": "^1.9.1",
     "es-toolkit": "^1.41.0",
     "js-yaml": "^4.1.0",
     "obug": "^2.0.0",
@@ -74,18 +74,19 @@
     "typanion": "^3.14.0"
   },
   "devDependencies": {
-    "@emnapi/runtime": "^1.7.1",
-    "@oxc-node/core": "^0.0.35",
+    "@emnapi/runtime": "^1.9.1",
+    "@oxc-node/core": "^0.1.0",
     "@std/toml": "npm:@jsr/std__toml@^1.0.11",
     "@types/inquirer": "^9.0.9",
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^24.10.0",
     "@types/semver": "^7.7.1",
-    "ava": "^6.4.1",
+    "ava": "^7.0.0",
     "empathic": "^2.0.0",
-    "env-paths": "^3.0.0",
+    "env-paths": "^4.0.0",
+    "oxc-parser": "^0.124.0",
     "prettier": "^3.6.2",
-    "tsdown": "^0.18.0",
+    "tsdown": "^0.21.0",
     "tslib": "^2.8.1",
     "typescript": "^5.9.3"
   },

package/src/api/build.ts

@@ -381,35 +381,11 @@ class Builder {
           set = true
         }
       } else {
-        if (
-          this.target.platform === 'linux' &&
-          process.platform === 'linux' &&
-          this.target.arch === process.arch &&
-          (function (abi: string | null) {
-            const glibcVersionRuntime =
-              // @ts-expect-error
-              process.report?.getReport()?.header?.glibcVersionRuntime
-            const libc = glibcVersionRuntime ? 'gnu' : 'musl'
-            return abi === libc
-          })(this.target.abi)
-        ) {
-          debug.warn(
-            'You are trying to cross compile to linux target on linux platform which is unnecessary.',
-          )
-        } else if (
-          this.target.platform === 'darwin' &&
-          process.platform === 'darwin'
-        ) {
-          debug.warn(
-            'You are trying to cross compile to darwin target on darwin platform which is unnecessary.',
-          )
-        } else {
-          // use cargo-zigbuild to cross compile to other platforms
-          debug('Use %i', 'cargo-zigbuild')
-          tryInstallCargoBinary('cargo-zigbuild', 'zigbuild')
-          this.args.push('zigbuild')
-          set = true
-        }
+        // use cargo-zigbuild to cross compile to other platforms
+        debug('Use %i', 'cargo-zigbuild')
+        tryInstallCargoBinary('cargo-zigbuild', 'zigbuild')
+        this.args.push('zigbuild')
+        set = true
       }
     }
 
@@ -569,6 +545,19 @@ class Builder {
       'wasm32-wasi-threads',
     )
     this.envs.EMNAPI_LINK_DIR = emnapi
+    const emnapiVersion = require('emnapi/package.json').version
+    const projectRequire = createRequire(join(this.options.cwd, 'package.json'))
+    const emnapiCoreVersion = projectRequire('@emnapi/core').version
+    const emnapiRuntimeVersion = projectRequire('@emnapi/runtime').version
+
+    if (
+      emnapiVersion !== emnapiCoreVersion ||
+      emnapiVersion !== emnapiRuntimeVersion
+    ) {
+      throw new Error(
+        `emnapi version mismatch: emnapi@${emnapiVersion}, @emnapi/core@${emnapiCoreVersion}, @emnapi/runtime@${emnapiRuntimeVersion}. Please ensure all emnapi packages are the same version.`,
+      )
+    }
     const { WASI_SDK_PATH } = process.env
 
     if (WASI_SDK_PATH && existsSync(WASI_SDK_PATH)) {
@@ -964,6 +953,7 @@ class Builder {
           this.config.wasm?.browser?.fs,
           this.config.wasm?.browser?.asyncInit,
           this.config.wasm?.browser?.buffer,
+          this.config.wasm?.browser?.errorEvent,
         ) +
           `export default __napiModule.exports\n` +
           idents
@@ -978,7 +968,10 @@ class Builder {
       await writeFileAsync(workerPath, WASI_WORKER_TEMPLATE, 'utf8')
       await writeFileAsync(
         browserWorkerPath,
-        createWasiBrowserWorkerBinding(this.config.wasm?.browser?.fs ?? false),
+        createWasiBrowserWorkerBinding(
+          this.config.wasm?.browser?.fs ?? false,
+          this.config.wasm?.browser?.errorEvent ?? false,
+        ),
         'utf8',
       )
       await writeFileAsync(

package/src/api/create-npm-dirs.ts

@@ -1,7 +1,10 @@
+import { createRequire } from 'node:module'
 import { join, resolve } from 'node:path'
 
 import { parse } from 'semver'
 
+const require = createRequire(import.meta.url)
+
 import {
   applyDefaultCreateNpmDirsOptions,
   type CreateNpmDirsOptions,
@@ -22,6 +25,52 @@ export interface PackageMeta {
   'dist-tags': { [index: string]: string }
 }
 
+const WASM_RUNTIME_PACKAGE_NAME = '@napi-rs/wasm-runtime'
+
+async function getLatestWasmRuntimeVersion() {
+  const npmRegistryBase =
+    process.env.npm_config_registry?.replace(/\/?$/, '/') ??
+    'https://registry.npmjs.org/'
+  const packageMetadataUrl = `${npmRegistryBase}${WASM_RUNTIME_PACKAGE_NAME}`
+  let response: Response
+
+  try {
+    response = await fetch(packageMetadataUrl)
+  } catch (error) {
+    throw new Error(
+      `Failed to fetch ${packageMetadataUrl} while resolving ${WASM_RUNTIME_PACKAGE_NAME}. Check your network connection and npm registry availability.`,
+      { cause: error },
+    )
+  }
+
+  if (!response.ok) {
+    throw new Error(
+      `Failed to fetch ${packageMetadataUrl} while resolving ${WASM_RUNTIME_PACKAGE_NAME}: npm registry responded with ${response.status} ${response.statusText || 'Unknown Status'}`,
+    )
+  }
+
+  let packageMeta: PackageMeta
+
+  try {
+    packageMeta = (await response.json()) as PackageMeta
+  } catch (error) {
+    throw new Error(
+      `Failed to parse npm registry metadata for ${WASM_RUNTIME_PACKAGE_NAME} from ${packageMetadataUrl}`,
+      { cause: error },
+    )
+  }
+
+  const latestVersion = packageMeta['dist-tags']?.latest
+
+  if (typeof latestVersion !== 'string' || latestVersion.trim().length === 0) {
+    throw new Error(
+      `npm registry metadata for ${WASM_RUNTIME_PACKAGE_NAME} from ${packageMetadataUrl} did not include a latest dist-tag`,
+    )
+  }
+
+  return latestVersion.trim()
+}
+
 export async function createNpmDirs(userOptions: CreateNpmDirsOptions) {
   const options = applyDefaultCreateNpmDirsOptions(userOptions)
 
@@ -57,6 +106,9 @@ export async function createNpmDirs(userOptions: CreateNpmDirsOptions) {
       packageJsonPath,
       options.configPath ? resolve(options.cwd, options.configPath) : undefined,
     )
+  const wasmRuntimeVersion = targets.some((target) => target.arch === 'wasm32')
+    ? await getLatestWasmRuntimeVersion()
+    : undefined
 
   for (const target of targets) {
     const targetDir = join(npmPath, `${target.platformArchABI}`)
@@ -122,11 +174,11 @@ export async function createNpmDirs(userOptions: CreateNpmDirsOptions) {
           node: '>=14.0.0',
         }
       }
-      const wasmRuntime = await fetch(
-        `https://registry.npmjs.org/@napi-rs/wasm-runtime`,
-      ).then((res) => res.json() as Promise<PackageMeta>)
+      const emnapiVersion = require('emnapi/package.json').version
       scopedPackageJson.dependencies = {
-        '@napi-rs/wasm-runtime': `^${wasmRuntime['dist-tags'].latest}`,
+        '@napi-rs/wasm-runtime': `^${wasmRuntimeVersion}`,
+        '@emnapi/core': emnapiVersion,
+        '@emnapi/runtime': emnapiVersion,
       }
     }
 

package/src/api/new.ts

@@ -34,24 +34,15 @@ const TEMPLATE_REPOS = {
 } as const
 
 async function checkGitCommand(): Promise<boolean> {
-  try {
-    await new Promise((resolve) => {
-      const cp = exec('git --version')
-      cp.on('error', () => {
-        resolve(false)
-      })
-      cp.on('exit', (code) => {
-        if (code === 0) {
-          resolve(true)
-        } else {
-          resolve(false)
-        }
-      })
+  return new Promise<boolean>((resolve) => {
+    const cp = exec('git --version')
+    cp.on('error', () => {
+      resolve(false)
     })
-    return true
-  } catch {
-    return false
-  }
+    cp.on('exit', (code) => {
+      resolve(code === 0)
+    })
+  })
 }
 
 async function ensureCacheDir(
@@ -132,7 +123,7 @@ async function copyDirectory(
         !includeWasiBindings &&
         (entry.name.endsWith('.wasi-browser.js') ||
           entry.name.endsWith('.wasi.cjs') ||
-          entry.name.endsWith('wasi-worker.browser.mjs ') ||
+          entry.name.endsWith('wasi-worker-browser.mjs') ||
           entry.name.endsWith('wasi-worker.mjs') ||
           entry.name.endsWith('browser.js'))
       ) {

package/src/api/rename.ts

@@ -45,8 +45,16 @@ export async function renameProject(userOptions: RenameOptions) {
     const configPath = resolve(options.cwd, options.configPath)
     const configContent = await readFileAsync(configPath, 'utf8')
     const configData = JSON.parse(configContent)
-    configData.binaryName = options.binaryName
-    configData.packageName = options.packageName
+    merge(
+      configData,
+      omitBy(
+        {
+          binaryName: options.binaryName,
+          packageName: options.packageName,
+        },
+        isNil,
+      ),
+    )
     await writeFileAsync(configPath, JSON.stringify(configData, null, 2))
   }
 
@@ -73,7 +81,7 @@ export async function renameProject(userOptions: RenameOptions) {
   const updatedTomlContent = stringifyToml(cargoToml)
 
   await writeFileAsync(cargoTomlPath, updatedTomlContent)
-  if (oldName !== options.binaryName) {
+  if (options.binaryName && oldName !== options.binaryName) {
     const githubActionsPath = find.dir('.github', {
       cwd: options.cwd,
     })

package/src/api/templates/load-wasi-template.ts

@@ -5,6 +5,7 @@ export const createWasiBrowserBinding = (
   fs = false,
   asyncInit = false,
   buffer = false,
+  errorEvent = false,
 ) => {
   const fsImport = fs
     ? buffer
@@ -32,6 +33,15 @@ const __wasi = new __WASI({
     ? `    worker.addEventListener('message', __wasmCreateOnMessageForFsProxy(__fs))\n`
     : ''
 
+  const workerErrorHandler = errorEvent
+    ? `    worker.addEventListener('error', (event) => {
+      if (event.data && typeof event.data === 'object' && event.data.type === 'error') {
+        window.dispatchEvent(new CustomEvent('napi-rs-worker-error', { detail: event.data }))
+      }
+    })
+`
+    : ''
+
   const emnapiInjectBuffer = buffer
     ? '__emnapiContext.feature.Buffer = Buffer'
     : ''
@@ -77,6 +87,7 @@ const {
       type: 'module',
     })
 ${workerFsHandler}
+${workerErrorHandler}
     return worker
   },
   overwriteImports(importObject) {

package/src/api/templates/wasi-worker-template.ts

@@ -63,13 +63,19 @@ globalThis.onmessage = function (e) {
 };
 `
 
-export const createWasiBrowserWorkerBinding = (fs: boolean) => {
+export const createWasiBrowserWorkerBinding = (
+  fs: boolean,
+  errorEvent: boolean,
+) => {
   const fsImport = fs
     ? `import { instantiateNapiModuleSync, MessageHandler, WASI, createFsProxy } from '@napi-rs/wasm-runtime'
 import { memfsExported as __memfsExported } from '@napi-rs/wasm-runtime/fs'
 
 const fs = createFsProxy(__memfsExported)`
     : `import { instantiateNapiModuleSync, MessageHandler, WASI } from '@napi-rs/wasm-runtime'`
+  const errorOutputsAppend = errorEvent
+    ? `\n        errorOutputs.push([...arguments])`
+    : ''
   const wasiCreation = fs
     ? `const wasi = new WASI({
       fs,
@@ -83,6 +89,7 @@ const fs = createFsProxy(__memfsExported)`
       printErr: function() {
         // eslint-disable-next-line no-console
         console.error.apply(console, arguments)
+        ${errorOutputsAppend}
       },
     })`
     : `const wasi = new WASI({
@@ -93,10 +100,19 @@ const fs = createFsProxy(__memfsExported)`
       printErr: function() {
         // eslint-disable-next-line no-console
         console.error.apply(console, arguments)
+        ${errorOutputsAppend}
       },
     })`
+  const errorHandler = errorEvent
+    ? `onError(error) {
+    postMessage({ type: 'error', error, errorOutputs })
+    errorOutputs.length = 0
+  }`
+    : ''
   return `${fsImport}
 
+const errorOutputs = []
+
 const handler = new MessageHandler({
   onLoad({ wasmModule, wasmMemory }) {
     ${wasiCreation}
@@ -113,6 +129,7 @@ const handler = new MessageHandler({
       },
     })
   },
+  ${errorHandler}
 })
 
 globalThis.onmessage = function (e) {

package/src/commands/cli-version.ts

@@ -0,0 +1,15 @@
+import { Command } from 'clipanion'
+
+import { CLI_VERSION } from '../utils/misc.js'
+
+/**
+ * A command that prints the version of the CLI.
+ *
+ * Paths: `-v`, `--version`
+ */
+export class CliVersionCommand extends Command<any> {
+  static paths = [[`-v`], [`--version`]]
+  async execute() {
+    await this.context.stdout.write(`${CLI_VERSION}\n`)
+  }
+}

package/src/index.ts

@@ -10,6 +10,7 @@ import { universalizeBinaries } from './api/universalize.js'
 import { version } from './api/version.js'
 import { ArtifactsCommand } from './commands/artifacts.js'
 import { BuildCommand } from './commands/build.js'
+import { CliVersionCommand } from './commands/cli-version.js'
 import { CreateNpmDirsCommand } from './commands/create-npm-dirs.js'
 import { HelpCommand } from './commands/help.js'
 import { NewCommand } from './commands/new.js'
@@ -33,6 +34,7 @@ cli.register(RenameCommand)
 cli.register(PrePublishCommand)
 cli.register(VersionCommand)
 cli.register(HelpCommand)
+cli.register(CliVersionCommand)
 
 /**
  *

package/src/utils/config.ts

@@ -83,6 +83,10 @@ export interface UserNapiConfig {
        * Whether to inject `buffer` to emnapi context
        */
       buffer?: boolean
+      /**
+       * Whether to emit custom events for errors in worker
+       */
+      errorEvent?: boolean
     }
   }
 

package/src/utils/metadata.ts

@@ -62,7 +62,7 @@ export async function parseMetadata(manifestPath: string) {
   let stdout = ''
   let stderr = ''
   let status = 0
-  let error = null
+  let error: Error | null = null
 
   childProcess.stdout.on('data', (data) => {
     stdout += data
@@ -72,6 +72,10 @@ export async function parseMetadata(manifestPath: string) {
     stderr += data
   })
 
+  childProcess.on('error', (err) => {
+    error = err
+  })
+
   await new Promise<void>((resolve) => {
     childProcess.on('close', (code) => {
       status = code ?? 0