@optique/core 1.0.0-dev.1663 → 1.0.0-dev.1667

package/dist/constructs.js

@@ -158,7 +158,11 @@ function unwrapNestedAnnotationViews(value, seen = /* @__PURE__ */ new WeakMap()
 				changed$1 = true;
 			}
 		}
-		return changed$1 ? clone$1 : source;
+		if (!changed$1) {
+			seen.set(source, source);
+			return source;
+		}
+		return clone$1;
 	}
 	const proto = Object.getPrototypeOf(source);
 	if (proto !== Object.prototype && proto !== null) return source;
@@ -480,6 +484,26 @@ function generateNoMatchError(context) {
 	else if (hasArguments && hasCommands && !hasOptions) return message`No matching command or argument found.`;
 	else return message`No matching option, command, or argument found.`;
 }
+function normalizeExclusiveState(state) {
+	if (!Array.isArray(state) || state.length !== 2 || typeof state[0] !== "number") return void 0;
+	return state;
+}
+function annotateExclusiveParserResult(parentState, parser, result) {
+	if (!result.success) return result;
+	const annotatedState = getAnnotatedChildState(parentState, result.next.state, parser);
+	if (annotatedState === result.next.state) return result;
+	return {
+		...result,
+		next: {
+			...result.next,
+			state: annotatedState
+		}
+	};
+}
+function createExclusiveState(parentState, index, parser, result) {
+	const annotatedResult = annotateExclusiveParserResult(parentState, parser, result);
+	return annotateFreshArray(parentState, [index, annotatedResult]);
+}
 /**
 * Creates a complete() method shared by or() and longestMatch().
 * @internal
@@ -487,11 +511,12 @@ function generateNoMatchError(context) {
 function createExclusiveComplete(parsers, options, noMatchContext, mode) {
 	const syncParsers = parsers;
 	return (state, exec) => {
-		if (state == null) return {
+		const activeState = normalizeExclusiveState(state);
+		if (activeState == null) return {
 			success: false,
 			error: getNoMatchError(options, noMatchContext)
 		};
-		const [i, result] = state;
+		const [i, result] = activeState;
 		if (!result.success) return {
 			success: false,
 			error: result.error
@@ -511,32 +536,35 @@ function createExclusiveSuggest(parsers, mode) {
 	return (context, prefix) => {
 		return dispatchIterableByMode(mode, function* () {
 			const suggestions = [];
-			if (context.state == null) for (let i = 0; i < syncParsers.length; i++) {
+			const activeState = normalizeExclusiveState(context.state);
+			if (activeState == null) for (let i = 0; i < syncParsers.length; i++) {
 				const parser = syncParsers[i];
-				const parserSuggestions = parser.suggest(withChildContext(context, i, parser.initialState), prefix);
+				const parserSuggestions = parser.suggest(withChildContext(context, i, parser.initialState, parser), prefix);
 				suggestions.push(...parserSuggestions);
 			}
 			else {
-				const [index, parserResult] = context.state;
+				const [index, parserResult] = activeState;
 				if (parserResult.success) {
-					const parserSuggestions = syncParsers[index].suggest(withChildContext(context, index, parserResult.next.state), prefix);
+					const parser = syncParsers[index];
+					const parserSuggestions = parser.suggest(withChildContext(context, index, parserResult.next.state, parser), prefix);
 					suggestions.push(...parserSuggestions);
 				}
 			}
 			yield* deduplicateSuggestions(suggestions);
 		}, async function* () {
 			const suggestions = [];
-			if (context.state == null) for (let i = 0; i < parsers.length; i++) {
+			const activeState = normalizeExclusiveState(context.state);
+			if (activeState == null) for (let i = 0; i < parsers.length; i++) {
 				const parser = parsers[i];
-				const parserSuggestions = parser.suggest(withChildContext(context, i, parser.initialState), prefix);
+				const parserSuggestions = parser.suggest(withChildContext(context, i, parser.initialState, parser), prefix);
 				if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
 				else suggestions.push(...parserSuggestions);
 			}
 			else {
-				const [index, parserResult] = context.state;
+				const [index, parserResult] = activeState;
 				if (parserResult.success) {
 					const parser = parsers[index];
-					const parserSuggestions = parser.suggest(withChildContext(context, index, parserResult.next.state), prefix);
+					const parserSuggestions = parser.suggest(withChildContext(context, index, parserResult.next.state, parser), prefix);
 					if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
 					else suggestions.push(...parserSuggestions);
 				}
@@ -546,8 +574,9 @@ function createExclusiveSuggest(parsers, mode) {
 	};
 }
 function getExclusiveSuggestRuntimeNodes(parsers, state, path) {
-	if (!Array.isArray(state) || state.length !== 2 || typeof state[0] !== "number") return [];
-	const [index, parserResult] = state;
+	const activeState = normalizeExclusiveState(state);
+	if (activeState == null) return [];
+	const [index, parserResult] = activeState;
 	if (!parserResult?.success || index < 0 || index >= parsers.length) return [];
 	const parser = parsers[index];
 	return getParserSuggestRuntimeNodes(parser, parserResult.next.state, [...path, index]);
@@ -610,34 +639,32 @@ 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]) => context.state?.[0] === a ? -1 : context.state?.[0] === b ? 1 : a - b);
+		orderedParsers.sort(([_, a], [__, b]) => activeState?.[0] === a ? -1 : activeState?.[0] === b ? 1 : a - b);
 		for (const [parser, i] of orderedParsers) {
-			const result = parser.parse(withChildContext(context, i, context.state == null || context.state[0] !== i || !context.state[1].success ? parser.initialState : context.state[1].next.state));
+			const result = parser.parse(withChildContext(context, i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
 			if (result.success && result.consumed.length > 0) {
-				if (context.state?.[0] !== i && context.state?.[1].success) {
-					const previouslyConsumed = context.state[1].consumed;
+				if (activeState?.[0] !== i && activeState?.[1].success) {
+					const previouslyConsumed = activeState[1].consumed;
 					const checkResult = parser.parse({
-						...withChildContext(context, i, parser.initialState),
+						...withChildContext(context, i, parser.initialState, parser),
 						buffer: previouslyConsumed
 					});
 					const canConsumeShared = checkResult.success && checkResult.consumed.length === previouslyConsumed.length && checkResult.consumed.every((c, idx) => c === previouslyConsumed[idx]);
 					if (!canConsumeShared) return {
 						success: false,
 						consumed: context.buffer.length - result.next.buffer.length,
-						error: message`${values(context.state[1].consumed)} and ${values(result.consumed)} cannot be used together.`
+						error: message`${values(activeState[1].consumed)} and ${values(result.consumed)} cannot be used together.`
 					};
 					const replayExec = mergeChildExec(context.exec, checkResult.next.exec);
-					const replayedResult = parser.parse({
-						...withChildContext({
-							...context,
-							...replayExec != null ? {
-								exec: replayExec,
-								dependencyRegistry: replayExec.dependencyRegistry
-							} : {}
-						}, i, checkResult.next.state),
-						state: checkResult.next.state
-					});
+					const replayedResult = parser.parse(withChildContext({
+						...context,
+						...replayExec != null ? {
+							exec: replayExec,
+							dependencyRegistry: replayExec.dependencyRegistry
+						} : {}
+					}, i, checkResult.next.state, parser));
 					if (!replayedResult.success) return replayedResult;
 					const mergedExec$1 = mergeChildExec(replayExec, replayedResult.next.exec);
 					return {
@@ -646,10 +673,10 @@ function or(...args) {
 							...context,
 							buffer: replayedResult.next.buffer,
 							optionsTerminated: replayedResult.next.optionsTerminated,
-							state: [i, {
+							state: createExclusiveState(context.state, i, parser, {
 								...replayedResult,
 								consumed: [...previouslyConsumed, ...replayedResult.consumed]
-							}],
+							}),
 							...mergedExec$1 != null ? {
 								exec: mergedExec$1,
 								dependencyRegistry: mergedExec$1.dependencyRegistry
@@ -665,7 +692,7 @@ function or(...args) {
 						...context,
 						buffer: result.next.buffer,
 						optionsTerminated: result.next.optionsTerminated,
-						state: [i, result],
+						state: createExclusiveState(context.state, i, parser, result),
 						...mergedExec != null ? {
 							exec: mergedExec,
 							dependencyRegistry: mergedExec.dependencyRegistry
@@ -682,16 +709,17 @@ 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]) => context.state?.[0] === a ? -1 : context.state?.[0] === b ? 1 : a - b);
+		orderedParsers.sort(([_, a], [__, b]) => activeState?.[0] === a ? -1 : activeState?.[0] === b ? 1 : a - b);
 		for (const [parser, i] of orderedParsers) {
-			const resultOrPromise = parser.parse(withChildContext(context, i, context.state == null || context.state[0] !== i || !context.state[1].success ? parser.initialState : context.state[1].next.state));
+			const resultOrPromise = parser.parse(withChildContext(context, i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
 			const result = await resultOrPromise;
 			if (result.success && result.consumed.length > 0) {
-				if (context.state?.[0] !== i && context.state?.[1].success) {
-					const previouslyConsumed = context.state[1].consumed;
+				if (activeState?.[0] !== i && activeState?.[1].success) {
+					const previouslyConsumed = activeState[1].consumed;
 					const checkResultOrPromise = parser.parse({
-						...withChildContext(context, i, parser.initialState),
+						...withChildContext(context, i, parser.initialState, parser),
 						buffer: previouslyConsumed
 					});
 					const checkResult = await checkResultOrPromise;
@@ -699,16 +727,16 @@ function or(...args) {
 					if (!canConsumeShared) return {
 						success: false,
 						consumed: context.buffer.length - result.next.buffer.length,
-						error: message`${values(context.state[1].consumed)} and ${values(result.consumed)} cannot be used together.`
+						error: message`${values(activeState[1].consumed)} and ${values(result.consumed)} cannot be used together.`
 					};
 					const replayExec = mergeChildExec(context.exec, checkResult.next.exec);
-					const replayedResultOrPromise = parser.parse({ ...withChildContext({
+					const replayedResultOrPromise = parser.parse(withChildContext({
 						...context,
 						...replayExec != null ? {
 							exec: replayExec,
 							dependencyRegistry: replayExec.dependencyRegistry
 						} : {}
-					}, i, checkResult.next.state) });
+					}, i, checkResult.next.state, parser));
 					const replayedResult = await replayedResultOrPromise;
 					if (!replayedResult.success) return replayedResult;
 					const mergedExec$1 = mergeChildExec(replayExec, replayedResult.next.exec);
@@ -718,10 +746,10 @@ function or(...args) {
 							...context,
 							buffer: replayedResult.next.buffer,
 							optionsTerminated: replayedResult.next.optionsTerminated,
-							state: [i, {
+							state: createExclusiveState(context.state, i, parser, {
 								...replayedResult,
 								consumed: [...previouslyConsumed, ...replayedResult.consumed]
-							}],
+							}),
 							...mergedExec$1 != null ? {
 								exec: mergedExec$1,
 								dependencyRegistry: mergedExec$1.dependencyRegistry
@@ -737,7 +765,7 @@ function or(...args) {
 						...context,
 						buffer: result.next.buffer,
 						optionsTerminated: result.next.optionsTerminated,
-						state: [i, result],
+						state: createExclusiveState(context.state, i, parser, result),
 						...mergedExec != null ? {
 							exec: mergedExec,
 							dependencyRegistry: mergedExec.dependencyRegistry
@@ -801,6 +829,7 @@ function or(...args) {
 	};
 	const singleDependencyMetadata = composeExclusiveDependencyMetadata(parsers);
 	if (singleDependencyMetadata != null) singleResult.dependencyMetadata = singleDependencyMetadata;
+	defineInheritedAnnotationParser(singleResult);
 	return singleResult;
 }
 /**
@@ -833,13 +862,15 @@ function longestMatch(...args) {
 	const parseSync = (context) => {
 		let bestMatch = null;
 		let error = getInitialError(context);
+		const activeState = normalizeExclusiveState(context.state);
 		for (let i = 0; i < syncParsers.length; i++) {
 			const parser = syncParsers[i];
-			const result = parser.parse(withChildContext(context, i, context.state == null || context.state[0] !== i || !context.state[1].success ? parser.initialState : context.state[1].next.state));
+			const result = parser.parse(withChildContext(context, i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
 			if (result.success) {
 				const consumed = context.buffer.length - result.next.buffer.length;
 				if (bestMatch === null || consumed > bestMatch.consumed) bestMatch = {
 					index: i,
+					parser,
 					result,
 					consumed
 				};
@@ -853,7 +884,7 @@ function longestMatch(...args) {
 					...context,
 					buffer: bestMatch.result.next.buffer,
 					optionsTerminated: bestMatch.result.next.optionsTerminated,
-					state: [bestMatch.index, bestMatch.result],
+					state: createExclusiveState(context.state, bestMatch.index, bestMatch.parser, bestMatch.result),
 					...mergedExec != null ? {
 						exec: mergedExec,
 						dependencyRegistry: mergedExec.dependencyRegistry
@@ -870,14 +901,16 @@ function longestMatch(...args) {
 	const parseAsync = async (context) => {
 		let bestMatch = null;
 		let error = getInitialError(context);
+		const activeState = normalizeExclusiveState(context.state);
 		for (let i = 0; i < parsers.length; i++) {
 			const parser = parsers[i];
-			const resultOrPromise = parser.parse(withChildContext(context, i, context.state == null || context.state[0] !== i || !context.state[1].success ? parser.initialState : context.state[1].next.state));
+			const resultOrPromise = parser.parse(withChildContext(context, i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
 			const result = await resultOrPromise;
 			if (result.success) {
 				const consumed = context.buffer.length - result.next.buffer.length;
 				if (bestMatch === null || consumed > bestMatch.consumed) bestMatch = {
 					index: i,
+					parser,
 					result,
 					consumed
 				};
@@ -891,7 +924,7 @@ function longestMatch(...args) {
 					...context,
 					buffer: bestMatch.result.next.buffer,
 					optionsTerminated: bestMatch.result.next.optionsTerminated,
-					state: [bestMatch.index, bestMatch.result],
+					state: createExclusiveState(context.state, bestMatch.index, bestMatch.parser, bestMatch.result),
 					...mergedExec != null ? {
 						exec: mergedExec,
 						dependencyRegistry: mergedExec.dependencyRegistry
@@ -961,6 +994,7 @@ function longestMatch(...args) {
 	};
 	const multiDependencyMetadata = composeExclusiveDependencyMetadata(parsers);
 	if (multiDependencyMetadata != null) multiResult.dependencyMetadata = multiDependencyMetadata;
+	defineInheritedAnnotationParser(multiResult);
 	return multiResult;
 }
 /**
@@ -986,15 +1020,15 @@ function* suggestObjectSync(context, prefix, parserPairs) {
 	if (context.buffer.length > 0) {
 		const lastToken = context.buffer[context.buffer.length - 1];
 		for (const [field, parser] of parserPairs) if (isOptionRequiringValue(parser.usage, lastToken)) {
-			const fieldState = context.state && typeof context.state === "object" && field in context.state ? context.state[field] : parser.initialState;
-			yield* parser.suggest(withChildContext(contextWithRegistry, field, fieldState), prefix);
+			const annotatedFieldState = getAnnotatedFieldState(context.state, field, parser);
+			yield* parser.suggest(withChildContext(contextWithRegistry, field, annotatedFieldState, parser), prefix);
 			return;
 		}
 	}
 	const suggestions = [];
 	for (const [field, parser] of parserPairs) {
-		const fieldState = context.state && typeof context.state === "object" && field in context.state ? context.state[field] : parser.initialState;
-		const fieldSuggestions = parser.suggest(withChildContext(contextWithRegistry, field, fieldState), prefix);
+		const annotatedFieldState = getAnnotatedFieldState(context.state, field, parser);
+		const fieldSuggestions = parser.suggest(withChildContext(contextWithRegistry, field, annotatedFieldState, parser), prefix);
 		suggestions.push(...fieldSuggestions);
 	}
 	yield* deduplicateSuggestions(suggestions);
@@ -1022,16 +1056,16 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 	if (context.buffer.length > 0) {
 		const lastToken = context.buffer[context.buffer.length - 1];
 		for (const [field, parser] of parserPairs) if (isOptionRequiringValue(parser.usage, lastToken)) {
-			const fieldState = context.state && typeof context.state === "object" && field in context.state ? context.state[field] : parser.initialState;
-			const suggestions$1 = parser.suggest(withChildContext(contextWithRegistry, field, fieldState), prefix);
+			const annotatedFieldState = getAnnotatedFieldState(context.state, field, parser);
+			const suggestions$1 = parser.suggest(withChildContext(contextWithRegistry, field, annotatedFieldState, parser), prefix);
 			for await (const s of suggestions$1) yield s;
 			return;
 		}
 	}
 	const suggestions = [];
 	for (const [field, parser] of parserPairs) {
-		const fieldState = context.state && typeof context.state === "object" && field in context.state ? context.state[field] : parser.initialState;
-		const fieldSuggestions = parser.suggest(withChildContext(contextWithRegistry, field, fieldState), prefix);
+		const annotatedFieldState = getAnnotatedFieldState(context.state, field, parser);
+		const fieldSuggestions = parser.suggest(withChildContext(contextWithRegistry, field, annotatedFieldState, parser), prefix);
 		for await (const s of fieldSuggestions) suggestions.push(s);
 	}
 	yield* deduplicateSuggestions(suggestions);
@@ -1378,7 +1412,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			madeProgress = false;
 			const getFieldState = createFieldStateGetter(currentContext.state, getObjectParseChildState);
 			for (const [field, parser] of parserPairs) {
-				const result = parser.parse(withChildContext(currentContext, field, getFieldState(field, parser)));
+				const result = parser.parse(withChildContext(currentContext, field, getFieldState(field, parser), parser));
 				if (result.success && result.consumed.length > 0) {
 					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
@@ -1439,7 +1473,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			madeProgress = false;
 			const getFieldState = createFieldStateGetter(currentContext.state, getObjectParseChildState);
 			for (const [field, parser] of parserPairs) {
-				const resultOrPromise = parser.parse(withChildContext(currentContext, field, getFieldState(field, parser)));
+				const resultOrPromise = parser.parse(withChildContext(currentContext, field, getFieldState(field, parser), parser));
 				const result = await resultOrPromise;
 				if (result.success && result.consumed.length > 0) {
 					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
@@ -1506,6 +1540,10 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		parse(context) {
 			return dispatchByMode(combinedMode, () => parseSync(context), () => parseAsync(context));
 		},
+		getSuggestRuntimeNodes(state, path) {
+			const stateRecord = state != null && typeof state === "object" ? state : objectParser.initialState;
+			return buildSuggestRuntimeNodesFromPairs(parserPairs, stateRecord, path);
+		},
 		complete(state, exec) {
 			return dispatchByMode(combinedMode, () => {
 				const runtime = exec?.dependencyRuntime ?? createDependencyRuntimeContext(exec?.dependencyRegistry);
@@ -1749,7 +1787,7 @@ async function* suggestTupleAsync(context, prefix, parsers) {
 			state: createAnnotatedArrayStateRecord(stateArray)
 		}, buildIndexedParserPairs(parsers), runtime.registry, advancedContext.exec);
 	}
-	markFailedTupleSuggestSources(parsers, stateArray, advanced.failedParserIndexes, runtime, advancedContext.exec?.path);
+	await markFailedTupleSuggestSourcesAsync(parsers, stateArray, advanced.failedParserIndexes, runtime, advancedContext.exec?.path);
 	const contextWithRegistry = {
 		...advancedContext,
 		dependencyRegistry: runtime.registry,
@@ -1903,18 +1941,36 @@ async function advanceTupleSuggestContextAsync(context, parsers) {
 function markFailedTupleSuggestSources(parsers, stateArray, failedParserIndexes, runtime, parentPath) {
 	if (failedParserIndexes.length < 1) return;
 	const prefix = parentPath ?? [];
-	const failedSourceIds = /* @__PURE__ */ new Set();
 	for (const index of failedParserIndexes) {
 		const parser = parsers[index];
 		if (parser == null) continue;
 		const parserState = stateArray && Array.isArray(stateArray) ? stateArray[index] : parser.initialState;
 		const nodes = getParserSuggestRuntimeNodes(parser, getAnnotatedChildState(stateArray, parserState, parser), [...prefix, index]);
+		if (nodes.length < 1) continue;
+		const failedRuntime = createDependencyRuntimeContext();
+		collectExplicitSourceValues(nodes, failedRuntime);
 		for (const node of nodes) {
 			const sourceId = node.parser.dependencyMetadata?.source?.sourceId;
-			if (sourceId != null) failedSourceIds.add(sourceId);
+			if (sourceId != null && failedRuntime.isSourceFailed(sourceId)) runtime.markSourceFailed(sourceId);
+		}
+	}
+}
+async function markFailedTupleSuggestSourcesAsync(parsers, stateArray, failedParserIndexes, runtime, parentPath) {
+	if (failedParserIndexes.length < 1) return;
+	const prefix = parentPath ?? [];
+	for (const index of failedParserIndexes) {
+		const parser = parsers[index];
+		if (parser == null) continue;
+		const parserState = stateArray && Array.isArray(stateArray) ? stateArray[index] : parser.initialState;
+		const nodes = getParserSuggestRuntimeNodes(parser, getAnnotatedChildState(stateArray, parserState, parser), [...prefix, index]);
+		if (nodes.length < 1) continue;
+		const failedRuntime = createDependencyRuntimeContext();
+		await collectExplicitSourceValuesAsync(nodes, failedRuntime);
+		for (const node of nodes) {
+			const sourceId = node.parser.dependencyMetadata?.source?.sourceId;
+			if (sourceId != null && failedRuntime.isSourceFailed(sourceId)) runtime.markSourceFailed(sourceId);
 		}
 	}
-	for (const sourceId of failedSourceIds) runtime.markSourceFailed(sourceId);
 }
 function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 	const label = typeof labelOrParsers === "string" ? labelOrParsers : void 0;
