@napi-rs/cli 3.0.0-alpha.95 → 3.0.0-alpha.97

package/dist/utils/target.d.ts

@@ -1,4 +1,4 @@
-export type Platform = NodeJS.Platform | 'wasm' | 'wasi';
+export type Platform = NodeJS.Platform | 'wasm' | 'wasi' | 'ohos';
 export declare const UNIVERSAL_TARGETS: {
     readonly 'universal-apple-darwin': readonly ["aarch64-apple-darwin", "x86_64-apple-darwin"];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/cli",
-  "version": "3.0.0-alpha.95",
+  "version": "3.0.0-alpha.97",
   "description": "Cli tools for napi-rs",
   "author": "LongYinan <lynweklm@gmail.com>",
   "homepage": "https://github.com/napi-rs/napi-rs",
@@ -132,5 +132,5 @@
       "e2e/**/*.spec.ts"
     ]
   },
-  "gitHead": "0aa36c39a6cb6b73ce969a33cf4ec04301a1d77a"
+  "gitHead": "402679859f57e7f13a98144f3d2e529c13d2d5a4"
 }

package/src/api/build.ts

@@ -514,86 +514,15 @@ class Builder {
     }
 
     if (this.target.platform === 'android') {
-      const { ANDROID_NDK_LATEST_HOME } = process.env
-      if (!ANDROID_NDK_LATEST_HOME) {
-        debug.warn(
-          `${colors.red(
-            'ANDROID_NDK_LATEST_HOME',
-          )} environment variable is missing`,
-        )
-      }
-
-      const targetArch = this.target.arch === 'arm' ? 'armv7a' : 'aarch64'
-      const targetPlatform =
-        this.target.arch === 'arm' ? 'androideabi24' : 'android24'
-      const hostPlatform =
-        process.platform === 'darwin'
-          ? 'darwin'
-          : process.platform === 'win32'
-            ? 'windows'
-            : 'linux'
-      Object.assign(this.envs, {
-        CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/${targetArch}-linux-android24-clang`,
-        CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/${targetArch}-linux-androideabi24-clang`,
-        TARGET_CC: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/${targetArch}-linux-${targetPlatform}-clang`,
-        TARGET_CXX: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/${targetArch}-linux-${targetPlatform}-clang++`,
-        TARGET_AR: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/llvm-ar`,
-        TARGET_RANLIB: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/llvm-ranlib`,
-        ANDROID_NDK: ANDROID_NDK_LATEST_HOME,
-        PATH: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin:${process.env.PATH}`,
-      })
+      this.setAndroidEnv()
     }
-    // END LINKER
 
     if (this.target.platform === 'wasi') {
-      const emnapi = join(
-        require.resolve('emnapi'),
-        '..',
-        'lib',
-        'wasm32-wasi-threads',
-      )
-      this.envs.EMNAPI_LINK_DIR = emnapi
-      this.envs.SETJMP_LINK_DIR = setjmpLib
-      const { WASI_SDK_PATH } = process.env
+      this.setWasiEnv()
+    }
 
-      if (WASI_SDK_PATH && existsSync(WASI_SDK_PATH)) {
-        this.envs.CARGO_TARGET_WASM32_WASI_PREVIEW1_THREADS_LINKER = join(
-          WASI_SDK_PATH,
-          'bin',
-          'wasm-ld',
-        )
-        this.envs.CARGO_TARGET_WASM32_WASIP1_LINKER = join(
-          WASI_SDK_PATH,
-          'bin',
-          'wasm-ld',
-        )
-        this.envs.CARGO_TARGET_WASM32_WASIP1_THREADS_LINKER = join(
-          WASI_SDK_PATH,
-          'bin',
-          'wasm-ld',
-        )
-        this.envs.CARGO_TARGET_WASM32_WASIP2_LINKER = join(
-          WASI_SDK_PATH,
-          'bin',
-          'wasm-ld',
-        )
-        this.setEnvIfNotExists('CC', join(WASI_SDK_PATH, 'bin', 'clang'))
-        this.setEnvIfNotExists('CXX', join(WASI_SDK_PATH, 'bin', 'clang++'))
-        this.setEnvIfNotExists('AR', join(WASI_SDK_PATH, 'bin', 'ar'))
-        this.setEnvIfNotExists('RANLIB', join(WASI_SDK_PATH, 'bin', 'ranlib'))
-        this.setEnvIfNotExists(
-          'CFLAGS',
-          `--target=wasm32-wasi-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj -I${setjmpInclude}`,
-        )
-        this.setEnvIfNotExists(
-          'CXXFLAGS',
-          `--target=wasm32-wasi-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj -I${setjmpInclude}`,
-        )
-        this.setEnvIfNotExists(
-          `LDFLAGS`,
-          `-fuse-ld=${WASI_SDK_PATH}/bin/wasm-ld --target=wasm32-wasi-threads`,
-        )
-      }
+    if (this.target.abi === 'ohos') {
+      this.setOpenHarmonyEnv()
     }
 
     debug('Set envs: ')
@@ -618,6 +547,141 @@ class Builder {
     })
   }
 
+  private setAndroidEnv() {
+    const { ANDROID_NDK_LATEST_HOME } = process.env
+    if (!ANDROID_NDK_LATEST_HOME) {
+      debug.warn(
+        `${colors.red(
+          'ANDROID_NDK_LATEST_HOME',
+        )} environment variable is missing`,
+      )
+    }
+
+    // skip cross compile setup if host is android
+    if (process.platform === 'android') {
+      return
+    }
+
+    const targetArch = this.target.arch === 'arm' ? 'armv7a' : 'aarch64'
+    const targetPlatform =
+      this.target.arch === 'arm' ? 'androideabi24' : 'android24'
+    const hostPlatform =
+      process.platform === 'darwin'
+        ? 'darwin'
+        : process.platform === 'win32'
+          ? 'windows'
+          : 'linux'
+    Object.assign(this.envs, {
+      CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/${targetArch}-linux-android24-clang`,
+      CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/${targetArch}-linux-androideabi24-clang`,
+      TARGET_CC: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/${targetArch}-linux-${targetPlatform}-clang`,
+      TARGET_CXX: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/${targetArch}-linux-${targetPlatform}-clang++`,
+      TARGET_AR: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/llvm-ar`,
+      TARGET_RANLIB: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/llvm-ranlib`,
+      ANDROID_NDK: ANDROID_NDK_LATEST_HOME,
+      PATH: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin${process.platform === 'win32' ? ';' : ':'}${process.env.PATH}`,
+    })
+  }
+
+  private setWasiEnv() {
+    const emnapi = join(
+      require.resolve('emnapi'),
+      '..',
+      'lib',
+      '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)) {
+      this.envs.CARGO_TARGET_WASM32_WASI_PREVIEW1_THREADS_LINKER = join(
+        WASI_SDK_PATH,
+        'bin',
+        'wasm-ld',
+      )
+      this.envs.CARGO_TARGET_WASM32_WASIP1_LINKER = join(
+        WASI_SDK_PATH,
+        'bin',
+        'wasm-ld',
+      )
+      this.envs.CARGO_TARGET_WASM32_WASIP1_THREADS_LINKER = join(
+        WASI_SDK_PATH,
+        'bin',
+        'wasm-ld',
+      )
+      this.envs.CARGO_TARGET_WASM32_WASIP2_LINKER = join(
+        WASI_SDK_PATH,
+        'bin',
+        'wasm-ld',
+      )
+      this.setEnvIfNotExists('TARGET_CC', join(WASI_SDK_PATH, 'bin', 'clang'))
+      this.setEnvIfNotExists(
+        'TARGET_CXX',
+        join(WASI_SDK_PATH, 'bin', 'clang++'),
+      )
+      this.setEnvIfNotExists('TARGET_AR', join(WASI_SDK_PATH, 'bin', 'ar'))
+      this.setEnvIfNotExists(
+        'TARGET_RANLIB',
+        join(WASI_SDK_PATH, 'bin', 'ranlib'),
+      )
+      this.setEnvIfNotExists(
+        'TARGET_CFLAGS',
+        `--target=wasm32-wasi-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj -I${setjmpInclude}`,
+      )
+      this.setEnvIfNotExists(
+        'TARGET_CXXFLAGS',
+        `--target=wasm32-wasi-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj -I${setjmpInclude}`,
+      )
+      this.setEnvIfNotExists(
+        `TARGET_LDFLAGS`,
+        `-fuse-ld=${WASI_SDK_PATH}/bin/wasm-ld --target=wasm32-wasi-threads`,
+      )
+    }
+  }
+
+  private setOpenHarmonyEnv() {
+    const { OHOS_SDK_PATH, OHOS_SDK_NATIVE } = process.env
+    const ndkPath = OHOS_SDK_PATH
+      ? `${OHOS_SDK_NATIVE}/native`
+      : OHOS_SDK_NATIVE
+    // @ts-expect-error
+    if (!ndkPath && process.platform !== 'openharmony') {
+      debug.warn(
+        `${colors.red('OHOS_SDK_PATH')} or ${colors.red('OHOS_SDK_NATIVE')} environment variable is missing`,
+      )
+      return
+    }
+    const linkerName = `CARGO_TARGET_${this.target.triple.toUpperCase().replace(/-/g, '_')}_LINKER`
+    const ranPath = `${ndkPath}/llvm/bin/llvm-ranlib`
+    const arPath = `${ndkPath}/llvm/bin/llvm-ar`
+    const ccPath = `${ndkPath}/llvm/bin/${this.target.triple}-clang`
+    const cxxPath = `${ndkPath}/llvm/bin/${this.target.triple}-clang++`
+    const asPath = `${ndkPath}/llvm/bin/llvm-as`
+    const ldPath = `${ndkPath}/llvm/bin/ld.lld`
+    const stripPath = `${ndkPath}/llvm/bin/llvm-strip`
+    const objDumpPath = `${ndkPath}/llvm/bin/llvm-objdump`
+    const objCopyPath = `${ndkPath}/llvm/bin/llvm-objcopy`
+    const nmPath = `${ndkPath}/llvm/bin/llvm-nm`
+    const binPath = `${ndkPath}/llvm/bin`
+    const libPath = `${ndkPath}/llvm/lib`
+
+    this.setEnvIfNotExists('LIBCLANG_PATH', libPath)
+    this.setEnvIfNotExists('DEP_ATOMIC', 'clang_rt.builtins')
+    this.setEnvIfNotExists(linkerName, ccPath)
+    this.setEnvIfNotExists('TARGET_CC', ccPath)
+    this.setEnvIfNotExists('TARGET_CXX', cxxPath)
+    this.setEnvIfNotExists('TARGET_AR', arPath)
+    this.setEnvIfNotExists('TARGET_RANLIB', ranPath)
+    this.setEnvIfNotExists('TARGET_AS', asPath)
+    this.setEnvIfNotExists('TARGET_LD', ldPath)
+    this.setEnvIfNotExists('TARGET_STRIP', stripPath)
+    this.setEnvIfNotExists('TARGET_OBJDUMP', objDumpPath)
+    this.setEnvIfNotExists('TARGET_OBJCOPY', objCopyPath)
+    this.setEnvIfNotExists('TARGET_NM', nmPath)
+    this.envs.PATH = `${binPath}${process.platform === 'win32' ? ';' : ':'}${process.env.PATH}`
+  }
+
   private setFeatures() {
     const args = []
     if (this.options.allFeatures && this.options.noDefaultFeatures) {

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

@@ -38,17 +38,19 @@ const bindingHeader = `// prettier-ignore
 `
 
 function createCommonBinding(localName: string, pkgName: string): string {
-  function requireTuple(tuple: string) {
+  function requireTuple(tuple: string, identSize = 8) {
+    const identLow = ' '.repeat(identSize - 2)
+    const ident = ' '.repeat(identSize)
     return `try {
-        return require('./${localName}.${tuple}.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('${pkgName}-${tuple}')
-      } catch (e) {
-        loadErrors.push(e)
-      }
+${ident}return require('./${localName}.${tuple}.node')
+${identLow}} catch (e) {
+${ident}loadErrors.push(e)
+${identLow}}
+${identLow}try {
+${ident}return require('${pkgName}-${tuple}')
+${identLow}} catch (e) {
+${ident}loadErrors.push(e)
+${identLow}}
 `
   }
 
@@ -70,6 +72,8 @@ const isMusl = () => {
   return musl
 }
 
+const isOpenHarmony = process.platform === 'openharmony'
+
 const isFileMusl = (f) => f.includes('libc.musl-') || f.includes('ld-musl-')
 
 const isMuslFromFilesystem = () => {
@@ -135,7 +139,7 @@ function requireNative() {
       loadErrors.push(new Error(\`Unsupported architecture on Windows: \${process.arch}\`))
     }
   } else if (process.platform === 'darwin') {
-    ${requireTuple('darwin-universal')}
+    ${requireTuple('darwin-universal', 6)}
     if (process.arch === 'x64') {
       ${requireTuple('darwin-x64')}
     } else if (process.arch === 'arm64') {
@@ -154,27 +158,33 @@ function requireNative() {
   } else if (process.platform === 'linux') {
     if (process.arch === 'x64') {
       if (isMusl()) {
-        ${requireTuple('linux-x64-musl')}
+        ${requireTuple('linux-x64-musl', 10)}
+      } else if (isOpenHarmony) {
+        ${requireTuple('linux-x64-ohos', 10)}
       } else {
-        ${requireTuple('linux-x64-gnu')}
+        ${requireTuple('linux-x64-gnu', 10)}
       }
     } else if (process.arch === 'arm64') {
       if (isMusl()) {
-        ${requireTuple('linux-arm64-musl')}
+        ${requireTuple('linux-arm64-musl', 10)}
+      } else if (isOpenHarmony) {
+        ${requireTuple('linux-arm64-ohos', 10)}
       } else {
-        ${requireTuple('linux-arm64-gnu')}
+        ${requireTuple('linux-arm64-gnu', 10)}
       }
     } else if (process.arch === 'arm') {
       if (isMusl()) {
-        ${requireTuple('linux-arm-musleabihf')}
+        ${requireTuple('linux-arm-musleabihf', 10)}
+      } else if (isOpenHarmony) {
+        ${requireTuple('linux-arm-ohos', 10)}
       } else {
-        ${requireTuple('linux-arm-gnueabihf')}
+        ${requireTuple('linux-arm-gnueabihf', 10)}
       }
     } else if (process.arch === 'riscv64') {
       if (isMusl()) {
-        ${requireTuple('linux-riscv64-musl')}
+        ${requireTuple('linux-riscv64-musl', 10)}
       } else {
-        ${requireTuple('linux-riscv64-gnu')}
+        ${requireTuple('linux-riscv64-gnu', 10)}
       }
     } else if (process.arch === 'ppc64') {
       ${requireTuple('linux-ppc64-gnu')}

package/src/utils/target.ts

@@ -1,6 +1,6 @@
 import { execSync } from 'node:child_process'
 
-export type Platform = NodeJS.Platform | 'wasm' | 'wasi'
+export type Platform = NodeJS.Platform | 'wasm' | 'wasi' | 'ohos'
 
 export const UNIVERSAL_TARGETS = {
   'universal-apple-darwin': ['aarch64-apple-darwin', 'x86_64-apple-darwin'],