@package-pal/cli 0.0.44 → 0.0.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@package-pal/cli",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "description": "CLI tool exposing core PackagePal functionality.",
   "keywords": [
     "package",
@@ -13,24 +13,24 @@
   "license": "MIT",
   "type": "module",
   "dependencies": {
-    "tar": "^7.5.2"
+    "tar": "^7.5.9"
   },
   "devDependencies": {
-    "@clack/prompts": "^0.11.0",
-    "@stricli/core": "^1.2.4",
-    "@package-pal/core": "0.0.8",
-    "@package-pal/util": "0.0.9",
-    "@types/bun": "^1.3.3",
+    "@clack/prompts": "^1.1.0",
+    "@stricli/core": "^1.2.6",
+    "@package-pal/core": "0.0.9",
+    "@package-pal/util": "0.0.10",
+    "@types/bun": "^1.3.10",
     "typescript": "^5.9.3"
   },
   "optionalDependencies": {
-    "@package-pal/cli-linux-x64": "0.0.15",
-    "@package-pal/cli-linux-x64-musl": "0.0.15",
-    "@package-pal/cli-linux-arm64": "0.0.15",
-    "@package-pal/cli-linux-arm64-musl": "0.0.15",
-    "@package-pal/cli-darwin-arm64": "0.0.15",
-    "@package-pal/cli-darwin-x64": "0.0.15",
-    "@package-pal/cli-windows-x64": "0.0.15"
+    "@package-pal/cli-linux-x64": "0.0.17",
+    "@package-pal/cli-linux-x64-musl": "0.0.17",
+    "@package-pal/cli-linux-arm64": "0.0.17",
+    "@package-pal/cli-linux-arm64-musl": "0.0.17",
+    "@package-pal/cli-darwin-arm64": "0.0.17",
+    "@package-pal/cli-darwin-x64": "0.0.17",
+    "@package-pal/cli-windows-x64": "0.0.17"
   },
   "engines": {
     "node": ">=18"

package/src/lib/install/functions/exec.js

@@ -1,4 +1,5 @@
 import { execFileSync } from 'child_process';
+import { isDefined } from '@package-pal/util';
 
 /**
  * @param {string} binPath
@@ -8,7 +9,23 @@ import { execFileSync } from 'child_process';
 export const exec = (
 	binPath, args = process.argv.slice(2), stdio = 'inherit',
 ) => {
-	return execFileSync(
-		binPath, args, { stdio },
-	);
+	try {
+		return execFileSync(
+			binPath, args, { stdio },
+		);
+	} catch (error) {
+		const exitError
+			= (stdio === 'inherit'
+				&& typeof error === 'object'
+				&& error !== null
+				&& 'status' in error
+				&& typeof error.status === 'number')
+				? error.status
+				: undefined;
+		if (isDefined(exitError)) {
+			process.exit(exitError);
+		}
+
+		throw error;
+	}
 };

package/src/lib/install/functions/get-platform-info.js

@@ -17,7 +17,7 @@ export const getPlatformInfo = () => {
 			break;
 
 		case 'linux':
-			let isMusl = false;
+			let isMusl;
 			try {
 				// The report will not have a glibcVersionRuntime property if musl is being used.
 				/** @type {{ header?: { glibcVersionRuntime?: unknown } }} */

package/src/lib/install/functions/link-existing-binary.js

@@ -8,7 +8,7 @@ import {
 export const linkExistingBinary = ({
 	platform, targetBinPath, outputBinPath,
 }) => {
-	const isWin = platform === 'win32';
+	const isWindows = platform === 'win32';
 
 	/**
 	 *  @param {string | undefined} method
@@ -27,7 +27,7 @@ export const linkExistingBinary = ({
 		errs.push(e);
 	}
 
-	if (!isWin) {
+	if (!isWindows) {
 		try {
 			symlinkSync(targetBinPath, outputBinPath);
 			verifyLinked('symlinkSync');

package/src/lib/install/functions/load-missing-binary.js

@@ -27,7 +27,7 @@ const tryDownloadAndExtract = (
 					reject(new Error(`Failed to download binary: Redirect location missing.`));
 					return;
 				}
-				downloadAndExtract(
+				tryDownloadAndExtract(
 					res.headers.location, binExecutableName, outputBinDir,
 				)
 					.then(resolve)
@@ -65,22 +65,22 @@ const downloadAndExtract = async (
 			await tryDownloadAndExtract(
 				tarballUrl, binExecutableName, outputBinDir,
 			);
+			try {
+				chmodSync(join(outputBinDir, binExecutableName), 0o755);
+			} catch {
+				//
+			}
 			return;
 		} catch (error) {
 			if (attempt < maxAttempts) {
 				const delay = initialBackoffMs * 2 ** (attempt - 1);
 				console.warn(`Download failed (attempt ${attempt.toString()}), retrying in ${delay.toString()}ms...`);
+				await new Promise(resolve => setTimeout(resolve, delay));
 			} else {
 				throw error;
 			}
 		}
 	}
-
-	try {
-		chmodSync(join(outputBinDir, binExecutableName), 0o755);
-	} catch {
-		//
-	}
 };
 
 /**

package/src/lib/install/functions/prepare-binary.js

@@ -2,6 +2,7 @@ import {
 	chmodSync,
 	mkdirSync, rmSync,
 } from 'fs';
+import { join } from 'path';
 import { linkExistingBinary } from './link-existing-binary.js';
 import { loadMissingBinary } from './load-missing-binary.js';
 import { validateBinaryVersion } from './validate-binary-version.js';
@@ -22,6 +23,17 @@ export const prepareBinary = ({
 
 	// Windows can't be optimised to run the binary directly (.exe).
 	if (platform === 'win32') {
+		if (!targetBinPath) {
+			const downloadBinarySourceDir = join(
+				outputBinDir, 'source', 'bin',
+			);
+			mkdirSync(downloadBinarySourceDir, { recursive: true });
+			return loadMissingBinary({
+				binExecutableName,
+				targetPackage,
+				outputBinDir: downloadBinarySourceDir,
+			});
+		}
 		return;
 	}