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

package/dist/utils/target.d.ts

@@ -1,8 +1,8 @@
-export type Platform = NodeJS.Platform | 'wasm' | 'wasi' | 'ohos';
+export type Platform = NodeJS.Platform | 'wasm' | 'wasi' | 'openharmony';
 export declare const UNIVERSAL_TARGETS: {
     readonly 'universal-apple-darwin': readonly ["aarch64-apple-darwin", "x86_64-apple-darwin"];
 };
-export declare const AVAILABLE_TARGETS: readonly ["aarch64-apple-darwin", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "aarch64-pc-windows-msvc", "x86_64-apple-darwin", "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-unknown-freebsd", "i686-pc-windows-msvc", "armv7-unknown-linux-gnueabihf", "armv7-unknown-linux-musleabihf", "armv7-linux-androideabi", "universal-apple-darwin", "riscv64gc-unknown-linux-gnu", "powerpc64le-unknown-linux-gnu", "s390x-unknown-linux-gnu", "wasm32-wasi-preview1-threads"];
+export declare const AVAILABLE_TARGETS: readonly ["aarch64-apple-darwin", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "aarch64-unknown-linux-ohos", "aarch64-pc-windows-msvc", "x86_64-apple-darwin", "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-unknown-linux-ohos", "x86_64-unknown-freebsd", "i686-pc-windows-msvc", "armv7-unknown-linux-gnueabihf", "armv7-unknown-linux-musleabihf", "armv7-linux-androideabi", "universal-apple-darwin", "riscv64gc-unknown-linux-gnu", "powerpc64le-unknown-linux-gnu", "s390x-unknown-linux-gnu", "wasm32-wasi-preview1-threads", "wasm32-wasip1-threads"];
 export type TargetTriple = (typeof AVAILABLE_TARGETS)[number];
 export declare const DEFAULT_TARGETS: readonly ["x86_64-apple-darwin", "aarch64-apple-darwin", "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu"];
 export declare const TARGET_LINKER: Record<string, string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/cli",
-  "version": "3.0.0-alpha.97",
+  "version": "3.0.0-alpha.98",
   "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": "402679859f57e7f13a98144f3d2e529c13d2d5a4"
+  "gitHead": "67449f1917084892f936d8d776e68cdb5e722026"
 }

package/src/api/build.ts

@@ -521,7 +521,7 @@ class Builder {
       this.setWasiEnv()
     }
 
