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

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, 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, 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, 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, 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, createDeferredParseState, createDependencySourceState, dependency, deriveFrom, deriveFromAsync, deriveFromSync, formatDependencyError, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser } 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, 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, 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

@@ -1,4 +1,5 @@
 const require_message = require('./message.cjs');
+const require_dependency = require('./dependency.cjs');
 
 //#region src/modifiers.ts
 /**
@@ -89,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: [],
@@ -99,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]);
 		},
@@ -176,6 +199,8 @@ function withDefault(parser, defaultValue, options) {
 		}, prefix);
 		for await (const s of suggestions) yield s;
 	}
+	const innerInitialState = syncParser.initialState;
+	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: [],
@@ -186,22 +211,114 @@ function withDefault(parser, defaultValue, options) {
 			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") 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])) {
+				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]);
@@ -284,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,4 +1,5 @@
 import { formatMessage, message, text } from "./message.js";
+import { DependencyId, TransformsDependencyValueMarker, WrappedDependencySourceMarker, createDependencySourceState, isDependencySourceState, isPendingDependencySourceState, isWrappedDependencySource, transformsDependencyValue } from "./dependency.js";
 
 //#region src/modifiers.ts
 /**
@@ -89,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: [],
@@ -99,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]);
 		},
@@ -176,6 +199,8 @@ function withDefault(parser, defaultValue, options) {
 		}, prefix);
 		for await (const s of suggestions) yield s;
 	}
+	const innerInitialState = syncParser.initialState;
+	const wrappedDependencyMarker = isPendingDependencySourceState(innerInitialState) ? { [WrappedDependencySourceMarker]: innerInitialState } : isWrappedDependencySource(parser) ? { [WrappedDependencySourceMarker]: parser[WrappedDependencySourceMarker] } : {};
 	return {
 		$mode: parser.$mode,
 		$valueType: [],
@@ -186,22 +211,114 @@ function withDefault(parser, defaultValue, options) {
 			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") 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])) {
+				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]);
@@ -284,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/dist/primitives.cjs

@@ -203,7 +203,7 @@ function option(...args) {
 		initialState: valueParser == null ? {
 			success: true,
 			value: false
-		} : {
+		} : require_dependency.isDependencySource(valueParser) ? require_dependency.createPendingDependencySourceState(valueParser[require_dependency.DependencyId]) : {
 			success: false,
 			error: options.errors?.missing ? typeof options.errors.missing === "function" ? options.errors.missing(optionNames$1) : options.errors.missing : require_message.message`Missing option ${require_message.optionNames(optionNames$1)}.`
 		},
@@ -357,6 +357,10 @@ function option(...args) {
 				success: false,
 				error: options.errors?.missing ? typeof options.errors.missing === "function" ? options.errors.missing(optionNames$1) : options.errors.missing : require_message.message`Missing option ${require_message.optionNames(optionNames$1)}.`
 			};
+			if (require_dependency.isPendingDependencySourceState(state)) return {
+				success: false,
+				error: options.errors?.missing ? typeof options.errors.missing === "function" ? options.errors.missing(optionNames$1) : options.errors.missing : require_message.message`Missing option ${require_message.optionNames(optionNames$1)}.`
+			};
 			if (require_dependency.isDeferredParseState(state)) {
 				const preliminaryResult = state.preliminaryResult;
 				if (preliminaryResult.success) return preliminaryResult;

package/dist/primitives.d.cts

@@ -1,16 +1,17 @@
 import { Message } from "./message.cjs";
 import { OptionName } from "./usage.cjs";
 import { ValueParser, ValueParserResult } from "./valueparser.cjs";
-import { DeferredParseState } from "./dependency.cjs";
+import { DeferredParseState, PendingDependencySourceState } from "./dependency.cjs";
 import { Mode, Parser } from "./parser.cjs";
 
 //#region src/primitives.d.ts
 /**
  * State type for options that may use deferred parsing (DerivedValueParser).
- * This extends the normal ValueParserResult to also support DeferredParseState.
+ * This extends the normal ValueParserResult to also support DeferredParseState
+ * and PendingDependencySourceState.
  * @internal
  */
-type OptionState<T> = ValueParserResult<T> | DeferredParseState<T> | undefined;
+type OptionState<T> = ValueParserResult<T> | DeferredParseState<T> | PendingDependencySourceState | undefined;
 /**
  * Creates a parser that always succeeds without consuming any input and
  * produces a constant value of the type {@link T}.

package/dist/primitives.d.ts

@@ -1,16 +1,17 @@
 import { Message } from "./message.js";
 import { OptionName } from "./usage.js";
 import { ValueParser, ValueParserResult } from "./valueparser.js";
-import { DeferredParseState } from "./dependency.js";
+import { DeferredParseState, PendingDependencySourceState } from "./dependency.js";
 import { Mode, Parser } from "./parser.js";
 
 //#region src/primitives.d.ts
 /**
  * State type for options that may use deferred parsing (DerivedValueParser).
- * This extends the normal ValueParserResult to also support DeferredParseState.
+ * This extends the normal ValueParserResult to also support DeferredParseState
+ * and PendingDependencySourceState.
  * @internal
  */
-type OptionState<T> = ValueParserResult<T> | DeferredParseState<T> | undefined;
+type OptionState<T> = ValueParserResult<T> | DeferredParseState<T> | PendingDependencySourceState | undefined;
 /**
  * Creates a parser that always succeeds without consuming any input and
  * produces a constant value of the type {@link T}.

package/dist/primitives.js

@@ -1,5 +1,5 @@
 import { message, metavar, optionName, optionNames } from "./message.js";
-import { DependencyId, createDeferredParseState, createDependencySourceState, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser } from "./dependency.js";
+import { DependencyId, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState } from "./dependency.js";
 import { extractCommandNames, extractOptionNames } from "./usage.js";
 import { DEFAULT_FIND_SIMILAR_OPTIONS, createErrorWithSuggestions, findSimilar } from "./suggestion.js";
 import { isValueParser } from "./valueparser.js";
@@ -203,7 +203,7 @@ function option(...args) {
 		initialState: valueParser == null ? {
 			success: true,
 			value: false
-		} : {
+		} : isDependencySource(valueParser) ? createPendingDependencySourceState(valueParser[DependencyId]) : {
 			success: false,
 			error: options.errors?.missing ? typeof options.errors.missing === "function" ? options.errors.missing(optionNames$1) : options.errors.missing : message`Missing option ${optionNames(optionNames$1)}.`
 		},
@@ -357,6 +357,10 @@ function option(...args) {
 				success: false,
 				error: options.errors?.missing ? typeof options.errors.missing === "function" ? options.errors.missing(optionNames$1) : options.errors.missing : message`Missing option ${optionNames(optionNames$1)}.`
 			};
+			if (isPendingDependencySourceState(state)) return {
+				success: false,
+				error: options.errors?.missing ? typeof options.errors.missing === "function" ? options.errors.missing(optionNames$1) : options.errors.missing : message`Missing option ${optionNames(optionNames$1)}.`
+			};
 			if (isDeferredParseState(state)) {
 				const preliminaryResult = state.preliminaryResult;
 				if (preliminaryResult.success) return preliminaryResult;

package/package.json

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