@optique/core 1.4.0-dev.2622 → 1.4.0-dev.2625

package/dist/execution-context.cjs

@@ -1,3 +1,4 @@
+const require_short_option = require('./short-option.cjs');
 
 //#region src/execution-context.ts
 /**
@@ -37,7 +38,7 @@ function withChildContext(context, segment, state, usage) {
 	const exec = withChildExecPath(context.exec, segment);
 	const dependencyRegistry = context.dependencyRegistry ?? exec?.dependencyRegistry;
 	return {
-		...context,
+		...require_short_option.withOptionScopeChild(context, segment),
 		state,
 		...usage != null ? { usage } : {},
 		...exec != null ? {

package/dist/execution-context.js

@@ -1,3 +1,5 @@
+import { withOptionScopeChild } from "./short-option.js";
+
 //#region src/execution-context.ts
 /**
 * Appends a child parser segment to the current execution path.
@@ -36,7 +38,7 @@ function withChildContext(context, segment, state, usage) {
 	const exec = withChildExecPath(context.exec, segment);
 	const dependencyRegistry = context.dependencyRegistry ?? exec?.dependencyRegistry;
 	return {
-		...context,
+		...withOptionScopeChild(context, segment),
 		state,
 		...usage != null ? { usage } : {},
 		...exec != null ? {

package/dist/extension.cjs

@@ -2,6 +2,7 @@ const require_internal_annotations = require('./internal/annotations.cjs');
 const require_mode_dispatch = require('./internal/mode-dispatch.cjs');
 const require_internal_parser = require('./internal/parser.cjs');
 const require_annotation_state = require('./annotation-state.cjs');
+const require_short_option = require('./short-option.cjs');
 const require_phase2_seed = require('./phase2-seed.cjs');
 
 //#region src/extension.ts
@@ -28,6 +29,19 @@ function defineTraits(parser, traits) {
 	});
 }
 /**
+* Preserves a wrapped parser's reachable option names in the same parse path.
+* Call this when a transparent wrapper constructs a fresh parser object instead
+* of copying the inner parser with object spread.
+*
+* @param parser The wrapper parser to annotate.
+* @param innerParser The parser that handles the wrapper's CLI input.
+* @throws {TypeError} If scope metadata cannot be defined on the wrapper.
+* @since 1.4.0
+*/
+function inheritOptionScope$1(parser, innerParser) {
+	require_short_option.inheritOptionScope(parser, innerParser);
+}
+/**
 * Reads the stable extension traits defined on a parser object.
 *
 * @param parser The parser object to inspect.
@@ -80,6 +94,7 @@ exports.dispatchByMode = require_mode_dispatch.dispatchByMode;
 exports.extractPhase2SeedKey = require_phase2_seed.extractPhase2SeedKey;
 exports.getTraits = getTraits;
 exports.inheritAnnotations = require_internal_annotations.inheritAnnotations;
+exports.inheritOptionScope = inheritOptionScope$1;
 exports.injectAnnotations = require_internal_annotations.injectAnnotations;
 exports.isInjectedAnnotationState = require_internal_annotations.isInjectedAnnotationState;
 exports.mapModeValue = require_mode_dispatch.mapModeValue;

package/dist/extension.d.cts

@@ -60,6 +60,17 @@ type ParserSourceMetadata<M extends Mode = Mode, TValue = unknown, TState = unkn
  * @since 1.0.0
  */
 declare function defineTraits(parser: object, traits: ParserTraits): void;
+/**
+ * Preserves a wrapped parser's reachable option names in the same parse path.
+ * Call this when a transparent wrapper constructs a fresh parser object instead
+ * of copying the inner parser with object spread.
+ *
+ * @param parser The wrapper parser to annotate.
+ * @param innerParser The parser that handles the wrapper's CLI input.
+ * @throws {TypeError} If scope metadata cannot be defined on the wrapper.
+ * @since 1.4.0
+ */
+declare function inheritOptionScope(parser: object, innerParser: Parser<Mode, unknown, unknown>): void;
 /**
  * Reads the stable extension traits defined on a parser object.
  *
@@ -95,4 +106,4 @@ declare function delegateSuggestNodes<TInnerState>(innerParser: Parser<Mode, unk
  */
 declare function mapSourceMetadata<M extends Mode, TValue, TState>(parser: Pick<Parser<M, TValue, TState>, "dependencyMetadata">, mapSource: (source: ParserSourceMetadata<M, TValue, TState>) => ParserSourceMetadata<M, TValue, TState>): Parser<M, TValue, TState>["dependencyMetadata"] | undefined;
 //#endregion
-export { ParserSourceMetadata, ParserTraits, SuggestNode, defineTraits, delegateSuggestNodes, dispatchByMode, extractPhase2SeedKey, getTraits, inheritAnnotations, injectAnnotations, isInjectedAnnotationState, mapModeValue, mapSourceMetadata, unwrapInjectedAnnotationState, withAnnotationView, wrapForMode };
+export { ParserSourceMetadata, ParserTraits, SuggestNode, defineTraits, delegateSuggestNodes, dispatchByMode, extractPhase2SeedKey, getTraits, inheritAnnotations, inheritOptionScope, injectAnnotations, isInjectedAnnotationState, mapModeValue, mapSourceMetadata, unwrapInjectedAnnotationState, withAnnotationView, wrapForMode };

package/dist/extension.d.ts

@@ -60,6 +60,17 @@ type ParserSourceMetadata<M extends Mode = Mode, TValue = unknown, TState = unkn
  * @since 1.0.0
  */
 declare function defineTraits(parser: object, traits: ParserTraits): void;
