@napi-rs/cli 3.1.2 → 3.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/cli",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "description": "Cli tools for napi-rs",
   "author": "LongYinan <lynweklm@gmail.com>",
   "homepage": "https://github.com/napi-rs/napi-rs",
@@ -15,21 +15,13 @@
   },
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.cjs"
-      }
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
     },
-    "./package.json": {
-      "import": "./package.json",
-      "require": "./package.json"
-    }
+    "./package.json": "./package.json"
   },
   "files": [
     "dist",
@@ -75,27 +67,26 @@
     "colorette": "^2.0.20",
     "debug": "^4.4.0",
     "emnapi": "^1.4.0",
+    "es-toolkit": "^1.39.8",
     "find-up": "^7.0.0",
     "js-yaml": "^4.1.0",
-    "lodash-es": "^4.17.21",
     "semver": "^7.7.1",
     "typanion": "^3.14.0"
   },
   "devDependencies": {
     "@emnapi/core": "^1.4.0",
     "@emnapi/runtime": "^1.4.0",
-    "@oxc-node/core": "^0.0.30",
+    "@oxc-node/core": "^0.0.32",
     "@std/toml": "npm:@jsr/std__toml@^1.0.8",
     "@types/debug": "^4.1.12",
     "@types/inquirer": "^9.0.7",
     "@types/js-yaml": "^4.0.9",
-    "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.13.16",
     "@types/semver": "^7.7.0",
     "ava": "^6.2.0",
     "env-paths": "^3.0.0",
     "prettier": "^3.5.3",
-    "rolldown": "latest",
+    "tsdown": "^0.14.0",
     "tslib": "^2.8.1",
     "typescript": "^5.8.2"
   },
