@napi-rs/cli 3.0.0-alpha.44 → 3.0.0-alpha.46

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

@@ -1,11 +1,12 @@
 export const WASI_WORKER_TEMPLATE = `import fs from "node:fs";
 import { createRequire } from "node:module";
+import { WASI } from "node:wasi";
 import { parentPort, Worker } from "node:worker_threads";
 
-import { instantiateNapiModuleSync, MessageHandler, WASI } from "@napi-rs/wasm-runtime";
-
 const require = createRequire(import.meta.url);
 
+const { instantiateNapiModuleSync, MessageHandler, getDefaultContext } = require("@napi-rs/wasm-runtime");
+
 if (parentPort) {
   parentPort.on("message", (data) => {
     globalThis.onmessage({ data });
@@ -26,13 +27,22 @@ Object.assign(globalThis, {
   },
 });
 
+const emnapiContext = getDefaultContext()
+
 const handler = new MessageHandler({
   onLoad({ wasmModule, wasmMemory }) {
-    const wasi = new WASI({ fs });
+    const wasi = new WASI({
+      version: 'preview1',
+      env: process.env,
+      preopens: {
+        '/': '/',
+      },
+    });
 
     return instantiateNapiModuleSync(wasmModule, {
       childThread: true,
       wasi,
+      context: emnapiContext,
       overwriteImports(importObject) {
         importObject.env = {
           ...importObject.env,

package/src/commands/new.ts

@@ -64,14 +64,14 @@ export class NewCommand extends BaseNewCommand {
   private async fetchName(defaultName: string): Promise<string> {
     return (
       this.$$name ??
-      (await inquirer
+      inquirer
         .prompt({
           type: 'input',
           name: 'name',
           message: 'Package name (the name field in your package.json file)',
           default: defaultName,
         })
-        .then(({ name }) => name))
+        .then(({ name }) => name)
     )
   }
 
@@ -93,7 +93,7 @@ export class NewCommand extends BaseNewCommand {
         name: 'minNodeApiVersion',
         message: 'Minimum node-api version (with node version requirement)',
         loop: false,
-        choices: new Array(8).fill(0).map((_, i) => ({
+        choices: Array.from({ length: 8 }, (_, i) => ({
           name: `napi${i + 1} (${napiEngineRequirement(i + 1)})`,
           value: i + 1,
         })),

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

@@ -93,6 +93,13 @@ Generated by [AVA](https://avajs.dev).
         platformArchABI: 'linux-arm-gnueabihf',
         triple: 'armv7-unknown-linux-gnueabihf',
       },
+      {
+        abi: 'musleabihf',
+        arch: 'arm',
+        platform: 'linux',
+        platformArchABI: 'linux-arm-musleabihf',
+        triple: 'armv7-unknown-linux-musleabihf',
+      },
       {
         abi: 'eabi',
         arch: 'arm',
@@ -114,6 +121,20 @@ Generated by [AVA](https://avajs.dev).
         platformArchABI: 'linux-riscv64-gnu',
         triple: 'riscv64gc-unknown-linux-gnu',
       },
+      {
+        abi: 'gnu',
+        arch: 'ppc64',
+        platform: 'linux',
+        platformArchABI: 'linux-ppc64-gnu',
+        triple: 'powerpc64le-unknown-linux-gnu',
+      },
+      {
+        abi: 'gnu',
+        arch: 's390x',
+        platform: 'linux',
+        platformArchABI: 'linux-s390x-gnu',
+        triple: 's390x-unknown-linux-gnu',
+      },
       {
         abi: 'wasi',
         arch: 'wasm32',

package/src/utils/index.ts

@@ -1,4 +1,3 @@
-export * from './ci.js'
 export * from './log.js'
 export * from './misc.js'
 export * from './target.js'

package/src/utils/target.ts

@@ -19,9 +19,12 @@ export const AVAILABLE_TARGETS = [
   'x86_64-unknown-freebsd',
   'i686-pc-windows-msvc',
   'armv7-unknown-linux-gnueabihf',
+  'armv7-unknown-linux-musleabihf',
   'armv7-linux-androideabi',
   'universal-apple-darwin',
   'riscv64gc-unknown-linux-gnu',
+  'powerpc64le-unknown-linux-gnu',
+  's390x-unknown-linux-gnu',
   'wasm32-wasi-preview1-threads',
 ] as const
 
@@ -37,6 +40,8 @@ export const DEFAULT_TARGETS = [
 export const TARGET_LINKER: Record<string, string> = {
   'aarch64-unknown-linux-musl': 'aarch64-linux-musl-gcc',
   'riscv64gc-unknown-linux-gnu': 'riscv64-linux-gnu-gcc',
+  'powerpc64le-unknown-linux-gnu': 'powerpc64le-linux-gnu-gcc',
+  's390x-unknown-linux-gnu': 's390x-linux-gnu-gcc',
 }
 
 // https://nodejs.org/api/process.html#process_process_arch
@@ -62,6 +67,7 @@ const CpuToNodeArch: Record<string, NodeJSArch> = {
   i686: 'ia32',
   armv7: 'arm',
   riscv64gc: 'riscv64',
+  powerpc64le: 'ppc64',
 }
 
 export const NodeArchToCpu: Record<string, string> = {
@@ -70,6 +76,7 @@ export const NodeArchToCpu: Record<string, string> = {
   ia32: 'i686',
   arm: 'armv7',
   riscv64: 'riscv64gc',
+  ppc64: 'powerpc64le',
 }
 
 const SysToNodePlatform: Record<string, Platform> = {
@@ -102,7 +109,10 @@ export interface Target {
  *   - `abi` = The ABI, for example `gnu`, `android`, `eabi`, etc.
  */
 export function parseTriple(rawTriple: string): Target {
-  if (rawTriple === 'wasm32-wasi-preview1-threads') {
+  if (
+    rawTriple === 'wasm32-wasi-preview1-threads' ||
+    rawTriple.startsWith('wasm32-wasip')
+  ) {
     return {
       triple: rawTriple,
       platformArchABI: 'wasm32-wasi',

package/dist/utils/ci.d.ts

@@ -1,11 +0,0 @@
-import { TargetTriple } from './target.js';
-export declare const CIConfig: Partial<Record<TargetTriple, {
-    host: string;
-    build_image?: string;
-    build_setup?: string[];
-    test?: boolean;
-    test_image?: string;
-    test_setup?: string[];
-    yarn_cpu?: string;
-    yarn_libc?: string;
-}>>;

package/dist/utils/ci.js

@@ -1,96 +0,0 @@
-export const CIConfig = {
-    'x86_64-apple-darwin': {
-        host: 'macos-latest',
-    },
-    'x86_64-pc-windows-msvc': {
-        host: 'windows-latest',
-    },
-    'i686-pc-windows-msvc': {
-        host: 'windows-latest',
-        test: false,
-    },
-    'x86_64-unknown-linux-gnu': {
-        host: 'ubuntu-latest',
-        build_image: 'ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian',
-    },
-    'x86_64-unknown-linux-musl': {
-        host: 'ubuntu-latest',
-        build_image: 'ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine',
-        test_image: 'node:${{ matrix.node }}-alpine',
-        yarn_libc: 'musl',
-    },
-    'aarch64-apple-darwin': {
-        host: 'macos-latest',
-        build_setup: [
-            'sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*',
-            'export CC=$(xcrun -f clang)',
-            'export CXX=$(xcrun -f clang++)',
-            'export SDK_ROOT=$(xcrun --sdk macosx --show-sdk-path)',
-            'export CFLAGS="-isysroot $SDK_ROOT -isystem $SDK_ROOT"',
-        ],
-        test: false,
-    },
-    'aarch64-unknown-linux-gnu': {
-        host: 'ubuntu-latest',
-        build_image: 'ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64',
-        build_setup: [
-            'sudo apt-get update',
-            'sudo apt-get install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu -y',
-            'export CARGO_BUILD_TARGET=x86_64-unknown-linux-gnu',
-        ],
-        test_image: 'ghcr.io/napi-rs/napi-rs/nodejs:aarch64-${{ matrix.node }}',
-        yarn_cpu: 'arm64',
-    },
-    'aarch64-unknown-linux-musl': {
-        host: 'ubuntu-latest',
-        build_image: 'ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine',
-        build_setup: ['rustup target add aarch64-unknown-linux-musl'],
-        test_image: 'multiarch/alpine:aarch64-latest-stable',
-        test_setup: ['apk add nodejs npm yarn'],
-        yarn_cpu: 'arm64',
-        yarn_libc: 'musl',
-    },
-    'aarch64-pc-windows-msvc': {
-        host: 'windows-latest',
-        test: false,
-    },
-    'armv7-unknown-linux-gnueabihf': {
-        host: 'ubuntu-latest',
-        build_setup: [
-            'sudo apt-get update',
-            'sudo apt-get install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf -y',
-        ],
-        yarn_cpu: 'arm',
-        test_image: 'ghcr.io/napi-rs/napi-rs/nodejs:armhf-${{ matrix.node }}',
-    },
-    'aarch64-linux-android': {
-        host: 'ubuntu-latest',
-        build_setup: [
-            'export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"',
-            'export CC="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"',
-            'export CXX="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang++"',
-            'export PATH="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}"',
-        ],
-        test: false,
-    },
-    'armv7-linux-androideabi': {
-        host: 'ubuntu-latest',
-        build_setup: [
-            'export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"',
-            'export CC="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"',
-            'export CXX="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang++"',
-            'export PATH="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}"',
-        ],
-        test: false,
-    },
-    'riscv64gc-unknown-linux-gnu': {
-        host: 'ubuntu-latest',
-        build_setup: [
-            'sudo apt-get update',
-            'sudo apt-get install g++-riscv64-linux-gnu gcc-riscv64-linux-gnu -y',
-        ],
-        // No official nodejs docker image for riscv64
-        test: false,
-    },
-};
-//# sourceMappingURL=ci.js.map

package/dist/utils/ci.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ci.js","sourceRoot":"","sources":["../../src/utils/ci.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,QAAQ,GAcjB;IACF,qBAAqB,EAAE;QACrB,IAAI,EAAE,cAAc;KACrB;IACD,wBAAwB,EAAE;QACxB,IAAI,EAAE,gBAAgB;KACvB;IACD,sBAAsB,EAAE;QACtB,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,KAAK;KACZ;IACD,0BAA0B,EAAE;QAC1B,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,gDAAgD;KAC9D;IACD,2BAA2B,EAAE;QAC3B,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,gDAAgD;QAC7D,UAAU,EAAE,gCAAgC;QAC5C,SAAS,EAAE,MAAM;KAClB;IACD,sBAAsB,EAAE;QACtB,IAAI,EAAE,cAAc;QACpB,WAAW,EAAE;YACX,wDAAwD;YACxD,6BAA6B;YAC7B,gCAAgC;YAChC,uDAAuD;YACvD,wDAAwD;SACzD;QACD,IAAI,EAAE,KAAK;KACZ;IACD,2BAA2B,EAAE;QAC3B,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,wDAAwD;QACrE,WAAW,EAAE;YACX,qBAAqB;YACrB,qEAAqE;YACrE,oDAAoD;SACrD;QACD,UAAU,EAAE,2DAA2D;QACvE,QAAQ,EAAE,OAAO;KAClB;IACD,4BAA4B,EAAE;QAC5B,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,gDAAgD;QAC7D,WAAW,EAAE,CAAC,8CAA8C,CAAC;QAC7D,UAAU,EAAE,wCAAwC;QACpD,UAAU,EAAE,CAAC,yBAAyB,CAAC;QACvC,QAAQ,EAAE,OAAO;QACjB,SAAS,EAAE,MAAM;KAClB;IACD,yBAAyB,EAAE;QACzB,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,KAAK;KACZ;IACD,+BAA+B,EAAE;QAC/B,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE;YACX,qBAAqB;YACrB,yEAAyE;SAC1E;QACD,QAAQ,EAAE,KAAK;QACf,UAAU,EAAE,yDAAyD;KACtE;IACD,uBAAuB,EAAE;QACvB,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE;YACX,gJAAgJ;YAChJ,yGAAyG;YACzG,4GAA4G;YAC5G,qFAAqF;SACtF;QACD,IAAI,EAAE,KAAK;KACZ;IACD,yBAAyB,EAAE;QACzB,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE;YACX,qJAAqJ;YACrJ,4GAA4G;YAC5G,+GAA+G;YAC/G,qFAAqF;SACtF;QACD,IAAI,EAAE,KAAK;KACZ;IACD,6BAA6B,EAAE;QAC7B,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE;YACX,qBAAqB;YACrB,qEAAqE;SACtE;QACD,8CAA8C;QAC9C,IAAI,EAAE,KAAK;KACZ;CACF,CAAA"}

package/src/utils/ci.ts

@@ -1,111 +0,0 @@
-import { TargetTriple } from './target.js'
-
-export const CIConfig: Partial<
-  Record<
-    TargetTriple,
-    {
-      host: string
-      build_image?: string
-      build_setup?: string[]
-      test?: boolean
-      test_image?: string
-      test_setup?: string[]
-      yarn_cpu?: string
-      yarn_libc?: string
-    }
-  >
-> = {
-  'x86_64-apple-darwin': {
-    host: 'macos-latest',
-  },
-  'x86_64-pc-windows-msvc': {
-    host: 'windows-latest',
-  },
-  'i686-pc-windows-msvc': {
-    host: 'windows-latest',
-    test: false,
-  },
-  'x86_64-unknown-linux-gnu': {
-    host: 'ubuntu-latest',
-    build_image: 'ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian',
-  },
-  'x86_64-unknown-linux-musl': {
-    host: 'ubuntu-latest',
-    build_image: 'ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine',
-    test_image: 'node:${{ matrix.node }}-alpine',
-    yarn_libc: 'musl',
-  },
-  'aarch64-apple-darwin': {
-    host: 'macos-latest',
-    build_setup: [
-      'sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*',
-      'export CC=$(xcrun -f clang)',
-      'export CXX=$(xcrun -f clang++)',
-      'export SDK_ROOT=$(xcrun --sdk macosx --show-sdk-path)',
-      'export CFLAGS="-isysroot $SDK_ROOT -isystem $SDK_ROOT"',
-    ],
-    test: false,
-  },
-  'aarch64-unknown-linux-gnu': {
-    host: 'ubuntu-latest',
-    build_image: 'ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64',
-    build_setup: [
-      'sudo apt-get update',
-      'sudo apt-get install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu -y',
-      'export CARGO_BUILD_TARGET=x86_64-unknown-linux-gnu',
-    ],
-    test_image: 'ghcr.io/napi-rs/napi-rs/nodejs:aarch64-${{ matrix.node }}',
-    yarn_cpu: 'arm64',
-  },
-  'aarch64-unknown-linux-musl': {
-    host: 'ubuntu-latest',
-    build_image: 'ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine',
-    build_setup: ['rustup target add aarch64-unknown-linux-musl'],
-    test_image: 'multiarch/alpine:aarch64-latest-stable',
-    test_setup: ['apk add nodejs npm yarn'],
-    yarn_cpu: 'arm64',
-    yarn_libc: 'musl',
-  },
-  'aarch64-pc-windows-msvc': {
-    host: 'windows-latest',
-    test: false,
-  },
-  'armv7-unknown-linux-gnueabihf': {
-    host: 'ubuntu-latest',
-    build_setup: [
-      'sudo apt-get update',
-      'sudo apt-get install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf -y',
-    ],
-    yarn_cpu: 'arm',
-    test_image: 'ghcr.io/napi-rs/napi-rs/nodejs:armhf-${{ matrix.node }}',
-  },
-  'aarch64-linux-android': {
-    host: 'ubuntu-latest',
-    build_setup: [
-      'export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"',
-      'export CC="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"',
-      'export CXX="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang++"',
-      'export PATH="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}"',
-    ],
-    test: false,
-  },
-  'armv7-linux-androideabi': {
-    host: 'ubuntu-latest',
-    build_setup: [
-      'export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"',
-      'export CC="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"',
-      'export CXX="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang++"',
-      'export PATH="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}"',
-    ],
-    test: false,
-  },
-  'riscv64gc-unknown-linux-gnu': {
-    host: 'ubuntu-latest',
-    build_setup: [
-      'sudo apt-get update',
-      'sudo apt-get install g++-riscv64-linux-gnu gcc-riscv64-linux-gnu -y',
-    ],
-    // No official nodejs docker image for riscv64
-    test: false,
-  },
-}