@@ -2313,7 +2369,7 @@ function merge(...args) {
 		for (let i = 0; i < syncParsers.length; i++) {
 			const parser = syncParsers[i];
 			const parserState = extractParserState(parser, currentContext, i);
-			const result = parser.parse(withChildContext(currentContext, i, parserState));
+			const result = parser.parse(withChildContext(currentContext, i, parserState, parser));
 			if (result.success) {
 				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 				const newState = mergeResultState(parser, currentContext, parserState, result, i);
@@ -2358,7 +2414,7 @@ function merge(...args) {
 		for (let i = 0; i < parsers.length; i++) {
 			const parser = parsers[i];
 			const parserState = extractParserState(parser, currentContext, i);
-			const resultOrPromise = parser.parse(withChildContext(currentContext, i, parserState));
+			const resultOrPromise = parser.parse(withChildContext(currentContext, i, parserState, parser));
 			const result = await resultOrPromise;
 			if (result.success) {
 				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
@@ -2607,7 +2663,7 @@ function merge(...args) {
 				for (let i = 0; i < parsers.length; i++) {
 					const parser = parsers[i];
 					const parserState = extractState(parser, i);
-					const childContext = withChildContext(contextWithRegistry$1, i, parserState);
+					const childContext = withChildContext(contextWithRegistry$1, i, parserState, parser);
 					const excludedSourceFields = perChildExcludedSourceFields$1[i];
 					const contextForChild = excludedSourceFields == null ? childContext : (() => {
 						const childRuntime = createDependencyRuntimeContext(runtime$1.registry.clone());
@@ -2648,7 +2704,7 @@ function merge(...args) {
 				for (let i = 0; i < syncParsers.length; i++) {
 					const parser = syncParsers[i];
 					const parserState = extractState(parser, i);
-					const childContext = withChildContext(contextWithRegistry, i, parserState);
+					const childContext = withChildContext(contextWithRegistry, i, parserState, parser);
 					const excludedSourceFields = perChildExcludedSourceFields[i];
 					const contextForChild = excludedSourceFields == null ? childContext : (() => {
 						const childRuntime = createDependencyRuntimeContext(runtime.registry.clone());
@@ -3441,7 +3497,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 						...branchResult.next,
 						state: {
 							...state,
-							branchState: branchResult.next.state
+							branchState: getAnnotatedChildState(state, branchResult.next.state, branchParser)
 						},
 						...mergedExec != null ? {
 							exec: mergedExec,
@@ -3485,7 +3541,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 										kind: "branch",
 										key: value
 									},
-									branchState: branchParseResult.next.state
+									branchState: getAnnotatedChildState(state, branchParseResult.next.state, branchParser)
 								},
 								...mergedExec != null ? {
 									exec: mergedExec,
@@ -3506,7 +3562,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 									kind: "branch",
 									key: value
 								},
-								branchState: branchParser.initialState
+								branchState: getAnnotatedChildState(state, branchParser.initialState, branchParser)
 							},
 							...discriminatorExec != null ? {
 								exec: discriminatorExec,
@@ -3529,7 +3585,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 						state: {
 							...state,
 							selectedBranch: { kind: "default" },
-							branchState: defaultResult.next.state
+							branchState: getAnnotatedChildState(state, defaultResult.next.state, syncDefaultBranch)
 						},
 						...mergedExec != null ? {
 							exec: mergedExec,
@@ -3559,7 +3615,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 						...branchResult.next,
 						state: {
 							...state,
-							branchState: branchResult.next.state
+							branchState: getAnnotatedChildState(state, branchResult.next.state, branchParser)
 						},
 						...mergedExec != null ? {
 							exec: mergedExec,
@@ -3603,7 +3659,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 										kind: "branch",
 										key: value
 									},
-									branchState: branchParseResult.next.state
+									branchState: getAnnotatedChildState(state, branchParseResult.next.state, branchParser)
 								},
 								...mergedExec != null ? {
 									exec: mergedExec,
@@ -3624,7 +3680,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 									kind: "branch",
 									key: value
 								},
-								branchState: branchParser.initialState
+								branchState: getAnnotatedChildState(state, branchParser.initialState, branchParser)
 							},
 							...discriminatorExec != null ? {
 								exec: discriminatorExec,
@@ -3647,7 +3703,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 						state: {
 							...state,
 							selectedBranch: { kind: "default" },
-							branchState: defaultResult.next.state
+							branchState: getAnnotatedChildState(state, defaultResult.next.state, defaultBranch)
 						},
 						...mergedExec != null ? {
 							exec: mergedExec,
@@ -3670,7 +3726,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		const syncBranches = branches;
 		if (state.selectedBranch === void 0) {
 			if (syncDefaultBranch !== void 0) {
-				const branchState = state.branchState ?? syncDefaultBranch.initialState;
+				const branchState = getAnnotatedChildState(state, state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch);
 				const defaultResult = unwrapCompleteResult(syncDefaultBranch.complete(branchState, withChildExecPath(exec, "_branch")));
 				if (!defaultResult.success) return defaultResult;
 				return {
@@ -3690,12 +3746,12 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
 		const combinedState = {
 			_discriminator: state.discriminatorState,
-			_branch: state.branchState
+			_branch: getAnnotatedChildState(state, state.branchState, branchParser)
 		};
 		const runtime = createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
 		collectExplicitSourceValues(buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, exec?.path), runtime);
 		collectSourcesFromState(combinedState, runtime);
-		const resolvedBranchState = resolveStateWithRuntime(state.branchState, runtime);
+		const resolvedBranchState = getAnnotatedChildState(state, resolveStateWithRuntime(state.branchState, runtime), branchParser);
 		const completionExec = {
 			...exec ?? {
 				usage: branchParser.usage,
@@ -3733,7 +3789,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 	const completeAsync = async (state, exec) => {
 		if (state.selectedBranch === void 0) {
 			if (defaultBranch !== void 0) {
-				const branchState = state.branchState ?? defaultBranch.initialState;
+				const branchState = getAnnotatedChildState(state, state.branchState ?? defaultBranch.initialState, defaultBranch);
 				const defaultResult = unwrapCompleteResult(await defaultBranch.complete(branchState, withChildExecPath(exec, "_branch")));
 				if (!defaultResult.success) return defaultResult;
 				return {
@@ -3753,12 +3809,12 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
 		const combinedState = {
 			_discriminator: state.discriminatorState,
-			_branch: state.branchState
+			_branch: getAnnotatedChildState(state, state.branchState, branchParser)
 		};
 		const runtime = createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
 		await collectExplicitSourceValuesAsync(buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, exec?.path), runtime);
 		collectSourcesFromState(combinedState, runtime);
-		const resolvedBranchState = await resolveStateWithRuntimeAsync(state.branchState, runtime);
+		const resolvedBranchState = getAnnotatedChildState(state, await resolveStateWithRuntimeAsync(state.branchState, runtime), branchParser);
 		const completionExec = {
 			...exec ?? {
 				usage: branchParser.usage,
@@ -3800,14 +3856,12 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		const syncDefaultBranch = defaultBranch;
 		if (state.selectedBranch === void 0) {
 			const runtime = createDependencyRuntimeContext(context.dependencyRegistry?.clone());
-			collectExplicitSourceValues(buildRuntimeNodesFromPairs(syncDefaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", syncDefaultBranch]], {
+			const defaultCombinedState = {
 				_discriminator: state.discriminatorState,
-				_branch: state.branchState
-			}, context.exec?.path), runtime);
-			collectSourcesFromState({
-				_discriminator: state.discriminatorState,
-				_branch: state.branchState
-			}, runtime);
+				_branch: syncDefaultBranch == null ? state.branchState : getAnnotatedChildState(state, state.branchState, syncDefaultBranch)
+			};
+			collectExplicitSourceValues(buildRuntimeNodesFromPairs(syncDefaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", syncDefaultBranch]], defaultCombinedState, context.exec?.path), runtime);
+			collectSourcesFromState(defaultCombinedState, runtime);
 			const suggestContext = {
 				...context,
 				dependencyRegistry: runtime.registry,
@@ -3818,13 +3872,13 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				} } : {}
 			};
 			yield* syncDiscriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState), prefix);
-			if (syncDefaultBranch !== void 0) yield* syncDefaultBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? syncDefaultBranch.initialState), prefix);
+			if (syncDefaultBranch !== void 0) yield* syncDefaultBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch), prefix);
 		} else {
 			const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
 			const runtime = createDependencyRuntimeContext(context.dependencyRegistry?.clone());
 			const combinedState = {
 				_discriminator: state.discriminatorState,
-				_branch: state.branchState
+				_branch: getAnnotatedChildState(state, state.branchState, branchParser)
 			};
 			collectExplicitSourceValues(buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, context.exec?.path), runtime);
 			collectSourcesFromState(combinedState, runtime);
@@ -3837,21 +3891,19 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					dependencyRegistry: runtime.registry
 				} } : {}
 			};
-			yield* branchParser.suggest(withChildContext(suggestContext, "_branch", state.branchState), prefix);
+			yield* branchParser.suggest(withChildContext(suggestContext, "_branch", state.branchState, branchParser), prefix);
 		}
 	}
 	async function* suggestAsync(context, prefix) {
 		const state = context.state ?? initialState;
 		if (state.selectedBranch === void 0) {
 			const runtime = createDependencyRuntimeContext(context.dependencyRegistry?.clone());
-			await collectExplicitSourceValuesAsync(buildRuntimeNodesFromPairs(defaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", defaultBranch]], {
+			const defaultCombinedState = {
 				_discriminator: state.discriminatorState,
-				_branch: state.branchState
-			}, context.exec?.path), runtime);
-			collectSourcesFromState({
-				_discriminator: state.discriminatorState,
-				_branch: state.branchState
-			}, runtime);
+				_branch: defaultBranch == null ? state.branchState : getAnnotatedChildState(state, state.branchState, defaultBranch)
+			};
+			await collectExplicitSourceValuesAsync(buildRuntimeNodesFromPairs(defaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", defaultBranch]], defaultCombinedState, context.exec?.path), runtime);
+			collectSourcesFromState(defaultCombinedState, runtime);
 			const suggestContext = {
 				...context,
 				dependencyRegistry: runtime.registry,
@@ -3862,13 +3914,13 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				} } : {}
 			};
 			yield* discriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState), prefix);
-			if (defaultBranch !== void 0) yield* defaultBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? defaultBranch.initialState), prefix);
+			if (defaultBranch !== void 0) yield* defaultBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch), prefix);
 		} else {
 			const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
 			const runtime = createDependencyRuntimeContext(context.dependencyRegistry?.clone());
 			const combinedState = {
 				_discriminator: state.discriminatorState,
-				_branch: state.branchState
+				_branch: getAnnotatedChildState(state, state.branchState, branchParser)
 			};
 			await collectExplicitSourceValuesAsync(buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, context.exec?.path), runtime);
 			collectSourcesFromState(combinedState, runtime);
@@ -3881,7 +3933,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					dependencyRegistry: runtime.registry
 				} } : {}
 			};
-			yield* branchParser.suggest(withChildContext(suggestContext, "_branch", state.branchState), prefix);
+			yield* branchParser.suggest(withChildContext(suggestContext, "_branch", state.branchState, branchParser), prefix);
 		}
 	}
 	const conditionalParser = {