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

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;
 		}
 	}
 }
@@ -146,17 +218,17 @@ async function* suggestOptionAsync(optionNames$1, valueParser, hidden, context,
 * Internal sync helper for argument suggest functionality.
 * @internal
 */
-function* suggestArgumentSync(valueParser, hidden, prefix) {
+function* suggestArgumentSync(valueParser, hidden, prefix, dependencyRegistry) {
 	if (hidden) return;
-	if (valueParser.suggest) yield* valueParser.suggest(prefix);
+	if (valueParser.suggest) yield* getSuggestionsWithDependency(valueParser, prefix, dependencyRegistry);
 }
 /**
 * Internal async helper for argument suggest functionality.
 * @internal
 */
-async function* suggestArgumentAsync(valueParser, hidden, prefix) {
+async function* suggestArgumentAsync(valueParser, hidden, prefix, dependencyRegistry) {
 	if (hidden) return;
-	if (valueParser.suggest) for await (const suggestion of valueParser.suggest(prefix)) yield suggestion;
+	if (valueParser.suggest) yield* getSuggestionsWithDependencyAsync(valueParser, prefix, dependencyRegistry);
 }
 function option(...args) {
 	const lastArg = args.at(-1);
@@ -709,9 +781,9 @@ function argument(valueParser, options = {}) {
 				error: options.errors?.invalidValue ? typeof options.errors.invalidValue === "function" ? options.errors.invalidValue(state.error) : options.errors.invalidValue : message`${metavar(valueParser.metavar)}: ${state.error}`
 			};
 		},
-		suggest(_context, prefix) {
-			if (isAsync) return suggestArgumentAsync(valueParser, options.hidden ?? false, prefix);
-			return suggestArgumentSync(valueParser, options.hidden ?? false, prefix);
+		suggest(context, prefix) {
+			if (isAsync) return suggestArgumentAsync(valueParser, options.hidden ?? false, prefix, context.dependencyRegistry);
+			return suggestArgumentSync(valueParser, options.hidden ?? false, prefix, context.dependencyRegistry);
 		},
 		getDocFragments(_state, defaultValue) {
 			if (options.hidden) return {

package/package.json

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