typeslayer 0.1.4 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typeslayer",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Slay your TypeScript types",
   "private": false,
   "type": "module",
@@ -44,10 +44,6 @@
   },
   "packageManager": "pnpm@10.6.5",
   "scripts": {
-    "postinstall": "node scripts/postinstall.js",
-    "dev": "vite",
-    "build": "tsc && vite build",
-    "preview": "vite preview",
-    "tauri": "tauri"
+    "postinstall": "node scripts/postinstall.js"
   }
 }

package/scripts/postinstall.js

@@ -1,13 +1,15 @@
 #!/usr/bin/env node
 
-import { chmodSync, createWriteStream, existsSync, mkdirSync } from "node:fs";
-import { get } from "node:https";
+import { execSync } from "node:child_process";
+import { chmodSync, existsSync, mkdirSync } from "node:fs";
+import { createRequire } from "node:module";
 import { arch, platform } from "node:os";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
+const require = createRequire(import.meta.url);
 
 const PACKAGE_VERSION = process.env.npm_package_version;
 
@@ -19,84 +21,49 @@ if (process.env.TYPESLAYER_SKIP_POSTINSTALL) {
 	process.exit(0);
 }
 
+// Also skip if we're in a pnpm workspace (local development)
+if (
+	process.env.PNPM_HOME ||
+	process.env.npm_config_user_agent?.includes("pnpm")
+) {
+	console.log("⏭️  Skipping typeslayer binary download (in pnpm workspace).");
+	process.exit(0);
+}
+
 const getBinaryInfo = () => {
 	const plat = platform();
 	const architecture = arch();
 
-	let platformDir, binaryName, releaseAssetName;
+	let platformDir, binaryName, npmPackage;
 
 	if (plat === "linux" && architecture === "x64") {
 		platformDir = "linux-x64";
 		binaryName = "typeslayer";
-		releaseAssetName = "typeslayer-linux-x64";
+		npmPackage = "@typeslayer/linux-x64";
 	} else if (plat === "darwin" && architecture === "x64") {
 		platformDir = "darwin-x64";
 		binaryName = "typeslayer";
-		releaseAssetName = "typeslayer-darwin-x64";
+		npmPackage = "@typeslayer/darwin-x64";
 	} else if (plat === "darwin" && architecture === "arm64") {
 		platformDir = "darwin-arm64";
 		binaryName = "typeslayer";
-		releaseAssetName = "typeslayer-darwin-arm64";
+		npmPackage = "@typeslayer/darwin-arm64";
 	} else if (plat === "win32" && architecture === "x64") {
 		platformDir = "win32-x64";
 		binaryName = "typeslayer.exe";
-		releaseAssetName = "typeslayer-win32-x64.exe";
+		npmPackage = "@typeslayer/win32-x64";
 	} else {
 		console.warn(`⚠️  Platform ${plat}-${architecture} is not supported`);
 		process.exit(0); // Don't fail the install, just skip
 	}
 
-	return { platformDir, binaryName, releaseAssetName };
-};
-
-const downloadBinary = (url, destPath) => {
-	return new Promise((resolve, reject) => {
-		console.log(`📦 Downloading binary from ${url}...`);
-
-		get(url, (response) => {
-			if (response.statusCode === 302 || response.statusCode === 301) {
-				// Follow redirect
-				return downloadBinary(response.headers.location, destPath).then(
-					resolve,
-					reject,
-				);
-			}
-
-			if (response.statusCode !== 200) {
-				reject(
-					new Error(
-						`Failed to download: ${response.statusCode} ${response.statusMessage}`,
-					),
-				);
-				return;
-			}
-
-			const fileStream = createWriteStream(destPath);
-			response.pipe(fileStream);
-
-			fileStream.on("finish", () => {
-				fileStream.close();
-				// Make executable on Unix-like systems
-				if (process.platform !== "win32") {
-					chmodSync(destPath, 0o755);
-				}
-				console.log("✅ Binary downloaded successfully");
-				resolve();
-			});
-
-			fileStream.on("error", (err) => {
-				reject(err);
-			});
-		}).on("error", (err) => {
-			reject(err);
-		});
-	});
+	return { platformDir, binaryName, npmPackage };
 };
 
 (async () => {
 	try {
-		const { platformDir, binaryName, releaseAssetName } = getBinaryInfo();
-		const binariesDir = join(__dirname, "..", "binaries", platformDir);
+		const { platformDir, binaryName, npmPackage } = getBinaryInfo();
+		const binariesDir = join(__dirname, "..", "..", "builds", platformDir);
 		const binaryPath = join(binariesDir, binaryName);
 
 		// Skip if binary already exists
@@ -108,10 +75,63 @@ const downloadBinary = (url, destPath) => {
 		// Create directory if it doesn't exist
 		mkdirSync(binariesDir, { recursive: true });
 
-		// Download from GitHub release
-		const releaseUrl = `https://github.com/dimitropoulos/typeslayer/releases/download/typeslayer-v${PACKAGE_VERSION}/${releaseAssetName}`;
+		// First, try to use the optionalDependency (esbuild pattern)
+		// This is the primary mechanism - npm installs the right platform package automatically
+		let binaryFound = false;
+		try {
+			const optionalPkgPath = require.resolve(`${npmPackage}/package.json`);
+			const optionalBinaryPath = join(dirname(optionalPkgPath), binaryName);
+			if (existsSync(optionalBinaryPath)) {
+				console.log(`📦 Using ${npmPackage} from optionalDependencies...`);
+				const fs = await import("node:fs/promises");
+				await fs.copyFile(optionalBinaryPath, binaryPath);
+				if (process.platform !== "win32") {
+					chmodSync(binaryPath, 0o755);
+				}
+				console.log("✅ Binary copied successfully");
+				binaryFound = true;
+			}
+		} catch {
+			// optionalDependency not available - fall back to downloading
+			console.warn(
+				`⚠️  ${npmPackage} not found in optionalDependencies (may have been installed with --no-optional flag)`,
+			);
+		}
+
+		if (!binaryFound) {
+			// Fallback: Install the platform-specific binary package from npm
+			console.log(`📦 Downloading ${npmPackage}@${PACKAGE_VERSION}...`);
+			execSync(`npm install --no-save "${npmPackage}@${PACKAGE_VERSION}"`, {
+				stdio: "inherit",
+			});
 
-		await downloadBinary(releaseUrl, binaryPath);
+			// Copy the binary from node_modules to our builds directory
+			const nodeModulesBinaryPath = join(
+				__dirname,
+				"..",
+				"..",
+				"..",
+				"node_modules",
+				npmPackage.replace("@", "").replace("/", "-"),
+				binaryName,
+			);
+
+			if (!existsSync(nodeModulesBinaryPath)) {
+				throw new Error(
+					`Binary not found at ${nodeModulesBinaryPath} after npm install`,
+				);
+			}
+
+			// Copy and make executable
+			const fs = await import("node:fs/promises");
+			await fs.copyFile(nodeModulesBinaryPath, binaryPath);
+
+			if (process.platform !== "win32") {
+				chmodSync(binaryPath, 0o755);
+			}
+
+			console.log("✅ Binary installed successfully");
+		}
 	} catch (error) {
 		console.error("❌ Failed to download binary:", error.message);
 		console.error(