@napi-rs/cli 3.3.1 → 3.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/cli",
-  "version": "3.3.1",
+  "version": "3.4.1",
   "description": "Cli tools for napi-rs",
   "author": "LongYinan <lynweklm@gmail.com>",
   "homepage": "https://github.com/napi-rs/napi-rs",

package/src/api/build.ts

@@ -619,9 +619,7 @@ class Builder {
 
   private setOpenHarmonyEnv() {
     const { OHOS_SDK_PATH, OHOS_SDK_NATIVE } = process.env
-    const ndkPath = OHOS_SDK_PATH
-      ? `${OHOS_SDK_NATIVE}/native`
-      : OHOS_SDK_NATIVE
+    const ndkPath = OHOS_SDK_PATH ? `${OHOS_SDK_PATH}/native` : OHOS_SDK_NATIVE
     // @ts-expect-error
     if (!ndkPath && process.platform !== 'openharmony') {
       debug.warn(
@@ -880,10 +878,8 @@ class Builder {
       return []
     }
 
-    const exports = await generateTypeDef({
+    const { exports, dts } = await generateTypeDef({
       typeDefDir,
-      outputDir: this.outputDir,
-      dts: this.options.dts,
       noDtsHeader: this.options.noDtsHeader,
       dtsHeader: this.options.dtsHeader,
       configDtsHeader: this.config.dtsHeader,
@@ -892,6 +888,17 @@ class Builder {
       cwd: this.options.cwd,
     })
 
+    const dest = join(this.outputDir, this.options.dts ?? 'index.d.ts')
+
+    try {
+      debug('Writing type def to:')
+      debug('  %i', dest)
+      await writeFileAsync(dest, dts, 'utf-8')
+    } catch (e) {
+      debug.error('Failed to write type def file')
+      debug.error(e as Error)
+    }
+
     if (exports.length > 0) {
       const dest = join(this.outputDir, this.options.dts ?? 'index.d.ts')
       this.outputs.push({ kind: 'dts', path: dest })
@@ -1044,8 +1051,6 @@ export async function writeJsBinding(
 
 export interface GenerateTypeDefOptions {
   typeDefDir: string
-  outputDir: string
-  dts?: string
   noDtsHeader?: boolean
   dtsHeader?: string
   dtsHeaderFile?: string
@@ -1057,13 +1062,11 @@ export interface GenerateTypeDefOptions {
 
 export async function generateTypeDef(
   options: GenerateTypeDefOptions,
-): Promise<string[]> {
+): Promise<{ exports: string[]; dts: string }> {
   if (!(await dirExistsAsync(options.typeDefDir))) {
-    return []
+    return { exports: [], dts: '' }
   }
 
-  const dest = join(options.outputDir, options.dts ?? 'index.d.ts')
-
   let header = ''
   let dts = ''
   let exports: string[] = []
@@ -1094,7 +1097,7 @@ export async function generateTypeDef(
 
   if (!files.length) {
     debug('No type def files found. Skip generating dts file.')
-    return []
+    return { exports: [], dts: '' }
   }
 
   for (const file of files) {
@@ -1130,14 +1133,8 @@ export type TypedArray = Int8Array | Uint8Array | Uint8ClampedArray | Int16Array
 
   dts = header + dts
 
-  try {
-    debug('Writing type def to:')
-    debug('  %i', dest)
-    await writeFileAsync(dest, dts, 'utf-8')
-  } catch (e) {
-    debug.error('Failed to write type def file')
-    debug.error(e as Error)
+  return {
+    exports,
+    dts,
   }
-
-  return exports
 }

package/src/api/templates/js-binding.ts

@@ -5,9 +5,6 @@ export function createCjsBinding(
   packageVersion?: string,
 ): string {
   return `${bindingHeader}
-const { createRequire } = require('node:module')
-require = createRequire(__filename)
-
 ${createCommonBinding(localName, pkgName, packageVersion)}
 module.exports = nativeBinding
 ${idents
@@ -146,7 +143,7 @@ function requireNative() {
     }
   } else if (process.platform === 'win32') {
     if (process.arch === 'x64') {
-      if (process.report?.getReport?.()?.header?.osName?.startsWith?.('MINGW')) {
+      if (process.config?.variables?.shlib_suffix === 'dll.a' || process.config?.variables?.node_target_type === 'shared_library') {
         ${requireTuple('win32-x64-gnu')}
       } else {
         ${requireTuple('win32-x64-msvc')}

package/src/index.ts

@@ -57,6 +57,40 @@ export class NapiCli {
   version = version
 }
 
+export function createBuildCommand(args: string[]): BuildCommand {
+  return cli.process(['build', ...args]) as BuildCommand
+}
+
+export function createArtifactsCommand(args: string[]): ArtifactsCommand {
+  return cli.process(['artifacts', ...args]) as ArtifactsCommand
+}
+
+export function createCreateNpmDirsCommand(
+  args: string[],
+): CreateNpmDirsCommand {
+  return cli.process(['create-npm-dirs', ...args]) as CreateNpmDirsCommand
+}
+
+export function createPrePublishCommand(args: string[]): PrePublishCommand {
+  return cli.process(['pre-publish', ...args]) as PrePublishCommand
+}
+
+export function createRenameCommand(args: string[]): RenameCommand {
+  return cli.process(['rename', ...args]) as RenameCommand
+}
+
+export function createUniversalizeCommand(args: string[]): UniversalizeCommand {
+  return cli.process(['universalize', ...args]) as UniversalizeCommand
+}
+
+export function createVersionCommand(args: string[]): VersionCommand {
+  return cli.process(['version', ...args]) as VersionCommand
+}
+
+export function createNewCommand(args: string[]): NewCommand {
+  return cli.process(['new', ...args]) as NewCommand
+}
+
 export { parseTriple } from './utils/target.js'
 export {
   type GenerateTypeDefOptions,
@@ -64,3 +98,4 @@ export {
   writeJsBinding,
   generateTypeDef,
 } from './api/build.js'
+export { readNapiConfig } from './utils/config.js'