@napi-rs/cli 3.9.0 → 3.10.0

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) => {