@@ -116,9 +107,8 @@
     "url": "https://github.com/sponsors/Brooooooklyn"
   },
   "scripts": {
-    "clean": "node --import @oxc-node/core/register ./clean.ts",
     "codegen": "node --import @oxc-node/core/register ./codegen/index.ts",
-    "build": "tsc && yarn clean && rolldown -c rolldown.config.js",
+    "build": "tsdown",
     "test": "node --import @oxc-node/core/register ../node_modules/ava/entrypoints/cli.mjs"
   },
   "ava": {

package/src/api/build.ts

@@ -227,62 +227,43 @@ class Builder {
       const upperCaseTarget = targetToEnvVar(this.target.triple)
       const crossTargetName = alias[this.target.triple] ?? this.target.triple
       const linkerEnv = `CARGO_TARGET_${upperCaseTarget}_LINKER`
-      this.envs[linkerEnv] = join(
-        toolchainPath,
-        'bin',
-        `${crossTargetName}-gcc`,
+      this.setEnvIfNotExists(
+        linkerEnv,
+        join(toolchainPath, 'bin', `${crossTargetName}-gcc`),
       )
-      if (!process.env.TARGET_SYSROOT) {
-        this.envs[`TARGET_SYSROOT`] = join(
-          toolchainPath,
-          crossTargetName,
-          'sysroot',
-        )
-      }
-      if (!process.env.TARGET_AR) {
-        this.envs[`TARGET_AR`] = join(
-          toolchainPath,
-          'bin',
-          `${crossTargetName}-ar`,
-        )
-      }
-      if (!process.env.TARGET_RANLIB) {
-        this.envs[`TARGET_RANLIB`] = join(
-          toolchainPath,
-          'bin',
-          `${crossTargetName}-ranlib`,
-        )
-      }
-      if (!process.env.TARGET_READELF) {
-        this.envs[`TARGET_READELF`] = join(
-          toolchainPath,
-          'bin',
-          `${crossTargetName}-readelf`,
-        )
-      }
-      if (!process.env.TARGET_C_INCLUDE_PATH) {
-        this.envs[`TARGET_C_INCLUDE_PATH`] = join(
-          toolchainPath,
-          crossTargetName,
-          'sysroot',
-          'usr',
-          'include/',
-        )
-      }
-      if (!process.env.TARGET_CC) {
-        this.envs[`TARGET_CC`] = join(
-          toolchainPath,
-          'bin',
-          `${crossTargetName}-gcc`,
-        )
-      }
-      if (!process.env.TARGET_CXX) {
-        this.envs[`TARGET_CXX`] = join(
-          toolchainPath,
-          'bin',
-          `${crossTargetName}-g++`,
-        )
-      }
+      this.setEnvIfNotExists(
+        'TARGET_SYSROOT',
+        join(toolchainPath, crossTargetName, 'sysroot'),
+      )
+      this.setEnvIfNotExists(
+        'TARGET_AR',
+        join(toolchainPath, 'bin', `${crossTargetName}-ar`),
+      )
+      this.setEnvIfNotExists(
+        'TARGET_RANLIB',
+        join(toolchainPath, 'bin', `${crossTargetName}-ranlib`),
+      )
+      this.setEnvIfNotExists(
+        'TARGET_READELF',
+        join(toolchainPath, 'bin', `${crossTargetName}-readelf`),
+      )
+      this.setEnvIfNotExists(
+        'TARGET_C_INCLUDE_PATH',
+        join(toolchainPath, crossTargetName, 'sysroot', 'usr', 'include/'),
+      )
+      this.setEnvIfNotExists(
+        'TARGET_CC',
+        join(toolchainPath, 'bin', `${crossTargetName}-gcc`),
+      )
+      this.setEnvIfNotExists(
+        'TARGET_CXX',
+        join(toolchainPath, 'bin', `${crossTargetName}-g++`),
+      )
+      this.setEnvIfNotExists(
+        'BINDGEN_EXTRA_CLANG_ARGS',
+        `--sysroot=${this.envs.TARGET_SYSROOT}}`,
+      )
+
       if (
         process.env.TARGET_CC?.startsWith('clang') ||
         (process.env.CC?.startsWith('clang') && !process.env.TARGET_CC)

package/src/api/rename.ts

@@ -4,7 +4,7 @@ import { resolve, join } from 'node:path'
 
 import { parse as parseToml, stringify as stringifyToml } from '@std/toml'
 import { load as yamlParse, dump as yamlStringify } from 'js-yaml'
-import { isNil, merge, omitBy, pick } from 'lodash-es'
+import { isNil, merge, omitBy, pick } from 'es-toolkit'
 import { findUp } from 'find-up'
 
 import { applyDefaultRenameOptions, RenameOptions } from '../def/rename.js'
@@ -22,8 +22,14 @@ export async function renameProject(userOptions: RenameOptions) {
   const packageJsonData = JSON.parse(packageJsonContent)
 
   merge(
-    packageJsonData,
-    omitBy(pick(options, ['name', 'description', 'author', 'license']), isNil),
+    merge(
+      packageJsonData,
+      omitBy(
+        // @ts-expect-error missing fields: author and license
+        pick(options, ['name', 'description', 'author', 'license']),
+        isNil,
+      ),
+    ),
     {
       napi: omitBy(
         {

package/src/utils/config.ts

@@ -1,5 +1,5 @@
 import { underline, yellow } from 'colorette'
-import { merge, omit } from 'lodash-es'
+import { merge, omit } from 'es-toolkit'
 
 import { fileExists, readFileAsync } from './misc.js'
 import { DEFAULT_TARGETS, parseTriple, Target } from './target.js'
@@ -208,7 +208,7 @@ export async function readNapiConfig(
       packageJson: pkgJson,
       npmClient: 'npm',
     },
-    omit(userNapiConfig, 'targets'),
+    omit(userNapiConfig, ['targets']),
   )
 
   let targets: string[] = userNapiConfig.targets ?? []

package/src/utils/typegen.ts

@@ -1,4 +1,4 @@
-import { sortBy } from 'lodash-es'
+import { sortBy } from 'es-toolkit'
 
 import { readFileAsync } from './misc.js'
 
@@ -60,6 +60,18 @@ function prettyPrint(
 
     case TypeDefKind.Struct:
       const extendsDef = line.extends ? ` extends ${line.extends}` : ''
+      if (line.extends) {
+        // Extract generic params from extends type like Iterator<T, TResult, TNext>
+        const genericMatch = line.extends.match(/Iterator<(.+)>$/)
+        if (genericMatch) {
+          const [T, TResult, TNext] = genericMatch[1]
+            .split(',')
+            .map((p) => p.trim())
+          line.def =
+            line.def +
+            `\nnext(value?: ${TNext}): IteratorResult<${T}, ${TResult}>`
+        }
+      }
       s += `${exportDeclare(ambient)} class ${line.name}${extendsDef} {\n${line.def}\n}`
       if (line.original_name && line.original_name !== line.name) {
         s += `\nexport type ${line.original_name} = ${line.name}`
@@ -94,7 +106,7 @@ export async function processTypeDef(
   const groupedDefs = preprocessTypeDef(defs)
 
   const dts =
-    sortBy(Array.from(groupedDefs), ([namespace]) => namespace)
+    sortBy(Array.from(groupedDefs), [([namespace]) => namespace])
       .map(([namespace, defs]) => {
         if (namespace === TOP_LEVEL_NAMESPACE) {
           return defs

package/dist/api/__tests__/create-npm-dirs.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/api/__tests__/new.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/api/artifacts.d.ts

@@ -1,2 +0,0 @@
-import { ArtifactsOptions } from '../def/artifacts.js';
-export declare function collectArtifacts(userOptions: ArtifactsOptions): Promise<void>;

package/dist/api/build.d.ts

@@ -1,14 +0,0 @@
-import { BuildOptions as RawBuildOptions } from '../def/build.js';
-type OutputKind = 'js' | 'dts' | 'node' | 'exe' | 'wasm';
-type Output = {
-    kind: OutputKind;
-    path: string;
-};
-type BuildOptions = RawBuildOptions & {
-    cargoOptions?: string[];
-};
-export declare function buildProject(rawOptions: BuildOptions): Promise<{
-    task: Promise<Output[]>;
-    abort: () => void;
-}>;
-export {};

package/dist/api/create-npm-dirs.d.ts

@@ -1,7 +0,0 @@
-import { CreateNpmDirsOptions } from '../def/create-npm-dirs.js';
-export interface PackageMeta {
-    'dist-tags': {
-        [index: string]: string;
-    };
-}
-export declare function createNpmDirs(userOptions: CreateNpmDirsOptions): Promise<void>;

package/dist/api/new.d.ts

@@ -1,4 +0,0 @@
-import { NewOptions as RawNewOptions } from '../def/new.js';
-type NewOptions = Required<RawNewOptions>;
-export declare function newProject(userOptions: RawNewOptions): Promise<void>;
-export { NewOptions };

package/dist/api/pre-publish.d.ts

@@ -1,2 +0,0 @@
-import { PrePublishOptions } from '../def/pre-publish.js';
-export declare function prePublish(userOptions: PrePublishOptions): Promise<void>;

package/dist/api/rename.d.ts

@@ -1,2 +0,0 @@
-import { RenameOptions } from '../def/rename.js';
-export declare function renameProject(userOptions: RenameOptions): Promise<void>;

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

@@ -1 +0,0 @@
-export * from './js-binding.js';

package/dist/api/templates/js-binding.d.ts

@@ -1,2 +0,0 @@
-export declare function createCjsBinding(localName: string, pkgName: string, idents: string[], packageVersion?: string): string;
-export declare function createEsmBinding(localName: string, pkgName: string, idents: string[], packageVersion?: string): string;

package/dist/api/templates/load-wasi-template.d.ts

@@ -1,2 +0,0 @@
-export declare const createWasiBrowserBinding: (wasiFilename: string, initialMemory?: number, maximumMemory?: number, fs?: boolean, asyncInit?: boolean, buffer?: boolean) => string;
-export declare const createWasiBinding: (wasmFileName: string, packageName: string, initialMemory?: number, maximumMemory?: number) => string;

package/dist/api/templates/wasi-worker-template.d.ts

@@ -1,2 +0,0 @@
-export declare const WASI_WORKER_TEMPLATE = "import fs from \"node:fs\";\nimport { createRequire } from \"node:module\";\nimport { parse } from \"node:path\";\nimport { WASI } from \"node:wasi\";\nimport { parentPort, Worker } from \"node:worker_threads\";\n\nconst require = createRequire(import.meta.url);\n\nconst { instantiateNapiModuleSync, MessageHandler, getDefaultContext } = require(\"@napi-rs/wasm-runtime\");\n\nif (parentPort) {\n  parentPort.on(\"message\", (data) => {\n    globalThis.onmessage({ data });\n  });\n}\n\nObject.assign(globalThis, {\n  self: globalThis,\n  require,\n  Worker,\n  importScripts: function (f) {\n    ;(0, eval)(fs.readFileSync(f, \"utf8\") + \"//# sourceURL=\" + f);\n  },\n  postMessage: function (msg) {\n    if (parentPort) {\n      parentPort.postMessage(msg);\n    }\n  },\n});\n\nconst emnapiContext = getDefaultContext();\n\nconst __rootDir = parse(process.cwd()).root;\n\nconst handler = new MessageHandler({\n  onLoad({ wasmModule, wasmMemory }) {\n    const wasi = new WASI({\n      version: 'preview1',\n      env: process.env,\n      preopens: {\n        [__rootDir]: __rootDir,\n      },\n    });\n\n    return instantiateNapiModuleSync(wasmModule, {\n      childThread: true,\n      wasi,\n      context: emnapiContext,\n      overwriteImports(importObject) {\n        importObject.env = {\n          ...importObject.env,\n          ...importObject.napi,\n          ...importObject.emnapi,\n          memory: wasmMemory\n        };\n      },\n    });\n  },\n});\n\nglobalThis.onmessage = function (e) {\n  handler.handle(e);\n};\n";
-export declare const createWasiBrowserWorkerBinding: (fs: boolean) => string;

package/dist/api/universalize.d.ts

@@ -1,2 +0,0 @@
-import { UniversalizeOptions } from '../def/universalize.js';
-export declare function universalizeBinaries(userOptions: UniversalizeOptions): Promise<void>;

package/dist/api/version.d.ts

@@ -1,2 +0,0 @@
-import { VersionOptions } from '../def/version.js';
-export declare function version(userOptions: VersionOptions): Promise<void>;

package/dist/cli.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/dist/commands/artifacts.d.ts

@@ -1,6 +0,0 @@
-import { BaseArtifactsCommand } from '../def/artifacts.js';
-export declare class ArtifactsCommand extends BaseArtifactsCommand {
-    static usage: import("clipanion").Usage;
-    static paths: string[][];
-    execute(): Promise<void>;
-}

package/dist/commands/build.d.ts

@@ -1,6 +0,0 @@
-import { BaseBuildCommand } from '../def/build.js';
-export declare class BuildCommand extends BaseBuildCommand {
-    pipe: string | undefined;
-    cargoOptions: string[];
-    execute(): Promise<void>;
-}

package/dist/commands/create-npm-dirs.d.ts

@@ -1,4 +0,0 @@
-import { BaseCreateNpmDirsCommand } from '../def/create-npm-dirs.js';
-export declare class CreateNpmDirsCommand extends BaseCreateNpmDirsCommand {
-    execute(): Promise<void>;
-}

package/dist/commands/help.d.ts

@@ -1,10 +0,0 @@
-import { Command } from 'clipanion';
-/**
- * A command that prints the usage of all commands.
- *
- * Paths: `-h`, `--help`
- */
-export declare class HelpCommand extends Command<any> {
-    static paths: string[][];
-    execute(): Promise<void>;
-}

package/dist/commands/new.d.ts

@@ -1,12 +0,0 @@
-import { BaseNewCommand } from '../def/new.js';
-export declare class NewCommand extends BaseNewCommand {
-    interactive: boolean;
-    execute(): Promise<0 | 1>;
-    private fetchOptions;
-    private fetchName;
-    private fetchLicense;
-    private fetchNapiVersion;
-    private fetchTargets;
-    private fetchTypeDef;
-    private fetchGithubActions;
-}

package/dist/commands/pre-publish.d.ts

@@ -1,4 +0,0 @@
-import { BasePrePublishCommand } from '../def/pre-publish.js';
-export declare class PrePublishCommand extends BasePrePublishCommand {
-    execute(): Promise<void>;
-}

package/dist/commands/rename.d.ts

@@ -1,4 +0,0 @@
-import { BaseRenameCommand } from '../def/rename.js';
-export declare class RenameCommand extends BaseRenameCommand {
-    execute(): Promise<void>;
-}

package/dist/commands/universalize.d.ts

@@ -1,4 +0,0 @@
-import { BaseUniversalizeCommand } from '../def/universalize.js';
-export declare class UniversalizeCommand extends BaseUniversalizeCommand {
-    execute(): Promise<void>;
-}

package/dist/commands/version.d.ts

@@ -1,4 +0,0 @@
-import { BaseVersionCommand } from '../def/version.js';
-export declare class VersionCommand extends BaseVersionCommand {
-    execute(): Promise<void>;
-}

package/dist/def/artifacts.d.ts

@@ -1,70 +0,0 @@
-import { Command } from 'clipanion';
-export declare abstract class BaseArtifactsCommand extends Command {
-    static paths: string[][];
-    static usage: import("clipanion").Usage;
-    cwd: string;
-    configPath?: string;
-    packageJsonPath: string;
-    outputDir: string;
-    npmDir: string;
-    buildOutputDir?: string;
-    getOptions(): {
-        cwd: string;
-        configPath: string | undefined;
-        packageJsonPath: string;
-        outputDir: string;
-        npmDir: string;
-        buildOutputDir: string | undefined;
-    };
-}
-/**
- * Copy artifacts from Github Actions into npm packages and ready to publish
- */
-export interface ArtifactsOptions {
-    /**
-     * The working directory of where napi command will be executed in, all other paths options are relative to this path
-     *
-     * @default process.cwd()
-     */
-    cwd?: string;
-    /**
-     * Path to `napi` config json file
-     */
-    configPath?: string;
-    /**
-     * Path to `package.json`
-     *
-     * @default 'package.json'
-     */
-    packageJsonPath?: string;
-    /**
-     * Path to the folder where all built `.node` files put, same as `--output-dir` of build command
-     *
-     * @default './artifacts'
-     */
-    outputDir?: string;
-    /**
-     * Path to the folder where the npm packages put
-     *
-     * @default 'npm'
-     */
-    npmDir?: string;
-    /**
-     * Path to the build output dir, only needed when targets contains `wasm32-wasi-*`
-     */
-    buildOutputDir?: string;
-}
-export declare function applyDefaultArtifactsOptions(options: ArtifactsOptions): {
-    cwd: string;
-    /**
-     * Path to `napi` config json file
-     */
-    configPath?: string;
-    packageJsonPath: string;
-    outputDir: string;
-    npmDir: string;
-    /**
-     * Path to the build output dir, only needed when targets contains `wasm32-wasi-*`
-     */
-    buildOutputDir?: string;
-};