@package-pal/cli 0.0.34 → 0.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@package-pal/cli",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "description": "CLI tool exposing core PackagePal functionality.",
   "keywords": [
     "package",
@@ -13,25 +13,25 @@
   "license": "MIT",
   "type": "module",
   "dependencies": {
-    "tar": "^7.4.3"
+    "tar": "^7.5.1"
   },
   "devDependencies": {
-    "@package-pal/core": "0.0.3",
-    "@package-pal/util": "0.0.5",
+    "@package-pal/core": "0.0.4",
+    "@package-pal/util": "0.0.6",
     "@clack/prompts": "^0.11.0",
     "@stricli/core": "^1.2.0",
     "@types/bun": "^1.2.19",
     "typescript": "^5.9.2",
-    "yoctocolors": "^2.1.1"
+    "yoctocolors": "^2.1.2"
   },
   "optionalDependencies": {
-    "@package-pal/cli-linux-x64": "0.0.9",
-    "@package-pal/cli-linux-x64-musl": "0.0.9",
-    "@package-pal/cli-linux-arm64": "0.0.9",
-    "@package-pal/cli-linux-arm64-musl": "0.0.9",
-    "@package-pal/cli-darwin-arm64": "0.0.9",
-    "@package-pal/cli-darwin-x64": "0.0.9",
-    "@package-pal/cli-windows-x64": "0.0.9"
+    "@package-pal/cli-linux-x64": "0.0.10",
+    "@package-pal/cli-linux-x64-musl": "0.0.10",
+    "@package-pal/cli-linux-arm64": "0.0.10",
+    "@package-pal/cli-linux-arm64-musl": "0.0.10",
+    "@package-pal/cli-darwin-arm64": "0.0.10",
+    "@package-pal/cli-darwin-x64": "0.0.10",
+    "@package-pal/cli-windows-x64": "0.0.10"
   },
   "engines": {
     "node": ">=18"

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

@@ -1,3 +1,4 @@
+import { readFileSync } from 'fs';
 import { createRequire } from 'module';
 import {
 	dirname, join, resolve,
@@ -16,12 +17,12 @@ export const getPathInfo = ({
 	const __dirname = dirname(fileURLToPath(import.meta.url));
 	const binName = Object.keys(packageJson.bin)[0];
 	if (!binName) {
-		throw new Error(`Expected '${targetPackage}' bin name.`);
+		throw new Error(`Expected '${packageJson.name}' bin name.`);
 	}
 
-	const targetVersion = packageJson.version;
-	if (!targetVersion) {
-		throw new Error(`Expected '${targetPackage}' version.`);
+	const baseVersion = packageJson.version;
+	if (!baseVersion) {
+		throw new Error(`Expected '${packageJson.name}' version.`);
 	}
 
 	const packageRootDir = resolve(
@@ -34,13 +35,26 @@ export const getPathInfo = ({
 	const outputBinPath = join(outputBinDir, binExecutableName);
 
 	/** @type {string | null} */
-	let targetBinPath;
+	let targetBinPath = null;
+	/** @type {string | null} */
+	let targetVersion = null;
 	try {
 		targetBinPath = require.resolve(join(
 			'@package-pal', targetPackage, 'bin', binExecutableName,
 		));
+
+		if (targetBinPath) {
+			const targetPackageRoot = dirname(dirname(targetBinPath));
+			const targetPackageJsonPath = join(targetPackageRoot, 'package.json');
+			/** @type {Record<string, unknown> | null} */
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+			const targetPackageJson = JSON.parse(readFileSync(targetPackageJsonPath, { encoding: 'utf8' }));
+			if (typeof targetPackageJson?.version === 'string') {
+				targetVersion = targetPackageJson.version;
+			}
+		}
 	} catch {
-		targetBinPath = null;
+		//
 	}
 
 	return {
@@ -51,6 +65,7 @@ export const getPathInfo = ({
 		outputBinBasePath,
 		outputBinPath,
 		targetBinPath,
+		baseVersion,
 		targetVersion,
 	};
 };

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

@@ -13,7 +13,7 @@ export const launchFallback = async () => {
 		platform, targetPackage,
 	} = getPlatformInfo();
 	const {
-		targetBinPath, binExecutableName, outputBinDir, targetVersion,
+		targetBinPath, binExecutableName, outputBinDir,
 	} = getPathInfo({
 		platform,
 		targetPackage,
@@ -38,12 +38,12 @@ export const launchFallback = async () => {
 			recursive: true,
 		});
 		mkdirSync(downloadBinarySourceDir, { recursive: true });
-		await loadMissingBinary({
+		const downloadTargetVersion = await loadMissingBinary({
 			binExecutableName,
 			targetPackage,
 			outputBinDir: downloadBinarySourceDir,
 		});
-		validateBinaryVersion(targetVersion, downloadBinPath);
+		validateBinaryVersion(downloadTargetVersion, downloadBinPath);
 	}
 
 	return exec(downloadBinPath);

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

@@ -104,4 +104,6 @@ export const loadMissingBinary = async ({
 	await downloadAndExtract(
 		tarballUrl, binExecutableName, outputBinDir,
 	);
+
+	return targetPackageVersion;
 };

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

@@ -7,7 +7,7 @@ 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
+ * @param {{ platform: Bun.Platform, binExecutableName: string, targetPackage: string, targetVersion: string | null, targetBinPath: string | null, outputBinDir: string, outputBinBasePath: string, outputBinPath: string }} options
  */
 export const prepareBinary = ({
 	platform, binExecutableName, targetPackage, targetVersion, targetBinPath, outputBinDir, outputBinBasePath, outputBinPath,
@@ -25,8 +25,14 @@ export const prepareBinary = ({
 		return;
 	}
 
-	rmSync(outputBinBasePath, { force: true });
-	rmSync(outputBinPath, { force: true });
+	rmSync(outputBinBasePath, {
+		force: true,
+		recursive: true,
+	});
+	rmSync(outputBinPath, {
+		force: true,
+		recursive: true,
+	});
 	mkdirSync(outputBinDir, { recursive: true });
 
 	if (targetBinPath) {

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

@@ -1,16 +1,20 @@
-import { exec } from './exec.js';
-
-/**
- * @param {string} targetVersion
- * @param {string} targetBinPath
- */
-export const validateBinaryVersion = (targetVersion, targetBinPath) => {
-	const stdout = exec(
-		targetBinPath, ['-v'], 'pipe',
-	).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 | null} targetVersion
+ * @param {string} targetBinPath
+ */
+export const validateBinaryVersion = (targetVersion, targetBinPath) => {
+	if (!targetVersion) {
+		throw new Error(`'${targetBinPath}' no binary version found.`);
+	}
+
+	const stdout = exec(
+		targetBinPath, ['-v'], 'pipe',
+	).toString()
+		.trim();
+
+	if (stdout.toLowerCase() !== targetVersion.toLowerCase()) {
+		throw new Error(`'${targetBinPath}' binary version mismatch; expected ${targetVersion}, got ${stdout}.`);
+	}
+};