@napi-rs/cli 3.6.0 → 3.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/cli",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "Cli tools for napi-rs",
   "author": "LongYinan <lynweklm@gmail.com>",
   "homepage": "https://napi.rs/",
@@ -75,7 +75,7 @@
   },
   "devDependencies": {
     "@emnapi/runtime": "^1.9.1",
-    "@oxc-node/core": "^0.0.35",
+    "@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",
@@ -84,7 +84,7 @@
     "ava": "^7.0.0",
     "empathic": "^2.0.0",
     "env-paths": "^4.0.0",
-    "oxc-parser": "^0.121.0",
+    "oxc-parser": "^0.124.0",
     "prettier": "^3.6.2",
     "tsdown": "^0.21.0",
     "tslib": "^2.8.1",

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
       }
     }
 

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

@@ -25,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)
 
@@ -60,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}`)
@@ -126,11 +175,8 @@ export async function createNpmDirs(userOptions: CreateNpmDirsOptions) {
         }
       }
       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}`,
+        '@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/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