@optique/core 0.10.0-dev.296 → 0.10.0-dev.297

package/dist/constructs.cjs

@@ -538,12 +538,18 @@ function longestMatch(...args) {
 * @internal
 */
 function* suggestObjectSync(context, prefix, parserPairs) {
+	const registry = context.dependencyRegistry instanceof require_dependency.DependencyRegistry ? context.dependencyRegistry : new require_dependency.DependencyRegistry();
+	if (context.state && typeof context.state === "object") collectDependencies(context.state, registry);
+	const contextWithRegistry = {
+		...context,
+		dependencyRegistry: registry
+	};
 	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({
-				...context,
+				...contextWithRegistry,
 				state: fieldState
 			}, prefix);
 			return;
@@ -553,7 +559,7 @@ function* suggestObjectSync(context, prefix, parserPairs) {
 	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({
-			...context,
+			...contextWithRegistry,
 			state: fieldState
 		}, prefix);
 		suggestions.push(...fieldSuggestions);
@@ -565,12 +571,18 @@ function* suggestObjectSync(context, prefix, parserPairs) {
 * @internal
 */
 async function* suggestObjectAsync(context, prefix, parserPairs) {
+	const registry = context.dependencyRegistry instanceof require_dependency.DependencyRegistry ? context.dependencyRegistry : new require_dependency.DependencyRegistry();
+	if (context.state && typeof context.state === "object") collectDependencies(context.state, registry);
+	const contextWithRegistry = {
+		...context,
+		dependencyRegistry: registry
+	};
 	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({
-				...context,
+				...contextWithRegistry,
 				state: fieldState
 			}, prefix);
 			for await (const s of suggestions$1) yield s;
@@ -581,7 +593,7 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 	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({
-			...context,
+			...contextWithRegistry,
 			state: fieldState
 		}, prefix);
 		for await (const s of fieldSuggestions) suggestions.push(s);
@@ -647,19 +659,17 @@ function resolveDeferred(state, registry) {
 		const parser = deferredState.parser;
 		const depIds = deferredState.dependencyIds;
 		if (depIds && depIds.length > 0) {
+			const defaults = deferredState.defaultValues;
 			const dependencyValues = [];
-			let allDepsAvailable = true;
-			for (const depId$1 of depIds) if (registry.has(depId$1)) dependencyValues.push(registry.get(depId$1));
-			else {
-				allDepsAvailable = false;
-				break;
+			for (let i = 0; i < depIds.length; i++) {
+				const depId$1 = depIds[i];
+				if (registry.has(depId$1)) dependencyValues.push(registry.get(depId$1));
+				else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
+				else return deferredState.preliminaryResult;
 			}
-			if (allDepsAvailable) {
-				const reParseResult = parser[require_dependency.ParseWithDependency](deferredState.rawInput, dependencyValues);
-				if (reParseResult instanceof Promise) return deferredState.preliminaryResult;
-				return reParseResult;
-			}
-			return deferredState.preliminaryResult;
+			const reParseResult = parser[require_dependency.ParseWithDependency](deferredState.rawInput, dependencyValues);
+			if (reParseResult instanceof Promise) return deferredState.preliminaryResult;
+			return reParseResult;
 		}
 		const depId = deferredState.dependencyId;
 		if (registry.has(depId)) {
@@ -704,18 +714,16 @@ async function resolveDeferredAsync(state, registry) {
 		const parser = deferredState.parser;
 		const depIds = deferredState.dependencyIds;
 		if (depIds && depIds.length > 0) {
+			const defaults = deferredState.defaultValues;
 			const dependencyValues = [];
-			let allDepsAvailable = true;
-			for (const depId$1 of depIds) if (registry.has(depId$1)) dependencyValues.push(registry.get(depId$1));
-			else {
-				allDepsAvailable = false;
-				break;
-			}
-			if (allDepsAvailable) {
-				const reParseResult = parser[require_dependency.ParseWithDependency](deferredState.rawInput, dependencyValues);
-				return Promise.resolve(reParseResult);
+			for (let i = 0; i < depIds.length; i++) {
+				const depId$1 = depIds[i];
+				if (registry.has(depId$1)) dependencyValues.push(registry.get(depId$1));
+				else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
+				else return deferredState.preliminaryResult;
 			}
-			return deferredState.preliminaryResult;
+			const reParseResult = parser[require_dependency.ParseWithDependency](deferredState.rawInput, dependencyValues);
+			return Promise.resolve(reParseResult);
 		}
 		const depId = deferredState.dependencyId;
 		if (registry.has(depId)) {
@@ -2230,6 +2238,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		};
 	};
 	const completeSync = (state) => {
+		const syncDiscriminator = discriminator;
 		const syncDefaultBranch = defaultBranch;
 		const syncBranches = branches;
 		if (state.selectedBranch === void 0) {
@@ -2248,7 +2257,14 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 		}
 		const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
-		const branchResult = branchParser.complete(state.branchState);
+		const discriminatorCompleteResult = syncDiscriminator.complete(state.discriminatorState);
+		const combinedState = {
+			_discriminator: state.discriminatorState,
+			_branch: state.branchState
+		};
+		const resolvedCombinedState = resolveDeferredParseStates(combinedState);
+		const resolvedBranchState = resolvedCombinedState._branch;
+		const branchResult = branchParser.complete(resolvedBranchState);
 		if (!branchResult.success) {
 			if (state.discriminatorValue !== void 0 && options?.errors?.branchError) return {
 				success: false,
@@ -2256,7 +2272,11 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 			return branchResult;
 		}
-		const discriminatorValue = state.selectedBranch.kind === "default" ? void 0 : state.selectedBranch.key;
+		let discriminatorValue;
+		if (state.selectedBranch.kind === "default") discriminatorValue = void 0;
+		else if (require_dependency.isDependencySourceState(discriminatorCompleteResult)) discriminatorValue = discriminatorCompleteResult.result.success ? discriminatorCompleteResult.result.value : state.selectedBranch.key;
+		else if (discriminatorCompleteResult.success) discriminatorValue = discriminatorCompleteResult.value;
+		else discriminatorValue = state.selectedBranch.key;
 		return {
 			success: true,
 			value: [discriminatorValue, branchResult.value]
@@ -2279,7 +2299,14 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 		}
 		const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
-		const branchResult = await branchParser.complete(state.branchState);
+		const discriminatorCompleteResult = await discriminator.complete(state.discriminatorState);
+		const combinedState = {
+			_discriminator: state.discriminatorState,
+			_branch: state.branchState
+		};
+		const resolvedCombinedState = await resolveDeferredParseStatesAsync(combinedState);
+		const resolvedBranchState = resolvedCombinedState._branch;
+		const branchResult = await branchParser.complete(resolvedBranchState);
 		if (!branchResult.success) {
 			if (state.discriminatorValue !== void 0 && options?.errors?.branchError) return {
 				success: false,
@@ -2287,7 +2314,11 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 			return branchResult;
 		}
-		const discriminatorValue = state.selectedBranch.kind === "default" ? void 0 : state.selectedBranch.key;
+		let discriminatorValue;
+		if (state.selectedBranch.kind === "default") discriminatorValue = void 0;
+		else if (require_dependency.isDependencySourceState(discriminatorCompleteResult)) discriminatorValue = discriminatorCompleteResult.result.success ? discriminatorCompleteResult.result.value : state.selectedBranch.key;
+		else if (discriminatorCompleteResult.success) discriminatorValue = discriminatorCompleteResult.value;
+		else discriminatorValue = state.selectedBranch.key;
 		return {
 			success: true,
 			value: [discriminatorValue, branchResult.value]

package/dist/constructs.js

@@ -538,12 +538,18 @@ function longestMatch(...args) {
 * @internal
 */
 function* suggestObjectSync(context, prefix, parserPairs) {
+	const registry = context.dependencyRegistry instanceof DependencyRegistry ? context.dependencyRegistry : new DependencyRegistry();
+	if (context.state && typeof context.state === "object") collectDependencies(context.state, registry);
+	const contextWithRegistry = {
+		...context,
+		dependencyRegistry: registry
+	};
 	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({
-				...context,
+				...contextWithRegistry,
 				state: fieldState
 			}, prefix);
 			return;
@@ -553,7 +559,7 @@ function* suggestObjectSync(context, prefix, parserPairs) {
 	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({
-			...context,
+			...contextWithRegistry,
 			state: fieldState
 		}, prefix);
 		suggestions.push(...fieldSuggestions);
@@ -565,12 +571,18 @@ function* suggestObjectSync(context, prefix, parserPairs) {
 * @internal
 */
 async function* suggestObjectAsync(context, prefix, parserPairs) {
+	const registry = context.dependencyRegistry instanceof DependencyRegistry ? context.dependencyRegistry : new DependencyRegistry();
+	if (context.state && typeof context.state === "object") collectDependencies(context.state, registry);
+	const contextWithRegistry = {
+		...context,
+		dependencyRegistry: registry
+	};
 	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({
-				...context,
+				...contextWithRegistry,
 				state: fieldState
 			}, prefix);
 			for await (const s of suggestions$1) yield s;
@@ -581,7 +593,7 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 	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({
-			...context,
+			...contextWithRegistry,
 			state: fieldState
 		}, prefix);
 		for await (const s of fieldSuggestions) suggestions.push(s);
@@ -647,19 +659,17 @@ function resolveDeferred(state, registry) {
 		const parser = deferredState.parser;
 		const depIds = deferredState.dependencyIds;
 		if (depIds && depIds.length > 0) {
+			const defaults = deferredState.defaultValues;
 			const dependencyValues = [];
-			let allDepsAvailable = true;
-			for (const depId$1 of depIds) if (registry.has(depId$1)) dependencyValues.push(registry.get(depId$1));
-			else {
-				allDepsAvailable = false;
-				break;
+			for (let i = 0; i < depIds.length; i++) {
+				const depId$1 = depIds[i];
+				if (registry.has(depId$1)) dependencyValues.push(registry.get(depId$1));
+				else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
+				else return deferredState.preliminaryResult;
 			}
-			if (allDepsAvailable) {
-				const reParseResult = parser[ParseWithDependency](deferredState.rawInput, dependencyValues);
-				if (reParseResult instanceof Promise) return deferredState.preliminaryResult;
-				return reParseResult;
-			}
-			return deferredState.preliminaryResult;
+			const reParseResult = parser[ParseWithDependency](deferredState.rawInput, dependencyValues);
+			if (reParseResult instanceof Promise) return deferredState.preliminaryResult;
+			return reParseResult;
 		}
 		const depId = deferredState.dependencyId;
 		if (registry.has(depId)) {
@@ -704,18 +714,16 @@ async function resolveDeferredAsync(state, registry) {
 		const parser = deferredState.parser;
 		const depIds = deferredState.dependencyIds;
 		if (depIds && depIds.length > 0) {
+			const defaults = deferredState.defaultValues;
 			const dependencyValues = [];
-			let allDepsAvailable = true;
-			for (const depId$1 of depIds) if (registry.has(depId$1)) dependencyValues.push(registry.get(depId$1));
-			else {
-				allDepsAvailable = false;
-				break;
-			}
-			if (allDepsAvailable) {
-				const reParseResult = parser[ParseWithDependency](deferredState.rawInput, dependencyValues);
-				return Promise.resolve(reParseResult);
+			for (let i = 0; i < depIds.length; i++) {
+				const depId$1 = depIds[i];
+				if (registry.has(depId$1)) dependencyValues.push(registry.get(depId$1));
+				else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
+				else return deferredState.preliminaryResult;
 			}
-			return deferredState.preliminaryResult;
+			const reParseResult = parser[ParseWithDependency](deferredState.rawInput, dependencyValues);
+			return Promise.resolve(reParseResult);
 		}
 		const depId = deferredState.dependencyId;
 		if (registry.has(depId)) {
@@ -2230,6 +2238,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		};
 	};
 	const completeSync = (state) => {
+		const syncDiscriminator = discriminator;
 		const syncDefaultBranch = defaultBranch;
 		const syncBranches = branches;
 		if (state.selectedBranch === void 0) {
@@ -2248,7 +2257,14 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 		}
 		const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
-		const branchResult = branchParser.complete(state.branchState);
+		const discriminatorCompleteResult = syncDiscriminator.complete(state.discriminatorState);
+		const combinedState = {
+			_discriminator: state.discriminatorState,
+			_branch: state.branchState
+		};
+		const resolvedCombinedState = resolveDeferredParseStates(combinedState);
+		const resolvedBranchState = resolvedCombinedState._branch;
+		const branchResult = branchParser.complete(resolvedBranchState);
 		if (!branchResult.success) {
 			if (state.discriminatorValue !== void 0 && options?.errors?.branchError) return {
 				success: false,
@@ -2256,7 +2272,11 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 			return branchResult;
 		}
-		const discriminatorValue = state.selectedBranch.kind === "default" ? void 0 : state.selectedBranch.key;
+		let discriminatorValue;
+		if (state.selectedBranch.kind === "default") discriminatorValue = void 0;
+		else if (isDependencySourceState(discriminatorCompleteResult)) discriminatorValue = discriminatorCompleteResult.result.success ? discriminatorCompleteResult.result.value : state.selectedBranch.key;
+		else if (discriminatorCompleteResult.success) discriminatorValue = discriminatorCompleteResult.value;
+		else discriminatorValue = state.selectedBranch.key;
 		return {
 			success: true,
 			value: [discriminatorValue, branchResult.value]
@@ -2279,7 +2299,14 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 		}
 		const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
-		const branchResult = await branchParser.complete(state.branchState);
+		const discriminatorCompleteResult = await discriminator.complete(state.discriminatorState);
+		const combinedState = {
+			_discriminator: state.discriminatorState,
+			_branch: state.branchState
+		};
+		const resolvedCombinedState = await resolveDeferredParseStatesAsync(combinedState);
+		const resolvedBranchState = resolvedCombinedState._branch;
+		const branchResult = await branchParser.complete(resolvedBranchState);
 		if (!branchResult.success) {
 			if (state.discriminatorValue !== void 0 && options?.errors?.branchError) return {
 				success: false,
@@ -2287,7 +2314,11 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 			return branchResult;
 		}
-		const discriminatorValue = state.selectedBranch.kind === "default" ? void 0 : state.selectedBranch.key;
+		let discriminatorValue;
+		if (state.selectedBranch.kind === "default") discriminatorValue = void 0;
+		else if (isDependencySourceState(discriminatorCompleteResult)) discriminatorValue = discriminatorCompleteResult.result.success ? discriminatorCompleteResult.result.value : state.selectedBranch.key;
+		else if (discriminatorCompleteResult.success) discriminatorValue = discriminatorCompleteResult.value;
+		else discriminatorValue = state.selectedBranch.key;
 		return {
 			success: true,
 			value: [discriminatorValue, branchResult.value]

package/dist/dependency.cjs

@@ -27,11 +27,23 @@ const DependencyId = Symbol.for("@optique/core/dependency/DependencyId");
 */
 const DependencyIds = Symbol.for("@optique/core/dependency/DependencyIds");
 /**
+* A unique symbol used to store the default values function on derived parsers.
+* This is used during partial dependency resolution to fill in missing values.
+* @since 0.10.0
+*/
+const DefaultValues = Symbol.for("@optique/core/dependency/DefaultValues");
+/**
 * A unique symbol used to access the parseWithDependency method on derived parsers.
 * @since 0.10.0
 */
 const ParseWithDependency = Symbol.for("@optique/core/dependency/ParseWithDependency");
 /**
+* A unique symbol used to access the suggestWithDependency method on derived parsers.
+* This method generates suggestions using the provided dependency values instead of defaults.
+* @since 0.10.0
+*/
+const SuggestWithDependency = Symbol.for("@optique/core/dependency/SuggestWithDependency");
+/**
 * Creates a dependency source from a {@link ValueParser}.
 *
 * A dependency source wraps an existing value parser and enables creating
@@ -195,6 +207,7 @@ function createSyncDerivedFromParser(sourceId, options) {
 		[DerivedValueParserMarker]: true,
 		[DependencyId]: sourceId,
 		[DependencyIds]: allDependencyIds,
+		[DefaultValues]: options.defaultValues,
 		parse(input) {
 			const sourceValues = options.defaultValues();
 			const derivedParser = options.factory(...sourceValues);
@@ -222,6 +235,16 @@ function createSyncDerivedFromParser(sourceId, options) {
 			const sourceValues = options.defaultValues();
 			const derivedParser = options.factory(...sourceValues);
 			if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
+		},
+		*[SuggestWithDependency](prefix, dependencyValue) {
+			let derivedParser;
+			try {
+				derivedParser = options.factory(...dependencyValue);
+			} catch {
+				const sourceValues = options.defaultValues();
+				derivedParser = options.factory(...sourceValues);
+			}
+			if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
 		}
 	};
 }
@@ -237,6 +260,7 @@ function createAsyncDerivedFromParserFromAsyncFactory(sourceId, options) {
 		[DerivedValueParserMarker]: true,
 		[DependencyId]: sourceId,
 		[DependencyIds]: allDependencyIds,
+		[DefaultValues]: options.defaultValues,
 		parse(input) {
 			const sourceValues = options.defaultValues();
 			const derivedParser = options.factory(...sourceValues);
@@ -264,6 +288,16 @@ function createAsyncDerivedFromParserFromAsyncFactory(sourceId, options) {
 			const sourceValues = options.defaultValues();
 			const derivedParser = options.factory(...sourceValues);
 			if (derivedParser.suggest) for await (const suggestion of derivedParser.suggest(prefix)) yield suggestion;
+		},
+		async *[SuggestWithDependency](prefix, dependencyValue) {
+			let derivedParser;
+			try {
+				derivedParser = options.factory(...dependencyValue);
+			} catch {
+				const sourceValues = options.defaultValues();
+				derivedParser = options.factory(...sourceValues);
+			}
+			if (derivedParser.suggest) for await (const suggestion of derivedParser.suggest(prefix)) yield suggestion;
 		}
 	};
 }
@@ -279,6 +313,7 @@ function createAsyncDerivedFromParserFromSyncFactory(sourceId, options) {
 		[DerivedValueParserMarker]: true,
 		[DependencyId]: sourceId,
 		[DependencyIds]: allDependencyIds,
+		[DefaultValues]: options.defaultValues,
 		parse(input) {
 			const sourceValues = options.defaultValues();
 			const derivedParser = options.factory(...sourceValues);
@@ -306,6 +341,16 @@ function createAsyncDerivedFromParserFromSyncFactory(sourceId, options) {
 			const sourceValues = options.defaultValues();
 			const derivedParser = options.factory(...sourceValues);
 			if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
+		},
+		*[SuggestWithDependency](prefix, dependencyValue) {
+			let derivedParser;
+			try {
+				derivedParser = options.factory(...dependencyValue);
+			} catch {
+				const sourceValues = options.defaultValues();
+				derivedParser = options.factory(...sourceValues);
+			}
+			if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
 		}
 	};
 }
@@ -360,6 +405,15 @@ function createSyncDerivedParser(sourceId, options) {
 			const sourceValue = options.defaultValue();
 			const derivedParser = options.factory(sourceValue);
 			if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
+		},
+		*[SuggestWithDependency](prefix, dependencyValue) {
+			let derivedParser;
+			try {
+				derivedParser = options.factory(dependencyValue);
+			} catch {
+				derivedParser = options.factory(options.defaultValue());
+			}
+			if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
 		}
 	};
 }
@@ -400,6 +454,15 @@ function createAsyncDerivedParserFromAsyncFactory(sourceId, options) {
 			const sourceValue = options.defaultValue();
 			const derivedParser = options.factory(sourceValue);
 			if (derivedParser.suggest) for await (const suggestion of derivedParser.suggest(prefix)) yield suggestion;
+		},
+		async *[SuggestWithDependency](prefix, dependencyValue) {
+			let derivedParser;
+			try {
+				derivedParser = options.factory(dependencyValue);
+			} catch {
+				derivedParser = options.factory(options.defaultValue());
+			}
+			if (derivedParser.suggest) for await (const suggestion of derivedParser.suggest(prefix)) yield suggestion;
 		}
 	};
 }
@@ -440,6 +503,15 @@ function createAsyncDerivedParserFromSyncFactory(sourceId, options) {
 			const sourceValue = options.defaultValue();
 			const derivedParser = options.factory(sourceValue);
 			if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
+		},
+		*[SuggestWithDependency](prefix, dependencyValue) {
+			let derivedParser;
+			try {
+				derivedParser = options.factory(dependencyValue);
+			} catch {
+				derivedParser = options.factory(options.defaultValue());
+			}
+			if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
 		}
 	};
 }
@@ -471,12 +543,15 @@ function isDeferredParseState(value) {
 */
 function createDeferredParseState(rawInput, parser, preliminaryResult) {
 	const multipleIds = DependencyIds in parser ? parser[DependencyIds] : void 0;
+	const defaultValuesFn = DefaultValues in parser ? parser[DefaultValues] : void 0;
+	const defaultVals = defaultValuesFn ? defaultValuesFn() : void 0;
 	return {
 		[DeferredParseMarker]: true,
 		rawInput,
 		parser,
 		dependencyId: parser[DependencyId],
 		dependencyIds: multipleIds,
+		defaultValues: defaultVals,
 		preliminaryResult
 	};
 }
@@ -644,6 +719,7 @@ function formatDependencyError(error) {
 }
 
 //#endregion
+exports.DefaultValues = DefaultValues;
 exports.DeferredParseMarker = DeferredParseMarker;
 exports.DependencyId = DependencyId;
 exports.DependencyIds = DependencyIds;
@@ -653,6 +729,7 @@ exports.DependencySourceStateMarker = DependencySourceStateMarker;
 exports.DerivedValueParserMarker = DerivedValueParserMarker;
 exports.ParseWithDependency = ParseWithDependency;
 exports.PendingDependencySourceStateMarker = PendingDependencySourceStateMarker;
+exports.SuggestWithDependency = SuggestWithDependency;
 exports.TransformsDependencyValueMarker = TransformsDependencyValueMarker;
 exports.WrappedDependencySourceMarker = WrappedDependencySourceMarker;
 exports.createDeferredParseState = createDeferredParseState;

package/dist/dependency.d.cts

@@ -1,7 +1,7 @@
 import { NonEmptyString } from "./nonempty.cjs";
 import { Message } from "./message.cjs";
 import { ValueParser, ValueParserResult } from "./valueparser.cjs";
-import { Mode } from "./parser.cjs";
+import { Mode, Suggestion } from "./parser.cjs";
 
 //#region src/dependency.d.ts
 
@@ -30,11 +30,23 @@ declare const DependencyId: unique symbol;
  * @since 0.10.0
  */
 declare const DependencyIds: unique symbol;
+/**
+ * A unique symbol used to store the default values function on derived parsers.
+ * This is used during partial dependency resolution to fill in missing values.
+ * @since 0.10.0
+ */
+declare const DefaultValues: unique symbol;
 /**
  * A unique symbol used to access the parseWithDependency method on derived parsers.
  * @since 0.10.0
  */
 declare const ParseWithDependency: unique symbol;
+/**
+ * A unique symbol used to access the suggestWithDependency method on derived parsers.
+ * This method generates suggestions using the provided dependency values instead of defaults.
+ * @since 0.10.0
+ */
+declare const SuggestWithDependency: unique symbol;
 /**
  * Combines two modes into a single mode.
  * If either mode is async, the result is async.
@@ -327,6 +339,12 @@ interface DerivedValueParser<M extends Mode = "sync", T = unknown, S = unknown>
    * @internal
    */
   readonly [DependencyIds]?: readonly symbol[];
+  /**
+   * The default values function for this parser's dependencies.
+   * Used during partial dependency resolution to fill in missing values.
+   * @internal
+   */
+  readonly [DefaultValues]?: () => readonly unknown[];
   /**
    * Parses the input using the actual dependency value instead of the default.
    * This method is used during dependency resolution in `complete()`.
@@ -337,6 +355,16 @@ interface DerivedValueParser<M extends Mode = "sync", T = unknown, S = unknown>
    * @internal
    */
   readonly [ParseWithDependency]: (input: string, dependencyValue: S) => ValueParserResult<T> | Promise<ValueParserResult<T>>;
+  /**
+   * Generates suggestions using the provided dependency value instead of the default.
+   * This method is used during shell completion when dependency sources have been parsed.
+   *
+   * @param prefix The input prefix to filter suggestions.
+   * @param dependencyValue The resolved dependency value.
+   * @returns An iterable of suggestions.
+   * @internal
+   */
+  readonly [SuggestWithDependency]?: (prefix: string, dependencyValue: S) => Iterable<Suggestion> | AsyncIterable<Suggestion>;
 }
 /**
  * Creates a dependency source from a {@link ValueParser}.
@@ -484,6 +512,12 @@ interface DeferredParseState<T = unknown> {
    * If present, this is used instead of `dependencyId`.
    */
   readonly dependencyIds?: readonly symbol[];
+  /**
+   * The default values to use for dependencies that are not provided.
+   * For multi-dependency parsers, this is a tuple of default values in order.
+   * For single-dependency parsers, this is the single default value.
+   */
+  readonly defaultValues?: readonly unknown[];
   /**
    * The preliminary parse result using the default dependency value.
    * This is used as a fallback if dependency resolution is not needed
@@ -713,4 +747,4 @@ type DependencyError = {
  */
 declare function formatDependencyError(error: DependencyError): Message;
 //#endregion
-export { AnyDependencySource, CombineMode, CombinedDependencyMode, DeferredParseMarker, DeferredParseState, DependencyError, DependencyId, DependencyIds, DependencyMode, DependencyRegistry, DependencySource, DependencySourceMarker, DependencySourceState, DependencySourceStateMarker, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DerivedValueParserMarker, ParseWithDependency, PendingDependencySourceState, PendingDependencySourceStateMarker, ResolvedDependency, TransformsDependencyValueMarker, WrappedDependencySourceMarker, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource, transformsDependencyValue };
+export { AnyDependencySource, CombineMode, CombinedDependencyMode, DefaultValues, DeferredParseMarker, DeferredParseState, DependencyError, DependencyId, DependencyIds, DependencyMode, DependencyRegistry, DependencySource, DependencySourceMarker, DependencySourceState, DependencySourceStateMarker, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DerivedValueParserMarker, ParseWithDependency, PendingDependencySourceState, PendingDependencySourceStateMarker, ResolvedDependency, SuggestWithDependency, TransformsDependencyValueMarker, WrappedDependencySourceMarker, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource, transformsDependencyValue };

package/dist/dependency.d.ts

@@ -1,7 +1,7 @@
 import { NonEmptyString } from "./nonempty.js";
 import { Message } from "./message.js";
 import { ValueParser, ValueParserResult } from "./valueparser.js";
-import { Mode } from "./parser.js";
+import { Mode, Suggestion } from "./parser.js";
 
 //#region src/dependency.d.ts
 
@@ -30,11 +30,23 @@ declare const DependencyId: unique symbol;
  * @since 0.10.0
  */
 declare const DependencyIds: unique symbol;
+/**
+ * A unique symbol used to store the default values function on derived parsers.
+ * This is used during partial dependency resolution to fill in missing values.
+ * @since 0.10.0
+ */
+declare const DefaultValues: unique symbol;
 /**
  * A unique symbol used to access the parseWithDependency method on derived parsers.
  * @since 0.10.0
  */
 declare const ParseWithDependency: unique symbol;
+/**
+ * A unique symbol used to access the suggestWithDependency method on derived parsers.
+ * This method generates suggestions using the provided dependency values instead of defaults.
+ * @since 0.10.0
+ */
+declare const SuggestWithDependency: unique symbol;
 /**
  * Combines two modes into a single mode.
  * If either mode is async, the result is async.
@@ -327,6 +339,12 @@ interface DerivedValueParser<M extends Mode = "sync", T = unknown, S = unknown>
    * @internal
    */
   readonly [DependencyIds]?: readonly symbol[];
+  /**
+   * The default values function for this parser's dependencies.
+   * Used during partial dependency resolution to fill in missing values.
+   * @internal
+   */
+  readonly [DefaultValues]?: () => readonly unknown[];
   /**
    * Parses the input using the actual dependency value instead of the default.
    * This method is used during dependency resolution in `complete()`.
@@ -337,6 +355,16 @@ interface DerivedValueParser<M extends Mode = "sync", T = unknown, S = unknown>
    * @internal
    */
   readonly [ParseWithDependency]: (input: string, dependencyValue: S) => ValueParserResult<T> | Promise<ValueParserResult<T>>;
+  /**
+   * Generates suggestions using the provided dependency value instead of the default.
+   * This method is used during shell completion when dependency sources have been parsed.
+   *
+   * @param prefix The input prefix to filter suggestions.
+   * @param dependencyValue The resolved dependency value.
+   * @returns An iterable of suggestions.
+   * @internal
+   */
+  readonly [SuggestWithDependency]?: (prefix: string, dependencyValue: S) => Iterable<Suggestion> | AsyncIterable<Suggestion>;
 }
 /**
  * Creates a dependency source from a {@link ValueParser}.
@@ -484,6 +512,12 @@ interface DeferredParseState<T = unknown> {
    * If present, this is used instead of `dependencyId`.
    */
   readonly dependencyIds?: readonly symbol[];
+  /**
+   * The default values to use for dependencies that are not provided.
+   * For multi-dependency parsers, this is a tuple of default values in order.
+   * For single-dependency parsers, this is the single default value.
+   */
+  readonly defaultValues?: readonly unknown[];
   /**
    * The preliminary parse result using the default dependency value.
    * This is used as a fallback if dependency resolution is not needed
@@ -713,4 +747,4 @@ type DependencyError = {
  */
 declare function formatDependencyError(error: DependencyError): Message;
 //#endregion
-export { AnyDependencySource, CombineMode, CombinedDependencyMode, DeferredParseMarker, DeferredParseState, DependencyError, DependencyId, DependencyIds, DependencyMode, DependencyRegistry, DependencySource, DependencySourceMarker, DependencySourceState, DependencySourceStateMarker, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DerivedValueParserMarker, ParseWithDependency, PendingDependencySourceState, PendingDependencySourceStateMarker, ResolvedDependency, TransformsDependencyValueMarker, WrappedDependencySourceMarker, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource, transformsDependencyValue };
+export { AnyDependencySource, CombineMode, CombinedDependencyMode, DefaultValues, DeferredParseMarker, DeferredParseState, DependencyError, DependencyId, DependencyIds, DependencyMode, DependencyRegistry, DependencySource, DependencySourceMarker, DependencySourceState, DependencySourceStateMarker, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DerivedValueParserMarker, ParseWithDependency, PendingDependencySourceState, PendingDependencySourceStateMarker, ResolvedDependency, SuggestWithDependency, TransformsDependencyValueMarker, WrappedDependencySourceMarker, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource, transformsDependencyValue };

package/dist/dependency.js

@@ -27,11 +27,23 @@ const DependencyId = Symbol.for("@optique/core/dependency/DependencyId");
 */
 const DependencyIds = Symbol.for("@optique/core/dependency/DependencyIds");
 /**
+* A unique symbol used to store the default values function on derived parsers.
+* This is used during partial dependency resolution to fill in missing values.
+* @since 0.10.0
+*/
+const DefaultValues = Symbol.for("@optique/core/dependency/DefaultValues");
+/**
 * A unique symbol used to access the parseWithDependency method on derived parsers.
 * @since 0.10.0
 */
 const ParseWithDependency = Symbol.for("@optique/core/dependency/ParseWithDependency");
 /**
+* A unique symbol used to access the suggestWithDependency method on derived parsers.
+* This method generates suggestions using the provided dependency values instead of defaults.
+* @since 0.10.0
+*/
+const SuggestWithDependency = Symbol.for("@optique/core/dependency/SuggestWithDependency");
+/**
 * Creates a dependency source from a {@link ValueParser}.
 *
 * A dependency source wraps an existing value parser and enables creating
@@ -195,6 +207,7 @@ function createSyncDerivedFromParser(sourceId, options) {
 		[DerivedValueParserMarker]: true,
 		[DependencyId]: sourceId,
 		[DependencyIds]: allDependencyIds,
+		[DefaultValues]: options.defaultValues,
 		parse(input) {
 			const sourceValues = options.defaultValues();
 			const derivedParser = options.factory(...sourceValues);
@@ -222,6 +235,16 @@ function createSyncDerivedFromParser(sourceId, options) {
 			const sourceValues = options.defaultValues();
 			const derivedParser = options.factory(...sourceValues);
 			if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
+		},
+		*[SuggestWithDependency](prefix, dependencyValue) {
+			let derivedParser;
+			try {
+				derivedParser = options.factory(...dependencyValue);
+			} catch {
+				const sourceValues = options.defaultValues();
+				derivedParser = options.factory(...sourceValues);
+			}
+			if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
 		}
 	};
 }
@@ -237,6 +260,7 @@ function createAsyncDerivedFromParserFromAsyncFactory(sourceId, options) {
 		[DerivedValueParserMarker]: true,
 		[DependencyId]: sourceId,
 		[DependencyIds]: allDependencyIds,
+		[DefaultValues]: options.defaultValues,
 		parse(input) {
 			const sourceValues = options.defaultValues();
 			const derivedParser = options.factory(...sourceValues);
@@ -264,6 +288,16 @@ function createAsyncDerivedFromParserFromAsyncFactory(sourceId, options) {
 			const sourceValues = options.defaultValues();
 			const derivedParser = options.factory(...sourceValues);
 			if (derivedParser.suggest) for await (const suggestion of derivedParser.suggest(prefix)) yield suggestion;
+		},
+		async *[SuggestWithDependency](prefix, dependencyValue) {
+			let derivedParser;
+			try {
+				derivedParser = options.factory(...dependencyValue);
+			} catch {
+				const sourceValues = options.defaultValues();
+				derivedParser = options.factory(...sourceValues);
+			}
+			if (derivedParser.suggest) for await (const suggestion of derivedParser.suggest(prefix)) yield suggestion;
 		}
 	};
 }
@@ -279,6 +313,7 @@ function createAsyncDerivedFromParserFromSyncFactory(sourceId, options) {
 		[DerivedValueParserMarker]: true,
 		[DependencyId]: sourceId,
 		[DependencyIds]: allDependencyIds,
+		[DefaultValues]: options.defaultValues,
 		parse(input) {
 			const sourceValues = options.defaultValues();
 			const derivedParser = options.factory(...sourceValues);
@@ -306,6 +341,16 @@ function createAsyncDerivedFromParserFromSyncFactory(sourceId, options) {
 			const sourceValues = options.defaultValues();
 			const derivedParser = options.factory(...sourceValues);
 			if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
+		},
+		*[SuggestWithDependency](prefix, dependencyValue) {
+			let derivedParser;
+			try {
+				derivedParser = options.factory(...dependencyValue);
+			} catch {
+				const sourceValues = options.defaultValues();
+				derivedParser = options.factory(...sourceValues);
+			}
+			if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
 		}
 	};
 }
@@ -360,6 +405,15 @@ function createSyncDerivedParser(sourceId, options) {
 			const sourceValue = options.defaultValue();
 			const derivedParser = options.factory(sourceValue);
 			if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
+		},
+		*[SuggestWithDependency](prefix, dependencyValue) {
+			let derivedParser;
+			try {
+				derivedParser = options.factory(dependencyValue);
+			} catch {
+				derivedParser = options.factory(options.defaultValue());
+			}
+			if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
 		}
 	};
 }
@@ -400,6 +454,15 @@ function createAsyncDerivedParserFromAsyncFactory(sourceId, options) {
 			const sourceValue = options.defaultValue();
 			const derivedParser = options.factory(sourceValue);
 			if (derivedParser.suggest) for await (const suggestion of derivedParser.suggest(prefix)) yield suggestion;
+		},
+		async *[SuggestWithDependency](prefix, dependencyValue) {
+			let derivedParser;
+			try {
+				derivedParser = options.factory(dependencyValue);
+			} catch {
+				derivedParser = options.factory(options.defaultValue());
+			}
+			if (derivedParser.suggest) for await (const suggestion of derivedParser.suggest(prefix)) yield suggestion;
 		}
 	};
 }
@@ -440,6 +503,15 @@ function createAsyncDerivedParserFromSyncFactory(sourceId, options) {
 			const sourceValue = options.defaultValue();
 			const derivedParser = options.factory(sourceValue);
 			if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
+		},
+		*[SuggestWithDependency](prefix, dependencyValue) {
+			let derivedParser;
+			try {
+				derivedParser = options.factory(dependencyValue);
+			} catch {
+				derivedParser = options.factory(options.defaultValue());
+			}
+			if (derivedParser.suggest) yield* derivedParser.suggest(prefix);
 		}
 	};
 }
@@ -471,12 +543,15 @@ function isDeferredParseState(value) {
 */
 function createDeferredParseState(rawInput, parser, preliminaryResult) {
 	const multipleIds = DependencyIds in parser ? parser[DependencyIds] : void 0;
+	const defaultValuesFn = DefaultValues in parser ? parser[DefaultValues] : void 0;
+	const defaultVals = defaultValuesFn ? defaultValuesFn() : void 0;
 	return {
 		[DeferredParseMarker]: true,
 		rawInput,
 		parser,
 		dependencyId: parser[DependencyId],
 		dependencyIds: multipleIds,
+		defaultValues: defaultVals,
 		preliminaryResult
 	};
 }
@@ -644,4 +719,4 @@ function formatDependencyError(error) {
 }
 
 //#endregion
-export { DeferredParseMarker, DependencyId, DependencyIds, DependencyRegistry, DependencySourceMarker, DependencySourceStateMarker, DerivedValueParserMarker, ParseWithDependency, PendingDependencySourceStateMarker, TransformsDependencyValueMarker, WrappedDependencySourceMarker, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource, transformsDependencyValue };
+export { DefaultValues, DeferredParseMarker, DependencyId, DependencyIds, DependencyRegistry, DependencySourceMarker, DependencySourceStateMarker, DerivedValueParserMarker, ParseWithDependency, PendingDependencySourceStateMarker, SuggestWithDependency, TransformsDependencyValueMarker, WrappedDependencySourceMarker, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource, transformsDependencyValue };

package/dist/index.cjs

@@ -11,6 +11,7 @@ const require_primitives = require('./primitives.cjs');
 const require_parser = require('./parser.cjs');
 const require_facade = require('./facade.cjs');
 
+exports.DefaultValues = require_dependency.DefaultValues;
 exports.DeferredParseMarker = require_dependency.DeferredParseMarker;
 exports.DependencyId = require_dependency.DependencyId;
 exports.DependencyIds = require_dependency.DependencyIds;
@@ -23,6 +24,7 @@ exports.ParseWithDependency = require_dependency.ParseWithDependency;
 exports.PendingDependencySourceStateMarker = require_dependency.PendingDependencySourceStateMarker;
 exports.RunError = require_facade.RunError;
 exports.RunParserError = require_facade.RunParserError;
+exports.SuggestWithDependency = require_dependency.SuggestWithDependency;
 exports.TransformsDependencyValueMarker = require_dependency.TransformsDependencyValueMarker;
 exports.WithDefaultError = require_modifiers.WithDefaultError;
 exports.WrappedDependencySourceMarker = require_dependency.WrappedDependencySourceMarker;

package/dist/index.d.cts

@@ -5,9 +5,9 @@ import { DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, Doc
 import { ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, FloatOptions, IntegerOptionsBigInt, IntegerOptionsNumber, LocaleOptions, StringOptions, UrlOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, choice, float, integer, isValueParser, locale, string, url, uuid } from "./valueparser.cjs";
 import { ConditionalErrorOptions, ConditionalOptions, DuplicateOptionError, LongestMatchErrorOptions, LongestMatchOptions, MergeOptions, NoMatchContext, ObjectErrorOptions, ObjectOptions, OrErrorOptions, OrOptions, TupleOptions, concat, conditional, group, longestMatch, merge, object, or, tuple } from "./constructs.cjs";
 import { MultipleErrorOptions, MultipleOptions, WithDefaultError, WithDefaultOptions, map, multiple, optional, withDefault } from "./modifiers.cjs";
-import { AnyDependencySource, CombineMode, CombinedDependencyMode, DeferredParseMarker, DeferredParseState, DependencyError, DependencyId, DependencyIds, DependencyMode, DependencyRegistry, DependencySource, DependencySourceMarker, DependencySourceState, DependencySourceStateMarker, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DerivedValueParserMarker, ParseWithDependency, PendingDependencySourceState, PendingDependencySourceStateMarker, ResolvedDependency, TransformsDependencyValueMarker, WrappedDependencySourceMarker, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource, transformsDependencyValue } from "./dependency.cjs";
+import { AnyDependencySource, CombineMode, CombinedDependencyMode, DefaultValues, DeferredParseMarker, DeferredParseState, DependencyError, DependencyId, DependencyIds, DependencyMode, DependencyRegistry, DependencySource, DependencySourceMarker, DependencySourceState, DependencySourceStateMarker, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DerivedValueParserMarker, ParseWithDependency, PendingDependencySourceState, PendingDependencySourceStateMarker, ResolvedDependency, SuggestWithDependency, TransformsDependencyValueMarker, WrappedDependencySourceMarker, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource, transformsDependencyValue } from "./dependency.cjs";
 import { ArgumentErrorOptions, ArgumentOptions, CommandErrorOptions, CommandOptions, FlagErrorOptions, FlagOptions, OptionErrorOptions, OptionOptions, OptionState, PassThroughFormat, PassThroughOptions, argument, command, constant, flag, option, passThrough } from "./primitives.cjs";
 import { CombineModes, DocState, InferMode, InferValue, Mode, ModeIterable, ModeValue, Parser, ParserContext, ParserResult, Result, Suggestion, getDocPage, getDocPageAsync, getDocPageSync, parse, parseAsync, parseSync, suggest, suggestAsync, suggestSync } from "./parser.cjs";
 import { ShellCompletion, bash, fish, nu, pwsh, zsh } from "./completion.cjs";
 import { RunError, RunOptions, RunParserError, run, runParser, runParserAsync, runParserSync } from "./facade.cjs";
-export { AnyDependencySource, ArgumentErrorOptions, ArgumentOptions, ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CombineMode, CombineModes, CombinedDependencyMode, CommandErrorOptions, CommandOptions, ConditionalErrorOptions, ConditionalOptions, DeferredParseMarker, DeferredParseState, DependencyError, DependencyId, DependencyIds, DependencyMode, DependencyRegistry, DependencySource, DependencySourceMarker, DependencySourceState, DependencySourceStateMarker, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DerivedValueParserMarker, DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, DocState, DuplicateOptionError, FlagErrorOptions, FlagOptions, FloatOptions, InferMode, InferValue, IntegerOptionsBigInt, IntegerOptionsNumber, LocaleOptions, LongestMatchErrorOptions, LongestMatchOptions, MergeOptions, Message, MessageFormatOptions, MessageTerm, Mode, ModeIterable, ModeValue, MultipleErrorOptions, MultipleOptions, NoMatchContext, NonEmptyString, ObjectErrorOptions, ObjectOptions, OptionErrorOptions, OptionName, OptionOptions, OptionState, OrErrorOptions, OrOptions, ParseWithDependency, Parser, ParserContext, ParserResult, PassThroughFormat, PassThroughOptions, PendingDependencySourceState, PendingDependencySourceStateMarker, ResolvedDependency, Result, RunError, RunOptions, RunParserError, ShellCompletion, ShowDefaultOptions, StringOptions, Suggestion, TransformsDependencyValueMarker, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, ValueSetOptions, WithDefaultError, WithDefaultOptions, WrappedDependencySourceMarker, argument, bash, choice, command, commandLine, concat, conditional, constant, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractOptionNames, fish, flag, float, formatDependencyError, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getDocPage, getDocPageAsync, getDocPageSync, group, integer, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isNonEmptyString, isPendingDependencySourceState, isValueParser, isWrappedDependencySource, locale, longestMatch, map, merge, message, metavar, multiple, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, parse, parseAsync, parseSync, passThrough, pwsh, run, runParser, runParserAsync, runParserSync, string, suggest, suggestAsync, suggestSync, text, transformsDependencyValue, tuple, url, uuid, value, valueSet, values, withDefault, zsh };
+export { AnyDependencySource, ArgumentErrorOptions, ArgumentOptions, ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CombineMode, CombineModes, CombinedDependencyMode, CommandErrorOptions, CommandOptions, ConditionalErrorOptions, ConditionalOptions, DefaultValues, DeferredParseMarker, DeferredParseState, DependencyError, DependencyId, DependencyIds, DependencyMode, DependencyRegistry, DependencySource, DependencySourceMarker, DependencySourceState, DependencySourceStateMarker, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DerivedValueParserMarker, DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, DocState, DuplicateOptionError, FlagErrorOptions, FlagOptions, FloatOptions, InferMode, InferValue, IntegerOptionsBigInt, IntegerOptionsNumber, LocaleOptions, LongestMatchErrorOptions, LongestMatchOptions, MergeOptions, Message, MessageFormatOptions, MessageTerm, Mode, ModeIterable, ModeValue, MultipleErrorOptions, MultipleOptions, NoMatchContext, NonEmptyString, ObjectErrorOptions, ObjectOptions, OptionErrorOptions, OptionName, OptionOptions, OptionState, OrErrorOptions, OrOptions, ParseWithDependency, Parser, ParserContext, ParserResult, PassThroughFormat, PassThroughOptions, PendingDependencySourceState, PendingDependencySourceStateMarker, ResolvedDependency, Result, RunError, RunOptions, RunParserError, ShellCompletion, ShowDefaultOptions, StringOptions, SuggestWithDependency, Suggestion, TransformsDependencyValueMarker, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, ValueSetOptions, WithDefaultError, WithDefaultOptions, WrappedDependencySourceMarker, argument, bash, choice, command, commandLine, concat, conditional, constant, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractOptionNames, fish, flag, float, formatDependencyError, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getDocPage, getDocPageAsync, getDocPageSync, group, integer, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isNonEmptyString, isPendingDependencySourceState, isValueParser, isWrappedDependencySource, locale, longestMatch, map, merge, message, metavar, multiple, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, parse, parseAsync, parseSync, passThrough, pwsh, run, runParser, runParserAsync, runParserSync, string, suggest, suggestAsync, suggestSync, text, transformsDependencyValue, tuple, url, uuid, value, valueSet, values, withDefault, zsh };

package/dist/index.d.ts

@@ -5,9 +5,9 @@ import { DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, Doc
 import { ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, FloatOptions, IntegerOptionsBigInt, IntegerOptionsNumber, LocaleOptions, StringOptions, UrlOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, choice, float, integer, isValueParser, locale, string, url, uuid } from "./valueparser.js";
 import { ConditionalErrorOptions, ConditionalOptions, DuplicateOptionError, LongestMatchErrorOptions, LongestMatchOptions, MergeOptions, NoMatchContext, ObjectErrorOptions, ObjectOptions, OrErrorOptions, OrOptions, TupleOptions, concat, conditional, group, longestMatch, merge, object, or, tuple } from "./constructs.js";
 import { MultipleErrorOptions, MultipleOptions, WithDefaultError, WithDefaultOptions, map, multiple, optional, withDefault } from "./modifiers.js";
-import { AnyDependencySource, CombineMode, CombinedDependencyMode, DeferredParseMarker, DeferredParseState, DependencyError, DependencyId, DependencyIds, DependencyMode, DependencyRegistry, DependencySource, DependencySourceMarker, DependencySourceState, DependencySourceStateMarker, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DerivedValueParserMarker, ParseWithDependency, PendingDependencySourceState, PendingDependencySourceStateMarker, ResolvedDependency, TransformsDependencyValueMarker, WrappedDependencySourceMarker, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource, transformsDependencyValue } from "./dependency.js";
+import { AnyDependencySource, CombineMode, CombinedDependencyMode, DefaultValues, DeferredParseMarker, DeferredParseState, DependencyError, DependencyId, DependencyIds, DependencyMode, DependencyRegistry, DependencySource, DependencySourceMarker, DependencySourceState, DependencySourceStateMarker, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DerivedValueParserMarker, ParseWithDependency, PendingDependencySourceState, PendingDependencySourceStateMarker, ResolvedDependency, SuggestWithDependency, TransformsDependencyValueMarker, WrappedDependencySourceMarker, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource, transformsDependencyValue } from "./dependency.js";
 import { ArgumentErrorOptions, ArgumentOptions, CommandErrorOptions, CommandOptions, FlagErrorOptions, FlagOptions, OptionErrorOptions, OptionOptions, OptionState, PassThroughFormat, PassThroughOptions, argument, command, constant, flag, option, passThrough } from "./primitives.js";
 import { CombineModes, DocState, InferMode, InferValue, Mode, ModeIterable, ModeValue, Parser, ParserContext, ParserResult, Result, Suggestion, getDocPage, getDocPageAsync, getDocPageSync, parse, parseAsync, parseSync, suggest, suggestAsync, suggestSync } from "./parser.js";
 import { ShellCompletion, bash, fish, nu, pwsh, zsh } from "./completion.js";
 import { RunError, RunOptions, RunParserError, run, runParser, runParserAsync, runParserSync } from "./facade.js";
-export { AnyDependencySource, ArgumentErrorOptions, ArgumentOptions, ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CombineMode, CombineModes, CombinedDependencyMode, CommandErrorOptions, CommandOptions, ConditionalErrorOptions, ConditionalOptions, DeferredParseMarker, DeferredParseState, DependencyError, DependencyId, DependencyIds, DependencyMode, DependencyRegistry, DependencySource, DependencySourceMarker, DependencySourceState, DependencySourceStateMarker, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DerivedValueParserMarker, DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, DocState, DuplicateOptionError, FlagErrorOptions, FlagOptions, FloatOptions, InferMode, InferValue, IntegerOptionsBigInt, IntegerOptionsNumber, LocaleOptions, LongestMatchErrorOptions, LongestMatchOptions, MergeOptions, Message, MessageFormatOptions, MessageTerm, Mode, ModeIterable, ModeValue, MultipleErrorOptions, MultipleOptions, NoMatchContext, NonEmptyString, ObjectErrorOptions, ObjectOptions, OptionErrorOptions, OptionName, OptionOptions, OptionState, OrErrorOptions, OrOptions, ParseWithDependency, Parser, ParserContext, ParserResult, PassThroughFormat, PassThroughOptions, PendingDependencySourceState, PendingDependencySourceStateMarker, ResolvedDependency, Result, RunError, RunOptions, RunParserError, ShellCompletion, ShowDefaultOptions, StringOptions, Suggestion, TransformsDependencyValueMarker, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, ValueSetOptions, WithDefaultError, WithDefaultOptions, WrappedDependencySourceMarker, argument, bash, choice, command, commandLine, concat, conditional, constant, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractOptionNames, fish, flag, float, formatDependencyError, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getDocPage, getDocPageAsync, getDocPageSync, group, integer, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isNonEmptyString, isPendingDependencySourceState, isValueParser, isWrappedDependencySource, locale, longestMatch, map, merge, message, metavar, multiple, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, parse, parseAsync, parseSync, passThrough, pwsh, run, runParser, runParserAsync, runParserSync, string, suggest, suggestAsync, suggestSync, text, transformsDependencyValue, tuple, url, uuid, value, valueSet, values, withDefault, zsh };
+export { AnyDependencySource, ArgumentErrorOptions, ArgumentOptions, ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CombineMode, CombineModes, CombinedDependencyMode, CommandErrorOptions, CommandOptions, ConditionalErrorOptions, ConditionalOptions, DefaultValues, DeferredParseMarker, DeferredParseState, DependencyError, DependencyId, DependencyIds, DependencyMode, DependencyRegistry, DependencySource, DependencySourceMarker, DependencySourceState, DependencySourceStateMarker, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DerivedValueParserMarker, DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, DocState, DuplicateOptionError, FlagErrorOptions, FlagOptions, FloatOptions, InferMode, InferValue, IntegerOptionsBigInt, IntegerOptionsNumber, LocaleOptions, LongestMatchErrorOptions, LongestMatchOptions, MergeOptions, Message, MessageFormatOptions, MessageTerm, Mode, ModeIterable, ModeValue, MultipleErrorOptions, MultipleOptions, NoMatchContext, NonEmptyString, ObjectErrorOptions, ObjectOptions, OptionErrorOptions, OptionName, OptionOptions, OptionState, OrErrorOptions, OrOptions, ParseWithDependency, Parser, ParserContext, ParserResult, PassThroughFormat, PassThroughOptions, PendingDependencySourceState, PendingDependencySourceStateMarker, ResolvedDependency, Result, RunError, RunOptions, RunParserError, ShellCompletion, ShowDefaultOptions, StringOptions, SuggestWithDependency, Suggestion, TransformsDependencyValueMarker, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, ValueSetOptions, WithDefaultError, WithDefaultOptions, WrappedDependencySourceMarker, argument, bash, choice, command, commandLine, concat, conditional, constant, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractOptionNames, fish, flag, float, formatDependencyError, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getDocPage, getDocPageAsync, getDocPageSync, group, integer, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isNonEmptyString, isPendingDependencySourceState, isValueParser, isWrappedDependencySource, locale, longestMatch, map, merge, message, metavar, multiple, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, parse, parseAsync, parseSync, passThrough, pwsh, run, runParser, runParserAsync, runParserSync, string, suggest, suggestAsync, suggestSync, text, transformsDependencyValue, tuple, url, uuid, value, valueSet, values, withDefault, zsh };

package/dist/index.js

@@ -1,6 +1,6 @@
 import { commandLine, envVar, formatMessage, message, metavar, optionName, optionNames, text, value, valueSet, values } from "./message.js";
 import { bash, fish, nu, pwsh, zsh } from "./completion.js";
-import { DeferredParseMarker, DependencyId, DependencyIds, DependencyRegistry, DependencySourceMarker, DependencySourceStateMarker, DerivedValueParserMarker, ParseWithDependency, PendingDependencySourceStateMarker, TransformsDependencyValueMarker, WrappedDependencySourceMarker, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource, transformsDependencyValue } from "./dependency.js";
+import { DefaultValues, DeferredParseMarker, DependencyId, DependencyIds, DependencyRegistry, DependencySourceMarker, DependencySourceStateMarker, DerivedValueParserMarker, ParseWithDependency, PendingDependencySourceStateMarker, SuggestWithDependency, TransformsDependencyValueMarker, WrappedDependencySourceMarker, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource, transformsDependencyValue } from "./dependency.js";
 import { extractArgumentMetavars, extractCommandNames, extractOptionNames, formatUsage, formatUsageTerm, normalizeUsage } from "./usage.js";
 import { DuplicateOptionError, concat, conditional, group, longestMatch, merge, object, or, tuple } from "./constructs.js";
 import { formatDocPage } from "./doc.js";
@@ -11,4 +11,4 @@ import { argument, command, constant, flag, option, passThrough } from "./primit
 import { getDocPage, getDocPageAsync, getDocPageSync, parse, parseAsync, parseSync, suggest, suggestAsync, suggestSync } from "./parser.js";
 import { RunError, RunParserError, run, runParser, runParserAsync, runParserSync } from "./facade.js";
 
-export { DeferredParseMarker, DependencyId, DependencyIds, DependencyRegistry, DependencySourceMarker, DependencySourceStateMarker, DerivedValueParserMarker, DuplicateOptionError, ParseWithDependency, PendingDependencySourceStateMarker, RunError, RunParserError, TransformsDependencyValueMarker, WithDefaultError, WrappedDependencySourceMarker, argument, bash, choice, command, commandLine, concat, conditional, constant, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractOptionNames, fish, flag, float, formatDependencyError, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getDocPage, getDocPageAsync, getDocPageSync, group, integer, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isNonEmptyString, isPendingDependencySourceState, isValueParser, isWrappedDependencySource, locale, longestMatch, map, merge, message, metavar, multiple, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, parse, parseAsync, parseSync, passThrough, pwsh, run, runParser, runParserAsync, runParserSync, string, suggest, suggestAsync, suggestSync, text, transformsDependencyValue, tuple, url, uuid, value, valueSet, values, withDefault, zsh };
+export { DefaultValues, DeferredParseMarker, DependencyId, DependencyIds, DependencyRegistry, DependencySourceMarker, DependencySourceStateMarker, DerivedValueParserMarker, DuplicateOptionError, ParseWithDependency, PendingDependencySourceStateMarker, RunError, RunParserError, SuggestWithDependency, TransformsDependencyValueMarker, WithDefaultError, WrappedDependencySourceMarker, argument, bash, choice, command, commandLine, concat, conditional, constant, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractOptionNames, fish, flag, float, formatDependencyError, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getDocPage, getDocPageAsync, getDocPageSync, group, integer, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isNonEmptyString, isPendingDependencySourceState, isValueParser, isWrappedDependencySource, locale, longestMatch, map, merge, message, metavar, multiple, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, parse, parseAsync, parseSync, passThrough, pwsh, run, runParser, runParserAsync, runParserSync, string, suggest, suggestAsync, suggestSync, text, transformsDependencyValue, tuple, url, uuid, value, valueSet, values, withDefault, zsh };

package/dist/parser.d.cts

@@ -187,6 +187,15 @@ interface ParserContext<TState> {
    * @since 0.7.0
    */
   readonly usage: Usage;
+  /**
+   * A registry containing resolved dependency values from DependencySource parsers.
+   * This is used during shell completion to provide suggestions based on
+   * the actual dependency values that have been parsed, rather than defaults.
+   * The type is `unknown` to avoid circular dependency issues; the actual type
+   * is `DependencyRegistry` from `./dependency.ts`.
+   * @since 0.10.0
+   */
+  readonly dependencyRegistry?: unknown;
 }
 /**
  * Represents a suggestion for command-line completion or guidance.

package/dist/parser.d.ts

@@ -187,6 +187,15 @@ interface ParserContext<TState> {
    * @since 0.7.0
    */
   readonly usage: Usage;
+  /**
+   * A registry containing resolved dependency values from DependencySource parsers.
+   * This is used during shell completion to provide suggestions based on
+   * the actual dependency values that have been parsed, rather than defaults.
+   * The type is `unknown` to avoid circular dependency issues; the actual type
+   * is `DependencyRegistry` from `./dependency.ts`.
+   * @since 0.10.0
+   */
+  readonly dependencyRegistry?: unknown;
 }
 /**
  * Represents a suggestion for command-line completion or guidance.

package/dist/primitives.cjs

@@ -53,6 +53,42 @@ function constant(value) {
 	};
 }
 /**
+* Internal helper to get suggestions from a value parser, using dependency values
+* if the parser is a derived parser and dependency values are available.
+* @internal
+*/
+function* getSuggestionsWithDependency(valueParser, prefix, dependencyRegistry) {
+	if (!valueParser.suggest) return;
+	if (require_dependency.isDerivedValueParser(valueParser) && require_dependency.SuggestWithDependency in valueParser) {
+		const derived = valueParser;
+		const suggestWithDep = derived[require_dependency.SuggestWithDependency];
+		if (suggestWithDep && dependencyRegistry) {
+			const depIds = require_dependency.DependencyIds in derived ? derived[require_dependency.DependencyIds] : [derived[require_dependency.DependencyId]];
+			const defaults = require_dependency.DefaultValues in derived ? derived[require_dependency.DefaultValues]?.() : void 0;
+			const registry = dependencyRegistry;
+			const dependencyValues = [];
+			let hasAnyValue = false;
+			for (let i = 0; i < depIds.length; i++) {
+				const depId = depIds[i];
+				if (registry.has(depId)) {
+					dependencyValues.push(registry.get(depId));
+					hasAnyValue = true;
+				} else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
+				else {
+					yield* valueParser.suggest(prefix);
+					return;
+				}
+			}
+			if (hasAnyValue) {
+				const depValue = depIds.length === 1 ? dependencyValues[0] : dependencyValues;
+				yield* suggestWithDep(prefix, depValue);
+				return;
+			}
+		}
+	}
+	yield* valueParser.suggest(prefix);
+}
+/**
 * Internal sync helper for option suggest functionality.
 * @internal
 */
@@ -64,7 +100,7 @@ function* suggestOptionSync(optionNames$1, valueParser, hidden, context, prefix)
 		const valuePart = prefix.slice(equalsIndex + 1);
 		if (optionNames$1.includes(optionPart)) {
 			if (valueParser && valueParser.suggest) {
-				const valueSuggestions = valueParser.suggest(valuePart);
+				const valueSuggestions = getSuggestionsWithDependency(valueParser, valuePart, context.dependencyRegistry);
 				for (const suggestion of valueSuggestions) if (suggestion.kind === "literal") yield {
 					kind: "literal",
 					text: `${optionPart}=${suggestion.text}`,
@@ -93,9 +129,45 @@ function* suggestOptionSync(optionNames$1, valueParser, hidden, context, prefix)
 				const lastToken = context.buffer[context.buffer.length - 1];
 				if (optionNames$1.includes(lastToken)) shouldSuggestValues = true;
 			} else if (context.state === void 0 && context.buffer.length === 0) shouldSuggestValues = true;
-			if (shouldSuggestValues) yield* valueParser.suggest(prefix);
+			if (shouldSuggestValues) yield* getSuggestionsWithDependency(valueParser, prefix, context.dependencyRegistry);
+		}
+	}
+}
+/**
+* Internal async helper to get suggestions from a value parser, using dependency values
+* if the parser is a derived parser and dependency values are available.
+* @internal
+*/
+async function* getSuggestionsWithDependencyAsync(valueParser, prefix, dependencyRegistry) {
+	if (!valueParser.suggest) return;
+	if (require_dependency.isDerivedValueParser(valueParser) && require_dependency.SuggestWithDependency in valueParser) {
+		const derived = valueParser;
+		const suggestWithDep = derived[require_dependency.SuggestWithDependency];
+		if (suggestWithDep && dependencyRegistry) {
+			const depIds = require_dependency.DependencyIds in derived ? derived[require_dependency.DependencyIds] : [derived[require_dependency.DependencyId]];
+			const defaults = require_dependency.DefaultValues in derived ? derived[require_dependency.DefaultValues]?.() : void 0;
+			const registry = dependencyRegistry;
+			const dependencyValues = [];
+			let hasAnyValue = false;
+			for (let i = 0; i < depIds.length; i++) {
+				const depId = depIds[i];
+				if (registry.has(depId)) {
+					dependencyValues.push(registry.get(depId));
+					hasAnyValue = true;
+				} else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
+				else {
+					for await (const suggestion of valueParser.suggest(prefix)) yield suggestion;
+					return;
+				}
+			}
+			if (hasAnyValue) {
+				const depValue = depIds.length === 1 ? dependencyValues[0] : dependencyValues;
+				for await (const suggestion of suggestWithDep(prefix, depValue)) yield suggestion;
+				return;
+			}
 		}
 	}
+	for await (const suggestion of valueParser.suggest(prefix)) yield suggestion;
 }
 /**
 * Internal async helper for option suggest functionality.
@@ -109,7 +181,7 @@ async function* suggestOptionAsync(optionNames$1, valueParser, hidden, context,
 		const valuePart = prefix.slice(equalsIndex + 1);
 		if (optionNames$1.includes(optionPart)) {
 			if (valueParser && valueParser.suggest) {
-				const valueSuggestions = valueParser.suggest(valuePart);
+				const valueSuggestions = getSuggestionsWithDependencyAsync(valueParser, valuePart, context.dependencyRegistry);
 				for await (const suggestion of valueSuggestions) if (suggestion.kind === "literal") yield {
 					kind: "literal",
 					text: `${optionPart}=${suggestion.text}`,
@@ -138,7 +210,7 @@ async function* suggestOptionAsync(optionNames$1, valueParser, hidden, context,
 				const lastToken = context.buffer[context.buffer.length - 1];
 				if (optionNames$1.includes(lastToken)) shouldSuggestValues = true;
 			} else if (context.state === void 0 && context.buffer.length === 0) shouldSuggestValues = true;
-			if (shouldSuggestValues) for await (const suggestion of valueParser.suggest(prefix)) yield suggestion;
+			if (shouldSuggestValues) for await (const suggestion of getSuggestionsWithDependencyAsync(valueParser, prefix, context.dependencyRegistry)) yield suggestion;
 		}
 	}
 }

package/dist/primitives.js

@@ -1,5 +1,5 @@
 import { message, metavar, optionName, optionNames } from "./message.js";
-import { DependencyId, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState } from "./dependency.js";
+import { DefaultValues, DependencyId, DependencyIds, SuggestWithDependency, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState } from "./dependency.js";
 import { extractCommandNames, extractOptionNames } from "./usage.js";
 import { DEFAULT_FIND_SIMILAR_OPTIONS, createErrorWithSuggestions, findSimilar } from "./suggestion.js";
 import { isValueParser } from "./valueparser.js";
@@ -53,6 +53,42 @@ function constant(value) {
 	};
 }
 /**
+* Internal helper to get suggestions from a value parser, using dependency values
+* if the parser is a derived parser and dependency values are available.
+* @internal
+*/
+function* getSuggestionsWithDependency(valueParser, prefix, dependencyRegistry) {
+	if (!valueParser.suggest) return;
+	if (isDerivedValueParser(valueParser) && SuggestWithDependency in valueParser) {
+		const derived = valueParser;
+		const suggestWithDep = derived[SuggestWithDependency];
+		if (suggestWithDep && dependencyRegistry) {
+			const depIds = DependencyIds in derived ? derived[DependencyIds] : [derived[DependencyId]];
+			const defaults = DefaultValues in derived ? derived[DefaultValues]?.() : void 0;
+			const registry = dependencyRegistry;
+			const dependencyValues = [];
+			let hasAnyValue = false;
+			for (let i = 0; i < depIds.length; i++) {
+				const depId = depIds[i];
+				if (registry.has(depId)) {
+					dependencyValues.push(registry.get(depId));
+					hasAnyValue = true;
+				} else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
+				else {
+					yield* valueParser.suggest(prefix);
+					return;
+				}
+			}
+			if (hasAnyValue) {
+				const depValue = depIds.length === 1 ? dependencyValues[0] : dependencyValues;
+				yield* suggestWithDep(prefix, depValue);
+				return;
+			}
+		}
+	}
+	yield* valueParser.suggest(prefix);
+}
+/**
 * Internal sync helper for option suggest functionality.
 * @internal
 */
@@ -64,7 +100,7 @@ function* suggestOptionSync(optionNames$1, valueParser, hidden, context, prefix)
 		const valuePart = prefix.slice(equalsIndex + 1);
 		if (optionNames$1.includes(optionPart)) {
 			if (valueParser && valueParser.suggest) {
-				const valueSuggestions = valueParser.suggest(valuePart);
+				const valueSuggestions = getSuggestionsWithDependency(valueParser, valuePart, context.dependencyRegistry);
 				for (const suggestion of valueSuggestions) if (suggestion.kind === "literal") yield {
 					kind: "literal",
 					text: `${optionPart}=${suggestion.text}`,
@@ -93,9 +129,45 @@ function* suggestOptionSync(optionNames$1, valueParser, hidden, context, prefix)
 				const lastToken = context.buffer[context.buffer.length - 1];
 				if (optionNames$1.includes(lastToken)) shouldSuggestValues = true;
 			} else if (context.state === void 0 && context.buffer.length === 0) shouldSuggestValues = true;
-			if (shouldSuggestValues) yield* valueParser.suggest(prefix);
+			if (shouldSuggestValues) yield* getSuggestionsWithDependency(valueParser, prefix, context.dependencyRegistry);
+		}
+	}
+}
+/**
+* Internal async helper to get suggestions from a value parser, using dependency values
+* if the parser is a derived parser and dependency values are available.
+* @internal
+*/
+async function* getSuggestionsWithDependencyAsync(valueParser, prefix, dependencyRegistry) {
+	if (!valueParser.suggest) return;
+	if (isDerivedValueParser(valueParser) && SuggestWithDependency in valueParser) {
+		const derived = valueParser;
+		const suggestWithDep = derived[SuggestWithDependency];
+		if (suggestWithDep && dependencyRegistry) {
+			const depIds = DependencyIds in derived ? derived[DependencyIds] : [derived[DependencyId]];
+			const defaults = DefaultValues in derived ? derived[DefaultValues]?.() : void 0;
+			const registry = dependencyRegistry;
+			const dependencyValues = [];
+			let hasAnyValue = false;
+			for (let i = 0; i < depIds.length; i++) {
+				const depId = depIds[i];
+				if (registry.has(depId)) {
+					dependencyValues.push(registry.get(depId));
+					hasAnyValue = true;
+				} else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
+				else {
+					for await (const suggestion of valueParser.suggest(prefix)) yield suggestion;
+					return;
+				}
+			}
+			if (hasAnyValue) {
+				const depValue = depIds.length === 1 ? dependencyValues[0] : dependencyValues;
+				for await (const suggestion of suggestWithDep(prefix, depValue)) yield suggestion;
+				return;
+			}
 		}
 	}
+	for await (const suggestion of valueParser.suggest(prefix)) yield suggestion;
 }
 /**
 * Internal async helper for option suggest functionality.
@@ -109,7 +181,7 @@ async function* suggestOptionAsync(optionNames$1, valueParser, hidden, context,
 		const valuePart = prefix.slice(equalsIndex + 1);
 		if (optionNames$1.includes(optionPart)) {
 			if (valueParser && valueParser.suggest) {
-				const valueSuggestions = valueParser.suggest(valuePart);
+				const valueSuggestions = getSuggestionsWithDependencyAsync(valueParser, valuePart, context.dependencyRegistry);
 				for await (const suggestion of valueSuggestions) if (suggestion.kind === "literal") yield {
 					kind: "literal",
 					text: `${optionPart}=${suggestion.text}`,
@@ -138,7 +210,7 @@ async function* suggestOptionAsync(optionNames$1, valueParser, hidden, context,
 				const lastToken = context.buffer[context.buffer.length - 1];
 				if (optionNames$1.includes(lastToken)) shouldSuggestValues = true;
 			} else if (context.state === void 0 && context.buffer.length === 0) shouldSuggestValues = true;
-			if (shouldSuggestValues) for await (const suggestion of valueParser.suggest(prefix)) yield suggestion;
+			if (shouldSuggestValues) for await (const suggestion of getSuggestionsWithDependencyAsync(valueParser, prefix, context.dependencyRegistry)) yield suggestion;
 		}
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "0.10.0-dev.296+80e4ca45",
+  "version": "0.10.0-dev.297+39a6b9dd",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",