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

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/dist/parser.d.cts

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

package/dist/parser.d.ts

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

package/dist/primitives.cjs

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

package/dist/primitives.js

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

package/package.json

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