hacksh 0.16.0 → 0.18.0

package/dist/index.js

@@ -1,4 +1,4 @@
-import { a as createExec, c as HackshPromptError, d as summarizeError, f as summarizeErrors, i as resolveOutputMode, l as HackshUsageError, n as createJsonPrinter, o as HackshExecError, r as createPrintQueue, s as HackshExitError, t as createPrettyPrinter, u as HackshValidationError } from "./pretty-DJ2CE6TU.js";
+import { a as createExec, c as HackshExitError, d as HackshValidationError, f as summarizeError, i as resolveOutputMode, l as HackshPromptError, n as createJsonPrinter, o as HackshError, p as summarizeErrors, r as createPrintQueue, s as HackshExecError, t as createPrettyPrinter, u as HackshUsageError } from "./pretty-BjzGnVLM.js";
 import { globalRegistry, safeParseAsync } from "zod/v4/core";
 import { parseArgs as parseArgs$1 } from "node:util";
 import { readFile, realpath } from "node:fs/promises";
@@ -619,6 +619,44 @@ function promptError(reason, prompt, message, cause) {
 function validateMessage(kind, message, choices) {
 	if (typeof message !== "string" || message.length === 0) throw promptError("invalid-options", details$1(kind, message, choices), `Invalid ${kind} prompt: message must be a non-empty string`);
 }
+function validateChoices(kind, options) {
+	const choices = Array.isArray(options?.options) ? options.options.map((option) => typeof option === "object" && option !== null && typeof option.value === "string" ? option.value : "[Invalid choice]") : [];
+	const prompt = details$1(kind, options?.message, choices);
+	validateMessage(kind, options?.message, choices);
+	if (!Array.isArray(options.options) || options.options.length === 0) throw promptError("invalid-options", prompt, `A ${kind} prompt requires at least one choice`);
+	const seen = /* @__PURE__ */ new Set();
+	for (const option of options.options) {
+		if (typeof option !== "object" || option === null || typeof option.value !== "string" || option.value.length === 0 || option.label !== void 0 && typeof option.label !== "string" || option.hint !== void 0 && typeof option.hint !== "string") throw promptError("invalid-options", prompt, `${kind === "select" ? "Select" : "Autocomplete"} choices must have valid string values`);
+		if (seen.has(option.value)) throw promptError("invalid-options", prompt, `Duplicate ${kind} choice: ${option.value}`);
+		seen.add(option.value);
+	}
+	return prompt;
+}
+function sortedChoices(options, prompt) {
+	const { sortBy } = options;
+	if (sortBy === void 0) return options.options;
+	if (typeof sortBy !== "function") throw promptError("invalid-options", prompt, "sortBy must be a function");
+	let keyType;
+	const keyed = options.options.map((item) => {
+		let key;
+		try {
+			key = sortBy(item);
+		} catch (cause) {
+			throw promptError("input-error", prompt, "Choice sort key could not be computed", cause);
+		}
+		if (typeof key !== "string" && (typeof key !== "number" || Number.isNaN(key))) throw promptError("invalid-options", prompt, "sortBy must return a string or a non-NaN number");
+		const type = typeof key;
+		if (keyType !== void 0 && keyType !== type) throw promptError("invalid-options", prompt, "sortBy keys must all have the same type");
+		keyType = type;
+		return {
+			item,
+			key
+		};
+	});
+	keyed.sort((a, b) => a.key < b.key ? -1 : a.key > b.key ? 1 : 0);
+	return keyed.map(({ item }) => item);
+}
+const graphemeSegmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
 function asInput(value, prompt) {
 	if (typeof value !== "object" || value === null || typeof Reflect.get(value, "on") !== "function" || typeof Reflect.get(value, "removeListener") !== "function" || typeof Reflect.get(value, "resume") !== "function" || typeof Reflect.get(value, "pause") !== "function") throw promptError("input-error", prompt, "Interactive input is not a readable stream");
 	return value;
@@ -647,7 +685,7 @@ var PromptController = class {
 			throw promptError("printer-error", prompt, "The prompt could not be displayed", cause);
 		}
 	}
-	async #run(prompt, initial, accept, update, submitted, closed) {
+	async #run(prompt, initial, accept, update, submitted, closed, cancelOnEscape = () => true) {
 		if (!this.#interactive) throw promptError("non-interactive", prompt, `Cannot request ${prompt.kind} input in non-interactive mode: ${prompt.message}`);
 		if (this.#signal.aborted) throw promptError("aborted", prompt, "Prompt aborted", this.#signal.reason);
 		const input = asInput(this.#inputValue, prompt);
@@ -689,7 +727,7 @@ var PromptController = class {
 					};
 					const handleKeypress = async (character, key = {}) => {
 						if (settled) return;
-						if (key.ctrl && key.name === "c" || key.name === "escape") {
+						if (key.ctrl && key.name === "c" || key.name === "escape" && cancelOnEscape()) {
 							fail("cancelled", "Prompt cancelled");
 							return;
 						}
@@ -797,36 +835,71 @@ var PromptController = class {
 		}
 	}
 	async select(options) {
-		const choices = Array.isArray(options?.options) ? options.options.map((option) => typeof option === "object" && option !== null && typeof option.value === "string" ? option.value : "[Invalid choice]") : [];
-		const prompt = details$1("select", options?.message, choices);
-		validateMessage("select", options?.message, choices);
-		if (!Array.isArray(options.options) || options.options.length === 0) throw promptError("invalid-options", prompt, "A select prompt requires at least one choice");
-		const seen = /* @__PURE__ */ new Set();
-		for (const option of options.options) {
-			if (typeof option !== "object" || option === null || typeof option.value !== "string" || option.value.length === 0 || option.label !== void 0 && typeof option.label !== "string" || option.hint !== void 0 && typeof option.hint !== "string") throw promptError("invalid-options", prompt, "Select choices must have valid string values");
-			if (seen.has(option.value)) throw promptError("invalid-options", prompt, `Duplicate select choice: ${option.value}`);
-			seen.add(option.value);
-		}
-		let selected = options.initialValue === void 0 ? 0 : choices.indexOf(options.initialValue);
+		const prompt = validateChoices("select", options);
+		const choices = sortedChoices(options, prompt);
+		let selected = options.initialValue === void 0 ? 0 : choices.findIndex(({ value }) => value === options.initialValue);
 		if (selected < 0) throw promptError("invalid-options", prompt, `Unknown initial select value: ${String(options.initialValue)}`);
 		const state = (status = "active") => ({
 			kind: "select",
 			message: options.message,
 			status,
-			value: options.options[selected].value,
-			choices: options.options.map(({ value, label, hint }, index) => ({
+			value: choices[selected].value,
+			choices: choices.map(({ value, label, hint }, index) => ({
 				value,
 				label: label ?? value,
 				...hint === void 0 ? {} : { hint },
 				selected: index === selected
 			}))
 		});
-		return await this.#run(prompt, state(), (_character, key) => key.name === "return" || key.name === "enter" ? options.options[selected].value : void 0, (_character, key) => {
+		return await this.#run(prompt, state(), (_character, key) => key.name === "return" || key.name === "enter" ? choices[selected].value : void 0, (_character, key) => {
 			if (key.name !== "up" && key.name !== "down") return void 0;
-			selected = (selected + (key.name === "up" ? -1 : 1) + options.options.length) % options.options.length;
+			selected = (selected + (key.name === "up" ? -1 : 1) + choices.length) % choices.length;
 			return state();
 		}, () => state("submitted"), () => state("closed"));
 	}
+	async autocomplete(options) {
+		const prompt = validateChoices("autocomplete", options);
+		if (options.placeholder !== void 0 && typeof options.placeholder !== "string") throw promptError("invalid-options", prompt, "Autocomplete placeholder must be a string");
+		const choices = sortedChoices(options, prompt);
+		let query = "";
+		let selected = -1;
+		let filtered = choices;
+		const state = (status = "active") => ({
+			kind: "autocomplete",
+			message: options.message,
+			status,
+			query,
+			phase: selected < 0 ? "input" : "select",
+			...options.placeholder === void 0 ? {} : { placeholder: options.placeholder },
+			...selected < 0 ? {} : { value: filtered[selected].value },
+			choices: filtered.map(({ value, label, hint }, index) => ({
+				value,
+				label: label ?? value,
+				...hint === void 0 ? {} : { hint },
+				selected: index === selected
+			}))
+		});
+		return await this.#run(prompt, state(), (_character, key) => selected >= 0 && (key.name === "return" || key.name === "enter") ? filtered[selected].value : void 0, (character, key) => {
+			if (key.name === "down") {
+				if (selected >= filtered.length - 1) return void 0;
+				selected += 1;
+			} else if (key.name === "up") {
+				if (selected < 0) return void 0;
+				selected -= 1;
+			} else if (key.name === "escape") selected = -1;
+			else {
+				if (key.name === "backspace") {
+					const last = graphemeSegmenter.segment(query).containing(query.length - 1);
+					query = last === void 0 ? "" : query.slice(0, last.index);
+				} else if (!key.ctrl && !key.meta && character.length > 0 && !/\p{Cc}/u.test(character)) query += character;
+				else return void 0;
+				selected = -1;
+				const search = query.toLowerCase();
+				filtered = search.length === 0 ? choices : choices.filter(({ value, label }) => (label ?? value).toLowerCase().includes(search));
+			}
+			return state();
+		}, () => state("submitted"), () => state("closed"), () => selected < 0);
+	}
 	async confirm(options) {
 		const prompt = details$1("confirm", options?.message);
 		validateMessage("confirm", options?.message);
@@ -1178,13 +1251,6 @@ async function runCommand(root, argv, options = {}) {
 		await output.drain();
 	}
 }
-async function drainAndExit(output, code = 1) {
-	try {
-		await output.drain();
-	} finally {
-		process.exit(code);
-	}
-}
 function commandErrorExitCode(error) {
 	if (error instanceof HackshExitError) return error.exitCode;
 	return error instanceof HackshPromptError && error.reason === "cancelled" ? 130 : 1;
@@ -1213,21 +1279,6 @@ function listenForExitSignals() {
 		}
 	};
 }
-async function reportOutputSetupError(error, options) {
-	if (options.onError) {
-		await options.onError(error);
-		return drainAndExit(createPrintQueue(options.printer ?? { print: () => void 0 }));
-	}
-	const output = createPrintQueue(options.printer ?? createJsonPrinter({
-		stdout: options.stdout ?? process.stdout,
-		stderr: options.stderr ?? process.stderr
-	}));
-	await output.printer.print({
-		type: "error",
-		error: summarizeError(error)
-	});
-	return drainAndExit(output);
-}
 async function reportCommandError(error, output) {
 	if (error instanceof HackshExitError && error.message === "") return;
 	await output.printer.print({
@@ -1240,37 +1291,33 @@ async function reportCommandError(error, output) {
 	});
 }
 async function runMain(command, options = {}) {
-	let output;
-	try {
-		output = prepareOutput(options, options.env ?? process.env);
-	} catch (error) {
-		return reportOutputSetupError(error, options);
-	}
+	const output = prepareOutput(options, options.env ?? process.env);
 	const signals = listenForExitSignals();
-	const exit = (code) => {
-		signals.release();
-		return drainAndExit(output, signals.exitCode() ?? code);
-	};
+	let exitCode;
 	try {
-		await executeCommand(command, options.argv ?? process.argv.slice(2), output, options.env, signals.signal, () => findPackageVersion(process.argv[1]));
-	} catch (error) {
-		if (options.onError) {
-			await options.onError(error);
-			return exit(commandErrorExitCode(error));
+		try {
+			await executeCommand(command, options.argv ?? process.argv.slice(2), output, options.env, signals.signal, () => findPackageVersion(process.argv[1]));
+		} catch (error) {
+			const signalExitCode = signals.exitCode();
+			if (signalExitCode !== void 0 && error === signals.signal.reason) exitCode = signalExitCode;
+			else {
+				if (!(error instanceof HackshError)) throw error;
+				if (options.onError) await options.onError(error);
+				else await reportCommandError(error, output);
+				exitCode = commandErrorExitCode(error);
+			}
 		}
+	} finally {
 		try {
-			await reportCommandError(error, output);
+			await output.drain();
 		} finally {
-			await exit(commandErrorExitCode(error));
+			signals.release();
 		}
-	} finally {
-		signals.release();
 	}
-	const signalExitCode = signals.exitCode();
-	if (signalExitCode !== void 0) return drainAndExit(output, signalExitCode);
-	await output.drain();
+	const code = signals.exitCode() ?? exitCode;
+	if (code !== void 0) process.exit(code);
 }
 //#endregion
-export { HackshExecError, HackshExitError, HackshPromptError, HackshUsageError, HackshValidationError, defineCommand, parseArgs, renderUsage, runCommand, runMain, showUsage, summarizeUsage };
+export { HackshError, HackshExecError, HackshExitError, HackshPromptError, HackshUsageError, HackshValidationError, defineCommand, parseArgs, renderUsage, runCommand, runMain, showUsage, summarizeUsage };
 
 //# sourceMappingURL=index.js.map