@napi-rs/cli 3.0.3 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/cli",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "description": "Cli tools for napi-rs",
   "author": "LongYinan <lynweklm@gmail.com>",
   "homepage": "https://github.com/napi-rs/napi-rs",
@@ -79,8 +79,7 @@
     "js-yaml": "^4.1.0",
     "lodash-es": "^4.17.21",
     "semver": "^7.7.1",
-    "typanion": "^3.14.0",
-    "wasm-sjlj": "^1.0.6"
+    "typanion": "^3.14.0"
   },
   "devDependencies": {
     "@emnapi/core": "^1.4.0",
@@ -131,6 +130,5 @@
       "**/__tests__/**/*.spec.ts",
       "e2e/**/*.spec.ts"
     ]
-  },
-  "gitHead": "9f0dc581be12fb039cf4c337b6c5014ae54ae56c"
+  }
 }

package/src/api/build.ts

@@ -6,7 +6,6 @@ import { homedir } from 'node:os'
 import { parse, join, resolve } from 'node:path'
 
 import * as colors from 'colorette'
-import { include as setjmpInclude, lib as setjmpLib } from 'wasm-sjlj'
 
 import { BuildOptions as RawBuildOptions } from '../def/build.js'
 import {
@@ -591,7 +590,6 @@ class Builder {
       'wasm32-wasi-threads',
     )
     this.envs.EMNAPI_LINK_DIR = emnapi
-    this.envs.SETJMP_LINK_DIR = setjmpLib
     const { WASI_SDK_PATH } = process.env
 
     if (WASI_SDK_PATH && existsSync(WASI_SDK_PATH)) {
@@ -627,11 +625,11 @@ class Builder {
       )
       this.setEnvIfNotExists(
         'TARGET_CFLAGS',
-        `--target=wasm32-wasi-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj -I${setjmpInclude}`,
+        `--target=wasm32-wasi-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj`,
       )
       this.setEnvIfNotExists(
         'TARGET_CXXFLAGS',
-        `--target=wasm32-wasi-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj -I${setjmpInclude}`,
+        `--target=wasm32-wasi-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj`,
       )
       this.setEnvIfNotExists(
         `TARGET_LDFLAGS`,
@@ -1001,6 +999,7 @@ export type TypedArray = Int8Array | Uint8Array | Uint8ClampedArray | Int16Array
       this.config.binaryName,
       this.config.packageName,
       idents,
+      this.config.packageJson.version,
     )
 
     try {

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

@@ -2,12 +2,13 @@ export function createCjsBinding(
   localName: string,
   pkgName: string,
   idents: string[],
+  packageVersion?: string,
 ): string {
   return `${bindingHeader}
 const { createRequire } = require('node:module')
 require = createRequire(__filename)
 
-${createCommonBinding(localName, pkgName)}
+${createCommonBinding(localName, pkgName, packageVersion)}
 module.exports = nativeBinding
 ${idents
   .map((ident) => `module.exports.${ident} = nativeBinding.${ident}`)
@@ -19,13 +20,14 @@ export function createEsmBinding(
   localName: string,
   pkgName: string,
   idents: string[],
+  packageVersion?: string,
 ): string {
   return `${bindingHeader}
 import { createRequire } from 'node:module'
 const require = createRequire(import.meta.url)
 const __dirname = new URL('.', import.meta.url).pathname
 
-${createCommonBinding(localName, pkgName)}
+${createCommonBinding(localName, pkgName, packageVersion)}
 const { ${idents.join(', ')} } = nativeBinding
 ${idents.map((ident) => `export { ${ident} }`).join('\n')}
 `
@@ -37,20 +39,37 @@ const bindingHeader = `// prettier-ignore
 /* auto-generated by NAPI-RS */
 `
 
-function createCommonBinding(localName: string, pkgName: string): string {
+function createCommonBinding(
+  localName: string,
+  pkgName: string,
+  packageVersion?: string,
+): string {
   function requireTuple(tuple: string, identSize = 8) {
     const identLow = ' '.repeat(identSize - 2)
     const ident = ' '.repeat(identSize)
-    return `try {
-${ident}return require('./${localName}.${tuple}.node')
+    const versionCheck = packageVersion
+      ? `
+${identLow}try {
+${ident}const binding = require('${pkgName}-${tuple}')
+${ident}const bindingPackageVersion = require('${pkgName}-${tuple}/package.json').version
+${ident}if (bindingPackageVersion !== '${packageVersion}') {
+${ident}  throw new Error(\`Native binding package version mismatch, expected ${packageVersion} but got \${bindingPackageVersion}. You can reinstall dependencies to fix this issue.\`)
+${ident}}
+${ident}return binding
 ${identLow}} catch (e) {
 ${ident}loadErrors.push(e)
-${identLow}}
+${identLow}}`
+      : `
 ${identLow}try {
 ${ident}return require('${pkgName}-${tuple}')
 ${identLow}} catch (e) {
 ${ident}loadErrors.push(e)
 ${identLow}}`
+    return `try {
+${ident}return require('./${localName}.${tuple}.node')
+${identLow}} catch (e) {
+${ident}loadErrors.push(e)
+${identLow}}${versionCheck}`
   }
 
   return `const { readFileSync } = require('node:fs')
@@ -186,11 +205,11 @@ function requireNative() {
     }
   } else if (process.platform === 'openharmony') {
     if (process.arch === 'arm64') {
-      ${requireTuple('linux-arm64-ohos')}
+      ${requireTuple('openharmony-arm64')}
     } else if (process.arch === 'x64') {
-      ${requireTuple('linux-x64-ohos')}
+      ${requireTuple('openharmony-x64')}
     } else if (process.arch === 'arm') {
-      ${requireTuple('linux-arm-ohos')}
+      ${requireTuple('openharmony-arm')}
     } else {
       loadErrors.push(new Error(\`Unsupported architecture on OpenHarmony: \${process.arch}\`))
     }

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

@@ -41,7 +41,7 @@ Generated by [AVA](https://avajs.dev).
         abi: null,
         arch: 'arm64',
         platform: 'openharmony',
-        platformArchABI: 'linux-arm64-ohos',
+        platformArchABI: 'openharmony-arm64',
         triple: 'aarch64-unknown-linux-ohos',
       },
       {
@@ -83,7 +83,7 @@ Generated by [AVA](https://avajs.dev).
         abi: null,
         arch: 'x64',
         platform: 'openharmony',
-        platformArchABI: 'linux-x64-ohos',
+        platformArchABI: 'openharmony-x64',
         triple: 'x86_64-unknown-linux-ohos',
       },
       {

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

@@ -197,8 +197,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     export declare class Fib3 {␊
       current: number␊
-      next: number␊
-      constructor(current: number, next: number)␊
+      nextNum: number␊
+      constructor(current: number, nextNum: number)␊
       [Symbol.iterator](): Iterator<number, void, number>␊
     }␊
     ␊

package/src/utils/target.ts

@@ -6,6 +6,8 @@ export const UNIVERSAL_TARGETS = {
   'universal-apple-darwin': ['aarch64-apple-darwin', 'x86_64-apple-darwin'],
 } as const
 
+const SUB_SYSTEMS = new Set(['android', 'ohos'])
+
 export const AVAILABLE_TARGETS = [
   'aarch64-apple-darwin',
   'aarch64-linux-android',
@@ -139,24 +141,19 @@ export function parseTriple(rawTriple: string): Target {
     ;[cpu, sys] = triples
   } else {
     // aarch64-unknown-linux-musl
-    // ^ cpu           ^ sys ^ abi
+    // ^ cpu   ^vendor ^ sys ^ abi
     // aarch64-apple-darwin
     // ^ cpu         ^ sys  (abi is None)
     ;[cpu, , sys, abi = null] = triples
   }
 
+  if (abi && SUB_SYSTEMS.has(abi)) {
+    sys = abi
+    abi = null
+  }
   const platform = SysToNodePlatform[sys] ?? (sys as Platform)
   const arch = CpuToNodeArch[cpu] ?? (cpu as NodeJSArch)
 
-  if (rawTriple.includes('ohos')) {
-    return {
-      triple: rawTriple,
-      platformArchABI: `linux-${arch}-ohos`,
-      platform: 'openharmony',
-      arch,
-      abi: null,
-    }
-  }
   return {
     triple: rawTriple,
     platformArchABI: abi ? `${platform}-${arch}-${abi}` : `${platform}-${arch}`,

package/src/utils/typegen.ts

@@ -15,6 +15,7 @@ enum TypeDefKind {
   Type = 'type',
   Fn = 'fn',
   Struct = 'struct',
+  Extends = 'extends',
   Impl = 'impl',
 }
 
@@ -23,6 +24,7 @@ interface TypeDefLine {
   name: string
   original_name?: string
   def: string
+  extends?: string
   js_doc?: string
   js_mod?: string
 }
@@ -57,7 +59,8 @@ function prettyPrint(
       break
 
     case TypeDefKind.Struct:
-      s += `${exportDeclare(ambient)} class ${line.name} {\n${line.def}\n}`
+      const extendsDef = line.extends ? ` extends ${line.extends}` : ''
+      s += `${exportDeclare(ambient)} class ${line.name}${extendsDef} {\n${line.def}\n}`
       if (line.original_name && line.original_name !== line.name) {
         s += `\nexport type ${line.original_name} = ${line.name}`
       }
@@ -185,6 +188,11 @@ function preprocessTypeDef(defs: TypeDefLine[]): Map<string, TypeDefLine[]> {
     if (def.kind === TypeDefKind.Struct) {
       group.push(def)
       classDefs.set(def.name, def)
+    } else if (def.kind === TypeDefKind.Extends) {
+      const classDef = classDefs.get(def.name)
+      if (classDef) {
+        classDef.extends = def.def
+      }
     } else if (def.kind === TypeDefKind.Impl) {
       // merge `impl` into class definition
       const classDef = classDefs.get(def.name)