@optique/core 1.4.0-dev.2607 → 1.4.0-dev.2611

package/dist/facade.cjs

@@ -12,7 +12,6 @@ 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');
@@ -518,7 +517,7 @@ function classifyParseFailure(failure, helpOptionNames, helpCommandNames, versio
 * Handles shell completion requests.
 * @since 0.6.0
 */
-function handleCompletion(completionArgs, programName, parser, completionParser, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, termWidth, completionCommandDisplayName, completionOptionDisplayName, isOptionMode, sectionOrder, showUsage, rootOptionSuggestions = [], messageFormatter, theme, automaticWidth = false) {
+function handleCompletion(completionArgs, programName, parser, completionParser, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, termWidth, completionCommandDisplayName, completionOptionDisplayName, isOptionMode, sectionOrder, showUsage, rootOptionSuggestions = [], messageFormatter, theme, automaticWidth = false, errors) {
 	const errorOptions = (format) => automaticWidth ? require_terminal_width.withAutomaticWidth(format, (width) => {
 		maxWidth = width;
 	}) : format;
@@ -527,7 +526,7 @@ function handleCompletion(completionArgs, programName, parser, completionParser,
 	const callOnError = (code, error) => onError(code, error);
 	const callOnCompletion = (code) => onCompletion(code);
 	if (!shellName) {
-		const error = require_message.message`Missing shell name for completion.`;
+		const error = errors?.missingShell ?? require_message.message`Missing shell name for completion.`;
 		const writeError = () => stderr(require_message_renderer.renderErrorMessage(error, errorOptions({
 			messageFormatter,
 			theme,
@@ -562,14 +561,15 @@ function handleCompletion(completionArgs, programName, parser, completionParser,
 			return result;
 		}, async () => callOnError(1, error));
 	}
-	const shell = availableShells[shellName];
+	const shell = Object.hasOwn(availableShells, shellName) ? availableShells[shellName] : void 0;
 	if (!shell) {
 		const available = [];
 		for (const name in availableShells) {
 			if (available.length > 0) available.push(require_message.text(", "));
 			available.push(require_message.value(name));
 		}
-		const error = require_message.message`Unsupported shell ${shellName}. Available shells: ${available}.`;
+		const unsupportedShell = errors?.unsupportedShell;
+		const error = typeof unsupportedShell === "function" ? unsupportedShell(shellName, Object.keys(availableShells)) : unsupportedShell ?? require_message.message`Unsupported shell ${shellName}. Available shells: ${available}.`;
 		stderr(require_message_renderer.renderErrorMessage(error, errorOptions({
 			messageFormatter,
 			theme,
@@ -750,16 +750,83 @@ function collectActiveValueOptionNames(usage, commandPath, includeDirectAfterCom
 		flag: /* @__PURE__ */ new Set()
 	};
 	if (commandPath.length === 0) {
-		require_usage_internals.collectRootOptionNames(usage, optionNames, rootLeadingNames);
+		collectRootOptionNames(usage, optionNames, rootLeadingNames);
 		return optionNames.value;
-	} else require_usage_internals.collectActiveOptionNames(usage, commandPath, optionNames, false, includeDirectAfterCommandOptions);
+	} else 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) => ({
@@ -971,7 +1038,7 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 				classified.shell,
 				...classified.commandPath ?? [],
 				...classified.args
-			], programName, parser, classified.source === "command" ? completionParsers.completionCommand : completionParsers.completionOption, stdout, stderr, onCompletionResult, onErrorResult, availableShells, colors, maxWidth, termWidth, completionCommandNames[0], completionOptionNames[0], classified.source === "option", sectionOrder, showUsage, rootOptionSuggestions, messageFormatter, theme, automaticWidth);
+			], programName, parser, classified.source === "command" ? completionParsers.completionCommand : completionParsers.completionOption, stdout, stderr, onCompletionResult, onErrorResult, availableShells, colors, maxWidth, termWidth, completionCommandNames[0], completionOptionNames[0], classified.source === "option", sectionOrder, showUsage, rootOptionSuggestions, messageFormatter, theme, automaticWidth, options.completion?.errors);
 			case "help": {
 				let helpGeneratorParser;
 				let docGeneratorParser;

package/dist/facade.d.cts

@@ -243,6 +243,24 @@ interface RunOptions<THelp, TError> {
      * @default `{ bash, fish, nu, pwsh, zsh }`
      */
     readonly shells?: Record<string, ShellCompletion>;
+    /**
+     * Custom messages for completion shell errors.  Unspecified errors use
+     * the default messages.
+     * @since 1.4.0
+     */
+    readonly errors?: {
+      /**
+       * Message shown when no shell name is provided.
+       * @since 1.4.0
+       */
+      readonly missingShell?: Message;
+      /**
+       * Message shown for an unsupported shell.  A callback receives the
+       * shell name and the available shell names, including custom shells.
+       * @since 1.4.0
+       */
+      readonly unsupportedShell?: Message | ((shell: string, availableShells: readonly string[]) => Message);
+    };
     /** Callback invoked when completion is requested. */
     readonly onShow?: (() => THelp) | ((exitCode: number) => THelp);
   } & ({
@@ -265,6 +283,7 @@ interface RunOptions<THelp, TError> {
    * Callback invoked after error output for a parse failure, an invalid
    * command path before help, or a missing or unsupported completion shell.
    * Receives the exit code and the structured error message used for output.
+   * Completion errors use `completion.errors` overrides when configured.
    * The message does not include the runner's `Error: ` prefix or usage/help
    * output.  The runner preserves any formatting terms in the original message.
    *

package/dist/facade.d.ts

@@ -243,6 +243,24 @@ interface RunOptions<THelp, TError> {
      * @default `{ bash, fish, nu, pwsh, zsh }`
      */
     readonly shells?: Record<string, ShellCompletion>;
+    /**
+     * Custom messages for completion shell errors.  Unspecified errors use
+     * the default messages.
+     * @since 1.4.0
+     */
+    readonly errors?: {
+      /**
+       * Message shown when no shell name is provided.
+       * @since 1.4.0
+       */
+      readonly missingShell?: Message;
+      /**
+       * Message shown for an unsupported shell.  A callback receives the
+       * shell name and the available shell names, including custom shells.
+       * @since 1.4.0
+       */
+      readonly unsupportedShell?: Message | ((shell: string, availableShells: readonly string[]) => Message);
+    };
     /** Callback invoked when completion is requested. */
     readonly onShow?: (() => THelp) | ((exitCode: number) => THelp);
   } & ({
@@ -265,6 +283,7 @@ interface RunOptions<THelp, TError> {
    * Callback invoked after error output for a parse failure, an invalid
    * command path before help, or a missing or unsupported completion shell.
    * Receives the exit code and the structured error message used for output.
+   * Completion errors use `completion.errors` overrides when configured.
    * The message does not include the runner's `Error: ` prefix or usage/help
    * output.  The runner preserves any formatting terms in the original message.
    *

package/dist/facade.js

@@ -12,7 +12,6 @@ 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";
@@ -518,7 +517,7 @@ function classifyParseFailure(failure, helpOptionNames, helpCommandNames, versio
 * Handles shell completion requests.
 * @since 0.6.0
 */
-function handleCompletion(completionArgs, programName, parser, completionParser, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, termWidth, completionCommandDisplayName, completionOptionDisplayName, isOptionMode, sectionOrder, showUsage, rootOptionSuggestions = [], messageFormatter, theme, automaticWidth = false) {
+function handleCompletion(completionArgs, programName, parser, completionParser, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, termWidth, completionCommandDisplayName, completionOptionDisplayName, isOptionMode, sectionOrder, showUsage, rootOptionSuggestions = [], messageFormatter, theme, automaticWidth = false, errors) {
 	const errorOptions = (format) => automaticWidth ? withAutomaticWidth(format, (width) => {
 		maxWidth = width;
 	}) : format;
@@ -527,7 +526,7 @@ function handleCompletion(completionArgs, programName, parser, completionParser,
 	const callOnError = (code, error) => onError(code, error);
 	const callOnCompletion = (code) => onCompletion(code);
 	if (!shellName) {
-		const error = message`Missing shell name for completion.`;
+		const error = errors?.missingShell ?? message`Missing shell name for completion.`;
 		const writeError = () => stderr(renderErrorMessage(error, errorOptions({
 			messageFormatter,
 			theme,
@@ -562,14 +561,15 @@ function handleCompletion(completionArgs, programName, parser, completionParser,
 			return result;
 		}, async () => callOnError(1, error));
 	}
-	const shell = availableShells[shellName];
+	const shell = Object.hasOwn(availableShells, shellName) ? availableShells[shellName] : void 0;
 	if (!shell) {
 		const available = [];
 		for (const name in availableShells) {
 			if (available.length > 0) available.push(text(", "));
 			available.push(value(name));
 		}
-		const error = message`Unsupported shell ${shellName}. Available shells: ${available}.`;
+		const unsupportedShell = errors?.unsupportedShell;
+		const error = typeof unsupportedShell === "function" ? unsupportedShell(shellName, Object.keys(availableShells)) : unsupportedShell ?? message`Unsupported shell ${shellName}. Available shells: ${available}.`;
 		stderr(renderErrorMessage(error, errorOptions({
 			messageFormatter,
 			theme,
@@ -757,9 +757,76 @@ 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) => ({
@@ -971,7 +1038,7 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 				classified.shell,
 				...classified.commandPath ?? [],
 				...classified.args
-			], programName, parser, classified.source === "command" ? completionParsers.completionCommand : completionParsers.completionOption, stdout, stderr, onCompletionResult, onErrorResult, availableShells, colors, maxWidth, termWidth, completionCommandNames[0], completionOptionNames[0], classified.source === "option", sectionOrder, showUsage, rootOptionSuggestions, messageFormatter, theme, automaticWidth);
+			], programName, parser, classified.source === "command" ? completionParsers.completionCommand : completionParsers.completionOption, stdout, stderr, onCompletionResult, onErrorResult, availableShells, colors, maxWidth, termWidth, completionCommandNames[0], completionOptionNames[0], classified.source === "option", sectionOrder, showUsage, rootOptionSuggestions, messageFormatter, theme, automaticWidth, options.completion?.errors);
 			case "help": {
 				let helpGeneratorParser;
 				let docGeneratorParser;

package/dist/modifiers.cjs

@@ -4,7 +4,6 @@ const require_mode_dispatch = require('./internal/mode-dispatch.cjs');
 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_short_option = require('./short-option.cjs');
 const require_execution_context = require('./execution-context.cjs');
 const require_phase2_seed = require('./phase2-seed.cjs');
 const require_dependency_metadata = require('./dependency-metadata.cjs');
@@ -479,7 +478,7 @@ function optional(parser) {
 	require_internal_parser.defineParseLanes(optionalParser, adaptOptionalStyleParseLanes(parser));
 	require_internal_parser.defineInheritedAnnotationParser(optionalParser);
 	require_internal_parser.defineSourceBindingOnlyAnnotationCompletionParser(optionalParser);
-	return fluent(require_short_option.scopeParser(optionalParser, require_short_option.combinedOptionScope([parser])));
+	return fluent(optionalParser);
 }
 /**
 * Error type for structured error messages in {@link withDefault} default value callbacks.
@@ -730,7 +729,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(require_short_option.scopeParser(withDefaultParser, require_short_option.combinedOptionScope([parser])));
+	return fluent(withDefaultParser);
 }
 /**
 * Creates a parser that transforms the result value of another parser using
@@ -919,7 +918,7 @@ function map(parser, transform) {
 		if (composed != null) mappedParser.dependencyMetadata = composed;
 	}
 	require_dependency_runtime.defineForwardedEffectfulSchedulingNodes(mappedParser, parser);
-	return fluent(require_short_option.scopeParser(mappedParser, require_short_option.combinedOptionScope([parser])));
+	return fluent(mappedParser);
 }
 const deferredValueBrand = Symbol.for("@optique/core/deferredValue");
 /**
@@ -1715,7 +1714,7 @@ function multiple(parser, options = {}) {
 			enumerable: false
 		});
 	}
-	return fluent(require_short_option.scopeParser(resultParser, require_short_option.combinedOptionScope([parser])));
+	return fluent(resultParser);
 }
 /**
 * Creates a parser that requires the wrapped parser to consume at least one
@@ -1851,7 +1850,7 @@ function nonEmpty(parser) {
 		enumerable: false
 	});
 	require_dependency_runtime.defineForwardedEffectfulSchedulingNodes(nonEmptyParser, parser);
-	return fluent(require_short_option.scopeParser(nonEmptyParser, require_short_option.combinedOptionScope([parser])));
+	return fluent(nonEmptyParser);
 }
 const fluentParserMarker = Symbol.for("@optique/core/fluent");
 /**

package/dist/modifiers.js

@@ -4,7 +4,6 @@ import { dispatchByMode, dispatchIterableByMode, mapModeValue, wrapForMode } fro
 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 { combinedOptionScope, scopeParser } from "./short-option.js";
 import { mergeChildExec, withChildContext, withChildExecPath } from "./execution-context.js";
 import { completeOrExtractPhase2Seed, extractPhase2Seed, extractPhase2SeedKey, phase2SeedFromValueResult } from "./phase2-seed.js";
 import { composeDependencyMetadata } from "./dependency-metadata.js";
@@ -479,7 +478,7 @@ function optional(parser) {
 	defineParseLanes(optionalParser, adaptOptionalStyleParseLanes(parser));
 	defineInheritedAnnotationParser(optionalParser);
 	defineSourceBindingOnlyAnnotationCompletionParser(optionalParser);
-	return fluent(scopeParser(optionalParser, combinedOptionScope([parser])));
+	return fluent(optionalParser);
 }
 /**
 * Error type for structured error messages in {@link withDefault} default value callbacks.
@@ -730,7 +729,7 @@ function withDefault(parser, defaultValue, options) {
 	defineParseLanes(withDefaultParser, adaptOptionalStyleParseLanes(parser));
 	defineInheritedAnnotationParser(withDefaultParser);
 	defineSourceBindingOnlyAnnotationCompletionParser(withDefaultParser);
-	return fluent(scopeParser(withDefaultParser, combinedOptionScope([parser])));
+	return fluent(withDefaultParser);
 }
 /**
 * Creates a parser that transforms the result value of another parser using
@@ -919,7 +918,7 @@ function map(parser, transform) {
 		if (composed != null) mappedParser.dependencyMetadata = composed;
 	}
 	defineForwardedEffectfulSchedulingNodes(mappedParser, parser);
-	return fluent(scopeParser(mappedParser, combinedOptionScope([parser])));
+	return fluent(mappedParser);
 }
 const deferredValueBrand = Symbol.for("@optique/core/deferredValue");
 /**
@@ -1715,7 +1714,7 @@ function multiple(parser, options = {}) {
 			enumerable: false
 		});
 	}
-	return fluent(scopeParser(resultParser, combinedOptionScope([parser])));
+	return fluent(resultParser);
 }
 /**
 * Creates a parser that requires the wrapped parser to consume at least one
@@ -1851,7 +1850,7 @@ function nonEmpty(parser) {
 		enumerable: false
 	});
 	defineForwardedEffectfulSchedulingNodes(nonEmptyParser, parser);
-	return fluent(scopeParser(nonEmptyParser, combinedOptionScope([parser])));
+	return fluent(nonEmptyParser);
 }
 const fluentParserMarker = Symbol.for("@optique/core/fluent");
 /**

package/dist/primitives.cjs

@@ -6,14 +6,13 @@ 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_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_execution_context = require('./execution-context.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
@@ -257,25 +256,11 @@ 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 && !waitingForValue) {
+	if (equalsIndex >= 0) {
 		const optionPart = prefix.slice(0, equalsIndex);
 		const valuePart = prefix.slice(equalsIndex + 1);
-		if (optionNames$1.includes(optionPart) && !/^-[^-]$/.test(optionPart)) {
+		if (optionNames$1.includes(optionPart)) {
 			if (valueParser && valueParser.suggest) {
 				const valueSuggestions = getSuggestionsWithDependency(valueParser, valuePart, context.dependencyRegistry, context.exec);
 				for (const suggestion of valueSuggestions) if (suggestion.kind === "literal") yield {
@@ -356,25 +341,11 @@ 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 && !waitingForValue) {
+	if (equalsIndex >= 0) {
 		const optionPart = prefix.slice(0, equalsIndex);
 		const valuePart = prefix.slice(equalsIndex + 1);
-		if (optionNames$1.includes(optionPart) && !/^-[^-]$/.test(optionPart)) {
+		if (optionNames$1.includes(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 {
@@ -553,18 +524,10 @@ function option(...args) {
 					};
 				});
 			}
-			const prefixes = optionNames$1.filter((name) => name.startsWith("--") || name.startsWith("/") || name.startsWith("-") && name.length > 2).map((name) => ({
-				optionName: name,
-				prefix: name.startsWith("/") ? `${name}:` : `${name}=`
-			}));
-			if (valueParser != null && optionNames$1.some((name) => /^-[^-]$/.test(name) && context.buffer[0].startsWith(name)) && !require_short_option.fullNameOwnsToken(context, context.buffer[0])) {
-				for (const name of optionNames$1) if (/^-[^-]$/.test(name)) prefixes.push({
-					optionName: name,
-					prefix: name
-				});
-			}
-			for (const { prefix, optionName: optionName$1 } of prefixes) {
+			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) {
 				if (!context.buffer[0].startsWith(prefix)) continue;
+				const optionName$1 = prefix.slice(0, -1);
 				if (hasParsedOptionValue(context.state, valueParser)) return {
 					success: false,
 					consumed: 1,
@@ -605,7 +568,7 @@ function option(...args) {
 			if (valueParser == null) {
 				const shortOptions = optionNames$1.filter((name) => name.match(/^-[^-]$/));
 				for (const shortOption of shortOptions) {
-					if (!context.buffer[0].startsWith(shortOption) || require_short_option.fullNameOwnsToken(context, context.buffer[0])) continue;
+					if (!context.buffer[0].startsWith(shortOption)) continue;
 					if (hasParsedOptionValue(context.state, valueParser)) return {
 						success: false,
 						consumed: 1,
@@ -894,7 +857,7 @@ function flag(...args) {
 			}
 			const shortOptions = optionNames$1.filter((name) => name.match(/^-[^-]$/));
 			for (const shortOption of shortOptions) {
-				if (!context.buffer[0].startsWith(shortOption) || require_short_option.fullNameOwnsToken(context, context.buffer[0])) continue;
+				if (!context.buffer[0].startsWith(shortOption)) continue;
 				if (context.state?.success) return {
 					success: false,
 					consumed: 1,
@@ -1115,7 +1078,7 @@ function negatableFlag(names, options = {}) {
 			}
 			for (const shortOption of optionNames$1) {
 				if (!shortOption.match(/^-[^-]$/)) continue;
-				if (!context.buffer[0].startsWith(shortOption) || require_short_option.fullNameOwnsToken(context, context.buffer[0])) 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);
 			}
 			const invalidOption = context.buffer[0];
@@ -1471,7 +1434,6 @@ function validateUniqueCommandNames(names) {
 function* suggestCommandSync(context, prefix, name, aliases, parser, options) {
 	if (require_usage.isSuggestionHidden(options.hidden)) return;
 	const state = normalizeCommandState(context.state);
-	if (state != null) context = require_short_option.withParserOptionScope(context, parser);
 	if (state === void 0) {
 		const description = options.brief ?? options.description;
 		for (const commandName of [name, ...aliases]) if (commandName.startsWith(prefix)) yield {
@@ -1485,7 +1447,6 @@ function* suggestCommandSync(context, prefix, name, aliases, 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 != null) context = require_short_option.withParserOptionScope(context, parser);
 	if (state === void 0) {
 		const description = options.brief ?? options.description;
 		for (const commandName of [name, ...aliases]) if (commandName.startsWith(prefix)) yield {
@@ -1526,8 +1487,6 @@ 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]);
 	const result = {
 		[Symbol.for("@optique/core/commandParser")]: true,
 		mode: parser.mode,
@@ -1595,7 +1554,6 @@ function command(name, parser, options = {}) {
 						] : baseError
 					};
 				}
-				commandScope.select(context, enteredScope);
 				return {
 					success: true,
 					next: {
@@ -1626,7 +1584,7 @@ function command(name, parser, options = {}) {
 					}
 					return parseResult;
 				};
-				return require_mode_dispatch.dispatchByMode(parser.mode, () => wrapState(syncInnerParser.parse(require_execution_context.withChildContext(require_short_option.withParserOptionScope(context, parser), name, innerState, parser.usage))), async () => wrapState(await parser.parse(require_execution_context.withChildContext(require_short_option.withParserOptionScope(context, parser), name, innerState, parser.usage))));
+				return require_mode_dispatch.dispatchByMode(parser.mode, () => wrapState(syncInnerParser.parse(require_execution_context.withChildContext(context, name, innerState, parser.usage))), async () => wrapState(await parser.parse(require_execution_context.withChildContext(context, name, innerState, parser.usage))));
 			}
 			return {
 				success: false,
@@ -1776,9 +1734,7 @@ function command(name, parser, options = {}) {
 		configurable: true,
 		enumerable: false
 	});
-	return require_modifiers.fluent(require_short_option.scopeParser(result, commandScope.source, (context) => {
-		if (normalizeCommandState(context.state) != null) commandScope.select(context, enteredScope);
-	}));
+	return require_modifiers.fluent(result);
 }
 /**
 * Creates a parser that collects unrecognized options and passes them through.

package/dist/primitives.d.cts

@@ -104,7 +104,7 @@ interface OptionErrorOptions {
 /**
  * Creates a parser for various styles of command-line options that take an
  * argument value, such as `--option=value`, `-option=value`, `-o value`,
- * `-ovalue`, or `/option:value`.
+ * or `/option:value`.
  * @template M The execution mode of the parser.
  * @template T The type of value this parser produces.
  * @param args The {@link OptionName}s to parse, followed by
@@ -118,7 +118,7 @@ declare function option<M extends Mode, T>(...args: readonly [OptionName, ...rea
 /**
  * Creates a parser for various styles of command-line options that take an
  * argument value, such as `--option=value`, `-option=value`, `-o value`,
- * `-ovalue`, or `/option:value`.
+ * or `/option:value`.
  * @template M The execution mode of the parser.
  * @template T The type of value this parser produces.
  * @param args The {@link OptionName}s to parse, followed by
@@ -140,7 +140,7 @@ declare function option(...optionNames: readonly [OptionName, ...readonly Option
 /**
  * Creates a parser for various styles of command-line options that take an
  * argument value, such as `--option=value`, `-option=value`, `-o value`,
- * `-ovalue`, or `/option:value`.
+ * or `/option:value`.
  * @param args The {@link OptionName}s to parse, followed by
  *             an optional {@link OptionOptions} object that allows you to
  *             specify a description or other metadata.