@package-pal/cli 0.0.35 → 0.0.37

package/package.json

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

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

@@ -1,71 +1,71 @@
-import { readFileSync } from 'fs';
-import { createRequire } from 'module';
-import {
-	dirname, join, resolve,
-} from 'path';
-import { fileURLToPath } from 'url';
-import packageJson from '../../../../package.json' with { type: 'json' };
-
-const require = createRequire(import.meta.url);
-
-/**
- * @param {{ platform: Bun.Platform, targetPackage: string }} options
- */
-export const getPathInfo = ({
-	platform, targetPackage,
-}) => {
-	const __dirname = dirname(fileURLToPath(import.meta.url));
-	const binName = Object.keys(packageJson.bin)[0];
-	if (!binName) {
-		throw new Error(`Expected '${packageJson.name}' bin name.`);
-	}
-
-	const baseVersion = packageJson.version;
-	if (!baseVersion) {
-		throw new Error(`Expected '${packageJson.name}' version.`);
-	}
-
-	const packageRootDir = resolve(
-		__dirname, '..', '..', '..', '..',
-	);
-
-	const binExecutableName = platform === 'win32' ? `${binName}.exe` : binName;
-	const outputBinDir = join(packageRootDir, 'bin');
-	const outputBinBasePath = join(outputBinDir, binName);
-	const outputBinPath = join(outputBinDir, binExecutableName);
-
-	/** @type {string | null} */
-	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 {
-		//
-	}
-
-	return {
-		packageRootDir,
-		outputBinDir,
-		binName,
-		binExecutableName,
-		outputBinBasePath,
-		outputBinPath,
-		targetBinPath,
-		baseVersion,
-		targetVersion,
-	};
-};
+import { readFileSync } from 'fs';
+import { createRequire } from 'module';
+import {
+	dirname, join, resolve,
+} from 'path';
+import { fileURLToPath } from 'url';
+import packageJson from '../../../../package.json' with { type: 'json' };
+
+const require = createRequire(import.meta.url);
+
+/**
+ * @param {{ platform: Bun.Platform, targetPackage: string }} options
+ */
+export const getPathInfo = ({
+	platform, targetPackage,
+}) => {
+	const __dirname = dirname(fileURLToPath(import.meta.url));
+	const binName = Object.keys(packageJson.bin)[0];
+	if (!binName) {
+		throw new Error(`Expected '${packageJson.name}' bin name.`);
+	}
+
+	const baseVersion = packageJson.version;
+	if (!baseVersion) {
+		throw new Error(`Expected '${packageJson.name}' version.`);
+	}
+
+	const packageRootDir = resolve(
+		__dirname, '..', '..', '..', '..',
+	);
+
+	const binExecutableName = platform === 'win32' ? `${binName}.exe` : binName;
+	const outputBinDir = join(packageRootDir, 'bin');
+	const outputBinBasePath = join(outputBinDir, binName);
+	const outputBinPath = join(outputBinDir, binExecutableName);
+
+	/** @type {string | null} */
+	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 {
+		//
+	}
+
+	return {
+		packageRootDir,
+		outputBinDir,
+		binName,
+		binExecutableName,
+		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,

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

@@ -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,20 +1,23 @@
-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}.`);
-	}
-};
+import packageJson from '../../../../package.json';
+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();
+
+	const expectedVersion = `${packageJson.version}-${targetVersion}`;
+
+	if (stdout.toLowerCase() !== expectedVersion.toLowerCase()) {
+		throw new Error(`'${targetBinPath}' binary version mismatch; expected ${expectedVersion}, got ${stdout}.`);
+	}
+};