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

package/dist/constructs.cjs

@@ -243,11 +243,38 @@ function or(...args) {
 				state: context.state == null || context.state[0] !== i || !context.state[1].success ? parser.initialState : context.state[1].next.state
 			});
 			if (result.success && result.consumed.length > 0) {
-				if (context.state?.[0] !== i && context.state?.[1].success) return {
-					success: false,
-					consumed: context.buffer.length - result.next.buffer.length,
-					error: require_message.message`${require_message.values(context.state[1].consumed)} and ${require_message.values(result.consumed)} cannot be used together.`
-				};
+				if (context.state?.[0] !== i && context.state?.[1].success) {
+					const previouslyConsumed = context.state[1].consumed;
+					const checkResult = parser.parse({
+						...context,
+						buffer: previouslyConsumed,
+						state: parser.initialState
+					});
+					const canConsumeShared = checkResult.success && checkResult.consumed.length === previouslyConsumed.length && checkResult.consumed.every((c, idx) => c === previouslyConsumed[idx]);
+					if (!canConsumeShared) return {
+						success: false,
+						consumed: context.buffer.length - result.next.buffer.length,
+						error: require_message.message`${require_message.values(context.state[1].consumed)} and ${require_message.values(result.consumed)} cannot be used together.`
+					};
+					const replayedResult = parser.parse({
+						...context,
+						state: checkResult.next.state
+					});
+					if (!replayedResult.success) return replayedResult;
+					return {
+						success: true,
+						next: {
+							...context,
+							buffer: replayedResult.next.buffer,
+							optionsTerminated: replayedResult.next.optionsTerminated,
+							state: [i, {
+								...replayedResult,
+								consumed: [...previouslyConsumed, ...replayedResult.consumed]
+							}]
+						},
+						consumed: replayedResult.consumed
+					};
+				}
 				return {
 					success: true,
 					next: {
@@ -276,11 +303,40 @@ function or(...args) {
 			});
 			const result = await resultOrPromise;
 			if (result.success && result.consumed.length > 0) {
-				if (context.state?.[0] !== i && context.state?.[1].success) return {
-					success: false,
-					consumed: context.buffer.length - result.next.buffer.length,
-					error: require_message.message`${require_message.values(context.state[1].consumed)} and ${require_message.values(result.consumed)} cannot be used together.`
-				};
+				if (context.state?.[0] !== i && context.state?.[1].success) {
+					const previouslyConsumed = context.state[1].consumed;
+					const checkResultOrPromise = parser.parse({
+						...context,
+						buffer: previouslyConsumed,
+						state: parser.initialState
+					});
+					const checkResult = await checkResultOrPromise;
+					const canConsumeShared = checkResult.success && checkResult.consumed.length === previouslyConsumed.length && checkResult.consumed.every((c, idx) => c === previouslyConsumed[idx]);
+					if (!canConsumeShared) return {
+						success: false,
+						consumed: context.buffer.length - result.next.buffer.length,
+						error: require_message.message`${require_message.values(context.state[1].consumed)} and ${require_message.values(result.consumed)} cannot be used together.`
+					};
+					const replayedResultOrPromise = parser.parse({
+						...context,
+						state: checkResult.next.state
+					});
+					const replayedResult = await replayedResultOrPromise;
+					if (!replayedResult.success) return replayedResult;
+					return {
+						success: true,
+						next: {
+							...context,
+							buffer: replayedResult.next.buffer,
+							optionsTerminated: replayedResult.next.optionsTerminated,
+							state: [i, {
+								...replayedResult,
+								consumed: [...previouslyConsumed, ...replayedResult.consumed]
+							}]
+						},
+						consumed: replayedResult.consumed
+					};
+				}
 				return {
 					success: true,
 					next: {
@@ -863,7 +919,8 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					} else if (fieldState === void 0 && require_dependency.isWrappedDependencySource(fieldParser)) {
 						const pendingState = fieldParser[require_dependency.WrappedDependencySourceMarker];
 						const completed = fieldParser.complete([pendingState]);
-						preCompletedState[fieldKey] = completed;
+						if (require_dependency.isDependencySourceState(completed)) preCompletedState[fieldKey] = completed;
+						else preCompletedState[fieldKey] = fieldState;
 					} else preCompletedState[fieldKey] = fieldState;
 				}
 				const resolvedState = resolveDeferredParseStates(preCompletedState);
@@ -912,7 +969,8 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					} else if (fieldState === void 0 && require_dependency.isWrappedDependencySource(fieldParser)) {
 						const pendingState = fieldParser[require_dependency.WrappedDependencySourceMarker];
 						const completed = await fieldParser.complete([pendingState]);
-						preCompletedState[fieldKey] = completed;
+						if (require_dependency.isDependencySourceState(completed)) preCompletedState[fieldKey] = completed;
+						else preCompletedState[fieldKey] = fieldState;
 					} else preCompletedState[fieldKey] = fieldState;
 				}
 				const resolvedState = await resolveDeferredParseStatesAsync(preCompletedState);
@@ -1162,10 +1220,43 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		},
 		complete(state) {
 			if (!isAsync) {
-				const result = [];
 				const stateArray = state;
+				const preCompletedState = [];
 				for (let i = 0; i < syncParsers.length; i++) {
-					const valueResult = syncParsers[i].complete(stateArray[i]);
+					const elementState = stateArray[i];
+					const elementParser = syncParsers[i];
+					if (Array.isArray(elementState) && elementState.length === 1 && require_dependency.isPendingDependencySourceState(elementState[0])) {
+						const completed = elementParser.complete(elementState);
+						preCompletedState[i] = completed;
+					} else if (elementState === void 0 && require_dependency.isPendingDependencySourceState(elementParser.initialState)) {
+						const completed = elementParser.complete([elementParser.initialState]);
+						preCompletedState[i] = completed;
+					} else if (elementState === void 0 && require_dependency.isWrappedDependencySource(elementParser)) {
+						const pendingState = elementParser[require_dependency.WrappedDependencySourceMarker];
+						const completed = elementParser.complete([pendingState]);
+						preCompletedState[i] = completed;
+					} else preCompletedState[i] = elementState;
+				}
+				const resolvedState = resolveDeferredParseStates(preCompletedState);
+				const resolvedArray = resolvedState;
+				const result = [];
+				for (let i = 0; i < syncParsers.length; i++) {
+					const elementResolvedState = resolvedArray[i];
+					const elementParser = syncParsers[i];
+					const originalElementState = stateArray[i];
+					const wasPreCompletedCase1 = Array.isArray(originalElementState) && originalElementState.length === 1 && require_dependency.isPendingDependencySourceState(originalElementState[0]);
+					const wasPreCompletedCase2 = originalElementState === void 0 && require_dependency.isPendingDependencySourceState(elementParser.initialState);
+					const wasPreCompletedCase3 = originalElementState === void 0 && require_dependency.isWrappedDependencySource(elementParser);
+					if (require_dependency.isDependencySourceState(elementResolvedState) && (wasPreCompletedCase1 || wasPreCompletedCase2 || wasPreCompletedCase3)) {
+						const depResult = elementResolvedState.result;
+						if (depResult.success) result[i] = depResult.value;
+						else return {
+							success: false,
+							error: depResult.error
+						};
+						continue;
+					}
+					const valueResult = elementParser.complete(elementResolvedState);
 					if (valueResult.success) result[i] = valueResult.value;
 					else return {
 						success: false,
@@ -1178,10 +1269,43 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				};
 			}
 			return (async () => {
-				const result = [];
 				const stateArray = state;
+				const preCompletedState = [];
+				for (let i = 0; i < parsers.length; i++) {
+					const elementState = stateArray[i];
+					const elementParser = parsers[i];
+					if (Array.isArray(elementState) && elementState.length === 1 && require_dependency.isPendingDependencySourceState(elementState[0])) {
+						const completed = await elementParser.complete(elementState);
+						preCompletedState[i] = completed;
+					} else if (elementState === void 0 && require_dependency.isPendingDependencySourceState(elementParser.initialState)) {
+						const completed = await elementParser.complete([elementParser.initialState]);
+						preCompletedState[i] = completed;
+					} else if (elementState === void 0 && require_dependency.isWrappedDependencySource(elementParser)) {
+						const pendingState = elementParser[require_dependency.WrappedDependencySourceMarker];
+						const completed = await elementParser.complete([pendingState]);
+						preCompletedState[i] = completed;
+					} else preCompletedState[i] = elementState;
+				}
+				const resolvedState = await resolveDeferredParseStatesAsync(preCompletedState);
+				const resolvedArray = resolvedState;
+				const result = [];
 				for (let i = 0; i < parsers.length; i++) {
-					const valueResult = await parsers[i].complete(stateArray[i]);
+					const elementResolvedState = resolvedArray[i];
+					const elementParser = parsers[i];
+					const originalElementState = stateArray[i];
+					const wasPreCompletedCase1 = Array.isArray(originalElementState) && originalElementState.length === 1 && require_dependency.isPendingDependencySourceState(originalElementState[0]);
+					const wasPreCompletedCase2 = originalElementState === void 0 && require_dependency.isPendingDependencySourceState(elementParser.initialState);
+					const wasPreCompletedCase3 = originalElementState === void 0 && require_dependency.isWrappedDependencySource(elementParser);
+					if (require_dependency.isDependencySourceState(elementResolvedState) && (wasPreCompletedCase1 || wasPreCompletedCase2 || wasPreCompletedCase3)) {
+						const depResult = elementResolvedState.result;
+						if (depResult.success) result[i] = depResult.value;
+						else return {
+							success: false,
+							error: depResult.error
+						};
+						continue;
+					}
+					const valueResult = await elementParser.complete(elementResolvedState);
 					if (valueResult.success) result[i] = valueResult.value;
 					else return {
 						success: false,

package/dist/constructs.js

@@ -243,11 +243,38 @@ function or(...args) {
 				state: context.state == null || context.state[0] !== i || !context.state[1].success ? parser.initialState : context.state[1].next.state
 			});
 			if (result.success && result.consumed.length > 0) {
-				if (context.state?.[0] !== i && context.state?.[1].success) return {
-					success: false,
-					consumed: context.buffer.length - result.next.buffer.length,
-					error: message`${values(context.state[1].consumed)} and ${values(result.consumed)} cannot be used together.`
-				};
+				if (context.state?.[0] !== i && context.state?.[1].success) {
+					const previouslyConsumed = context.state[1].consumed;
+					const checkResult = parser.parse({
+						...context,
+						buffer: previouslyConsumed,
+						state: parser.initialState
+					});
+					const canConsumeShared = checkResult.success && checkResult.consumed.length === previouslyConsumed.length && checkResult.consumed.every((c, idx) => c === previouslyConsumed[idx]);
+					if (!canConsumeShared) return {
+						success: false,
+						consumed: context.buffer.length - result.next.buffer.length,
+						error: message`${values(context.state[1].consumed)} and ${values(result.consumed)} cannot be used together.`
+					};
+					const replayedResult = parser.parse({
+						...context,
+						state: checkResult.next.state
+					});
+					if (!replayedResult.success) return replayedResult;
+					return {
+						success: true,
+						next: {
+							...context,
+							buffer: replayedResult.next.buffer,
+							optionsTerminated: replayedResult.next.optionsTerminated,
+							state: [i, {
+								...replayedResult,
+								consumed: [...previouslyConsumed, ...replayedResult.consumed]
+							}]
+						},
+						consumed: replayedResult.consumed
+					};
+				}
 				return {
 					success: true,
 					next: {
@@ -276,11 +303,40 @@ function or(...args) {
 			});
 			const result = await resultOrPromise;
 			if (result.success && result.consumed.length > 0) {
-				if (context.state?.[0] !== i && context.state?.[1].success) return {
-					success: false,
-					consumed: context.buffer.length - result.next.buffer.length,
-					error: message`${values(context.state[1].consumed)} and ${values(result.consumed)} cannot be used together.`
-				};
+				if (context.state?.[0] !== i && context.state?.[1].success) {
+					const previouslyConsumed = context.state[1].consumed;
+					const checkResultOrPromise = parser.parse({
+						...context,
+						buffer: previouslyConsumed,
+						state: parser.initialState
+					});
+					const checkResult = await checkResultOrPromise;
+					const canConsumeShared = checkResult.success && checkResult.consumed.length === previouslyConsumed.length && checkResult.consumed.every((c, idx) => c === previouslyConsumed[idx]);
+					if (!canConsumeShared) return {
+						success: false,
+						consumed: context.buffer.length - result.next.buffer.length,
+						error: message`${values(context.state[1].consumed)} and ${values(result.consumed)} cannot be used together.`
+					};
+					const replayedResultOrPromise = parser.parse({
+						...context,
+						state: checkResult.next.state
+					});
+					const replayedResult = await replayedResultOrPromise;
+					if (!replayedResult.success) return replayedResult;
+					return {
+						success: true,
+						next: {
+							...context,
+							buffer: replayedResult.next.buffer,
+							optionsTerminated: replayedResult.next.optionsTerminated,
+							state: [i, {
+								...replayedResult,
+								consumed: [...previouslyConsumed, ...replayedResult.consumed]
+							}]
+						},
+						consumed: replayedResult.consumed
+					};
+				}
 				return {
 					success: true,
 					next: {
@@ -863,7 +919,8 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					} else if (fieldState === void 0 && isWrappedDependencySource(fieldParser)) {
 						const pendingState = fieldParser[WrappedDependencySourceMarker];
 						const completed = fieldParser.complete([pendingState]);
-						preCompletedState[fieldKey] = completed;
+						if (isDependencySourceState(completed)) preCompletedState[fieldKey] = completed;
+						else preCompletedState[fieldKey] = fieldState;
 					} else preCompletedState[fieldKey] = fieldState;
 				}
 				const resolvedState = resolveDeferredParseStates(preCompletedState);
@@ -912,7 +969,8 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					} else if (fieldState === void 0 && isWrappedDependencySource(fieldParser)) {
 						const pendingState = fieldParser[WrappedDependencySourceMarker];
 						const completed = await fieldParser.complete([pendingState]);
-						preCompletedState[fieldKey] = completed;
+						if (isDependencySourceState(completed)) preCompletedState[fieldKey] = completed;
+						else preCompletedState[fieldKey] = fieldState;
 					} else preCompletedState[fieldKey] = fieldState;
 				}
 				const resolvedState = await resolveDeferredParseStatesAsync(preCompletedState);
@@ -1162,10 +1220,43 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		},
 		complete(state) {
 			if (!isAsync) {
-				const result = [];
 				const stateArray = state;
+				const preCompletedState = [];
 				for (let i = 0; i < syncParsers.length; i++) {
-					const valueResult = syncParsers[i].complete(stateArray[i]);
+					const elementState = stateArray[i];
+					const elementParser = syncParsers[i];
+					if (Array.isArray(elementState) && elementState.length === 1 && isPendingDependencySourceState(elementState[0])) {
+						const completed = elementParser.complete(elementState);
+						preCompletedState[i] = completed;
+					} else if (elementState === void 0 && isPendingDependencySourceState(elementParser.initialState)) {
+						const completed = elementParser.complete([elementParser.initialState]);
+						preCompletedState[i] = completed;
+					} else if (elementState === void 0 && isWrappedDependencySource(elementParser)) {
+						const pendingState = elementParser[WrappedDependencySourceMarker];
+						const completed = elementParser.complete([pendingState]);
+						preCompletedState[i] = completed;
+					} else preCompletedState[i] = elementState;
+				}
+				const resolvedState = resolveDeferredParseStates(preCompletedState);
+				const resolvedArray = resolvedState;
+				const result = [];
+				for (let i = 0; i < syncParsers.length; i++) {
+					const elementResolvedState = resolvedArray[i];
+					const elementParser = syncParsers[i];
+					const originalElementState = stateArray[i];
+					const wasPreCompletedCase1 = Array.isArray(originalElementState) && originalElementState.length === 1 && isPendingDependencySourceState(originalElementState[0]);
+					const wasPreCompletedCase2 = originalElementState === void 0 && isPendingDependencySourceState(elementParser.initialState);
+					const wasPreCompletedCase3 = originalElementState === void 0 && isWrappedDependencySource(elementParser);
+					if (isDependencySourceState(elementResolvedState) && (wasPreCompletedCase1 || wasPreCompletedCase2 || wasPreCompletedCase3)) {
+						const depResult = elementResolvedState.result;
+						if (depResult.success) result[i] = depResult.value;
+						else return {
+							success: false,
+							error: depResult.error
+						};
+						continue;
+					}
+					const valueResult = elementParser.complete(elementResolvedState);
 					if (valueResult.success) result[i] = valueResult.value;
 					else return {
 						success: false,
@@ -1178,10 +1269,43 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				};
 			}
 			return (async () => {
-				const result = [];
 				const stateArray = state;
+				const preCompletedState = [];
+				for (let i = 0; i < parsers.length; i++) {
+					const elementState = stateArray[i];
+					const elementParser = parsers[i];
+					if (Array.isArray(elementState) && elementState.length === 1 && isPendingDependencySourceState(elementState[0])) {
+						const completed = await elementParser.complete(elementState);
+						preCompletedState[i] = completed;
+					} else if (elementState === void 0 && isPendingDependencySourceState(elementParser.initialState)) {
+						const completed = await elementParser.complete([elementParser.initialState]);
+						preCompletedState[i] = completed;
+					} else if (elementState === void 0 && isWrappedDependencySource(elementParser)) {
+						const pendingState = elementParser[WrappedDependencySourceMarker];
+						const completed = await elementParser.complete([pendingState]);
+						preCompletedState[i] = completed;
+					} else preCompletedState[i] = elementState;
+				}
+				const resolvedState = await resolveDeferredParseStatesAsync(preCompletedState);
+				const resolvedArray = resolvedState;
+				const result = [];
 				for (let i = 0; i < parsers.length; i++) {
-					const valueResult = await parsers[i].complete(stateArray[i]);
+					const elementResolvedState = resolvedArray[i];
+					const elementParser = parsers[i];
+					const originalElementState = stateArray[i];
+					const wasPreCompletedCase1 = Array.isArray(originalElementState) && originalElementState.length === 1 && isPendingDependencySourceState(originalElementState[0]);
+					const wasPreCompletedCase2 = originalElementState === void 0 && isPendingDependencySourceState(elementParser.initialState);
+					const wasPreCompletedCase3 = originalElementState === void 0 && isWrappedDependencySource(elementParser);
+					if (isDependencySourceState(elementResolvedState) && (wasPreCompletedCase1 || wasPreCompletedCase2 || wasPreCompletedCase3)) {
+						const depResult = elementResolvedState.result;
+						if (depResult.success) result[i] = depResult.value;
+						else return {
+							success: false,
+							error: depResult.error
+						};
+						continue;
+					}
+					const valueResult = await elementParser.complete(elementResolvedState);
 					if (valueResult.success) result[i] = valueResult.value;
 					else return {
 						success: false,

package/dist/dependency.cjs

@@ -1,3 +1,4 @@
+const require_message = require('./message.cjs');
 
 //#region src/dependency.ts
 /**
@@ -200,7 +201,16 @@ function createSyncDerivedFromParser(sourceId, options) {
 			return derivedParser.parse(input);
 		},
 		[ParseWithDependency](input, dependencyValue) {
-			const derivedParser = options.factory(...dependencyValue);
+			let derivedParser;
+			try {
+				derivedParser = options.factory(...dependencyValue);
+			} catch (e) {
+				const msg = e instanceof Error ? e.message : String(e);
+				return {
+					success: false,
+					error: require_message.message`Factory error: ${msg}`
+				};
+			}
 			return derivedParser.parse(input);
 		},
 		format(value) {
@@ -233,7 +243,16 @@ function createAsyncDerivedFromParserFromAsyncFactory(sourceId, options) {
 			return derivedParser.parse(input);
 		},
 		[ParseWithDependency](input, dependencyValue) {
-			const derivedParser = options.factory(...dependencyValue);
+			let derivedParser;
+			try {
+				derivedParser = options.factory(...dependencyValue);
+			} catch (e) {
+				const msg = e instanceof Error ? e.message : String(e);
+				return Promise.resolve({
+					success: false,
+					error: require_message.message`Factory error: ${msg}`
+				});
+			}
 			return derivedParser.parse(input);
 		},
 		format(value) {
@@ -266,7 +285,16 @@ function createAsyncDerivedFromParserFromSyncFactory(sourceId, options) {
 			return Promise.resolve(derivedParser.parse(input));
 		},
 		[ParseWithDependency](input, dependencyValue) {
-			const derivedParser = options.factory(...dependencyValue);
+			let derivedParser;
+			try {
+				derivedParser = options.factory(...dependencyValue);
+			} catch (e) {
+				const msg = e instanceof Error ? e.message : String(e);
+				return Promise.resolve({
+					success: false,
+					error: require_message.message`Factory error: ${msg}`
+				});
+			}
 			return Promise.resolve(derivedParser.parse(input));
 		},
 		format(value) {
@@ -311,7 +339,16 @@ function createSyncDerivedParser(sourceId, options) {
 			return derivedParser.parse(input);
 		},
 		[ParseWithDependency](input, dependencyValue) {
-			const derivedParser = options.factory(dependencyValue);
+			let derivedParser;
+			try {
+				derivedParser = options.factory(dependencyValue);
+			} catch (e) {
+				const msg = e instanceof Error ? e.message : String(e);
+				return {
+					success: false,
+					error: require_message.message`Factory error: ${msg}`
+				};
+			}
 			return derivedParser.parse(input);
 		},
 		format(value) {
@@ -342,7 +379,16 @@ function createAsyncDerivedParserFromAsyncFactory(sourceId, options) {
 			return derivedParser.parse(input);
 		},
 		[ParseWithDependency](input, dependencyValue) {
-			const derivedParser = options.factory(dependencyValue);
+			let derivedParser;
+			try {
+				derivedParser = options.factory(dependencyValue);
+			} catch (e) {
+				const msg = e instanceof Error ? e.message : String(e);
+				return Promise.resolve({
+					success: false,
+					error: require_message.message`Factory error: ${msg}`
+				});
+			}
 			return derivedParser.parse(input);
 		},
 		format(value) {
@@ -373,7 +419,16 @@ function createAsyncDerivedParserFromSyncFactory(sourceId, options) {
 			return Promise.resolve(derivedParser.parse(input));
 		},
 		[ParseWithDependency](input, dependencyValue) {
-			const derivedParser = options.factory(dependencyValue);
+			let derivedParser;
+			try {
+				derivedParser = options.factory(dependencyValue);
+			} catch (e) {
+				const msg = e instanceof Error ? e.message : String(e);
+				return Promise.resolve({
+					success: false,
+					error: require_message.message`Factory error: ${msg}`
+				});
+			}
 			return Promise.resolve(derivedParser.parse(input));
 		},
 		format(value) {
@@ -492,6 +547,28 @@ function createPendingDependencySourceState(dependencyId) {
 */
 const WrappedDependencySourceMarker = Symbol.for("@optique/core/dependency/WrappedDependencySourceMarker");
 /**
+* A unique symbol used to indicate that a wrapper transforms the dependency
+* source value. This is used by withDefault to determine whether its default
+* value should be registered as the dependency value.
+*
+* When a wrapper has this marker set to `true`, it means the wrapper transforms
+* the dependency source value (e.g., via map()), so the wrapper's output is NOT
+* a valid dependency source value.
+*
+* @since 0.10.0
+*/
+const TransformsDependencyValueMarker = Symbol.for("@optique/core/dependency/TransformsDependencyValueMarker");
+/**
+* Checks if a parser transforms the dependency value (has TransformsDependencyValueMarker).
+*
+* @param parser The parser to check.
+* @returns `true` if the parser transforms the dependency value.
+* @since 0.10.0
+*/
+function transformsDependencyValue(parser) {
+	return typeof parser === "object" && parser !== null && TransformsDependencyValueMarker in parser && parser[TransformsDependencyValueMarker] === true;
+}
+/**
 * Checks if a parser wraps a dependency source (has WrappedDependencySourceMarker).
 *
 * @param parser The parser to check.
@@ -576,6 +653,7 @@ exports.DependencySourceStateMarker = DependencySourceStateMarker;
 exports.DerivedValueParserMarker = DerivedValueParserMarker;
 exports.ParseWithDependency = ParseWithDependency;
 exports.PendingDependencySourceStateMarker = PendingDependencySourceStateMarker;
+exports.TransformsDependencyValueMarker = TransformsDependencyValueMarker;
 exports.WrappedDependencySourceMarker = WrappedDependencySourceMarker;
 exports.createDeferredParseState = createDeferredParseState;
 exports.createDependencySourceState = createDependencySourceState;
@@ -590,4 +668,5 @@ exports.isDependencySource = isDependencySource;
 exports.isDependencySourceState = isDependencySourceState;
 exports.isDerivedValueParser = isDerivedValueParser;
 exports.isPendingDependencySourceState = isPendingDependencySourceState;
-exports.isWrappedDependencySource = isWrappedDependencySource;
+exports.isWrappedDependencySource = isWrappedDependencySource;
+exports.transformsDependencyValue = transformsDependencyValue;

package/dist/dependency.d.cts

@@ -602,6 +602,28 @@ declare function createPendingDependencySourceState(dependencyId: symbol): Pendi
  * @since 0.10.0
  */
 declare const WrappedDependencySourceMarker: unique symbol;
+/**
+ * A unique symbol used to indicate that a wrapper transforms the dependency
+ * source value. This is used by withDefault to determine whether its default
+ * value should be registered as the dependency value.
+ *
+ * When a wrapper has this marker set to `true`, it means the wrapper transforms
+ * the dependency source value (e.g., via map()), so the wrapper's output is NOT
+ * a valid dependency source value.
+ *
+ * @since 0.10.0
+ */
+declare const TransformsDependencyValueMarker: unique symbol;
+/**
+ * Checks if a parser transforms the dependency value (has TransformsDependencyValueMarker).
+ *
+ * @param parser The parser to check.
+ * @returns `true` if the parser transforms the dependency value.
+ * @since 0.10.0
+ */
+declare function transformsDependencyValue(parser: unknown): parser is {
+  [TransformsDependencyValueMarker]: true;
+};
 /**
  * Checks if a parser wraps a dependency source (has WrappedDependencySourceMarker).
  *
@@ -691,4 +713,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, WrappedDependencySourceMarker, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource };
+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 };

package/dist/dependency.d.ts

@@ -602,6 +602,28 @@ declare function createPendingDependencySourceState(dependencyId: symbol): Pendi
  * @since 0.10.0
  */
 declare const WrappedDependencySourceMarker: unique symbol;
+/**
+ * A unique symbol used to indicate that a wrapper transforms the dependency
+ * source value. This is used by withDefault to determine whether its default
+ * value should be registered as the dependency value.
+ *
+ * When a wrapper has this marker set to `true`, it means the wrapper transforms
+ * the dependency source value (e.g., via map()), so the wrapper's output is NOT
+ * a valid dependency source value.
+ *
+ * @since 0.10.0
+ */
+declare const TransformsDependencyValueMarker: unique symbol;
+/**
+ * Checks if a parser transforms the dependency value (has TransformsDependencyValueMarker).
+ *
+ * @param parser The parser to check.
+ * @returns `true` if the parser transforms the dependency value.
+ * @since 0.10.0
+ */
+declare function transformsDependencyValue(parser: unknown): parser is {
+  [TransformsDependencyValueMarker]: true;
+};
 /**
  * Checks if a parser wraps a dependency source (has WrappedDependencySourceMarker).
  *
@@ -691,4 +713,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, WrappedDependencySourceMarker, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource };
+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 };

package/dist/dependency.js

@@ -1,3 +1,5 @@
+import { message } from "./message.js";
+
 //#region src/dependency.ts
 /**
 * A unique symbol used to identify dependency sources at compile time.
@@ -199,7 +201,16 @@ function createSyncDerivedFromParser(sourceId, options) {
 			return derivedParser.parse(input);
 		},
 		[ParseWithDependency](input, dependencyValue) {
-			const derivedParser = options.factory(...dependencyValue);
+			let derivedParser;
+			try {
+				derivedParser = options.factory(...dependencyValue);
+			} catch (e) {
+				const msg = e instanceof Error ? e.message : String(e);
+				return {
+					success: false,
+					error: message`Factory error: ${msg}`
+				};
+			}
 			return derivedParser.parse(input);
 		},
 		format(value) {
@@ -232,7 +243,16 @@ function createAsyncDerivedFromParserFromAsyncFactory(sourceId, options) {
 			return derivedParser.parse(input);
 		},
 		[ParseWithDependency](input, dependencyValue) {
-			const derivedParser = options.factory(...dependencyValue);
+			let derivedParser;
+			try {
+				derivedParser = options.factory(...dependencyValue);
+			} catch (e) {
+				const msg = e instanceof Error ? e.message : String(e);
+				return Promise.resolve({
+					success: false,
+					error: message`Factory error: ${msg}`
+				});
+			}
 			return derivedParser.parse(input);
 		},
 		format(value) {
@@ -265,7 +285,16 @@ function createAsyncDerivedFromParserFromSyncFactory(sourceId, options) {
 			return Promise.resolve(derivedParser.parse(input));
 		},
 		[ParseWithDependency](input, dependencyValue) {
-			const derivedParser = options.factory(...dependencyValue);
+			let derivedParser;
+			try {
+				derivedParser = options.factory(...dependencyValue);
+			} catch (e) {
+				const msg = e instanceof Error ? e.message : String(e);
+				return Promise.resolve({
+					success: false,
+					error: message`Factory error: ${msg}`
+				});
+			}
 			return Promise.resolve(derivedParser.parse(input));
 		},
 		format(value) {
@@ -310,7 +339,16 @@ function createSyncDerivedParser(sourceId, options) {
 			return derivedParser.parse(input);
 		},
 		[ParseWithDependency](input, dependencyValue) {
-			const derivedParser = options.factory(dependencyValue);
+			let derivedParser;
+			try {
+				derivedParser = options.factory(dependencyValue);
+			} catch (e) {
+				const msg = e instanceof Error ? e.message : String(e);
+				return {
+					success: false,
+					error: message`Factory error: ${msg}`
+				};
+			}
 			return derivedParser.parse(input);
 		},
 		format(value) {
@@ -341,7 +379,16 @@ function createAsyncDerivedParserFromAsyncFactory(sourceId, options) {
 			return derivedParser.parse(input);
 		},
 		[ParseWithDependency](input, dependencyValue) {
-			const derivedParser = options.factory(dependencyValue);
+			let derivedParser;
+			try {
+				derivedParser = options.factory(dependencyValue);
+			} catch (e) {
+				const msg = e instanceof Error ? e.message : String(e);
+				return Promise.resolve({
+					success: false,
+					error: message`Factory error: ${msg}`
+				});
+			}
 			return derivedParser.parse(input);
 		},
 		format(value) {
@@ -372,7 +419,16 @@ function createAsyncDerivedParserFromSyncFactory(sourceId, options) {
 			return Promise.resolve(derivedParser.parse(input));
 		},
 		[ParseWithDependency](input, dependencyValue) {
-			const derivedParser = options.factory(dependencyValue);
+			let derivedParser;
+			try {
+				derivedParser = options.factory(dependencyValue);
+			} catch (e) {
+				const msg = e instanceof Error ? e.message : String(e);
+				return Promise.resolve({
+					success: false,
+					error: message`Factory error: ${msg}`
+				});
+			}
 			return Promise.resolve(derivedParser.parse(input));
 		},
 		format(value) {
@@ -491,6 +547,28 @@ function createPendingDependencySourceState(dependencyId) {
 */
 const WrappedDependencySourceMarker = Symbol.for("@optique/core/dependency/WrappedDependencySourceMarker");
 /**
+* A unique symbol used to indicate that a wrapper transforms the dependency
+* source value. This is used by withDefault to determine whether its default
+* value should be registered as the dependency value.
+*
+* When a wrapper has this marker set to `true`, it means the wrapper transforms
+* the dependency source value (e.g., via map()), so the wrapper's output is NOT
+* a valid dependency source value.
+*
+* @since 0.10.0
+*/
+const TransformsDependencyValueMarker = Symbol.for("@optique/core/dependency/TransformsDependencyValueMarker");
+/**
+* Checks if a parser transforms the dependency value (has TransformsDependencyValueMarker).
+*
+* @param parser The parser to check.
+* @returns `true` if the parser transforms the dependency value.
+* @since 0.10.0
+*/
+function transformsDependencyValue(parser) {
+	return typeof parser === "object" && parser !== null && TransformsDependencyValueMarker in parser && parser[TransformsDependencyValueMarker] === true;
+}
+/**
 * Checks if a parser wraps a dependency source (has WrappedDependencySourceMarker).
 *
 * @param parser The parser to check.
@@ -566,4 +644,4 @@ function formatDependencyError(error) {
 }
 
 //#endregion
-export { DeferredParseMarker, DependencyId, DependencyIds, DependencyRegistry, DependencySourceMarker, DependencySourceStateMarker, DerivedValueParserMarker, ParseWithDependency, PendingDependencySourceStateMarker, WrappedDependencySourceMarker, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource };
+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 };

package/dist/index.cjs

@@ -23,6 +23,7 @@ exports.ParseWithDependency = require_dependency.ParseWithDependency;
 exports.PendingDependencySourceStateMarker = require_dependency.PendingDependencySourceStateMarker;
 exports.RunError = require_facade.RunError;
 exports.RunParserError = require_facade.RunParserError;
+exports.TransformsDependencyValueMarker = require_dependency.TransformsDependencyValueMarker;
 exports.WithDefaultError = require_modifiers.WithDefaultError;
 exports.WrappedDependencySourceMarker = require_dependency.WrappedDependencySourceMarker;
 exports.argument = require_primitives.argument;
@@ -95,6 +96,7 @@ exports.suggest = require_parser.suggest;
 exports.suggestAsync = require_parser.suggestAsync;
 exports.suggestSync = require_parser.suggestSync;
 exports.text = require_message.text;
+exports.transformsDependencyValue = require_dependency.transformsDependencyValue;
 exports.tuple = require_constructs.tuple;
 exports.url = require_valueparser.url;
 exports.uuid = require_valueparser.uuid;

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, WrappedDependencySourceMarker, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource } 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, PendingDependencySourceState, PendingDependencySourceStateMarker, ResolvedDependency, 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, 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, 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, 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 };

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, WrappedDependencySourceMarker, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource } 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, PendingDependencySourceState, PendingDependencySourceStateMarker, ResolvedDependency, 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, 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, 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, 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 };

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, WrappedDependencySourceMarker, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource } from "./dependency.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 { 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, 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, tuple, url, uuid, value, valueSet, values, withDefault, zsh };
+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 };

package/dist/modifiers.cjs

@@ -90,6 +90,11 @@ function optional(parser) {
 		}, prefix);
 		for await (const s of suggestions) yield s;
 	}
+	const innerHasWrappedDependency = require_dependency.isWrappedDependencySource(parser);
+	const innerHasDirectDependency = require_dependency.isPendingDependencySourceState(syncParser.initialState);
+	const wrappedDependencyMarker = innerHasWrappedDependency ? { [require_dependency.WrappedDependencySourceMarker]: parser[require_dependency.WrappedDependencySourceMarker] } : innerHasDirectDependency ? { [require_dependency.WrappedDependencySourceMarker]: syncParser.initialState } : {};
+	const hasWrappedDependencySource = require_dependency.WrappedDependencySourceMarker in wrappedDependencyMarker;
+	const wrappedPendingState = hasWrappedDependencySource ? wrappedDependencyMarker[require_dependency.WrappedDependencySourceMarker] : void 0;
 	return {
 		$mode: parser.$mode,
 		$valueType: [],
@@ -100,15 +105,32 @@ function optional(parser) {
 			terms: parser.usage
 		}],
 		initialState: void 0,
+		...wrappedDependencyMarker,
 		parse(context) {
 			if (isAsync) return parseOptionalStyleAsync(context, parser);
 			return parseOptionalStyleSync(context, syncParser);
 		},
 		complete(state) {
-			if (typeof state === "undefined") return {
-				success: true,
-				value: void 0
-			};
+			if (typeof state === "undefined") {
+				if (innerHasWrappedDependency && wrappedPendingState) {
+					if (!isAsync) return syncParser.complete([wrappedPendingState]);
+					return parser.complete([wrappedPendingState]);
+				}
+				return {
+					success: true,
+					value: void 0
+				};
+			}
+			if (Array.isArray(state) && state.length === 1 && require_dependency.isPendingDependencySourceState(state[0])) {
+				if (innerHasWrappedDependency) {
+					if (!isAsync) return syncParser.complete(state);
+					return parser.complete(state);
+				}
+				return {
+					success: true,
+					value: void 0
+				};
+			}
 			if (!isAsync) return syncParser.complete(state[0]);
 			return parser.complete(state[0]);
 		},
@@ -178,7 +200,7 @@ function withDefault(parser, defaultValue, options) {
 		for await (const s of suggestions) yield s;
 	}
 	const innerInitialState = syncParser.initialState;
-	const wrappedDependencyMarker = require_dependency.isPendingDependencySourceState(innerInitialState) ? { [require_dependency.WrappedDependencySourceMarker]: innerInitialState } : {};
+	const wrappedDependencyMarker = require_dependency.isPendingDependencySourceState(innerInitialState) ? { [require_dependency.WrappedDependencySourceMarker]: innerInitialState } : require_dependency.isWrappedDependencySource(parser) ? { [require_dependency.WrappedDependencySourceMarker]: parser[require_dependency.WrappedDependencySourceMarker] } : {};
 	return {
 		$mode: parser.$mode,
 		$valueType: [],
@@ -195,29 +217,108 @@ function withDefault(parser, defaultValue, options) {
 			return parseOptionalStyleSync(context, syncParser);
 		},
 		complete(state) {
-			if (typeof state === "undefined") try {
-				const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
-				return {
-					success: true,
-					value
-				};
-			} catch (error) {
-				return {
-					success: false,
-					error: error instanceof WithDefaultError ? error.errorMessage : require_message.message`${require_message.text(String(error))}`
-				};
+			if (typeof state === "undefined") {
+				if (require_dependency.transformsDependencyValue(parser)) {
+					const innerResult = !isAsync ? syncParser.complete(void 0) : parser.complete(void 0);
+					const handleInnerResult = (res) => {
+						if (require_dependency.isDependencySourceState(res)) try {
+							const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
+							return require_dependency.createDependencySourceState({
+								success: true,
+								value
+							}, res[require_dependency.DependencyId]);
+						} catch (error) {
+							return {
+								success: false,
+								error: error instanceof WithDefaultError ? error.errorMessage : require_message.message`${require_message.text(String(error))}`
+							};
+						}
+						try {
+							const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
+							return {
+								success: true,
+								value
+							};
+						} catch (error) {
+							return {
+								success: false,
+								error: error instanceof WithDefaultError ? error.errorMessage : require_message.message`${require_message.text(String(error))}`
+							};
+						}
+					};
+					if (innerResult instanceof Promise) return innerResult.then(handleInnerResult);
+					return handleInnerResult(innerResult);
+				}
+				if (require_dependency.isWrappedDependencySource(parser)) try {
+					const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
+					const pendingState = parser[require_dependency.WrappedDependencySourceMarker];
+					return require_dependency.createDependencySourceState({
+						success: true,
+						value
+					}, pendingState[require_dependency.DependencyId]);
+				} catch (error) {
+					return {
+						success: false,
+						error: error instanceof WithDefaultError ? error.errorMessage : require_message.message`${require_message.text(String(error))}`
+					};
+				}
+				try {
+					const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
+					return {
+						success: true,
+						value
+					};
+				} catch (error) {
+					return {
+						success: false,
+						error: error instanceof WithDefaultError ? error.errorMessage : require_message.message`${require_message.text(String(error))}`
+					};
+				}
 			}
-			if (require_dependency.isPendingDependencySourceState(state[0])) try {
-				const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
-				return require_dependency.createDependencySourceState({
-					success: true,
-					value
-				}, state[0][require_dependency.DependencyId]);
-			} catch (error) {
-				return {
-					success: false,
-					error: error instanceof WithDefaultError ? error.errorMessage : require_message.message`${require_message.text(String(error))}`
-				};
+			if (require_dependency.isPendingDependencySourceState(state[0])) {
+				if (require_dependency.transformsDependencyValue(parser)) {
+					const innerResult = !isAsync ? syncParser.complete(state) : parser.complete(state);
+					const handleInnerResult = (res) => {
+						if (require_dependency.isDependencySourceState(res)) try {
+							const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
+							return require_dependency.createDependencySourceState({
+								success: true,
+								value
+							}, res[require_dependency.DependencyId]);
+						} catch (error) {
+							return {
+								success: false,
+								error: error instanceof WithDefaultError ? error.errorMessage : require_message.message`${require_message.text(String(error))}`
+							};
+						}
+						try {
+							const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
+							return {
+								success: true,
+								value
+							};
+						} catch (error) {
+							return {
+								success: false,
+								error: error instanceof WithDefaultError ? error.errorMessage : require_message.message`${require_message.text(String(error))}`
+							};
+						}
+					};
+					if (innerResult instanceof Promise) return innerResult.then(handleInnerResult);
+					return handleInnerResult(innerResult);
+				}
+				try {
+					const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
+					return require_dependency.createDependencySourceState({
+						success: true,
+						value
+					}, state[0][require_dependency.DependencyId]);
+				} catch (error) {
+					return {
+						success: false,
+						error: error instanceof WithDefaultError ? error.errorMessage : require_message.message`${require_message.text(String(error))}`
+					};
+				}
 			}
 			if (!isAsync) return syncParser.complete(state[0]);
 			return parser.complete(state[0]);
@@ -300,10 +401,15 @@ function map(parser, transform) {
 		};
 		return res;
 	};
+	const dependencyMarkers = require_dependency.isWrappedDependencySource(parser) ? {
+		[require_dependency.WrappedDependencySourceMarker]: parser[require_dependency.WrappedDependencySourceMarker],
+		[require_dependency.TransformsDependencyValueMarker]: true
+	} : {};
 	return {
 		...parser,
 		$valueType: [],
 		complete,
+		...dependencyMarkers,
 		getDocFragments(state, _defaultValue) {
 			return parser.getDocFragments(state, void 0);
 		}

package/dist/modifiers.js

@@ -1,5 +1,5 @@
 import { formatMessage, message, text } from "./message.js";
-import { DependencyId, WrappedDependencySourceMarker, createDependencySourceState, isPendingDependencySourceState } from "./dependency.js";
+import { DependencyId, TransformsDependencyValueMarker, WrappedDependencySourceMarker, createDependencySourceState, isDependencySourceState, isPendingDependencySourceState, isWrappedDependencySource, transformsDependencyValue } from "./dependency.js";
 
 //#region src/modifiers.ts
 /**
@@ -90,6 +90,11 @@ function optional(parser) {
 		}, prefix);
 		for await (const s of suggestions) yield s;
 	}
+	const innerHasWrappedDependency = isWrappedDependencySource(parser);
+	const innerHasDirectDependency = isPendingDependencySourceState(syncParser.initialState);
+	const wrappedDependencyMarker = innerHasWrappedDependency ? { [WrappedDependencySourceMarker]: parser[WrappedDependencySourceMarker] } : innerHasDirectDependency ? { [WrappedDependencySourceMarker]: syncParser.initialState } : {};
+	const hasWrappedDependencySource = WrappedDependencySourceMarker in wrappedDependencyMarker;
+	const wrappedPendingState = hasWrappedDependencySource ? wrappedDependencyMarker[WrappedDependencySourceMarker] : void 0;
 	return {
 		$mode: parser.$mode,
 		$valueType: [],
@@ -100,15 +105,32 @@ function optional(parser) {
 			terms: parser.usage
 		}],
 		initialState: void 0,
+		...wrappedDependencyMarker,
 		parse(context) {
 			if (isAsync) return parseOptionalStyleAsync(context, parser);
 			return parseOptionalStyleSync(context, syncParser);
 		},
 		complete(state) {
-			if (typeof state === "undefined") return {
-				success: true,
-				value: void 0
-			};
+			if (typeof state === "undefined") {
+				if (innerHasWrappedDependency && wrappedPendingState) {
+					if (!isAsync) return syncParser.complete([wrappedPendingState]);
+					return parser.complete([wrappedPendingState]);
+				}
+				return {
+					success: true,
+					value: void 0
+				};
+			}
+			if (Array.isArray(state) && state.length === 1 && isPendingDependencySourceState(state[0])) {
+				if (innerHasWrappedDependency) {
+					if (!isAsync) return syncParser.complete(state);
+					return parser.complete(state);
+				}
+				return {
+					success: true,
+					value: void 0
+				};
+			}
 			if (!isAsync) return syncParser.complete(state[0]);
 			return parser.complete(state[0]);
 		},
@@ -178,7 +200,7 @@ function withDefault(parser, defaultValue, options) {
 		for await (const s of suggestions) yield s;
 	}
 	const innerInitialState = syncParser.initialState;
-	const wrappedDependencyMarker = isPendingDependencySourceState(innerInitialState) ? { [WrappedDependencySourceMarker]: innerInitialState } : {};
+	const wrappedDependencyMarker = isPendingDependencySourceState(innerInitialState) ? { [WrappedDependencySourceMarker]: innerInitialState } : isWrappedDependencySource(parser) ? { [WrappedDependencySourceMarker]: parser[WrappedDependencySourceMarker] } : {};
 	return {
 		$mode: parser.$mode,
 		$valueType: [],
@@ -195,29 +217,108 @@ function withDefault(parser, defaultValue, options) {
 			return parseOptionalStyleSync(context, syncParser);
 		},
 		complete(state) {
-			if (typeof state === "undefined") try {
-				const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
-				return {
-					success: true,
-					value
-				};
-			} catch (error) {
-				return {
-					success: false,
-					error: error instanceof WithDefaultError ? error.errorMessage : message`${text(String(error))}`
-				};
+			if (typeof state === "undefined") {
+				if (transformsDependencyValue(parser)) {
+					const innerResult = !isAsync ? syncParser.complete(void 0) : parser.complete(void 0);
+					const handleInnerResult = (res) => {
+						if (isDependencySourceState(res)) try {
+							const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
+							return createDependencySourceState({
+								success: true,
+								value
+							}, res[DependencyId]);
+						} catch (error) {
+							return {
+								success: false,
+								error: error instanceof WithDefaultError ? error.errorMessage : message`${text(String(error))}`
+							};
+						}
+						try {
+							const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
+							return {
+								success: true,
+								value
+							};
+						} catch (error) {
+							return {
+								success: false,
+								error: error instanceof WithDefaultError ? error.errorMessage : message`${text(String(error))}`
+							};
+						}
+					};
+					if (innerResult instanceof Promise) return innerResult.then(handleInnerResult);
+					return handleInnerResult(innerResult);
+				}
+				if (isWrappedDependencySource(parser)) try {
+					const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
+					const pendingState = parser[WrappedDependencySourceMarker];
+					return createDependencySourceState({
+						success: true,
+						value
+					}, pendingState[DependencyId]);
+				} catch (error) {
+					return {
+						success: false,
+						error: error instanceof WithDefaultError ? error.errorMessage : message`${text(String(error))}`
+					};
+				}
+				try {
+					const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
+					return {
+						success: true,
+						value
+					};
+				} catch (error) {
+					return {
+						success: false,
+						error: error instanceof WithDefaultError ? error.errorMessage : message`${text(String(error))}`
+					};
+				}
 			}
-			if (isPendingDependencySourceState(state[0])) try {
-				const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
-				return createDependencySourceState({
-					success: true,
-					value
-				}, state[0][DependencyId]);
-			} catch (error) {
-				return {
-					success: false,
-					error: error instanceof WithDefaultError ? error.errorMessage : message`${text(String(error))}`
-				};
+			if (isPendingDependencySourceState(state[0])) {
+				if (transformsDependencyValue(parser)) {
+					const innerResult = !isAsync ? syncParser.complete(state) : parser.complete(state);
+					const handleInnerResult = (res) => {
+						if (isDependencySourceState(res)) try {
+							const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
+							return createDependencySourceState({
+								success: true,
+								value
+							}, res[DependencyId]);
+						} catch (error) {
+							return {
+								success: false,
+								error: error instanceof WithDefaultError ? error.errorMessage : message`${text(String(error))}`
+							};
+						}
+						try {
+							const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
+							return {
+								success: true,
+								value
+							};
+						} catch (error) {
+							return {
+								success: false,
+								error: error instanceof WithDefaultError ? error.errorMessage : message`${text(String(error))}`
+							};
+						}
+					};
+					if (innerResult instanceof Promise) return innerResult.then(handleInnerResult);
+					return handleInnerResult(innerResult);
+				}
+				try {
+					const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
+					return createDependencySourceState({
+						success: true,
+						value
+					}, state[0][DependencyId]);
+				} catch (error) {
+					return {
+						success: false,
+						error: error instanceof WithDefaultError ? error.errorMessage : message`${text(String(error))}`
+					};
+				}
 			}
 			if (!isAsync) return syncParser.complete(state[0]);
 			return parser.complete(state[0]);
@@ -300,10 +401,15 @@ function map(parser, transform) {
 		};
 		return res;
 	};
+	const dependencyMarkers = isWrappedDependencySource(parser) ? {
+		[WrappedDependencySourceMarker]: parser[WrappedDependencySourceMarker],
+		[TransformsDependencyValueMarker]: true
+	} : {};
 	return {
 		...parser,
 		$valueType: [],
 		complete,
+		...dependencyMarkers,
 		getDocFragments(state, _defaultValue) {
 			return parser.getDocFragments(state, void 0);
 		}

package/package.json

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