@napi-rs/cli 3.8.6 → 3.9.1

package/src/api/__tests__/templates.spec.ts

@@ -7,7 +7,10 @@ import {
   createWasiBrowserBinding,
   createWasiDeferredBrowserBinding,
 } from '../templates/load-wasi-template.js'
-import { createWasiBrowserWorkerBinding } from '../templates/wasi-worker-template.js'
+import {
+  createWasiBrowserWorkerBinding,
+  WASI_WORKER_TEMPLATE,
+} from '../templates/wasi-worker-template.js'
 
 const test = ava
 
@@ -228,6 +231,36 @@ const wasiLoaderCases: Array<{ name: string; code: string }> = [
   { name: 'deferred/workerd', code: createWasiDeferredBrowserBinding('test') },
 ]
 
+test('Node WASI loader uses an accessible host root on Android', (t) => {
+  const code = createWasiBinding('test', '@scope/test')
+  assertValidJS(t, code, 'Node WASI loader')
+  t.true(code.includes('const __cwd = process.cwd()'))
+  t.true(code.includes("process.platform === 'android' ? __cwd : __rootDir"))
+  t.true(code.includes('[__rootDir]: __hostRoot'))
+  t.true(code.includes('[__hostRoot]: __hostRoot'))
+  t.true(
+    code.includes('workerData: { hostRoot: __hostRoot, rootDir: __rootDir }'),
+  )
+  t.false(code.includes('[__rootDir]: __rootDir'))
+})
+
+test('Node WASI worker uses an accessible host root on Android', (t) => {
+  assertValidJS(t, WASI_WORKER_TEMPLATE, 'Node WASI worker')
+  t.true(
+    WASI_WORKER_TEMPLATE.includes(
+      "workerData && typeof workerData.rootDir === 'string' && workerData.rootDir",
+    ),
+  )
+  t.true(
+    WASI_WORKER_TEMPLATE.includes(
+      "workerData && typeof workerData.hostRoot === 'string' && workerData.hostRoot",
+    ),
+  )
+  t.true(WASI_WORKER_TEMPLATE.includes('[__rootDir]: __hostRoot'))
+  t.true(WASI_WORKER_TEMPLATE.includes('[__hostRoot]: __hostRoot'))
+  t.false(WASI_WORKER_TEMPLATE.includes('[__rootDir]: __rootDir'))
+})
+
 for (const { name, code } of wasiLoaderCases) {
   test(`WASI loader waits for queued settlements before destroy: ${name}`, (t) => {
     t.true(
@@ -284,6 +317,34 @@ function initializationRollbackBody(code: string): string {
   return code.slice(deferredStart, code.indexOf('throw error', deferredStart))
 }
 
+test('createCjsBinding uses one statement dialect', (t) => {
+  const code = createCjsBinding('test', '@scope/test', ['sum'], '1.0.0', [
+    'wasm32-wasi',
+  ])
+  t.false(
+    code.includes('NAPI_RS_NATIVE_LIBRARY_PATH);'),
+    'native library require must not use a leftover semicolon',
+  )
+  t.true(code.includes("const __napiWasiFlavors = ['wasm32-wasi']"))
+  t.false(code.includes('"wasm32-wasi"'))
+  t.true(code.includes("return require('./test.win32-x64-gnu.node')"))
+  const win32Gnu = code.slice(
+    code.indexOf("process.arch === 'x64'"),
+    code.indexOf("process.arch === 'ia32'"),
+  )
+  t.true(
+    win32Gnu.includes("          return require('./test.win32-x64-gnu.node')"),
+    'win32-x64 gnu local require must be indented inside try',
+  )
+})
+
+test('WASI worker template matches the CJS/ESM quote and semicolon dialect', (t) => {
+  t.true(WASI_WORKER_TEMPLATE.includes("import fs from 'node:fs'"))
+  t.false(WASI_WORKER_TEMPLATE.includes('from "node:fs"'))
+  t.false(WASI_WORKER_TEMPLATE.includes("from 'node:fs';"))
+  t.true(WASI_WORKER_TEMPLATE.includes('memory: wasmMemory,'))
+})
+
 test('createEsmBinding is Node 12 compatible', (t) => {
   const code = createEsmBinding('test', '@scope/test', ['sum'])
   assertValidJS(t, code, 'esm')
@@ -294,3 +355,25 @@ test('createEsmBinding is Node 12 compatible', (t) => {
   t.false(code.includes('?.'), 'ESM loader must not use optional chaining')
   t.false(code.includes('??'), 'ESM loader must not use nullish coalescing')
 })
+
+test('createEsmBinding builds native addon loading on portable ESM primitives', (t) => {
+  const code = createEsmBinding('test', '@scope/test', ['sum'])
+  assertValidJS(t, code, 'esm')
+  t.true(
+    code.includes(`import { createRequire } from 'module'`),
+    'ESM loader must import createRequire so native .node addons can be loaded without the CommonJS `require` global',
+  )
+  t.true(
+    code.includes('const require = createRequire(import.meta.url)'),
+    'ESM loader must derive `require` from the current module, not rely on a CommonJS global',
+  )
+  // `@napi-rs/cli` is a valid Node package but is not running under Deno. Deno
+  // rejects `URL.pathname` treated as a filesystem path, which is exactly how a
+  // `__dirname` built from `new URL('.', import.meta.url).pathname` behaves on
+  // Windows (percent-encoded, forward-slash separated). The ESM native loader
+  // never used `__dirname` anyway, so it must not emit that construct at all.
+  t.false(
+    /new URL\(['"]\.['"], import\.meta\.url\)\.pathname/.test(code),
+    'ESM loader must not treat URL.pathname as a filesystem path',
+  )
+})

package/src/api/build.ts

@@ -45,7 +45,10 @@ import {
   targetToEnvVar,
   tryInstallCargoBinary,
   unlinkAsync,
+  rustBundledWasiLibc,
+  wasiLibcHasNewFutexAbi,
   wasiLoaderSuffix,
+  wasiSdkMajorVersion,
   wasiTargetHasThreads,
   writeFileAtomic,
   withFileSystemReconciliation,
@@ -84,8 +87,13 @@ type WasiBindingMetadata = {
   bindingTypeDef?: string
 }
 
+export type BuildFormat = 'esm' | 'commonjs'
+
 type BuildOptions = RawBuildOptions & { cargoOptions?: string[] }
-type ParsedBuildOptions = Omit<BuildOptions, 'cwd'> & { cwd: string }
+type ParsedBuildOptions = Omit<BuildOptions, 'cwd' | 'format'> & {
+  cwd: string
+  format: BuildFormat
+}
 
 export const WASI_ARTIFACT_METADATA_PREFIX = '// napi-rs-artifact-metadata:'
 
@@ -218,6 +226,83 @@ export function getTypeDefCacheFolder(options: {
   return join(options.targetDir, 'napi-rs', `${options.crateName}-${hash}`)
 }
 
+/**
+ * Name of the emnapi archive directory built against the wasi-sdk 34 ABI.
+ * Only the threaded target has one: the signature change it carries lives in
+ * the threads-only futex code.
+ */
+export const EMNAPI_WASI_SDK_34_LINK_DIR = 'wasm32-wasip1-threads-wasi-sdk-34'
+
+export interface EmnapiLinkDirSelection {
+  /** Directory name under `emnapi/lib` whose archives should be linked. */
+  linkDirName: string
+  /** Detected wasi-sdk major version, `null` when no wasi-sdk is configured. */
+  wasiSdkMajor: number | null
+  /** `true` when the toolchain needs the wasi-sdk 34 archives. */
+  needsWasiSdk34: boolean
+}
+
+/**
+ * Pick the emnapi archive directory for a WASI build.
+ *
+ * wasi-libc removed the unused `int op` parameter from
+ * `__wasilibc_futex_wait_atomic_wait` / `__wasilibc_futex_wait_maybe_busy`,
+ * and wasi-sdk 34 is the first release shipping the 3-argument signature.
+ * Linking the legacy 4-argument archives against a wasi-sdk >= 34 sysroot
+ * makes `wasm-ld` report `function signature mismatch` and emit an invalid
+ * wasm module, so emnapi publishes a second archive set for the new ABI and
+ * the directory has to be chosen by wasi-sdk version, not by target triple.
+ *
+ * Without `WASI_SDK_PATH`, cargo links through `rust-lld` against the
+ * wasi-libc bundled with the Rust standard library, so that archive is
+ * probed instead. Rust picked up wasi-sdk 34 in rust-lang/rust#161773, which
+ * lands in 1.100, and a toolchain carrying it needs the new archives even
+ * though no wasi-sdk is configured.
+ *
+ * The legacy directory stays the default whenever the ABI cannot be
+ * determined, and older emnapi releases ship it alone.
+ */
+export function selectEmnapiLinkDir(
+  emnapiLibDir: string,
+  wasiTarget: string,
+  hasThreads: boolean,
+  wasiSdkPath: string | undefined,
+  {
+    cwd,
+    rustWasiLibc,
+  }: {
+    // The directory Cargo is spawned in. It selects the toolchain, so the
+    // sysroot probe has to use it too.
+    cwd?: string
+    // Omit to resolve the Rust sysroot lazily, so a configured wasi-sdk never
+    // pays for a `rustc` invocation. Pass `null` to skip the probe.
+    rustWasiLibc?: string | null
+  } = {},
+): EmnapiLinkDirSelection {
+  const usingWasiSdk = Boolean(wasiSdkPath) && existsSync(wasiSdkPath!)
+  const wasiSdkMajor = usingWasiSdk ? wasiSdkMajorVersion(wasiSdkPath!) : null
+  // Whichever wasi-libc actually gets linked decides the ABI: the wasi-sdk
+  // sysroot when one is configured, otherwise the copy bundled with the Rust
+  // standard library. Only the threaded target has a second archive set, so
+  // `hasThreads` gates the probe as well as the result — a threadless build
+  // must not pay for a `rustc` invocation and an archive read it cannot use.
+  const needsWasiSdk34 =
+    hasThreads &&
+    (usingWasiSdk
+      ? wasiSdkMajor !== null && wasiSdkMajor >= 34
+      : wasiLibcHasNewFutexAbi(
+          rustWasiLibc === undefined
+            ? rustBundledWasiLibc(wasiTarget, cwd)
+            : rustWasiLibc,
+        ) === true)
+  const linkDirName =
+    needsWasiSdk34 &&
+    existsSync(join(emnapiLibDir, EMNAPI_WASI_SDK_34_LINK_DIR))
+      ? EMNAPI_WASI_SDK_34_LINK_DIR
+      : wasiTarget
+  return { linkDirName, wasiSdkMajor, needsWasiSdk34 }
+}
+
 export function createWasiCompilerFlags(
   wasiSdkPath: string,
   wasiTarget: string,
@@ -569,12 +654,57 @@ function readWasmU32(binary: Uint8Array, start: number) {
   throw new Error('Invalid WebAssembly unsigned LEB128 value')
 }
 
+type BuildFormatOptions = {
+  format?: string
+  esm?: boolean
+  commonjs?: boolean
+}
+
+/**
+ * Resolve the explicit build format and its legacy CLI/API aliases.
+ *
+ * CommonJS is the historical default. The aliases are intentionally kept
+ * separate from `format` because `--esm` and `--commonjs` are boolean flags,
+ * while `--format` takes a value.
+ */
+export function resolveBuildFormat(options: BuildFormatOptions): BuildFormat {
+  let format: BuildFormat | undefined
+  if (options.format !== undefined) {
+    if (options.format === 'esm' || options.format === 'commonjs') {
+      format = options.format
+    } else {
+      throw new Error(
+        `Invalid build format ${JSON.stringify(options.format)}. Expected \`esm\` or \`commonjs\`.`,
+      )
+    }
+  }
+
+  if (options.esm && options.commonjs) {
+    throw new Error('`--esm` and `--commonjs` cannot be used together.')
+  }
+
+  const aliasFormat = options.esm
+    ? 'esm'
+    : options.commonjs
+      ? 'commonjs'
+      : undefined
+  if (format && aliasFormat && format !== aliasFormat) {
+    throw new Error(
+      `\`--format ${format}\` cannot be used with \`--${aliasFormat}\`.`,
+    )
+  }
+
+  return format ?? aliasFormat ?? 'commonjs'
+}
+
+/** Build the configured NAPI-RS crate and generate its output artifacts. */
 export async function buildProject(rawOptions: BuildOptions) {
   debug('napi build command receive options: %O', rawOptions)
 
   const options: ParsedBuildOptions = {
     dtsCache: true,
     ...rawOptions,
+    format: resolveBuildFormat(rawOptions),
     cwd: rawOptions.cwd ?? process.cwd(),
   }
 
@@ -1411,16 +1541,40 @@ class Builder {
   private setWasiEnv() {
     const hasThreads = wasiTargetHasThreads(this.target)
     const wasiTarget = hasThreads ? 'wasm32-wasip1-threads' : 'wasm32-wasip1'
-    const emnapi = join(require.resolve('emnapi'), '..', 'lib', wasiTarget)
+    const emnapiLibDir = join(require.resolve('emnapi'), '..', 'lib')
     const emnapiVersion = require('emnapi/package.json').version
+    const { WASI_SDK_PATH } = process.env
+    // `wasiTarget` stays the real target triple, because it is what the clang
+    // driver is told to build for below. The emnapi archive directory is a
+    // separate choice: emnapi ships two archive sets for the threaded target,
+    // one per wasi-libc futex ABI. See `selectEmnapiLinkDir`.
+    const { linkDirName, wasiSdkMajor, needsWasiSdk34 } = selectEmnapiLinkDir(
+      emnapiLibDir,
+      wasiTarget,
+      hasThreads,
+      WASI_SDK_PATH,
+      { cwd: this.options.cwd },
+    )
+    const emnapi = join(emnapiLibDir, linkDirName)
     // Keep this in sync with `emnapi_link_library` in `crates/build/src/wasi.rs`.
     const emnapiArchive = join(
       emnapi,
       hasThreads ? 'libemnapi-napi-rs-mt.a' : 'libemnapi-basic-napi-rs.a',
     )
+    const fellBackToLegacy =
+      needsWasiSdk34 && linkDirName !== EMNAPI_WASI_SDK_34_LINK_DIR
     if (!existsSync(emnapiArchive)) {
       throw new Error(
-        `emnapi@${emnapiVersion} is missing the ${wasiTarget} archive required by napi-rs at ${emnapiArchive}. Install emnapi v2 with support for this target.`,
+        fellBackToLegacy
+          ? `emnapi@${emnapiVersion} does not ship the ${EMNAPI_WASI_SDK_34_LINK_DIR} archives that wasi-sdk ${wasiSdkMajor} requires, and the ${linkDirName} archive it fell back to is missing too at ${emnapiArchive}. Upgrade emnapi to a version that ships the wasi-sdk 34 archives.`
+          : needsWasiSdk34
+            ? `emnapi@${emnapiVersion} is missing the ${linkDirName} archive required by napi-rs at ${emnapiArchive}. wasi-sdk ${wasiSdkMajor} needs those archives, so upgrade emnapi to a version that ships them.`
+            : `emnapi@${emnapiVersion} is missing the ${linkDirName} archive required by napi-rs at ${emnapiArchive}. Install emnapi v2 with support for this target.`,
+      )
+    }
+    if (fellBackToLegacy) {
+      debug.warn(
+        `emnapi@${emnapiVersion} does not ship the ${EMNAPI_WASI_SDK_34_LINK_DIR} archives that wasi-sdk ${wasiSdkMajor} requires. Falling back to ${linkDirName}, which links the legacy wasi-libc futex ABI and may fail with \`wasm-ld: function signature mismatch\`. Upgrade emnapi to fix this.`,
       )
     }
     this.envs.EMNAPI_LINK_DIR = emnapi
@@ -1449,7 +1603,6 @@ class Builder {
         `emnapi version mismatch: emnapi@${emnapiVersion}, @emnapi/core@${emnapiCoreVersion}, @emnapi/runtime@${emnapiRuntimeVersion}. Please ensure all emnapi packages are the same version.`,
       )
     }
-    const { WASI_SDK_PATH } = process.env
 
     if (WASI_SDK_PATH && existsSync(WASI_SDK_PATH)) {
       this.envs.CARGO_TARGET_WASM32_WASI_PREVIEW1_THREADS_LINKER = join(
@@ -2003,7 +2156,7 @@ class Builder {
       noJsBinding: this.options.noJsBinding,
       idents,
       jsBinding: this.options.jsBinding,
-      esm: this.options.esm,
+      format: this.options.format,
       binaryName: this.config.binaryName,
       packageName: this.options.jsPackageName ?? this.config.packageName,
       version: process.env.npm_new_version ?? this.config.packageJson.version,
@@ -2352,7 +2505,9 @@ export interface WriteJsBindingOptions {
   noJsBinding?: boolean
   idents: string[]
   jsBinding?: string
+  format?: BuildFormat
   esm?: boolean
+  commonjs?: boolean
   binaryName: string
   packageName: string
   version: string
@@ -2366,6 +2521,7 @@ export interface WriteJsBindingOptions {
   wasiFlavors?: string[]
 }
 
+/** Write a platform binding loader in the requested module format. */
 export async function writeJsBinding(
   options: WriteJsBindingOptions,
 ): Promise<Output | undefined> {
@@ -2389,7 +2545,8 @@ export async function writeJsBinding(
     ? localWasiName
     : `./${localWasiName}`
 
-  const createBinding = options.esm ? createEsmBinding : createCjsBinding
+  const createBinding =
+    resolveBuildFormat(options) === 'esm' ? createEsmBinding : createCjsBinding
   const binding = createBinding(
     options.binaryName,
     options.packageName,
@@ -2506,10 +2663,27 @@ export declare class ExternalObject<T> {
 
   if (dts.indexOf('TypedArray') > -1) {
     header += `
-export type TypedArray = Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array | BigInt64Array | BigUint64Array
+export type TypedArray =
+  | Int8Array
+  | Uint8Array
+  | Uint8ClampedArray
+  | Int16Array
+  | Uint16Array
+  | Int32Array
+  | Uint32Array
+  | Float32Array
+  | Float64Array
+  | BigInt64Array
+  | BigUint64Array
 `
   }
 
+  if (header && !header.endsWith('\n')) {
+    header += '\n'
+  }
+  if (header && !header.endsWith('\n\n')) {
+    header += '\n'
+  }
   dts = header + dts
   const dtsWithTypeImports = rewriteTypeImportReferences(
     header + dtsWithTypeImportMarkers,

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

@@ -28,6 +28,7 @@ import {
   pick,
   resolvePackageReconciliationPaths,
   restrictWasiNodeEngine,
+  serializeJson,
   wasiLoaderSuffix,
   wasiTargetHasThreads,
   withFileSystemReconciliation,
@@ -574,7 +575,7 @@ async function createNpmDirsUnlocked(
 
     const targetPackageJson = join(targetDir, 'package.json')
     pendingWrites.push({
-      content: JSON.stringify(scopedPackageJson, null, 2) + '\n',
+      content: serializeJson(scopedPackageJson),
       destination: targetPackageJson,
     })
     if (wasmModuleTypeDef) {

package/src/api/new.ts

@@ -4,8 +4,8 @@ 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 { parse as parseToml } from '@std/toml'
+import { load as yamlLoad } from 'js-yaml'
 
 import {
   applyDefaultNewOptions,
@@ -15,6 +15,9 @@ import {
   AVAILABLE_TARGETS,
   CLI_VERSION,
   debugFactory,
+  serializeJson,
+  serializeToml,
+  serializeYaml,
   DEFAULT_TARGETS,
   getWasiTarget,
   mkdirAsync,
@@ -347,7 +350,7 @@ async function filterTargetsInPackageJson(
     }
   }
 
-  await fs.writeFile(filePath, JSON.stringify(packageJson, null, 2) + '\n')
+  await fs.writeFile(filePath, serializeJson(packageJson))
   await updateGeneratedWasiAttributes(
     path.join(path.dirname(filePath), '.gitattributes'),
     packageJson.napi.binaryName,
@@ -381,10 +384,10 @@ async function updateGeneratedWasiAttributes(
       generatedFiles.add(`${binaryName}.${suffix}-deferred.d.ts`)
     }
   }
+  while (lines[lines.length - 1] === '') {
+    lines.pop()
+  }
   if (generatedFiles.size > 0) {
-    while (lines[lines.length - 1] === '') {
-      lines.pop()
-    }
     lines.push(
       '',
       ...[...generatedFiles].map((file) => `${file} linguist-detectable=false`),
@@ -429,7 +432,7 @@ async function updateCargoTomlTypeDef(
 
   dependencies['napi-derive'] = dependencyConfig
 
-  await fs.writeFile(filePath, stringifyToml(cargoToml))
+  await fs.writeFile(filePath, serializeToml(cargoToml))
 }
 
 export async function updateCargoTomlNodeApiVersion(
@@ -475,7 +478,7 @@ export async function updateCargoTomlNodeApiVersion(
 
   dependencies.napi = dependencyConfig
 
-  await fs.writeFile(filePath, stringifyToml(cargoToml))
+  await fs.writeFile(filePath, serializeToml(cargoToml))
 }
 
 async function filterTargetsInGithubActions(
@@ -683,12 +686,7 @@ async function filterTargetsInGithubActions(
   }
 
   // Write back the filtered YAML
-  const updatedYaml = yamlDump(yaml, {
-    lineWidth: -1,
-    noRefs: true,
-    sortKeys: false,
-  })
-  await fs.writeFile(filePath, updatedYaml)
+  await fs.writeFile(filePath, serializeYaml(yaml))
 }
 
 function processOptions(options: RawNewOptions) {
@@ -853,10 +851,7 @@ export async function newProject(userOptions: RawNewOptions) {
         )
       }
 
-      await fs.writeFile(
-        packageJsonPath,
-        JSON.stringify(pkgJson, null, 2) + '\n',
-      )
+      await fs.writeFile(packageJsonPath, serializeJson(pkgJson))
     } catch (error) {
       throw new Error(`Failed to create project: ${error}`)
     }

package/src/api/pre-publish.ts

@@ -58,6 +58,7 @@ import {
   withFileSystemReconciliation,
   AVAILABLE_TARGETS,
   parseTriple,
+  serializeJson,
   type CommonPackageJsonFields,
   type FileSystemTransactionWrite,
   type RootPublisher,
@@ -2267,7 +2268,7 @@ async function registerPublicationWorkspaces(
   } else {
     manifest.workspaces = releaseWorkspaces
   }
-  await writeFileAtomic(manifestPath, JSON.stringify(manifest, null, 2))
+  await writeFileAtomic(manifestPath, serializeJson(manifest))
 }
 
 async function createPublicationExecutionPackage(
@@ -2391,10 +2392,7 @@ async function materializeRootReleasePlan(
     }
   }
   syncThreadlessWasiRootFacadeManifest(updatedPackageJson, plan.packageJson)
-  await writeFileAtomic(
-    packageJsonPath,
-    JSON.stringify(updatedPackageJson, null, 2),
-  )
+  await writeFileAtomic(packageJsonPath, serializeJson(updatedPackageJson))
 
   const generatedFiles = new Set(plan.facade?.generatedFiles ?? [])
   await Promise.all(
@@ -2492,7 +2490,7 @@ async function stageReleasePackage(
   const packageJsonPath = join(stagedPkgDir, 'package.json')
   const packageJson = JSON.parse(await readFileAsync(packageJsonPath, 'utf8'))
   packageJson.version = packageVersion
-  await writeFileAtomic(packageJsonPath, JSON.stringify(packageJson, null, 2))
+  await writeFileAtomic(packageJsonPath, serializeJson(packageJson))
   return {
     pkgDir: options.pkgDir,
     rootDir: options.rootDir,
@@ -2705,10 +2703,7 @@ async function validateReleasePackageContents({
   if (updateManifest) {
     packageFiles.splice(0, packageFiles.length, ...declarationClosure.files)
     packageJson.files = packageFiles
-    await writeFileAtomic(
-      packageJsonPath,
-      `${JSON.stringify(packageJson, null, 2)}\n`,
-    )
+    await writeFileAtomic(packageJsonPath, serializeJson(packageJson))
   }
 
   const publicFiles = new Set<string>(packageFiles)

package/src/api/rename.ts

@@ -12,8 +12,8 @@ import {
   sep,
 } from 'node:path'
 
-import { parse as parseToml, stringify as stringifyToml } from '@std/toml'
-import { load as yamlParse, dump as yamlStringify } from 'js-yaml'
+import { parse as parseToml } from '@std/toml'
+import { load as yamlParse } from 'js-yaml'
 import { isNil, omitBy, pick } from 'es-toolkit'
 
 import { applyDefaultRenameOptions, type RenameOptions } from '../def/rename.js'
@@ -23,6 +23,9 @@ import {
   readFileAsync,
   resolvePackageReconciliationPaths,
   type Target,
+  serializeJson,
+  serializeToml,
+  serializeYaml,
   wasiLoaderSuffix,
   wasiTargetHasThreads,
   withPackageFileSystemReconciliation,
@@ -1265,10 +1268,6 @@ function updateNapiConfigRecord(record: JsonRecord, options: RenameOptions) {
   }
 }
 
-function serializeJsonLike(content: string, value: unknown) {
-  return `${JSON.stringify(value, null, 2)}${content.endsWith('\n') ? '\n' : ''}`
-}
-
 function sanitizeCargoPackageName(binaryName: string) {
   return binaryName.replace(/[^A-Za-z0-9_]/g, '_').toLowerCase()
 }
@@ -1458,8 +1457,7 @@ async function renameProjectUnlocked(
   const plan = new RenameTransactionPlan()
   plan.addWrite(
     packageJsonPath,
-    serializeJsonLike(
-      packageJsonContent,
+    serializeJson(
       rewritePackageManifest(
         packageJsonData,
         managedWasiRenames,
@@ -1477,11 +1475,7 @@ async function renameProjectUnlocked(
       throw new Error(`NAPI config must contain a JSON object: ${configPath}`)
     }
     updateNapiConfigRecord(configData, options)
-    plan.addWrite(
-      configPath,
-      serializeJsonLike(configContent, configData),
-      configMode,
-    )
+    plan.addWrite(configPath, serializeJson(configData), configMode)
   }
 
   if (binaryNameChanged) {
@@ -1495,7 +1489,7 @@ async function renameProjectUnlocked(
     const cargoToml = parseToml(tomlContent) as any
     if (cargoToml.package) {
       cargoToml.package.name = sanitizeCargoPackageName(newName)
-      plan.addWrite(cargoTomlPath, stringifyToml(cargoToml), cargoTomlMode)
+      plan.addWrite(cargoTomlPath, serializeToml(cargoToml), cargoTomlMode)
     }
 
     const workflowPath = join(projectRoot, '.github', 'workflows', 'CI.yml')
@@ -1515,11 +1509,7 @@ async function renameProjectUnlocked(
         workflowData.env.APP_NAME = newName
         plan.addWrite(
           canonicalWorkflowPath,
-          yamlStringify(workflowData, {
-            lineWidth: -1,
-            noRefs: true,
-            sortKeys: false,
-          }),
+          serializeYaml(workflowData),
           workflowMode,
         )
       }
@@ -1567,8 +1557,7 @@ async function renameProjectUnlocked(
             `Managed package manifest must contain a JSON object: ${targetPackageJsonPath}`,
           )
         }
-        const updatedContent = serializeJsonLike(
-          content,
+        const updatedContent = serializeJson(
           rewritePackageManifest(
             manifest,
             managedWasiRenames,

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

@@ -43,11 +43,11 @@ function createWasiFallbackChain(
         specifier,
         isPackage,
         localArtifacts,
-      }) => `  if (!wasiBindingLoaded && (!__napiWasiFlavorRequested || __napiWasiFlavor === ${JSON.stringify(flavor)})) {
+      }) => `  if (!wasiBindingLoaded && (!__napiWasiFlavorRequested || __napiWasiFlavor === '${flavor}')) {
     let candidateError = null
     let candidateFailed = false
     try {
-      candidateError = __napiWasiResolveCandidate('${specifier}', ${isPackage}, ${JSON.stringify(localArtifacts)})
+      candidateError = __napiWasiResolveCandidate('${specifier}', ${isPackage}, ${localArtifacts ? `[${localArtifacts.map((artifact) => `'${artifact}'`).join(', ')}]` : 'undefined'})
       candidateFailed = candidateError !== null
       if (!candidateFailed) {${
         isPackage && packageVersion
@@ -157,7 +157,6 @@ ${idents.map((ident) => `export { ${ident} }`).join('\n')}`
   return `${bindingHeader}
 import { createRequire } from 'module'
 const require = createRequire(import.meta.url)
-const __dirname = new URL('.', import.meta.url).pathname
 
 ${createCommonBinding(
   localName,
@@ -170,8 +169,7 @@ ${exportsCode}
 `
 }
 
-const bindingHeader = `// prettier-ignore
-/* eslint-disable */
+const bindingHeader = `/* eslint-disable */
 // @ts-nocheck
 /* auto-generated by NAPI-RS */
 `
@@ -273,7 +271,7 @@ const isMuslFromChildProcess = () => {
 function requireNative() {
   if (process.env.NAPI_RS_NATIVE_LIBRARY_PATH) {
     try {
-      return require(process.env.NAPI_RS_NATIVE_LIBRARY_PATH);
+      return require(process.env.NAPI_RS_NATIVE_LIBRARY_PATH)
     } catch (err) {
       loadErrors.push(err)
     }
@@ -288,9 +286,9 @@ function requireNative() {
   } else if (process.platform === 'win32') {
     if (process.arch === 'x64') {
       if ((process.config && process.config.variables && process.config.variables.shlib_suffix === 'dll.a') || (process.config && process.config.variables && process.config.variables.node_target_type === 'shared_library')) {
-        ${requireTuple('win32-x64-gnu')}
+        ${requireTuple('win32-x64-gnu', 10)}
       } else {
-        ${requireTuple('win32-x64-msvc')}
+        ${requireTuple('win32-x64-msvc', 10)}
       }
     } else if (process.arch === 'ia32') {
       ${requireTuple('win32-ia32-msvc')}
@@ -396,7 +394,7 @@ function createLoadErrorChain(errors) {
 //
 // NAPI_RS_WASI_FLAVOR selects one exact generated flavor and implies strict
 // WASI loading. It never crosses into another flavor or falls back to native.
-const __napiWasiFlavors = ${JSON.stringify(flavors)}
+const __napiWasiFlavors = [${flavors.map((flavor) => `'${flavor}'`).join(', ')}]
 const __napiWasiFlavor = process.env.NAPI_RS_WASI_FLAVOR
 const __napiWasiFlavorRequested =
   typeof __napiWasiFlavor === 'string' && __napiWasiFlavor.length > 0