@napi-rs/cli 3.9.0 → 3.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/cli",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "description": "Cli tools for napi-rs",
   "author": "LongYinan <lynweklm@gmail.com>",
   "homepage": "https://napi.rs/",
@@ -68,7 +68,7 @@
     "clipanion": "^4.0.0-rc.4",
     "colorette": "^2.0.20",
     "es-toolkit": "^1.47.0",
-    "js-yaml": "^4.2.0",
+    "js-yaml": "^5.0.0",
     "obug": "^2.1.2",
     "semver": "^7.8.2",
     "typanion": "^3.14.0",
@@ -87,9 +87,8 @@
     "emnapi": "^2.0.0-alpha.4",
     "empathic": "^2.0.1",
     "env-paths": "^4.0.0",
-    "oxc-parser": "^0.148.0",
-    "prettier": "^3.8.3",
-    "tsdown": "^0.22.2",
+    "oxc-parser": "^0.149.0",
+    "tsdown": "^0.23.0",
     "tslib": "^2.8.1"
   },
   "peerDependencies": {

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

@@ -61,11 +61,11 @@ Generated by [AVA](https://avajs.dev).
     let __emnapiWasmEnvCleanupDrainPromise␊
     let __wasiDisposed = false␊
     let __wasiDisposePromise␊
-    let __completeWasiDisposal = function() {}␊
+    let __completeWasiDisposal = function () {}␊
     // Overridden by loader flavors that have a last-resort reclaim for a rollback␊
     // that stopped short of destroying the context. See␊
     // \`__rollbackWasiInitialization\`.␊
-    let __retainWasiRollbackForRetry = function() {}␊
+    let __retainWasiRollbackForRetry = function () {}␊
     ␊
     function __isThenable(value) {␊
       return (␊
@@ -669,11 +669,11 @@ Generated by [AVA](https://avajs.dev).
     let __emnapiWasmEnvCleanupDrainPromise␊
     let __wasiDisposed = false␊
     let __wasiDisposePromise␊
-    let __completeWasiDisposal = function() {}␊
+    let __completeWasiDisposal = function () {}␊
     // Overridden by loader flavors that have a last-resort reclaim for a rollback␊
     // that stopped short of destroying the context. See␊
     // \`__rollbackWasiInitialization\`.␊
-    let __retainWasiRollbackForRetry = function() {}␊
+    let __retainWasiRollbackForRetry = function () {}␊
     ␊
     function __isThenable(value) {␊
       return (␊
@@ -1296,11 +1296,11 @@ Generated by [AVA](https://avajs.dev).
     let __emnapiWasmEnvCleanupDrainPromise␊
     let __wasiDisposed = false␊
     let __wasiDisposePromise␊
-    let __completeWasiDisposal = function() {}␊
+    let __completeWasiDisposal = function () {}␊
     // Overridden by loader flavors that have a last-resort reclaim for a rollback␊
     // that stopped short of destroying the context. See␊
     // \`__rollbackWasiInitialization\`.␊
-    let __retainWasiRollbackForRetry = function() {}␊
+    let __retainWasiRollbackForRetry = function () {}␊
     ␊
     function __isThenable(value) {␊
       return (␊
@@ -1880,10 +1880,9 @@ Generated by [AVA](https://avajs.dev).
             // eslint-disable-next-line no-console␊
             console.log.apply(console, arguments)␊
           },␊
-          printErr: function() {␊
+          printErr: function () {␊
             // eslint-disable-next-line no-console␊
             console.error.apply(console, arguments)␊
-            ␊
           },␊
         })␊
         return instantiateNapiModuleSync(wasmModule, {␊
@@ -1904,7 +1903,6 @@ Generated by [AVA](https://avajs.dev).
           },␊
         })␊
       },␊
-      ␊
     })␊
     ␊
     globalThis.onmessage = function (e) {␊
@@ -1933,10 +1931,9 @@ Generated by [AVA](https://avajs.dev).
             // eslint-disable-next-line no-console␊
             console.log.apply(console, arguments)␊
           },␊
-          printErr: function() {␊
+          printErr: function () {␊
             // eslint-disable-next-line no-console␊
             console.error.apply(console, arguments)␊
-            ␊
             errorOutputs.push([...arguments])␊
           },␊
         })␊
@@ -1998,10 +1995,9 @@ Generated by [AVA](https://avajs.dev).
             // eslint-disable-next-line no-console␊
             console.log.apply(console, arguments)␊
           },␊
-          printErr: function() {␊
+          printErr: function () {␊
             // eslint-disable-next-line no-console␊
             console.error.apply(console, arguments)␊
-            ␊
             errorOutputs.push([...arguments])␊
           },␊
         })␊

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

@@ -25,9 +25,11 @@ import ava, { type ExecutionContext, type TestFn } from 'ava'
 
 import {
   buildProject,
+  EMNAPI_WASI_SDK_34_LINK_DIR,
   generateTypeDef,
   napiCrossToolchainEnvs,
   resolveBuildFormat,
+  selectEmnapiLinkDir,
   validateCrossCompileFlags,
   validateNapiCrossSupport,
   writeJsBinding,
@@ -1108,3 +1110,195 @@ const isNapiCrossUnsupportedHost =
     )
   },
 )
+
+async function createEmnapiLibDir(root: string, dirNames: string[]) {
+  const emnapiLibDir = join(root, 'emnapi', 'lib')
+  for (const dirName of dirNames) {
+    await mkdir(join(emnapiLibDir, dirName), { recursive: true })
+  }
+  return emnapiLibDir
+}
+
+async function createWasiSdkDir(root: string, version: string) {
+  const wasiSdkPath = join(root, `wasi-sdk-${version}`)
+  await mkdir(wasiSdkPath, { recursive: true })
+  await writeFile(join(wasiSdkPath, 'VERSION'), `${version}\n`)
+  return wasiSdkPath
+}
+
+async function createWasiLibcArchive(
+  projectDir: string,
+  abi: 'legacy' | 'new',
+) {
+  const libcPath = join(projectDir, `libc-${abi}.a`)
+  // Only the archive member names matter: wasi-libc moved the futex helpers
+  // into `futex.c` when it dropped the `int op` parameter, and kept `__wait.c`
+  // for other symbols.
+  const members =
+    abi === 'new'
+      ? ['__wait.c.obj', 'futex.c.obj']
+      : ['__wait.c.obj', '__wasilibc_busywait.c.obj']
+  await writeFile(libcPath, `!<arch>\n${members.join('\n')}\n`)
+  return libcPath
+}
+
+test('selects the wasi-sdk 34 emnapi archives for wasi-sdk >= 34', async (t) => {
+  const { projectDir } = t.context
+  const emnapiLibDir = await createEmnapiLibDir(projectDir, [
+    'wasm32-wasip1',
+    'wasm32-wasip1-threads',
+    EMNAPI_WASI_SDK_34_LINK_DIR,
+  ])
+  const wasiSdkPath = await createWasiSdkDir(projectDir, '34.0')
+
+  t.deepEqual(
+    selectEmnapiLinkDir(
+      emnapiLibDir,
+      'wasm32-wasip1-threads',
+      true,
+      wasiSdkPath,
+    ),
+    {
+      linkDirName: EMNAPI_WASI_SDK_34_LINK_DIR,
+      wasiSdkMajor: 34,
+      needsWasiSdk34: true,
+    },
+  )
+})
+
+test('keeps the legacy emnapi archives for wasi-sdk <= 33', async (t) => {
+  const { projectDir } = t.context
+  const emnapiLibDir = await createEmnapiLibDir(projectDir, [
+    'wasm32-wasip1-threads',
+    EMNAPI_WASI_SDK_34_LINK_DIR,
+  ])
+  const wasiSdkPath = await createWasiSdkDir(projectDir, '33.0')
+
+  t.deepEqual(
+    selectEmnapiLinkDir(
+      emnapiLibDir,
+      'wasm32-wasip1-threads',
+      true,
+      wasiSdkPath,
+    ),
+    {
+      linkDirName: 'wasm32-wasip1-threads',
+      wasiSdkMajor: 33,
+      needsWasiSdk34: false,
+    },
+  )
+})
+
+test('keeps the legacy emnapi archives when the wasi-libc ABI is unknown', async (t) => {
+  const { projectDir } = t.context
+  const emnapiLibDir = await createEmnapiLibDir(projectDir, [
+    'wasm32-wasip1-threads',
+    EMNAPI_WASI_SDK_34_LINK_DIR,
+  ])
+
+  t.deepEqual(
+    // `null` stands in for a Rust sysroot that cannot be probed.
+    selectEmnapiLinkDir(
+      emnapiLibDir,
+      'wasm32-wasip1-threads',
+      true,
+      undefined,
+      { rustWasiLibc: null },
+    ),
+    {
+      linkDirName: 'wasm32-wasip1-threads',
+      wasiSdkMajor: null,
+      needsWasiSdk34: false,
+    },
+  )
+})
+
+test('keeps the legacy emnapi archives for a pre wasi-sdk 34 Rust toolchain', async (t) => {
+  const { projectDir } = t.context
+  const emnapiLibDir = await createEmnapiLibDir(projectDir, [
+    'wasm32-wasip1-threads',
+    EMNAPI_WASI_SDK_34_LINK_DIR,
+  ])
+  const rustWasiLibc = await createWasiLibcArchive(projectDir, 'legacy')
+
+  t.deepEqual(
+    selectEmnapiLinkDir(
+      emnapiLibDir,
+      'wasm32-wasip1-threads',
+      true,
+      undefined,
+      { rustWasiLibc },
+    ),
+    {
+      linkDirName: 'wasm32-wasip1-threads',
+      wasiSdkMajor: null,
+      needsWasiSdk34: false,
+    },
+  )
+})
+
+test('selects the wasi-sdk 34 archives for a Rust toolchain that bundles the new wasi-libc', async (t) => {
+  const { projectDir } = t.context
+  const emnapiLibDir = await createEmnapiLibDir(projectDir, [
+    'wasm32-wasip1-threads',
+    EMNAPI_WASI_SDK_34_LINK_DIR,
+  ])
+  const rustWasiLibc = await createWasiLibcArchive(projectDir, 'new')
+
+  t.deepEqual(
+    // No wasi-sdk is configured: cargo links Rust's bundled wasi-libc, and
+    // Rust picked up wasi-sdk 34 in rust-lang/rust#161773.
+    selectEmnapiLinkDir(
+      emnapiLibDir,
+      'wasm32-wasip1-threads',
+      true,
+      undefined,
+      { rustWasiLibc },
+    ),
+    {
+      linkDirName: EMNAPI_WASI_SDK_34_LINK_DIR,
+      wasiSdkMajor: null,
+      needsWasiSdk34: true,
+    },
+  )
+})
+
+test('never selects the wasi-sdk 34 archives for the threadless target', async (t) => {
+  const { projectDir } = t.context
+  const emnapiLibDir = await createEmnapiLibDir(projectDir, [
+    'wasm32-wasip1',
+    EMNAPI_WASI_SDK_34_LINK_DIR,
+  ])
+  const wasiSdkPath = await createWasiSdkDir(projectDir, '34.0')
+
+  t.deepEqual(
+    selectEmnapiLinkDir(emnapiLibDir, 'wasm32-wasip1', false, wasiSdkPath),
+    {
+      linkDirName: 'wasm32-wasip1',
+      wasiSdkMajor: 34,
+      needsWasiSdk34: false,
+    },
+  )
+})
+
+test('falls back to the legacy archives when emnapi has no wasi-sdk 34 directory', async (t) => {
+  const { projectDir } = t.context
+  const emnapiLibDir = await createEmnapiLibDir(projectDir, [
+    'wasm32-wasip1-threads',
+  ])
+  const wasiSdkPath = await createWasiSdkDir(projectDir, '34.0')
+
+  t.deepEqual(
+    selectEmnapiLinkDir(
+      emnapiLibDir,
+      'wasm32-wasip1-threads',
+      true,
+      wasiSdkPath,
+    ),
+    {
+      linkDirName: 'wasm32-wasip1-threads',
+      wasiSdkMajor: 34,
+      needsWasiSdk34: true,
+    },
+  )
+})

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

@@ -131,9 +131,10 @@ test('should omit exports fields from publishConfig in scoped packages', async (
   const scopedPackageJsonPath = join(scopedDir, 'package.json')
   t.true(existsSync(scopedPackageJsonPath))
 
-  const scopedPackageJson = JSON.parse(
-    await readFile(scopedPackageJsonPath, 'utf-8'),
-  )
+  const scopedPackageJsonSource = await readFile(scopedPackageJsonPath, 'utf-8')
+  t.true(scopedPackageJsonSource.endsWith('\n'))
+  t.false(scopedPackageJsonSource.endsWith('\n\n'))
+  const scopedPackageJson = JSON.parse(scopedPackageJsonSource)
 
   // Verify that publishConfig only contains registry and access, not exports
   t.truthy(scopedPackageJson.publishConfig)

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')

package/src/api/build.ts

@@ -45,7 +45,10 @@ import {
   targetToEnvVar,
   tryInstallCargoBinary,
   unlinkAsync,
+  rustBundledWasiLibc,
+  wasiLibcHasNewFutexAbi,
   wasiLoaderSuffix,
+  wasiSdkMajorVersion,
   wasiTargetHasThreads,
   writeFileAtomic,
   withFileSystemReconciliation,
@@ -223,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,
@@ -1461,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
@@ -1499,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(
@@ -2560,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) {