@package-pal/cli 0.0.10 → 0.0.12

package/package.json

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

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

@@ -18,9 +18,10 @@ export const getPathInfo = (platform, targetPackage) => {
 		throw new Error('Expected bin name.');
 	}
 
-	const outputBinDir = resolve(
-		__dirname, '..', 'bin',
+	const packageRootDir = resolve(
+		__dirname, '..', '..', '..',
 	);
+	const outputBinDir = join(packageRootDir, 'bin');
 	const outputBinTargetBasePath = join(outputBinDir, binName);
 	const binExecutableName = platform === 'win32' ? `${binName}.exe` : binName;
 
@@ -35,6 +36,7 @@ export const getPathInfo = (platform, targetPackage) => {
 	}
 
 	return {
+		packageRootDir,
 		outputBinDir,
 		binName,
 		binExecutableName,

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

@@ -11,20 +11,34 @@ import {
 export const linkExistingBinary = (
 	platform, binExecutableName, targetBinPath, outputBinTargetBasePath,
 ) => {
-	if (platform !== 'win32') {
-		symlinkSync(targetBinPath, outputBinTargetBasePath);
-		return;
-	}
+	const isWin = platform === 'win32';
 
 	try {
-		linkSync(targetBinPath, outputBinTargetBasePath);
-	} catch {
+		if (!isWin) {
+			symlinkSync(targetBinPath, outputBinTargetBasePath);
+			return;
+		}
+	} catch (eSym) {
 		try {
-			copyFileSync(targetBinPath, outputBinTargetBasePath);
-		} catch (e) {
-			throw new Error(`Failed to link to or copy target binary '${targetBinPath}'.`, { cause: e });
+			linkSync(targetBinPath, outputBinTargetBasePath);
+		} catch (eLink) {
+			try {
+				copyFileSync(targetBinPath, outputBinTargetBasePath);
+			} catch (eCopy) {
+				const cause = [
+					eSym,
+					eLink,
+					eCopy,
+				].filter(Boolean);
+				throw new Error(`Failed to link to or copy target binary '${targetBinPath}'.`, { cause });
+			}
 		}
 	}
 
-	writeFileSync(`${outputBinTargetBasePath}.cmd`, `@echo off\r\n"%~dp0\\${binExecutableName}" %*\r\n`);
+	console.info(`Successfully linked binary: '${outputBinTargetBasePath}' → '${targetBinPath}'.`);
+
+	if (isWin) {
+		console.info('Creating cmd shim.');
+		writeFileSync(`${outputBinTargetBasePath}.cmd`, `@echo off\r\n"%~dp0\\${binExecutableName}" %*\r\n`);
+	}
 };

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

@@ -41,7 +41,7 @@ const tryDownloadAndExtract = (
 			const extractStream = x({
 				cwd: outputBinDir,
 				strip: 1,
-				filter: path => path === join('package', binExecutableName),
+				filter: path => path === `package/${binExecutableName}`,
 			});
 
 			pipeline(res, extractStream).then(resolve)
@@ -83,7 +83,7 @@ const downloadAndExtract = async (
 export const loadMissingBinary = async (
 	binExecutableName, targetPackage, outputBinDir,
 ) => {
-	const fullTargetPackageName = join('@package-pal', targetPackage);
+	const fullTargetPackageName = `@package-pal/${targetPackage}`;
 	/** @type {Record<string, string>} */
 	const optionalDeps = packageJson.optionalDependencies;
 	const targetPackageVersion = optionalDeps[fullTargetPackageName];
@@ -93,7 +93,7 @@ export const loadMissingBinary = async (
 	}
 
 	const tarballUrl = `https://registry.npmjs.org/${fullTargetPackageName}/-/${targetPackage}-${targetPackageVersion}.tgz`;
-	console.log(`Downloading '${fullTargetPackageName}' into '${outputBinDir}' from ${tarballUrl}...`);
+	console.info(`Downloading '${fullTargetPackageName}' into '${outputBinDir}' from ${tarballUrl}...`);
 
 	await downloadAndExtract(
 		tarballUrl, binExecutableName, outputBinDir,