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

package/dist/constructs.js

@@ -1,16 +1,17 @@
-import { annotateFreshArray, getAnnotations, inheritAnnotations } from "./annotations.js";
+import { annotateFreshArray, getAnnotations, inheritAnnotations } from "./internal/annotations.js";
 import { message, optionName, text, values } from "./message.js";
 import { validateLabel } from "./validate.js";
 import { extractArgumentMetavars, extractCommandNames, extractOptionNames, isDocHidden, mergeHidden } from "./usage.js";
 import { deduplicateDocFragments } from "./doc.js";
-import { dispatchByMode, dispatchIterableByMode } from "./mode-dispatch.js";
-import { createDependencySourceState, dependencyId, isDependencySourceState, isPendingDependencySourceState, isWrappedDependencySource, wrappedDependencySourceMarker } from "./dependency.js";
+import { dispatchByMode, dispatchIterableByMode } from "./internal/mode-dispatch.js";
+import { createDependencySourceState, dependencyId, isDependencySourceState, isPendingDependencySourceState, isWrappedDependencySource, wrappedDependencySourceMarker } from "./internal/dependency.js";
 import { buildRuntimeNodesFromArray, buildRuntimeNodesFromPairs, collectExplicitSourceValues, collectExplicitSourceValuesAsync, collectSourcesFromState, createDependencyRuntimeContext, fillMissingSourceDefaults, fillMissingSourceDefaultsAsync, resolveStateWithRuntime, resolveStateWithRuntimeAsync } from "./dependency-runtime.js";
+import { defineInheritedAnnotationParser, getParserSuggestRuntimeNodes, unmatchedNonCliDependencySourceStateMarker } from "./internal/parser.js";
+import { annotationViewTargets, getWrappedChildParseState, getWrappedChildState, reconcileObjectChildState, unwrapAnnotationView } from "./annotation-state.js";
+import { mergeChildExec, withChildContext, withChildExecPath } from "./execution-context.js";
 import { completeOrExtractPhase2Seed, extractPhase2Seed, extractPhase2SeedKey, phase2SeedFromValueResult } from "./phase2-seed.js";
 import { DEFAULT_FIND_SIMILAR_OPTIONS, createErrorWithSuggestions, createSuggestionMessage, deduplicateSuggestions, findSimilar } from "./suggestion.js";
 import { collectLeadingCandidates } from "./usage-internals.js";
-import { defineInheritedAnnotationParser, getParserSuggestRuntimeNodes, unmatchedNonCliDependencySourceStateMarker } from "./parser.js";
-import { annotationViewTargets, getWrappedChildParseState, getWrappedChildState, reconcileObjectChildState, unwrapAnnotationView } from "./annotation-state.js";
 
 //#region src/constructs.ts
 /**
@@ -21,13 +22,6 @@ const EMPTY_LEADING_NAMES = /* @__PURE__ */ new Set();
 function isNonCliBoundSourceState(state, parser) {
 	return parser[unmatchedNonCliDependencySourceStateMarker] === true && state != null && typeof state === "object" && Object.hasOwn(state, "hasCliValue") && state.hasCliValue === false;
 }
