simplify publish native addons script

Author: Brooooooklyn

packages/cli/publish-native-addons.ts

@@ -12,7 +12,9 @@ import { readdir } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-import { NapiCli } from '@napi-rs/cli';
+import { NapiCli, parseTriple } from '@napi-rs/cli';
+
+import pkg from './package.json' with { type: 'json' };
 
 const cli = new NapiCli();
 
@@ -40,17 +42,6 @@ await cli.prePublish({
   skipOptionalPublish: true,
 });
 
-// Mapping from npm platform directory names to Rust target triples
-const RUST_TARGETS: Record<string, string> = {
-  'darwin-arm64': 'aarch64-apple-darwin',
-  'darwin-x64': 'x86_64-apple-darwin',
-  'linux-arm64-gnu': 'aarch64-unknown-linux-gnu',
-  'linux-arm64-musl': 'aarch64-unknown-linux-musl',
-  'linux-x64-gnu': 'x86_64-unknown-linux-gnu',
-  'linux-x64-musl': 'x86_64-unknown-linux-musl',
-  'win32-arm64-msvc': 'aarch64-pc-windows-msvc',
-  'win32-x64-msvc': 'x86_64-pc-windows-msvc',
-};
 const npmDir = join(currentDir, 'npm');
 const platformDirs = await readdir(npmDir);
 
@@ -69,54 +60,38 @@ for (const file of platformDirs) {
       e instanceof Error &&
       e.message.includes('You cannot publish over the previously published versions')
     ) {
+      // eslint-disable-next-line no-console
       console.info(e.message);
+      // eslint-disable-next-line no-console
       console.warn(`${file} has been published, skipping`);
     } else {
       throw e;
     }
   }
 }
 
-// Platform metadata for CLI packages
-const PLATFORM_META: Record<string, { os: string; cpu: string; libc?: string }> = {
-  'darwin-arm64': { os: 'darwin', cpu: 'arm64' },
-  'darwin-x64': { os: 'darwin', cpu: 'x64' },
-  'linux-arm64-gnu': { os: 'linux', cpu: 'arm64', libc: 'glibc' },
-  'linux-arm64-musl': { os: 'linux', cpu: 'arm64', libc: 'musl' },
-  'linux-x64-gnu': { os: 'linux', cpu: 'x64', libc: 'glibc' },
-  'linux-x64-musl': { os: 'linux', cpu: 'x64', libc: 'musl' },
-  'win32-arm64-msvc': { os: 'win32', cpu: 'arm64' },
-  'win32-x64-msvc': { os: 'win32', cpu: 'x64' },
-};
-
 // Read version from packages/cli/package.json for lockstep versioning
 const cliPackageJson = JSON.parse(readFileSync(join(currentDir, 'package.json'), 'utf-8'));
 const cliVersion = cliPackageJson.version;
 
 // Create and publish separate @voidzero-dev/vite-plus-cli-{platform} packages
 const cliNpmDir = join(currentDir, 'cli-npm');
-for (const [platform, rustTarget] of Object.entries(RUST_TARGETS)) {
-  const meta = PLATFORM_META[platform];
-  if (!meta) {
-    // eslint-disable-next-line no-console
-    console.log(`Skipping CLI package for ${platform}: no platform metadata`);
-    continue;
-  }
-
-  const isWindows = platform.startsWith('win32');
+for (const napiTarget of pkg.napi.targets) {
+  const { platform, arch, abi, platformArchABI } = parseTriple(napiTarget);
+  const isWindows = platform === 'win32';
   const binaryName = isWindows ? 'vp.exe' : 'vp';
-  const rustBinarySource = join(repoRoot, 'target', rustTarget, 'release', binaryName);
+  const rustBinarySource = join(repoRoot, 'target', napiTarget, 'release', binaryName);
 
   if (!existsSync(rustBinarySource)) {
     // eslint-disable-next-line no-console
     console.warn(
-      `Warning: Rust binary not found at ${rustBinarySource}, skipping CLI package for ${platform}`,
+      `Warning: Rust binary not found at ${rustBinarySource}, skipping CLI package for ${platformArchABI}`,
     );
     continue;
   }
 
   // Create temp directory for CLI package
-  const platformCliDir = join(cliNpmDir, platform);
+  const platformCliDir = join(cliNpmDir, platformArchABI);
   mkdirSync(platformCliDir, { recursive: true });
 
   // Copy binary
@@ -131,10 +106,10 @@ for (const [platform, rustTarget] of Object.entries(RUST_TARGETS)) {
   const shimName = 'vp-shim.exe';
   const files = [binaryName];
   if (isWindows) {
-    const shimSource = join(repoRoot, 'target', rustTarget, 'release', shimName);
+    const shimSource = join(repoRoot, 'target', napiTarget, 'release', shimName);
     if (!existsSync(shimSource)) {
       console.error(
-        `Error: ${shimName} not found at ${shimSource}. Run "cargo build -p vite_trampoline --release --target ${rustTarget}" first.`,
+        `Error: ${shimName} not found at ${shimSource}. Run "cargo build -p vite_trampoline --release --target ${napiTarget}" first.`,
       );
       process.exit(1);
     }
@@ -144,13 +119,13 @@ for (const [platform, rustTarget] of Object.entries(RUST_TARGETS)) {
 
   // Generate package.json
   const cliPackage = {
-    name: `@voidzero-dev/vite-plus-cli-${platform}`,
+    name: `@voidzero-dev/vite-plus-cli-${platformArchABI}`,
     version: cliVersion,
-    os: [meta.os],
-    cpu: [meta.cpu],
-    ...(meta.libc ? { libc: [meta.libc] } : {}),
+    os: [platform],
+    cpu: [arch],
+    ...(abi ? { libc: [abi] } : {}),
     files,
-    description: `Vite+ CLI binary for ${platform}`,
+    description: `Vite+ CLI binary for ${platformArchABI}`,
     repository: cliPackageJson.repository,
   };
   writeFileSync(join(platformCliDir, 'package.json'), JSON.stringify(cliPackage, null, 2) + '\n');