@napi-rs/cli 3.6.1 → 3.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/cli",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "description": "Cli tools for napi-rs",
   "author": "LongYinan <lynweklm@gmail.com>",
   "homepage": "https://napi.rs/",
@@ -84,7 +84,7 @@
     "ava": "^7.0.0",
     "empathic": "^2.0.0",
     "env-paths": "^4.0.0",
-    "oxc-parser": "^0.124.0",
+    "oxc-parser": "^0.125.0",
     "prettier": "^3.6.2",
     "tsdown": "^0.21.0",
     "tslib": "^2.8.1",

package/src/api/build.ts

@@ -542,7 +542,7 @@ class Builder {
       require.resolve('emnapi'),
       '..',
       'lib',
-      'wasm32-wasi-threads',
+      'wasm32-wasip1-threads',
     )
     this.envs.EMNAPI_LINK_DIR = emnapi
     const emnapiVersion = require('emnapi/package.json').version
@@ -593,15 +593,15 @@ class Builder {
       )
       this.setEnvIfNotExists(
         'TARGET_CFLAGS',
-        `--target=wasm32-wasi-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj`,
+        `--target=wasm32-wasip1-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`,
+        `--target=wasm32-wasip1-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj`,
       )
       this.setEnvIfNotExists(
         `TARGET_LDFLAGS`,
-        `-fuse-ld=${WASI_SDK_PATH}/bin/wasm-ld --target=wasm32-wasi-threads`,
+        `-fuse-ld=${WASI_SDK_PATH}/bin/wasm-ld --target=wasm32-wasip1-threads`,
       )
     }
   }
@@ -1093,19 +1093,21 @@ export async function generateTypeDef(
     return { exports: [], dts: '' }
   }
 
-  for (const file of files) {
-    if (!file.isFile()) {
-      continue
-    }
-
-    const { dts: fileDts, exports: fileExports } = await processTypeDef(
-      join(options.typeDefDir, file.name),
-      options.constEnum ?? true,
-    )
+  const typeDefFiles = files
+    .filter((file) => file.isFile())
+    .sort((a, b) => a.name.localeCompare(b.name))
+
+  const processedTypeDefs = await Promise.all(
+    typeDefFiles.map((file) =>
+      processTypeDef(
+        join(options.typeDefDir, file.name),
+        options.constEnum ?? true,
+      ),
+    ),
+  )
 
-    dts += fileDts
-    exports.push(...fileExports)
-  }
+  dts = processedTypeDefs.map(({ dts }) => dts).join('')
+  exports = processedTypeDefs.flatMap(({ exports }) => exports)
 
   if (dts.indexOf('ExternalObject<') > -1) {
     header += `

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

@@ -1,9 +1,10 @@
 import { createRequire } from 'node:module'
 import { join, resolve } from 'node:path'
 
-import { parse } from 'semver'
+import { Comparator, Range, minVersion, subset } from 'semver'
 
 const require = createRequire(import.meta.url)
+const minimumWasiNodeVersion = '>=14.0.0'
 
 import {
   applyDefaultCreateNpmDirsOptions,
@@ -156,23 +157,11 @@ export async function createNpmDirs(userOptions: CreateNpmDirsOptions) {
         `wasi-worker.mjs`,
         `wasi-worker-browser.mjs`,
       )
-      let needRestrictNodeVersion = true
-      if (scopedPackageJson.engines?.node) {
-        try {
-          const { major } = parse(scopedPackageJson.engines.node) ?? {
-            major: 0,
-          }
-          if (major >= 14) {
-            needRestrictNodeVersion = false
-          }
-        } catch {
-          // ignore
-        }
-      }
-      if (needRestrictNodeVersion) {
-        scopedPackageJson.engines = {
-          node: '>=14.0.0',
-        }
+      scopedPackageJson.engines = {
+        ...scopedPackageJson.engines,
+        node: scopedPackageJson.engines?.node
+          ? restrictWasiNodeEngine(scopedPackageJson.engines.node)
+          : minimumWasiNodeVersion,
       }
       const emnapiVersion = require('emnapi/package.json').version
       scopedPackageJson.dependencies = {
@@ -206,3 +195,69 @@ function readme(packageName: string, target: Target) {
 This is the **${target.triple}** binary for \`${packageName}\`
 `
 }
