@napi-rs/cli 3.0.0-alpha.3 → 3.0.0-alpha.31

package/src/api/new.ts

@@ -1,4 +1,4 @@
-import path from 'path'
+import path from 'node:path'
 
 import {
   applyDefaultNewOptions,
@@ -10,7 +10,11 @@ import {
   debugFactory,
   DEFAULT_TARGETS,
   mkdirAsync,
+  readdirAsync,
+  statAsync,
+  type SupportedTestFramework,
   writeFileAsync,
+  SupportedPackageManager,
 } from '../utils/index.js'
 import { napiEngineRequirement } from '../utils/version.js'
 
@@ -35,6 +39,9 @@ type NewOptions = Required<RawNewOptions>
 
 function processOptions(options: RawNewOptions) {
   debug('Processing options...')
+  if (!options.path) {
+    throw new Error('Please provide the path as the argument')
+  }
   options.path = path.resolve(process.cwd(), options.path)
   debug(`Resolved target path to: ${options.path}`)
 
@@ -67,47 +74,75 @@ export async function newProject(userOptions: RawNewOptions) {
   debug('Targets to be enabled:')
   debug(options.targets)
 
-  const outputs = generateFiles(options)
+  const outputs = await generateFiles(options)
 
-  try {
-    debug(`Try to create target directory: ${options.path}`)
-    if (!options.dryRun) {
-      await mkdirAsync(options.path, { recursive: true })
-    }
-  } catch (e) {
-    throw new Error(`Failed to create target directory: ${options.path}`, {
-      cause: e,
-    })
-  }
+  await ensurePath(options.path, options.dryRun)
 
   await dumpOutputs(outputs, options.dryRun)
   debug(`Project created at: ${options.path}`)
 }
 
-function generateFiles(options: NewOptions): Output[] {
+async function ensurePath(path: string, dryRun = false) {
+  const stat = await statAsync(path, {}).catch(() => undefined)
+
+  // file descriptor exists
+  if (stat) {
+    if (stat.isFile()) {
+      throw new Error(
+        `Path ${path} for creating new napi-rs project already exists and it's not a directory.`,
+      )
+    } else if (stat.isDirectory()) {
+      const files = await readdirAsync(path)
+      if (files.length) {
+        throw new Error(
+          `Path ${path} for creating new napi-rs project already exists and it's not empty.`,
+        )
+      }
+    }
+  }
+
+  if (!dryRun) {
+    try {
+      debug(`Try to create target directory: ${path}`)
+      if (!dryRun) {
+        await mkdirAsync(path, { recursive: true })
+      }
+    } catch (e) {
+      throw new Error(`Failed to create target directory: ${path}`, {
+        cause: e,
+      })
+    }
+  }
+}
+
+async function generateFiles(options: NewOptions): Promise<Output[]> {
+  const packageJson = await generatePackageJson(options)
   return [
     generateCargoToml,
     generateLibRs,
     generateBuildRs,
-    generatePackageJson,
     generateGithubWorkflow,
     generateIgnoreFiles,
-  ].flatMap((generator) => {
-    const output = generator(options)
-
-    if (!output) {
-      return []
-    }
-
-    if (Array.isArray(output)) {
-      return output.map((o) => ({
-        ...o,
-        target: path.join(options.path, o.target),
-      }))
-    } else {
-      return [{ ...output, target: path.join(options.path, output.target) }]
-    }
-  })
+  ]
+    .flatMap((generator) => {
+      const output = generator(options)
+
+      if (!output) {
+        return []
+      }
+
+      if (Array.isArray(output)) {
+        return output.map((o) => ({
+          ...o,
+          target: path.join(options.path, o.target),
+        }))
+      } else {
+        return [{ ...output, target: path.join(options.path, output.target) }]
+      }
+    })
+    .concat([
+      { ...packageJson, target: path.join(options.path, packageJson.target) },
+    ])
 }
 
 function generateCargoToml(options: NewOptions): Output {
@@ -136,16 +171,17 @@ function generateBuildRs(_options: NewOptions): Output {
   }
 }
 
-function generatePackageJson(options: NewOptions): Output {
+async function generatePackageJson(options: NewOptions): Promise<Output> {
   return {
     target: './package.json',
-    content: createPackageJson({
+    content: await createPackageJson({
       name: options.name,
       binaryName: getBinaryName(options.name),
       targets: options.targets,
       license: options.license,
       engineRequirement: napiEngineRequirement(options.minNodeApiVersion),
       cliVersion: CLI_VERSION,
+      testFramework: options.testFramework as SupportedTestFramework,
     }),
   }
 }
@@ -158,8 +194,8 @@ function generateGithubWorkflow(options: NewOptions): Output | null {
   return {
     target: './.github/workflows/ci.yml',
     content: createGithubActionsCIYml(
-      getBinaryName(options.name),
       options.targets,
+      options.packageManager as SupportedPackageManager,
     ),
   }
 }

package/src/api/pre-publish.ts

@@ -1,6 +1,6 @@
-import { execSync } from 'child_process'
-import { existsSync, statSync } from 'fs'
-import { join, relative, resolve } from 'path'
+import { execSync } from 'node:child_process'
+import { existsSync, statSync } from 'node:fs'
+import { join, resolve } from 'node:path'
 
 import { Octokit } from '@octokit/rest'
 
@@ -31,10 +31,13 @@ export async function prePublish(userOptions: PrePublishOptions) {
 
   const options = applyDefaultPrePublishOptions(userOptions)
 
-  const packageJsonPath = relative(options.cwd, options.packageJsonPath)
+  const packageJsonPath = resolve(options.cwd, options.packageJsonPath)
 
   const { packageJson, targets, packageName, binaryName, npmClient } =
-    await readNapiConfig(packageJsonPath)
+    await readNapiConfig(
+      packageJsonPath,
+      options.configPath ? resolve(options.cwd, options.configPath) : undefined,
+    )
 
   async function createGhRelease(packageName: string, version: string) {
     if (!options.ghRelease) {
@@ -129,11 +132,14 @@ export async function prePublish(userOptions: PrePublishOptions) {
   if (!options.dryRun) {
     await version(userOptions)
     await updatePackageJson(packageJsonPath, {
-      optionalDependencies: targets.reduce((deps, target) => {
-        deps[`${packageName}-${target.platformArchABI}`] = packageJson.version
-
-        return deps
-      }, {} as Record<string, string>),
+      optionalDependencies: targets.reduce(
+        (deps, target) => {
+          deps[`${packageName}-${target.platformArchABI}`] = packageJson.version
+
+          return deps
+        },
+        {} as Record<string, string>,
+      ),
     })
   }
 
@@ -147,7 +153,9 @@ export async function prePublish(userOptions: PrePublishOptions) {
       options.npmDir,
       `${target.platformArchABI}`,
     )
-    const filename = `${binaryName}.${target.platformArchABI}.node`
+    const ext =
+      target.platform === 'wasi' || target.platform === 'wasm' ? 'wasm' : 'node'
+    const filename = `${binaryName}.${target.platformArchABI}.${ext}`
     const dstPath = join(pkgDir, filename)
 
     if (!options.dryRun) {
@@ -184,7 +192,8 @@ export async function prePublish(userOptions: PrePublishOptions) {
               'content-length': dstFileStats.size,
               'content-type': 'application/octet-stream',
             },
-            data: await readFileAsync(dstPath, { encoding: 'utf-8' }),
+            // @ts-expect-error octokit types are wrong
+            data: await readFileAsync(dstPath),
           })
           debug.info(`GitHub release created`)
           debug.info(`Download URL: %s`, assetInfo.data.browser_download_url)

package/src/api/rename.ts

@@ -1,4 +1,4 @@
-import { resolve } from 'path'
+import { resolve } from 'node:path'
 
 import { isNil, merge, omitBy, pick } from 'lodash-es'
 
@@ -30,6 +30,15 @@ export async function renameProject(userOptions: RenameOptions) {
     },
   )
 
+  if (options.configPath) {
+    const configPath = resolve(options.cwd, options.configPath)
+    const configContent = await readFileAsync(configPath, 'utf8')
+    const configData = JSON.parse(configContent)
+    configData.binaryName = options.binaryName
+    configData.packageName = options.packageName
+    await writeFileAsync(configPath, JSON.stringify(configData, null, 2))
+  }
+
   await writeFileAsync(
     packageJsonPath,
     JSON.stringify(packageJsonData, null, 2),

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

@@ -195,4 +195,5 @@ Cargo.lock
 !.yarn/versions
 
 *.node
+*.wasm
 `