@maayn/veld 0.3.6 → 0.3.7

package/bin/veld.js

@@ -4,12 +4,12 @@
  * Veld CLI — npm wrapper
  *
  * This wrapper uses the bundled binary for the current platform.
- * Binaries are included in the package for all supported platforms.
+ * The binary is downloaded by the postinstall script (install.js).
  */
 
 "use strict";
 
-const { execFileSync } = require("child_process");
+const { spawnSync } = require("child_process");
 const path = require("path");
 const fs = require("fs");
 const os = require("os");
@@ -44,7 +44,7 @@ function getBinaryName() {
 }
 
 function getBinaryPath() {
-  // Use bundled binary for this platform
+  // 1. Use bundled binary for this platform (downloaded by postinstall)
   const platformKey = getPlatformKey();
   if (platformKey) {
     const bundledBin = path.join(__dirname, "..", "binaries", platformKey, getBinaryName());
@@ -53,32 +53,50 @@ function getBinaryPath() {
     }
   }
 
-  // Fallback: check if veld is on PATH
-  const envPath = os.platform() === "win32" ? "veld.exe" : "veld";
-  return envPath;
-}
+  // 2. Check if veld binary was placed at package root (single-binary layout)
+  const rootBin = path.join(__dirname, "..", getBinaryName());
+  if (fs.existsSync(rootBin)) {
+    return rootBin;
+  }
 
-try {
-  const binary = getBinaryPath();
-  const args = process.argv.slice(2);
+  // 3. Not found — return null so we can show a helpful error
+  return null;
+}
 
-  const result = execFileSync(binary, args, {
-    stdio: "inherit",
-    env: process.env,
-  });
+const binary = getBinaryPath();
 