+
+function restrictWasiNodeEngine(nodeRange: string) {
+  try {
+    if (subset(nodeRange, minimumWasiNodeVersion)) {
+      return nodeRange
+    }
+
+    if (subset(minimumWasiNodeVersion, nodeRange)) {
+      return minimumWasiNodeVersion
+    }
+
+    const minimumComparator = new Comparator(minimumWasiNodeVersion)
+    const restrictedRangeSets = new Range(nodeRange).set
+      .map((comparators) =>
+        normalizeComparatorSet([...comparators, minimumComparator]),
+      )
+      .filter(
+        (candidate): candidate is string =>
+          candidate !== undefined && minVersion(candidate) !== null,
+      )
+
+    if (restrictedRangeSets.length > 0) {
+      return restrictedRangeSets.join(' || ')
+    }
+  } catch {
+    // ignore
+  }
+
+  return minimumWasiNodeVersion
+}
+
+function normalizeComparatorSet(comparators: Comparator[]) {
+  const exactMatch = comparators.find(({ operator }) => operator === '')
+  if (exactMatch) {
+    return comparators.every((comparator) => comparator.test(exactMatch.semver))
+      ? exactMatch.value
+      : undefined
+  }
+
+  let lowerBound: Comparator | undefined
+  let upperBound: Comparator | undefined
+
+  for (const comparator of comparators) {
+    if (comparator.operator === '>' || comparator.operator === '>=') {
+      if (
+        !lowerBound ||
+        comparator.semver.compare(lowerBound.semver) > 0 ||
+        (comparator.semver.compare(lowerBound.semver) === 0 &&
+          comparator.operator === '>')
+      ) {
+        lowerBound = comparator
+      }
+    } else if (comparator.operator === '<' || comparator.operator === '<=') {
+      if (
+        !upperBound ||
+        comparator.semver.compare(upperBound.semver) < 0 ||
+        (comparator.semver.compare(upperBound.semver) === 0 &&
+          comparator.operator === '<')
+      ) {
+        upperBound = comparator
+      }
+    }
+  }
+
+  return [lowerBound?.value, upperBound?.value].filter(Boolean).join(' ')
+}

package/src/api/new.ts

@@ -4,6 +4,7 @@ import { homedir } from 'node:os'
 import path from 'node:path'
 import { promises as fs } from 'node:fs'
 
