@optique/core 1.4.0-dev.2661 → 1.4.0-dev.2664

package/dist/constructs.cjs

@@ -1028,12 +1028,16 @@ function analyzeNoMatchContext(parsers) {
 * construction. This is a programmer error, not a user error.
 */
 var DuplicateOptionError = class extends Error {
+	/** The option name shared by multiple fields. */
+	optionName;
+	/** The fields declaring the option. */
+	sources;
 	constructor(optionName$1, sources) {
 		const sourceNames = sources.map((s) => typeof s === "symbol" ? s.description ?? s.toString() : s);
 		super(`Duplicate option name "${optionName$1}" found in fields: ${sourceNames.join(", ")}. Each option name must be unique within a parser combinator.`);
+		this.name = "DuplicateOptionError";
 		this.optionName = optionName$1;
 		this.sources = sources;
-		this.name = "DuplicateOptionError";
 	}
 };
 /**
@@ -1041,6 +1045,8 @@ var DuplicateOptionError = class extends Error {
 * during parser construction. This is a programmer error, not a user error.
 */
 var DuplicateCommandNameError = class extends TypeError {
+	commandName;
+	sources;
 	constructor(commandName, sources) {
 		const sourceNames = sources.map((s) => typeof s === "symbol" ? s.description ?? s.toString() : s);
 		super(`Duplicate command name "${commandName}" found in parsers: ${sourceNames.join(", ")}. Each command name or alias must be unique within active parser alternatives.`);
@@ -1134,6 +1140,16 @@ function generateNoMatchError(context) {
 	else if (hasOptions && hasCommands && hasArguments) return require_message.message`No matching option, command, or argument found.`;
 	else return require_message.message`No value provided.`;
 }
+/** Potential alternatives; only parsing decides whether replay can switch. */
+function selectExclusiveChildren(parsers, state, activeFirst = false) {
+	const active = normalizeExclusiveState(state);
+	const children = parsers.map((parser, index) => ({
+		parser,
+		index,
+		state: require_annotation_state.getWrappedChildParseState(state, active?.[0] === index && active[1].success ? active[1].next.state : parser.initialState, parser)
+	}));
+	return activeFirst ? children.sort((a, b) => active?.[0] === a.index ? -1 : active?.[0] === b.index ? 1 : a.index - b.index) : children;
+}
 function normalizeExclusiveState(state) {
 	if (!Array.isArray(state) || state.length !== 2 || typeof state[0] !== "number") return void 0;
 	return state;
@@ -1463,15 +1479,19 @@ function or(...args) {
 	const parseSync = (context) => {
 		let error = getInitialError(context);
 		const activeState = normalizeExclusiveState(context.state);
-		const orderedParsers = syncParsers.map((p, i) => [p, i]);
-		orderedParsers.sort(([_, a], [__, b]) => activeState?.[0] === a ? -1 : activeState?.[0] === b ? 1 : a - b);
+		const orderedParsers = selectExclusiveChildren(syncParsers, context.state, true);
 		let zeroConsumedBranch = null;
 		let zeroConsumedCount = 0;
 		let provisionalConsuming = null;
 		let optionsTerminatorResult = null;
 		let provisionalAmbiguous = false;
-		for (const [parser, i] of orderedParsers) {
-			const result = parser.parse(withChildContext$1(require_short_option.forkOptionScope(context), i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
+		for (const { parser, index: i, state: childState } of orderedParsers) {
+			const childContext = withChildContext$1(require_short_option.forkOptionScope(context), i, childState, parser);
+			const result = parser.parse(childContext);
+			if (result.success && result.consumed.length === 0) {
+				const own = require_passthrough.retainConsumingFailureHint(void 0, childContext, result.next);
+				if (own != null && error.consumed < own.failure.consumed) error = own.failure;
+			}
 			if (isOptionsTerminatorOnlyResult(context, result)) {
 				if (activeState?.[0] === i && activeState[1].success && activeState[1].consumed.length > 0 && result.next.buffer.length < 1) return preserveExclusiveStateAfterOptionsTerminator(context, result);
 				optionsTerminatorResult ??= result;
@@ -1671,16 +1691,20 @@ function or(...args) {
 	const parseAsync = async (context) => {
 		let error = getInitialError(context);
 		const activeState = normalizeExclusiveState(context.state);
-		const orderedParsers = parsers.map((p, i) => [p, i]);
-		orderedParsers.sort(([_, a], [__, b]) => activeState?.[0] === a ? -1 : activeState?.[0] === b ? 1 : a - b);
+		const orderedParsers = selectExclusiveChildren(parsers, context.state, true);
 		let zeroConsumedBranch = null;
 		let zeroConsumedCount = 0;
 		let provisionalConsuming = null;
 		let optionsTerminatorResult = null;
 		let provisionalAmbiguous = false;
-		for (const [parser, i] of orderedParsers) {
-			const resultOrPromise = parser.parse(withChildContext$1(require_short_option.forkOptionScope(context), i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
+		for (const { parser, index: i, state: childState } of orderedParsers) {
+			const childContext = withChildContext$1(require_short_option.forkOptionScope(context), i, childState, parser);
+			const resultOrPromise = parser.parse(childContext);
 			const result = await resultOrPromise;
+			if (result.success && result.consumed.length === 0) {
+				const own = require_passthrough.retainConsumingFailureHint(void 0, childContext, result.next);
+				if (own != null && error.consumed < own.failure.consumed) error = own.failure;
+			}
 			if (isOptionsTerminatorOnlyResult(context, result)) {
 				if (activeState?.[0] === i && activeState[1].success && activeState[1].consumed.length > 0 && result.next.buffer.length < 1) return preserveExclusiveStateAfterOptionsTerminator(context, result);
 				optionsTerminatorResult ??= result;
@@ -1948,14 +1972,7 @@ function or(...args) {
 	if (singleDependencyMetadata != null) singleResult.dependencyMetadata = singleDependencyMetadata;
 	defineExclusiveSchedulingNodes(singleResult, parsers);
 	require_internal_parser.defineInheritedAnnotationParser(singleResult);
-	require_passthrough.defineOptionMatch(singleResult, (state, token) => require_passthrough.combineOptionMatches(parsers.map((parser, index) => {
-		const active = normalizeExclusiveState(state);
-		return require_passthrough.getOptionMatch(parser, active?.[0] === index && active[1].success ? active[1].next.state : parser.initialState, token);
-	})));
-	require_passthrough.definePassThroughPriority(singleResult, parsers, (state, token) => {
-		const active = normalizeExclusiveState(state);
-		return require_passthrough.combinePassThroughPriorities(parsers.map((parser, index) => require_passthrough.getPassThroughPriority(parser, active?.[0] === index && active[1].success ? active[1].next.state : parser.initialState, token)));
-	});
+	require_passthrough.defineReachableChildren(singleResult, parsers, (state) => selectExclusiveChildren(parsers, state, true));
 	return require_modifiers.fluent(require_short_option.scopeParser(singleResult, require_short_option.combinedOptionScope(parsers, parsers.map((_, index) => index))));
 }
 /**
@@ -2001,7 +2018,7 @@ function createLongestMatch(...args) {
 			},
 			consumed: [...optionsTerminatorResult.consumed, ...match.result.consumed]
 		};
-		const next = selectedResult.consumed.length === 0 ? require_passthrough.withPassThroughFailure(selectedResult.next, consumingFailure) : selectedResult.next;
+		const next = selectedResult.consumed.length === 0 ? require_passthrough.withReturnedConsumingFailure(selectedResult.next, consumingFailure) : selectedResult.next;
 		const parser = parsers[match.index];
 		const mergedExec = require_execution_context.mergeChildExec(context.exec, next.exec);
 		return {
@@ -2046,10 +2063,8 @@ function createLongestMatch(...args) {
 		const optionsTerminatorMatches = [];
 		let error = getInitialError(context);
 		let consumingFailure;
-		const activeState = normalizeExclusiveState(context.state);
-		for (let i = 0; i < syncParsers.length; i++) {
-			const parser = syncParsers[i];
-			const childContext = withChildContext$1(require_short_option.forkOptionScope(context), i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser);
+		for (const { parser, index: i, state: childState } of selectExclusiveChildren(syncParsers, context.state)) {
+			const childContext = withChildContext$1(require_short_option.forkOptionScope(context), i, childState, parser);
 			const result = parser.parse(childContext);
 			if (isOptionsTerminatorOnlyResult(context, result)) {
 				optionsTerminatorMatches.push({
@@ -2062,6 +2077,7 @@ function createLongestMatch(...args) {
 			}
 			if (result.success) {
 				consumingFailure = require_passthrough.retainConsumingFailureHint(consumingFailure, context, result.next);
+				if (consumingFailure != null && error.consumed < consumingFailure.failure.consumed) error = consumingFailure.failure;
 				const consumed = context.buffer.length - result.next.buffer.length;
 				const bestIsProvisional = bestMatch != null && bestMatch.result.success && !!bestMatch.result.provisional;
 				if (bestMatch === null || consumed > bestMatch.consumed || consumed === bestMatch.consumed && bestIsProvisional && !result.provisional) bestMatch = {
@@ -2088,10 +2104,8 @@ function createLongestMatch(...args) {
 		const optionsTerminatorMatches = [];
 		let error = getInitialError(context);
 		let consumingFailure;
-		const activeState = normalizeExclusiveState(context.state);
-		for (let i = 0; i < parsers.length; i++) {
-			const parser = parsers[i];
-			const childContext = withChildContext$1(require_short_option.forkOptionScope(context), i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser);
+		for (const { parser, index: i, state: childState } of selectExclusiveChildren(parsers, context.state)) {
+			const childContext = withChildContext$1(require_short_option.forkOptionScope(context), i, childState, parser);
 			const resultOrPromise = parser.parse(childContext);
 			const result = await resultOrPromise;
 			if (isOptionsTerminatorOnlyResult(context, result)) {
@@ -2105,6 +2119,7 @@ function createLongestMatch(...args) {
 			}
 			if (result.success) {
 				consumingFailure = require_passthrough.retainConsumingFailureHint(consumingFailure, context, result.next);
+				if (consumingFailure != null && error.consumed < consumingFailure.failure.consumed) error = consumingFailure.failure;
 				const consumed = context.buffer.length - result.next.buffer.length;
 				const bestIsProvisional = bestMatch != null && bestMatch.result.success && !!bestMatch.result.provisional;
 				if (bestMatch === null || consumed > bestMatch.consumed || consumed === bestMatch.consumed && bestIsProvisional && !result.provisional) bestMatch = {
@@ -2193,14 +2208,7 @@ function createLongestMatch(...args) {
 	if (multiDependencyMetadata != null) multiResult.dependencyMetadata = multiDependencyMetadata;
 	defineExclusiveSchedulingNodes(multiResult, parsers);
 	require_internal_parser.defineInheritedAnnotationParser(multiResult);
-	require_passthrough.defineOptionMatch(multiResult, (state, token) => require_passthrough.combineOptionMatches(parsers.map((parser, index) => {
-		const active = normalizeExclusiveState(state);
-		return require_passthrough.getOptionMatch(parser, active?.[0] === index && active[1].success ? active[1].next.state : parser.initialState, token);
-	})));
-	require_passthrough.definePassThroughPriority(multiResult, parsers, (state, token) => {
-		const active = normalizeExclusiveState(state);
-		return require_passthrough.combinePassThroughPriorities(parsers.map((parser, index) => require_passthrough.getPassThroughPriority(parser, active?.[0] === index && active[1].success ? active[1].next.state : parser.initialState, token)));
-	});
+	require_passthrough.defineReachableChildren(multiResult, parsers, (state) => selectExclusiveChildren(parsers, state, false));
 	return require_modifiers.fluent(require_short_option.scopeParser(multiResult, require_short_option.combinedOptionScope(parsers, parsers.map((_, index) => index))));
 }
 /**
@@ -2642,7 +2650,10 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		if (!result.success) return result;
 		if (result.consumed.length === 0 && result.next.state === fieldState) return {
 			success: true,
-			next: context,
+			next: {
+				...context,
+				...require_passthrough.getPassThroughFailureHint(result.next)
+			},
 			consumed: []
 		};
 		require_short_option.adoptOptionScope(context, result.next);
@@ -2723,8 +2734,10 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					madeProgress = true;
 					consumedFields.add(field);
 					break;
-				} else if (result.success) consumingFailure = require_passthrough.retainConsumingFailureHint(consumingFailure, currentContext, result.next);
-				else {
+				} else if (result.success) {
+					consumingFailure = require_passthrough.retainConsumingFailureHint(consumingFailure, currentContext, result.next);
+					if (consumingFailure != null && error.consumed < consumingFailure.failure.consumed) error = consumingFailure.failure;
+				} else {
 					const match = require_passthrough.getOptionMatch(parser, getFieldState(field, parser), currentContext.buffer[0]);
 					if (result.consumed > 0 && match != null) consumingFailure = require_passthrough.retainConsumingFailure(consumingFailure, result, match.priority);
 					if (error.consumed < result.consumed) error = result;
@@ -2759,7 +2772,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		}
 		if (anySuccess) return {
 			success: true,
-			next: require_passthrough.withPassThroughFailure(currentContext, consumingFailure),
+			next: require_passthrough.withReturnedConsumingFailure(currentContext, consumingFailure),
 			consumed: allConsumed
 		};
 		if (currentContext.buffer.length === 0) {
@@ -2840,8 +2853,10 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					madeProgress = true;
 					consumedFields.add(field);
 					break;
-				} else if (result.success) consumingFailure = require_passthrough.retainConsumingFailureHint(consumingFailure, currentContext, result.next);
-				else {
+				} else if (result.success) {
+					consumingFailure = require_passthrough.retainConsumingFailureHint(consumingFailure, currentContext, result.next);
+					if (consumingFailure != null && error.consumed < consumingFailure.failure.consumed) error = consumingFailure.failure;
+				} else {
 					const match = require_passthrough.getOptionMatch(parser, getFieldState(field, parser), currentContext.buffer[0]);
 					if (result.consumed > 0 && match != null) consumingFailure = require_passthrough.retainConsumingFailure(consumingFailure, result, match.priority);
 					if (error.consumed < result.consumed) error = result;
@@ -2876,7 +2891,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		}
 		if (anySuccess) return {
 			success: true,
-			next: require_passthrough.withPassThroughFailure(currentContext, consumingFailure),
+			next: require_passthrough.withReturnedConsumingFailure(currentContext, consumingFailure),
 			consumed: allConsumed
 		};
 		if (currentContext.buffer.length === 0) {
@@ -3246,8 +3261,13 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 	});
 	require_internal_parser.defineParseLanes(objectParser, objectParseLanes);
 	require_internal_parser.defineInheritedAnnotationParser(objectParser);
-	require_passthrough.defineOptionMatch(objectParser, (state, token) => require_passthrough.combineOptionMatches(parserPairs.map(([field, parser]) => require_passthrough.getOptionMatch(parser, getAnnotatedFieldState(state, typeof field === "number" ? String(field) : field, parser), token))));
-	require_passthrough.definePassThroughPriority(objectParser, parserPairs.map(([, parser]) => parser), (state, token) => require_passthrough.combinePassThroughPriorities(parserPairs.map(([field, parser]) => require_passthrough.getPassThroughPriority(parser, getAnnotatedFieldState(state, typeof field === "number" ? String(field) : field, parser), token))));
+	require_passthrough.defineReachableChildren(objectParser, parserPairs.map(([, parser]) => parser), (state) => {
+		const getFieldState = createFieldStateGetter(state, getObjectParseChildState);
+		return parserPairs.map(([field, parser]) => ({
+			parser,
+			state: require_annotation_state.getWrappedChildParseState(state, getFieldState(field, parser), parser)
+		}));
+	});
 	return require_modifiers.fluent(require_short_option.scopeParser(objectParser, require_short_option.combinedOptionScope(parserPairs.map(([, p]) => p), parserPairs.map(([field]) => field)), void 0, true));
 }
 function isParserLike(value) {
@@ -3908,8 +3928,10 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					matchedParsers.add(index);
 					foundMatch = true;
 					break;
-				} else if (result.success) consumingFailure = require_passthrough.retainConsumingFailureHint(consumingFailure, currentContext, result.next);
-				else {
+				} else if (result.success) {
+					consumingFailure = require_passthrough.retainConsumingFailureHint(consumingFailure, currentContext, result.next);
+					if (consumingFailure != null && error.consumed < consumingFailure.failure.consumed) error = consumingFailure.failure;
+				} else {
 					const match = require_passthrough.getOptionMatch(parser, stateArray[index], currentContext.buffer[0]);
 					if (result.consumed > 0 && match != null) consumingFailure = require_passthrough.retainConsumingFailure(consumingFailure, result, match.priority);
 					if (error.consumed < result.consumed) error = result;
@@ -3945,7 +3967,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		}
 		return {
 			success: true,
-			next: require_passthrough.withPassThroughFailure(currentContext, consumingFailure),
+			next: require_passthrough.withReturnedConsumingFailure(currentContext, consumingFailure),
 			consumed: allConsumed
 		};
 	};
@@ -3984,8 +4006,10 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					matchedParsers.add(index);
 					foundMatch = true;
 					break;
-				} else if (result.success) consumingFailure = require_passthrough.retainConsumingFailureHint(consumingFailure, currentContext, result.next);
-				else {
+				} else if (result.success) {
+					consumingFailure = require_passthrough.retainConsumingFailureHint(consumingFailure, currentContext, result.next);
+					if (consumingFailure != null && error.consumed < consumingFailure.failure.consumed) error = consumingFailure.failure;
+				} else {
 					const match = require_passthrough.getOptionMatch(parser, stateArray[index], currentContext.buffer[0]);
 					if (result.consumed > 0 && match != null) consumingFailure = require_passthrough.retainConsumingFailure(consumingFailure, result, match.priority);
 					if (error.consumed < result.consumed) error = result;
@@ -4022,7 +4046,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		}
 		return {
 			success: true,
-			next: require_passthrough.withPassThroughFailure(currentContext, consumingFailure),
+			next: require_passthrough.withReturnedConsumingFailure(currentContext, consumingFailure),
 			consumed: allConsumed
 		};
 	};
@@ -4295,8 +4319,10 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		enumerable: false
 	});
 	require_internal_parser.defineInheritedAnnotationParser(tupleParser);
-	require_passthrough.defineOptionMatch(tupleParser, (state, token) => require_passthrough.combineOptionMatches(parsers.map((parser, index) => require_passthrough.getOptionMatch(parser, require_annotation_state.getWrappedChildState(state, state[index], parser), token))));
-	require_passthrough.definePassThroughPriority(tupleParser, parsers, (state, token) => require_passthrough.combinePassThroughPriorities(parsers.map((parser, index) => require_passthrough.getPassThroughPriority(parser, require_annotation_state.getWrappedChildState(state, state[index], parser), token))));
+	require_passthrough.defineReachableChildren(tupleParser, parsers, (state) => parsers.map((parser, index) => ({
+		parser,
+		state: require_annotation_state.getWrappedChildParseState(state, state[index], parser)
+	})));
 	return require_modifiers.fluent(require_short_option.scopeParser(tupleParser, require_short_option.combinedOptionScope(parsers, parsers.map((_, index) => index))));
 }
 function seq(...rawArgs) {
@@ -5028,7 +5054,8 @@ function merge(...args) {
 					if (!canTryPositionalLaneAfterFailure(lane, currentContext)) continue;
 				}
 				attemptedLane = true;
-				const result = lane.parse(currentContext);
+				const childContext = require_passthrough.withPassThroughFailure(currentContext, consumingFailure);
+				const result = lane.parse(childContext);
 				laneResults.set(lane, result);
 				if (result.success && result.consumed.length > 0) {
 					currentContext = result.next;
@@ -5038,6 +5065,13 @@ function merge(...args) {
 					madeProgress = true;
 					break;
 				}
+				if (result.success) {
+					const own = require_passthrough.retainConsumingFailureHint(void 0, childContext, result.next);
+					if (own != null) {
+						consumingFailure = require_passthrough.retainConsumingFailure(consumingFailure, own.failure, own.priority);
+						if (error.consumed < own.failure.consumed) error = own.failure;
+					}
+				}
 				if (!result.success) {
 					if (result.consumed > 0 && require_passthrough.matchesOptionToken({
 						leadingNames: lane.leadingNames,
@@ -5074,7 +5108,7 @@ function merge(...args) {
 		}
 		return {
 			success: true,
-			next: require_passthrough.withPassThroughFailure(currentContext, consumingFailure),
+			next: require_passthrough.withReturnedConsumingFailure(currentContext, consumingFailure),
 			consumed: allConsumed
 		};
 	};
@@ -5097,7 +5131,8 @@ function merge(...args) {
 					if (!canTryPositionalLaneAfterFailure(lane, currentContext)) continue;
 				}
 				attemptedLane = true;
-				const result = await lane.parse(currentContext);
+				const childContext = require_passthrough.withPassThroughFailure(currentContext, consumingFailure);
+				const result = await lane.parse(childContext);
 				laneResults.set(lane, result);
 				if (result.success && result.consumed.length > 0) {
 					currentContext = result.next;
@@ -5107,6 +5142,13 @@ function merge(...args) {
 					madeProgress = true;
 					break;
 				}
+				if (result.success) {
+					const own = require_passthrough.retainConsumingFailureHint(void 0, childContext, result.next);
+					if (own != null) {
+						consumingFailure = require_passthrough.retainConsumingFailure(consumingFailure, own.failure, own.priority);
+						if (error.consumed < own.failure.consumed) error = own.failure;
+					}
+				}
 				if (!result.success) {
 					if (result.consumed > 0 && require_passthrough.matchesOptionToken({
 						leadingNames: lane.leadingNames,
@@ -5143,7 +5185,7 @@ function merge(...args) {
 		}
 		return {
 			success: true,
-			next: require_passthrough.withPassThroughFailure(currentContext, consumingFailure),
+			next: require_passthrough.withReturnedConsumingFailure(currentContext, consumingFailure),
 			consumed: allConsumed
 		};
 	};
@@ -5686,8 +5728,10 @@ function merge(...args) {
 	};
 	require_internal_parser.defineParseLanes(mergeParser, mergeParseLanes);
 	require_internal_parser.defineInheritedAnnotationParser(mergeParser);
-	require_passthrough.defineOptionMatch(mergeParser, (state, token) => require_passthrough.combineOptionMatches(sorted.map(([parser], index) => require_passthrough.getOptionMatch(parser, extractParserStateFromState(parser, state, index), token))));
-	require_passthrough.definePassThroughPriority(mergeParser, parsers, (state, token) => require_passthrough.combinePassThroughPriorities(sorted.map(([parser], index) => require_passthrough.getPassThroughPriority(parser, extractParserStateFromState(parser, state, index), token))));
+	require_passthrough.defineReachableChildren(mergeParser, parsers, (state) => sorted.map(([parser], index) => ({
+		parser,
+		state: require_annotation_state.getWrappedChildParseState(state, extractParserStateFromState(parser, state, index), parser)
+	})));
 	return require_modifiers.fluent(require_short_option.scopeParser(mergeParser, require_short_option.combinedOptionScope(parsers, parsers.map((_, index) => index))));
 }
 /**
@@ -5961,8 +6005,10 @@ function concat(...parsers) {
 					matchedParsers.add(index);
 					foundMatch = true;
 					break;
-				} else if (result.success) consumingFailure = require_passthrough.retainConsumingFailureHint(consumingFailure, currentContext, result.next);
-				else {
+				} else if (result.success) {
+					consumingFailure = require_passthrough.retainConsumingFailureHint(consumingFailure, currentContext, result.next);
+					if (consumingFailure != null && error.consumed < consumingFailure.failure.consumed) error = consumingFailure.failure;
+				} else {
 					const match = require_passthrough.getOptionMatch(parser, stateArray[index], currentContext.buffer[0]);
 					if (result.consumed > 0 && match != null) consumingFailure = require_passthrough.retainConsumingFailure(consumingFailure, result, match.priority);
 					if (error.consumed < result.consumed) error = result;
@@ -5998,7 +6044,7 @@ function concat(...parsers) {
 		}
 		return {
 			success: true,
-			next: require_passthrough.withPassThroughFailure(currentContext, consumingFailure),
+			next: require_passthrough.withReturnedConsumingFailure(currentContext, consumingFailure),
 			consumed: allConsumed
 		};
 	};
@@ -6036,8 +6082,10 @@ function concat(...parsers) {
 					matchedParsers.add(index);
 					foundMatch = true;
 					break;
-				} else if (result.success) consumingFailure = require_passthrough.retainConsumingFailureHint(consumingFailure, currentContext, result.next);
-				else {
+				} else if (result.success) {
+					consumingFailure = require_passthrough.retainConsumingFailureHint(consumingFailure, currentContext, result.next);
+					if (consumingFailure != null && error.consumed < consumingFailure.failure.consumed) error = consumingFailure.failure;
+				} else {
 					const match = require_passthrough.getOptionMatch(parser, stateArray[index], currentContext.buffer[0]);
 					if (result.consumed > 0 && match != null) consumingFailure = require_passthrough.retainConsumingFailure(consumingFailure, result, match.priority);
 					if (error.consumed < result.consumed) error = result;
@@ -6073,7 +6121,7 @@ function concat(...parsers) {
 		}
 		return {
 			success: true,
-			next: require_passthrough.withPassThroughFailure(currentContext, consumingFailure),
+			next: require_passthrough.withReturnedConsumingFailure(currentContext, consumingFailure),
 			consumed: allConsumed
 		};
 	};
@@ -6344,8 +6392,10 @@ function concat(...parsers) {
 		}
 	};
 	require_internal_parser.defineInheritedAnnotationParser(concatParser);
-	require_passthrough.defineOptionMatch(concatParser, (state, token) => require_passthrough.combineOptionMatches(parsers.map((parser, index) => require_passthrough.getOptionMatch(parser, require_annotation_state.getWrappedChildState(state, state[index], parser), token))));
-	require_passthrough.definePassThroughPriority(concatParser, parsers, (state, token) => require_passthrough.combinePassThroughPriorities(parsers.map((parser, index) => require_passthrough.getPassThroughPriority(parser, require_annotation_state.getWrappedChildState(state, state[index], parser), token))));
+	require_passthrough.defineReachableChildren(concatParser, parsers, (state) => parsers.map((parser, index) => ({
+		parser,
+		state: require_annotation_state.getWrappedChildParseState(state, state[index], parser)
+	})));
 	return require_modifiers.fluent(require_short_option.scopeParser(concatParser, require_short_option.combinedOptionScope(parsers, parsers.map((_, index) => index))));
 }
 function group(label, parser, options = {}) {
@@ -6465,8 +6515,10 @@ function group(label, parser, options = {}) {
 		enumerable: false
 	});
 	require_passthrough.delegateKnownCompletion(groupParser, parser);
-	require_passthrough.defineOptionMatch(groupParser, (state, token) => require_passthrough.getOptionMatch(parser, state, token));
-	require_passthrough.definePassThroughPriority(groupParser, [parser], (state, token) => require_passthrough.getPassThroughPriority(parser, state, token));
+	require_passthrough.defineReachableChildren(groupParser, [parser], (state) => [{
+		parser,
+		state
+	}]);
 	return require_modifiers.fluent(require_short_option.scopeParser(groupParser, require_short_option.combinedOptionScope([parser])));
 }
 /**
@@ -6577,13 +6629,14 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		return options?.errors?.noMatch ? typeof options.errors.noMatch === "function" ? options.errors.noMatch(noMatchContext) : options.errors.noMatch : generateNoMatchError(noMatchContext);
 	};
 	const optionScope = require_short_option.conditionalOptionScope(discriminator, defaultBranch, branchParsers.map(([, p]) => p));
+	const selectBranch = (selected, table, fallback) => selected.kind === "default" ? fallback : table[selected.key];
 	const parseSync = (context) => {
 		const state = context.state ?? initialState;
 		const syncDiscriminator = discriminator;
 		const syncBranches = branches;
 		const syncDefaultBranch = defaultBranch;
 		if (state.selectedBranch !== void 0) {
-			const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
+			const branchParser = selectBranch(state.selectedBranch, syncBranches, syncDefaultBranch);
 			const branchResult = branchParser.parse(withChildContext$1(context, "_branch", state.branchState, branchParser, branchParser.usage));
 			if (branchResult.success) {
 				const mergedExec = require_execution_context.mergeChildExec(context.exec, branchResult.next.exec);
@@ -6724,7 +6777,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 	const parseAsync = async (context) => {
 		const state = context.state ?? initialState;
 		if (state.selectedBranch !== void 0) {
-			const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
+			const branchParser = selectBranch(state.selectedBranch, branches, defaultBranch);
 			const branchResult = await branchParser.parse(withChildContext$1(context, "_branch", state.branchState, branchParser, branchParser.usage));
 			if (branchResult.success) {
 				const mergedExec = require_execution_context.mergeChildExec(context.exec, branchResult.next.exec);
@@ -7842,7 +7895,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 	});
 	const reachableBranches = (state) => {
 		if (state.selectedBranch != null) {
-			const branch = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
+			const branch = selectBranch(state.selectedBranch, branches, defaultBranch);
 			return branch == null ? [] : [{
 				branch,
 				state: state.branchState
@@ -7862,18 +7915,17 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			state: branch.initialState
 		}));
 	};
-	require_passthrough.definePassThroughPriority(conditionalParser, [discriminator, ...allBranchParsers], (state, token) => require_passthrough.combinePassThroughPriorities([...state.selectedBranch == null ? [require_passthrough.getPassThroughPriority(discriminator, state.discriminatorState, token)] : [], ...reachableBranches(state).map(({ branch, state: state$1 }) => require_passthrough.getPassThroughPriority(branch, state$1, token))]));
-	require_passthrough.defineOptionMatch(conditionalParser, (state, token) => {
-		if (state.selectedBranch != null) {
-			const branch = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
-			return branch == null ? void 0 : require_passthrough.getOptionMatch(branch, state.branchState, token);
-		}
-		return require_passthrough.combineOptionMatches([require_passthrough.getOptionMatch(discriminator, state.discriminatorState, token), ...reachableBranches(state).map(({ branch, state: state$1 }) => require_passthrough.getOptionMatch(branch, state$1, token))]);
-	});
+	require_passthrough.defineReachableChildren(conditionalParser, [discriminator, ...allBranchParsers], (state) => [...state.selectedBranch == null ? [{
+		parser: discriminator,
+		state: require_annotation_state.getWrappedChildParseState(state, state.discriminatorState, discriminator)
+	}] : [], ...reachableBranches(state).map(({ branch, state: childState }) => ({
+		parser: branch,
+		state: require_annotation_state.getWrappedChildParseState(state, childState, branch)
+	}))]);
 	return require_modifiers.fluent(require_short_option.scopeParser(conditionalParser, optionScope.source, (context) => {
 		const selected = context.state?.selectedBranch;
 		if (selected != null) {
-			const branch = selected.kind === "default" ? defaultBranch : branches[selected.key];
+			const branch = selectBranch(selected, branches, defaultBranch);
 			if (branch != null) optionScope.select(context, branch);
 		}
 	}));

package/dist/constructs.d.cts

@@ -103,7 +103,9 @@ interface OrErrorOptions {
  * construction. This is a programmer error, not a user error.
  */
 declare class DuplicateOptionError extends Error {
+  /** The option name shared by multiple fields. */
   readonly optionName: string;
+  /** The fields declaring the option. */
   readonly sources: readonly (string | symbol)[];
   constructor(optionName: string, sources: readonly (string | symbol)[]);
 }

package/dist/constructs.d.ts

@@ -103,7 +103,9 @@ interface OrErrorOptions {
  * construction. This is a programmer error, not a user error.
  */
 declare class DuplicateOptionError extends Error {
+  /** The option name shared by multiple fields. */
   readonly optionName: string;
+  /** The fields declaring the option. */
   readonly sources: readonly (string | symbol)[];
   constructor(optionName: string, sources: readonly (string | symbol)[]);
 }