@optique/core 1.4.0-dev.2618 → 1.4.0-dev.2619

package/dist/facade.js

@@ -1,17 +1,18 @@
 import { injectAnnotations } from "./internal/annotations.js";
 import { cacheTerminalTheme, renderTerminalTerm } from "./terminal-internal.js";
 import { measureText, spaceAfterLabel } from "./text-layout.js";
-import { validateCommandNames, validateContextIds, validateLabel, validateMetaNameCollisions, validateOptionNames, validateProgramName } from "./validate.js";
-import { cloneUsage, formatUsage, formatUsageTerm, isSuggestionHidden, normalizeUsage } from "./usage.js";
+import { validateCommandNames, validateContextIds, validateMetaNameCollisions, validateOptionNames, validateProgramName } from "./validate.js";
+import { cloneUsage, formatUsage, isSuggestionHidden, normalizeUsage } from "./usage.js";
 import { hasAutomaticWidth, minimumUsageWidth, withAutomaticWidth } from "./terminal-width.js";
 import { commandLine, lineBreak, message, optionName, text, value } from "./message.js";
 import { renderErrorMessage } from "./message-renderer.js";
-import { formatDocPage, isDocEntryHidden } from "./doc.js";
+import { formatDocPage } from "./doc.js";
 import { dispatchByMode } from "./internal/mode-dispatch.js";
 import { collectExplicitSourceValues, collectExplicitSourceValuesAsync, createDependencyRuntimeContext } from "./dependency-runtime.js";
 import { createInputTrace } from "./input-trace.js";
 import { attemptParseAsync, attemptParseSync, createEffectfulCompletionSession, createParserContext, getDocPage } from "./internal/parser.js";
 import { bash, fish, nu, pwsh, zsh } from "./completion.js";
+import { collectActiveOptionNames, collectRootOptionNames } from "./usage-internals.js";
 import { allowDuplicateLeadingCommandNamesKey, hiddenCommandAliasesKey } from "./internal/command-alias.js";
 import { completeOrExtractPhase2Seed } from "./phase2-seed.js";
 import { multiple, optional, withDefault } from "./modifiers.js";
@@ -757,76 +758,9 @@ function collectActiveValueOptionNames(usage, commandPath, includeDirectAfterCom
 	for (const name of optionNames.flag) names.delete(name);
 	return names;
 }
-function collectRootOptionNames(usage, names, rootLeadingNames) {
-	for (const term of usage) collectRootOptionNamesFromTerm(term, names, rootLeadingNames);
-}
-function collectRootOptionNamesFromTerm(term, names, rootLeadingNames) {
-	switch (term.type) {
-		case "option":
-			for (const name of term.names) {
-				if (!rootLeadingNames.has(name)) continue;
-				if (term.metavar != null) names.value.add(name);
-				else names.flag.add(name);
-			}
-			return;
-		case "optional":
-		case "multiple":
-		case "sequence":
-			collectRootOptionNames(term.terms, names, rootLeadingNames);
-			return;
-		case "exclusive":
-			for (const branch of term.terms) collectRootOptionNames(branch, names, rootLeadingNames);
-			return;
-		case "argument":
-		case "command":
-		case "literal":
-		case "passthrough":
-		case "ellipsis": return;
-	}
-}
-function collectActiveOptionNames(usage, commandPath, names, fromExclusive, includeDirectAfterCommandOptions) {
-	if (commandPath.length === 0) {
-		collectOptionNamesAtCurrentCommandDepth(usage, names, false);
-		return;
-	}
-	const [commandName, ...rest] = commandPath;
-	for (let i = 0; i < usage.length; i++) {
-		const term = usage[i];
-		if (term.type === "command" && term.name === commandName) {
-			const remainingUsage = usage.slice(i + 1);
-			if (rest.length === 0) collectOptionNamesAtCurrentCommandDepth(remainingUsage, names, !fromExclusive && includeDirectAfterCommandOptions);
-			else collectActiveOptionNames(remainingUsage, rest, names, fromExclusive, includeDirectAfterCommandOptions);
-		} else if (term.type === "exclusive") for (const branch of term.terms) collectActiveOptionNames(branch, commandPath, names, true, includeDirectAfterCommandOptions);
-		else if (term.type === "optional" || term.type === "multiple" || term.type === "sequence") collectActiveOptionNames(term.terms, commandPath, names, fromExclusive, includeDirectAfterCommandOptions);
-	}
-}
 function isRootOptionToken(token, rootOptionSuggestions) {
 	return token != null && rootOptionSuggestions.some((suggestion) => token === suggestion.text || token.startsWith(`${suggestion.text}=`));
 }