-    if (this.target.abi === 'ohos') {
+    if (this.target.platform === 'openharmony') {
       this.setOpenHarmonyEnv()
     }
 

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

@@ -50,8 +50,7 @@ ${identLow}try {
 ${ident}return require('${pkgName}-${tuple}')
 ${identLow}} catch (e) {
 ${ident}loadErrors.push(e)
-${identLow}}
-`
+${identLow}}`
   }
 
   return `const { readFileSync } = require('node:fs')
@@ -72,8 +71,6 @@ const isMusl = () => {
   return musl
 }
 
-const isOpenHarmony = process.platform === 'openharmony'
-
 const isFileMusl = (f) => f.includes('libc.musl-') || f.includes('ld-musl-')
 
 const isMuslFromFilesystem = () => {
@@ -159,24 +156,18 @@ function requireNative() {
     if (process.arch === 'x64') {
       if (isMusl()) {
         ${requireTuple('linux-x64-musl', 10)}
-      } else if (isOpenHarmony) {
-        ${requireTuple('linux-x64-ohos', 10)}
       } else {
         ${requireTuple('linux-x64-gnu', 10)}
       }
     } else if (process.arch === 'arm64') {
       if (isMusl()) {
         ${requireTuple('linux-arm64-musl', 10)}
-      } else if (isOpenHarmony) {
-        ${requireTuple('linux-arm64-ohos', 10)}
       } else {
         ${requireTuple('linux-arm64-gnu', 10)}
       }
     } else if (process.arch === 'arm') {
       if (isMusl()) {
         ${requireTuple('linux-arm-musleabihf', 10)}
-      } else if (isOpenHarmony) {
-        ${requireTuple('linux-arm-ohos', 10)}
       } else {
         ${requireTuple('linux-arm-gnueabihf', 10)}
       }
@@ -193,6 +184,16 @@ function requireNative() {
     } else {
       loadErrors.push(new Error(\`Unsupported architecture on Linux: \${process.arch}\`))
     }
+  } else if (process.platform === 'openharmony') {
+    if (process.arch === 'arm64') {
+      ${requireTuple('linux-x64-ohos')}
+    } else if (process.arch === 'x64') {
+      ${requireTuple('linux-arm64-ohos')}
+    } else if (process.arch === 'arm') {
+      ${requireTuple('linux-arm-ohos')}
+    } else {
+      loadErrors.push(new Error(\`Unsupported architecture on OpenHarmony: \${process.arch}\`))
+    }
   } else {
     loadErrors.push(new Error(\`Unsupported OS: \${process.platform}, architecture: \${process.arch}\`))
   }

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

@@ -37,6 +37,13 @@ Generated by [AVA](https://avajs.dev).
         platformArchABI: 'linux-arm64-musl',
         triple: 'aarch64-unknown-linux-musl',
       },
+      {
+        abi: null,
+        arch: 'arm64',
+        platform: 'openharmony',
+        platformArchABI: 'linux-arm64-ohos',
+        triple: 'aarch64-unknown-linux-ohos',
+      },
       {
         abi: 'msvc',
         arch: 'arm64',
@@ -72,6 +79,13 @@ Generated by [AVA](https://avajs.dev).
         platformArchABI: 'linux-x64-musl',
         triple: 'x86_64-unknown-linux-musl',
       },
+      {
+        abi: null,
+        arch: 'x64',
+        platform: 'openharmony',
+        platformArchABI: 'linux-x64-ohos',
+        triple: 'x86_64-unknown-linux-ohos',
+      },
       {
         abi: null,
         arch: 'x64',
@@ -142,4 +156,11 @@ Generated by [AVA](https://avajs.dev).
         platformArchABI: 'wasm32-wasi',
         triple: 'wasm32-wasi-preview1-threads',
       },
+      {
+        abi: 'wasi',
+        arch: 'wasm32',
+        platform: 'wasi',
+        platformArchABI: 'wasm32-wasi',
+        triple: 'wasm32-wasip1-threads',
+      },
     ]

package/src/utils/target.ts

@@ -1,6 +1,6 @@
 import { execSync } from 'node:child_process'
 
-export type Platform = NodeJS.Platform | 'wasm' | 'wasi' | 'ohos'
+export type Platform = NodeJS.Platform | 'wasm' | 'wasi' | 'openharmony'
 
 export const UNIVERSAL_TARGETS = {
   'universal-apple-darwin': ['aarch64-apple-darwin', 'x86_64-apple-darwin'],
@@ -11,11 +11,13 @@ export const AVAILABLE_TARGETS = [
   'aarch64-linux-android',
   'aarch64-unknown-linux-gnu',
   'aarch64-unknown-linux-musl',
+  'aarch64-unknown-linux-ohos',
   'aarch64-pc-windows-msvc',
   'x86_64-apple-darwin',
   'x86_64-pc-windows-msvc',
   'x86_64-unknown-linux-gnu',
   'x86_64-unknown-linux-musl',
+  'x86_64-unknown-linux-ohos',
   'x86_64-unknown-freebsd',
   'i686-pc-windows-msvc',
   'armv7-unknown-linux-gnueabihf',
@@ -26,6 +28,7 @@ export const AVAILABLE_TARGETS = [
   'powerpc64le-unknown-linux-gnu',
   's390x-unknown-linux-gnu',
   'wasm32-wasi-preview1-threads',
+  'wasm32-wasip1-threads',
 ] as const
 
 export type TargetTriple = (typeof AVAILABLE_TARGETS)[number]
@@ -84,6 +87,7 @@ const SysToNodePlatform: Record<string, Platform> = {
   freebsd: 'freebsd',
   darwin: 'darwin',
   windows: 'win32',
+  ohos: 'openharmony',
 }
 
 export const UniArchsByPlatform: Partial<Record<Platform, NodeJSArch[]>> = {
@@ -143,6 +147,16 @@ export function parseTriple(rawTriple: string): Target {
 
   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}`,