+import { parse as parseToml, stringify as stringifyToml } from '@std/toml'
 import { load as yamlLoad, dump as yamlDump } from 'js-yaml'
 
 import {
@@ -15,6 +16,7 @@ import {
   debugFactory,
   DEFAULT_TARGETS,
   mkdirAsync,
+  parseTriple,
   readdirAsync,
   statAsync,
   type SupportedPackageManager,
@@ -33,6 +35,8 @@ const TEMPLATE_REPOS = {
   pnpm: 'https://github.com/napi-rs/package-template-pnpm',
 } as const
 
+const WASI_TARGET = 'wasm32-wasip1-threads'
+
 async function checkGitCommand(): Promise<boolean> {
   return new Promise<boolean>((resolve) => {
     const cp = exec('git --version')
@@ -125,7 +129,7 @@ async function copyDirectory(
           entry.name.endsWith('.wasi.cjs') ||
           entry.name.endsWith('wasi-worker-browser.mjs') ||
           entry.name.endsWith('wasi-worker.mjs') ||
-          entry.name.endsWith('browser.js'))
+          entry.name === 'browser.js')
       ) {
         continue
       }
@@ -140,6 +144,7 @@ async function filterTargetsInPackageJson(
 ): Promise<void> {
   const content = await fs.readFile(filePath, 'utf-8')
   const packageJson = JSON.parse(content)
+  const includeWasiBindings = enabledTargets.includes(WASI_TARGET)
 
   // Filter napi.targets
   if (packageJson.napi?.targets) {
@@ -148,9 +153,63 @@ async function filterTargetsInPackageJson(
     )
   }
 
+  if (!includeWasiBindings) {
+    if (
+      packageJson.browser === 'browser.js' ||
+      packageJson.browser === './browser.js'
+    ) {
+      delete packageJson.browser
+    }
+
+    if (Array.isArray(packageJson.files)) {
+      packageJson.files = packageJson.files.filter(
+        (file: unknown) => file !== 'browser.js' && file !== './browser.js',
+      )
+    }
+  }
+
   await fs.writeFile(filePath, JSON.stringify(packageJson, null, 2) + '\n')
 }
 
+async function updateCargoTomlTypeDef(
+  filePath: string,
+  enableTypeDef: boolean,
+): Promise<void> {
+  if (enableTypeDef) {
+    return
+  }
+
+  const content = await fs.readFile(filePath, 'utf-8')
+  const cargoToml = parseToml(content) as Record<string, any>
+  const dependencies = cargoToml.dependencies
+
+  if (!dependencies || !dependencies['napi-derive']) {
+    return
+  }
+
+  const napiDeriveDependency = dependencies['napi-derive']
+  const dependencyConfig =
+    typeof napiDeriveDependency === 'string'
+      ? { version: napiDeriveDependency }
+      : { ...napiDeriveDependency }
+
+  const existingFeatures = Array.isArray(dependencyConfig.features)
+    ? dependencyConfig.features.filter(
+        (feature: unknown): feature is string => typeof feature === 'string',
+      )
+    : []
+
+  dependencyConfig['default-features'] = false
+  dependencyConfig.features = [
+    'strict',
+    ...existingFeatures.filter((feature) => feature !== 'strict'),
+  ].filter((feature) => feature !== 'type-def')
+
+  dependencies['napi-derive'] = dependencyConfig
+
+  await fs.writeFile(filePath, stringifyToml(cargoToml))
+}
+
 async function filterTargetsInGithubActions(
   filePath: string,
   enabledTargets: string[],
@@ -158,13 +217,6 @@ async function filterTargetsInGithubActions(
   const content = await fs.readFile(filePath, 'utf-8')
   const yaml = yamlLoad(content) as any
 
-  const macOSAndWindowsTargets = new Set([
-    'x86_64-pc-windows-msvc',
-    'x86_64-pc-windows-gnu',
-    'aarch64-pc-windows-msvc',
-    'x86_64-apple-darwin',
-  ])
-
   const linuxTargets = new Set([
     'x86_64-unknown-linux-gnu',
     'x86_64-unknown-linux-musl',
@@ -184,6 +236,10 @@ async function filterTargetsInGithubActions(
   const hasLinuxTargets = enabledTargets.some((target) =>
     linuxTargets.has(target),
   )
+  const hasMacOSOrWindowsTargets = enabledTargets.some((target) => {
+    const platform = parseTriple(target).platform
+    return platform === 'darwin' || platform === 'win32'
+  })
 
   // Filter the matrix configurations in the build job
   if (yaml?.jobs?.build?.strategy?.matrix?.settings) {
@@ -198,7 +254,7 @@ async function filterTargetsInGithubActions(
 
   const jobsToRemove: string[] = []
 
-  if (enabledTargets.every((target) => !macOSAndWindowsTargets.has(target))) {
+  if (!hasMacOSOrWindowsTargets) {
     jobsToRemove.push('test-macOS-windows-binding')
   } else {
     // Filter the matrix configurations in the test-macOS-windows-binding job
@@ -237,7 +293,7 @@ async function filterTargetsInGithubActions(
     }
   }
 
-  if (!enabledTargets.includes('wasm32-wasip1-threads')) {
+  if (!enabledTargets.includes(WASI_TARGET)) {
     jobsToRemove.push('test-wasi')
   }
 
@@ -313,11 +369,9 @@ function processOptions(options: RawNewOptions) {
     const out = execSync(`rustup target list`, {
       encoding: 'utf8',
     })
-    if (out.includes('wasm32-wasip1-threads')) {
+    if (out.includes(WASI_TARGET)) {
       options.targets = options.targets.map((target) =>
-        target === 'wasm32-wasi-preview1-threads'
-          ? 'wasm32-wasip1-threads'
-          : target,
+        target === 'wasm32-wasi-preview1-threads' ? WASI_TARGET : target,
       )
     }
   }
@@ -357,7 +411,7 @@ export async function newProject(userOptions: RawNewOptions) {
       await copyDirectory(
         templatePath,
         options.path,
-        options.targets.includes('wasm32-wasip1-threads'),
+        options.targets.includes(WASI_TARGET),
       )
 
       // Rename project using the rename API
@@ -367,6 +421,11 @@ export async function newProject(userOptions: RawNewOptions) {
         binaryName: getBinaryName(options.name),
       })
 
+      const cargoTomlPath = path.join(options.path, 'Cargo.toml')
+      if (existsSync(cargoTomlPath)) {
+        await updateCargoTomlTypeDef(cargoTomlPath, options.enableTypeDef)
+      }
+
       // Filter targets in package.json
       const packageJsonPath = path.join(options.path, 'package.json')
       if (existsSync(packageJsonPath)) {

package/src/api/pre-publish.ts

@@ -85,6 +85,7 @@ export async function prePublish(userOptions: PrePublishOptions) {
 
   function getRepoInfo(packageName: string, version: string) {
     const headCommit = execSync('git log -1 --pretty=%B', {
+      cwd: options.cwd,
       encoding: 'utf-8',
     }).trim()
 

package/src/api/rename.ts

@@ -41,6 +41,18 @@ export async function renameProject(userOptions: RenameOptions) {
     },
   )
 
+  if (options.repository) {
+    if (
+      packageJsonData.repository &&
+      typeof packageJsonData.repository === 'object' &&
+      !Array.isArray(packageJsonData.repository)
+    ) {
+      packageJsonData.repository.url = options.repository
+    } else {
+      packageJsonData.repository = options.repository
+    }
+  }
+
   if (options.configPath) {
     const configPath = resolve(options.cwd, options.configPath)
     const configContent = await readFileAsync(configPath, 'utf8')

package/src/api/universalize.ts

@@ -1,5 +1,5 @@
 import { spawnSync } from 'node:child_process'
-import { join, resolve } from 'node:path'
+import { resolve } from 'node:path'
 
 import {
   applyDefaultUniversalizeOptions,
@@ -25,7 +25,7 @@ const universalizers: Partial<
 export async function universalizeBinaries(userOptions: UniversalizeOptions) {
   const options = applyDefaultUniversalizeOptions(userOptions)
 
-  const packageJsonPath = join(options.cwd, options.packageJsonPath)
+  const packageJsonPath = resolve(options.cwd, options.packageJsonPath)
 
   const config = await readNapiConfig(
     packageJsonPath,

package/src/commands/build.ts

@@ -35,6 +35,7 @@ export class BuildCommand extends BaseBuildCommand {
         } catch (e) {
           debug.error(`Failed to pipe output file ${output.path} to command`)
           debug.error(e)
+          throw e
         }
       }
     }

package/src/commands/new.ts

@@ -11,10 +11,20 @@ import {
   DEFAULT_TARGETS,
   type TargetTriple,
 } from '../utils/index.js'
-import { napiEngineRequirement } from '../utils/version.js'
+import {
+  napiEngineRequirement,
+  SUPPORTED_NAPI_VERSIONS,
+} from '../utils/version.js'
 
 const debug = debugFactory('new')
 
+export function getNapiVersionChoices() {
+  return SUPPORTED_NAPI_VERSIONS.map((version) => ({
+    name: `napi${version} (${napiEngineRequirement(version)})`,
+    value: version,
+  }))
+}
+
 export class NewCommand extends BaseNewCommand {
   interactive = Option.Boolean('--interactive,-i', true, {
     description:
@@ -77,10 +87,7 @@ export class NewCommand extends BaseNewCommand {
       message: 'Minimum node-api version (with node version requirement)',
       loop: false,
       pageSize: 10,
-      choices: Array.from({ length: 8 }, (_, i) => ({
-        name: `napi${i + 1} (${napiEngineRequirement(i + 1)})`,
-        value: i + 1,
-      })),
+      choices: getNapiVersionChoices(),
       // choice index
       default: this.minNodeApiVersion - 1,
     })

package/src/utils/misc.ts

@@ -43,6 +43,27 @@ export function pick<O, K extends keyof O>(o: O, ...keys: K[]): Pick<O, K> {
   }, {} as O)
 }
 
+function isPlainObject(value: unknown): value is Record<string, any> {
+  return value !== null && typeof value === 'object' && !Array.isArray(value)
+}
+
+function mergePackageJson(
+  old: Record<string, any>,
+  partial: Record<string, any>,
+): Record<string, any> {
+  const merged = { ...old }
+
+  for (const [key, value] of Object.entries(partial)) {
+    if (isPlainObject(merged[key]) && isPlainObject(value)) {
+      merged[key] = mergePackageJson(merged[key], value)
+    } else {
+      merged[key] = value
+    }
+  }
+
+  return merged
+}
+
 export async function updatePackageJson(
   path: string,
   partial: Record<string, any>,
@@ -53,7 +74,10 @@ export async function updatePackageJson(
     return
   }
   const old = JSON.parse(await readFileAsync(path, 'utf8'))
-  await writeFileAsync(path, JSON.stringify({ ...old, ...partial }, null, 2))
+  await writeFileAsync(
+    path,
+    JSON.stringify(mergePackageJson(old, partial), null, 2),
+  )
 }
 
 export const CLI_VERSION = pkgJson.version

package/src/utils/version.ts

@@ -25,6 +25,10 @@ const NAPI_VERSION_MATRIX = new Map<NapiVersion, string>([
   [NapiVersion.Napi9, '18.17.0 | 20.3.0 | 21.1.0'],
 ])
 
+export const SUPPORTED_NAPI_VERSIONS = Object.values(NapiVersion).filter(
+  (v): v is NapiVersion => typeof v === 'number',
+)
+
 interface NodeVersion {
   major: number
   minor: number