@package-pal/cli 0.0.14 → 0.0.16

package/bin/ppal

@@ -1,2 +1,16 @@
-#!/usr/bin/env node
-throw new Error("Native binary not linked yet. Re-run `npm install` or check postinstall script.");
+#!/usr/bin/env node
+
+// Fallback, if post-install script did not execute.
+// Requires more overhead due to launching Node process which then launches the CLI process.
+
+import { getPathInfo } from '../src/lib/install/functions/get-path-info.js';
+import { getPlatformInfo } from '../src/lib/install/functions/get-platform-info.js';
+
+const {
+	platform, targetPackage,
+} = getPlatformInfo();
+const { targetBinPath } = getPathInfo({ platform, targetPackage });
+
+require('child_process').execFileSync(targetBinPath, process.argv.slice(2), {
+	stdio: 'inherit',
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@package-pal/cli",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "CLI tool exposing core PackagePal functionality.",
   "keywords": [
     "package",
@@ -25,17 +25,16 @@
     "yoctocolors": "^2.1.1"
   },
   "optionalDependencies": {
-    "@package-pal/cli-linux-x64": "0.0.1",
-    "@package-pal/cli-linux-x64-musl": "0.0.1",
-    "@package-pal/cli-linux-arm64": "0.0.1",
-    "@package-pal/cli-linux-arm64-musl": "0.0.1",
-    "@package-pal/cli-darwin-arm64": "0.0.1",
-    "@package-pal/cli-darwin-x64": "0.0.1",
-    "@package-pal/cli-windows-x64": "0.0.1"
+    "@package-pal/cli-linux-x64": "0.0.2",
+    "@package-pal/cli-linux-x64-musl": "0.0.2",
+    "@package-pal/cli-linux-arm64": "0.0.2",
+    "@package-pal/cli-linux-arm64-musl": "0.0.2",
+    "@package-pal/cli-darwin-arm64": "0.0.2",
+    "@package-pal/cli-darwin-x64": "0.0.2",
+    "@package-pal/cli-windows-x64": "0.0.2"
   },
   "bin": {
-    "ppal": "bin/ppal",
-    "dppal": "./src/index.ts"
+    "ppal": "bin/ppal"
   },
   "files": [
     "src/lib/install",

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

@@ -1,10 +1,11 @@
 import { rmSync } from 'fs';
 
 /**
- * @param {Bun.Platform} platform
- * @param {string} outputBinBasePath
+ * @param {{ platform: Bun.Platform, outputBinBasePath: string }} options
  */
-export const clearPlaceholderBinary = (platform, outputBinBasePath) => {
+export const clearPlaceholderBinary = ({
+	platform, outputBinBasePath,
+}) => {
 	rmSync(outputBinBasePath, { force: true });
 
 	if (platform === 'win32') {

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

@@ -8,14 +8,20 @@ import packageJson from '../../../../package.json' with { type: 'json' };
 const require = createRequire(import.meta.url);
 
 /**
- * @param {Bun.Platform} platform
- * @param {string} targetPackage
+ * @param {{ platform: Bun.Platform, targetPackage: string }} options
  */
-export const getPathInfo = (platform, targetPackage) => {
+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 bin name.');
+		throw new Error(`Expected '${targetPackage}' bin name.`);
+	}
+
+	const targetVersion = packageJson.version;
+	if (!targetVersion) {
+		throw new Error(`Expected '${targetPackage}' version.`);
 	}
 
 	const packageRootDir = resolve(
@@ -31,7 +37,7 @@ export const getPathInfo = (platform, targetPackage) => {
 	let targetBinPath;
 	try {
 		targetBinPath = require.resolve(join(
-			'@package-pal', targetPackage, binExecutableName,
+			'@package-pal', targetPackage, 'bin', binExecutableName,
 		));
 	} catch {
 		targetBinPath = null;
@@ -45,5 +51,6 @@ export const getPathInfo = (platform, targetPackage) => {
 		outputBinBasePath,
 		outputBinPath,
 		targetBinPath,
+		targetVersion,
 	};
 };

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

@@ -1,58 +1,62 @@
 import {
-	copyFileSync, existsSync, linkSync, symlinkSync, writeFileSync,
+	copyFileSync, existsSync, linkSync, symlinkSync, unlinkSync,
 } from 'fs';
 
 /**
- * @param {Bun.Platform} platform
- * @param {string} binExecutableName
- * @param {string} targetBinPath
- * @param {string} outputBinBasePath
- * @param {string} outputBinPath
+ * @param {{ platform: Bun.Platform, binExecutableName: string, targetBinPath: string, outputBinBasePath: string, outputBinPath: string }} options
  */
-export const linkExistingBinary = (
+export const linkExistingBinary = ({
 	platform, binExecutableName, targetBinPath, outputBinBasePath, outputBinPath,
-) => {
+}) => {
 	const isWin = platform === 'win32';
 
 	/**
-	 * @param {string} method
+	 *  @param {string | undefined} method
 	 */
 	const verifyLinked = (method) => {
 		if (!existsSync(outputBinPath)) {
-			throw new Error(`Expected link not found after ${method}: '${outputBinPath}'.`);
+			throw new Error(`Expected link not found${method ? ` after ${method}` : ''}: '${outputBinPath}'.`);
 		}
 	};
 
+	const errs = [];
+
 	try {
-		if (!isWin) {
+		unlinkSync(outputBinPath);
+	} catch (e) {
+		errs.push(e);
+	}
+
+	if (!isWin) {
+		try {
 			symlinkSync(targetBinPath, outputBinPath);
 			verifyLinked('symlinkSync');
+
 			return;
+		} catch (eSymlinkSync) {
+			errs.push(eSymlinkSync);
 		}
-	} catch (eSym) {
+	}
+
+	try {
+		linkSync(targetBinPath, outputBinPath);
+		verifyLinked('linkSync');
+	} catch (eLinkSync) {
+		errs.push(eLinkSync);
+
 		try {
-			linkSync(targetBinPath, outputBinPath);
-			verifyLinked('linkSync');
-		} catch (eLink) {
-			try {
-				copyFileSync(targetBinPath, outputBinPath);
-				verifyLinked('copyFileSync');
-			} catch (eCopy) {
-				const cause = [
-					eSym,
-					eLink,
-					eCopy,
-				].filter(Boolean);
-				throw new Error(`Failed to link to or copy target binary '${targetBinPath}'.`, { cause });
-			}
+			copyFileSync(targetBinPath, outputBinPath);
+			verifyLinked('copyFileSync');
+		} catch (eCopyFileSync) {
+			errs.push(eCopyFileSync);
 		}
 	}
 
-	console.info(`Successfully linked binary: '${outputBinPath}' → '${targetBinPath}'.`);
-
-	if (isWin) {
-		const shimPath = `${outputBinBasePath}.cmd`;
-		console.info(`Creating cmd shim '${shimPath}'.`);
-		writeFileSync(shimPath, `@echo off\r\n"%~dp0\\${binExecutableName}" %*\r\n`);
+	try {
+		verifyLinked(undefined);
+	} catch {
+		throw new Error('Unable to link CLI binary.', { cause: errs });
 	}
+
+	console.info(`Successfully linked binary: '${outputBinPath}' → '${targetBinPath}'.`);
 };

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

@@ -1,3 +1,4 @@
+import { chmod } from 'fs/promises';
 import { get } from 'https';
 import { join } from 'path';
 import { pipeline } from 'stream/promises';
@@ -17,7 +18,8 @@ const tryDownloadAndExtract = (
 ) => {
 	return new Promise((resolve, reject) => {
 		get(tarballUrl, (res) => {
-			const isRedirect = res.statusCode === 301 || res.statusCode === 302;
+			const isRedirect = res.statusCode && (res.statusCode >= 300
+				&& res.statusCode < 400);
 			const isSuccess = res.statusCode === 200;
 
 			if (isRedirect) {
@@ -73,16 +75,20 @@ const downloadAndExtract = async (
 			}
 		}
 	}
+
+	try {
+		await chmod(join(outputBinDir, binExecutableName), 0o755);
+	} catch {
+		//
+	}
 };
 
 /**
- * @param {string} binExecutableName
- * @param {string} targetPackage
- * @param {string} outputBinDir
+ * @param {{ binExecutableName: string, targetPackage: string, outputBinDir: string }} options
  */
-export const loadMissingBinary = async (
+export const loadMissingBinary = async ({
 	binExecutableName, targetPackage, outputBinDir,
-) => {
+}) => {
 	const fullTargetPackageName = `@package-pal/${targetPackage}`;
 	/** @type {Record<string, string>} */
 	const optionalDeps = packageJson.optionalDependencies;

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

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

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

@@ -0,0 +1,3 @@
+// export const validateBinaryVersion = (targetVersion) => {
+// 	//
+// };

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

@@ -1,18 +1,27 @@
-import { getPathInfo } from './functions/get-path-info.js';
-import { getPlatformInfo } from './functions/get-platform-info.js';
-import { prepareBinary } from './functions/prepare-binary.js';
-
-try {
-	const {
-		platform, targetPackage,
-	} = getPlatformInfo();
-	const {
-		outputBinDir, binExecutableName, outputBinBasePath, outputBinPath, targetBinPath,
-	} = getPathInfo(platform, targetPackage);
-
-	await prepareBinary(
-		platform, binExecutableName, targetPackage, targetBinPath, outputBinDir, outputBinBasePath, outputBinPath,
-	);
-} catch (e) {
-	throw new Error('Postinstall failed to install CLI binary.', { cause: e });
-}
+import { getPathInfo } from './functions/get-path-info.js';
+import { getPlatformInfo } from './functions/get-platform-info.js';
+import { prepareBinary } from './functions/prepare-binary.js';
+
+try {
+	const {
+		platform, targetPackage,
+	} = getPlatformInfo();
+	const {
+		outputBinDir, binExecutableName, outputBinBasePath, outputBinPath, targetBinPath,
+	} = getPathInfo({
+		platform,
+		targetPackage,
+	});
+
+	await prepareBinary({
+		platform,
+		binExecutableName,
+		targetPackage,
+		targetBinPath,
+		outputBinDir,
+		outputBinBasePath,
+		outputBinPath,
+	});
+} catch (e) {
+	throw new Error('Postinstall failed to install CLI binary.', { cause: e });
+}