@crustjs/crust 0.6.0 → 0.6.1

package/bin/crust.js

@@ -124,6 +124,7 @@ if (process.platform === "win32") {
 	}
 	// Become the binary: one process, so signals and exit status reach it with no relay.
 	// Node ignores SIGPIPE and SIGXFSZ, and ignored signals survive execve; handled ones reset.
+	// Ignores Node inherited (nohup's SIGHUP) were reset at its startup, so none pass on.
 	process.on("SIGPIPE", () => {});
 	process.on("SIGXFSZ", () => {});
 	// Early execve versions (e.g. Node 24.0.0) default to an empty environment.

package/dist/index.js

@@ -1,7 +1,7 @@
 import { copyFileSync, cpSync, existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, realpathSync, rmSync, rmdirSync, statSync, writeFileSync } from "node:fs";
-import { chmod, copyFile, mkdtemp, readFile, readdir, rm, writeFile } from "node:fs/promises";
+import { chmod, copyFile, mkdtemp, readFile, readdir, realpath, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { dirname, isAbsolute, join, posix, relative, resolve, sep, win32 } from "node:path";
+import { basename, dirname, isAbsolute, join, posix, relative, resolve, sep, win32 } from "node:path";
 import { randomBytes } from "node:crypto";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { spawn } from "node:child_process";
@@ -62,7 +62,7 @@ function readIgnoredMask() {
 function isErrnoException(error) {
 	return error instanceof Error && "code" in error && typeof error.code === "string";
 }
-// ../core/dist/invocation-B_3ZsKUB.js
+// ../core/dist/invocation-DKSTuFCO.js
 /**
 * A typed error for runtime recipe, Extension, Context, documentation, argv, and validation failures.
 *
@@ -170,6 +170,9 @@ function readForceColor(overrides) {
 function forceColorDisables(forceColor) {
 	return forceColor === "0" || forceColor === "false";
 }
+function isDumbTerm(term) {
+	return term?.toLowerCase() === "dumb";
+}
 function isTrueColorTerm(term) {
 	const lower = term.toLowerCase();
 	return lower.includes("24bit") || lower.includes("truecolor") || lower.endsWith("-direct");
@@ -193,19 +196,20 @@ function detectDepth(colorTerm, term) {
 * - `"never"` → `"none"`.
 * - `"always"` → `"truecolor"`.
 * - `"auto"`:
-*   1. `FORCE_COLOR` set → decides unconditionally (overrides TTY and
-*      `NO_COLOR`, chalk convention): `0` / `false` → `"none"`; `1` →
+*   1. `FORCE_COLOR` set → decides unconditionally (overrides TTY,
+*      `NO_COLOR`, and `TERM=dumb`, as in Node's `tty` color detection):
+*      `0` / `false` → `"none"`; `1` →
 *      `"16"`; `2` → `"256"`; `3` → `"truecolor"`; any other value
 *      (including empty) → forced on at the `COLORTERM` / `TERM`
 *      detected depth.
-*   2. Not a TTY OR `NO_COLOR` set non-empty → `"none"`.
+*   2. Not a TTY OR `NO_COLOR` set non-empty OR `TERM=dumb`
+*      (case-insensitive) → `"none"`.
 *   3. `COLORTERM` is `"truecolor"` or `"24bit"` (case-insensitive) →
 *      `"truecolor"`.
 *   4. `TERM` ends with `-direct` OR contains `truecolor` / `24bit` →
 *      `"truecolor"`.
-*   5. `TERM === "dumb"` → `"none"`.
-*   6. `TERM` contains `256color` → `"256"`.
-*   7. Any other TTY value → `"16"`.
+*   5. `TERM` contains `256color` → `"256"`.
+*   6. Any other TTY value → `"16"`.
 *
 * Detection follows the ecosystem `FORCE_COLOR` / `NO_COLOR` / `COLORTERM`
 * / `TERM` conventions; no bespoke environment variables are introduced.
@@ -247,14 +251,15 @@ function resolveColorDepth(mode, overrides) {
 	if (!readTTY(overrides)) return "none";
 	const noColor = read(overrides, "noColor", process.env.NO_COLOR);
 	if (noColor !== void 0 && noColor !== "") return "none";
-	if (term !== void 0 && term.toLowerCase() === "dumb" && !detectsTruecolor(colorTerm, term)) return "none";
+	if (isDumbTerm(term)) return "none";
 	return detectDepth(colorTerm, term);
 }
 /**
 * Resolve whether non-color ANSI modifiers should be emitted.
 *
-* In `"auto"` mode, modifiers are enabled when stdout is a TTY, but are
-* **not** affected by `NO_COLOR` (which only controls color output).
+* In `"auto"` mode, modifiers are enabled when stdout is a TTY and `TERM`
+* is not `dumb`, but are **not** affected by `NO_COLOR` (which only
+* controls color output).
 * `FORCE_COLOR`, when set, decides unconditionally — it is the all-ANSI
 * switch, while `NO_COLOR` is the colors-only switch.
 *
@@ -266,7 +271,7 @@ function resolveModifierCapability(mode, overrides) {
 	if (mode === "never") return false;
 	const forceColor = readForceColor(overrides);
 	if (forceColor !== void 0) return !forceColorDisables(forceColor);
-	return readTTY(overrides);
+	return readTTY(overrides) && !isDumbTerm(read(overrides, "term", process.env.TERM));
 }
 /**
 * Apply an ANSI style pair to a string with nesting-safe composition.
@@ -379,20 +384,35 @@ function collectIncludeDirs(cwd, stageDir, include, artifactNames) {
 	return includeDirs;
 }
 /**
+* Names a template ships on purpose that `npm pack`/`npm publish` drop from
+* every directory of a package whatever its `files` says, in any letter case.
+* A dropped `.gitignore` or `.npmignore` also acts as ignore rules for its own
+* directory. The rest of npm's ignore list (`.DS_Store`, `*.orig`, …) is junk
+* nobody means to publish, so it stays silently dropped.
+*/
+const NPM_DROPPED_NAME = /^\.(?:gitignore|npmignore|npmrc)$/i;
+/**
 * Walks `dir` the way the dereferencing copy will (through symlinked
-* directories) and rejects any path whose real location leaves the project.
+* directories) and rejects any path whose real location leaves the project,
+* and any {@link NPM_DROPPED_NAME} name.
 */
 function assertResolvesInsideProject(cwd, entry, dir) {
 	const realCwd = realpathSync(cwd);
 	const seen = /* @__PURE__ */ new Set();
+	const npmDropped = [];
 	const walk = (path) => {
 		const real = realpathSync(path);
 		if (!isWithin(realCwd, real)) throw new Error(`package.json crust.include entry ${JSON.stringify(entry)} resolves outside the project root: ${relative(cwd, path)} -> ${real}`);
+		if (NPM_DROPPED_NAME.test(basename(path))) npmDropped.push(relative(cwd, path));
 		if (seen.has(real) || !statSync(path).isDirectory()) return;
 		seen.add(real);
 		for (const child of readdirSync(path)) walk(join(path, child));
 	};
 	walk(dir);
+	if (npmDropped.length > 0) {
+		const listed = npmDropped.sort().map((path) => `\n  ${path}`).join("");
+		throw new Error(`package.json crust.include entry ${JSON.stringify(entry)} contains files npm leaves out of published packages:${listed}\n  Rename each (e.g. .gitignore -> _gitignore) and restore the name when your CLI copies it; scaffold() from @crustjs/create turns a leading _ on a file name into a dot.`);
+	}
 }
 /**
 * Copies one entry's Extension build hook output into the shared artifact
@@ -553,6 +573,7 @@ function killProcessTree(child) {
 * calls are passed through unchanged and own their shell escaping.
 */
 async function runProcess(command, args = [], options = {}) {
+	options.signal?.throwIfAborted();
 	const windowsShimCommand = getWindowsShimCommand(command, args, options.shell);
 	const collect = (options.stdio ?? "collect") === "collect";
 	const collectStdout = collect && options.stdout !== "ignore";
@@ -595,6 +616,17 @@ async function runProcess(command, args = [], options = {}) {
 			} catch {}
 		}
 	}) : () => {};
