@package-pal/cli 0.0.13 → 0.0.14

package/package.json

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

package/src/lib/install/functions/clear-placeholder-binary.js

@@ -2,13 +2,13 @@ import { rmSync } from 'fs';
 
 /**
  * @param {Bun.Platform} platform
- * @param {string} outputBinTargetBasePath
+ * @param {string} outputBinBasePath
  */
-export const clearPlaceholderBinary = (platform, outputBinTargetBasePath) => {
-	rmSync(outputBinTargetBasePath, { force: true });
+export const clearPlaceholderBinary = (platform, outputBinBasePath) => {
+	rmSync(outputBinBasePath, { force: true });
 
 	if (platform === 'win32') {
-		rmSync(`${outputBinTargetBasePath}.exe`, { force: true });
-		rmSync(`${outputBinTargetBasePath}.cmd`, { force: true });
+		rmSync(`${outputBinBasePath}.exe`, { force: true });
+		rmSync(`${outputBinBasePath}.cmd`, { force: true });
 	}
 };

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

@@ -21,9 +21,11 @@ export const getPathInfo = (platform, targetPackage) => {
 	const packageRootDir = resolve(
 		__dirname, '..', '..', '..', '..',
 	);
-	const outputBinDir = join(packageRootDir, 'bin');
-	const outputBinTargetBasePath = join(outputBinDir, binName);
+
 	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;
@@ -40,7 +42,8 @@ export const getPathInfo = (platform, targetPackage) => {
 		outputBinDir,
 		binName,
 		binExecutableName,
-		outputBinTargetBasePath,
+		outputBinBasePath,
+		outputBinPath,
 		targetBinPath,
 	};
 };

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

@@ -1,29 +1,42 @@
 import {
-	copyFileSync, linkSync, symlinkSync, writeFileSync,
+	copyFileSync, existsSync, linkSync, symlinkSync, writeFileSync,
 } from 'fs';
 
 /**
  * @param {Bun.Platform} platform
  * @param {string} binExecutableName
  * @param {string} targetBinPath
- * @param {string} outputBinTargetBasePath
+ * @param {string} outputBinBasePath
+ * @param {string} outputBinPath
  */
 export const linkExistingBinary = (
-	platform, binExecutableName, targetBinPath, outputBinTargetBasePath,
+	platform, binExecutableName, targetBinPath, outputBinBasePath, outputBinPath,
 ) => {
 	const isWin = platform === 'win32';
 
+	/**
+	 * @param {string} method
+	 */
+	const verifyLinked = (method) => {
+		if (!existsSync(outputBinPath)) {
+			throw new Error(`Expected link not found after ${method}: '${outputBinPath}'.`);
+		}
+	};
+
 	try {
 		if (!isWin) {
-			symlinkSync(targetBinPath, outputBinTargetBasePath);
+			symlinkSync(targetBinPath, outputBinPath);
+			verifyLinked('symlinkSync');
 			return;
 		}
 	} catch (eSym) {
 		try {
-			linkSync(targetBinPath, outputBinTargetBasePath);
+			linkSync(targetBinPath, outputBinPath);
+			verifyLinked('linkSync');
 		} catch (eLink) {
 			try {
-				copyFileSync(targetBinPath, outputBinTargetBasePath);
+				copyFileSync(targetBinPath, outputBinPath);
+				verifyLinked('copyFileSync');
 			} catch (eCopy) {
 				const cause = [
 					eSym,
@@ -35,10 +48,10 @@ export const linkExistingBinary = (
 		}
 	}
 
-	console.info(`Successfully linked binary: '${outputBinTargetBasePath}' → '${targetBinPath}'.`);
+	console.info(`Successfully linked binary: '${outputBinPath}' → '${targetBinPath}'.`);
 
 	if (isWin) {
-		const shimPath = `${outputBinTargetBasePath}.cmd`;
+		const shimPath = `${outputBinBasePath}.cmd`;
 		console.info(`Creating cmd shim '${shimPath}'.`);
 		writeFileSync(shimPath, `@echo off\r\n"%~dp0\\${binExecutableName}" %*\r\n`);
 	}

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

@@ -9,18 +9,19 @@ import { loadMissingBinary } from './load-missing-binary.js';
  * @param {string} targetPackage
  * @param {string | null} targetBinPath
  * @param {string} outputBinDir
- * @param {string} outputBinTargetBasePath
+ * @param {string} outputBinBasePath
+ * @param {string} outputBinPath
  */
 export const prepareBinary = (
-	platform, binExecutableName, targetPackage, targetBinPath, outputBinDir, outputBinTargetBasePath,
+	platform, binExecutableName, targetPackage, targetBinPath, outputBinDir, outputBinBasePath, outputBinPath,
 ) => {
-	clearPlaceholderBinary(platform, outputBinTargetBasePath);
+	clearPlaceholderBinary(platform, outputBinBasePath);
 	mkdirSync(outputBinDir, { recursive: true });
 
 	if (targetBinPath) {
 		console.info(`Expected CLI binary package is available in '${targetBinPath}'.`);
 		linkExistingBinary(
-			platform, binExecutableName, targetBinPath, outputBinTargetBasePath,
+			platform, binExecutableName, targetBinPath, outputBinBasePath, outputBinPath,
 		);
 		return Promise.resolve();
 	}

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

@@ -7,11 +7,11 @@ try {
 		platform, targetPackage,
 	} = getPlatformInfo();
 	const {
-		outputBinDir, binExecutableName, outputBinTargetBasePath, targetBinPath,
+		outputBinDir, binExecutableName, outputBinBasePath, outputBinPath, targetBinPath,
 	} = getPathInfo(platform, targetPackage);
 
 	await prepareBinary(
-		platform, binExecutableName, targetPackage, targetBinPath, outputBinDir, outputBinTargetBasePath,
+		platform, binExecutableName, targetPackage, targetBinPath, outputBinDir, outputBinBasePath, outputBinPath,
 	);
 } catch (e) {
 	throw new Error('Postinstall failed to install CLI binary.', { cause: e });