@optique/core 1.1.0-dev.2096 → 1.1.0-dev.2148

package/dist/primitives.cjs

@@ -1,11 +1,12 @@
-const require_annotations = require('./internal/annotations.cjs');
+const require_internal_annotations = require('./internal/annotations.cjs');
 const require_message = require('./message.cjs');
 const require_validate = require('./validate.cjs');
 const require_usage = require('./usage.cjs');
 const require_mode_dispatch = require('./internal/mode-dispatch.cjs');
-const require_dependency = require('./internal/dependency.cjs');
+const require_internal_dependency = require('./internal/dependency.cjs');
 const require_dependency_runtime = require('./dependency-runtime.cjs');
 const require_annotation_state = require('./annotation-state.cjs');
+const require_command_alias = require('./internal/command-alias.cjs');
 const require_execution_context = require('./execution-context.cjs');
 const require_phase2_seed = require('./phase2-seed.cjs');
 const require_suggestion = require('./suggestion.cjs');
@@ -46,8 +47,8 @@ function buildTraceEntry(kind, rawInput, consumed, valueParser, parseResult, opt
 		...optionNames$1 != null ? { optionNames: optionNames$1 } : {},
 		metavar: valueParser.metavar
 	};
-	if (require_dependency.isDerivedValueParser(valueParser)) {
-		const defaults = require_dependency.getSnapshottedDefaultDependencyValues(parseResult);
+	if (require_internal_dependency.isDerivedValueParser(valueParser)) {
+		const defaults = require_internal_dependency.getSnapshottedDefaultDependencyValues(parseResult);
 		if (defaults != null) return {
 			...entry,
 			defaultDependencyValues: defaults
@@ -211,13 +212,13 @@ function fail() {
 */
 function* getSuggestionsWithDependency(valueParser, prefix, dependencyRegistry, exec) {
 	if (!valueParser.suggest) return;
-	if (require_dependency.isDerivedValueParser(valueParser) && require_dependency.suggestWithDependency in valueParser) {
+	if (require_internal_dependency.isDerivedValueParser(valueParser) && require_internal_dependency.suggestWithDependency in valueParser) {
 		const derived = valueParser;
-		const suggestWithDep = derived[require_dependency.suggestWithDependency];
+		const suggestWithDep = derived[require_internal_dependency.suggestWithDependency];
 		if (suggestWithDep && dependencyRegistry) {
 			const dependencyRuntime = exec?.dependencyRuntime;
-			const depIds = require_dependency.getDependencyIds(derived);
-			const defaultsFn = require_dependency.getDefaultValuesFunction(derived);
+			const depIds = require_internal_dependency.getDependencyIds(derived);
+			const defaultsFn = require_internal_dependency.getDefaultValuesFunction(derived);
 			const defaults = defaultsFn?.();
 			const dependencyValues = [];
 			let hasAnyValue = false;
@@ -295,13 +296,13 @@ function* suggestOptionSync(optionNames$1, valueParser, hidden, context, prefix)
 */
 async function* getSuggestionsWithDependencyAsync(valueParser, prefix, dependencyRegistry, exec) {
 	if (!valueParser.suggest) return;
-	if (require_dependency.isDerivedValueParser(valueParser) && require_dependency.suggestWithDependency in valueParser) {
+	if (require_internal_dependency.isDerivedValueParser(valueParser) && require_internal_dependency.suggestWithDependency in valueParser) {
 		const derived = valueParser;
-		const suggestWithDep = derived[require_dependency.suggestWithDependency];
+		const suggestWithDep = derived[require_internal_dependency.suggestWithDependency];
 		if (suggestWithDep && dependencyRegistry) {
 			const dependencyRuntime = exec?.dependencyRuntime;
-			const depIds = require_dependency.getDependencyIds(derived);
-			const defaultsFn = require_dependency.getDefaultValuesFunction(derived);
+			const depIds = require_internal_dependency.getDependencyIds(derived);
+			const defaultsFn = require_internal_dependency.getDefaultValuesFunction(derived);
 			const defaults = defaultsFn?.();
 			const dependencyValues = [];
 			let hasAnyValue = false;
@@ -690,7 +691,7 @@ function option(...args) {
 		configurable: true,
 		enumerable: false
 	});
-	else if (!require_dependency.isDerivedValueParser(valueParser)) {
+	else if (!require_internal_dependency.isDerivedValueParser(valueParser)) {
 		const vp = valueParser;
 		const wrapParseResult = (parsed) => parsed.success ? parsed : {
 			success: false,
@@ -698,6 +699,7 @@ function option(...args) {
 		};
 		Object.defineProperty(result, "validateValue", {
 			value(v) {
+				if (typeof vp.validate === "function") return require_mode_dispatch.wrapForMode(mode, wrapParseResult(vp.validate(v)));
 				let stringified;
 				try {
 					stringified = vp.format(v);
@@ -1324,7 +1326,7 @@ function argument(valueParser, options = {}) {
 			enumerable: false
 		});
 	}
-	if (!require_dependency.isDerivedValueParser(valueParser)) {
+	if (!require_internal_dependency.isDerivedValueParser(valueParser)) {
 		const vp = valueParser;
 		const vpMode = valueParser.mode;
 		const wrapParseResult = (parsed) => parsed.success ? parsed : {
@@ -1333,6 +1335,7 @@ function argument(valueParser, options = {}) {
 		};
 		Object.defineProperty(result, "validateValue", {
 			value(v) {
+				if (typeof vp.validate === "function") return require_mode_dispatch.wrapForMode(vpMode, wrapParseResult(vp.validate(v)));
 				let stringified;
 				try {
 					stringified = vp.format(v);
@@ -1380,7 +1383,7 @@ function getCommandChildState(commandState, childState, parser) {
 	return require_annotation_state.getWrappedChildState(commandState, childState, parser);
 }
 function createCommandState(sourceState, state) {
-	return require_annotations.annotateFreshArray(sourceState, state);
+	return require_internal_annotations.annotateFreshArray(sourceState, state);
 }
 function appendCommandPath(exec, name) {
 	if (exec == null) return void 0;
@@ -1389,25 +1392,56 @@ function appendCommandPath(exec, name) {
 		commandPath: [...exec.commandPath ?? [], name]
 	};
 }
-function* suggestCommandSync(context, prefix, name, parser, options) {
+function getCommandNames(name, options) {
+	return [
+		name,
+		...getVisibleCommandAliases(options),
+		...getHiddenCommandAliases(options)
+	];
+}
+function getVisibleCommandAliases(options) {
+	const aliases = options.aliases;
+	if (aliases == null) return [];
+	if (!isNonEmptyStringArray(aliases)) throw new TypeError("Command aliases must be a non-empty array of strings.");
+	return aliases;
+}
+function getHiddenCommandAliases(options) {
+	const hiddenAliases = options[require_command_alias.hiddenCommandAliasesKey];
+	if (hiddenAliases == null) return [];
+	if (!isNonEmptyStringArray(hiddenAliases)) throw new TypeError("Hidden command aliases must be a non-empty array of strings.");
+	return hiddenAliases;
+}
+function isNonEmptyStringArray(value) {
+	if (!Array.isArray(value) || value.length === 0) return false;
+	for (let i = 0; i < value.length; i++) if (typeof value[i] !== "string") return false;
+	return true;
+}
+function validateUniqueCommandNames(names) {
+	const seen = /* @__PURE__ */ new Set();
+	for (const name of names) {
+		if (seen.has(name)) throw new TypeError(`Command has a duplicate name: "${name}".`);
+		seen.add(name);
+	}
+}
+function* suggestCommandSync(context, prefix, name, aliases, parser, options) {
 	if (require_usage.isSuggestionHidden(options.hidden)) return;
 	const state = normalizeCommandState(context.state);
 	if (state === void 0) {
-		if (name.startsWith(prefix)) yield {
+		for (const commandName of [name, ...aliases]) if (commandName.startsWith(prefix)) yield {
 			kind: "literal",
-			text: name,
+			text: commandName,
 			...options.description && { description: options.description }
 		};
 	} else if (state[0] === "matched") yield* parser.suggest(require_execution_context.withChildContext(context, name, getCommandChildState(context.state, parser.initialState, parser), parser.usage), prefix);
 	else if (state[0] === "parsing") yield* parser.suggest(require_execution_context.withChildContext(context, name, getCommandChildState(context.state, state[1], parser), parser.usage), prefix);
 }
-async function* suggestCommandAsync(context, prefix, name, parser, options) {
+async function* suggestCommandAsync(context, prefix, name, aliases, parser, options) {
 	if (require_usage.isSuggestionHidden(options.hidden)) return;
 	const state = normalizeCommandState(context.state);
 	if (state === void 0) {
-		if (name.startsWith(prefix)) yield {
+		for (const commandName of [name, ...aliases]) if (commandName.startsWith(prefix)) yield {
 			kind: "literal",
-			text: name,
+			text: commandName,
 			...options.description && { description: options.description }
 		};
 	} else if (state[0] === "matched") {
@@ -1435,7 +1469,11 @@ async function* suggestCommandAsync(context, prefix, name, parser, options) {
 *         embedded whitespace, or contains control characters.
 */
 function command(name, parser, options = {}) {
-	require_validate.validateCommandNames([name], "Command");
+	const commandNames = getCommandNames(name, options);
+	const aliases = getVisibleCommandAliases(options);
+	const hiddenAliases = getHiddenCommandAliases(options);
+	require_validate.validateCommandNames(commandNames, "Command");
+	validateUniqueCommandNames(commandNames);
 	const isAsync = parser.mode === "async";
 	const syncInnerParser = parser;
 	const asyncInnerParser = parser;
@@ -1448,10 +1486,12 @@ function command(name, parser, options = {}) {
 		usage: [{
 			type: "command",
 			name,
+			...aliases.length > 0 && { aliases },
+			...hiddenAliases.length > 0 && { hiddenAliases },
 			...options.usageLine != null && { usageLine: options.usageLine },
 			...options.hidden != null && { hidden: options.hidden }
 		}, ...parser.usage],
-		leadingNames: new Set([name]),
+		leadingNames: new Set(commandNames),
 		acceptingAnyToken: false,
 		initialState: void 0,
 		canSkip(state, exec) {
@@ -1474,10 +1514,11 @@ function command(name, parser, options = {}) {
 		parse(context) {
 			const state = normalizeCommandState(context.state);
 			if (state === void 0) {
-				if (context.buffer.length < 1 || context.buffer[0] !== name) {
+				if (context.buffer.length < 1 || !commandNames.includes(context.buffer[0])) {
 					const actual = context.buffer.length > 0 ? context.buffer[0] : null;
 					const leadingCmds = require_usage_internals.extractLeadingCommandNames(context.usage);
-					const suggestions = actual ? require_suggestion.findSimilar(actual, leadingCmds, require_suggestion.DEFAULT_FIND_SIMILAR_OPTIONS) : [];
+					const rawSuggestions = actual ? require_suggestion.findSimilar(actual, leadingCmds, require_suggestion.DEFAULT_FIND_SIMILAR_OPTIONS) : [];
+					const suggestions = require_suggestion.expandCommandAliasSuggestions(context.usage, rawSuggestions);
 					if (options.errors?.notMatched) {
 						const errorMessage = options.errors.notMatched;
 						return {
@@ -1608,8 +1649,8 @@ function command(name, parser, options = {}) {
 			return require_mode_dispatch.wrapForMode(parser.mode, null);
 		},
 		suggest(context, prefix) {
-			if (isAsync) return suggestCommandAsync(context, prefix, name, parser, options);
-			return suggestCommandSync(context, prefix, name, parser, options);
+			if (isAsync) return suggestCommandAsync(context, prefix, name, aliases, parser, options);
+			return suggestCommandSync(context, prefix, name, aliases, parser, options);
 		},
 		getDocFragments(state, defaultValue) {
 			const commandState = state.kind === "available" ? normalizeCommandState(state.state) : void 0;
@@ -1740,7 +1781,7 @@ function passThrough(options = {}) {
 					next: {
 						...context,
 						buffer: [],
-						state: require_annotations.annotateFreshArray(context.state, [...context.state, ...captured])
+						state: require_internal_annotations.annotateFreshArray(context.state, [...context.state, ...captured])
 					},
 					consumed: captured
 				};
@@ -1761,7 +1802,7 @@ function passThrough(options = {}) {
 					next: {
 						...context,
 						buffer: context.buffer.slice(1),
-						state: require_annotations.annotateFreshArray(context.state, [...context.state, token])
+						state: require_internal_annotations.annotateFreshArray(context.state, [...context.state, token])
 					},
 					consumed: [token]
 				};
@@ -1777,7 +1818,7 @@ function passThrough(options = {}) {
 					next: {
 						...context,
 						buffer: context.buffer.slice(1),
-						state: require_annotations.annotateFreshArray(context.state, [...context.state, token])
+						state: require_internal_annotations.annotateFreshArray(context.state, [...context.state, token])
 					},
 					consumed: [token]
 				};
@@ -1787,7 +1828,7 @@ function passThrough(options = {}) {
 					next: {
 						...context,
 						buffer: context.buffer.slice(2),
-						state: require_annotations.annotateFreshArray(context.state, [
+						state: require_internal_annotations.annotateFreshArray(context.state, [
 							...context.state,
 							token,
 							nextToken
@@ -1800,7 +1841,7 @@ function passThrough(options = {}) {
 					next: {
 						...context,
 						buffer: context.buffer.slice(1),
-						state: require_annotations.annotateFreshArray(context.state, [...context.state, token])
+						state: require_internal_annotations.annotateFreshArray(context.state, [...context.state, token])
 					},
 					consumed: [token]
 				};
@@ -1812,7 +1853,7 @@ function passThrough(options = {}) {
 			};
 		},
 		complete(state, _exec) {
-			if (require_annotations.getAnnotations(state) == null) return {
+			if (require_internal_annotations.getAnnotations(state) == null) return {
 				success: true,
 				value: state
 			};

package/dist/primitives.d.cts

@@ -448,6 +448,16 @@ interface CommandOptions {
    * @since 0.9.0
    */
   readonly hidden?: HiddenVisibility;
+  /**
+   * Additional names that invoke this command.
+   *
+   * Aliases are functional at runtime and are suggested by shell completion,
+   * but are hidden from usage and documentation output.  The `name` parameter
+   * passed to {@link command} remains the canonical display name.
+   *
+   * @since 1.1.0
+   */
+  readonly aliases?: readonly [string, ...string[]];
   /**
    * Error messages customization.
    * @since 0.5.0

package/dist/primitives.d.ts

@@ -448,6 +448,16 @@ interface CommandOptions {
    * @since 0.9.0
    */
   readonly hidden?: HiddenVisibility;
+  /**
+   * Additional names that invoke this command.
+   *
+   * Aliases are functional at runtime and are suggested by shell completion,
+   * but are hidden from usage and documentation output.  The `name` parameter
+   * passed to {@link command} remains the canonical display name.
+   *
+   * @since 1.1.0
+   */
+  readonly aliases?: readonly [string, ...string[]];
   /**
    * Error messages customization.
    * @since 0.5.0

package/dist/primitives.js

@@ -6,9 +6,10 @@ import { dispatchByMode, dispatchIterableByMode, wrapForMode } from "./internal/
 import { getDefaultValuesFunction, getDependencyIds, getSnapshottedDefaultDependencyValues, isDerivedValueParser, suggestWithDependency } from "./internal/dependency.js";
 import { replayDerivedParser, replayDerivedParserAsync } from "./dependency-runtime.js";
 import { getWrappedChildParseState, getWrappedChildState, isAnnotationWrappedInitialState, normalizeInjectedAnnotationState } from "./annotation-state.js";
+import { hiddenCommandAliasesKey } from "./internal/command-alias.js";
 import { mergeChildExec, withChildContext, withChildExecPath } from "./execution-context.js";
 import { completeOrExtractPhase2Seed, extractPhase2SeedKey } from "./phase2-seed.js";
-import { DEFAULT_FIND_SIMILAR_OPTIONS, createErrorWithSuggestions, createSuggestionMessage, findSimilar } from "./suggestion.js";
+import { DEFAULT_FIND_SIMILAR_OPTIONS, createErrorWithSuggestions, createSuggestionMessage, expandCommandAliasSuggestions, findSimilar } from "./suggestion.js";
 import { extractLeadingCommandNames } from "./usage-internals.js";
 import { extractDependencyMetadata } from "./dependency-metadata.js";
 import { isValueParser } from "./valueparser.js";
@@ -698,6 +699,7 @@ function option(...args) {
 		};
 		Object.defineProperty(result, "validateValue", {
 			value(v) {
+				if (typeof vp.validate === "function") return wrapForMode(mode, wrapParseResult(vp.validate(v)));
 				let stringified;
 				try {
 					stringified = vp.format(v);
@@ -1333,6 +1335,7 @@ function argument(valueParser, options = {}) {
 		};
 		Object.defineProperty(result, "validateValue", {
 			value(v) {
+				if (typeof vp.validate === "function") return wrapForMode(vpMode, wrapParseResult(vp.validate(v)));
 				let stringified;
 				try {
 					stringified = vp.format(v);
@@ -1389,25 +1392,56 @@ function appendCommandPath(exec, name) {
 		commandPath: [...exec.commandPath ?? [], name]
 	};
 }
-function* suggestCommandSync(context, prefix, name, parser, options) {
+function getCommandNames(name, options) {
+	return [
+		name,
+		...getVisibleCommandAliases(options),
+		...getHiddenCommandAliases(options)
+	];
+}
+function getVisibleCommandAliases(options) {
+	const aliases = options.aliases;
+	if (aliases == null) return [];
+	if (!isNonEmptyStringArray(aliases)) throw new TypeError("Command aliases must be a non-empty array of strings.");
+	return aliases;
+}
+function getHiddenCommandAliases(options) {
+	const hiddenAliases = options[hiddenCommandAliasesKey];
+	if (hiddenAliases == null) return [];
+	if (!isNonEmptyStringArray(hiddenAliases)) throw new TypeError("Hidden command aliases must be a non-empty array of strings.");
+	return hiddenAliases;
+}
+function isNonEmptyStringArray(value) {
+	if (!Array.isArray(value) || value.length === 0) return false;
+	for (let i = 0; i < value.length; i++) if (typeof value[i] !== "string") return false;
+	return true;
+}
+function validateUniqueCommandNames(names) {
+	const seen = /* @__PURE__ */ new Set();
+	for (const name of names) {
+		if (seen.has(name)) throw new TypeError(`Command has a duplicate name: "${name}".`);
+		seen.add(name);
+	}
+}
+function* suggestCommandSync(context, prefix, name, aliases, parser, options) {
 	if (isSuggestionHidden(options.hidden)) return;
 	const state = normalizeCommandState(context.state);
 	if (state === void 0) {
-		if (name.startsWith(prefix)) yield {
+		for (const commandName of [name, ...aliases]) if (commandName.startsWith(prefix)) yield {
 			kind: "literal",
-			text: name,
+			text: commandName,
 			...options.description && { description: options.description }
 		};
 	} else if (state[0] === "matched") yield* parser.suggest(withChildContext(context, name, getCommandChildState(context.state, parser.initialState, parser), parser.usage), prefix);
 	else if (state[0] === "parsing") yield* parser.suggest(withChildContext(context, name, getCommandChildState(context.state, state[1], parser), parser.usage), prefix);
 }
-async function* suggestCommandAsync(context, prefix, name, parser, options) {
+async function* suggestCommandAsync(context, prefix, name, aliases, parser, options) {
 	if (isSuggestionHidden(options.hidden)) return;
 	const state = normalizeCommandState(context.state);
 	if (state === void 0) {
-		if (name.startsWith(prefix)) yield {
+		for (const commandName of [name, ...aliases]) if (commandName.startsWith(prefix)) yield {
 			kind: "literal",
-			text: name,
+			text: commandName,
 			...options.description && { description: options.description }
 		};
 	} else if (state[0] === "matched") {
@@ -1435,7 +1469,11 @@ async function* suggestCommandAsync(context, prefix, name, parser, options) {
 *         embedded whitespace, or contains control characters.
 */
 function command(name, parser, options = {}) {
-	validateCommandNames([name], "Command");
+	const commandNames = getCommandNames(name, options);
+	const aliases = getVisibleCommandAliases(options);
+	const hiddenAliases = getHiddenCommandAliases(options);
+	validateCommandNames(commandNames, "Command");
+	validateUniqueCommandNames(commandNames);
 	const isAsync = parser.mode === "async";
 	const syncInnerParser = parser;
 	const asyncInnerParser = parser;
@@ -1448,10 +1486,12 @@ function command(name, parser, options = {}) {
 		usage: [{
 			type: "command",
 			name,
+			...aliases.length > 0 && { aliases },
+			...hiddenAliases.length > 0 && { hiddenAliases },
 			...options.usageLine != null && { usageLine: options.usageLine },
 			...options.hidden != null && { hidden: options.hidden }
 		}, ...parser.usage],
-		leadingNames: new Set([name]),
+		leadingNames: new Set(commandNames),
 		acceptingAnyToken: false,
 		initialState: void 0,
 		canSkip(state, exec) {
@@ -1474,10 +1514,11 @@ function command(name, parser, options = {}) {
 		parse(context) {
 			const state = normalizeCommandState(context.state);
 			if (state === void 0) {
-				if (context.buffer.length < 1 || context.buffer[0] !== name) {
+				if (context.buffer.length < 1 || !commandNames.includes(context.buffer[0])) {
 					const actual = context.buffer.length > 0 ? context.buffer[0] : null;
 					const leadingCmds = extractLeadingCommandNames(context.usage);
-					const suggestions = actual ? findSimilar(actual, leadingCmds, DEFAULT_FIND_SIMILAR_OPTIONS) : [];
+					const rawSuggestions = actual ? findSimilar(actual, leadingCmds, DEFAULT_FIND_SIMILAR_OPTIONS) : [];
+					const suggestions = expandCommandAliasSuggestions(context.usage, rawSuggestions);
 					if (options.errors?.notMatched) {
 						const errorMessage = options.errors.notMatched;
 						return {
@@ -1608,8 +1649,8 @@ function command(name, parser, options = {}) {
 			return wrapForMode(parser.mode, null);
 		},
 		suggest(context, prefix) {
-			if (isAsync) return suggestCommandAsync(context, prefix, name, parser, options);
-			return suggestCommandSync(context, prefix, name, parser, options);
+			if (isAsync) return suggestCommandAsync(context, prefix, name, aliases, parser, options);
+			return suggestCommandSync(context, prefix, name, aliases, parser, options);
 		},
 		getDocFragments(state, defaultValue) {
 			const commandState = state.kind === "available" ? normalizeCommandState(state.state) : void 0;

package/dist/suggestion.cjs

@@ -141,6 +141,73 @@ function createSuggestionMessage(suggestions) {
 	return messageParts;
 }
 /**
+* Expands command alias suggestions so an alias typo can point at both the
+* canonical command and the alias that matched.
+*
+* @param usage Usage terms that define command aliases.
+* @param suggestions Candidate suggestions returned by {@link findSimilar}.
+* @returns Suggestions with alias hits expanded to canonical name + alias.
+* @internal
+*/
+function expandCommandAliasSuggestions(usage, suggestions) {
+	if (suggestions.length === 0) return suggestions;
+	const commandAliasTargets = collectCommandAliasTargets(usage);
+	const expanded = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const suggestion of suggestions) {
+		const targets = commandAliasTargets.get(suggestion) ?? [suggestion];
+		for (const target of targets) {
+			if (seen.has(target)) continue;
+			seen.add(target);
+			expanded.push(target);
+		}
+	}
+	return expanded;
+}
+function collectCommandAliasTargets(usage) {
+	const targets = /* @__PURE__ */ new Map();
+	function traverse(terms) {
+		if (!terms || !Array.isArray(terms)) return true;
+		for (const term of terms) {
+			if (term.type === "option") continue;
+			if (term.type === "argument") return false;
+			if (term.type === "command") {
+				if (require_usage.isSuggestionHidden(term.hidden)) return false;
+				if (!targets.has(term.name)) targets.set(term.name, [term.name]);
+				for (const alias of term.aliases ?? []) if (!targets.has(alias)) targets.set(alias, [term.name, alias]);
+				for (const alias of term.hiddenAliases ?? []) if (!targets.has(alias)) targets.set(alias, [term.name]);
+				return false;
+			}
+			if (term.type === "optional") {
+				traverse(term.terms);
+				continue;
+			}
+			if (term.type === "multiple") {
+				const termsSkippable = traverse(term.terms);
+				if (term.min === 0 || termsSkippable) continue;
+				return false;
+			}
+			if (term.type === "sequence") {
+				if (traverse(term.terms)) continue;
+				return false;
+			}
+			if (term.type === "exclusive") {
+				let anySkippable = false;
+				for (const branch of term.terms) {
+					const branchSkippable = traverse(branch);
+					anySkippable = anySkippable || branchSkippable;
+				}
+				if (anySkippable) continue;
+				return false;
+			}
+			return false;
+		}
+		return true;
+	}
+	traverse(usage);
+	return targets;
+}
+/**
 * Creates an error message with suggestions for similar options or commands.
 *
 * This is a convenience function that combines the functionality of
@@ -175,7 +242,8 @@ function createErrorWithSuggestions(baseError, invalidInput, usage, type = "both
 	if (type === "option" || type === "both") for (const name of require_usage.extractOptionNames(usage)) candidates.add(name);
 	if (type === "command" || type === "both") for (const name of require_usage.extractCommandNames(usage)) candidates.add(name);
 	const suggestions = findSimilar(invalidInput, candidates, DEFAULT_FIND_SIMILAR_OPTIONS);
-	const suggestionMsg = customFormatter ? customFormatter(suggestions) : createSuggestionMessage(suggestions);
+	const displaySuggestions = type === "option" ? suggestions : expandCommandAliasSuggestions(usage, suggestions);
+	const suggestionMsg = customFormatter ? customFormatter(displaySuggestions) : createSuggestionMessage(displaySuggestions);
 	return suggestionMsg.length > 0 ? [
 		...baseError,
 		require_message.text("\n\n"),
@@ -248,4 +316,6 @@ exports.DEFAULT_FIND_SIMILAR_OPTIONS = DEFAULT_FIND_SIMILAR_OPTIONS;
 exports.createErrorWithSuggestions = createErrorWithSuggestions;
 exports.createSuggestionMessage = createSuggestionMessage;
 exports.deduplicateSuggestions = deduplicateSuggestions;
-exports.findSimilar = findSimilar;
+exports.expandCommandAliasSuggestions = expandCommandAliasSuggestions;
+exports.findSimilar = findSimilar;
+exports.levenshteinDistance = levenshteinDistance;