+	let forceKillTimer;
+	const onAbort = () => {
+		try {
+			if (detached || process.platform === "win32") killProcessTree(proc);
+			else {
+				proc.kill("SIGTERM");
+				forceKillTimer = setTimeout(() => proc.kill("SIGKILL"), 5e3);
+			}
+		} catch {}
+	};
+	options.signal?.addEventListener("abort", onAbort, { once: true });
 	const { text } = process.getBuiltinModule("node:stream/consumers");
 	const { once } = process.getBuiltinModule("node:events");
 	try {
@@ -603,6 +635,7 @@ async function runProcess(command, args = [], options = {}) {
 			collect ? text(proc.stderr) : "",
 			once(proc, "close")
 		]), stopped]);
+		options.signal?.throwIfAborted();
 		return {
 			exitCode,
 			stdout,
@@ -610,7 +643,9 @@ async function runProcess(command, args = [], options = {}) {
 		};
 	} finally {
 		clearTimeout(timer);
+		clearTimeout(forceKillTimer);
 		release();
+		options.signal?.removeEventListener("abort", onAbort);
 	}
 }
 function isExecutableFile(path) {
@@ -1804,6 +1839,12 @@ for (const { specifier, source } of options.plugins) {
 	}
 	plugins.push(plugin);
 }
