@napi-rs/cli 3.5.0 → 3.6.0

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@napi-rs/cli",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "description": "Cli tools for napi-rs",
   "author": "LongYinan <lynweklm@gmail.com>",
-  "homepage": "https://github.com/napi-rs/napi-rs",
+  "homepage": "https://napi.rs/",
   "license": "MIT",
   "type": "module",
   "engines": {
@@ -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",
+    "@emnapi/runtime": "^1.9.1",
     "@oxc-node/core": "^0.0.35",
     "@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.121.0",
     "prettier": "^3.6.2",
-    "tsdown": "^0.16.1",
+    "tsdown": "^0.21.0",
     "tslib": "^2.8.1",
     "typescript": "^5.9.3"
   },

package/src/api/build.ts

@@ -569,6 +569,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 +977,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 +992,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,
@@ -122,11 +125,14 @@ export async function createNpmDirs(userOptions: CreateNpmDirsOptions) {
           node: '>=14.0.0',
         }
       }
+      const emnapiVersion = require('emnapi/package.json').version
       const wasmRuntime = await fetch(
         `https://registry.npmjs.org/@napi-rs/wasm-runtime`,
       ).then((res) => res.json() as Promise<PackageMeta>)
       scopedPackageJson.dependencies = {
         '@napi-rs/wasm-runtime': `^${wasmRuntime['dist-tags'].latest}`,
+        '@emnapi/core': emnapiVersion,
+        '@emnapi/runtime': emnapiVersion,
       }
     }
 

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

@@ -238,13 +238,17 @@ if (!nativeBinding || process.env.NAPI_RS_FORCE_WASI) {
       wasiBindingError = err
     }
   }
-  if (!nativeBinding) {
+  if (!nativeBinding || process.env.NAPI_RS_FORCE_WASI) {
     try {
       wasiBinding = require('${pkgName}-wasm32-wasi')
       nativeBinding = wasiBinding
     } catch (err) {
       if (process.env.NAPI_RS_FORCE_WASI) {
-        wasiBindingError.cause = err
+        if (!wasiBindingError) {
+          wasiBindingError = err
+        } else {
+          wasiBindingError.cause = err
+        }
         loadErrors.push(err)
       }
     }

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) {
@@ -145,7 +156,7 @@ if (__nodeFs.existsSync(__wasmDebugFilePath)) {
   __wasmFilePath = __wasmDebugFilePath
 } else if (!__nodeFs.existsSync(__wasmFilePath)) {
   try {
-    __wasmFilePath = __nodePath.resolve('${packageName}-wasm32-wasi')
+    __wasmFilePath = require.resolve('${packageName}-wasm32-wasi/${wasmFileName}.wasm')
   } catch {
     throw new Error('Cannot find ${wasmFileName}.wasm file, and ${packageName}-wasm32-wasi package is not installed.')
   }

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
     }
   }
 
@@ -198,6 +202,8 @@ export async function readNapiConfig(
         `Both napi field in ${pkgJsonPath} and [NAPI-RS config](${configPathUnderline}) file are found, the NAPI-RS config file will be used.`,
       ),
     )
+  }
+  if (separatedConfig) {
     Object.assign(userNapiConfig, separatedConfig)
   }
   const napiConfig: NapiConfig = merge(