@zigc/cli 0.15.20 → 0.16.0-dev.3041

package/README.md

@@ -27,8 +27,4 @@ The `@zigc/cli` package resolves the correct native binary for your platform via
 | `@zigc/win32-x64` | Windows x64 |
 | `@zigc/win32-arm64` | Windows ARM64 |
 
-The standard library is shipped separately in `@zigc/lib` (shared across all platforms).
-
-## License
-
-MIT
+The standard library is shipped separately in `@zigc/lib` (shared across all platforms).

package/bin/zig

@@ -1,99 +1,26 @@
 #!/usr/bin/env node
+import { spawn } from 'node:child_process';
+import { createRequire } from 'node:module';
 
-// Stub that delegates to the native zig binary from the platform package.
-// Sets ZIG_LIB_DIR to the shared @zigc/lib package.
-
-import { execFileSync } from "child_process";
-import { existsSync, readFileSync } from "fs";
-import { createRequire } from "module";
-import { dirname, join } from "path";
-import { fileURLToPath } from "url";
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
 const require = createRequire(import.meta.url);
-const isWindows = process.platform === "win32";
-const ext = isWindows ? ".exe" : "";
-const platformKey = `${process.platform}-${process.arch}`;
-
-const platformDirs = {
-  "darwin-arm64": "darwin-arm64",
-  "darwin-x64": "darwin-x64",
-  "linux-x64": "linux-x64",
-  "linux-arm64": "linux-arm64",
-  "win32-x64": "win32-x64",
-  "win32-arm64": "win32-arm64",
-};
-
-function isNativeBinary(filePath) {
-  try {
-    const buf = readFileSync(filePath, { encoding: null, flag: "r" });
-    return buf.length > 2 && !(buf[0] === 0x23 && buf[1] === 0x21);
-  } catch { return false; }
-}
-
-function findBinary() {
-  const binName = `zig${ext}`;
-
-  // 1. Check if a real binary exists next to this stub
-  const localBin = join(__dirname, binName);
-  if (existsSync(localBin) && isNativeBinary(localBin)) return localBin;
-
-  // 2. Resolve from the platform-specific optional dependency (npm installed)
-  const pkgName = `@zigc/${platformDirs[platformKey]}`;
-  if (pkgName) {
-    try {
-      const pkgDir = dirname(require.resolve(`${pkgName}/package.json`));
-      const bin = join(pkgDir, "bin", binName);
-      if (existsSync(bin)) return bin;
-    } catch {}
-  }
-
-  // 3. Check sibling workspace directory (local dev with prepare.sh)
-  const dir = platformDirs[platformKey];
-  if (dir) {
-    const sibling = join(__dirname, "..", "..", dir, "bin", binName);
-    if (existsSync(sibling)) return sibling;
-  }
-
-  return null;
-}
-
-function findLibDir() {
-  // 1. Resolve from @zigc/lib package (npm installed)
-  try {
-    const libPkgDir = dirname(require.resolve("@zigc/lib/package.json"));
-    const libDir = join(libPkgDir, "lib");
-    if (existsSync(libDir)) return libDir;
-  } catch {}
-
-  // 2. Check sibling workspace directory (local dev)
-  const sibling = join(__dirname, "..", "..", "lib", "lib");
-  if (existsSync(sibling)) return sibling;
-
-  return null;
-}
-
-const bin = findBinary();
-if (!bin) {
-  console.error("Error: zig binary not found for this platform.");
-  console.error(`Platform: ${platformKey}`);
-  console.error("Run 'bash prepare.sh' in the @zigc directory to download binaries.");
-  process.exit(1);
-}
-
-const env = { ...process.env };
-
-// Set ZIG_LIB_DIR so zig can find its standard library
-const libDir = findLibDir();
-if (libDir) {
-  env.ZIG_LIB_DIR = libDir;
-}
+const pkgName = `@zigc/${process.platform}-${process.arch}`;
+const ext = process.platform === 'win32' ? '.exe' : '';
 
 try {
-  execFileSync(bin, process.argv.slice(2), { stdio: "inherit", env });
+  const binaryPath = require.resolve(`${pkgName}/bin/zig${ext}`);
+
+  const child = spawn(binaryPath, process.argv.slice(2), { 
+    stdio: 'inherit',
+    shell: process.platform === 'win32' 
+  });
+
+  child.on('exit', (code) => process.exit(code ?? 0));
+  child.on('error', (err) => {
+    console.error('Failed to start child process:', err);
+    process.exit(1);
+  });
 } catch (e) {
-  if (e.status !== undefined) {
-    process.exit(e.status);
-  }
-  throw e;
-}
+  console.error(`Error: Could not find binary for ${process.platform}-${process.arch}`);
+  console.error(`Ensure the optional dependency "${pkgName}" is installed.`);
+  process.exit(1);
+}

package/package.json

@@ -1,25 +1,26 @@
 {
   "name": "@zigc/cli",
-  "version": "0.15.20",
+  "version": "0.16.0-dev.3041",
+  "type": "module",
   "description": "Zig compiler CLI via npm - run `bunx @zigc/cli` or `npx @zigc/cli`",
   "bin": {
     "zig": "bin/zig"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/ziex-dev/ziex.git"
+    "url": "git+https://github.com/ziex-dev/zigc.git"
   },
   "license": "MIT",
   "preferUnplugged": true,
   "dependencies": {
-    "@zigc/lib": "0.15.20"
+    "@zigc/lib": "0.16.0-dev.3041"
   },
   "optionalDependencies": {
-    "@zigc/darwin-arm64": "0.15.20",
-    "@zigc/darwin-x64": "0.15.20",
-    "@zigc/linux-x64": "0.15.20",
-    "@zigc/linux-arm64": "0.15.20",
-    "@zigc/win32-x64": "0.15.20",
-    "@zigc/win32-arm64": "0.15.20"
+    "@zigc/darwin-arm64": "0.16.0-dev.3041",
+    "@zigc/darwin-x64": "0.16.0-dev.3041",
+    "@zigc/linux-x64": "0.16.0-dev.3041",
+    "@zigc/linux-arm64": "0.16.0-dev.3041",
+    "@zigc/win32-x64": "0.16.0-dev.3041",
+    "@zigc/win32-arm64": "0.16.0-dev.3041"
   }
 }