@package-pal/cli 0.0.8 → 0.0.10

package/package.json

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

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

@@ -1,9 +1,12 @@
+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 {Bun.Platform} platform
  * @param {string} targetPackage
@@ -19,13 +22,22 @@ export const getPathInfo = (platform, targetPackage) => {
 		__dirname, '..', 'bin',
 	);
 	const outputBinTargetBasePath = join(outputBinDir, binName);
-	const targetBinPath = resolve(
-		__dirname, '..', '..', targetPackage, platform === 'win32' ? `${binName}.exe` : binName,
-	);
+	const binExecutableName = platform === 'win32' ? `${binName}.exe` : binName;
+
+	/** @type {string | null} */
+	let targetBinPath;
+	try {
+		targetBinPath = require.resolve(join(
+			'@package-pal', targetPackage, binExecutableName,
+		));
+	} catch {
+		targetBinPath = null;
+	}
 
 	return {
 		outputBinDir,
 		binName,
+		binExecutableName,
 		outputBinTargetBasePath,
 		targetBinPath,
 	};

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

@@ -4,12 +4,12 @@ import {
 
 /**
  * @param {Bun.Platform} platform
+ * @param {string} binExecutableName
  * @param {string} targetBinPath
- * @param {string} binName
  * @param {string} outputBinTargetBasePath
  */
 export const linkExistingBinary = (
-	platform, binName, targetBinPath, outputBinTargetBasePath,
+	platform, binExecutableName, targetBinPath, outputBinTargetBasePath,
 ) => {
 	if (platform !== 'win32') {
 		symlinkSync(targetBinPath, outputBinTargetBasePath);
@@ -26,5 +26,5 @@ export const linkExistingBinary = (
 		}
 	}
 
-	writeFileSync(`${outputBinTargetBasePath}.cmd`, `@echo off\r\n"%~dp0\\${binName}.exe" %*\r\n`);
+	writeFileSync(`${outputBinTargetBasePath}.cmd`, `@echo off\r\n"%~dp0\\${binExecutableName}" %*\r\n`);
 };

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

@@ -1,4 +1,5 @@
 import { get } from 'https';
+import { join } from 'path';
 import { pipeline } from 'stream/promises';
 import { x } from 'tar';
 import packageJson from '../../../../package.json' with { type: 'json' };
@@ -8,11 +9,11 @@ const initialBackoffMs = 500;
 
 /**
  * @param {string} tarballUrl
- * @param {string} binName
+ * @param {string} binExecutableName
  * @param {string} outputBinDir
  */
 const tryDownloadAndExtract = (
-	tarballUrl, binName, outputBinDir,
+	tarballUrl, binExecutableName, outputBinDir,
 ) => {
 	return new Promise((resolve, reject) => {
 		get(tarballUrl, (res) => {
@@ -25,7 +26,7 @@ const tryDownloadAndExtract = (
 					return;
 				}
 				downloadAndExtract(
-					res.headers.location, binName, outputBinDir,
+					res.headers.location, binExecutableName, outputBinDir,
 				)
 					.then(resolve)
 					.catch(reject);
@@ -40,7 +41,7 @@ const tryDownloadAndExtract = (
 			const extractStream = x({
 				cwd: outputBinDir,
 				strip: 1,
-				filter: path => path === `package/bin/${binName}`,
+				filter: path => path === join('package', binExecutableName),
 			});
 
 			pipeline(res, extractStream).then(resolve)
@@ -51,16 +52,16 @@ const tryDownloadAndExtract = (
 
 /**
  * @param {string} tarballUrl
- * @param {string} binName
+ * @param {string} binExecutableName
  * @param {string} outputBinDir
  */
 const downloadAndExtract = async (
-	tarballUrl, binName, outputBinDir,
+	tarballUrl, binExecutableName, outputBinDir,
 ) => {
 	for (let attempt = 1; attempt <= maxRetries; attempt++) {
 		try {
 			await tryDownloadAndExtract(
-				tarballUrl, binName, outputBinDir,
+				tarballUrl, binExecutableName, outputBinDir,
 			);
 			return;
 		} catch (error) {
@@ -75,14 +76,14 @@ const downloadAndExtract = async (
 };
 
 /**
- * @param {string} binName
+ * @param {string} binExecutableName
  * @param {string} targetPackage
  * @param {string} outputBinDir
  */
 export const loadMissingBinary = async (
-	binName, targetPackage, outputBinDir,
+	binExecutableName, targetPackage, outputBinDir,
 ) => {
-	const fullTargetPackageName = `@package-pal/${targetPackage}`;
+	const fullTargetPackageName = join('@package-pal', targetPackage);
 	/** @type {Record<string, string>} */
 	const optionalDeps = packageJson.optionalDependencies;
 	const targetPackageVersion = optionalDeps[fullTargetPackageName];
@@ -95,6 +96,6 @@ export const loadMissingBinary = async (
 	console.log(`Downloading '${fullTargetPackageName}' into '${outputBinDir}' from ${tarballUrl}...`);
 
 	await downloadAndExtract(
-		tarballUrl, binName, outputBinDir,
+		tarballUrl, binExecutableName, outputBinDir,
 	);
 };

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

@@ -1,34 +1,32 @@
-import {
-	existsSync, mkdirSync,
-} from 'fs';
+import { mkdirSync } from 'fs';
 import { clearPlaceholderBinary } from './clear-placeholder-binary.js';
 import { linkExistingBinary } from './link-existing-binary.js';
 import { loadMissingBinary } from './load-missing-binary.js';
 
 /**
  * @param {Bun.Platform} platform
- * @param {string} binName
+ * @param {string} binExecutableName
  * @param {string} targetPackage
- * @param {string} targetBinPath
+ * @param {string | null} targetBinPath
  * @param {string} outputBinDir
  * @param {string} outputBinTargetBasePath
  */
 export const prepareBinary = (
-	platform, binName, targetPackage, targetBinPath, outputBinDir, outputBinTargetBasePath,
+	platform, binExecutableName, targetPackage, targetBinPath, outputBinDir, outputBinTargetBasePath,
 ) => {
 	clearPlaceholderBinary(platform, outputBinTargetBasePath);
 	mkdirSync(outputBinDir, { recursive: true });
 
-	if (existsSync(targetBinPath)) {
+	if (targetBinPath) {
 		console.info(`Expected CLI binary package is available in '${targetBinPath}'.`);
 		linkExistingBinary(
-			platform, binName, targetBinPath, outputBinTargetBasePath,
+			platform, binExecutableName, targetBinPath, outputBinTargetBasePath,
 		);
 		return Promise.resolve();
 	}
 
-	console.warn(`Expected CLI binary was not found in '${targetBinPath}'.`);
+	console.warn(`Expected CLI binary was not found for '${targetPackage}'.`);
 	return loadMissingBinary(
-		binName, targetPackage, outputBinDir,
+		binExecutableName, targetPackage, outputBinDir,
 	);
 };

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

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