+/**
+ * Preserves a wrapped parser's reachable option names in the same parse path.
+ * Call this when a transparent wrapper constructs a fresh parser object instead
+ * of copying the inner parser with object spread.
+ *
+ * @param parser The wrapper parser to annotate.
+ * @param innerParser The parser that handles the wrapper's CLI input.
+ * @throws {TypeError} If scope metadata cannot be defined on the wrapper.
+ * @since 1.4.0
+ */
+declare function inheritOptionScope(parser: object, innerParser: Parser<Mode, unknown, unknown>): void;
 /**
  * Reads the stable extension traits defined on a parser object.
  *
@@ -95,4 +106,4 @@ declare function delegateSuggestNodes<TInnerState>(innerParser: Parser<Mode, unk
  */
 declare function mapSourceMetadata<M extends Mode, TValue, TState>(parser: Pick<Parser<M, TValue, TState>, "dependencyMetadata">, mapSource: (source: ParserSourceMetadata<M, TValue, TState>) => ParserSourceMetadata<M, TValue, TState>): Parser<M, TValue, TState>["dependencyMetadata"] | undefined;
 //#endregion
-export { ParserSourceMetadata, ParserTraits, SuggestNode, defineTraits, delegateSuggestNodes, dispatchByMode, extractPhase2SeedKey, getTraits, inheritAnnotations, injectAnnotations, isInjectedAnnotationState, mapModeValue, mapSourceMetadata, unwrapInjectedAnnotationState, withAnnotationView, wrapForMode };
+export { ParserSourceMetadata, ParserTraits, SuggestNode, defineTraits, delegateSuggestNodes, dispatchByMode, extractPhase2SeedKey, getTraits, inheritAnnotations, inheritOptionScope, injectAnnotations, isInjectedAnnotationState, mapModeValue, mapSourceMetadata, unwrapInjectedAnnotationState, withAnnotationView, wrapForMode };

package/dist/extension.js

@@ -2,6 +2,7 @@ import { inheritAnnotations, injectAnnotations, isInjectedAnnotationState, unwra
 import { dispatchByMode, mapModeValue, wrapForMode } from "./internal/mode-dispatch.js";
 import { annotationWrapperRequiresSourceBindingKey, composeWrappedSourceMetadata, defineInheritedAnnotationParser, getDelegatingSuggestRuntimeNodes, inheritParentAnnotationsKey, unmatchedNonCliDependencySourceStateMarker } from "./internal/parser.js";
 import { withAnnotationView } from "./annotation-state.js";
+import { inheritOptionScope } from "./short-option.js";
 import { extractPhase2SeedKey } from "./phase2-seed.js";
 
 //#region src/extension.ts
@@ -28,6 +29,19 @@ function defineTraits(parser, traits) {
 	});
 }
 /**
+* Preserves a wrapped parser's reachable option names in the same parse path.
+* Call this when a transparent wrapper constructs a fresh parser object instead
+* of copying the inner parser with object spread.
+*
+* @param parser The wrapper parser to annotate.
+* @param innerParser The parser that handles the wrapper's CLI input.
+* @throws {TypeError} If scope metadata cannot be defined on the wrapper.
+* @since 1.4.0
+*/
+function inheritOptionScope$1(parser, innerParser) {
+	inheritOptionScope(parser, innerParser);
+}
+/**
 * Reads the stable extension traits defined on a parser object.
 *
 * @param parser The parser object to inspect.
@@ -74,4 +88,4 @@ function mapSourceMetadata(parser, mapSource) {
 }
 
 //#endregion
-export { defineTraits, delegateSuggestNodes, dispatchByMode, extractPhase2SeedKey, getTraits, inheritAnnotations, injectAnnotations, isInjectedAnnotationState, mapModeValue, mapSourceMetadata, unwrapInjectedAnnotationState, withAnnotationView, wrapForMode };
+export { defineTraits, delegateSuggestNodes, dispatchByMode, extractPhase2SeedKey, getTraits, inheritAnnotations, inheritOptionScope$1 as inheritOptionScope, injectAnnotations, isInjectedAnnotationState, mapModeValue, mapSourceMetadata, unwrapInjectedAnnotationState, withAnnotationView, wrapForMode };

package/dist/facade.cjs

@@ -12,6 +12,7 @@ const require_dependency_runtime = require('./dependency-runtime.cjs');
 const require_input_trace = require('./input-trace.cjs');
 const require_internal_parser = require('./internal/parser.cjs');
 const require_completion = require('./completion.cjs');
+const require_usage_internals = require('./usage-internals.cjs');
 const require_command_alias = require('./internal/command-alias.cjs');
 const require_phase2_seed = require('./phase2-seed.cjs');
 const require_modifiers = require('./modifiers.cjs');
@@ -750,83 +751,16 @@ function collectActiveValueOptionNames(usage, commandPath, includeDirectAfterCom
 		flag: /* @__PURE__ */ new Set()
 	};
 	if (commandPath.length === 0) {
-		collectRootOptionNames(usage, optionNames, rootLeadingNames);
+		require_usage_internals.collectRootOptionNames(usage, optionNames, rootLeadingNames);
 		return optionNames.value;
-	} else collectActiveOptionNames(usage, commandPath, optionNames, false, includeDirectAfterCommandOptions);
+	} else require_usage_internals.collectActiveOptionNames(usage, commandPath, optionNames, false, includeDirectAfterCommandOptions);
 	const names = new Set(optionNames.value);
 	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 && !require_usage.isSuggestionHidden(helpOptionConfig.hidden)) suggestions.push(...helpOptionNames.map((name) => ({

package/dist/facade.js

@@ -12,6 +12,7 @@ import { collectExplicitSourceValues, collectExplicitSourceValuesAsync, createDe
 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) => ({

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(() => /* @__PURE__ */ new Set());
+	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.