@napi-rs/cli 3.0.0-alpha.91 → 3.0.0-alpha.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/cli",
-  "version": "3.0.0-alpha.91",
+  "version": "3.0.0-alpha.92",
   "description": "Cli tools for napi-rs",
   "author": "LongYinan <lynweklm@gmail.com>",
   "homepage": "https://github.com/napi-rs/napi-rs",
@@ -96,7 +96,7 @@
     "ava": "^6.2.0",
     "env-paths": "^3.0.0",
     "prettier": "^3.5.3",
-    "rolldown": "^1.0.0-beta.19",
+    "rolldown": "^1.0.0-beta.23",
     "tslib": "^2.8.1",
     "typescript": "^5.8.2"
   },
@@ -132,5 +132,5 @@
       "e2e/**/*.spec.ts"
     ]
   },
-  "gitHead": "71da5b6dc17064e478e5beb0ffa71f73d6238f7d"
+  "gitHead": "e9e806e92092e05bb5ed0c7fb9a30705bd09760e"
 }

package/src/api/build.ts

@@ -270,16 +270,14 @@ class Builder {
           'include/',
         )
       }
-      if (!process.env.CC && !process.env.TARGET_CC) {
-        this.envs[`CC`] = join(toolchainPath, 'bin', `${crossTargetName}-gcc`)
+      if (!process.env.TARGET_CC) {
         this.envs[`TARGET_CC`] = join(
           toolchainPath,
           'bin',
           `${crossTargetName}-gcc`,
         )
       }
-      if (!process.env.CXX && !process.env.TARGET_CXX) {
-        this.envs[`CXX`] = join(toolchainPath, 'bin', `${crossTargetName}-g++`)
+      if (!process.env.TARGET_CXX) {
         this.envs[`TARGET_CXX`] = join(
           toolchainPath,
           'bin',
@@ -287,22 +285,18 @@ class Builder {
         )
       }
       if (
-        (process.env.CC?.startsWith('clang') &&
-          (process.env.TARGET_CC?.startsWith('clang') ||
-            !process.env.TARGET_CC)) ||
-        process.env.TARGET_CC?.startsWith('clang')
+        process.env.TARGET_CC?.startsWith('clang') ||
+        (process.env.CC?.startsWith('clang') && !process.env.TARGET_CC)
       ) {
-        const CFLAGS = process.env.CFLAGS ?? ''
-        this.envs.CFLAGS = `--sysroot=${this.envs.TARGET_SYSROOT} --gcc-toolchain=${toolchainPath} ${CFLAGS}`
+        const TARGET_CFLAGS = process.env.TARGET_CFLAGS ?? ''
+        this.envs.TARGET_CFLAGS = `--sysroot=${this.envs.TARGET_SYSROOT} --gcc-toolchain=${toolchainPath} ${TARGET_CFLAGS}`
       }
       if (
-        (process.env.CXX?.startsWith('clang++') &&
-          (process.env.TARGET_CXX?.startsWith('clang++') ||
-            !process.env.TARGET_CXX)) ||
+        (process.env.CXX?.startsWith('clang++') && !process.env.TARGET_CXX) ||
         process.env.TARGET_CXX?.startsWith('clang++')
       ) {
-        const CXXFLAGS = process.env.CXXFLAGS ?? ''
-        this.envs.CXXFLAGS = `--sysroot=${this.envs.TARGET_SYSROOT} --gcc-toolchain=${toolchainPath} ${CXXFLAGS} ${CXXFLAGS}`
+        const TARGET_CXXFLAGS = process.env.TARGET_CXXFLAGS ?? ''
+        this.envs.TARGET_CXXFLAGS = `--sysroot=${this.envs.TARGET_SYSROOT} --gcc-toolchain=${toolchainPath} ${TARGET_CXXFLAGS}`
       }
       this.envs.PATH = this.envs.PATH
         ? `${toolchainPath}/bin:${this.envs.PATH}:${process.env.PATH}`
@@ -905,6 +899,12 @@ 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
+`
+    }
+
     dts = header + dts
 
     try {

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

@@ -15,10 +15,12 @@ import {
   Target,
 } from '../utils/index.js'
 
-import type { PackageMeta } from './templates/package.json.js'
-
 const debug = debugFactory('create-npm-dirs')
 
+export interface PackageMeta {
+  'dist-tags': { [index: string]: string }
+}
+
 export async function createNpmDirs(userOptions: CreateNpmDirsOptions) {
   const options = applyDefaultCreateNpmDirsOptions(userOptions)
 

package/src/api/templates/index.ts

@@ -1,8 +1 @@
-export * from './.gitignore.js'
-export * from './.npmignore.js'
-export * from './build.rs.js'
-export * from './cargo.toml.js'
-export * from './ci.yml.js'
-export * from './lib.rs.js'
-export * from './package.json.js'
 export * from './js-binding.js'

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

@@ -160,6 +160,29 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule
     worker.onmessage = ({ data }) => {
       __wasmCreateOnMessageForFsProxy(__nodeFs)(data)
     }
+
+    // The main thread of Node.js waits for all the active handles before exiting.
+    // But Rust threads are never waited without \`thread::join\`.
+    // So here we hack the code of Node.js to prevent the workers from being referenced (active).
+    // 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")
+      );
+      if (kPublicPort) {
+        worker[kPublicPort].ref = () => {};
+      }
+
+      const kHandle = Object.getOwnPropertySymbols(worker).find(s =>
+        s.toString().includes("kHandle")
+      );
+      if (kPublicPort) {
+        worker[kHandle].ref = () => {};
+      }
+
+      worker.unref();
+    }
     return worker
   },
   overwriteImports(importObject) {

package/src/utils/config.ts

@@ -234,6 +234,15 @@ export async function readNapiConfig(
     }
   }
 
+  // find duplicate targets
+  const uniqueTargets = new Set(targets)
+  if (uniqueTargets.size !== targets.length) {
+    const duplicateTarget = targets.find(
+      (target, index) => targets.indexOf(target) !== index,
+    )
+    throw new Error(`Duplicate targets are not allowed: ${duplicateTarget}`)
+  }
+
   napiConfig.targets = targets.map(parseTriple)
 
   return napiConfig

package/dist/api/templates/.gitignore.d.ts

@@ -1 +0,0 @@
-export declare const gitIgnore = "# Created by https://www.toptal.com/developers/gitignore/api/node\n# Edit at https://www.toptal.com/developers/gitignore?templates=node\n\n### Node ###\n# Logs\nlogs\n*.log\nnpm-debug.log*\nyarn-debug.log*\nyarn-error.log*\nlerna-debug.log*\n\n# Diagnostic reports (https://nodejs.org/api/report.html)\nreport.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json\n\n# Runtime data\npids\n*.pid\n*.seed\n*.pid.lock\n\n# Directory for instrumented libs generated by jscoverage/JSCover\nlib-cov\n\n# Coverage directory used by tools like istanbul\ncoverage\n*.lcov\n\n# nyc test coverage\n.nyc_output\n\n# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)\n.grunt\n\n# Bower dependency directory (https://bower.io/)\nbower_components\n\n# node-waf configuration\n.lock-wscript\n\n# Compiled binary addons (https://nodejs.org/api/addons.html)\nbuild/Release\n\n# Dependency directories\nnode_modules/\njspm_packages/\n\n# TypeScript v1 declaration files\ntypings/\n\n# TypeScript cache\n*.tsbuildinfo\n\n# Optional npm cache directory\n.npm\n\n# Optional eslint cache\n.eslintcache\n\n# Microbundle cache\n.rpt2_cache/\n.rts2_cache_cjs/\n.rts2_cache_es/\n.rts2_cache_umd/\n\n# Optional REPL history\n.node_repl_history\n\n# Output of 'npm pack'\n*.tgz\n\n# Yarn Integrity file\n.yarn-integrity\n\n# dotenv environment variables file\n.env\n.env.test\n\n# parcel-bundler cache (https://parceljs.org/)\n.cache\n\n# Next.js build output\n.next\n\n# Nuxt.js build / generate output\n.nuxt\ndist\n\n# Gatsby files\n.cache/\n# Comment in the public line in if your project uses Gatsby and not Next.js\n# https://nextjs.org/blog/next-9-1#public-directory-support\n# public\n\n# vuepress build output\n.vuepress/dist\n\n# Serverless directories\n.serverless/\n\n# FuseBox cache\n.fusebox/\n\n# DynamoDB Local files\n.dynamodb/\n\n# TernJS port file\n.tern-port\n\n# Stores VSCode versions used for testing VSCode extensions\n.vscode-test\n\n# End of https://www.toptal.com/developers/gitignore/api/node\n\n# Created by https://www.toptal.com/developers/gitignore/api/macos\n# Edit at https://www.toptal.com/developers/gitignore?templates=macos\n\n### macOS ###\n# General\n.DS_Store\n.AppleDouble\n.LSOverride\n\n# Icon must end with two \r\nIcon\n\n\n# Thumbnails\n._*\n\n# Files that might appear in the root of a volume\n.DocumentRevisions-V100\n.fseventsd\n.Spotlight-V100\n.TemporaryItems\n.Trashes\n.VolumeIcon.icns\n.com.apple.timemachine.donotpresent\n\n# Directories potentially created on remote AFP share\n.AppleDB\n.AppleDesktop\nNetwork Trash Folder\nTemporary Items\n.apdisk\n\n### macOS Patch ###\n# iCloud generated files\n*.icloud\n\n# End of https://www.toptal.com/developers/gitignore/api/macos\n\n# Created by https://www.toptal.com/developers/gitignore/api/windows\n# Edit at https://www.toptal.com/developers/gitignore?templates=windows\n\n### Windows ###\n# Windows thumbnail cache files\nThumbs.db\nThumbs.db:encryptable\nehthumbs.db\nehthumbs_vista.db\n\n# Dump file\n*.stackdump\n\n# Folder config file\n[Dd]esktop.ini\n\n# Recycle Bin used on file shares\n$RECYCLE.BIN/\n\n# Windows Installer files\n*.cab\n*.msi\n*.msix\n*.msm\n*.msp\n\n# Windows shortcuts\n*.lnk\n\n# End of https://www.toptal.com/developers/gitignore/api/windows\n\n#Added by cargo\n\n/target\nCargo.lock\n\n.pnp.*\n.yarn/*\n!.yarn/patches\n!.yarn/plugins\n!.yarn/releases\n!.yarn/sdks\n!.yarn/versions\n\n*.node\n*.wasm\n";

package/dist/api/templates/.npmignore.d.ts

@@ -1 +0,0 @@
-export declare const npmIgnore = "target\nCargo.lock\n.cargo\n.github\nnpm\n.eslintrc\n.prettierignore\nrustfmt.toml\nyarn.lock\n*.node\n.yarn\n__test__\nrenovate.json\n";

package/dist/api/templates/build.rs.d.ts

@@ -1 +0,0 @@
-export declare const createBuildRs: () => string;

package/dist/api/templates/cargo.toml.d.ts

@@ -1,6 +0,0 @@
-export declare const createCargoToml: ({ name, license, features, deriveFeatures, }: {
-    name: string;
-    license: string;
-    features: string[];
-    deriveFeatures: string[];
-}) => string;

package/dist/api/templates/ci-template.d.ts

@@ -1,3 +0,0 @@
-import type { SupportedPackageManager } from '../../utils/config.js';
-export type WasiTargetName = 'wasm32-wasi-preview1-threads' | 'wasm32-wasip1-threads' | 'wasm32-wasip2';
-export declare const YAML: (packageManager: SupportedPackageManager, wasiTargetName: WasiTargetName) => string;

package/dist/api/templates/ci.yml.d.ts

@@ -1,3 +0,0 @@
-import { type SupportedPackageManager } from '../../utils/index.js';
-import { type WasiTargetName } from './ci-template.js';
-export declare const createGithubActionsCIYml: (targets: string[], packageManager: SupportedPackageManager, wasiTargetName: WasiTargetName) => string;

package/dist/api/templates/lib.rs.d.ts

@@ -1 +0,0 @@
-export declare const createLibRs: () => string;

package/dist/api/templates/package.json.d.ts

@@ -1,15 +0,0 @@
-import type { SupportedTestFramework } from '../../utils/config.js';
-export interface PackageMeta {
-    'dist-tags': {
-        [index: string]: string;
-    };
-}
-export declare const createPackageJson: ({ name, binaryName, targets, license, engineRequirement, cliVersion, testFramework, }: {
-    name: string;
-    binaryName: string;
-    targets: string[];
-    license: string;
-    engineRequirement: string;
-    cliVersion: string;
-    testFramework: SupportedTestFramework;
-}) => Promise<string>;

package/src/api/templates/.gitignore.ts

@@ -1,199 +0,0 @@
-export const gitIgnore = `# Created by https://www.toptal.com/developers/gitignore/api/node
-# Edit at https://www.toptal.com/developers/gitignore?templates=node
-
-### Node ###
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-*.lcov
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# TypeScript cache
-*.tsbuildinfo
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Microbundle cache
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-.env.test
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-
-# Next.js build output
-.next
-
-# Nuxt.js build / generate output
-.nuxt
-dist
-
-# Gatsby files
-.cache/
-# Comment in the public line in if your project uses Gatsby and not Next.js
-# https://nextjs.org/blog/next-9-1#public-directory-support
-# public
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/
-
-# TernJS port file
-.tern-port
-
-# Stores VSCode versions used for testing VSCode extensions
-.vscode-test
-
-# End of https://www.toptal.com/developers/gitignore/api/node
-
-# Created by https://www.toptal.com/developers/gitignore/api/macos
-# Edit at https://www.toptal.com/developers/gitignore?templates=macos
-
-### macOS ###
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-### macOS Patch ###
-# iCloud generated files
-*.icloud
-
-# End of https://www.toptal.com/developers/gitignore/api/macos
-
-# Created by https://www.toptal.com/developers/gitignore/api/windows
-# Edit at https://www.toptal.com/developers/gitignore?templates=windows
-
-### Windows ###
-# Windows thumbnail cache files
-Thumbs.db
-Thumbs.db:encryptable
-ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
-
-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-# End of https://www.toptal.com/developers/gitignore/api/windows
-
-#Added by cargo
-
-/target
-Cargo.lock
-
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
-
-*.node
-*.wasm
-`

package/src/api/templates/.npmignore.ts

@@ -1,14 +0,0 @@
-export const npmIgnore = `target
-Cargo.lock
-.cargo
-.github
-npm
-.eslintrc
-.prettierignore
-rustfmt.toml
-yarn.lock
-*.node
-.yarn
-__test__
-renovate.json
-`

package/src/api/templates/build.rs.ts

@@ -1,4 +0,0 @@
-export const createBuildRs = () => `fn main() {
-  napi_build::setup();
-}
-`

package/src/api/templates/cargo.toml.ts

@@ -1,36 +0,0 @@
-export const createCargoToml = ({
-  name,
-  license,
-  features,
-  deriveFeatures,
-}: {
-  name: string
-  license: string
-  features: string[]
-  deriveFeatures: string[]
-}) => `[package]
-name = "${name.replace('@', '').replace('/', '_').toLowerCase()}"
-version = "1.0.0"
-edition = "2021"
-license = "${license}"
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies.napi]
-version = "2"
-default-features = false
-# see https://nodejs.org/api/n-api.html#node-api-version-matrix
-features = ${JSON.stringify(features)}
-
-[dependencies.napi-derive]
-version = "2"
-features = ${JSON.stringify(deriveFeatures)}
-
-[build-dependencies]
-napi-build = "2"
-
-[profile.release]
-lto = true
-strip = "symbols"
-`