politty 0.4.13 → 0.4.15

package/dist/{completion-D3LUac1o.cjs → completion-B5fgnUGm.cjs}

@@ -1,5 +1,5 @@
-const require_subcommand_router = require('./subcommand-router-BnHpqyRk.cjs');
-const require_lazy = require('./lazy-qPy4cMnv.cjs');
+const require_log_collector = require('./log-collector-Cd2_mv87.cjs');
+const require_subcommand_router = require('./subcommand-router-CqZX3orq.cjs');
 let zod = require("zod");
 let node_child_process = require("node:child_process");
 
@@ -8,6 +8,7 @@ function defineCommand(config) {
 	return {
 		name: config.name,
 		description: config.description,
+		aliases: config.aliases,
 		args: config.args,
 		subCommands: config.subCommands,
 		setup: config.setup,
@@ -112,6 +113,25 @@ function getVisibleSubs(subs) {
 	return subs.filter((s) => !s.name.startsWith("__"));
 }
 /**
+* Get all completable subcommand names including aliases.
+* Returns an array of { name, description } for all visible subcommands
+* and their aliases.
+*/
+function getSubNamesWithAliases(subs) {
+	const result = [];
+	for (const sub of getVisibleSubs(subs)) {
+		result.push({
+			name: sub.name,
+			description: sub.description
+		});
+		if (sub.aliases) for (const alias of sub.aliases) result.push({
+			name: alias,
+			description: sub.description
+		});
+	}
+	return result;
+}
+/**
 * Convert a resolved field to a completable option
 */
 function fieldToOption(field) {
@@ -131,21 +151,21 @@ function fieldToOption(field) {
 */
 function extractOptions$1(command) {
 	if (!command.args) return [];
-	return require_lazy.extractFields(command.args).fields.filter((field) => !field.positional).map(fieldToOption);
+	return require_subcommand_router.extractFields(command.args).fields.filter((field) => !field.positional).map(fieldToOption);
 }
 /**
 * Extract positional arguments from a command
 */
 function extractPositionals(command) {
 	if (!command.args) return [];
-	return require_lazy.extractFields(command.args).fields.filter((field) => field.positional);
+	return require_subcommand_router.extractFields(command.args).fields.filter((field) => field.positional);
 }
 /**
 * Extract completable positional arguments from a command
 */
 function extractCompletablePositionals(command) {
 	if (!command.args) return [];
-	return require_lazy.extractFields(command.args).fields.filter((field) => field.positional).map((field, index) => ({
+	return require_subcommand_router.extractFields(command.args).fields.filter((field) => field.positional).map((field, index) => ({
 		name: field.name,
 		cliName: field.cliName,
 		position: index,
@@ -161,7 +181,7 @@ function extractCompletablePositionals(command) {
 function extractSubcommand(name, command) {
 	const subcommands = [];
 	if (command.subCommands) for (const [subName, subCommand] of Object.entries(command.subCommands)) {
-		const resolved = require_lazy.resolveSubCommandMeta(subCommand);
+		const resolved = require_subcommand_router.resolveSubCommandMeta(subCommand);
 		if (resolved) subcommands.push(extractSubcommand(subName, resolved));
 		else subcommands.push({
 			name: subName,
@@ -174,6 +194,7 @@ function extractSubcommand(name, command) {
 	return {
 		name,
 		description: command.description,
+		aliases: command.aliases,
 		subcommands,
 		options: extractOptions$1(command),
 		positionals: extractCompletablePositionals(command)
@@ -192,16 +213,20 @@ function optTakesValueEntries(sub, parentPath) {
 	const lines = [];
 	for (const opt of sub.options) if (opt.takesValue) {
 		const patterns = [`${parentPath}:--${opt.cliName}`];
-		if (opt.alias) patterns.push(`${parentPath}:-${opt.alias}`);
+		if (opt.alias) for (const a of opt.alias) patterns.push(`${parentPath}:${a.length === 1 ? `-${a}` : `--${a}`}`);
 		lines.push(`        ${patterns.join("|")}) return 0 ;;`);
 	}
-	for (const child of getVisibleSubs(sub.subcommands)) lines.push(...optTakesValueEntries(child, joinPrefix(parentPath, child.name, ":")));
+	for (const child of getVisibleSubs(sub.subcommands)) {
+		lines.push(...optTakesValueEntries(child, joinPrefix(parentPath, child.name, ":")));
+		if (child.aliases) for (const alias of child.aliases) lines.push(...optTakesValueEntries(child, joinPrefix(parentPath, alias, ":")));
+	}
 	return lines;
 }
 /**
 * Recursively collect all subcommand route entries.
 * Returns entries used by all shell generators for both dispatch routing
 * and subcommand lookup (is_subcmd) tables.
+* Aliases are mapped to the same handler as the canonical name.
 */
 function collectRouteEntries(sub, parentPath = "", parentFunc = "") {
 	const entries = [];
@@ -214,6 +239,15 @@ function collectRouteEntries(sub, parentPath = "", parentFunc = "") {
 			funcSuffix,
 			lookupPattern: `${parentPath}:${child.name}`
 		});
+		if (child.aliases) for (const alias of child.aliases) {
+			const aliasPathStr = joinPrefix(parentPath, alias, ":");
+			entries.push(...collectRouteEntries(child, aliasPathStr, funcSuffix));
+			entries.push({
+				pathStr: aliasPathStr,
+				funcSuffix,
+				lookupPattern: `${parentPath}:${alias}`
+			});
+		}
 	}
 	return entries;
 }
@@ -246,7 +280,7 @@ function extractCompletionData(command, programName, globalArgsSchema) {
 	const rootSubcommand = extractSubcommand(programName, command);
 	let globalOptions;
 	if (globalArgsSchema) {
-		globalOptions = require_lazy.extractFields(globalArgsSchema).fields.filter((field) => !field.positional).map(fieldToOption);
+		globalOptions = require_subcommand_router.extractFields(globalArgsSchema).fields.filter((field) => !field.positional).map(fieldToOption);
 		propagateGlobalOptions(rootSubcommand, globalOptions);
 	} else globalOptions = rootSubcommand.options;
 	return {
@@ -332,7 +366,7 @@ function optionValueCases$2(options, inline) {
 		const valLines = bashValueLines(opt.valueCompletion, inline);
 		if (valLines.length === 0) continue;
 		const patterns = [`--${opt.cliName}`];
-		if (opt.alias) patterns.push(`-${opt.alias}`);
+		if (opt.alias) for (const a of opt.alias) patterns.push(a.length === 1 ? `-${a}` : `--${a}`);
 		const patternStr = patterns.join("|");
 		lines.push(`            ${patternStr})`);
 		for (const vl of valLines) lines.push(`                ${vl}`);
@@ -382,7 +416,7 @@ function availableOptionLines$2(options, fn) {
 	for (const opt of options) if (opt.valueType === "array") lines.push(`        _avail+=(--${opt.cliName})`);
 	else {
 		const patterns = [`"--${opt.cliName}"`];
-		if (opt.alias) patterns.push(`"-${opt.alias}"`);
+		if (opt.alias) for (const a of opt.alias) patterns.push(a.length === 1 ? `"-${a}"` : `"--${a}"`);
 		lines.push(`        __${fn}_not_used ${patterns.join(" ")} && _avail+=(--${opt.cliName})`);
 	}
 	lines.push(`        __${fn}_not_used "--help" && _avail+=(--help)`);
@@ -417,7 +451,7 @@ function generateSubHandler$2(sub, fn, path) {
 	lines.push(`        return`);
 	lines.push(`    fi`);
 	if (visibleSubs.length > 0) {
-		const subNames = visibleSubs.map((s) => s.name).join(" ");
+		const subNames = getSubNamesWithAliases(sub.subcommands).map((s) => s.name).join(" ");
 		lines.push(`    COMPREPLY=($(compgen -W "${subNames}" -- "$_cur"))`);
 		lines.push(`    compopt +o default 2>/dev/null`);
 	} else if (sub.positionals.length > 0) lines.push(...positionalBlock$2(sub.positionals));
@@ -479,7 +513,7 @@ function generateBashCompletion(command, options) {
 	lines.push(`        compopt +o default 2>/dev/null`);
 	if (visibleSubs.length > 0) {
 		lines.push(`    else`);
-		const subNames = visibleSubs.map((s) => s.name).join(" ");
+		const subNames = getSubNamesWithAliases(root.subcommands).map((s) => s.name).join(" ");
 		lines.push(`        COMPREPLY=($(compgen -W "${subNames}" -- "$_cur"))`);
 		lines.push(`        compopt +o default 2>/dev/null`);
 	} else if (root.positionals.length > 0) {
@@ -668,8 +702,16 @@ function generateSubcommandCandidates(context) {
 	const candidates = [];
 	let directive = CompletionDirective.FilterPrefix;
 	for (const name of context.subcommands) {
+		let description;
 		const sub = context.currentCommand.subCommands?.[name];
-		const description = sub ? require_lazy.resolveSubCommandMeta(sub)?.description : void 0;
+		if (sub) description = require_subcommand_router.resolveSubCommandMeta(sub)?.description;
+		else {
+			const canonical = require_subcommand_router.resolveSubCommandAlias(context.currentCommand, name);
+			if (canonical) {
+				const resolved = context.currentCommand.subCommands?.[canonical];
+				if (resolved) description = require_subcommand_router.resolveSubCommandMeta(resolved)?.description;
+			}
+		}
 		candidates.push({
 			value: name,
 			description,
@@ -693,7 +735,9 @@ function generateOptionNameCandidates(context) {
 	const directive = CompletionDirective.FilterPrefix;
 	const availableOptions = context.options.filter((opt) => {
 		if (opt.valueType === "array") return true;
-		return !context.usedOptions.has(opt.cliName) && !context.usedOptions.has(opt.alias || "");
+		if (context.usedOptions.has(opt.cliName)) return false;
+		if (opt.alias && opt.alias.some((a) => context.usedOptions.has(a))) return false;
+		return true;
 	});
 	for (const opt of availableOptions) candidates.push({
 		value: `--${opt.cliName}`,
@@ -761,7 +805,7 @@ function generatePositionalCandidates(context) {
 */
 function extractOptions(command) {
 	if (!command.args) return [];
-	return require_lazy.extractFields(command.args).fields.filter((field) => !field.positional).map((field) => ({
+	return require_subcommand_router.extractFields(command.args).fields.filter((field) => !field.positional).map((field) => ({
 		name: field.name,
 		cliName: field.cliName,
 		alias: field.alias,
@@ -777,7 +821,7 @@ function extractOptions(command) {
 */
 function extractPositionalsForContext(command) {
 	if (!command.args) return [];
-	return require_lazy.extractFields(command.args).fields.filter((field) => field.positional).map((field, index) => ({
+	return require_subcommand_router.extractFields(command.args).fields.filter((field) => field.positional).map((field, index) => ({
 		name: field.name,
 		cliName: field.cliName,
 		position: index,
@@ -788,20 +832,29 @@ function extractPositionalsForContext(command) {
 	}));
 }
 /**
-* Get subcommand names from a command
+* Get subcommand names from a command (including aliases)
 */
 function getSubcommandNames(command) {
 	if (!command.subCommands) return [];
-	return Object.keys(command.subCommands).filter((name) => !name.startsWith("__"));
+	const names = [];
+	for (const [name, subCmd] of Object.entries(command.subCommands)) {
+		if (name.startsWith("__")) continue;
+		names.push(name);
+		const meta = require_subcommand_router.resolveSubCommandMeta(subCmd);
+		if (meta?.aliases) names.push(...meta.aliases);
+	}
+	return names;
 }
 /**
-* Resolve subcommand by name
+* Resolve subcommand by name (including alias lookup)
 */
 function resolveSubcommand(command, name) {
 	if (!command.subCommands) return null;
 	const sub = command.subCommands[name];
-	if (!sub) return null;
-	return require_lazy.resolveSubCommandMeta(sub);
+	if (sub) return require_subcommand_router.resolveSubCommandMeta(sub);
+	const canonical = require_subcommand_router.resolveSubCommandAlias(command, name);
+	if (canonical) return require_subcommand_router.resolveSubCommandMeta(command.subCommands[canonical]);
+	return null;
 }
 /**
 * Check if a word is an option (starts with - or --)
@@ -831,7 +884,15 @@ function hasInlineValue(word) {
 * Find option by name or alias
 */
 function findOption(options, nameOrAlias) {
-	return options.find((opt) => opt.cliName === nameOrAlias || opt.alias === nameOrAlias);
+	return options.find((opt) => {
+		if (opt.cliName === nameOrAlias) return true;
+		if (opt.alias?.includes(nameOrAlias)) return true;
+		if (nameOrAlias.length > 1) {
+			if (opt.cliName.includes("-") && require_subcommand_router.toCamelCase(opt.cliName) === nameOrAlias) return true;
+			if (opt.alias?.some((a) => a.includes("-") && require_subcommand_router.toCamelCase(a) === nameOrAlias)) return true;
+		}
+		return false;
+	});
 }
 /**
 * Parse completion context from command line arguments
@@ -860,7 +921,7 @@ function parseCompletionContext(argv, rootCommand) {
 			const opt = findOption(options, optName);
 			if (opt) {
 				usedOptions.add(opt.cliName);
-				if (opt.alias) usedOptions.add(opt.alias);
+				if (opt.alias) for (const a of opt.alias) usedOptions.add(a);
 				if (opt.takesValue && !hasInlineValue(word)) i++;
 			}
 			i++;
@@ -1047,12 +1108,12 @@ function detectInlinePrefix(currentWord) {
 * Schema for the __complete command
 */
 const completeArgsSchema = zod.z.object({
-	shell: require_lazy.arg(zod.z.enum([
+	shell: require_subcommand_router.arg(zod.z.enum([
 		"bash",
 		"zsh",
 		"fish"
 	]), { description: "Target shell for output formatting" }),
-	args: require_lazy.arg(zod.z.array(zod.z.string()).default([]), {
+	args: require_subcommand_router.arg(zod.z.array(zod.z.string()).default([]), {
 		positional: true,
 		description: "Arguments to complete",
 		variadic: true
@@ -1150,7 +1211,7 @@ function optionValueCases$1(options) {
 		const valLines = fishValueLines(opt.valueCompletion);
 		if (valLines.length === 0) continue;
 		const conditions = [`test "$_prev" = "--${opt.cliName}"`];
-		if (opt.alias) conditions.push(`test "$_prev" = "-${opt.alias}"`);
+		if (opt.alias) for (const a of opt.alias) conditions.push(`test "$_prev" = "${a.length === 1 ? `-${a}` : `--${a}`}"`);
 		const cond = conditions.join("; or ");
 		lines.push(`    if ${cond}`);
 		for (const vl of valLines) lines.push(`        ${vl}`);
@@ -1182,7 +1243,7 @@ function availableOptionLines$1(options, fn) {
 		if (opt.valueType === "array") lines.push(`        echo "--${opt.cliName}\t${desc}"`);
 		else {
 			const checks = [`"--${opt.cliName}"`];
-			if (opt.alias) checks.push(`"-${opt.alias}"`);
+			if (opt.alias) for (const a of opt.alias) checks.push(a.length === 1 ? `"-${a}"` : `"--${a}"`);
 			lines.push(`        __${fn}_not_used ${checks.join(" ")}; and echo "--${opt.cliName}\t${desc}"`);
 		}
 	}
@@ -1218,7 +1279,7 @@ function generateSubHandler$1(sub, fn, path) {
 	lines.push(...availableOptionLines$1(sub.options, fn));
 	lines.push(`        return`);
 	lines.push(`    end`);
-	if (visibleSubs.length > 0) for (const s of visibleSubs) {
+	if (visibleSubs.length > 0) for (const s of getSubNamesWithAliases(sub.subcommands)) {
 		const desc = escapeDesc$1(s.description ?? "");
 		lines.push(`    echo "${s.name}\t${desc}"`);
 	}
@@ -1232,13 +1293,17 @@ function optTakesValueCases(sub, parentPath) {
 	const lines = [];
 	for (const opt of sub.options) if (opt.takesValue) {
 		const patterns = [`"${parentPath}:--${opt.cliName}"`];
-		if (opt.alias) patterns.push(`"${parentPath}:-${opt.alias}"`);
+		if (opt.alias) for (const a of opt.alias) patterns.push(`"${parentPath}:${a.length === 1 ? `-${a}` : `--${a}`}"`);
 		lines.push(`        case ${patterns.join(" ")}`);
 		lines.push(`            return 0`);
 	}
 	for (const child of getVisibleSubs(sub.subcommands)) {
 		const childPath = parentPath ? `${parentPath}:${child.name}` : child.name;
 		lines.push(...optTakesValueCases(child, childPath));
+		if (child.aliases) for (const alias of child.aliases) {
+			const aliasPath = parentPath ? `${parentPath}:${alias}` : alias;
+			lines.push(...optTakesValueCases(child, aliasPath));
+		}
 	}
 	return lines;
 }
@@ -1295,7 +1360,7 @@ function generateFishCompletion(command, options) {
 	lines.push(...availableOptionLines$1(root.options, fn));
 	if (visibleSubs.length > 0) {
 		lines.push(`    else`);
-		for (const s of visibleSubs) {
+		for (const s of getSubNamesWithAliases(root.subcommands)) {
 			const desc = escapeDesc$1(s.description ?? "");
 			lines.push(`        echo "${s.name}\t${desc}"`);
 		}
@@ -1407,7 +1472,7 @@ function optionValueCases(options, fn) {
 		const valLines = zshValueLines(opt.valueCompletion, fn);
 		if (valLines.length === 0) continue;
 		const patterns = [`--${opt.cliName}`];
-		if (opt.alias) patterns.push(`-${opt.alias}`);
+		if (opt.alias) for (const a of opt.alias) patterns.push(a.length === 1 ? `-${a}` : `--${a}`);
 		lines.push(`            ${patterns.join("|")})`);
 		for (const vl of valLines) lines.push(`                ${vl}`);
 		lines.push(`                return 0 ;;`);
@@ -1448,7 +1513,7 @@ function availableOptionLines(options, fn) {
 		if (opt.valueType === "array") lines.push(`        _opts+=("--${opt.cliName}${desc}")`);
 		else {
 			const patterns = [`"--${opt.cliName}"`];
-			if (opt.alias) patterns.push(`"-${opt.alias}"`);
+			if (opt.alias) for (const a of opt.alias) patterns.push(a.length === 1 ? `"-${a}"` : `"--${a}"`);
 			lines.push(`        __${fn}_not_used ${patterns.join(" ")} && _opts+=("--${opt.cliName}${desc}")`);
 		}
 	}
@@ -1483,7 +1548,7 @@ function generateSubHandler(sub, fn, path) {
 	lines.push(`        return 0`);
 	lines.push(`    fi`);
 	if (visibleSubs.length > 0) {
-		const subItems = visibleSubs.map((s) => {
+		const subItems = getSubNamesWithAliases(sub.subcommands).map((s) => {
 			const desc = s.description ? `:${escapeDesc(s.description)}` : "";
 			return `"${s.name}${desc}"`;
 		}).join(" ");
@@ -1558,7 +1623,7 @@ function generateZshCompletion(command, options) {
 	lines.push(`        __${fn}_cdescribe 'options' _opts`);
 	if (visibleSubs.length > 0) {
 		lines.push(`    else`);
-		const subItems = visibleSubs.map((s) => {
+		const subItems = getSubNamesWithAliases(root.subcommands).map((s) => {
 			const desc = s.description ? `:${escapeDesc(s.description)}` : "";
 			return `"${s.name}${desc}"`;
 		}).join(" ");
@@ -1687,7 +1752,7 @@ function detectShell() {
 * Schema for the completion command arguments
 */
 const completionArgsSchema = zod.z.object({
-	shell: require_lazy.arg(zod.z.enum([
+	shell: require_subcommand_router.arg(zod.z.enum([
 		"bash",
 		"zsh",
 		"fish"
@@ -1696,7 +1761,7 @@ const completionArgsSchema = zod.z.object({
 		description: "Shell type (bash, zsh, or fish)",
 		placeholder: "SHELL"
 	}),
-	instructions: require_lazy.arg(zod.z.boolean().default(false), {
+	instructions: require_subcommand_router.arg(zod.z.boolean().default(false), {
 		alias: "i",
 		description: "Show installation instructions"
 	})
@@ -1872,4 +1937,4 @@ Object.defineProperty(exports, 'withCompletionCommand', {
     return withCompletionCommand;
   }
 });
-//# sourceMappingURL=completion-D3LUac1o.cjs.map
+//# sourceMappingURL=completion-B5fgnUGm.cjs.map