-function collectOptionNamesAtCurrentCommandDepth(usage, names, afterMatchedCommand) {
-	for (const term of usage) if (collectOptionNamesAtCurrentCommandDepthFromTerm(term, names, afterMatchedCommand)) return;
-}
-function collectOptionNamesAtCurrentCommandDepthFromTerm(term, names, afterMatchedCommand) {
-	switch (term.type) {
-		case "command": return !afterMatchedCommand;
-		case "option":
-			if (term.metavar != null) for (const name of term.names) names.value.add(name);
-			else for (const name of term.names) names.flag.add(name);
-			return false;
-		case "optional":
-		case "multiple":
-		case "sequence":
-			collectOptionNamesAtCurrentCommandDepth(term.terms, names, afterMatchedCommand);
-			return false;
-		case "exclusive":
-			for (const branch of term.terms) collectOptionNamesAtCurrentCommandDepth(branch, names, false);
-			return false;
-		case "argument":
-		case "literal":
-		case "passthrough":
-		case "ellipsis": return false;
-	}
-}
 function getRootMetaOptionSuggestions(helpOptionConfig, helpOptionNames, versionOptionConfig, versionOptionNames) {
 	const suggestions = [];
 	if (helpOptionConfig != null && !isSuggestionHidden(helpOptionConfig.hidden)) suggestions.push(...helpOptionNames.map((name) => ({
@@ -884,7 +818,7 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 		options = optionsParam ?? {};
 	}
 	validateProgramName(programName);
-	const { colors, messageFormatter, theme: requestedTheme, maxWidth: requestedMaxWidth, termWidth, showDefault, showChoices, sectionOrder, helpSections, showUsage, usageLine, commandList = "recursive", aboveError = "usage", onError = () => {
+	const { colors, messageFormatter, theme: requestedTheme, maxWidth: requestedMaxWidth, termWidth, showDefault, showChoices, sectionOrder, showUsage, usageLine, commandList = "recursive", aboveError = "usage", onError = () => {
 		throw new RunParserError("Failed to parse command line arguments.");
 	}, stderr = console.error, stdout = console.log, brief, description, examples, author, bugs, footer } = options;
 	let maxWidth = requestedMaxWidth;
@@ -916,7 +850,6 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 	const onCompletion = options.completion?.onShow ?? (() => ({}));
 	const onCompletionResult = (code) => onCompletion(code);
 	const onErrorResult = (code, error) => onError(code, error);
-	for (const label of [helpSections?.commands, helpSections?.options]) if (label !== void 0) validateLabel(label);
 	if (helpOptionConfig?.names) validateOptionNames(helpOptionConfig.names, "Help option");
 	if (helpCommandConfig?.names) validateCommandNames(helpCommandConfig.names, "Help command");
 	if (versionOptionConfig?.names) validateOptionNames(versionOptionConfig.names, "Version option");
@@ -1089,8 +1022,7 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 							bugs: isTopLevel && !isMetaCommandHelp ? bugs ?? doc.bugs : void 0,
 							footer: shouldOverride ? footer ?? doc.footer : doc.footer ?? footer
 						}, commandList, isTopLevel);
-						const groupedDoc = applyHelpSections(augmentedDoc, helpSections);
-						const renderedDoc = isTopLevel && usageLine != null ? applyUsageLine(groupedDoc, usageLine) : groupedDoc;
+						const renderedDoc = isTopLevel && usageLine != null ? applyUsageLine(augmentedDoc, usageLine) : augmentedDoc;
 						stdout(formatDocPage(programName, renderedDoc, formatOptions({
 							messageFormatter,
 							theme,
@@ -1166,8 +1098,7 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 							footer: footer ?? doc.footer
 						}, commandList, isTopLevel);
 						const defaultRootUsage = typeof usageLine === "function" && (options.help || options.version || options.completion) ? normalizeUsage(getRootHelpGeneratorParser().usage) : augmentedDoc.usage ?? [];
-						const groupedDoc = applyHelpSections(augmentedDoc, helpSections);
-						const renderedDoc = isTopLevel && usageLine != null ? applyUsageLine(groupedDoc, usageLine, defaultRootUsage) : groupedDoc;
+						const renderedDoc = isTopLevel && usageLine != null ? applyUsageLine(augmentedDoc, usageLine, defaultRootUsage) : augmentedDoc;
 						stderr(formatDocPage(programName, renderedDoc, formatOptions({
 							messageFormatter,
 							theme,
@@ -1254,7 +1185,6 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 * @returns The parsed result if successful.
 * @throws {TypeError} If an async parser is passed at runtime.  Use
 * {@link runParser} or {@link runParserAsync} for async parsers.
-* @throws {TypeError} If a `helpSections` label is invalid.
 * @since 0.9.0
 */
 function runParserSync(parser, programName, args, options) {
@@ -1277,7 +1207,6 @@ function runParserSync(parser, programName, args, options) {
 * @param options Configuration options for customizing behavior.
 * @throws {RangeError} If rendering help or errors encounters an invalid theme
 * color, even when colors are disabled.
-* @throws {TypeError} If a `helpSections` label is invalid.
 * @returns A Promise of the parsed result if successful.
 * @since 0.9.0
 */
@@ -1292,66 +1221,6 @@ function applyUsageLine(doc, usageLine, defaultUsageLine = doc.usage ?? []) {
 		usage: normalizeUsage(customUsageLine)
 	};
 }
-/** Prepares the runner's final page without changing parser documentation. */
-function applyHelpSections(doc, labels) {
-	if (labels == null || labels.commands == null && labels.options == null) return doc;
-	const visible = (entry) => !isDocEntryHidden(entry) && formatUsageTerm(entry.term, { context: "doc" }).trim() !== "";
-	if (!doc.sections.some((section) => section.entries.some((entry) => entry.term.type === "command" && visible(entry)))) return doc;
-	const existingTitles = new Set(doc.sections.flatMap((section) => section.title == null ? [] : [section.title]));
-	const additions = /* @__PURE__ */ new Map();
-	const residuals = /* @__PURE__ */ new Map();
-	const newSections = /* @__PURE__ */ new Map();
-	for (const section of doc.sections) {
-		if (section.title != null) continue;
-		const commands = [];
-		const options = [];
-		const remaining = [];
-		for (const entry of section.entries) if (entry.term.type === "command" && labels.commands != null && visible(entry)) commands.push(entry);
-		else if (entry.term.type === "option" && labels.options != null && visible(entry)) options.push(entry);
-		else remaining.push(entry);
-		if (commands.length === 0 && options.length === 0) continue;
-		residuals.set(section, remaining);
-		for (const [label, entries] of [[labels.commands, commands], [labels.options, options]]) {
-			if (label == null || entries.length === 0) continue;
-			const previous = additions.get(label);
-			if (previous != null) previous.push(...entries);
-			else {
-				additions.set(label, entries);
-				if (!existingTitles.has(label)) {
-					const titles = newSections.get(section) ?? [];
-					titles.push(label);
-					newSections.set(section, titles);
-				}
-			}
-		}
-	}
-	if (additions.size === 0) return doc;
-	const sections = [];
-	for (const section of doc.sections) {
-		if (section.title != null) {
-			const entries$1 = additions.get(section.title);
-			sections.push(entries$1 == null ? section : {
-				...section,
-				entries: [...section.entries, ...entries$1]
-			});
-			continue;
-		}
-		for (const title of newSections.get(section) ?? []) sections.push({
-			title,
-			entries: additions.get(title) ?? []
-		});
-		const entries = residuals.get(section);
-		if (entries == null) sections.push(section);
-		else if (entries.length > 0) sections.push({
-			...section,
-			entries
-		});
-	}
-	return {
-		...doc,
-		sections
-	};
-}
 function maybeCollapseCommandList(doc, commandList, isTopLevel) {
 	if (commandList !== "top-level" || !isTopLevel) return doc;
 	return {
@@ -1687,7 +1556,6 @@ async function runWithBody(parser, programName, contexts, args, options) {
 * @param programName Name of the program for help/error output.
 * @param contexts Source contexts to use (priority: earlier overrides later).
 * @param options Run options including args, help, version, etc.
-* @throws {TypeError} If a `helpSections` label is invalid.
 * @throws {RangeError} If rendering help or errors encounters an invalid theme
 * color, even when colors are disabled.
 * @returns Promise that resolves to the parsed result.
@@ -1788,7 +1656,6 @@ function runWithSyncBody(parser, programName, contexts, args, options) {
 * @param programName Name of the program for help/error output.
 * @param contexts Source contexts to use (priority: earlier overrides later).
 * @param options Run options including args, help, version, etc.
-* @throws {TypeError} If a `helpSections` label is invalid.
 * @throws {RangeError} If rendering help or errors encounters an invalid theme
 * color, even when colors are disabled.
 * @returns The parsed result.
@@ -1840,7 +1707,6 @@ function runWithSync(parser, programName, contexts, options) {
 * @param programName Name of the program for help/error output.
 * @param contexts Source contexts to use (priority: earlier overrides later).
 * @param options Run options including args, help, version, etc.
-* @throws {TypeError} If a `helpSections` label is invalid.
 * @throws {RangeError} If rendering help or errors encounters an invalid theme
 * color, even when colors are disabled.
 * @returns Promise that resolves to the parsed result.

package/dist/index.d.cts

@@ -11,6 +11,6 @@ import { DeferredValue, DeferredValueOptions, DeferredValueSource, FluentParser,
 import { ConditionalErrorOptions, ConditionalOptions, DuplicateOptionError, GroupOptions, LongestMatchErrorOptions, LongestMatchOptions, MergeOptions, NoMatchContext, ObjectErrorOptions, ObjectOptions, OrErrorOptions, OrOptions, SeqOptions, TupleOptions, concat, conditional, group, longestMatch, merge, object, or, seq, tuple } from "./constructs.cjs";
 import { ParserValuePlaceholder, SourceContext, SourceContextRequest } from "./context.cjs";
 import { AnyDependencySource, CombineMode, CombinedDependencyMode, DependencyMode, DependencySource, DependencySourceInfo, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, dependency, deriveFrom, deriveFromAsync, deriveFromSync, getDependencySourceInfo, isDependencySource, isDerivedValueParser } from "./internal/dependency.cjs";
-import { CommandListMode, CommandSubConfig, ContextOptionsParam, ExtractRequiredOptions, HelpSectionsOptions, OptionSubConfig, RunOptions, RunParserError, RunWithOptions, SubstituteParserValue, runParser, runParserAsync, runParserSync, runWith, runWithAsync, runWithSync } from "./facade.cjs";
+import { CommandListMode, CommandSubConfig, ContextOptionsParam, ExtractRequiredOptions, OptionSubConfig, RunOptions, RunParserError, RunWithOptions, SubstituteParserValue, runParser, runParserAsync, runParserSync, runWith, runWithAsync, runWithSync } from "./facade.cjs";
 import { ArgumentErrorOptions, ArgumentOptions, CommandErrorOptions, CommandOptions, FlagErrorOptions, FlagOptions, NegatableFlagErrorOptions, NegatableFlagNameList, NegatableFlagNames, NegatableFlagOptions, NegatableFlagState, OptionErrorOptions, OptionOptions, OptionState, PassThroughFormat, PassThroughOptions, argument, command, constant, fail, flag, negatableFlag, option, passThrough } from "./primitives.cjs";
-export { type Annotations, AnyDependencySource, ArgumentErrorOptions, ArgumentOptions, ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CidrOptions, CidrValue, Color, ColorFormat, ColorOptions, CombineMode, CombineModes, CombinedDependencyMode, CommandErrorOptions, CommandListMode, CommandOptions, CommandSubConfig, ConditionalErrorOptions, ConditionalOptions, ContextOptionsParam, CronExpression, CronExpressionForOptions, CronOptions, DeferredMap, DeferredValue, DeferredValueOptions, DeferredValueSource, DependencyMode, DependencySource, DependencySourceInfo, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DetailedParseResult, DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, DocState, DomainOptions, DuplicateOptionError, EffectfulCompletionSession, EmailOptions, ErrorLabelTerm, ExecutionContext, ExecutionPhase, ExtractRequiredOptions, FileSizeOptions, FileSizeOptionsBigInt, FileSizeOptionsNumber, FileSizeUnit, FirstOfOptions, FlagErrorOptions, FlagOptions, FloatOptions, FluentParser, GroupOptions, HelpSectionsOptions, HiddenVisibility, HostnameOptions, InferMode, InferValue, IntegerOptionsBigInt, IntegerOptionsNumber, IpOptions, Ipv4Options, Ipv6Options, Json, JsonOptions, KeyValueOptions, LabelTerm, LocaleOptions, LongestMatchErrorOptions, LongestMatchOptions, MacAddressOptions, MergeOptions, type Message, type MessageFormatOptions, type MessageFormatter, type MessageFormatterOptions, type MessageTerm, Mode, ModeIterable, ModeValue, MultipleErrorOptions, MultipleOptions, NegatableFlagErrorOptions, NegatableFlagNameList, NegatableFlagNames, NegatableFlagOptions, NegatableFlagState, NoMatchContext, NonEmptyString, ObjectErrorOptions, ObjectOptions, OptionErrorOptions, OptionName, OptionOptions, OptionState, OptionSubConfig, OrErrorOptions, OrOptions, OriginOptions, ParseFrame, type ParseOptions, Parser, ParserContext, ParserModifiers, ParserResult, ParserValuePlaceholder, PassThroughFormat, PassThroughOptions, PortOptionsBigInt, PortOptionsNumber, PortRangeOptionsBigInt, PortRangeOptionsNumber, PortRangeValueBigInt, PortRangeValueNumber, ProgramNameTerm, RegExpOptions, Result, RunOptions, RunParserError, RunWithOptions, SemVer, SemVerOptionsObject, SemVerOptionsString, SemVerString, SeqOptions, ShellCompletion, ShowChoicesOptions, ShowDefaultOptions, SocketAddressOptions, SocketAddressValue, SourceContext, SourceContextRequest, StringOptions, SubstituteParserValue, Suggestion, SyntaxPunctuationTerm, TerminalColor, TerminalFormatContext, TerminalFormatter, TerminalFragment, TerminalStyle, TerminalTerm, TerminalTheme, TransformMapping, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, type ValueSetOptions, WithDefaultError, WithDefaultOptions, argument, bash, biject, checkBooleanOption, checkEnumOption, choice, cidr, cloneDocEntry, cloneUsage, cloneUsageTerm, color, command, commandLine, concat, conditional, constant, createMessageFormatter, createParserContext, cron, deduplicateDocEntries, deduplicateDocFragments, defaultTerminalTheme, deferredValue, dependency, deriveFrom, deriveFromAsync, deriveFromSync, domain, email, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractLiteralValues, extractOptionNames, fail, fileSize, firstOf, fish, flag, float, fluent, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getAnnotations, getDependencySourceInfo, getDocPage, getDocPageAsync, getDocPageSync, group, hostname, integer, ip, ipv4, ipv6, isDeferredValue, isDependencySource, isDerivedValueParser, isDocEntryHidden, isDocHidden, isNonEmptyString, isSuggestionHidden, isUsageHidden, isValueParser, json, keyValue, lineBreak, link, locale, longestMatch, macAddress, map, merge, mergeHidden, message, metavar, multiple, negatableFlag, nonEmpty, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, origin, parse, parseAsync, parseDetailed, parseSync, passThrough, port, portRange, pwsh, regExp, runParser, runParserAsync, runParserSync, runWith, runWithAsync, runWithSync, semVer, seq, socketAddress, string, suggest, suggestAsync, suggestSync, text, transform, tuple, url, uuid, value, valueSet, values, withDefault, zsh };
+export { type Annotations, AnyDependencySource, ArgumentErrorOptions, ArgumentOptions, ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CidrOptions, CidrValue, Color, ColorFormat, ColorOptions, CombineMode, CombineModes, CombinedDependencyMode, CommandErrorOptions, CommandListMode, CommandOptions, CommandSubConfig, ConditionalErrorOptions, ConditionalOptions, ContextOptionsParam, CronExpression, CronExpressionForOptions, CronOptions, DeferredMap, DeferredValue, DeferredValueOptions, DeferredValueSource, DependencyMode, DependencySource, DependencySourceInfo, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DetailedParseResult, DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, DocState, DomainOptions, DuplicateOptionError, EffectfulCompletionSession, EmailOptions, ErrorLabelTerm, ExecutionContext, ExecutionPhase, ExtractRequiredOptions, FileSizeOptions, FileSizeOptionsBigInt, FileSizeOptionsNumber, FileSizeUnit, FirstOfOptions, FlagErrorOptions, FlagOptions, FloatOptions, FluentParser, GroupOptions, HiddenVisibility, HostnameOptions, InferMode, InferValue, IntegerOptionsBigInt, IntegerOptionsNumber, IpOptions, Ipv4Options, Ipv6Options, Json, JsonOptions, KeyValueOptions, LabelTerm, LocaleOptions, LongestMatchErrorOptions, LongestMatchOptions, MacAddressOptions, MergeOptions, type Message, type MessageFormatOptions, type MessageFormatter, type MessageFormatterOptions, type MessageTerm, Mode, ModeIterable, ModeValue, MultipleErrorOptions, MultipleOptions, NegatableFlagErrorOptions, NegatableFlagNameList, NegatableFlagNames, NegatableFlagOptions, NegatableFlagState, NoMatchContext, NonEmptyString, ObjectErrorOptions, ObjectOptions, OptionErrorOptions, OptionName, OptionOptions, OptionState, OptionSubConfig, OrErrorOptions, OrOptions, OriginOptions, ParseFrame, type ParseOptions, Parser, ParserContext, ParserModifiers, ParserResult, ParserValuePlaceholder, PassThroughFormat, PassThroughOptions, PortOptionsBigInt, PortOptionsNumber, PortRangeOptionsBigInt, PortRangeOptionsNumber, PortRangeValueBigInt, PortRangeValueNumber, ProgramNameTerm, RegExpOptions, Result, RunOptions, RunParserError, RunWithOptions, SemVer, SemVerOptionsObject, SemVerOptionsString, SemVerString, SeqOptions, ShellCompletion, ShowChoicesOptions, ShowDefaultOptions, SocketAddressOptions, SocketAddressValue, SourceContext, SourceContextRequest, StringOptions, SubstituteParserValue, Suggestion, SyntaxPunctuationTerm, TerminalColor, TerminalFormatContext, TerminalFormatter, TerminalFragment, TerminalStyle, TerminalTerm, TerminalTheme, TransformMapping, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, type ValueSetOptions, WithDefaultError, WithDefaultOptions, argument, bash, biject, checkBooleanOption, checkEnumOption, choice, cidr, cloneDocEntry, cloneUsage, cloneUsageTerm, color, command, commandLine, concat, conditional, constant, createMessageFormatter, createParserContext, cron, deduplicateDocEntries, deduplicateDocFragments, defaultTerminalTheme, deferredValue, dependency, deriveFrom, deriveFromAsync, deriveFromSync, domain, email, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractLiteralValues, extractOptionNames, fail, fileSize, firstOf, fish, flag, float, fluent, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getAnnotations, getDependencySourceInfo, getDocPage, getDocPageAsync, getDocPageSync, group, hostname, integer, ip, ipv4, ipv6, isDeferredValue, isDependencySource, isDerivedValueParser, isDocEntryHidden, isDocHidden, isNonEmptyString, isSuggestionHidden, isUsageHidden, isValueParser, json, keyValue, lineBreak, link, locale, longestMatch, macAddress, map, merge, mergeHidden, message, metavar, multiple, negatableFlag, nonEmpty, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, origin, parse, parseAsync, parseDetailed, parseSync, passThrough, port, portRange, pwsh, regExp, runParser, runParserAsync, runParserSync, runWith, runWithAsync, runWithSync, semVer, seq, socketAddress, string, suggest, suggestAsync, suggestSync, text, transform, tuple, url, uuid, value, valueSet, values, withDefault, zsh };

package/dist/index.d.ts

@@ -11,6 +11,6 @@ import { DeferredValue, DeferredValueOptions, DeferredValueSource, FluentParser,
 import { ConditionalErrorOptions, ConditionalOptions, DuplicateOptionError, GroupOptions, LongestMatchErrorOptions, LongestMatchOptions, MergeOptions, NoMatchContext, ObjectErrorOptions, ObjectOptions, OrErrorOptions, OrOptions, SeqOptions, TupleOptions, concat, conditional, group, longestMatch, merge, object, or, seq, tuple } from "./constructs.js";
 import { ParserValuePlaceholder, SourceContext, SourceContextRequest } from "./context.js";
 import { AnyDependencySource, CombineMode, CombinedDependencyMode, DependencyMode, DependencySource, DependencySourceInfo, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, dependency, deriveFrom, deriveFromAsync, deriveFromSync, getDependencySourceInfo, isDependencySource, isDerivedValueParser } from "./internal/dependency.js";
-import { CommandListMode, CommandSubConfig, ContextOptionsParam, ExtractRequiredOptions, HelpSectionsOptions, OptionSubConfig, RunOptions, RunParserError, RunWithOptions, SubstituteParserValue, runParser, runParserAsync, runParserSync, runWith, runWithAsync, runWithSync } from "./facade.js";
+import { CommandListMode, CommandSubConfig, ContextOptionsParam, ExtractRequiredOptions, OptionSubConfig, RunOptions, RunParserError, RunWithOptions, SubstituteParserValue, runParser, runParserAsync, runParserSync, runWith, runWithAsync, runWithSync } from "./facade.js";
 import { ArgumentErrorOptions, ArgumentOptions, CommandErrorOptions, CommandOptions, FlagErrorOptions, FlagOptions, NegatableFlagErrorOptions, NegatableFlagNameList, NegatableFlagNames, NegatableFlagOptions, NegatableFlagState, OptionErrorOptions, OptionOptions, OptionState, PassThroughFormat, PassThroughOptions, argument, command, constant, fail, flag, negatableFlag, option, passThrough } from "./primitives.js";
-export { type Annotations, AnyDependencySource, ArgumentErrorOptions, ArgumentOptions, ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CidrOptions, CidrValue, Color, ColorFormat, ColorOptions, CombineMode, CombineModes, CombinedDependencyMode, CommandErrorOptions, CommandListMode, CommandOptions, CommandSubConfig, ConditionalErrorOptions, ConditionalOptions, ContextOptionsParam, CronExpression, CronExpressionForOptions, CronOptions, DeferredMap, DeferredValue, DeferredValueOptions, DeferredValueSource, DependencyMode, DependencySource, DependencySourceInfo, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DetailedParseResult, DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, DocState, DomainOptions, DuplicateOptionError, EffectfulCompletionSession, EmailOptions, ErrorLabelTerm, ExecutionContext, ExecutionPhase, ExtractRequiredOptions, FileSizeOptions, FileSizeOptionsBigInt, FileSizeOptionsNumber, FileSizeUnit, FirstOfOptions, FlagErrorOptions, FlagOptions, FloatOptions, FluentParser, GroupOptions, HelpSectionsOptions, HiddenVisibility, HostnameOptions, InferMode, InferValue, IntegerOptionsBigInt, IntegerOptionsNumber, IpOptions, Ipv4Options, Ipv6Options, Json, JsonOptions, KeyValueOptions, LabelTerm, LocaleOptions, LongestMatchErrorOptions, LongestMatchOptions, MacAddressOptions, MergeOptions, type Message, type MessageFormatOptions, type MessageFormatter, type MessageFormatterOptions, type MessageTerm, Mode, ModeIterable, ModeValue, MultipleErrorOptions, MultipleOptions, NegatableFlagErrorOptions, NegatableFlagNameList, NegatableFlagNames, NegatableFlagOptions, NegatableFlagState, NoMatchContext, NonEmptyString, ObjectErrorOptions, ObjectOptions, OptionErrorOptions, OptionName, OptionOptions, OptionState, OptionSubConfig, OrErrorOptions, OrOptions, OriginOptions, ParseFrame, type ParseOptions, Parser, ParserContext, ParserModifiers, ParserResult, ParserValuePlaceholder, PassThroughFormat, PassThroughOptions, PortOptionsBigInt, PortOptionsNumber, PortRangeOptionsBigInt, PortRangeOptionsNumber, PortRangeValueBigInt, PortRangeValueNumber, ProgramNameTerm, RegExpOptions, Result, RunOptions, RunParserError, RunWithOptions, SemVer, SemVerOptionsObject, SemVerOptionsString, SemVerString, SeqOptions, ShellCompletion, ShowChoicesOptions, ShowDefaultOptions, SocketAddressOptions, SocketAddressValue, SourceContext, SourceContextRequest, StringOptions, SubstituteParserValue, Suggestion, SyntaxPunctuationTerm, TerminalColor, TerminalFormatContext, TerminalFormatter, TerminalFragment, TerminalStyle, TerminalTerm, TerminalTheme, TransformMapping, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, type ValueSetOptions, WithDefaultError, WithDefaultOptions, argument, bash, biject, checkBooleanOption, checkEnumOption, choice, cidr, cloneDocEntry, cloneUsage, cloneUsageTerm, color, command, commandLine, concat, conditional, constant, createMessageFormatter, createParserContext, cron, deduplicateDocEntries, deduplicateDocFragments, defaultTerminalTheme, deferredValue, dependency, deriveFrom, deriveFromAsync, deriveFromSync, domain, email, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractLiteralValues, extractOptionNames, fail, fileSize, firstOf, fish, flag, float, fluent, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getAnnotations, getDependencySourceInfo, getDocPage, getDocPageAsync, getDocPageSync, group, hostname, integer, ip, ipv4, ipv6, isDeferredValue, isDependencySource, isDerivedValueParser, isDocEntryHidden, isDocHidden, isNonEmptyString, isSuggestionHidden, isUsageHidden, isValueParser, json, keyValue, lineBreak, link, locale, longestMatch, macAddress, map, merge, mergeHidden, message, metavar, multiple, negatableFlag, nonEmpty, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, origin, parse, parseAsync, parseDetailed, parseSync, passThrough, port, portRange, pwsh, regExp, runParser, runParserAsync, runParserSync, runWith, runWithAsync, runWithSync, semVer, seq, socketAddress, string, suggest, suggestAsync, suggestSync, text, transform, tuple, url, uuid, value, valueSet, values, withDefault, zsh };
+export { type Annotations, AnyDependencySource, ArgumentErrorOptions, ArgumentOptions, ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CidrOptions, CidrValue, Color, ColorFormat, ColorOptions, CombineMode, CombineModes, CombinedDependencyMode, CommandErrorOptions, CommandListMode, CommandOptions, CommandSubConfig, ConditionalErrorOptions, ConditionalOptions, ContextOptionsParam, CronExpression, CronExpressionForOptions, CronOptions, DeferredMap, DeferredValue, DeferredValueOptions, DeferredValueSource, DependencyMode, DependencySource, DependencySourceInfo, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DetailedParseResult, DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, DocState, DomainOptions, DuplicateOptionError, EffectfulCompletionSession, EmailOptions, ErrorLabelTerm, ExecutionContext, ExecutionPhase, ExtractRequiredOptions, FileSizeOptions, FileSizeOptionsBigInt, FileSizeOptionsNumber, FileSizeUnit, FirstOfOptions, FlagErrorOptions, FlagOptions, FloatOptions, FluentParser, GroupOptions, HiddenVisibility, HostnameOptions, InferMode, InferValue, IntegerOptionsBigInt, IntegerOptionsNumber, IpOptions, Ipv4Options, Ipv6Options, Json, JsonOptions, KeyValueOptions, LabelTerm, LocaleOptions, LongestMatchErrorOptions, LongestMatchOptions, MacAddressOptions, MergeOptions, type Message, type MessageFormatOptions, type MessageFormatter, type MessageFormatterOptions, type MessageTerm, Mode, ModeIterable, ModeValue, MultipleErrorOptions, MultipleOptions, NegatableFlagErrorOptions, NegatableFlagNameList, NegatableFlagNames, NegatableFlagOptions, NegatableFlagState, NoMatchContext, NonEmptyString, ObjectErrorOptions, ObjectOptions, OptionErrorOptions, OptionName, OptionOptions, OptionState, OptionSubConfig, OrErrorOptions, OrOptions, OriginOptions, ParseFrame, type ParseOptions, Parser, ParserContext, ParserModifiers, ParserResult, ParserValuePlaceholder, PassThroughFormat, PassThroughOptions, PortOptionsBigInt, PortOptionsNumber, PortRangeOptionsBigInt, PortRangeOptionsNumber, PortRangeValueBigInt, PortRangeValueNumber, ProgramNameTerm, RegExpOptions, Result, RunOptions, RunParserError, RunWithOptions, SemVer, SemVerOptionsObject, SemVerOptionsString, SemVerString, SeqOptions, ShellCompletion, ShowChoicesOptions, ShowDefaultOptions, SocketAddressOptions, SocketAddressValue, SourceContext, SourceContextRequest, StringOptions, SubstituteParserValue, Suggestion, SyntaxPunctuationTerm, TerminalColor, TerminalFormatContext, TerminalFormatter, TerminalFragment, TerminalStyle, TerminalTerm, TerminalTheme, TransformMapping, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, type ValueSetOptions, WithDefaultError, WithDefaultOptions, argument, bash, biject, checkBooleanOption, checkEnumOption, choice, cidr, cloneDocEntry, cloneUsage, cloneUsageTerm, color, command, commandLine, concat, conditional, constant, createMessageFormatter, createParserContext, cron, deduplicateDocEntries, deduplicateDocFragments, defaultTerminalTheme, deferredValue, dependency, deriveFrom, deriveFromAsync, deriveFromSync, domain, email, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractLiteralValues, extractOptionNames, fail, fileSize, firstOf, fish, flag, float, fluent, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getAnnotations, getDependencySourceInfo, getDocPage, getDocPageAsync, getDocPageSync, group, hostname, integer, ip, ipv4, ipv6, isDeferredValue, isDependencySource, isDerivedValueParser, isDocEntryHidden, isDocHidden, isNonEmptyString, isSuggestionHidden, isUsageHidden, isValueParser, json, keyValue, lineBreak, link, locale, longestMatch, macAddress, map, merge, mergeHidden, message, metavar, multiple, negatableFlag, nonEmpty, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, origin, parse, parseAsync, parseDetailed, parseSync, passThrough, port, portRange, pwsh, regExp, runParser, runParserAsync, runParserSync, runWith, runWithAsync, runWithSync, semVer, seq, socketAddress, string, suggest, suggestAsync, suggestSync, text, transform, tuple, url, uuid, value, valueSet, values, withDefault, zsh };

package/dist/modifiers.cjs

@@ -5,6 +5,7 @@ const require_dependency_runtime = require('./dependency-runtime.cjs');
 const require_internal_parser = require('./internal/parser.cjs');
 const require_annotation_state = require('./annotation-state.cjs');
 const require_execution_context = require('./execution-context.cjs');
+const require_short_option = require('./short-option.cjs');
 const require_phase2_seed = require('./phase2-seed.cjs');
 const require_dependency_metadata = require('./dependency-metadata.cjs');
 
@@ -478,7 +479,7 @@ function optional(parser) {
 	require_internal_parser.defineParseLanes(optionalParser, adaptOptionalStyleParseLanes(parser));
 	require_internal_parser.defineInheritedAnnotationParser(optionalParser);
 	require_internal_parser.defineSourceBindingOnlyAnnotationCompletionParser(optionalParser);
-	return fluent(optionalParser);
+	return fluent(require_short_option.scopeParser(optionalParser, require_short_option.combinedOptionScope([parser])));
 }
 /**
 * Error type for structured error messages in {@link withDefault} default value callbacks.
@@ -729,7 +730,7 @@ function withDefault(parser, defaultValue, options) {
 	require_internal_parser.defineParseLanes(withDefaultParser, adaptOptionalStyleParseLanes(parser));
 	require_internal_parser.defineInheritedAnnotationParser(withDefaultParser);
 	require_internal_parser.defineSourceBindingOnlyAnnotationCompletionParser(withDefaultParser);
-	return fluent(withDefaultParser);
+	return fluent(require_short_option.scopeParser(withDefaultParser, require_short_option.combinedOptionScope([parser])));
 }
 /**
 * Creates a parser that transforms the result value of another parser using
@@ -1714,7 +1715,7 @@ function multiple(parser, options = {}) {
 			enumerable: false
 		});
 	}
-	return fluent(resultParser);
+	return fluent(require_short_option.scopeParser(resultParser, require_short_option.repeatedOptionScope(parser)));
 }
 /**
 * Creates a parser that requires the wrapped parser to consume at least one
@@ -1850,7 +1851,7 @@ function nonEmpty(parser) {
 		enumerable: false
 	});
 	require_dependency_runtime.defineForwardedEffectfulSchedulingNodes(nonEmptyParser, parser);
-	return fluent(nonEmptyParser);
+	return fluent(require_short_option.scopeParser(nonEmptyParser, require_short_option.combinedOptionScope([parser])));
 }
 const fluentParserMarker = Symbol.for("@optique/core/fluent");
 /**

package/dist/modifiers.js

@@ -5,6 +5,7 @@ import { defineForwardedEffectfulSchedulingNodes } from "./dependency-runtime.js
 import { defineInheritedAnnotationParser, defineParseLanes, defineSourceBindingOnlyAnnotationCompletionParser, getOwnParseLanes, unmatchedNonCliDependencySourceStateMarker } from "./internal/parser.js";
 import { getDelegatedAnnotationState, hasDelegatedAnnotationCarrier, isAnnotationWrappedInitialState, normalizeDelegatedAnnotationState, normalizeNestedDelegatedAnnotationState } from "./annotation-state.js";
 import { mergeChildExec, withChildContext, withChildExecPath } from "./execution-context.js";
+import { combinedOptionScope, repeatedOptionScope, scopeParser } from "./short-option.js";
 import { completeOrExtractPhase2Seed, extractPhase2Seed, extractPhase2SeedKey, phase2SeedFromValueResult } from "./phase2-seed.js";
 import { composeDependencyMetadata } from "./dependency-metadata.js";
 
@@ -478,7 +479,7 @@ function optional(parser) {
 	defineParseLanes(optionalParser, adaptOptionalStyleParseLanes(parser));
 	defineInheritedAnnotationParser(optionalParser);
 	defineSourceBindingOnlyAnnotationCompletionParser(optionalParser);
-	return fluent(optionalParser);
+	return fluent(scopeParser(optionalParser, combinedOptionScope([parser])));
 }
 /**
 * Error type for structured error messages in {@link withDefault} default value callbacks.
@@ -729,7 +730,7 @@ function withDefault(parser, defaultValue, options) {
 	defineParseLanes(withDefaultParser, adaptOptionalStyleParseLanes(parser));
 	defineInheritedAnnotationParser(withDefaultParser);
 	defineSourceBindingOnlyAnnotationCompletionParser(withDefaultParser);
-	return fluent(withDefaultParser);
+	return fluent(scopeParser(withDefaultParser, combinedOptionScope([parser])));
 }
 /**
 * Creates a parser that transforms the result value of another parser using
@@ -1714,7 +1715,7 @@ function multiple(parser, options = {}) {
 			enumerable: false
 		});
 	}
-	return fluent(resultParser);
+	return fluent(scopeParser(resultParser, repeatedOptionScope(parser)));
 }
 /**
 * Creates a parser that requires the wrapped parser to consume at least one
@@ -1850,7 +1851,7 @@ function nonEmpty(parser) {
 		enumerable: false
 	});
 	defineForwardedEffectfulSchedulingNodes(nonEmptyParser, parser);
-	return fluent(nonEmptyParser);
+	return fluent(scopeParser(nonEmptyParser, combinedOptionScope([parser])));
 }
 const fluentParserMarker = Symbol.for("@optique/core/fluent");
 /**

package/dist/primitives.cjs

@@ -6,13 +6,14 @@ const require_mode_dispatch = require('./internal/mode-dispatch.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_usage_internals = require('./usage-internals.cjs');
+const require_short_option = require('./short-option.cjs');
+const require_command_alias = require('./internal/command-alias.cjs');
 const require_phase2_seed = require('./phase2-seed.cjs');
 const require_dependency_metadata = require('./dependency-metadata.cjs');
 const require_modifiers = require('./modifiers.cjs');
 const require_suggestion = require('./suggestion.cjs');
-const require_usage_internals = require('./usage-internals.cjs');
 const require_valueparser = require('./valueparser.cjs');
 
 //#region src/primitives.ts
@@ -256,11 +257,25 @@ function* getSuggestionsWithDependency(valueParser, prefix, dependencyRegistry,
 */
 function* suggestOptionSync(optionNames$1, valueParser, hidden, description, context, prefix) {
 	if (hidden) return;
+	if (context.optionsTerminated) return;
+	const waitingForValue = context.buffer.length > 0 && optionNames$1.includes(context.buffer[context.buffer.length - 1]);
+	if (valueParser != null && !waitingForValue && !isTerminalValueState(context.state)) {
+		const attached = require_short_option.attachedValuePrefix(context, prefix, optionNames$1);
+		if (attached != null) {
+			if (attached.value.length === 0 && optionNames$1.includes(prefix)) yield {
+				kind: "literal",
+				text: prefix,
+				...description != null ? { description } : {}
+			};
+			if (valueParser.suggest != null) for (const suggestion of getSuggestionsWithDependency(valueParser, attached.value, context.dependencyRegistry, context.exec)) yield require_short_option.prefixSuggestion(attached.head, suggestion);
+			return;
+		}
+	}
 	const equalsIndex = prefix.indexOf("=");
-	if (equalsIndex >= 0) {
+	if (equalsIndex >= 0 && !waitingForValue) {
 		const optionPart = prefix.slice(0, equalsIndex);
 		const valuePart = prefix.slice(equalsIndex + 1);
-		if (optionNames$1.includes(optionPart)) {
+		if (optionNames$1.includes(optionPart) && !/^-[^-]$/u.test(optionPart)) {
 			if (valueParser && valueParser.suggest) {
 				const valueSuggestions = getSuggestionsWithDependency(valueParser, valuePart, context.dependencyRegistry, context.exec);
 				for (const suggestion of valueSuggestions) if (suggestion.kind === "literal") yield {
@@ -279,7 +294,7 @@ function* suggestOptionSync(optionNames$1, valueParser, hidden, description, con
 		const expectingValue = context.buffer.length > 0 && optionNames$1.includes(context.buffer[context.buffer.length - 1]);
 		if (!expectingValue && (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/") || prefix.startsWith("+"))) {
 			for (const optionName$1 of optionNames$1) if (optionName$1.startsWith(prefix)) {
-				if (prefix === "-" && optionName$1.length !== 2) continue;
+				if (prefix === "-" && !/^-[^-]$/u.test(optionName$1)) continue;
 				yield {
 					kind: "literal",
 					text: optionName$1,
@@ -341,11 +356,25 @@ async function* getSuggestionsWithDependencyAsync(valueParser, prefix, dependenc
 */
 async function* suggestOptionAsync(optionNames$1, valueParser, hidden, description, context, prefix) {
 	if (hidden) return;
+	if (context.optionsTerminated) return;
+	const waitingForValue = context.buffer.length > 0 && optionNames$1.includes(context.buffer[context.buffer.length - 1]);
+	if (valueParser != null && !waitingForValue && !isTerminalValueState(context.state)) {
+		const attached = require_short_option.attachedValuePrefix(context, prefix, optionNames$1);
+		if (attached != null) {
+			if (attached.value.length === 0 && optionNames$1.includes(prefix)) yield {
+				kind: "literal",
+				text: prefix,
+				...description != null ? { description } : {}
+			};
+			if (valueParser.suggest != null) for await (const suggestion of getSuggestionsWithDependencyAsync(valueParser, attached.value, context.dependencyRegistry, context.exec)) yield require_short_option.prefixSuggestion(attached.head, suggestion);
+			return;
+		}
+	}
 	const equalsIndex = prefix.indexOf("=");
-	if (equalsIndex >= 0) {
+	if (equalsIndex >= 0 && !waitingForValue) {
 		const optionPart = prefix.slice(0, equalsIndex);
 		const valuePart = prefix.slice(equalsIndex + 1);
-		if (optionNames$1.includes(optionPart)) {
+		if (optionNames$1.includes(optionPart) && !/^-[^-]$/u.test(optionPart)) {
 			if (valueParser && valueParser.suggest) {
 				const valueSuggestions = getSuggestionsWithDependencyAsync(valueParser, valuePart, context.dependencyRegistry, context.exec);
 				for await (const suggestion of valueSuggestions) if (suggestion.kind === "literal") yield {
@@ -364,7 +393,7 @@ async function* suggestOptionAsync(optionNames$1, valueParser, hidden, descripti
 		const expectingValue = context.buffer.length > 0 && optionNames$1.includes(context.buffer[context.buffer.length - 1]);
 		if (!expectingValue && (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/") || prefix.startsWith("+"))) {
 			for (const optionName$1 of optionNames$1) if (optionName$1.startsWith(prefix)) {
-				if (prefix === "-" && optionName$1.length !== 2) continue;
+				if (prefix === "-" && !/^-[^-]$/u.test(optionName$1)) continue;
 				yield {
 					kind: "literal",
 					text: optionName$1,
@@ -524,10 +553,18 @@ function option(...args) {
 					};
 				});
 			}
-			const prefixes = optionNames$1.filter((name) => name.startsWith("--") || name.startsWith("/") || name.startsWith("-") && name.length > 2).map((name) => name.startsWith("/") ? `${name}:` : `${name}=`);
-			for (const prefix of prefixes) {
+			const prefixes = optionNames$1.filter((name) => name.startsWith("--") || name.startsWith("/") || name.startsWith("-") && name.length > 2 && !/^-[^-]$/u.test(name)).map((name) => ({
+				optionName: name,
+				prefix: name.startsWith("/") ? `${name}:` : `${name}=`
+			}));
+			if (valueParser != null && optionNames$1.some((name) => /^-[^-]$/u.test(name) && context.buffer[0].startsWith(name)) && !require_short_option.fullNameOwnsToken(context, context.buffer[0])) {
+				for (const name of optionNames$1) if (/^-[^-]$/u.test(name)) prefixes.push({
+					optionName: name,
+					prefix: name
+				});
+			}
+			for (const { prefix, optionName: optionName$1 } of prefixes) {
 				if (!context.buffer[0].startsWith(prefix)) continue;
-				const optionName$1 = prefix.slice(0, -1);
 				if (hasParsedOptionValue(context.state, valueParser)) return {
 					success: false,
 					consumed: 1,
@@ -566,9 +603,9 @@ function option(...args) {
 				});
 			}
 			if (valueParser == null) {
-				const shortOptions = optionNames$1.filter((name) => name.match(/^-[^-]$/));
+				const shortOptions = optionNames$1.filter((name) => name.match(/^-[^-]$/u));
 				for (const shortOption of shortOptions) {
-					if (!context.buffer[0].startsWith(shortOption)) continue;
+					if (!context.buffer[0].startsWith(shortOption) || require_short_option.fullNameOwnsToken(context, context.buffer[0])) continue;
 					if (hasParsedOptionValue(context.state, valueParser)) return {
 						success: false,
 						consumed: 1,
@@ -582,9 +619,9 @@ function option(...args) {
 								success: true,
 								value: true
 							},
-							buffer: [`-${context.buffer[0].slice(2)}`, ...context.buffer.slice(1)]
+							buffer: [`-${context.buffer[0].slice(shortOption.length)}`, ...context.buffer.slice(1)]
 						},
-						consumed: [context.buffer[0].slice(0, 2)]
+						consumed: [context.buffer[0].slice(0, shortOption.length)]
 					};
 				}
 			}
@@ -846,7 +883,7 @@ function flag(...args) {
 					consumed: context.buffer.slice(0, 1)
 				};
 			}
-			const prefixes = optionNames$1.filter((name) => name.startsWith("--") || name.startsWith("/") || name.startsWith("-") && name.length > 2).map((name) => name.startsWith("/") ? `${name}:` : `${name}=`);
+			const prefixes = optionNames$1.filter((name) => name.startsWith("--") || name.startsWith("/") || name.startsWith("-") && name.length > 2 && !/^-[^-]$/u.test(name)).map((name) => name.startsWith("/") ? `${name}:` : `${name}=`);
 			for (const prefix of prefixes) if (context.buffer[0].startsWith(prefix)) {
 				const value = context.buffer[0].slice(prefix.length);
 				return {
@@ -855,9 +892,9 @@ function flag(...args) {
 					error: require_message.message`Flag ${require_message.optionName(prefix.slice(0, -1))} does not accept a value, but got: ${value}.`
 				};
 			}
-			const shortOptions = optionNames$1.filter((name) => name.match(/^-[^-]$/));
+			const shortOptions = optionNames$1.filter((name) => name.match(/^-[^-]$/u));
 			for (const shortOption of shortOptions) {
-				if (!context.buffer[0].startsWith(shortOption)) continue;
+				if (!context.buffer[0].startsWith(shortOption) || require_short_option.fullNameOwnsToken(context, context.buffer[0])) continue;
 				if (context.state?.success) return {
 					success: false,
 					consumed: 1,
@@ -871,9 +908,9 @@ function flag(...args) {
 							success: true,
 							value: true
 						},
-						buffer: [`-${context.buffer[0].slice(2)}`, ...context.buffer.slice(1)]
+						buffer: [`-${context.buffer[0].slice(shortOption.length)}`, ...context.buffer.slice(1)]
 					},
-					consumed: [context.buffer[0].slice(0, 2)]
+					consumed: [context.buffer[0].slice(0, shortOption.length)]
 				};
 			}
 			const invalidOption = context.buffer[0];
@@ -914,7 +951,7 @@ function flag(...args) {
 			const suggestions = [];
 			if (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/") || prefix.startsWith("+")) {
 				for (const optionName$1 of optionNames$1) if (optionName$1.startsWith(prefix)) {
-					if (prefix === "-" && optionName$1.length !== 2) continue;
+					if (prefix === "-" && !/^-[^-]$/u.test(optionName$1)) continue;
 					suggestions.push({
 						kind: "literal",
 						text: optionName$1,
@@ -1065,7 +1102,7 @@ function negatableFlag(names, options = {}) {
 			const directValue = valueByName.get(context.buffer[0]);
 			if (directValue != null) return parseMatchedNegatableFlag(context, context.buffer[0], directValue, context.buffer.slice(0, 1), 1, context.buffer.slice(1), options);
 			for (const name of optionNames$1) {
-				if (!name.startsWith("--") && !name.startsWith("/") && !name.startsWith("+") && !(name.startsWith("-") && name.length > 2)) continue;
+				if (!name.startsWith("--") && !name.startsWith("/") && !name.startsWith("+") && !(name.startsWith("-") && name.length > 2 && !/^-[^-]$/u.test(name))) continue;
 				const prefix = name.startsWith("/") ? `${name}:` : `${name}=`;
 				if (context.buffer[0].startsWith(prefix)) {
 					const value = context.buffer[0].slice(prefix.length);
@@ -1077,9 +1114,9 @@ function negatableFlag(names, options = {}) {
 				}
 			}
 			for (const shortOption of optionNames$1) {
-				if (!shortOption.match(/^-[^-]$/)) continue;
-				if (!context.buffer[0].startsWith(shortOption)) continue;
-				return parseMatchedNegatableFlag(context, shortOption, valueByName.get(shortOption), [context.buffer[0].slice(0, 2)], 1, [`-${context.buffer[0].slice(2)}`, ...context.buffer.slice(1)], options);
+				if (!shortOption.match(/^-[^-]$/u)) continue;
+				if (!context.buffer[0].startsWith(shortOption) || require_short_option.fullNameOwnsToken(context, context.buffer[0])) continue;
+				return parseMatchedNegatableFlag(context, shortOption, valueByName.get(shortOption), [context.buffer[0].slice(0, shortOption.length)], 1, [`-${context.buffer[0].slice(shortOption.length)}`, ...context.buffer.slice(1)], options);
 			}
 			const invalidOption = context.buffer[0];
 			if (options.errors?.noMatch) {
@@ -1114,7 +1151,7 @@ function negatableFlag(names, options = {}) {
 			const suggestions = [];
 			if (prefix.startsWith("--") || prefix.startsWith("-") || prefix.startsWith("/") || prefix.startsWith("+")) {
 				for (const optionName$1 of optionNames$1) if (optionName$1.startsWith(prefix)) {
-					if (prefix === "-" && optionName$1.length !== 2) continue;
+					if (prefix === "-" && !/^-[^-]$/u.test(optionName$1)) continue;
 					suggestions.push({
 						kind: "literal",
 						text: optionName$1
@@ -1487,6 +1524,8 @@ function command(name, parser, options = {}) {
 	const isAsync = parser.mode === "async";
 	const syncInnerParser = parser;
 	const asyncInnerParser = parser;
+	const commandScope = require_short_option.selectableOptionScope(() => new Set(commandNames));
+	const enteredScope = require_short_option.combinedOptionScope([parser], [name]);
 	const result = {
 		[Symbol.for("@optique/core/commandParser")]: true,
 		mode: parser.mode,
@@ -1554,6 +1593,7 @@ function command(name, parser, options = {}) {
 						] : baseError
 					};
 				}
+				commandScope.select(context, enteredScope);
 				return {
 					success: true,
 					next: {
@@ -1734,7 +1774,9 @@ function command(name, parser, options = {}) {
 		configurable: true,
 		enumerable: false
 	});
-	return require_modifiers.fluent(result);
+	return require_modifiers.fluent(require_short_option.scopeParser(result, commandScope.source, (context) => {
+		if (normalizeCommandState(context.state) != null) commandScope.select(context, enteredScope);
+	}));
 }
 /**
 * Creates a parser that collects unrecognized options and passes them through.