-function withChildExecPath(exec, segment) {
-	if (exec == null) return void 0;
-	return {
-		...exec,
-		path: [...exec.path ?? [], segment]
-	};
-}
 function withDependencyRuntimeExec(usage, exec, runtime) {
 	if (exec == null) return {
 		usage,
@@ -43,35 +37,9 @@ function withDependencyRuntimeExec(usage, exec, runtime) {
 		dependencyRegistry: runtime.registry
 	};
 }
-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, parser, usage) {
-	const exec = withChildExecPath(context.exec, segment);
-	const dependencyRegistry = context.dependencyRegistry ?? exec?.dependencyRegistry;
+function withChildContext$1(context, segment, state, parser, usage) {
 	const childState = parser == null ? state : getWrappedChildParseState(context.state, state, parser);
-	return {
-		...context,
-		state: childState,
-		...usage != null ? { usage } : {},
-		...exec != null ? {
-			exec: dependencyRegistry === exec.dependencyRegistry ? exec : {
-				...exec,
-				dependencyRegistry
-			},
-			dependencyRegistry
-		} : {}
-	};
+	return withChildContext(context, segment, childState, usage);
 }
 function isUnmatchedDependencyState(state, parser) {
 	if (state === void 0) return true;
@@ -451,7 +419,7 @@ function assertParsers(parsers, callerName) {
 	for (let i = 0; i < parsers.length; i++) {
 		const p = parsers[i];
 		const r = p;
-		if (p == null || typeof p !== "object" && typeof p !== "function" || !(r.$mode === "sync" || r.$mode === "async") || !Array.isArray(r.usage) || typeof r.priority !== "number" || Number.isNaN(r.priority) || !("initialState" in p) || typeof r.parse !== "function" || typeof r.complete !== "function" || typeof r.suggest !== "function" || typeof r.getDocFragments !== "function") throw new TypeError(`${callerName} argument at index ${i} is not a valid Parser.`);
+		if (p == null || typeof p !== "object" && typeof p !== "function" || !(r.mode === "sync" || r.mode === "async") || !Array.isArray(r.usage) || typeof r.priority !== "number" || Number.isNaN(r.priority) || !("initialState" in p) || typeof r.parse !== "function" || typeof r.complete !== "function" || typeof r.suggest !== "function" || typeof r.getDocFragments !== "function") throw new TypeError(`${callerName} argument at index ${i} is not a valid Parser.`);
 	}
 }
 /**
@@ -568,7 +536,7 @@ function createExclusiveComplete(parsers, options, noMatchContext, mode) {
 			};
 		}, async () => {
 			const candidate = await findExclusiveZeroInputCandidateAsync(parsers, state, exec);
-			if (candidate != null && (parsers[candidate.index].$mode === "sync" || exec?.phase !== "parse" && exec?.phase !== "suggest")) {
+			if (candidate != null && (parsers[candidate.index].mode === "sync" || exec?.phase !== "parse" && exec?.phase !== "suggest")) {
 				const p = parsers[candidate.index];
 				const annotatedState = getWrappedChildState(state, candidate.parseResult.next.state, p);
 				return await p.complete(annotatedState, withChildExecPath(exec, candidate.index));
@@ -601,14 +569,14 @@ function createExclusiveSuggest(parsers, mode) {
 			const activeState = normalizeExclusiveState(context.state);
 			if (activeState == null || activeState[1].success && activeState[1].consumed.length === 0) for (let i = 0; i < syncParsers.length; i++) {
 				const parser = syncParsers[i];
-				const parserSuggestions = parser.suggest(withChildContext(context, i, parser.initialState, parser), prefix);
+				const parserSuggestions = parser.suggest(withChildContext$1(context, i, parser.initialState, parser), prefix);
 				suggestions.push(...parserSuggestions);
 			}
 			else {
 				const [index, parserResult] = activeState;
 				if (parserResult.success) {
 					const parser = syncParsers[index];
-					const parserSuggestions = parser.suggest(withChildContext(context, index, parserResult.next.state, parser), prefix);
+					const parserSuggestions = parser.suggest(withChildContext$1(context, index, parserResult.next.state, parser), prefix);
 					suggestions.push(...parserSuggestions);
 				}
 			}
@@ -618,16 +586,16 @@ function createExclusiveSuggest(parsers, mode) {
 			const activeState = normalizeExclusiveState(context.state);
 			if (activeState == null || activeState[1].success && activeState[1].consumed.length === 0) for (let i = 0; i < parsers.length; i++) {
 				const parser = parsers[i];
-				const parserSuggestions = parser.suggest(withChildContext(context, i, parser.initialState, parser), prefix);
-				if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
+				const parserSuggestions = parser.suggest(withChildContext$1(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] = activeState;
 				if (parserResult.success) {
 					const parser = parsers[index];
-					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);
+					const parserSuggestions = parser.suggest(withChildContext$1(context, index, parserResult.next.state, parser), prefix);
+					if (parser.mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
 					else suggestions.push(...parserSuggestions);
 				}
 			}
@@ -765,7 +733,7 @@ function or(...args) {
 	if (parsers.length < 1) throw new TypeError("or() requires at least one parser argument.");
 	assertParsers(parsers, "or()");
 	const noMatchContext = analyzeNoMatchContext(parsers);
-	const combinedMode = parsers.some((p) => p.$mode === "async") ? "async" : "sync";
+	const combinedMode = parsers.some((p) => p.mode === "async") ? "async" : "sync";
 	const syncParsers = parsers;
 	const getInitialError = (context) => ({
 		consumed: 0,
@@ -786,7 +754,7 @@ function or(...args) {
 		let provisionalConsuming = null;
 		let provisionalAmbiguous = false;
 		for (const [parser, i] of orderedParsers) {
-			const result = parser.parse(withChildContext(context, i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
+			const result = parser.parse(withChildContext$1(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 (result.provisional) {
 					const activeBranchLocked = activeState != null && activeState[1].success && activeState[1].consumed.length > 0;
@@ -830,7 +798,7 @@ function or(...args) {
 					}
 					const previouslyConsumed = activeState[1].consumed;
 					const checkResult = parser.parse({
-						...withChildContext(context, i, parser.initialState, parser),
+						...withChildContext$1(context, i, parser.initialState, parser),
 						buffer: previouslyConsumed
 					});
 					const canConsumeShared = checkResult.success && checkResult.consumed.length === previouslyConsumed.length && checkResult.consumed.every((c, idx) => c === previouslyConsumed[idx]);
@@ -840,7 +808,7 @@ function or(...args) {
 						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({
+					const replayedResult = parser.parse(withChildContext$1({
 						...context,
 						...replayExec != null ? {
 							exec: replayExec,
@@ -930,13 +898,13 @@ function or(...args) {
 			if (activeState != null && activeState[1].success) {
 				const previouslyConsumed = activeState[1].consumed;
 				const checkResult = provisionalConsuming.parser.parse({
-					...withChildContext(context, provisionalConsuming.index, provisionalConsuming.parser.initialState, provisionalConsuming.parser),
+					...withChildContext$1(context, provisionalConsuming.index, provisionalConsuming.parser.initialState, provisionalConsuming.parser),
 					buffer: previouslyConsumed
 				});
 				const canConsumeShared = checkResult.success && checkResult.consumed.length === previouslyConsumed.length && checkResult.consumed.every((c, idx) => c === previouslyConsumed[idx]);
 				if (canConsumeShared && checkResult.success) {
 					const replayExec = mergeChildExec(context.exec, checkResult.next.exec);
-					const replayedResult = provisionalConsuming.parser.parse(withChildContext({
+					const replayedResult = provisionalConsuming.parser.parse(withChildContext$1({
 						...context,
 						...replayExec != null ? {
 							exec: replayExec,
@@ -982,7 +950,7 @@ function or(...args) {
 		let provisionalConsuming = null;
 		let provisionalAmbiguous = false;
 		for (const [parser, i] of orderedParsers) {
-			const resultOrPromise = parser.parse(withChildContext(context, i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
+			const resultOrPromise = parser.parse(withChildContext$1(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 (result.provisional) {
@@ -1027,7 +995,7 @@ function or(...args) {
 					}
 					const previouslyConsumed = activeState[1].consumed;
 					const checkResultOrPromise = parser.parse({
-						...withChildContext(context, i, parser.initialState, parser),
+						...withChildContext$1(context, i, parser.initialState, parser),
 						buffer: previouslyConsumed
 					});
 					const checkResult = await checkResultOrPromise;
@@ -1038,7 +1006,7 @@ function or(...args) {
 						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$1({
 						...context,
 						...replayExec != null ? {
 							exec: replayExec,
@@ -1129,13 +1097,13 @@ function or(...args) {
 			if (activeState != null && activeState[1].success) {
 				const previouslyConsumed = activeState[1].consumed;
 				const checkResult = await provisionalConsuming.parser.parse({
-					...withChildContext(context, provisionalConsuming.index, provisionalConsuming.parser.initialState, provisionalConsuming.parser),
+					...withChildContext$1(context, provisionalConsuming.index, provisionalConsuming.parser.initialState, provisionalConsuming.parser),
 					buffer: previouslyConsumed
 				});
 				const canConsumeShared = checkResult.success && checkResult.consumed.length === previouslyConsumed.length && checkResult.consumed.every((c, idx) => c === previouslyConsumed[idx]);
 				if (canConsumeShared && checkResult.success) {
 					const replayExec = mergeChildExec(context.exec, checkResult.next.exec);
-					const replayedResult = await provisionalConsuming.parser.parse(withChildContext({
+					const replayedResult = await provisionalConsuming.parser.parse(withChildContext$1({
 						...context,
 						...replayExec != null ? {
 							exec: replayExec,
@@ -1172,7 +1140,7 @@ function or(...args) {
 		};
 	};
 	const singleResult = {
-		$mode: combinedMode,
+		mode: combinedMode,
 		$valueType: [],
 		$stateType: [],
 		priority: Math.max(...parsers.map((p) => p.priority)),
@@ -1242,7 +1210,7 @@ function longestMatch(...args) {
 	if (parsers.length < 1) throw new TypeError("longestMatch() requires at least one parser argument.");
 	assertParsers(parsers, "longestMatch()");
 	const noMatchContext = analyzeNoMatchContext(parsers);
-	const combinedMode = parsers.some((p) => p.$mode === "async") ? "async" : "sync";
+	const combinedMode = parsers.some((p) => p.mode === "async") ? "async" : "sync";
 	const syncParsers = parsers;
 	const getInitialError = (context) => ({
 		consumed: 0,
@@ -1259,7 +1227,7 @@ function longestMatch(...args) {
 		const activeState = normalizeExclusiveState(context.state);
 		for (let i = 0; i < syncParsers.length; i++) {
 			const parser = syncParsers[i];
-			const result = parser.parse(withChildContext(context, i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
+			const result = parser.parse(withChildContext$1(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;
 				const bestIsProvisional = bestMatch != null && bestMatch.result.success && !!bestMatch.result.provisional;
@@ -1299,7 +1267,7 @@ function longestMatch(...args) {
 		const activeState = normalizeExclusiveState(context.state);
 		for (let i = 0; i < parsers.length; i++) {
 			const parser = parsers[i];
-			const resultOrPromise = parser.parse(withChildContext(context, i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
+			const resultOrPromise = parser.parse(withChildContext$1(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;
@@ -1335,7 +1303,7 @@ function longestMatch(...args) {
 		};
 	};
 	const multiResult = {
-		$mode: combinedMode,
+		mode: combinedMode,
 		$valueType: [],
 		$stateType: [],
 		priority: Math.max(...parsers.map((p) => p.priority)),
@@ -1420,14 +1388,14 @@ function* suggestObjectSync(context, prefix, parserPairs) {
 		const lastToken = context.buffer[context.buffer.length - 1];
 		for (const [field, parser] of parserPairs) if (isOptionRequiringValue(parser.usage, lastToken)) {
 			const annotatedFieldState = getAnnotatedFieldState(context.state, field, parser);
-			yield* parser.suggest(withChildContext(contextWithRegistry, field, annotatedFieldState, parser), prefix);
+			yield* parser.suggest(withChildContext$1(contextWithRegistry, field, annotatedFieldState, parser), prefix);
 			return;
 		}
 	}
 	const suggestions = [];
 	for (const [field, parser] of parserPairs) {
 		const annotatedFieldState = getAnnotatedFieldState(context.state, field, parser);
-		const fieldSuggestions = parser.suggest(withChildContext(contextWithRegistry, field, annotatedFieldState, parser), prefix);
+		const fieldSuggestions = parser.suggest(withChildContext$1(contextWithRegistry, field, annotatedFieldState, parser), prefix);
 		suggestions.push(...fieldSuggestions);
 	}
 	yield* deduplicateSuggestions(suggestions);
@@ -1456,7 +1424,7 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 		const lastToken = context.buffer[context.buffer.length - 1];
 		for (const [field, parser] of parserPairs) if (isOptionRequiringValue(parser.usage, lastToken)) {
 			const annotatedFieldState = getAnnotatedFieldState(context.state, field, parser);
-			const suggestions$1 = parser.suggest(withChildContext(contextWithRegistry, field, annotatedFieldState, parser), prefix);
+			const suggestions$1 = parser.suggest(withChildContext$1(contextWithRegistry, field, annotatedFieldState, parser), prefix);
 			for await (const s of suggestions$1) yield s;
 			return;
 		}
@@ -1464,7 +1432,7 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 	const suggestions = [];
 	for (const [field, parser] of parserPairs) {
 		const annotatedFieldState = getAnnotatedFieldState(context.state, field, parser);
-		const fieldSuggestions = parser.suggest(withChildContext(contextWithRegistry, field, annotatedFieldState, parser), prefix);
+		const fieldSuggestions = parser.suggest(withChildContext$1(contextWithRegistry, field, annotatedFieldState, parser), prefix);
 		for await (const s of fieldSuggestions) suggestions.push(s);
 	}
 	yield* deduplicateSuggestions(suggestions);
@@ -1787,7 +1755,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 	};
 	if (!options.allowDuplicates) checkDuplicateOptionNames(parserPairs.map(([field, parser]) => [field, parser.usage]));
 	const noMatchContext = analyzeNoMatchContext(parserKeys.map((k) => parsers[k]));
-	const combinedMode = parserKeys.some((k) => parsers[k].$mode === "async") ? "async" : "sync";
+	const combinedMode = parserKeys.some((k) => parsers[k].mode === "async") ? "async" : "sync";
 	const getInitialError = (context) => ({
 		consumed: 0,
 		error: context.buffer.length > 0 ? (() => {
@@ -1812,7 +1780,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), parser));
+				const result = parser.parse(withChildContext$1(currentContext, field, getFieldState(field, parser), parser));
 				if (result.success && result.consumed.length > 0) {
 					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
@@ -1844,7 +1812,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				const typedParser = parser;
 				if (parser.leadingNames.size > 0 || typedParser.acceptingAnyToken) continue;
 				const fieldState = getFieldState(field, parser);
-				const result = typedParser.parse(withChildContext(currentContext, field, fieldState, parser));
+				const result = typedParser.parse(withChildContext$1(currentContext, field, fieldState, parser));
 				if (result.success && result.consumed.length === 0 && result.next.state !== fieldState) {
 					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 					currentContext = {
@@ -1909,7 +1877,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), parser));
+				const resultOrPromise = parser.parse(withChildContext$1(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);
@@ -1941,7 +1909,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				if (consumedFields.has(field)) continue;
 				if (parser.leadingNames.size > 0 || parser.acceptingAnyToken) continue;
 				const fieldState = getFieldState(field, parser);
-				const resultOrPromise = parser.parse(withChildContext(currentContext, field, fieldState, parser));
+				const resultOrPromise = parser.parse(withChildContext$1(currentContext, field, fieldState, parser));
 				const result = await resultOrPromise;
 				if (result.success && result.consumed.length === 0 && result.next.state !== fieldState) {
 					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
@@ -1997,7 +1965,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		};
 	};
 	const objectParser = {
-		$mode: combinedMode,
+		mode: combinedMode,
 		$valueType: [],
 		$stateType: [],
 		[fieldParsersKey]: parserPairs,
@@ -2326,7 +2294,7 @@ function suggestTupleSync(context, prefix, parsers) {
 	for (let i = 0; i < parsers.length; i++) {
 		const parser = parsers[i];
 		const parserState = stateArray && Array.isArray(stateArray) ? stateArray[i] : parser.initialState;
-		const parserSuggestions = parser.suggest(withChildContext(contextWithRegistry, i, parserState, parser), prefix);
+		const parserSuggestions = parser.suggest(withChildContext$1(contextWithRegistry, i, parserState, parser), prefix);
 		suggestions.push(...parserSuggestions);
 	}
 	return deduplicateSuggestions(suggestions);
@@ -2360,8 +2328,8 @@ async function* suggestTupleAsync(context, prefix, parsers) {
 	for (let i = 0; i < parsers.length; i++) {
 		const parser = parsers[i];
 		const parserState = stateArray && Array.isArray(stateArray) ? stateArray[i] : parser.initialState;
-		const parserSuggestions = parser.suggest(withChildContext(contextWithRegistry, i, parserState, parser), prefix);
-		if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
+		const parserSuggestions = parser.suggest(withChildContext$1(contextWithRegistry, i, parserState, parser), prefix);
+		if (parser.mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
 		else suggestions.push(...parserSuggestions);
 	}
 	yield* deduplicateSuggestions(suggestions);
@@ -2376,7 +2344,7 @@ function advanceTupleSuggestContextSync(context, parsers) {
 		const stateArray = Array.isArray(currentContext.state) ? [...currentContext.state] : parsers.map((parser) => parser.initialState);
 		const remainingParsers = parsers.map((parser, index) => [parser, index]).filter(([_, index]) => !matchedParsers.has(index)).sort(([parserA], [parserB]) => parserB.priority - parserA.priority);
 		for (const [parser, index] of remainingParsers) {
-			const result = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+			const result = parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 			if (result.success && result.consumed.length > 0) {
 				const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((state, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : state));
 				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
@@ -2401,7 +2369,7 @@ function advanceTupleSuggestContextSync(context, parsers) {
 			}
 		}
 		if (!foundMatch) for (const [parser, index] of remainingParsers) {
-			const result = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+			const result = parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 			if (result.success && result.consumed.length < 1) {
 				const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((state, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : state));
 				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
@@ -2442,7 +2410,7 @@ async function advanceTupleSuggestContextAsync(context, parsers) {
 		const stateArray = Array.isArray(currentContext.state) ? [...currentContext.state] : parsers.map((parser) => parser.initialState);
 		const remainingParsers = parsers.map((parser, index) => [parser, index]).filter(([_, index]) => !matchedParsers.has(index)).sort(([parserA], [parserB]) => parserB.priority - parserA.priority);
 		for (const [parser, index] of remainingParsers) {
-			const result = await parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+			const result = await parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 			if (result.success && result.consumed.length > 0) {
 				const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((state, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : state));
 				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
@@ -2467,7 +2435,7 @@ async function advanceTupleSuggestContextAsync(context, parsers) {
 			}
 		}
 		if (!foundMatch) for (const [parser, index] of remainingParsers) {
-			const result = await parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+			const result = await parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 			if (result.success && result.consumed.length < 1) {
 				const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((state, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : state));
 				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
@@ -2544,7 +2512,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		parsers = labelOrParsers;
 		options = maybeParsersOrOptions ?? {};
 	}
-	const combinedMode = parsers.some((p) => p.$mode === "async") ? "async" : "sync";
+	const combinedMode = parsers.some((p) => p.mode === "async") ? "async" : "sync";
 	const syncParsers = parsers;
 	if (!options.allowDuplicates) checkDuplicateOptionNames(parsers.map((parser, index) => [String(index), parser.usage]));
 	const parseSync = (context) => {
@@ -2560,7 +2528,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			const stateArray = currentContext.state;
 			const remainingParsers = syncParsers.map((parser, index) => [parser, index]).filter(([_, index]) => !matchedParsers.has(index)).sort(([parserA], [parserB]) => parserB.priority - parserA.priority);
 			for (const [parser, index] of remainingParsers) {
-				const result = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+				const result = parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 				if (result.success && result.consumed.length > 0) {
 					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : s));
 					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
@@ -2581,7 +2549,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				} else if (!result.success && error.consumed < result.consumed) error = result;
 			}
 			if (!foundMatch) for (const [parser, index] of remainingParsers) {
-				const result = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+				const result = parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 				if (result.success && result.consumed.length < 1) {
 					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : s));
 					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
@@ -2626,7 +2594,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			const stateArray = currentContext.state;
 			const remainingParsers = parsers.map((parser, index) => [parser, index]).filter(([_, index]) => !matchedParsers.has(index)).sort(([parserA], [parserB]) => parserB.priority - parserA.priority);
 			for (const [parser, index] of remainingParsers) {
-				const resultOrPromise = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+				const resultOrPromise = parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 				const result = await resultOrPromise;
 				if (result.success && result.consumed.length > 0) {
 					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : s));
@@ -2648,7 +2616,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				} else if (!result.success && error.consumed < result.consumed) error = result;
 			}
 			if (!foundMatch) for (const [parser, index] of remainingParsers) {
-				const resultOrPromise = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+				const resultOrPromise = parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 				const result = await resultOrPromise;
 				if (result.success && result.consumed.length < 1) {
 					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : s));
@@ -2682,7 +2650,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		};
 	};
 	const tupleParser = {
-		$mode: combinedMode,
+		mode: combinedMode,
 		$valueType: [],
 		$stateType: [],
 		[fieldParsersKey]: parsers.map((parser, index) => [String(index), parser]),
@@ -2939,7 +2907,7 @@ function merge(...args) {
 	const rawParsers = args.slice(startIndex, endIndex);
 	if (rawParsers.length < 1) throw new TypeError("merge() requires at least one parser argument.");
 	assertParsers(rawParsers, "merge()");
-	const combinedMode = rawParsers.some((p) => p.$mode === "async") ? "async" : "sync";
+	const combinedMode = rawParsers.some((p) => p.mode === "async") ? "async" : "sync";
 	const isAsync = combinedMode === "async";
 	const syncRawParsers = rawParsers;
 	const withIndex = rawParsers.map((p, i) => [p, i]);
@@ -3006,7 +2974,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, parser));
+			const result = parser.parse(withChildContext$1(currentContext, i, parserState, parser));
 			if (result.success) {
 				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
 				const newState = mergeResultState(parser, currentContext, parserState, result, i);
@@ -3051,7 +3019,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, parser));
+			const resultOrPromise = parser.parse(withChildContext$1(currentContext, i, parserState, parser));
 			const result = await resultOrPromise;
 			if (result.success) {
 				const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
@@ -3092,7 +3060,7 @@ function merge(...args) {
 		};
 	};
 	const mergeParser = {
-		$mode: combinedMode,
+		mode: combinedMode,
 		$valueType: [],
 		$stateType: [],
 		[fieldParsersKey]: mergedFieldParsers,
@@ -3447,7 +3415,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, parser);
+					const childContext = withChildContext$1(contextWithRegistry$1, i, parserState, parser);
 					const excludedSourceFields = perChildExcludedSourceFields$1[i];
 					const contextForChild = excludedSourceFields == null ? childContext : (() => {
 						const childRuntime = createDependencyRuntimeContext(runtime$1.registry.clone());
@@ -3461,7 +3429,7 @@ function merge(...args) {
 						};
 					})();
 					const parserSuggestions = parser.suggest(contextForChild, prefix);
-					if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
+					if (parser.mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
 					else suggestions.push(...parserSuggestions);
 				}
 				yield* deduplicateSuggestions(suggestions);
@@ -3488,7 +3456,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, parser);
+					const childContext = withChildContext$1(contextWithRegistry, i, parserState, parser);
 					const excludedSourceFields = perChildExcludedSourceFields[i];
 					const contextForChild = excludedSourceFields == null ? childContext : (() => {
 						const childRuntime = createDependencyRuntimeContext(runtime.registry.clone());
@@ -3749,7 +3717,7 @@ function tryParseSuggestList(context, stateArray, parsers, matchedParsers, remai
 	for (let ri = 0; ri < remaining.length; ri++) {
 		const [parser, index] = remaining[ri];
 		const parserState = index < stateArray.length ? stateArray[index] : parser.initialState;
-		const resultOrPromise = parser.parse(withChildContext(context, index, parserState, parser));
+		const resultOrPromise = parser.parse(withChildContext$1(context, index, parserState, parser));
 		if (resultOrPromise != null && typeof resultOrPromise === "object" && "then" in resultOrPromise && typeof resultOrPromise.then === "function") {
 			const tail = remaining.slice(ri + 1);
 			return resultOrPromise.then((result$1) => {
@@ -3801,7 +3769,7 @@ function tryParseSuggestList(context, stateArray, parsers, matchedParsers, remai
 function concat(...parsers) {
 	if (parsers.length < 1) throw new TypeError("concat() requires at least one parser argument.");
 	assertParsers(parsers, "concat()");
-	const combinedMode = parsers.some((p) => p.$mode === "async") ? "async" : "sync";
+	const combinedMode = parsers.some((p) => p.mode === "async") ? "async" : "sync";
 	const isAsync = combinedMode === "async";
 	const syncParsers = parsers;
 	const initialState = parsers.map((parser) => parser.initialState);
@@ -3818,7 +3786,7 @@ function concat(...parsers) {
 			const stateArray = currentContext.state;
 			const remainingParsers = syncParsers.map((parser, index) => [parser, index]).filter(([_, index]) => !matchedParsers.has(index)).sort(([parserA], [parserB]) => parserB.priority - parserA.priority);
 			for (const [parser, index] of remainingParsers) {
-				const result = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+				const result = parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 				if (result.success && result.consumed.length > 0) {
 					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : s));
 					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
@@ -3839,7 +3807,7 @@ function concat(...parsers) {
 				} else if (!result.success && error.consumed < result.consumed) error = result;
 			}
 			if (!foundMatch) for (const [parser, index] of remainingParsers) {
-				const result = parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+				const result = parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 				if (result.success && result.consumed.length < 1) {
 					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : s));
 					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
@@ -3884,7 +3852,7 @@ function concat(...parsers) {
 			const stateArray = currentContext.state;
 			const remainingParsers = parsers.map((parser, index) => [parser, index]).filter(([_, index]) => !matchedParsers.has(index)).sort(([parserA], [parserB]) => parserB.priority - parserA.priority);
 			for (const [parser, index] of remainingParsers) {
-				const result = await parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+				const result = await parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 				if (result.success && result.consumed.length > 0) {
 					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : s));
 					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
@@ -3905,7 +3873,7 @@ function concat(...parsers) {
 				} else if (!result.success && error.consumed < result.consumed) error = result;
 			}
 			if (!foundMatch) for (const [parser, index] of remainingParsers) {
-				const result = await parser.parse(withChildContext(currentContext, index, stateArray[index], parser));
+				const result = await parser.parse(withChildContext$1(currentContext, index, stateArray[index], parser));
 				if (result.success && result.consumed.length < 1) {
 					const newStateArray = annotateFreshArray(currentContext.state, stateArray.map((s, idx) => idx === index ? getWrappedChildState(currentContext.state, result.next.state, parser) : s));
 					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
@@ -4038,7 +4006,7 @@ function concat(...parsers) {
 		};
 	};
 	const concatParser = {
-		$mode: combinedMode,
+		mode: combinedMode,
 		$valueType: [],
 		$stateType: [],
 		priority: parsers.length > 0 ? Math.max(...parsers.map((p) => p.priority)) : 0,
@@ -4133,8 +4101,8 @@ function concat(...parsers) {
 				for (let i = 0; i < parsers.length; i++) {
 					const parser = parsers[i];
 					const parserState = stateArray$1 && Array.isArray(stateArray$1) ? stateArray$1[i] : parser.initialState;
-					const parserSuggestions = parser.suggest(withChildContext(contextWithRegistry$1, i, parserState, parser), prefix);
-					if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
+					const parserSuggestions = parser.suggest(withChildContext$1(contextWithRegistry$1, i, parserState, parser), prefix);
+					if (parser.mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
 					else suggestions.push(...parserSuggestions);
 				}
 				yield* deduplicateSuggestions(suggestions);
@@ -4146,7 +4114,7 @@ function concat(...parsers) {
 				for (let i = 0; i < syncParsers.length; i++) {
 					const parser = syncParsers[i];
 					const parserState = stateArray && Array.isArray(stateArray) ? stateArray[i] : parser.initialState;
-					const parserSuggestions = parser.suggest(withChildContext(contextWithRegistry, i, parserState, parser), prefix);
+					const parserSuggestions = parser.suggest(withChildContext$1(contextWithRegistry, i, parserState, parser), prefix);
 					suggestions.push(...parserSuggestions);
 				}
 				yield* deduplicateSuggestions(suggestions);
@@ -4184,7 +4152,7 @@ function concat(...parsers) {
 function group(label, parser, options = {}) {
 	validateLabel(label);
 	const groupParser = {
-		$mode: parser.$mode,
+		mode: parser.mode,
 		$valueType: parser.$valueType,
 		$stateType: parser.$stateType,
 		priority: parser.priority,
@@ -4204,7 +4172,7 @@ function group(label, parser, options = {}) {
 		parse: (context) => parser.parse(context),
 		complete: (state, exec) => parser.complete(state, exec),
 		suggest: (context, prefix) => {
-			if (options.hidden === true) return dispatchIterableByMode(parser.$mode, function* () {}, async function* () {});
+			if (options.hidden === true) return dispatchIterableByMode(parser.mode, function* () {}, async function* () {});
 			return parser.suggest(context, prefix);
 		},
 		getDocFragments: (state, defaultValue) => {
@@ -4330,7 +4298,7 @@ function group(label, parser, options = {}) {
 function conditional(discriminator, branches, defaultBranch, options) {
 	const branchParsers = Object.entries(branches);
 	const allBranchParsers = defaultBranch ? [...branchParsers.map(([_, p]) => p), defaultBranch] : branchParsers.map(([_, p]) => p);
-	const combinedMode = discriminator.$mode === "async" || allBranchParsers.some((p) => p.$mode === "async") ? "async" : "sync";
+	const combinedMode = discriminator.mode === "async" || allBranchParsers.some((p) => p.mode === "async") ? "async" : "sync";
 	const isAsync = combinedMode === "async";
 	const maxPriority = Math.max(discriminator.priority, ...allBranchParsers.map((p) => p.priority));
 	function appendLiteralToUsage(usage$1, literalValue) {
@@ -4381,7 +4349,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		const syncDefaultBranch = defaultBranch;
 		if (state.selectedBranch !== void 0) {
 			const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
-			const branchResult = branchParser.parse(withChildContext(context, "_branch", state.branchState, branchParser, branchParser.usage));
+			const branchResult = branchParser.parse(withChildContext$1(context, "_branch", state.branchState, branchParser, branchParser.usage));
 			if (branchResult.success) {
 				const mergedExec = mergeChildExec(context.exec, branchResult.next.exec);
 				return {
@@ -4402,7 +4370,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			}
 			return branchResult;
 		}
-		const discriminatorResult = syncDiscriminator.parse({ ...withChildContext(context, "_discriminator", state.discriminatorState, syncDiscriminator) });
+		const discriminatorResult = syncDiscriminator.parse({ ...withChildContext$1(context, "_discriminator", state.discriminatorState, syncDiscriminator) });
 		if (discriminatorResult.success) {
 			const annotatedDiscriminatorState = getWrappedChildState(state, discriminatorResult.next.state, syncDiscriminator);
 			const completionResult = syncDiscriminator.complete(annotatedDiscriminatorState, withChildExecPath(context.exec, "_discriminator"));
@@ -4412,7 +4380,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				if (branchParser) {
 					const discriminatorExec = mergeChildExec(context.exec, discriminatorResult.next.exec);
 					const branchParseResult = branchParser.parse({
-						...withChildContext({
+						...withChildContext$1({
 							...context,
 							...discriminatorExec != null ? {
 								exec: discriminatorExec,
@@ -4478,7 +4446,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		}
 		const discriminatorConsumed = discriminatorResult.success ? discriminatorResult.consumed.length : discriminatorResult.consumed;
 		if (syncDefaultBranch !== void 0) {
-			const defaultResult = syncDefaultBranch.parse(withChildContext(context, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch, syncDefaultBranch.usage));
+			const defaultResult = syncDefaultBranch.parse(withChildContext$1(context, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch, syncDefaultBranch.usage));
 			if (defaultResult.success && (defaultResult.consumed.length > 0 || discriminatorConsumed === 0 && context.buffer.length === 0)) {
 				const mergedExec = mergeChildExec(context.exec, defaultResult.next.exec);
 				const commitDefault = defaultResult.consumed.length > 0 || context.buffer.length === 0;
@@ -4512,7 +4480,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		const state = context.state ?? initialState;
 		if (state.selectedBranch !== void 0) {
 			const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
-			const branchResult = await branchParser.parse(withChildContext(context, "_branch", state.branchState, branchParser, branchParser.usage));
+			const branchResult = await branchParser.parse(withChildContext$1(context, "_branch", state.branchState, branchParser, branchParser.usage));
 			if (branchResult.success) {
 				const mergedExec = mergeChildExec(context.exec, branchResult.next.exec);
 				return {
@@ -4534,9 +4502,9 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			}
 			return branchResult;
 		}
-		const discriminatorResult = await discriminator.parse({ ...withChildContext(context, "_discriminator", state.discriminatorState, discriminator) });
+		const discriminatorResult = await discriminator.parse({ ...withChildContext$1(context, "_discriminator", state.discriminatorState, discriminator) });
 		if (discriminatorResult.success) {
-			if (discriminatorResult.consumed.length === 0 && discriminator.$mode === "async") {
+			if (discriminatorResult.consumed.length === 0 && discriminator.mode === "async") {
 				const discriminatorExec = mergeChildExec(context.exec, discriminatorResult.next.exec);
 				const speculationContext = {
 					...context,
@@ -4553,7 +4521,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				let speculativeError;
 				let ambiguous = false;
 				for (const [key, bp] of branchParsers) {
-					const branchResult = await bp.parse(withChildContext(speculationContext, "_branch", bp.initialState, bp, bp.usage));
+					const branchResult = await bp.parse(withChildContext$1(speculationContext, "_branch", bp.initialState, bp, bp.usage));
 					if (branchResult.success && branchResult.consumed.length > 0) {
 						if (branchResult.provisional) {
 							if (provisionalHit == null && !provisionalAmbiguous) provisionalHit = {
@@ -4612,7 +4580,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				}
 				let deferredBranchState = state.branchState;
 				if (defaultBranch !== void 0 && !ambiguous && !provisionalAmbiguous) {
-					const defaultResult = await defaultBranch.parse(withChildContext(speculationContext, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch, defaultBranch.usage));
+					const defaultResult = await defaultBranch.parse(withChildContext$1(speculationContext, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch, defaultBranch.usage));
 					if (defaultResult.success && defaultResult.consumed.length > 0) {
 						const defaultExec = mergeChildExec(discriminatorExec ?? context.exec, defaultResult.next.exec);
 						return {
@@ -4660,7 +4628,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				if (branchParser) {
 					const discriminatorExec = mergeChildExec(context.exec, discriminatorResult.next.exec);
 					const branchParseResult = await branchParser.parse({
-						...withChildContext({
+						...withChildContext$1({
 							...context,
 							...discriminatorExec != null ? {
 								exec: discriminatorExec,
@@ -4725,7 +4693,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		}
 		const discriminatorConsumed = discriminatorResult.success ? discriminatorResult.consumed.length : discriminatorResult.consumed;
 		if (defaultBranch !== void 0) {
-			const defaultResult = await defaultBranch.parse(withChildContext(context, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch, defaultBranch.usage));
+			const defaultResult = await defaultBranch.parse(withChildContext$1(context, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch, defaultBranch.usage));
 			if (defaultResult.success && (defaultResult.consumed.length > 0 || discriminatorConsumed === 0 && context.buffer.length === 0)) {
 				const mergedExec = mergeChildExec(context.exec, defaultResult.next.exec);
 				const commitDefault = defaultResult.consumed.length > 0 || context.buffer.length === 0;
@@ -5046,7 +5014,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					dependencyRegistry: runtime.registry
 				} } : {}
 			};
-			yield* syncDiscriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState, syncDiscriminator), prefix);
+			yield* syncDiscriminator.suggest(withChildContext$1(suggestContext, "_discriminator", state.discriminatorState, syncDiscriminator), prefix);
 			const annotatedDiscState = getWrappedChildState(state, state.discriminatorState, syncDiscriminator);
 			const discComplete = syncDiscriminator.complete(annotatedDiscState, withChildExecPath(suggestContext.exec ? {
 				...suggestContext.exec,
@@ -5054,8 +5022,8 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			} : void 0, "_discriminator"));
 			if (discComplete.success && syncBranches[discComplete.value] !== void 0) {
 				const resolvedBranch = syncBranches[discComplete.value];
-				yield* resolvedBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? resolvedBranch.initialState, resolvedBranch), prefix);
-			} else if (syncDefaultBranch !== void 0) yield* syncDefaultBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch), prefix);
+				yield* resolvedBranch.suggest(withChildContext$1(suggestContext, "_branch", state.branchState ?? resolvedBranch.initialState, resolvedBranch), prefix);
+			} else if (syncDefaultBranch !== void 0) yield* syncDefaultBranch.suggest(withChildContext$1(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());
@@ -5075,7 +5043,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					dependencyRegistry: runtime.registry
 				} } : {}
 			};
-			yield* branchParser.suggest(withChildContext(suggestContext, "_branch", state.branchState, branchParser), prefix);
+			yield* branchParser.suggest(withChildContext$1(suggestContext, "_branch", state.branchState, branchParser), prefix);
 		}
 	}
 	async function* suggestAsync(context, prefix) {
@@ -5098,9 +5066,9 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					dependencyRegistry: runtime.registry
 				} } : {}
 			};
-			yield* discriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState, discriminator), prefix);
+			yield* discriminator.suggest(withChildContext$1(suggestContext, "_discriminator", state.discriminatorState, discriminator), prefix);
 			let discResolved = false;
-			if (discriminator.$mode === "sync") {
+			if (discriminator.mode === "sync") {
 				const annotatedDiscState = getWrappedChildState(state, state.discriminatorState, discriminator);
 				const discComplete = discriminator.complete(annotatedDiscState, withChildExecPath(suggestContext.exec ? {
 					...suggestContext.exec,
@@ -5108,12 +5076,12 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				} : void 0, "_discriminator"));
 				if (discComplete.success && branches[discComplete.value] !== void 0) {
 					const resolvedBranch = branches[discComplete.value];
-					yield* resolvedBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? resolvedBranch.initialState, resolvedBranch), prefix);
+					yield* resolvedBranch.suggest(withChildContext$1(suggestContext, "_branch", state.branchState ?? resolvedBranch.initialState, resolvedBranch), prefix);
 					discResolved = true;
 				}
 			}
 			if (!discResolved) {
-				if (defaultBranch !== void 0) yield* defaultBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch), prefix);
+				if (defaultBranch !== void 0) yield* defaultBranch.suggest(withChildContext$1(suggestContext, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch), prefix);
 			}
 		} else {
 			const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
@@ -5134,11 +5102,11 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					dependencyRegistry: runtime.registry
 				} } : {}
 			};
-			yield* branchParser.suggest(withChildContext(suggestContext, "_branch", state.branchState, branchParser), prefix);
+			yield* branchParser.suggest(withChildContext$1(suggestContext, "_branch", state.branchState, branchParser), prefix);
 		}
 	}
 	const conditionalParser = {
-		$mode: combinedMode,
+		mode: combinedMode,
 		$valueType: [],
 		$stateType: [],
 		priority: maxPriority,