@optique/core 1.0.0-dev.1903 → 1.0.0-dev.1972

package/dist/phase2-seed.cjs

@@ -1,5 +1,5 @@
-const require_annotations = require('./annotations.cjs');
-const require_mode_dispatch = require('./mode-dispatch.cjs');
+const require_annotations = require('./internal/annotations.cjs');
+const require_mode_dispatch = require('./internal/mode-dispatch.cjs');
 
 //#region src/phase2-seed.ts
 /**
@@ -26,7 +26,7 @@ function phase2SeedFromValueResult(result) {
 * @internal
 */
 function extractPhase2Seed(parser, state, exec) {
-	return require_mode_dispatch.dispatchByMode(parser.$mode, () => {
+	return require_mode_dispatch.dispatchByMode(parser.mode, () => {
 		const extractor = parser[extractPhase2SeedKey];
 		return extractor == null ? null : extractor(state, exec);
 	}, async () => {
@@ -41,7 +41,7 @@ function extractPhase2Seed(parser, state, exec) {
 * @internal
 */
 function completeOrExtractPhase2Seed(parser, state, exec) {
-	return require_mode_dispatch.dispatchByMode(parser.$mode, () => {
+	return require_mode_dispatch.dispatchByMode(parser.mode, () => {
 		const result = parser.complete(state, exec);
 		if (result.success) return phase2SeedFromValueResult(result);
 		return extractPhase2Seed(parser, state, exec);

package/dist/phase2-seed.js

@@ -1,5 +1,5 @@
-import { unwrapInjectedAnnotationWrapper } from "./annotations.js";
-import { dispatchByMode } from "./mode-dispatch.js";
+import { unwrapInjectedAnnotationWrapper } from "./internal/annotations.js";
+import { dispatchByMode } from "./internal/mode-dispatch.js";
 
 //#region src/phase2-seed.ts
 /**
@@ -26,7 +26,7 @@ function phase2SeedFromValueResult(result) {
 * @internal
 */
 function extractPhase2Seed(parser, state, exec) {
-	return dispatchByMode(parser.$mode, () => {
+	return dispatchByMode(parser.mode, () => {
 		const extractor = parser[extractPhase2SeedKey];
 		return extractor == null ? null : extractor(state, exec);
 	}, async () => {
@@ -41,7 +41,7 @@ function extractPhase2Seed(parser, state, exec) {
 * @internal
 */
 function completeOrExtractPhase2Seed(parser, state, exec) {
-	return dispatchByMode(parser.$mode, () => {
+	return dispatchByMode(parser.mode, () => {
 		const result = parser.complete(state, exec);
 		if (result.success) return phase2SeedFromValueResult(result);
 		return extractPhase2Seed(parser, state, exec);

package/dist/primitives.cjs

@@ -1,16 +1,17 @@
-const require_annotations = require('./annotations.cjs');
+const require_annotations = require('./internal/annotations.cjs');
 const require_message = require('./message.cjs');
 const require_validate = require('./validate.cjs');
 const require_usage = require('./usage.cjs');
-const require_mode_dispatch = require('./mode-dispatch.cjs');
-const require_dependency = require('./dependency.cjs');
+const require_mode_dispatch = require('./internal/mode-dispatch.cjs');
+const require_dependency = require('./internal/dependency.cjs');
 const require_dependency_runtime = require('./dependency-runtime.cjs');
-const require_dependency_metadata = require('./dependency-metadata.cjs');
+const require_annotation_state = require('./annotation-state.cjs');
+const require_execution_context = require('./execution-context.cjs');
 const require_phase2_seed = require('./phase2-seed.cjs');
 const require_suggestion = require('./suggestion.cjs');
 const require_usage_internals = require('./usage-internals.cjs');
+const require_dependency_metadata = require('./dependency-metadata.cjs');
 const require_valueparser = require('./valueparser.cjs');
-const require_annotation_state = require('./annotation-state.cjs');
 
 //#region src/primitives.ts
 /**
@@ -18,42 +19,6 @@ const require_annotation_state = require('./annotation-state.cjs');
 * do not match any specific name at the first buffer position.
 */
 const EMPTY_LEADING_NAMES = /* @__PURE__ */ new Set();
-function withChildExecPath(exec, segment) {
-	if (exec == null) return void 0;
-	return {
-		...exec,
-		path: [...exec.path ?? [], segment]
-	};
-}
-function mergeChildExec(parent, child) {
-	if (parent == null) return child;
-	if (child == null) return parent;
-	return {
-		...parent,
-		trace: child.trace ?? parent.trace,
-		dependencyRuntime: child.dependencyRuntime ?? parent.dependencyRuntime,
-		dependencyRegistry: child.dependencyRegistry ?? parent.dependencyRegistry,
-		commandPath: child.commandPath ?? parent.commandPath,
-		preCompletedByParser: child.preCompletedByParser ?? parent.preCompletedByParser,
-		excludedSourceFields: child.excludedSourceFields ?? parent.excludedSourceFields
-	};
-}
-function withChildContext(context, segment, state, usage) {
-	const exec = withChildExecPath(context.exec, segment);
-	const dependencyRegistry = context.dependencyRegistry ?? exec?.dependencyRegistry;
-	return {
-		...context,
-		state,
-		...usage != null ? { usage } : {},
-		...exec != null ? {
-			exec: dependencyRegistry === exec.dependencyRegistry ? exec : {
-				...exec,
-				dependencyRegistry
-			},
-			dependencyRegistry
-		} : {}
-	};
-}
 function hasParsedOptionValue(state, valueParser) {
 	if (valueParser != null) return state != null && typeof state === "object" && "success" in state && typeof state.success === "boolean";
 	return state != null && "success" in state && state.success && state.value === true;
@@ -146,7 +111,7 @@ function constant(value) {
 	const result = {
 		$valueType: [],
 		$stateType: [],
-		$mode: "sync",
+		mode: "sync",
 		priority: 0,
 		usage: [],
 		leadingNames: EMPTY_LEADING_NAMES,
@@ -203,7 +168,7 @@ function fail() {
 	return {
 		$valueType: [],
 		$stateType: [],
-		$mode: "sync",
+		mode: "sync",
 		priority: 0,
 		usage: [],
 		leadingNames: EMPTY_LEADING_NAMES,
@@ -437,13 +402,13 @@ function option(...args) {
 		valueParser = void 0;
 	}
 	require_validate.validateOptionNames(optionNames$1, "Option");
-	const mode = valueParser?.$mode ?? "sync";
+	const mode = valueParser?.mode ?? "sync";
 	const isAsync = mode === "async";
 	const syncValueParser = valueParser;
 	const dependencyMetadata = valueParser != null ? require_dependency_metadata.extractDependencyMetadata(valueParser) : void 0;
 	const formatInvalidValueError = (error) => options.errors?.invalidValue ? typeof options.errors.invalidValue === "function" ? options.errors.invalidValue(error) : options.errors.invalidValue : require_message.message`${require_message.optionNames(optionNames$1)}: ${error}`;
 	const result = {
-		$mode: mode,
+		mode,
 		$valueType: [],
 		$stateType: [],
 		priority: 10,
@@ -508,7 +473,7 @@ function option(...args) {
 				if (context.buffer.length < 2) return {
 					success: false,
 					consumed: 1,
-					error: require_message.message`Option ${require_message.optionName(context.buffer[0])} requires a value, but got no value.`
+					error: options.errors?.endOfInput ?? require_message.message`${require_message.optionName(context.buffer[0])} requires ${require_message.metavar(valueParser.metavar)}.`
 				};
 				const rawInput = context.buffer[1];
 				return require_mode_dispatch.dispatchByMode(mode, () => {
@@ -807,7 +772,7 @@ function flag(...args) {
 	const result = {
 		$valueType: [],
 		$stateType: [],
-		$mode: "sync",
+		mode: "sync",
 		priority: 10,
 		usage: [{
 			type: "option",
@@ -978,7 +943,7 @@ function flag(...args) {
 *          the parsed value of type {@link T}.
 */
 function argument(valueParser, options = {}) {
-	const isAsync = valueParser.$mode === "async";
+	const isAsync = valueParser.mode === "async";
 	const syncValueParser = valueParser;
 	const dependencyMetadata = require_dependency_metadata.extractDependencyMetadata(valueParser);
 	const formatInvalidValueError = (error) => options.errors?.invalidValue ? typeof options.errors.invalidValue === "function" ? options.errors.invalidValue(error) : options.errors.invalidValue : require_message.message`${require_message.metavar(valueParser.metavar)}: ${error}`;
@@ -989,7 +954,7 @@ function argument(valueParser, options = {}) {
 		...options.hidden != null && { hidden: options.hidden }
 	};
 	const result = {
-		$mode: valueParser.$mode,
+		mode: valueParser.mode,
 		$valueType: [],
 		$stateType: [],
 		priority: 5,
@@ -1027,7 +992,7 @@ function argument(valueParser, options = {}) {
 				error: options.errors?.multiple ? typeof options.errors.multiple === "function" ? options.errors.multiple(valueParser.metavar) : options.errors.multiple : require_message.message`The argument ${require_message.metavar(valueParser.metavar)} cannot be used multiple times.`
 			};
 			const rawInput = context.buffer[i];
-			return require_mode_dispatch.dispatchByMode(valueParser.$mode, () => {
+			return require_mode_dispatch.dispatchByMode(valueParser.mode, () => {
 				const parseResult = syncValueParser.parse(rawInput);
 				const next = recordTrace(context, buildTraceEntry("argument-value", rawInput, context.buffer.slice(0, i + 1), syncValueParser, parseResult));
 				return {
@@ -1077,10 +1042,10 @@ function argument(valueParser, options = {}) {
 					error: formatInvalidValueError(resolved.error)
 				};
 			};
-			return require_mode_dispatch.dispatchByMode(valueParser.$mode, completeSync, completeAsync);
+			return require_mode_dispatch.dispatchByMode(valueParser.mode, completeSync, completeAsync);
 		},
 		suggest(context, prefix) {
-			if (require_annotation_state.normalizeInjectedAnnotationState(context.state) != null) return require_mode_dispatch.dispatchIterableByMode(valueParser.$mode, function* () {}, async function* () {});
+			if (require_annotation_state.normalizeInjectedAnnotationState(context.state) != null) return require_mode_dispatch.dispatchIterableByMode(valueParser.mode, function* () {}, async function* () {});
 			if (isAsync) return suggestArgumentAsync(valueParser, require_usage.isSuggestionHidden(options.hidden), prefix, context.dependencyRegistry, context.exec);
 			return suggestArgumentSync(valueParser, require_usage.isSuggestionHidden(options.hidden), prefix, context.dependencyRegistry, context.exec);
 		},
@@ -1125,7 +1090,7 @@ function argument(valueParser, options = {}) {
 	}
 	if (!require_dependency.isDerivedValueParser(valueParser)) {
 		const vp = valueParser;
-		const vpMode = valueParser.$mode;
+		const vpMode = valueParser.mode;
 		const wrapParseResult = (parsed) => parsed.success ? parsed : {
 			success: false,
 			error: formatInvalidValueError(parsed.error)
@@ -1197,8 +1162,8 @@ function* suggestCommandSync(context, prefix, name, parser, options) {
 			text: name,
 			...options.description && { description: options.description }
 		};
-	} else if (state[0] === "matched") yield* parser.suggest(withChildContext(context, name, getCommandChildState(context.state, parser.initialState, parser), parser.usage), prefix);
-	else if (state[0] === "parsing") yield* parser.suggest(withChildContext(context, name, getCommandChildState(context.state, state[1], parser), parser.usage), prefix);
+	} else if (state[0] === "matched") yield* parser.suggest(require_execution_context.withChildContext(context, name, getCommandChildState(context.state, parser.initialState, parser), parser.usage), prefix);
+	else if (state[0] === "parsing") yield* parser.suggest(require_execution_context.withChildContext(context, name, getCommandChildState(context.state, state[1], parser), parser.usage), prefix);
 }
 async function* suggestCommandAsync(context, prefix, name, parser, options) {
 	if (require_usage.isSuggestionHidden(options.hidden)) return;
@@ -1210,10 +1175,10 @@ async function* suggestCommandAsync(context, prefix, name, parser, options) {
 			...options.description && { description: options.description }
 		};
 	} else if (state[0] === "matched") {
-		const suggestions = parser.suggest(withChildContext(context, name, getCommandChildState(context.state, parser.initialState, parser), parser.usage), prefix);
+		const suggestions = parser.suggest(require_execution_context.withChildContext(context, name, getCommandChildState(context.state, parser.initialState, parser), parser.usage), prefix);
 		for await (const s of suggestions) yield s;
 	} else if (state[0] === "parsing") {
-		const suggestions = parser.suggest(withChildContext(context, name, getCommandChildState(context.state, state[1], parser), parser.usage), prefix);
+		const suggestions = parser.suggest(require_execution_context.withChildContext(context, name, getCommandChildState(context.state, state[1], parser), parser.usage), prefix);
 		for await (const s of suggestions) yield s;
 	}
 }
@@ -1235,12 +1200,12 @@ async function* suggestCommandAsync(context, prefix, name, parser, options) {
 */
 function command(name, parser, options = {}) {
 	require_validate.validateCommandNames([name], "Command");
-	const isAsync = parser.$mode === "async";
+	const isAsync = parser.mode === "async";
 	const syncInnerParser = parser;
 	const asyncInnerParser = parser;
 	const result = {
 		[Symbol.for("@optique/core/commandParser")]: true,
-		$mode: parser.$mode,
+		mode: parser.mode,
 		$valueType: [],
 		$stateType: [],
 		priority: 15,
@@ -1310,7 +1275,7 @@ function command(name, parser, options = {}) {
 				const innerState = state[0] === "matched" ? getCommandParseChildState(context.state, parser.initialState, parser) : getCommandParseChildState(context.state, state[1], parser);
 				const wrapState = (parseResult) => {
 					if (parseResult.success) {
-						const mergedExec = mergeChildExec(context.exec, parseResult.next.exec);
+						const mergedExec = require_execution_context.mergeChildExec(context.exec, parseResult.next.exec);
 						return {
 							success: true,
 							next: {
@@ -1326,7 +1291,7 @@ function command(name, parser, options = {}) {
 					}
 					return parseResult;
 				};
-				return require_mode_dispatch.dispatchByMode(parser.$mode, () => wrapState(syncInnerParser.parse(withChildContext(context, name, innerState, parser.usage))), async () => wrapState(await parser.parse(withChildContext(context, 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,
@@ -1341,7 +1306,7 @@ function command(name, parser, options = {}) {
 				error: options.errors?.notFound ?? require_message.message`Command ${require_message.optionName(name)} was not matched.`
 			};
 			else if (normalizedState[0] === "matched") {
-				const childExec = withChildExecPath(exec, name);
+				const childExec = require_execution_context.withChildExecPath(exec, name);
 				const childContext = {
 					buffer: [],
 					optionsTerminated: false,
@@ -1353,18 +1318,18 @@ function command(name, parser, options = {}) {
 						dependencyRegistry: childExec.dependencyRegistry
 					} : {}
 				};
-				return require_mode_dispatch.dispatchByMode(parser.$mode, () => {
+				return require_mode_dispatch.dispatchByMode(parser.mode, () => {
 					const parseResult = syncInnerParser.parse(childContext);
-					const nextExec = parseResult.success ? mergeChildExec(childExec, parseResult.next.exec) : childExec;
+					const nextExec = parseResult.success ? require_execution_context.mergeChildExec(childExec, parseResult.next.exec) : childExec;
 					return syncInnerParser.complete(parseResult.success ? getCommandChildState(state, parseResult.next.state, parser) : getCommandChildState(state, syncInnerParser.initialState, parser), nextExec);
 				}, async () => {
 					const parseResult = await asyncInnerParser.parse(childContext);
-					const nextExec = parseResult.success ? mergeChildExec(childExec, parseResult.next.exec) : childExec;
+					const nextExec = parseResult.success ? require_execution_context.mergeChildExec(childExec, parseResult.next.exec) : childExec;
 					return asyncInnerParser.complete(parseResult.success ? getCommandChildState(state, parseResult.next.state, parser) : getCommandChildState(state, parser.initialState, parser), nextExec);
 				});
 			} else if (normalizedState[0] === "parsing") {
-				const childExec = withChildExecPath(exec, name);
-				return require_mode_dispatch.dispatchByMode(parser.$mode, () => syncInnerParser.complete(getCommandChildState(state, normalizedState[1], parser), childExec), async () => await asyncInnerParser.complete(getCommandChildState(state, normalizedState[1], parser), childExec));
+				const childExec = require_execution_context.withChildExecPath(exec, name);
+				return require_mode_dispatch.dispatchByMode(parser.mode, () => syncInnerParser.complete(getCommandChildState(state, normalizedState[1], parser), childExec), async () => await asyncInnerParser.complete(getCommandChildState(state, normalizedState[1], parser), childExec));
 			}
 			return {
 				success: false,
@@ -1373,9 +1338,9 @@ function command(name, parser, options = {}) {
 		},
 		[require_phase2_seed.extractPhase2SeedKey](state, exec) {
 			const normalizedState = normalizeCommandState(state);
-			if (typeof normalizedState === "undefined") return require_mode_dispatch.wrapForMode(parser.$mode, null);
+			if (typeof normalizedState === "undefined") return require_mode_dispatch.wrapForMode(parser.mode, null);
 			if (normalizedState[0] === "matched") {
-				const childExec = withChildExecPath(exec, name);
+				const childExec = require_execution_context.withChildExecPath(exec, name);
 				const childContext = {
 					buffer: [],
 					optionsTerminated: false,
@@ -1387,18 +1352,18 @@ function command(name, parser, options = {}) {
 						dependencyRegistry: childExec.dependencyRegistry
 					} : {}
 				};
-				return require_mode_dispatch.dispatchByMode(parser.$mode, () => {
+				return require_mode_dispatch.dispatchByMode(parser.mode, () => {
 					const parseResult = syncInnerParser.parse(childContext);
-					const nextExec = parseResult.success ? mergeChildExec(childExec, parseResult.next.exec) : childExec;
+					const nextExec = parseResult.success ? require_execution_context.mergeChildExec(childExec, parseResult.next.exec) : childExec;
 					return require_phase2_seed.completeOrExtractPhase2Seed(syncInnerParser, parseResult.success ? getCommandChildState(state, parseResult.next.state, parser) : getCommandChildState(state, syncInnerParser.initialState, parser), nextExec);
 				}, async () => {
 					const parseResult = await asyncInnerParser.parse(childContext);
-					const nextExec = parseResult.success ? mergeChildExec(childExec, parseResult.next.exec) : childExec;
+					const nextExec = parseResult.success ? require_execution_context.mergeChildExec(childExec, parseResult.next.exec) : childExec;
 					return await require_phase2_seed.completeOrExtractPhase2Seed(asyncInnerParser, parseResult.success ? getCommandChildState(state, parseResult.next.state, parser) : getCommandChildState(state, parser.initialState, parser), nextExec);
 				});
 			}
-			if (normalizedState[0] === "parsing") return require_phase2_seed.completeOrExtractPhase2Seed(parser, getCommandChildState(state, normalizedState[1], parser), withChildExecPath(exec, name));
-			return require_mode_dispatch.wrapForMode(parser.$mode, null);
+			if (normalizedState[0] === "parsing") return require_phase2_seed.completeOrExtractPhase2Seed(parser, getCommandChildState(state, normalizedState[1], parser), require_execution_context.withChildExecPath(exec, name));
+			return require_mode_dispatch.wrapForMode(parser.mode, null);
 		},
 		suggest(context, prefix) {
 			if (isAsync) return suggestCommandAsync(context, prefix, name, parser, options);
@@ -1507,7 +1472,7 @@ function passThrough(options = {}) {
 	return {
 		$valueType: [],
 		$stateType: [],
-		$mode: "sync",
+		mode: "sync",
 		priority: -10,
 		usage: [{
 			type: "passthrough",

package/dist/primitives.d.cts

@@ -1,7 +1,7 @@
 import { Message } from "./message.cjs";
 import { HiddenVisibility, OptionName, Usage } from "./usage.cjs";
 import { ValueParser, ValueParserResult } from "./valueparser.cjs";
-import { Mode, Parser } from "./parser.cjs";
+import { Mode, Parser } from "./internal/parser.cjs";
 
 //#region src/primitives.d.ts
 /** @internal */

package/dist/primitives.d.ts

@@ -1,7 +1,7 @@
 import { Message } from "./message.js";
 import { HiddenVisibility, OptionName, Usage } from "./usage.js";
 import { ValueParser, ValueParserResult } from "./valueparser.js";
-import { Mode, Parser } from "./parser.js";
+import { Mode, Parser } from "./internal/parser.js";
 
 //#region src/primitives.d.ts
 /** @internal */

package/dist/primitives.js

@@ -1,16 +1,17 @@
-import { annotateFreshArray, getAnnotations } from "./annotations.js";
+import { annotateFreshArray, getAnnotations } from "./internal/annotations.js";
 import { message, metavar, optionName, optionNames, text, valueSet } from "./message.js";
 import { validateCommandNames, validateOptionNames } from "./validate.js";
 import { extractOptionNames, isDocHidden, isSuggestionHidden } from "./usage.js";
-import { dispatchByMode, dispatchIterableByMode, wrapForMode } from "./mode-dispatch.js";
-import { getDefaultValuesFunction, getDependencyIds, getSnapshottedDefaultDependencyValues, isDerivedValueParser, suggestWithDependency } from "./dependency.js";
+import { dispatchByMode, dispatchIterableByMode, wrapForMode } from "./internal/mode-dispatch.js";
+import { getDefaultValuesFunction, getDependencyIds, getSnapshottedDefaultDependencyValues, isDerivedValueParser, suggestWithDependency } from "./internal/dependency.js";
 import { replayDerivedParser, replayDerivedParserAsync } from "./dependency-runtime.js";
-import { extractDependencyMetadata } from "./dependency-metadata.js";
+import { getWrappedChildParseState, getWrappedChildState, isAnnotationWrappedInitialState, normalizeInjectedAnnotationState } from "./annotation-state.js";
+import { mergeChildExec, withChildContext, withChildExecPath } from "./execution-context.js";
 import { completeOrExtractPhase2Seed, extractPhase2SeedKey } from "./phase2-seed.js";
 import { DEFAULT_FIND_SIMILAR_OPTIONS, createErrorWithSuggestions, createSuggestionMessage, findSimilar } from "./suggestion.js";
 import { extractLeadingCommandNames } from "./usage-internals.js";
+import { extractDependencyMetadata } from "./dependency-metadata.js";
 import { isValueParser } from "./valueparser.js";
-import { getWrappedChildParseState, getWrappedChildState, isAnnotationWrappedInitialState, normalizeInjectedAnnotationState } from "./annotation-state.js";
 
 //#region src/primitives.ts
 /**
@@ -18,42 +19,6 @@ import { getWrappedChildParseState, getWrappedChildState, isAnnotationWrappedIni
 * do not match any specific name at the first buffer position.
 */
 const EMPTY_LEADING_NAMES = /* @__PURE__ */ new Set();
-function withChildExecPath(exec, segment) {
-	if (exec == null) return void 0;
-	return {
-		...exec,
-		path: [...exec.path ?? [], segment]
-	};
-}
-function mergeChildExec(parent, child) {
-	if (parent == null) return child;
-	if (child == null) return parent;
-	return {
-		...parent,
-		trace: child.trace ?? parent.trace,
-		dependencyRuntime: child.dependencyRuntime ?? parent.dependencyRuntime,
-		dependencyRegistry: child.dependencyRegistry ?? parent.dependencyRegistry,
-		commandPath: child.commandPath ?? parent.commandPath,
-		preCompletedByParser: child.preCompletedByParser ?? parent.preCompletedByParser,
-		excludedSourceFields: child.excludedSourceFields ?? parent.excludedSourceFields
-	};
-}
-function withChildContext(context, segment, state, usage) {
-	const exec = withChildExecPath(context.exec, segment);
-	const dependencyRegistry = context.dependencyRegistry ?? exec?.dependencyRegistry;
-	return {
-		...context,
-		state,
-		...usage != null ? { usage } : {},
-		...exec != null ? {
-			exec: dependencyRegistry === exec.dependencyRegistry ? exec : {
-				...exec,
-				dependencyRegistry
-			},
-			dependencyRegistry
-		} : {}
-	};
-}
 function hasParsedOptionValue(state, valueParser) {
 	if (valueParser != null) return state != null && typeof state === "object" && "success" in state && typeof state.success === "boolean";
 	return state != null && "success" in state && state.success && state.value === true;
@@ -146,7 +111,7 @@ function constant(value) {
 	const result = {
 		$valueType: [],
 		$stateType: [],
-		$mode: "sync",
+		mode: "sync",
 		priority: 0,
 		usage: [],
 		leadingNames: EMPTY_LEADING_NAMES,
@@ -203,7 +168,7 @@ function fail() {
 	return {
 		$valueType: [],
 		$stateType: [],
-		$mode: "sync",
+		mode: "sync",
 		priority: 0,
 		usage: [],
 		leadingNames: EMPTY_LEADING_NAMES,
@@ -437,13 +402,13 @@ function option(...args) {
 		valueParser = void 0;
 	}
 	validateOptionNames(optionNames$1, "Option");
-	const mode = valueParser?.$mode ?? "sync";
+	const mode = valueParser?.mode ?? "sync";
 	const isAsync = mode === "async";
 	const syncValueParser = valueParser;
 	const dependencyMetadata = valueParser != null ? extractDependencyMetadata(valueParser) : void 0;
 	const formatInvalidValueError = (error) => options.errors?.invalidValue ? typeof options.errors.invalidValue === "function" ? options.errors.invalidValue(error) : options.errors.invalidValue : message`${optionNames(optionNames$1)}: ${error}`;
 	const result = {
-		$mode: mode,
+		mode,
 		$valueType: [],
 		$stateType: [],
 		priority: 10,
@@ -508,7 +473,7 @@ function option(...args) {
 				if (context.buffer.length < 2) return {
 					success: false,
 					consumed: 1,
-					error: message`Option ${optionName(context.buffer[0])} requires a value, but got no value.`
+					error: options.errors?.endOfInput ?? message`${optionName(context.buffer[0])} requires ${metavar(valueParser.metavar)}.`
 				};
 				const rawInput = context.buffer[1];
 				return dispatchByMode(mode, () => {
@@ -807,7 +772,7 @@ function flag(...args) {
 	const result = {
 		$valueType: [],
 		$stateType: [],
-		$mode: "sync",
+		mode: "sync",
 		priority: 10,
 		usage: [{
 			type: "option",
@@ -978,7 +943,7 @@ function flag(...args) {
 *          the parsed value of type {@link T}.
 */
 function argument(valueParser, options = {}) {
-	const isAsync = valueParser.$mode === "async";
+	const isAsync = valueParser.mode === "async";
 	const syncValueParser = valueParser;
 	const dependencyMetadata = extractDependencyMetadata(valueParser);
 	const formatInvalidValueError = (error) => options.errors?.invalidValue ? typeof options.errors.invalidValue === "function" ? options.errors.invalidValue(error) : options.errors.invalidValue : message`${metavar(valueParser.metavar)}: ${error}`;
@@ -989,7 +954,7 @@ function argument(valueParser, options = {}) {
 		...options.hidden != null && { hidden: options.hidden }
 	};
 	const result = {
-		$mode: valueParser.$mode,
+		mode: valueParser.mode,
 		$valueType: [],
 		$stateType: [],
 		priority: 5,
@@ -1027,7 +992,7 @@ function argument(valueParser, options = {}) {
 				error: options.errors?.multiple ? typeof options.errors.multiple === "function" ? options.errors.multiple(valueParser.metavar) : options.errors.multiple : message`The argument ${metavar(valueParser.metavar)} cannot be used multiple times.`
 			};
 			const rawInput = context.buffer[i];
-			return dispatchByMode(valueParser.$mode, () => {
+			return dispatchByMode(valueParser.mode, () => {
 				const parseResult = syncValueParser.parse(rawInput);
 				const next = recordTrace(context, buildTraceEntry("argument-value", rawInput, context.buffer.slice(0, i + 1), syncValueParser, parseResult));
 				return {
@@ -1077,10 +1042,10 @@ function argument(valueParser, options = {}) {
 					error: formatInvalidValueError(resolved.error)
 				};
 			};
-			return dispatchByMode(valueParser.$mode, completeSync, completeAsync);
+			return dispatchByMode(valueParser.mode, completeSync, completeAsync);
 		},
 		suggest(context, prefix) {
-			if (normalizeInjectedAnnotationState(context.state) != null) return dispatchIterableByMode(valueParser.$mode, function* () {}, async function* () {});
+			if (normalizeInjectedAnnotationState(context.state) != null) return dispatchIterableByMode(valueParser.mode, function* () {}, async function* () {});
 			if (isAsync) return suggestArgumentAsync(valueParser, isSuggestionHidden(options.hidden), prefix, context.dependencyRegistry, context.exec);
 			return suggestArgumentSync(valueParser, isSuggestionHidden(options.hidden), prefix, context.dependencyRegistry, context.exec);
 		},
@@ -1125,7 +1090,7 @@ function argument(valueParser, options = {}) {
 	}
 	if (!isDerivedValueParser(valueParser)) {
 		const vp = valueParser;
-		const vpMode = valueParser.$mode;
+		const vpMode = valueParser.mode;
 		const wrapParseResult = (parsed) => parsed.success ? parsed : {
 			success: false,
 			error: formatInvalidValueError(parsed.error)
@@ -1235,12 +1200,12 @@ async function* suggestCommandAsync(context, prefix, name, parser, options) {
 */
 function command(name, parser, options = {}) {
 	validateCommandNames([name], "Command");
-	const isAsync = parser.$mode === "async";
+	const isAsync = parser.mode === "async";
 	const syncInnerParser = parser;
 	const asyncInnerParser = parser;
 	const result = {
 		[Symbol.for("@optique/core/commandParser")]: true,
-		$mode: parser.$mode,
+		mode: parser.mode,
 		$valueType: [],
 		$stateType: [],
 		priority: 15,
@@ -1326,7 +1291,7 @@ function command(name, parser, options = {}) {
 					}
 					return parseResult;
 				};
-				return dispatchByMode(parser.$mode, () => wrapState(syncInnerParser.parse(withChildContext(context, name, innerState, parser.usage))), async () => wrapState(await parser.parse(withChildContext(context, name, innerState, parser.usage))));
+				return dispatchByMode(parser.mode, () => wrapState(syncInnerParser.parse(withChildContext(context, name, innerState, parser.usage))), async () => wrapState(await parser.parse(withChildContext(context, name, innerState, parser.usage))));
 			}
 			return {
 				success: false,
@@ -1353,7 +1318,7 @@ function command(name, parser, options = {}) {
 						dependencyRegistry: childExec.dependencyRegistry
 					} : {}
 				};
-				return dispatchByMode(parser.$mode, () => {
+				return dispatchByMode(parser.mode, () => {
 					const parseResult = syncInnerParser.parse(childContext);
 					const nextExec = parseResult.success ? mergeChildExec(childExec, parseResult.next.exec) : childExec;
 					return syncInnerParser.complete(parseResult.success ? getCommandChildState(state, parseResult.next.state, parser) : getCommandChildState(state, syncInnerParser.initialState, parser), nextExec);
@@ -1364,7 +1329,7 @@ function command(name, parser, options = {}) {
 				});
 			} else if (normalizedState[0] === "parsing") {
 				const childExec = withChildExecPath(exec, name);
-				return dispatchByMode(parser.$mode, () => syncInnerParser.complete(getCommandChildState(state, normalizedState[1], parser), childExec), async () => await asyncInnerParser.complete(getCommandChildState(state, normalizedState[1], parser), childExec));
+				return dispatchByMode(parser.mode, () => syncInnerParser.complete(getCommandChildState(state, normalizedState[1], parser), childExec), async () => await asyncInnerParser.complete(getCommandChildState(state, normalizedState[1], parser), childExec));
 			}
 			return {
 				success: false,
@@ -1373,7 +1338,7 @@ function command(name, parser, options = {}) {
 		},
 		[extractPhase2SeedKey](state, exec) {
 			const normalizedState = normalizeCommandState(state);
-			if (typeof normalizedState === "undefined") return wrapForMode(parser.$mode, null);
+			if (typeof normalizedState === "undefined") return wrapForMode(parser.mode, null);
 			if (normalizedState[0] === "matched") {
 				const childExec = withChildExecPath(exec, name);
 				const childContext = {
@@ -1387,7 +1352,7 @@ function command(name, parser, options = {}) {
 						dependencyRegistry: childExec.dependencyRegistry
 					} : {}
 				};
-				return dispatchByMode(parser.$mode, () => {
+				return dispatchByMode(parser.mode, () => {
 					const parseResult = syncInnerParser.parse(childContext);
 					const nextExec = parseResult.success ? mergeChildExec(childExec, parseResult.next.exec) : childExec;
 					return completeOrExtractPhase2Seed(syncInnerParser, parseResult.success ? getCommandChildState(state, parseResult.next.state, parser) : getCommandChildState(state, syncInnerParser.initialState, parser), nextExec);
@@ -1398,7 +1363,7 @@ function command(name, parser, options = {}) {
 				});
 			}
 			if (normalizedState[0] === "parsing") return completeOrExtractPhase2Seed(parser, getCommandChildState(state, normalizedState[1], parser), withChildExecPath(exec, name));
-			return wrapForMode(parser.$mode, null);
+			return wrapForMode(parser.mode, null);
 		},
 		suggest(context, prefix) {
 			if (isAsync) return suggestCommandAsync(context, prefix, name, parser, options);
@@ -1507,7 +1472,7 @@ function passThrough(options = {}) {
 	return {
 		$valueType: [],
 		$stateType: [],
-		$mode: "sync",
+		mode: "sync",
 		priority: -10,
 		usage: [{
 			type: "passthrough",

package/dist/program.d.cts

@@ -1,5 +1,5 @@
 import { Message } from "./message.cjs";
-import { Mode, Parser } from "./parser.cjs";
+import { Mode, Parser } from "./internal/parser.cjs";
 
 //#region src/program.d.ts
 

package/dist/program.d.ts

@@ -1,5 +1,5 @@
 import { Message } from "./message.js";
-import { Mode, Parser } from "./parser.js";
+import { Mode, Parser } from "./internal/parser.js";
 
 //#region src/program.d.ts