-  process.exit(0);
-} catch (err) {
-  if (err.status !== undefined) {
-    process.exit(err.status);
-  }
-  console.error("Error: Could not run veld binary.");
-  console.error("Try reinstalling: npm install @maayn/veld");
+if (!binary) {
+  console.error("Error: Veld binary not found for your platform.");
   console.error("");
-  console.error("Or install manually:");
-  console.error("  go install github.com/Adhamzineldin/Veld/cmd/veld@latest");
+  console.error("The postinstall script may have failed. Try:");
+  console.error("  npm rebuild @maayn/veld");
   console.error("");
-  console.error(err.message);
+  console.error("Or install the binary manually:");
+  console.error("  go install github.com/Adhamzineldin/Veld/cmd/veld@latest");
+  console.error("  pip install maayn-veld");
+  console.error("  brew install maayn-veld/tap/maayn-veld");
+  process.exit(1);
+}
+
+const args = process.argv.slice(2);
+
+// Use spawnSync with shell:false to avoid opening a new terminal window on Windows.
+// stdio:"inherit" ensures stdin is passed through for interactive commands (e.g. veld init).
+const result = spawnSync(binary, args, {
+  stdio: "inherit",
+  env: process.env,
+  shell: false,
+  windowsHide: true,
+});
+
+if (result.error) {
+  if (result.error.code === "ENOENT") {
+    console.error("Error: Veld binary not found at: " + binary);
+    console.error("Try reinstalling: npm install @maayn/veld");
+  } else {
+    console.error("Error running veld:", result.error.message);
+  }
   process.exit(1);
 }
 
+process.exit(result.status || 0);

package/install.js

@@ -0,0 +1,222 @@
+/**
+ * Veld CLI — postinstall script
+ *
+ * Downloads the correct pre-built Veld binary for the current platform
+ * from GitHub Releases. Falls back to `go install` if the download fails.
+ *
+ * Supported platforms:
+ *   - linux-amd64, linux-arm64
+ *   - darwin-amd64, darwin-arm64
+ *   - windows-amd64
+ */
+
+"use strict";
+
+const https = require("https");
+const http = require("http");
+const fs = require("fs");
+const path = require("path");
+const os = require("os");
+const { execSync } = require("child_process");
+const zlib = require("zlib");
+
+const GITHUB_REPO = "Adhamzineldin/Veld";
+const GITHUB_API = `https://api.github.com/repos/${GITHUB_REPO}/releases/latest`;
+
+async function getLatestVersion() {
+  // Allow override via environment variable
+  if (process.env.VELD_VERSION) {
+    return process.env.VELD_VERSION.replace(/^v/, "");
+  }
+
+  try {
+    const https = require("https");
+    return new Promise((resolve, reject) => {
+      https.get(GITHUB_API, { timeout: 10000 }, (res) => {
+        let data = "";
+        res.on("data", (chunk) => (data += chunk));
+        res.on("end", () => {
+          try {
+            const json = JSON.parse(data);
+            const tag = json.tag_name || "";
+            resolve(tag.replace(/^v/, "") || "latest");
+          } catch {
+            resolve("latest");
+          }
+        });
+        res.on("error", () => resolve("latest"));
+      }).on("error", () => resolve("latest"));
+    });
+  } catch {
+    return "latest";
+  }
+}
+
+function getBaseUrl(version) {
+  if (version === "latest") {
+    return `https://github.com/${GITHUB_REPO}/releases/latest/download`;
+  }
+  return `https://github.com/${GITHUB_REPO}/releases/download/v${version}`;
+}
+
+function getPlatformKey() {
+  const platform = os.platform();
+  const arch = os.arch();
+
+  const platformMap = {
+    linux: "linux",
+    darwin: "darwin",
+    win32: "windows",
+  };
+
+  const archMap = {
+    x64: "amd64",
+    arm64: "arm64",
+  };
+
+  const p = platformMap[platform];
+  const a = archMap[arch];
+
+  if (!p || !a) {
+    return null;
+  }
+
+  return `${p}-${a}`;
+}
+
+function getBinaryName() {
+  return os.platform() === "win32" ? "veld.exe" : "veld";
+}
+
+function getDownloadUrl(platformKey, version) {
+  const ext = os.platform() === "win32" ? ".zip" : ".tar.gz";
+  const baseUrl = getBaseUrl(version);
+  return `${baseUrl}/veld-${platformKey}${ext}`;
+}
+
+function download(url) {
+  return new Promise((resolve, reject) => {
+    const get = url.startsWith("https") ? https.get : http.get;
+    get(url, (res) => {
+      // Follow redirects (GitHub sends 302)
+      if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+        return download(res.headers.location).then(resolve).catch(reject);
+      }
+      if (res.statusCode !== 200) {
+        reject(new Error(`HTTP ${res.statusCode} downloading ${url}`));
+        return;
+      }
+      const chunks = [];
+      res.on("data", (chunk) => chunks.push(chunk));
+      res.on("end", () => resolve(Buffer.concat(chunks)));
+      res.on("error", reject);
+    }).on("error", reject);
+  });
+}
+
+async function extractTarGz(buffer, destDir) {
+  // Write to temp file and use tar
+  const tmpFile = path.join(os.tmpdir(), `veld-${Date.now()}.tar.gz`);
+  fs.writeFileSync(tmpFile, buffer);
+  fs.mkdirSync(destDir, { recursive: true });
+  try {
+    execSync(`tar -xzf "${tmpFile}" -C "${destDir}"`, { stdio: "pipe" });
+  } finally {
+    fs.unlinkSync(tmpFile);
+  }
+}
+
+async function extractZip(buffer, destDir) {
+  // Write to temp file and use PowerShell / unzip
+  const tmpFile = path.join(os.tmpdir(), `veld-${Date.now()}.zip`);
+  fs.writeFileSync(tmpFile, buffer);
+  fs.mkdirSync(destDir, { recursive: true });
+  try {
+    if (os.platform() === "win32") {
+      execSync(
+        `powershell -Command "Expand-Archive -Force -Path '${tmpFile}' -DestinationPath '${destDir}'"`,
+        { stdio: "pipe" }
+      );
+    } else {
+      execSync(`unzip -o "${tmpFile}" -d "${destDir}"`, { stdio: "pipe" });
+    }
+  } finally {
+    fs.unlinkSync(tmpFile);
+  }
+}
+
+async function tryGoInstall() {
+  console.log("Attempting fallback: go install github.com/Adhamzineldin/Veld/cmd/veld@latest");
+  try {
+    execSync("go install github.com/Adhamzineldin/Veld/cmd/veld@latest", {
+      stdio: "inherit",
+    });
+    console.log("✓ Installed veld via go install");
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+async function main() {
+  const platformKey = getPlatformKey();
+
+  if (!platformKey) {
+    console.warn(
+      `Warning: Unsupported platform ${os.platform()}-${os.arch()}.`
+    );
+    console.warn("Attempting go install fallback...");
+    if (await tryGoInstall()) return;
+    console.warn("Install veld manually: go install github.com/Adhamzineldin/Veld/cmd/veld@latest");
+    return;
+  }
+
+  const version = await getLatestVersion();
+  const url = getDownloadUrl(platformKey, version);
+  const destDir = path.join(__dirname, "binaries", platformKey);
+  const binaryName = getBinaryName();
+  const binaryPath = path.join(destDir, binaryName);
+
+  // Skip if already downloaded
+  if (fs.existsSync(binaryPath)) {
+    console.log(`✓ veld binary already exists at ${binaryPath}`);
+    return;
+  }
+
+  console.log(`Downloading veld ${version} for ${platformKey}...`);
+  console.log(`  ${url}`);
+
+  try {
+    const buffer = await download(url);
+
+    if (os.platform() === "win32") {
+      await extractZip(buffer, destDir);
+    } else {
+      await extractTarGz(buffer, destDir);
+    }
+
+    // Make binary executable on Unix
+    if (os.platform() !== "win32") {
+      fs.chmodSync(binaryPath, 0o755);
+    }
+
+    if (fs.existsSync(binaryPath)) {
+      console.log(`✓ veld ${version} installed successfully`);
+    } else {
+      throw new Error("Binary not found after extraction");
+    }
+  } catch (err) {
+    console.warn(`Warning: Could not download pre-built binary: ${err.message}`);
+    console.warn("");
+
+    if (await tryGoInstall()) return;
+
+    console.warn("Install veld manually:");
+    console.warn("  go install github.com/Adhamzineldin/Veld/cmd/veld@latest");
+    console.warn("");
+    console.warn("Or download from: https://github.com/Adhamzineldin/Veld/releases");
+  }
+}
+
+main();
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maayn/veld",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "Contract-first, multi-stack API code generator. Write .veld contracts once, generate typed frontend SDKs and backend service interfaces.",
   "keywords": [
     "veld",
@@ -23,12 +23,16 @@
   "bin": {
     "veld": "./bin/veld.js"
   },
+  "scripts": {
+    "postinstall": "node install.js"
+  },
   "engines": {
     "node": ">=16"
   },
   "files": [
     "bin/",
     "binaries/",
+    "install.js",
     "README.md",
     "LICENSE"
   ]