@optique/core 1.0.0-dev.1661 → 1.0.0-dev.1665

package/dist/constructs.cjs

@@ -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;
@@ -986,15 +990,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* require_suggestion.deduplicateSuggestions(suggestions);
@@ -1022,16 +1026,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* require_suggestion.deduplicateSuggestions(suggestions);
@@ -1333,10 +1337,17 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 	const createFieldStateGetter = (parentState, annotateChildState = getAnnotatedChildState) => {
 		return (field, parser) => {
 			const fieldKey = field;
-			const cache = parentState != null && typeof parentState === "object" ? inheritedFieldStateCache.get(parentState) ?? (() => {
-				const stateCache = /* @__PURE__ */ new Map();
-				inheritedFieldStateCache.set(parentState, stateCache);
-				return stateCache;
+			const cache = parentState != null && typeof parentState === "object" ? (() => {
+				const annotatorCaches = inheritedFieldStateCache.get(parentState) ?? (() => {
+					const nextCaches = /* @__PURE__ */ new WeakMap();
+					inheritedFieldStateCache.set(parentState, nextCaches);
+					return nextCaches;
+				})();
+				return annotatorCaches.get(annotateChildState) ?? (() => {
+					const stateCache = /* @__PURE__ */ new Map();
+					annotatorCaches.set(annotateChildState, stateCache);
+					return stateCache;
+				})();
 			})() : void 0;
 			if (cache?.has(fieldKey)) return cache.get(fieldKey);
 			const sourceState = parentState != null && typeof parentState === "object" && fieldKey in parentState ? parentState[fieldKey] : parser.initialState;
@@ -1499,6 +1510,10 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		parse(context) {
 			return require_mode_dispatch.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 require_mode_dispatch.dispatchByMode(combinedMode, () => {
 				const runtime = exec?.dependencyRuntime ?? require_dependency_runtime.createDependencyRuntimeContext(exec?.dependencyRegistry);
@@ -1742,7 +1757,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,
@@ -1896,18 +1911,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 = require_parser.getParserSuggestRuntimeNodes(parser, getAnnotatedChildState(stateArray, parserState, parser), [...prefix, index]);
+		if (nodes.length < 1) continue;
+		const failedRuntime = require_dependency_runtime.createDependencyRuntimeContext();
+		require_dependency_runtime.collectExplicitSourceValues(nodes, failedRuntime);
+		for (const node of nodes) {
+			const sourceId = node.parser.dependencyMetadata?.source?.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 = require_parser.getParserSuggestRuntimeNodes(parser, getAnnotatedChildState(stateArray, parserState, parser), [...prefix, index]);
+		if (nodes.length < 1) continue;
+		const failedRuntime = require_dependency_runtime.createDependencyRuntimeContext();
+		await require_dependency_runtime.collectExplicitSourceValuesAsync(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);
 		}
 	}
-	for (const sourceId of failedSourceIds) runtime.markSourceFailed(sourceId);
 }
 function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 	const label = typeof labelOrParsers === "string" ? labelOrParsers : void 0;
@@ -2306,7 +2339,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);
@@ -2351,7 +2384,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);
@@ -2600,7 +2633,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 = require_dependency_runtime.createDependencyRuntimeContext(runtime$1.registry.clone());
@@ -2641,7 +2674,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 = require_dependency_runtime.createDependencyRuntimeContext(runtime.registry.clone());
@@ -3434,7 +3467,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,
@@ -3478,7 +3511,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,
@@ -3499,7 +3532,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 									kind: "branch",
 									key: value
 								},
-								branchState: branchParser.initialState
+								branchState: getAnnotatedChildState(state, branchParser.initialState, branchParser)
 							},
 							...discriminatorExec != null ? {
 								exec: discriminatorExec,
@@ -3522,7 +3555,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,
@@ -3552,7 +3585,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,
@@ -3596,7 +3629,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,
@@ -3617,7 +3650,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 									kind: "branch",
 									key: value
 								},
-								branchState: branchParser.initialState
+								branchState: getAnnotatedChildState(state, branchParser.initialState, branchParser)
 							},
 							...discriminatorExec != null ? {
 								exec: discriminatorExec,
@@ -3640,7 +3673,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,
@@ -3663,7 +3696,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 {
@@ -3683,12 +3716,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 = require_dependency_runtime.createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
 		require_dependency_runtime.collectExplicitSourceValues(require_dependency_runtime.buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, exec?.path), runtime);
 		require_dependency_runtime.collectSourcesFromState(combinedState, runtime);
-		const resolvedBranchState = require_dependency_runtime.resolveStateWithRuntime(state.branchState, runtime);
+		const resolvedBranchState = getAnnotatedChildState(state, require_dependency_runtime.resolveStateWithRuntime(state.branchState, runtime), branchParser);
 		const completionExec = {
 			...exec ?? {
 				usage: branchParser.usage,
@@ -3726,7 +3759,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 {
@@ -3746,12 +3779,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 = require_dependency_runtime.createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
 		await require_dependency_runtime.collectExplicitSourceValuesAsync(require_dependency_runtime.buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, exec?.path), runtime);
 		require_dependency_runtime.collectSourcesFromState(combinedState, runtime);
-		const resolvedBranchState = await require_dependency_runtime.resolveStateWithRuntimeAsync(state.branchState, runtime);
+		const resolvedBranchState = getAnnotatedChildState(state, await require_dependency_runtime.resolveStateWithRuntimeAsync(state.branchState, runtime), branchParser);
 		const completionExec = {
 			...exec ?? {
 				usage: branchParser.usage,
@@ -3793,14 +3826,12 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		const syncDefaultBranch = defaultBranch;
 		if (state.selectedBranch === void 0) {
 			const runtime = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
-			require_dependency_runtime.collectExplicitSourceValues(require_dependency_runtime.buildRuntimeNodesFromPairs(syncDefaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", syncDefaultBranch]], {
-				_discriminator: state.discriminatorState,
-				_branch: state.branchState
-			}, context.exec?.path), runtime);
-			require_dependency_runtime.collectSourcesFromState({
+			const defaultCombinedState = {
 				_discriminator: state.discriminatorState,
-				_branch: state.branchState
-			}, runtime);
+				_branch: syncDefaultBranch == null ? state.branchState : getAnnotatedChildState(state, state.branchState, syncDefaultBranch)
+			};
+			require_dependency_runtime.collectExplicitSourceValues(require_dependency_runtime.buildRuntimeNodesFromPairs(syncDefaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", syncDefaultBranch]], defaultCombinedState, context.exec?.path), runtime);
+			require_dependency_runtime.collectSourcesFromState(defaultCombinedState, runtime);
 			const suggestContext = {
 				...context,
 				dependencyRegistry: runtime.registry,
@@ -3811,13 +3842,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 = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
 			const combinedState = {
 				_discriminator: state.discriminatorState,
-				_branch: state.branchState
+				_branch: getAnnotatedChildState(state, state.branchState, branchParser)
 			};
 			require_dependency_runtime.collectExplicitSourceValues(require_dependency_runtime.buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, context.exec?.path), runtime);
 			require_dependency_runtime.collectSourcesFromState(combinedState, runtime);
@@ -3830,21 +3861,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 = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
-			await require_dependency_runtime.collectExplicitSourceValuesAsync(require_dependency_runtime.buildRuntimeNodesFromPairs(defaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", defaultBranch]], {
+			const defaultCombinedState = {
 				_discriminator: state.discriminatorState,
-				_branch: state.branchState
-			}, context.exec?.path), runtime);
-			require_dependency_runtime.collectSourcesFromState({
-				_discriminator: state.discriminatorState,
-				_branch: state.branchState
-			}, runtime);
+				_branch: defaultBranch == null ? state.branchState : getAnnotatedChildState(state, state.branchState, defaultBranch)
+			};
+			await require_dependency_runtime.collectExplicitSourceValuesAsync(require_dependency_runtime.buildRuntimeNodesFromPairs(defaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", defaultBranch]], defaultCombinedState, context.exec?.path), runtime);
+			require_dependency_runtime.collectSourcesFromState(defaultCombinedState, runtime);
 			const suggestContext = {
 				...context,
 				dependencyRegistry: runtime.registry,
@@ -3855,13 +3884,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 = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
 			const combinedState = {
 				_discriminator: state.discriminatorState,
-				_branch: state.branchState
+				_branch: getAnnotatedChildState(state, state.branchState, branchParser)
 			};
 			await require_dependency_runtime.collectExplicitSourceValuesAsync(require_dependency_runtime.buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, context.exec?.path), runtime);
 			require_dependency_runtime.collectSourcesFromState(combinedState, runtime);
@@ -3874,7 +3903,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 = {

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;
@@ -986,15 +990,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 +1026,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);
@@ -1333,10 +1337,17 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 	const createFieldStateGetter = (parentState, annotateChildState = getAnnotatedChildState) => {
 		return (field, parser) => {
 			const fieldKey = field;
-			const cache = parentState != null && typeof parentState === "object" ? inheritedFieldStateCache.get(parentState) ?? (() => {
-				const stateCache = /* @__PURE__ */ new Map();
-				inheritedFieldStateCache.set(parentState, stateCache);
-				return stateCache;
+			const cache = parentState != null && typeof parentState === "object" ? (() => {
+				const annotatorCaches = inheritedFieldStateCache.get(parentState) ?? (() => {
+					const nextCaches = /* @__PURE__ */ new WeakMap();
+					inheritedFieldStateCache.set(parentState, nextCaches);
+					return nextCaches;
+				})();
+				return annotatorCaches.get(annotateChildState) ?? (() => {
+					const stateCache = /* @__PURE__ */ new Map();
+					annotatorCaches.set(annotateChildState, stateCache);
+					return stateCache;
+				})();
 			})() : void 0;
 			if (cache?.has(fieldKey)) return cache.get(fieldKey);
 			const sourceState = parentState != null && typeof parentState === "object" && fieldKey in parentState ? parentState[fieldKey] : parser.initialState;
@@ -1499,6 +1510,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);
@@ -1742,7 +1757,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,
@@ -1896,18 +1911,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 && 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) failedSourceIds.add(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;
@@ -2306,7 +2339,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);
@@ -2351,7 +2384,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);
@@ -2600,7 +2633,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());
@@ -2641,7 +2674,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());
@@ -3434,7 +3467,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,
@@ -3478,7 +3511,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,
@@ -3499,7 +3532,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 									kind: "branch",
 									key: value
 								},
-								branchState: branchParser.initialState
+								branchState: getAnnotatedChildState(state, branchParser.initialState, branchParser)
 							},
 							...discriminatorExec != null ? {
 								exec: discriminatorExec,
@@ -3522,7 +3555,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,
@@ -3552,7 +3585,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,
@@ -3596,7 +3629,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,
@@ -3617,7 +3650,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 									kind: "branch",
 									key: value
 								},
-								branchState: branchParser.initialState
+								branchState: getAnnotatedChildState(state, branchParser.initialState, branchParser)
 							},
 							...discriminatorExec != null ? {
 								exec: discriminatorExec,
@@ -3640,7 +3673,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,
@@ -3663,7 +3696,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 {
@@ -3683,12 +3716,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,
@@ -3726,7 +3759,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 {
@@ -3746,12 +3779,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,
@@ -3793,14 +3826,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]], {
-				_discriminator: state.discriminatorState,
-				_branch: state.branchState
-			}, context.exec?.path), runtime);
-			collectSourcesFromState({
+			const defaultCombinedState = {
 				_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,
@@ -3811,13 +3842,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);
@@ -3830,21 +3861,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,
@@ -3855,13 +3884,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);
@@ -3874,7 +3903,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 = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.1661+6fc17d4f",
+  "version": "1.0.0-dev.1665+622e89f0",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",