@crustjs/crust 0.0.21 → 0.0.22

package/README.md

@@ -121,8 +121,7 @@ dist/npm/
   manifest.json
   root/
     package.json
-    bin/my-cli
-    bin/my-cli.cmd
+    bin/my-cli.js
   linux-x64/
     package.json
     bin/my-cli-bun-linux-x64-baseline
@@ -143,7 +142,7 @@ dist/npm/
     bin/my-cli-bun-windows-arm64.exe
 ```
 
-The generated root package contains shell and `.cmd` launchers plus `optionalDependencies` on the platform packages. Each platform package is tagged with npm `os` / `cpu` metadata and contains only its native binary.
+The generated root package contains a JS resolver plus `optionalDependencies` on the platform packages. Each platform package is tagged with npm `os` / `cpu` metadata and contains only its native binary. npm generates the platform launchers from the root package `bin` entry during install, so Crust does not stage its own `.cmd` file for `--package`.
 
 `crust build --package` is the npm-packaging workflow. The staged interface is:
 

package/bin/crust.js

@@ -0,0 +1,113 @@
+#!/usr/bin/env node
+// Auto-generated by crust build --package -- do not edit
+import { spawn } from "node:child_process";
+import { chmodSync, existsSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import process from "node:process";
+import { fileURLToPath } from "node:url";
+
+const PLATFORMS = {
+	"linux-x64": {
+		"packagePathSegment": "crust-linux-x64",
+		"packageName": "@crustjs/crust-linux-x64",
+		"binaryFilename": "crust-bun-linux-x64-baseline"
+	},
+	"linux-arm64": {
+		"packagePathSegment": "crust-linux-arm64",
+		"packageName": "@crustjs/crust-linux-arm64",
+		"binaryFilename": "crust-bun-linux-arm64"
+	},
+	"darwin-x64": {
+		"packagePathSegment": "crust-darwin-x64",
+		"packageName": "@crustjs/crust-darwin-x64",
+		"binaryFilename": "crust-bun-darwin-x64"
+	},
+	"darwin-arm64": {
+		"packagePathSegment": "crust-darwin-arm64",
+		"packageName": "@crustjs/crust-darwin-arm64",
+		"binaryFilename": "crust-bun-darwin-arm64"
+	},
+	"win32-x64": {
+		"packagePathSegment": "crust-windows-x64",
+		"packageName": "@crustjs/crust-windows-x64",
+		"binaryFilename": "crust-bun-windows-x64-baseline.exe"
+	},
+	"win32-arm64": {
+		"packagePathSegment": "crust-windows-arm64",
+		"packageName": "@crustjs/crust-windows-arm64",
+		"binaryFilename": "crust-bun-windows-arm64.exe"
+	}
+};
+const dir = dirname(fileURLToPath(import.meta.url));
+const platformKey = `${process.platform}-${process.arch}`;
+const target = PLATFORMS[platformKey];
+
+if (!target) {
+	console.error("[crust] Unsupported platform: " + platformKey);
+	console.error("[crust] Supported platforms: linux-x64, linux-arm64, darwin-x64, darwin-arm64, windows-x64, windows-arm64");
+	process.exit(1);
+}
+
+const candidateOne = resolve(
+	dir,
+	"..",
+	"..",
+	target.packagePathSegment,
+	"bin",
+	target.binaryFilename,
+);
+const candidateTwo = resolve(
+	dir,
+	"..",
+	"node_modules",
+	target.packageName,
+	"bin",
+	target.binaryFilename,
+);
+
+const binPath = existsSync(candidateOne)
+	? candidateOne
+	: existsSync(candidateTwo)
+		? candidateTwo
+		: null;
+
+if (!binPath) {
+	console.error("[crust] Missing platform package for " + platformKey);
+	console.error("[crust] Tried:");
+	console.error("  " + candidateOne);
+	console.error("  " + candidateTwo);
+	console.error(
+		"[crust] Reinstall dependencies on this platform and ensure optional dependencies are enabled.",
+	);
+	process.exit(1);
+}
+
+if (process.platform !== "win32") {
+	try {
+		chmodSync(binPath, 0o755);
+	} catch {
+		// Ignore permission adjustment failures and let spawn surface real errors.
+	}
+}
+
+const child = spawn(binPath, process.argv.slice(2), {
+	stdio: "inherit",
+});
+
+child.on("error", (error) => {
+	console.error("[crust] Failed to launch binary: " + error.message);
+	process.exit(1);
+});
+
+child.on("exit", (code, signal) => {
+	if (signal) {
+		try {
+			process.kill(process.pid, signal);
+		} catch {
+			process.exit(1);
+		}
+		return;
+	}
+
+	process.exit(code ?? 0);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@crustjs/crust",
-	"version": "0.0.21",
+	"version": "0.0.22",
 	"description": "CLI tooling for the Crust framework",
 	"license": "MIT",
 	"author": "chenxin-yan",
@@ -29,14 +29,14 @@
 		"bin"
 	],
 	"bin": {
-		"crust": "bin/crust"
+		"crust": "bin/crust.js"
 	},
 	"optionalDependencies": {
-		"@crustjs/crust-linux-x64": "0.0.21",
-		"@crustjs/crust-linux-arm64": "0.0.21",
-		"@crustjs/crust-darwin-x64": "0.0.21",
-		"@crustjs/crust-darwin-arm64": "0.0.21",
-		"@crustjs/crust-windows-x64": "0.0.21",
-		"@crustjs/crust-windows-arm64": "0.0.21"
+		"@crustjs/crust-linux-x64": "0.0.22",
+		"@crustjs/crust-linux-arm64": "0.0.22",
+		"@crustjs/crust-darwin-x64": "0.0.22",
+		"@crustjs/crust-darwin-arm64": "0.0.22",
+		"@crustjs/crust-windows-x64": "0.0.22",
+		"@crustjs/crust-windows-arm64": "0.0.22"
 	}
 }

package/bin/crust

@@ -1,65 +0,0 @@
-#!/usr/bin/env bash
-# Auto-generated by crust build --package -- do not edit
-set -e
-
-source="$0"
-while [ -L "$source" ]; do
-	link_dir="$(cd "$(dirname "$source")" && pwd)"
-	source="$(readlink "$source")"
-	case "$source" in
-		/*) ;;
-		*) source="$link_dir/$source" ;;
-	esac
-done
-
-dir="$(cd "$(dirname "$source")" && pwd)"
-platform="$(uname -s)-$(uname -m)"
-platform_pkg=""
-fallback_pkg=""
-binary=""
-
-case "$platform" in
-	Linux-x86_64)
-		platform_pkg="crust-linux-x64"
-		fallback_pkg="@crustjs/crust-linux-x64"
-		binary="crust-bun-linux-x64-baseline"
-		;;
-	Linux-aarch64)
-		platform_pkg="crust-linux-arm64"
-		fallback_pkg="@crustjs/crust-linux-arm64"
-		binary="crust-bun-linux-arm64"
-		;;
-	Darwin-x86_64)
-		platform_pkg="crust-darwin-x64"
-		fallback_pkg="@crustjs/crust-darwin-x64"
-		binary="crust-bun-darwin-x64"
-		;;
-	Darwin-arm64)
-		platform_pkg="crust-darwin-arm64"
-		fallback_pkg="@crustjs/crust-darwin-arm64"
-		binary="crust-bun-darwin-arm64"
-		;;
-	*)
-		echo "[crust] Unsupported platform: $platform" >&2
-		echo "[crust] Supported platforms: linux-x64, linux-arm64, darwin-x64, darwin-arm64" >&2
-		exit 1
-		;;
-esac
-
-candidate_one="$dir/../../$platform_pkg/bin/$binary"
-candidate_two="$dir/../node_modules/$fallback_pkg/bin/$binary"
-
-if [ -f "$candidate_one" ]; then
-	exec "$candidate_one" "$@"
-fi
-
-if [ -f "$candidate_two" ]; then
-	exec "$candidate_two" "$@"
-fi
-
-echo "[crust] Missing platform package for $platform" >&2
-echo "[crust] Tried:" >&2
-echo "  $candidate_one" >&2
-echo "  $candidate_two" >&2
-echo "[crust] Reinstall dependencies on this platform and ensure optional dependencies are enabled." >&2
-exit 1

package/bin/crust.cmd

@@ -1,45 +0,0 @@
-@echo off
-rem Auto-generated by crust build --package -- do not edit
-setlocal
-set "dir=%~dp0"
-set "host_arch=%PROCESSOR_ARCHITECTURE%"
-set "pkg_segment="
-set "fallback_pkg="
-set "binary="
-
-if /I "%PROCESSOR_ARCHITEW6432%"=="ARM64" set "host_arch=ARM64"
-
-if /I "%host_arch%"=="AMD64" (
-	set "pkg_segment=crust-windows-x64"
-	set "fallback_pkg=@crustjs\crust-windows-x64"
-	set "binary=crust-bun-windows-x64-baseline.exe"
-)
-if /I "%host_arch%"=="ARM64" (
-	set "pkg_segment=crust-windows-arm64"
-	set "fallback_pkg=@crustjs\crust-windows-arm64"
-	set "binary=crust-bun-windows-arm64.exe"
-)
-
-if "%binary%"=="" (
-	echo [crust] Unsupported Windows architecture: %host_arch% >&2
-	exit /b 1
-)
-
-set "candidate_one=%dir%..\..\%pkg_segment%\bin\%binary%"
-set "candidate_two=%dir%..\node_modules\%fallback_pkg%\bin\%binary%"
-
-if exist "%candidate_one%" (
-	"%candidate_one%" %*
-	exit /b %ERRORLEVEL%
-)
-
-if exist "%candidate_two%" (
-	"%candidate_two%" %*
-	exit /b %ERRORLEVEL%
-)
-
-echo [crust] Missing platform package for Windows %host_arch% >&2
-echo [crust] Tried: %candidate_one% >&2
-echo [crust] Tried: %candidate_two% >&2
-echo [crust] Reinstall dependencies on this platform and ensure optional dependencies are enabled. >&2
-exit /b 1