@optique/core 0.10.0-dev.293 → 0.10.0-dev.294

package/dist/constructs.cjs

@@ -541,32 +541,145 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 * @returns The field states with deferred states resolved to their actual values
 * @internal
 */
+/**
+* Recursively collects dependency values from DependencySourceState objects
+* found anywhere in the state tree.
+*/
+function collectDependencies(state, registry) {
+	if (state === null || state === void 0) return;
+	if (require_dependency.isDependencySourceState(state)) {
+		const depId = state[require_dependency.DependencyId];
+		const result = state.result;
+		if (result.success) registry.set(depId, result.value);
+		return;
+	}
+	if (Array.isArray(state)) {
+		for (const item of state) collectDependencies(item, registry);
+		return;
+	}
+	if (typeof state === "object" && !require_dependency.isDeferredParseState(state)) for (const key of Reflect.ownKeys(state)) collectDependencies(state[key], registry);
+}
+/**
+* Checks if a value is a plain object (created with `{}` or `Object.create(null)`).
+* Class instances like `Temporal.PlainDate`, `URL`, `Date`, etc. return false.
+* This is used to determine whether to recursively traverse an object when
+* resolving deferred parse states - we only want to traverse plain objects
+* that are part of the parser state structure, not user values.
+*/
+function isPlainObject(value) {
+	if (typeof value !== "object" || value === null) return false;
+	const proto = Object.getPrototypeOf(value);
+	return proto === Object.prototype || proto === null;
+}
+/**
+* Recursively resolves DeferredParseState objects found anywhere in the state tree.
+* Returns the resolved state (sync version).
+*
+* Only traverses:
+* - DeferredParseState (to resolve it)
+* - DependencySourceState (skipped, kept as-is)
+* - Arrays (to find nested deferred states)
+* - Plain objects (to find nested deferred states in parser state structures)
+*
+* Does NOT traverse class instances (e.g., Temporal.PlainDate, URL) since these
+* are user values that should be preserved as-is.
+*/
+function resolveDeferred(state, registry) {
+	if (state === null || state === void 0) return state;
+	if (require_dependency.isDeferredParseState(state)) {
+		const deferredState = state;
+		const parser = deferredState.parser;
+		const depIds = deferredState.dependencyIds;
+		if (depIds && depIds.length > 0) {
+			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);
+				if (reParseResult instanceof Promise) return deferredState.preliminaryResult;
+				return reParseResult;
+			}
+			return deferredState.preliminaryResult;
+		}
+		const depId = deferredState.dependencyId;
+		if (registry.has(depId)) {
+			const dependencyValue = registry.get(depId);
+			const reParseResult = parser[require_dependency.ParseWithDependency](deferredState.rawInput, dependencyValue);
+			if (reParseResult instanceof Promise) return deferredState.preliminaryResult;
+			return reParseResult;
+		}
+		return deferredState.preliminaryResult;
+	}
+	if (require_dependency.isDependencySourceState(state)) return state;
+	if (Array.isArray(state)) return state.map((item) => resolveDeferred(item, registry));
+	if (isPlainObject(state)) {
+		const resolved = {};
+		for (const key of Reflect.ownKeys(state)) resolved[key] = resolveDeferred(state[key], registry);
+		return resolved;
+	}
+	return state;
+}
 function resolveDeferredParseStates(fieldStates) {
 	const registry = new require_dependency.DependencyRegistry();
-	for (const key of Reflect.ownKeys(fieldStates)) {
-		const fieldState = fieldStates[key];
-		if (require_dependency.isDependencySourceState(fieldState)) {
-			const depId = fieldState[require_dependency.DependencyId];
-			const result = fieldState.result;
-			if (result.success) registry.set(depId, result.value);
+	collectDependencies(fieldStates, registry);
+	return resolveDeferred(fieldStates, registry);
+}
+/**
+* Recursively resolves DeferredParseState objects found anywhere in the state tree.
+* Returns the resolved state (async version).
+*
+* Only traverses:
+* - DeferredParseState (to resolve it)
+* - DependencySourceState (skipped, kept as-is)
+* - Arrays (to find nested deferred states)
+* - Plain objects (to find nested deferred states in parser state structures)
+*
+* Does NOT traverse class instances (e.g., Temporal.PlainDate, URL) since these
+* are user values that should be preserved as-is.
+*/
+async function resolveDeferredAsync(state, registry) {
+	if (state === null || state === void 0) return state;
+	if (require_dependency.isDeferredParseState(state)) {
+		const deferredState = state;
+		const parser = deferredState.parser;
+		const depIds = deferredState.dependencyIds;
+		if (depIds && depIds.length > 0) {
+			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);
+			}
+			return deferredState.preliminaryResult;
 		}
-	}
-	const resolvedStates = { ...fieldStates };
-	for (const key of Reflect.ownKeys(fieldStates)) {
-		const fieldState = fieldStates[key];
-		if (require_dependency.isDeferredParseState(fieldState)) {
-			const deferredState = fieldState;
-			const depId = deferredState.dependencyId;
-			if (registry.has(depId)) {
-				const dependencyValue = registry.get(depId);
-				const parser = deferredState.parser;
-				const reParseResult = parser[require_dependency.ParseWithDependency](deferredState.rawInput, dependencyValue);
-				if (reParseResult instanceof Promise) resolvedStates[key] = deferredState.preliminaryResult;
-				else resolvedStates[key] = reParseResult;
-			} else resolvedStates[key] = deferredState.preliminaryResult;
+		const depId = deferredState.dependencyId;
+		if (registry.has(depId)) {
+			const dependencyValue = registry.get(depId);
+			const reParseResult = parser[require_dependency.ParseWithDependency](deferredState.rawInput, dependencyValue);
+			return Promise.resolve(reParseResult);
 		}
+		return deferredState.preliminaryResult;
+	}
+	if (require_dependency.isDependencySourceState(state)) return state;
+	if (Array.isArray(state)) return Promise.all(state.map((item) => resolveDeferredAsync(item, registry)));
+	if (isPlainObject(state)) {
+		const resolved = {};
+		const keys = Reflect.ownKeys(state);
+		await Promise.all(keys.map(async (key) => {
+			resolved[key] = await resolveDeferredAsync(state[key], registry);
+		}));
+		return resolved;
 	}
-	return resolvedStates;
+	return state;
 }
 /**
 * Async version of resolveDeferredParseStates for async parsers.
@@ -574,29 +687,8 @@ function resolveDeferredParseStates(fieldStates) {
 */
 async function resolveDeferredParseStatesAsync(fieldStates) {
 	const registry = new require_dependency.DependencyRegistry();
-	for (const key of Reflect.ownKeys(fieldStates)) {
-		const fieldState = fieldStates[key];
-		if (require_dependency.isDependencySourceState(fieldState)) {
-			const depId = fieldState[require_dependency.DependencyId];
-			const result = fieldState.result;
-			if (result.success) registry.set(depId, result.value);
-		}
-	}
-	const resolvedStates = { ...fieldStates };
-	for (const key of Reflect.ownKeys(fieldStates)) {
-		const fieldState = fieldStates[key];
-		if (require_dependency.isDeferredParseState(fieldState)) {
-			const deferredState = fieldState;
-			const depId = deferredState.dependencyId;
-			if (registry.has(depId)) {
-				const dependencyValue = registry.get(depId);
-				const parser = deferredState.parser;
-				const reParseResult = parser[require_dependency.ParseWithDependency](deferredState.rawInput, dependencyValue);
-				resolvedStates[key] = await Promise.resolve(reParseResult);
-			} else resolvedStates[key] = deferredState.preliminaryResult;
-		}
-	}
-	return resolvedStates;
+	collectDependencies(fieldStates, registry);
+	return await resolveDeferredAsync(fieldStates, registry);
 }
 function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 	const label = typeof labelOrParsers === "string" ? labelOrParsers : void 0;
@@ -1220,15 +1312,15 @@ function merge(...args) {
 			return parseSync(context);
 		},
 		complete(state) {
-			const extractCompleteState = (parser, index) => {
+			const extractCompleteState = (parser, resolvedState, index) => {
 				if (parser.initialState === void 0) {
 					const key = `__parser_${index}`;
-					if (state && typeof state === "object" && key in state) return state[key];
+					if (resolvedState && typeof resolvedState === "object" && key in resolvedState) return resolvedState[key];
 					return void 0;
 				} else if (parser.initialState && typeof parser.initialState === "object") {
-					if (state && typeof state === "object") {
+					if (resolvedState && typeof resolvedState === "object") {
 						const extractedState = {};
-						for (const field in parser.initialState) extractedState[field] = field in state ? state[field] : parser.initialState[field];
+						for (const field in parser.initialState) extractedState[field] = field in resolvedState ? resolvedState[field] : parser.initialState[field];
 						return extractedState;
 					}
 					return parser.initialState;
@@ -1236,10 +1328,11 @@ function merge(...args) {
 				return parser.initialState;
 			};
 			if (!isAsync) {
+				const resolvedState = resolveDeferredParseStates(state);
 				const object$1 = {};
 				for (let i = 0; i < syncParsers.length; i++) {
 					const parser = syncParsers[i];
-					const parserState = extractCompleteState(parser, i);
+					const parserState = extractCompleteState(parser, resolvedState, i);
 					const result = parser.complete(parserState);
 					if (!result.success) return result;
 					for (const field in result.value) object$1[field] = result.value[field];
@@ -1250,10 +1343,11 @@ function merge(...args) {
 				};
 			}
 			return (async () => {
+				const resolvedState = await resolveDeferredParseStatesAsync(state);
 				const object$1 = {};
 				for (let i = 0; i < parsers.length; i++) {
 					const parser = parsers[i];
-					const parserState = extractCompleteState(parser, i);
+					const parserState = extractCompleteState(parser, resolvedState, i);
 					const result = await parser.complete(parserState);
 					if (!result.success) return result;
 					for (const field in result.value) object$1[field] = result.value[field];

package/dist/constructs.js

@@ -541,32 +541,145 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 * @returns The field states with deferred states resolved to their actual values
 * @internal
 */
+/**
+* Recursively collects dependency values from DependencySourceState objects
+* found anywhere in the state tree.
+*/
+function collectDependencies(state, registry) {
+	if (state === null || state === void 0) return;
+	if (isDependencySourceState(state)) {
+		const depId = state[DependencyId];
+		const result = state.result;
+		if (result.success) registry.set(depId, result.value);
+		return;
+	}
+	if (Array.isArray(state)) {
+		for (const item of state) collectDependencies(item, registry);
+		return;
+	}
+	if (typeof state === "object" && !isDeferredParseState(state)) for (const key of Reflect.ownKeys(state)) collectDependencies(state[key], registry);
+}
+/**
+* Checks if a value is a plain object (created with `{}` or `Object.create(null)`).
+* Class instances like `Temporal.PlainDate`, `URL`, `Date`, etc. return false.
+* This is used to determine whether to recursively traverse an object when
+* resolving deferred parse states - we only want to traverse plain objects
+* that are part of the parser state structure, not user values.
+*/
+function isPlainObject(value) {
+	if (typeof value !== "object" || value === null) return false;
+	const proto = Object.getPrototypeOf(value);
+	return proto === Object.prototype || proto === null;
+}
+/**
+* Recursively resolves DeferredParseState objects found anywhere in the state tree.
+* Returns the resolved state (sync version).
+*
+* Only traverses:
+* - DeferredParseState (to resolve it)
+* - DependencySourceState (skipped, kept as-is)
+* - Arrays (to find nested deferred states)
+* - Plain objects (to find nested deferred states in parser state structures)
+*
+* Does NOT traverse class instances (e.g., Temporal.PlainDate, URL) since these
+* are user values that should be preserved as-is.
+*/
+function resolveDeferred(state, registry) {
+	if (state === null || state === void 0) return state;
+	if (isDeferredParseState(state)) {
+		const deferredState = state;
+		const parser = deferredState.parser;
+		const depIds = deferredState.dependencyIds;
+		if (depIds && depIds.length > 0) {
+			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);
+				if (reParseResult instanceof Promise) return deferredState.preliminaryResult;
+				return reParseResult;
+			}
+			return deferredState.preliminaryResult;
+		}
+		const depId = deferredState.dependencyId;
+		if (registry.has(depId)) {
+			const dependencyValue = registry.get(depId);
+			const reParseResult = parser[ParseWithDependency](deferredState.rawInput, dependencyValue);
+			if (reParseResult instanceof Promise) return deferredState.preliminaryResult;
+			return reParseResult;
+		}
+		return deferredState.preliminaryResult;
+	}
+	if (isDependencySourceState(state)) return state;
+	if (Array.isArray(state)) return state.map((item) => resolveDeferred(item, registry));
+	if (isPlainObject(state)) {
+		const resolved = {};
+		for (const key of Reflect.ownKeys(state)) resolved[key] = resolveDeferred(state[key], registry);
+		return resolved;
+	}
+	return state;
+}
 function resolveDeferredParseStates(fieldStates) {
 	const registry = new DependencyRegistry();
-	for (const key of Reflect.ownKeys(fieldStates)) {
-		const fieldState = fieldStates[key];
-		if (isDependencySourceState(fieldState)) {
-			const depId = fieldState[DependencyId];
-			const result = fieldState.result;
-			if (result.success) registry.set(depId, result.value);
+	collectDependencies(fieldStates, registry);
+	return resolveDeferred(fieldStates, registry);
+}
+/**
+* Recursively resolves DeferredParseState objects found anywhere in the state tree.
+* Returns the resolved state (async version).
+*
+* Only traverses:
+* - DeferredParseState (to resolve it)
+* - DependencySourceState (skipped, kept as-is)
+* - Arrays (to find nested deferred states)
+* - Plain objects (to find nested deferred states in parser state structures)
+*
+* Does NOT traverse class instances (e.g., Temporal.PlainDate, URL) since these
+* are user values that should be preserved as-is.
+*/
+async function resolveDeferredAsync(state, registry) {
+	if (state === null || state === void 0) return state;
+	if (isDeferredParseState(state)) {
+		const deferredState = state;
+		const parser = deferredState.parser;
+		const depIds = deferredState.dependencyIds;
+		if (depIds && depIds.length > 0) {
+			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);
+			}
+			return deferredState.preliminaryResult;
 		}
-	}
-	const resolvedStates = { ...fieldStates };
-	for (const key of Reflect.ownKeys(fieldStates)) {
-		const fieldState = fieldStates[key];
-		if (isDeferredParseState(fieldState)) {
-			const deferredState = fieldState;
-			const depId = deferredState.dependencyId;
-			if (registry.has(depId)) {
-				const dependencyValue = registry.get(depId);
-				const parser = deferredState.parser;
-				const reParseResult = parser[ParseWithDependency](deferredState.rawInput, dependencyValue);
-				if (reParseResult instanceof Promise) resolvedStates[key] = deferredState.preliminaryResult;
-				else resolvedStates[key] = reParseResult;
-			} else resolvedStates[key] = deferredState.preliminaryResult;
+		const depId = deferredState.dependencyId;
+		if (registry.has(depId)) {
+			const dependencyValue = registry.get(depId);
+			const reParseResult = parser[ParseWithDependency](deferredState.rawInput, dependencyValue);
+			return Promise.resolve(reParseResult);
 		}
+		return deferredState.preliminaryResult;
+	}
+	if (isDependencySourceState(state)) return state;
+	if (Array.isArray(state)) return Promise.all(state.map((item) => resolveDeferredAsync(item, registry)));
+	if (isPlainObject(state)) {
+		const resolved = {};
+		const keys = Reflect.ownKeys(state);
+		await Promise.all(keys.map(async (key) => {
+			resolved[key] = await resolveDeferredAsync(state[key], registry);
+		}));
+		return resolved;
 	}
-	return resolvedStates;
+	return state;
 }
 /**
 * Async version of resolveDeferredParseStates for async parsers.
@@ -574,29 +687,8 @@ function resolveDeferredParseStates(fieldStates) {
 */
 async function resolveDeferredParseStatesAsync(fieldStates) {
 	const registry = new DependencyRegistry();
-	for (const key of Reflect.ownKeys(fieldStates)) {
-		const fieldState = fieldStates[key];
-		if (isDependencySourceState(fieldState)) {
-			const depId = fieldState[DependencyId];
-			const result = fieldState.result;
-			if (result.success) registry.set(depId, result.value);
-		}
-	}
-	const resolvedStates = { ...fieldStates };
-	for (const key of Reflect.ownKeys(fieldStates)) {
-		const fieldState = fieldStates[key];
-		if (isDeferredParseState(fieldState)) {
-			const deferredState = fieldState;
-			const depId = deferredState.dependencyId;
-			if (registry.has(depId)) {
-				const dependencyValue = registry.get(depId);
-				const parser = deferredState.parser;
-				const reParseResult = parser[ParseWithDependency](deferredState.rawInput, dependencyValue);
-				resolvedStates[key] = await Promise.resolve(reParseResult);
-			} else resolvedStates[key] = deferredState.preliminaryResult;
-		}
-	}
-	return resolvedStates;
+	collectDependencies(fieldStates, registry);
+	return await resolveDeferredAsync(fieldStates, registry);
 }
 function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 	const label = typeof labelOrParsers === "string" ? labelOrParsers : void 0;
@@ -1220,15 +1312,15 @@ function merge(...args) {
 			return parseSync(context);
 		},
 		complete(state) {
-			const extractCompleteState = (parser, index) => {
+			const extractCompleteState = (parser, resolvedState, index) => {
 				if (parser.initialState === void 0) {
 					const key = `__parser_${index}`;
-					if (state && typeof state === "object" && key in state) return state[key];
+					if (resolvedState && typeof resolvedState === "object" && key in resolvedState) return resolvedState[key];
 					return void 0;
 				} else if (parser.initialState && typeof parser.initialState === "object") {
-					if (state && typeof state === "object") {
+					if (resolvedState && typeof resolvedState === "object") {
 						const extractedState = {};
-						for (const field in parser.initialState) extractedState[field] = field in state ? state[field] : parser.initialState[field];
+						for (const field in parser.initialState) extractedState[field] = field in resolvedState ? resolvedState[field] : parser.initialState[field];
 						return extractedState;
 					}
 					return parser.initialState;
@@ -1236,10 +1328,11 @@ function merge(...args) {
 				return parser.initialState;
 			};
 			if (!isAsync) {
+				const resolvedState = resolveDeferredParseStates(state);
 				const object$1 = {};
 				for (let i = 0; i < syncParsers.length; i++) {
 					const parser = syncParsers[i];
-					const parserState = extractCompleteState(parser, i);
+					const parserState = extractCompleteState(parser, resolvedState, i);
 					const result = parser.complete(parserState);
 					if (!result.success) return result;
 					for (const field in result.value) object$1[field] = result.value[field];
@@ -1250,10 +1343,11 @@ function merge(...args) {
 				};
 			}
 			return (async () => {
+				const resolvedState = await resolveDeferredParseStatesAsync(state);
 				const object$1 = {};
 				for (let i = 0; i < parsers.length; i++) {
 					const parser = parsers[i];
-					const parserState = extractCompleteState(parser, i);
+					const parserState = extractCompleteState(parser, resolvedState, i);
 					const result = await parser.complete(parserState);
 					if (!result.success) return result;
 					for (const field in result.value) object$1[field] = result.value[field];

package/dist/dependency.cjs

@@ -20,6 +20,12 @@ const DerivedValueParserMarker = Symbol.for("@optique/core/dependency/DerivedVal
 */
 const DependencyId = Symbol.for("@optique/core/dependency/DependencyId");
 /**
+* A unique symbol used to store multiple dependency IDs on derived parsers
+* that depend on multiple sources (created via {@link deriveFrom}).
+* @since 0.10.0
+*/
+const DependencyIds = Symbol.for("@optique/core/dependency/DependencyIds");
+/**
 * A unique symbol used to access the parseWithDependency method on derived parsers.
 * @since 0.10.0
 */
@@ -181,11 +187,13 @@ function determineFactoryModeForDeriveFrom(options) {
 	return parser.$mode === "async";
 }
 function createSyncDerivedFromParser(sourceId, options) {
+	const allDependencyIds = options.dependencies.map((dep) => dep[DependencyId]);
 	return {
 		$mode: "sync",
 		metavar: options.metavar,
 		[DerivedValueParserMarker]: true,
 		[DependencyId]: sourceId,
+		[DependencyIds]: allDependencyIds,
 		parse(input) {
 			const sourceValues = options.defaultValues();
 			const derivedParser = options.factory(...sourceValues);
@@ -212,11 +220,13 @@ function createSyncDerivedFromParser(sourceId, options) {
 * factory returns an async parser.
 */
 function createAsyncDerivedFromParserFromAsyncFactory(sourceId, options) {
+	const allDependencyIds = options.dependencies.map((dep) => dep[DependencyId]);
 	return {
 		$mode: "async",
 		metavar: options.metavar,
 		[DerivedValueParserMarker]: true,
 		[DependencyId]: sourceId,
+		[DependencyIds]: allDependencyIds,
 		parse(input) {
 			const sourceValues = options.defaultValues();
 			const derivedParser = options.factory(...sourceValues);
@@ -243,11 +253,13 @@ function createAsyncDerivedFromParserFromAsyncFactory(sourceId, options) {
 * sources are async but the factory returns a sync parser.
 */
 function createAsyncDerivedFromParserFromSyncFactory(sourceId, options) {
+	const allDependencyIds = options.dependencies.map((dep) => dep[DependencyId]);
 	return {
 		$mode: "async",
 		metavar: options.metavar,
 		[DerivedValueParserMarker]: true,
 		[DependencyId]: sourceId,
+		[DependencyIds]: allDependencyIds,
 		parse(input) {
 			const sourceValues = options.defaultValues();
 			const derivedParser = options.factory(...sourceValues);
@@ -403,11 +415,13 @@ function isDeferredParseState(value) {
 * @since 0.10.0
 */
 function createDeferredParseState(rawInput, parser, preliminaryResult) {
+	const multipleIds = DependencyIds in parser ? parser[DependencyIds] : void 0;
 	return {
 		[DeferredParseMarker]: true,
 		rawInput,
 		parser,
 		dependencyId: parser[DependencyId],
+		dependencyIds: multipleIds,
 		preliminaryResult
 	};
 }
@@ -510,6 +524,7 @@ function formatDependencyError(error) {
 //#endregion
 exports.DeferredParseMarker = DeferredParseMarker;
 exports.DependencyId = DependencyId;
+exports.DependencyIds = DependencyIds;
 exports.DependencyRegistry = DependencyRegistry;
 exports.DependencySourceMarker = DependencySourceMarker;
 exports.DependencySourceStateMarker = DependencySourceStateMarker;

package/dist/dependency.d.cts

@@ -24,6 +24,12 @@ declare const DerivedValueParserMarker: unique symbol;
  * @since 0.10.0
  */
 declare const DependencyId: unique symbol;
+/**
+ * A unique symbol used to store multiple dependency IDs on derived parsers
+ * that depend on multiple sources (created via {@link deriveFrom}).
+ * @since 0.10.0
+ */
+declare const DependencyIds: unique symbol;
 /**
  * A unique symbol used to access the parseWithDependency method on derived parsers.
  * @since 0.10.0
@@ -308,9 +314,19 @@ interface DerivedValueParser<M extends Mode = "sync", T = unknown, S = unknown>
   readonly [DerivedValueParserMarker]: true;
   /**
    * The unique identifier of the dependency source this parser depends on.
+   * For parsers created with {@link deriveFrom} that have multiple dependencies,
+   * this is set to the first dependency's ID for backwards compatibility.
    * @internal
    */
   readonly [DependencyId]: symbol;
+  /**
+   * The unique identifiers of all dependency sources this parser depends on.
+   * Present only for parsers created with {@link deriveFrom} that have multiple
+   * dependencies. If present, this takes precedence over {@link DependencyId}
+   * during dependency resolution.
+   * @internal
+   */
+  readonly [DependencyIds]?: readonly symbol[];
   /**
    * Parses the input using the actual dependency value instead of the default.
    * This method is used during dependency resolution in `complete()`.
@@ -460,9 +476,14 @@ interface DeferredParseState<T = unknown> {
    */
   readonly parser: DerivedValueParser<Mode, T, unknown>;
   /**
-   * The dependency ID that this parser depends on.
+   * The dependency ID that this parser depends on (for single-dependency parsers).
    */
   readonly dependencyId: symbol;
+  /**
+   * The dependency IDs that this parser depends on (for multi-dependency parsers).
+   * If present, this is used instead of `dependencyId`.
+   */
+  readonly dependencyIds?: readonly symbol[];
   /**
    * The preliminary parse result using the default dependency value.
    * This is used as a fallback if dependency resolution is not needed
@@ -614,4 +635,4 @@ type DependencyError = {
  */
 declare function formatDependencyError(error: DependencyError): Message;
 //#endregion
-export { AnyDependencySource, CombineMode, CombinedDependencyMode, DeferredParseMarker, DeferredParseState, DependencyError, DependencyId, DependencyMode, DependencyRegistry, DependencySource, DependencySourceMarker, DependencySourceState, DependencySourceStateMarker, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DerivedValueParserMarker, ParseWithDependency, ResolvedDependency, createDeferredParseState, createDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser };
+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, ResolvedDependency, createDeferredParseState, createDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser };

package/dist/dependency.d.ts

@@ -24,6 +24,12 @@ declare const DerivedValueParserMarker: unique symbol;
  * @since 0.10.0
  */
 declare const DependencyId: unique symbol;
+/**
+ * A unique symbol used to store multiple dependency IDs on derived parsers
+ * that depend on multiple sources (created via {@link deriveFrom}).
+ * @since 0.10.0
+ */
+declare const DependencyIds: unique symbol;
 /**
  * A unique symbol used to access the parseWithDependency method on derived parsers.
  * @since 0.10.0
@@ -308,9 +314,19 @@ interface DerivedValueParser<M extends Mode = "sync", T = unknown, S = unknown>
   readonly [DerivedValueParserMarker]: true;
   /**
    * The unique identifier of the dependency source this parser depends on.
+   * For parsers created with {@link deriveFrom} that have multiple dependencies,
+   * this is set to the first dependency's ID for backwards compatibility.
    * @internal
    */
   readonly [DependencyId]: symbol;
+  /**
+   * The unique identifiers of all dependency sources this parser depends on.
+   * Present only for parsers created with {@link deriveFrom} that have multiple
+   * dependencies. If present, this takes precedence over {@link DependencyId}
+   * during dependency resolution.
+   * @internal
+   */
+  readonly [DependencyIds]?: readonly symbol[];
   /**
    * Parses the input using the actual dependency value instead of the default.
    * This method is used during dependency resolution in `complete()`.
@@ -460,9 +476,14 @@ interface DeferredParseState<T = unknown> {
    */
   readonly parser: DerivedValueParser<Mode, T, unknown>;
   /**
-   * The dependency ID that this parser depends on.
+   * The dependency ID that this parser depends on (for single-dependency parsers).
    */
   readonly dependencyId: symbol;
+  /**
+   * The dependency IDs that this parser depends on (for multi-dependency parsers).
+   * If present, this is used instead of `dependencyId`.
+   */
+  readonly dependencyIds?: readonly symbol[];
   /**
    * The preliminary parse result using the default dependency value.
    * This is used as a fallback if dependency resolution is not needed
@@ -614,4 +635,4 @@ type DependencyError = {
  */
 declare function formatDependencyError(error: DependencyError): Message;
 //#endregion
-export { AnyDependencySource, CombineMode, CombinedDependencyMode, DeferredParseMarker, DeferredParseState, DependencyError, DependencyId, DependencyMode, DependencyRegistry, DependencySource, DependencySourceMarker, DependencySourceState, DependencySourceStateMarker, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DerivedValueParserMarker, ParseWithDependency, ResolvedDependency, createDeferredParseState, createDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser };
+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, ResolvedDependency, createDeferredParseState, createDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser };

package/dist/dependency.js

@@ -19,6 +19,12 @@ const DerivedValueParserMarker = Symbol.for("@optique/core/dependency/DerivedVal
 */
 const DependencyId = Symbol.for("@optique/core/dependency/DependencyId");
 /**
+* A unique symbol used to store multiple dependency IDs on derived parsers
+* that depend on multiple sources (created via {@link deriveFrom}).
+* @since 0.10.0
+*/
+const DependencyIds = Symbol.for("@optique/core/dependency/DependencyIds");
+/**
 * A unique symbol used to access the parseWithDependency method on derived parsers.
 * @since 0.10.0
 */
@@ -180,11 +186,13 @@ function determineFactoryModeForDeriveFrom(options) {
 	return parser.$mode === "async";
 }
 function createSyncDerivedFromParser(sourceId, options) {
+	const allDependencyIds = options.dependencies.map((dep) => dep[DependencyId]);
 	return {
 		$mode: "sync",
 		metavar: options.metavar,
 		[DerivedValueParserMarker]: true,
 		[DependencyId]: sourceId,
+		[DependencyIds]: allDependencyIds,
 		parse(input) {
 			const sourceValues = options.defaultValues();
 			const derivedParser = options.factory(...sourceValues);
@@ -211,11 +219,13 @@ function createSyncDerivedFromParser(sourceId, options) {
 * factory returns an async parser.
 */
 function createAsyncDerivedFromParserFromAsyncFactory(sourceId, options) {
+	const allDependencyIds = options.dependencies.map((dep) => dep[DependencyId]);
 	return {
 		$mode: "async",
 		metavar: options.metavar,
 		[DerivedValueParserMarker]: true,
 		[DependencyId]: sourceId,
+		[DependencyIds]: allDependencyIds,
 		parse(input) {
 			const sourceValues = options.defaultValues();
 			const derivedParser = options.factory(...sourceValues);
@@ -242,11 +252,13 @@ function createAsyncDerivedFromParserFromAsyncFactory(sourceId, options) {
 * sources are async but the factory returns a sync parser.
 */
 function createAsyncDerivedFromParserFromSyncFactory(sourceId, options) {
+	const allDependencyIds = options.dependencies.map((dep) => dep[DependencyId]);
 	return {
 		$mode: "async",
 		metavar: options.metavar,
 		[DerivedValueParserMarker]: true,
 		[DependencyId]: sourceId,
+		[DependencyIds]: allDependencyIds,
 		parse(input) {
 			const sourceValues = options.defaultValues();
 			const derivedParser = options.factory(...sourceValues);
@@ -402,11 +414,13 @@ function isDeferredParseState(value) {
 * @since 0.10.0
 */
 function createDeferredParseState(rawInput, parser, preliminaryResult) {
+	const multipleIds = DependencyIds in parser ? parser[DependencyIds] : void 0;
 	return {
 		[DeferredParseMarker]: true,
 		rawInput,
 		parser,
 		dependencyId: parser[DependencyId],
+		dependencyIds: multipleIds,
 		preliminaryResult
 	};
 }
@@ -507,4 +521,4 @@ function formatDependencyError(error) {
 }
 
 //#endregion
-export { DeferredParseMarker, DependencyId, DependencyRegistry, DependencySourceMarker, DependencySourceStateMarker, DerivedValueParserMarker, ParseWithDependency, createDeferredParseState, createDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser };
+export { DeferredParseMarker, DependencyId, DependencyIds, DependencyRegistry, DependencySourceMarker, DependencySourceStateMarker, DerivedValueParserMarker, ParseWithDependency, createDeferredParseState, createDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser };

package/dist/index.cjs

@@ -13,6 +13,7 @@ const require_facade = require('./facade.cjs');
 
 exports.DeferredParseMarker = require_dependency.DeferredParseMarker;
 exports.DependencyId = require_dependency.DependencyId;
+exports.DependencyIds = require_dependency.DependencyIds;
 exports.DependencyRegistry = require_dependency.DependencyRegistry;
 exports.DependencySourceMarker = require_dependency.DependencySourceMarker;
 exports.DependencySourceStateMarker = require_dependency.DependencySourceStateMarker;

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, DependencyMode, DependencyRegistry, DependencySource, DependencySourceMarker, DependencySourceState, DependencySourceStateMarker, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DerivedValueParserMarker, ParseWithDependency, ResolvedDependency, createDeferredParseState, createDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser } from "./dependency.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, ResolvedDependency, createDeferredParseState, createDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser } 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, 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, ResolvedDependency, Result, RunError, RunOptions, RunParserError, ShellCompletion, ShowDefaultOptions, StringOptions, Suggestion, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, ValueSetOptions, WithDefaultError, WithDefaultOptions, argument, bash, choice, command, commandLine, concat, conditional, constant, createDeferredParseState, createDependencySourceState, 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, isValueParser, 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, tuple, url, uuid, value, valueSet, values, withDefault, zsh };
+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, ResolvedDependency, Result, RunError, RunOptions, RunParserError, ShellCompletion, ShowDefaultOptions, StringOptions, Suggestion, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, ValueSetOptions, WithDefaultError, WithDefaultOptions, argument, bash, choice, command, commandLine, concat, conditional, constant, createDeferredParseState, createDependencySourceState, 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, isValueParser, 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, 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, DependencyMode, DependencyRegistry, DependencySource, DependencySourceMarker, DependencySourceState, DependencySourceStateMarker, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DerivedValueParserMarker, ParseWithDependency, ResolvedDependency, createDeferredParseState, createDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser } from "./dependency.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, ResolvedDependency, createDeferredParseState, createDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser } 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, 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, ResolvedDependency, Result, RunError, RunOptions, RunParserError, ShellCompletion, ShowDefaultOptions, StringOptions, Suggestion, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, ValueSetOptions, WithDefaultError, WithDefaultOptions, argument, bash, choice, command, commandLine, concat, conditional, constant, createDeferredParseState, createDependencySourceState, 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, isValueParser, 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, tuple, url, uuid, value, valueSet, values, withDefault, zsh };
+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, ResolvedDependency, Result, RunError, RunOptions, RunParserError, ShellCompletion, ShowDefaultOptions, StringOptions, Suggestion, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, ValueSetOptions, WithDefaultError, WithDefaultOptions, argument, bash, choice, command, commandLine, concat, conditional, constant, createDeferredParseState, createDependencySourceState, 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, isValueParser, 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, 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, DependencyRegistry, DependencySourceMarker, DependencySourceStateMarker, DerivedValueParserMarker, ParseWithDependency, createDeferredParseState, createDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser } from "./dependency.js";
+import { DeferredParseMarker, DependencyId, DependencyIds, DependencyRegistry, DependencySourceMarker, DependencySourceStateMarker, DerivedValueParserMarker, ParseWithDependency, createDeferredParseState, createDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser } 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, DependencyRegistry, DependencySourceMarker, DependencySourceStateMarker, DerivedValueParserMarker, DuplicateOptionError, ParseWithDependency, RunError, RunParserError, WithDefaultError, argument, bash, choice, command, commandLine, concat, conditional, constant, createDeferredParseState, createDependencySourceState, 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, isValueParser, 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, tuple, url, uuid, value, valueSet, values, withDefault, zsh };
+export { DeferredParseMarker, DependencyId, DependencyIds, DependencyRegistry, DependencySourceMarker, DependencySourceStateMarker, DerivedValueParserMarker, DuplicateOptionError, ParseWithDependency, RunError, RunParserError, WithDefaultError, argument, bash, choice, command, commandLine, concat, conditional, constant, createDeferredParseState, createDependencySourceState, 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, isValueParser, 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, tuple, url, uuid, value, valueSet, values, withDefault, zsh };

package/dist/primitives.cjs

@@ -229,7 +229,8 @@ function option(...args) {
 				consumed: context.buffer.slice(0, 1)
 			};
 			if (optionNames$1.includes(context.buffer[0])) {
-				if (context.state?.success && (valueParser != null || context.state.value)) return {
+				const hasValue = valueParser != null ? context.state?.success || require_dependency.isDeferredParseState(context.state) || require_dependency.isDependencySourceState(context.state) : context.state?.success && context.state?.value;
+				if (hasValue) return {
 					success: false,
 					consumed: 1,
 					error: options.errors?.duplicate ? typeof options.errors.duplicate === "function" ? options.errors.duplicate(context.buffer[0]) : options.errors.duplicate : require_message.message`${require_message.optionName(context.buffer[0])} cannot be used multiple times.`

package/dist/primitives.js

@@ -229,7 +229,8 @@ function option(...args) {
 				consumed: context.buffer.slice(0, 1)
 			};
 			if (optionNames$1.includes(context.buffer[0])) {
-				if (context.state?.success && (valueParser != null || context.state.value)) return {
+				const hasValue = valueParser != null ? context.state?.success || isDeferredParseState(context.state) || isDependencySourceState(context.state) : context.state?.success && context.state?.value;
+				if (hasValue) return {
 					success: false,
 					consumed: 1,
 					error: options.errors?.duplicate ? typeof options.errors.duplicate === "function" ? options.errors.duplicate(context.buffer[0]) : options.errors.duplicate : message`${optionName(context.buffer[0])} cannot be used multiple times.`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "0.10.0-dev.293+9411c366",
+  "version": "0.10.0-dev.294+7d6c1ae6",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",