@package-pal/cli 0.0.24 → 0.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@package-pal/cli",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "description": "CLI tool exposing core PackagePal functionality.",
   "keywords": [
     "package",

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

@@ -1,11 +1,14 @@
-import { execFileSync } from 'child_process';
-
-/**
- * @param {string} binPath
- * @param {string[]} args
- */
-export const exec = (binPath, args = process.argv.slice(2)) => {
-	return execFileSync(
-		binPath, args, { stdio: 'inherit' },
-	);
-};
+import { execFileSync } from 'child_process';
+
+/**
+ * @param {string} binPath
+ * @param {string[]} args
+ * @param {import('child_process').StdioOptions} stdio
+ */
+export const exec = (
+	binPath, args = process.argv.slice(2), stdio = 'inherit',
+) => {
+	return execFileSync(
+		binPath, args, { stdio },
+	);
+};

package/src/lib/install/functions/launch-fallback.js

@@ -27,13 +27,12 @@ export const launchFallback = async () => {
 			force: true,
 			recursive: true,
 		});
-		validateBinaryVersion(targetVersion, targetBinPath);
 
 		return exec(targetBinPath);
 	}
 
-	const prevDownloadedBinPath = join(downloadBinarySourceDir, binExecutableName);
-	if (!existsSync(prevDownloadedBinPath)) {
+	const downloadBinPath = join(downloadBinarySourceDir, binExecutableName);
+	if (!existsSync(downloadBinPath)) {
 		rmSync(downloadBinarySourceDir, {
 			force: true,
 			recursive: true,
@@ -44,10 +43,8 @@ export const launchFallback = async () => {
 			targetPackage,
 			outputBinDir: downloadBinarySourceDir,
 		});
+		validateBinaryVersion(targetVersion, downloadBinPath);
 	}
 
-	const downloadBinPath = join(downloadBinarySourceDir, binExecutableName);
-	validateBinaryVersion(targetVersion, downloadBinPath);
-
 	return exec(downloadBinPath);
 };

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

@@ -1,33 +1,41 @@
-import {
-	mkdirSync, rmSync,
-} from 'fs';
-import { linkExistingBinary } from './link-existing-binary.js';
-import { loadMissingBinary } from './load-missing-binary.js';
-
-/**
- * @param {{ platform: Bun.Platform, binExecutableName: string, targetPackage: string, targetBinPath: string | null, outputBinDir: string, outputBinBasePath: string, outputBinPath: string }} options
- */
-export const prepareBinary = ({
-	platform, binExecutableName, targetPackage, targetBinPath, outputBinDir, outputBinBasePath, outputBinPath,
-}) => {
-	rmSync(outputBinBasePath, { force: true });
-	rmSync(outputBinPath, { force: true });
-	mkdirSync(outputBinDir, { recursive: true });
-
-	if (targetBinPath) {
-		console.info(`Expected CLI binary package is available in '${targetBinPath}'.`);
-		linkExistingBinary({
-			platform,
-			targetBinPath,
-			outputBinPath,
-		});
-		return Promise.resolve();
-	}
-
-	console.warn(`Expected CLI binary was not found for '${targetPackage}'.`);
-	return loadMissingBinary({
-		binExecutableName,
-		targetPackage,
-		outputBinDir,
-	});
-};
+import {
+	mkdirSync, rmSync,
+} from 'fs';
+import { linkExistingBinary } from './link-existing-binary.js';
+import { loadMissingBinary } from './load-missing-binary.js';
+import { validateBinaryVersion } from './validate-binary-version.js';
+
+/**
+ * @param {{ platform: Bun.Platform, binExecutableName: string, targetPackage: string, targetVersion: string, targetBinPath: string | null, outputBinDir: string, outputBinBasePath: string, outputBinPath: string }} options
+ */
+export const prepareBinary = ({
+	platform, binExecutableName, targetPackage, targetVersion, targetBinPath, outputBinDir, outputBinBasePath, outputBinPath,
+}) => {
+	rmSync(outputBinBasePath, { force: true });
+	rmSync(outputBinPath, { force: true });
+	mkdirSync(outputBinDir, { recursive: true });
+
+	if (targetBinPath) {
+		console.info(`Expected CLI binary package is available in '${targetBinPath}'.`);
+		validateBinaryVersion(targetVersion, targetBinPath);
+
+		// Windows can't be optimised to run the binary directly (.exe).
+		if (platform === 'win32') {
+			return;
+		}
+
+		linkExistingBinary({
+			platform,
+			targetBinPath,
+			outputBinPath,
+		});
+		return;
+	}
+
+	console.warn(`Expected CLI binary was not found for '${targetPackage}'.`);
+	return loadMissingBinary({
+		binExecutableName,
+		targetPackage,
+		outputBinDir,
+	});
+};

package/src/lib/install/functions/validate-binary-version.js

@@ -1,14 +1,16 @@
-import { exec } from './exec.js';
-
-/**
- * @param {string} targetVersion
- * @param {string} targetBinPath
- */
-export const validateBinaryVersion = (targetVersion, targetBinPath) => {
-	const stdout = exec(targetBinPath).toString()
-		.trim();
-
-	if (stdout.toLowerCase() !== targetVersion.toLowerCase()) {
-		throw new Error(`'${targetBinPath}' binary version mismatch; expected ${targetVersion}, got ${stdout}.`);
-	}
-};
+import { exec } from './exec.js';
+
+/**
+ * @param {string} targetVersion
+ * @param {string} targetBinPath
+ */
+export const validateBinaryVersion = (targetVersion, targetBinPath) => {
+	const stdout = exec(
+		targetBinPath, undefined, 'pipe',
+	).toString()
+		.trim();
+
+	if (stdout.toLowerCase() !== targetVersion.toLowerCase()) {
+		throw new Error(`'${targetBinPath}' binary version mismatch; expected ${targetVersion}, got ${stdout}.`);
+	}
+};

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

@@ -8,26 +8,24 @@ try {
 		platform, targetPackage,
 	} = getPlatformInfo();
 
-	// Windows can't be optimised to run the binary directly (.exe).
-	if (platform !== 'win32') {
-		const {
-			outputBinDir, binExecutableName, outputBinBasePath, outputBinPath, targetBinPath, targetVersion,
-		} = getPathInfo({
-			platform,
-			targetPackage,
-		});
+	const {
+		outputBinDir, binExecutableName, outputBinBasePath, outputBinPath, targetBinPath, targetVersion,
+	} = getPathInfo({
+		platform,
+		targetPackage,
+	});
 
-		await prepareBinary({
-			platform,
-			binExecutableName,
-			targetPackage,
-			targetBinPath,
-			outputBinDir,
-			outputBinBasePath,
-			outputBinPath,
-		});
-		validateBinaryVersion(targetVersion, outputBinPath);
-	}
+	await prepareBinary({
+		platform,
+		binExecutableName,
+		targetPackage,
+		targetVersion,
+		targetBinPath,
+		outputBinDir,
+		outputBinBasePath,
+		outputBinPath,
+	});
+	validateBinaryVersion(targetVersion, outputBinPath);
 } catch (e) {
 	throw new Error('Post install failed to install CLI binary.', { cause: e });
 }