@napi-rs/cli 3.0.0-alpha.9 → 3.0.0-alpha.90

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) {
@@ -150,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) {
@@ -187,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,14 +1,19 @@
-import { resolve } from 'path'
+import { existsSync } from 'node:fs'
+import { rename } from 'node:fs/promises'
+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 { findUp } from 'find-up'
 
 import { applyDefaultRenameOptions, RenameOptions } from '../def/rename.js'
-import { readFileAsync, writeFileAsync } from '../utils/index.js'
-
-import { createNpmDirs } from './create-npm-dirs.js'
+import { readConfig, readFileAsync, writeFileAsync } from '../utils/index.js'
 
 export async function renameProject(userOptions: RenameOptions) {
   const options = applyDefaultRenameOptions(userOptions)
+  const napiConfig = await readConfig(options)
+  const oldName = napiConfig.binaryName
 
   const packageJsonPath = resolve(options.cwd, options.packageJsonPath)
   const cargoTomlPath = resolve(options.cwd, options.manifestPath)
@@ -30,22 +35,103 @@ 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),
   )
 
-  let tomlContent = await readFileAsync(cargoTomlPath, 'utf8')
-  tomlContent = tomlContent.replace(
-    /name\s?=\s?"([\w+])"/,
-    `name = "${options.binaryName}"`,
-  )
-  await writeFileAsync(cargoTomlPath, tomlContent)
-
-  await createNpmDirs({
-    cwd: options.cwd,
-    packageJsonPath: options.packageJsonPath,
-    npmDir: options.npmDir,
-    dryRun: false,
-  })
+  const tomlContent = await readFileAsync(cargoTomlPath, 'utf8')
+  const cargoToml = parseToml(tomlContent) as any
+
+  // Update the package name
+  if (cargoToml.package && options.binaryName) {
+    // Sanitize the binary name for Rust package naming conventions
+    const sanitizedName = options.binaryName
+      .replace('@', '')
+      .replace('/', '_')
+      .replace(/-/g, '_')
+      .toLowerCase()
+    cargoToml.package.name = sanitizedName
+  }
+
+  // Stringify the updated TOML
+  const updatedTomlContent = stringifyToml(cargoToml)
+
+  await writeFileAsync(cargoTomlPath, updatedTomlContent)
+  if (oldName !== options.binaryName) {
+    const githubActionsPath = await findUp('.github', {
+      cwd: options.cwd,
+      type: 'directory',
+    })
+    if (githubActionsPath) {
+      const githubActionsCIYmlPath = join(
+        githubActionsPath,
+        'workflows',
+        'CI.yml',
+      )
+      if (existsSync(githubActionsCIYmlPath)) {
+        const githubActionsContent = await readFileAsync(
+          githubActionsCIYmlPath,
+          'utf8',
+        )
+        const githubActionsData = yamlParse(githubActionsContent) as any
+        if (githubActionsData.env?.APP_NAME) {
+          githubActionsData.env.APP_NAME = options.binaryName
+          await writeFileAsync(
+            githubActionsCIYmlPath,
+            yamlStringify(githubActionsData, {
+              lineWidth: -1,
+              noRefs: true,
+              sortKeys: false,
+            }),
+          )
+        }
+      }
+    }
+    const oldWasiBrowserBindingPath = join(
+      options.cwd,
+      `${oldName}.wasi-browser.js`,
+    )
+    if (existsSync(oldWasiBrowserBindingPath)) {
+      await rename(
+        oldWasiBrowserBindingPath,
+        join(options.cwd, `${options.binaryName}.wasi-browser.js`),
+      )
+    }
+    const oldWasiBindingPath = join(options.cwd, `${oldName}.wasi.cjs`)
+    if (existsSync(oldWasiBindingPath)) {
+      await rename(
+        oldWasiBindingPath,
+        join(options.cwd, `${options.binaryName}.wasi.cjs`),
+      )
+    }
+    const gitAttributesPath = join(options.cwd, '.gitattributes')
+    if (existsSync(gitAttributesPath)) {
+      const gitAttributesContent = await readFileAsync(
+        gitAttributesPath,
+        'utf8',
+      )
+      const gitAttributesData = gitAttributesContent
+        .split('\n')
+        .map((line) => {
+          return line
+            .replace(
+              `${oldName}.wasi-browser.js`,
+              `${options.binaryName}.wasi-browser.js`,
+            )
+            .replace(`${oldName}.wasi.cjs`, `${options.binaryName}.wasi.cjs`)
+        })
+        .join('\n')
+      await writeFileAsync(gitAttributesPath, gitAttributesData)
+    }
+  }
 }

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

@@ -32,4 +32,5 @@ napi-build = "2"
 
 [profile.release]
 lto = true
+strip = "symbols"
 `