@napi-rs/cli 3.9.0 → 3.9.1

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
@@ -169,8 +169,7 @@ ${exportsCode}
 `
 }
 
-const bindingHeader = `// prettier-ignore
-/* eslint-disable */
+const bindingHeader = `/* eslint-disable */
 // @ts-nocheck
 /* auto-generated by NAPI-RS */
 `
@@ -272,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)
     }
@@ -287,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')}
@@ -395,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

package/src/api/templates/load-wasi-template.ts

@@ -13,11 +13,11 @@ let __emnapiWasmEnvCleanupDrained = false
 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 (
@@ -1923,6 +1923,7 @@ function __createWasiWorker(filename) {
       return new Worker(filename, {
         env: process.env,
         execArgv: __workerExecArgv,
+        workerData: { hostRoot: __hostRoot, rootDir: __rootDir },
       })
     } catch (error) {
       if (!error || error.code !== 'ERR_WORKER_INVALID_EXEC_ARGV') {
@@ -1944,7 +1945,7 @@ function __createWasiWorker(filename) {
     : ''
   const memoryName = threads ? '__sharedMemory' : '__wasmMemory'
   const asyncWorkOptions = threads
-    ? `    asyncWorkPoolSize: (function() {
+    ? `    asyncWorkPoolSize: (function () {
       const threadsSizeFromEnv = Number(process.env.NAPI_RS_ASYNC_WORK_POOL_SIZE ?? process.env.UV_THREADPOOL_SIZE)
       // NaN > 0 is false
       if (threadsSizeFromEnv > 0) {
@@ -1980,21 +1981,21 @@ function __createWasiWorker(filename) {
       // According to https://github.com/nodejs/node/blob/19e0d472728c79d418b74bddff588bea70a403d0/lib/internal/worker.js#L415,
       // a worker is consist of two handles: kPublicPort and kHandle.
       {
-        const kPublicPort = Object.getOwnPropertySymbols(worker).find(s =>
-          s.toString().includes("kPublicPort")
-        );
+        const kPublicPort = Object.getOwnPropertySymbols(worker).find((s) =>
+          s.toString().includes('kPublicPort'),
+        )
         if (kPublicPort) {
-          worker[kPublicPort].ref = () => {};
+          worker[kPublicPort].ref = () => {}
         }
 
-        const kHandle = Object.getOwnPropertySymbols(worker).find(s =>
-          s.toString().includes("kHandle")
-        );
+        const kHandle = Object.getOwnPropertySymbols(worker).find((s) =>
+          s.toString().includes('kHandle'),
+        )
         if (kHandle) {
-          worker[kHandle].ref = () => {};
+          worker[kHandle].ref = () => {}
         }
 
-        worker.unref();
+        worker.unref()
       }
       return worker
     },
@@ -2002,8 +2003,6 @@ function __createWasiWorker(filename) {
     : ''
 
   return `/* eslint-disable */
-/* prettier-ignore */
-
 /* auto-generated by NAPI-RS */
 
 const __nodeFs = require('node:fs')
@@ -2019,14 +2018,18 @@ ${workerRuntimeImport}\
 const { createContext: __emnapiCreateContext } = require('@emnapi/runtime')
 ${workerExecArgv}\
 
-const __rootDir = __nodePath.parse(process.cwd()).root
+const __cwd = process.cwd()
+const __rootDir = __nodePath.parse(__cwd).root
+const __hostRoot =
+  process.platform === 'android' ? __cwd : __rootDir
 
 const __wasi = new __nodeWASI({
   version: 'preview1',
   env: process.env,
   preopens: {
-    [__rootDir]: __rootDir,
-  }
+    [__rootDir]: __hostRoot,
+    [__hostRoot]: __hostRoot,
+  },
 })
 
 const ${memoryName} = new WebAssembly.Memory({

package/src/api/templates/wasi-worker-template.ts

@@ -1,10 +1,10 @@
-export const WASI_WORKER_TEMPLATE = `import fs from "node:fs";
-import { createRequire } from "node:module";
-import { parse } from "node:path";
-import { WASI } from "node:wasi";
-import { parentPort, Worker } from "node:worker_threads";
+export const WASI_WORKER_TEMPLATE = `import fs from 'node:fs'
+import { createRequire } from 'node:module'
+import { parse } from 'node:path'
+import { WASI } from 'node:wasi'
+import { parentPort, Worker, workerData } from 'node:worker_threads'
 
-const require = createRequire(import.meta.url);
+const require = createRequire(import.meta.url)
 
 const {
   instantiateNapiModuleSync,
@@ -12,12 +12,12 @@ const {
   getDefaultContext,
   emnapiAsyncWorkPlugin,
   emnapiTSFNPlugin,
-} = require("@napi-rs/wasm-runtime");
+} = require('@napi-rs/wasm-runtime')
 
 if (parentPort) {
-  parentPort.on("message", (data) => {
-    globalThis.onmessage({ data });
-  });
+  parentPort.on('message', (data) => {
+    globalThis.onmessage({ data })
+  })
 }
 
 Object.assign(globalThis, {
@@ -25,18 +25,25 @@ Object.assign(globalThis, {
   require,
   Worker,
   importScripts: function (f) {
-    ;(0, eval)(fs.readFileSync(f, "utf8") + "//# sourceURL=" + f);
+    // oxlint-disable-next-line no-eval -- WASI importScripts polyfill
+    ;(0, eval)(fs.readFileSync(f, 'utf8') + '//# sourceURL=' + f)
   },
   postMessage: function (msg) {
     if (parentPort) {
-      parentPort.postMessage(msg);
+      parentPort.postMessage(msg)
     }
   },
-});
+})
 
-const emnapiContext = getDefaultContext();
+const emnapiContext = getDefaultContext()
 
-const __rootDir = parse(process.cwd()).root;
+const __cwd = process.cwd()
+const __rootDir =
+  (workerData && typeof workerData.rootDir === 'string' && workerData.rootDir) ||
+  parse(__cwd).root
+const __hostRoot =
+  (workerData && typeof workerData.hostRoot === 'string' && workerData.hostRoot) ||
+  (process.platform === 'android' ? __cwd : __rootDir)
 
 const handler = new MessageHandler({
   onLoad({ wasmModule, wasmMemory }) {
@@ -44,9 +51,10 @@ const handler = new MessageHandler({
       version: 'preview1',
       env: process.env,
       preopens: {
-        [__rootDir]: __rootDir,
+        [__rootDir]: __hostRoot,
+        [__hostRoot]: __hostRoot,
       },
-    });
+    })
 
     return instantiateNapiModuleSync(wasmModule, {
       childThread: true,
@@ -62,16 +70,16 @@ const handler = new MessageHandler({
           ...importObject.env,
           ...importObject.napi,
           ...importObject.emnapi,
-          memory: wasmMemory
-        };
+          memory: wasmMemory,
+        }
       },
-    });
+    })
   },
-});
+})
 
 globalThis.onmessage = function (e) {
-  handler.handle(e);
-};
+  handler.handle(e)
+}
 `
 
 export const createWasiBrowserWorkerBinding = (
@@ -110,10 +118,9 @@ const fs = createFsProxy(__memfsExported)`
         // 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)
-        ${errorOutputsAppend}
+        console.error.apply(console, arguments)${errorOutputsAppend}
       },
     })`
     : `const wasi = new WASI({
@@ -121,10 +128,9 @@ const fs = createFsProxy(__memfsExported)`
         // 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)
-        ${errorOutputsAppend}
+        console.error.apply(console, arguments)${errorOutputsAppend}
       },
     })`
   const errorHandler = errorEvent
@@ -156,8 +162,7 @@ const handler = new MessageHandler({
         }
       },
     })
-  },
-  ${errorHandler}
+  },${errorHandler ? `\n  ${errorHandler}` : ''}
 })
 
 globalThis.onmessage = function (e) {

package/src/commands/build.ts

@@ -11,7 +11,7 @@ const debug = debugFactory('build')
 export class BuildCommand extends BaseBuildCommand {
   pipe = Option.String('--pipe', {
     description:
-      'Pipe all outputs file to given command. e.g. `napi build --pipe "npx prettier --write"`',
+      'Pipe all outputs file to given command. e.g. `napi build --pipe "npx oxfmt"`',
   })
 
   cargoOptions = Option.Rest()

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

@@ -142,9 +142,7 @@ Generated by [AVA](https://avajs.dev).
     }␊
     export type Blake2bHasher = Blake2BHasher␊
     ␊
-    export declare class Blake2BKey {␊
-    ␊
-    }␊
+    export declare class Blake2BKey {}␊
     export type Blake2bKey = Blake2BKey␊
     ␊
     export declare class ClassWithFactory {␊
@@ -257,7 +255,7 @@ Generated by [AVA](https://avajs.dev).
     ␊
     export declare const enum ALIAS {␊
       A = 0,␊
-      B = 1␊
+      B = 1,␊
     }␊
     ␊
     export interface AliasedStruct {␊
@@ -345,7 +343,7 @@ Generated by [AVA](https://avajs.dev).
       Six = 6,␊
       Eight = 8,␊
       Nine = 9,␊
-      Ten = 10␊
+      Ten = 10,␊
     }␊
     ␊
     export declare function customStatusCode(): void␊
@@ -358,7 +356,7 @@ Generated by [AVA](https://avajs.dev).
     export declare function dateToNumber(input: Date): number␊
     ␊
     /** This is a const */␊
-    export const DEFAULT_COST: number␊
+    export declare const DEFAULT_COST: number␊
     ␊
     export declare function derefUint8Array(a: Uint8Array, b: Uint8ClampedArray): number␊
     ␊
@@ -374,9 +372,7 @@ Generated by [AVA](https://avajs.dev).
     ␊
     export declare function eitherStringOrNumber(input: string | number): number␊
     ␊
-    export declare const enum Empty {␊
-    ␊
-    }␊
+    export declare const enum Empty {}␊
     ␊
     export declare function enumToI32(e: CustomNumEnum): number␊
     ␊
@@ -422,7 +418,7 @@ Generated by [AVA](https://avajs.dev).
       /** Kills birds */␊
       Cat = 1,␊
       /** Tasty */␊
-      Duck = 2␊
+      Duck = 2,␊
     }␊
     ␊
     export declare function listObjKeys(obj: object): Array<string>␊
@@ -519,7 +515,7 @@ Generated by [AVA](https://avajs.dev).
     export declare const enum Status {␊
       Pristine = 'Pristine',␊
       Loading = 'Loading',␊
-      Ready = 'Ready'␊
+      Ready = 'Ready',␊
     }␊
     ␊
     export interface StrictObject {␊
@@ -695,9 +691,7 @@ Generated by [AVA](https://avajs.dev).
     }␊
     export type Blake2bHasher = Blake2BHasher␊
     ␊
-    export declare class Blake2BKey {␊
-    ␊
-    }␊
+    export declare class Blake2BKey {}␊
     export type Blake2bKey = Blake2BKey␊
     ␊
     export declare class ClassWithFactory {␊
@@ -810,7 +804,7 @@ Generated by [AVA](https://avajs.dev).
     ␊
     export declare enum ALIAS {␊
       A = 0,␊
-      B = 1␊
+      B = 1,␊
     }␊
     ␊
     export interface AliasedStruct {␊
@@ -898,7 +892,7 @@ Generated by [AVA](https://avajs.dev).
       Six = 6,␊
       Eight = 8,␊
       Nine = 9,␊
-      Ten = 10␊
+      Ten = 10,␊
     }␊
     ␊
     export declare function customStatusCode(): void␊
@@ -911,7 +905,7 @@ Generated by [AVA](https://avajs.dev).
     export declare function dateToNumber(input: Date): number␊
     ␊
     /** This is a const */␊
-    export const DEFAULT_COST: number␊
+    export declare const DEFAULT_COST: number␊
     ␊
     export declare function derefUint8Array(a: Uint8Array, b: Uint8ClampedArray): number␊
     ␊
@@ -927,9 +921,7 @@ Generated by [AVA](https://avajs.dev).
     ␊
     export declare function eitherStringOrNumber(input: string | number): number␊
     ␊
-    export declare enum Empty {␊
-    ␊
-    }␊
+    export declare enum Empty {}␊
     ␊
     export declare function enumToI32(e: CustomNumEnum): number␊
     ␊
@@ -975,7 +967,7 @@ Generated by [AVA](https://avajs.dev).
       /** Kills birds */␊
       Cat = 1,␊
       /** Tasty */␊
-      Duck = 2␊
+      Duck = 2,␊
     }␊
     ␊
     export declare function listObjKeys(obj: object): Array<string>␊
@@ -1069,9 +1061,7 @@ Generated by [AVA](https://avajs.dev).
     ␊
     export declare function setSymbolInObj(symbol: symbol): object␊
     ␊
-    export type Status =  'Pristine'|␊
-    'Loading'|␊
-    'Ready';␊
+    export type Status = 'Pristine' | 'Loading' | 'Ready'␊
     ␊
     export interface StrictObject {␊
       name: string␊
@@ -1172,12 +1162,12 @@ Generated by [AVA](https://avajs.dev).
 
     `export declare enum Priority {␊
       Low = 0,␊
-      High = 1␊
+      High = 1,␊
     }␊
     ␊
     export declare enum Status {␊
       Active = 'Active',␊
-      Inactive = 'Inactive'␊
+      Inactive = 'Inactive',␊
     }␊
     `
 
@@ -1187,11 +1177,11 @@ Generated by [AVA](https://avajs.dev).
 
     `export declare const enum Priority {␊
       Low = 0,␊
-      High = 1␊
+      High = 1,␊
     }␊
     ␊
     export declare const enum Status {␊
       Active = 'Active',␊
-      Inactive = 'Inactive'␊
+      Inactive = 'Inactive',␊
     }␊
     `

package/src/utils/__tests__/misc.spec.ts

@@ -71,6 +71,10 @@ test('updatePackageJson merges nested objects instead of overwriting them', asyn
     fsevents: '^2.3.3',
     '@napi-rs/fixture-darwin-arm64': '1.0.1',
   })
+
+  const written = await readFile(packageJsonPath, 'utf8')
+  t.true(written.endsWith('\n'))
+  t.false(written.endsWith('\n\n'))
 })
 
 test('statIdentitiesMatch distinguishes inodes that collide as lossy Numbers', (t) => {