+if (options.stripShebang) {
+	// Last, so a project plugin's onLoad for the entry still wins. The emptied line keeps line numbers.
+	plugins.push({ name: "crust-strip-shebang", setup(build) {
+		build.onLoad({ filter: new RegExp(\`^(?:\${options.stripShebang.map(RegExp.escape).join("|")})$\`) }, async ({ path, loader }) => ({ contents: (await Bun.file(path).text()).replace(/^#![^\\n]*/, ""), loader }));
+	} });
+}
 const result = await Bun.build({ ...options.build, define: ${JSON.stringify(CRUST_BUILD_DEFINE)}, plugins, throw: false });
 if (!result.success) {
 	for (const log of result.logs) console.error(log);
@@ -1819,7 +1860,7 @@ if (!options.build.compile) {
 }
 `;
 }
-async function runBunPluginDriver(build, outfilePath, { cwd, envFiles, bunPlugins }, runner) {
+async function runBunPluginDriver(build, outfilePath, { cwd, envFiles, bunPlugins }, runner, stripShebang) {
 	const driverPath = join(cwd, `.crust-build-${randomBytes(6).toString("hex")}.ts`);
 	await writeFile(driverPath, createBunPluginDriverScript({
 		plugins: bunPlugins.map((specifier) => ({
@@ -1827,7 +1868,8 @@ async function runBunPluginDriver(build, outfilePath, { cwd, envFiles, bunPlugin
 			source: resolveBunPluginSource(specifier, cwd)
 		})),
 		build,
-		outfile: outfilePath
+		outfile: outfilePath,
+		stripShebang
 	}));
 	try {
 		await runBuildProcess(runner, [...toBunEnvFileArgs(envFiles), driverPath], outfilePath, cwd);
@@ -1906,14 +1948,15 @@ async function runBuildProcess(runner, args, outfilePath, cwd) {
 */
 async function execScriptBuild(target, entryPath, outfilePath, settings, runner = resolveBunBuildRunner()) {
 	const { cwd, minify, envFiles, external } = settings;
-	if (settings.bunPlugins.length > 0) await runBunPluginDriver({
+	const stripShebang = target === "node" && /^#![^\n]*\bbun\b/.test(await readFile(entryPath, "utf8")) ? [entryPath, await realpath(entryPath)] : void 0;
+	if (settings.bunPlugins.length > 0 || stripShebang !== void 0) await runBunPluginDriver({
 		entrypoints: [entryPath],
 		minify,
 		env: "PUBLIC_*",
 		target,
 		format: "esm",
 		external
-	}, outfilePath, settings, runner);
+	}, outfilePath, settings, runner, stripShebang);
 	else await runBuildProcess(runner, [
 		"build",
 		...toBunEnvFileArgs(envFiles),
@@ -1930,9 +1973,9 @@ async function execScriptBuild(target, entryPath, outfilePath, settings, runner
 		...minify ? ["--minify"] : [],
 		entryPath
 	], outfilePath, cwd);
-	const output = await readFile(outfilePath, "utf8");
-	const shebang = `#!/usr/bin/env ${target}\n`;
-	await writeFile(outfilePath, shebang + output.replace(/^#![^\n]*(?:\n|$)/, ""));
+	const output = (await readFile(outfilePath, "utf8")).replace(/^#![^\n]*(?:\n|$)/, "");
+	if (target === "node" && output.startsWith("// @bun")) throw new Error(`Build failed for ${outfilePath}: Bun emitted Bun-only code for a Node bundle because the entry reached it starting with "#!/usr/bin/env bun".\n  Remove that line from ${entryPath}, or from what a crust.bunPlugins onLoad hook returns for it.`);
+	await writeFile(outfilePath, `#!/usr/bin/env ${target}\n${output}`);
 	if (process.platform !== "win32") await chmod(outfilePath, 493);
 }
 // src/launcher.ts
@@ -2027,6 +2070,7 @@ if (process.platform === "win32") {
 \t}
 \t// Become the binary: one process, so signals and exit status reach it with no relay.
 \t// Node ignores SIGPIPE and SIGXFSZ, and ignored signals survive execve; handled ones reset.
+\t// Ignores Node inherited (nohup's SIGHUP) were reset at its startup, so none pass on.
 \tprocess.on("SIGPIPE", () => {});
 \tprocess.on("SIGXFSZ", () => {});
 \t// Early execve versions (e.g. Node 24.0.0) default to an empty environment.
@@ -3260,6 +3304,10 @@ async function build(options = {}) {
 		const plan = planBuild(options, cwd);
 		io.stdout(`${dim("Runtime:")} ${plan.runtime} ${dim(`(${plan.runtimeSource})`)}`);
 		io.stdout(`${dim("Artifact:")} ${plan.artifact}`);
+		for (const { entryPath } of plan.entries) {
+			const named = /^#![^\n]*\b(bun|node)\b/.exec(readFileSync(entryPath, "utf8"))?.[1];
+			if (named !== void 0 && named !== plan.runtime) io.stderr(`${yellow("Warning:")} ${entryPath} starts with a ${named} shebang but crust.runtime is "${plan.runtime}". The build targets ${plan.runtime}; a linked command (npm link) still starts ${named}.`);
+		}
 		const compilers = await selectCompilers(plan, io);
 		rmSync(plan.stageDir, {
 			recursive: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crustjs/crust",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "CLI to build and publish Crust apps as npm packages or standalone binaries",
   "license": "MIT",
   "author": "chenxin-yan",
@@ -37,14 +37,14 @@
     "crust": "bin/crust.js"
   },
   "optionalDependencies": {
-    "@crustjs/crust-linux-x64": "0.6.0",
-    "@crustjs/crust-linux-arm64": "0.6.0",
-    "@crustjs/crust-linux-x64-musl": "0.6.0",
-    "@crustjs/crust-linux-arm64-musl": "0.6.0",
-    "@crustjs/crust-darwin-x64": "0.6.0",
-    "@crustjs/crust-darwin-arm64": "0.6.0",
-    "@crustjs/crust-windows-x64": "0.6.0",
-    "@crustjs/crust-windows-arm64": "0.6.0",
+    "@crustjs/crust-linux-x64": "0.6.1",
+    "@crustjs/crust-linux-arm64": "0.6.1",
+    "@crustjs/crust-linux-x64-musl": "0.6.1",
+    "@crustjs/crust-linux-arm64-musl": "0.6.1",
+    "@crustjs/crust-darwin-x64": "0.6.1",
+    "@crustjs/crust-darwin-arm64": "0.6.1",
+    "@crustjs/crust-windows-x64": "0.6.1",
+    "@crustjs/crust-windows-arm64": "0.6.1",
     "tsdown": "0.23.4",
     "@tsdown/exe": "0.23.4"
   },