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

package/dist/constructs.cjs

@@ -1,4 +1,5 @@
 const require_message = require('./message.cjs');
+const require_dependency = require('./dependency.cjs');
 const require_usage = require('./usage.cjs');
 const require_suggestion = require('./suggestion.cjs');
 
@@ -531,6 +532,72 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 	}
 	yield* require_suggestion.deduplicateSuggestions(suggestions);
 }
+/**
+* Resolves deferred parse states in an object's field states.
+* This function builds a dependency registry from DependencySourceState fields
+* and re-parses DeferredParseState fields using the actual dependency values.
+*
+* @param fieldStates A record of field names to their state values
+* @returns The field states with deferred states resolved to their actual values
+* @internal
+*/
+function resolveDeferredParseStates(fieldStates) {
+	const registry = new require_dependency.DependencyRegistry();
+	for (const key of Reflect.ownKeys(fieldStates)) {
+		const fieldState = fieldStates[key];
+		if (require_dependency.isDependencySourceState(fieldState)) {
+			const depId = fieldState[require_dependency.DependencyId];
+			const result = fieldState.result;
+			if (result.success) registry.set(depId, result.value);
+		}
+	}
+	const resolvedStates = { ...fieldStates };
+	for (const key of Reflect.ownKeys(fieldStates)) {
+		const fieldState = fieldStates[key];
+		if (require_dependency.isDeferredParseState(fieldState)) {
+			const deferredState = fieldState;
+			const depId = deferredState.dependencyId;
+			if (registry.has(depId)) {
+				const dependencyValue = registry.get(depId);
+				const parser = deferredState.parser;
+				const reParseResult = parser[require_dependency.ParseWithDependency](deferredState.rawInput, dependencyValue);
+				if (reParseResult instanceof Promise) resolvedStates[key] = deferredState.preliminaryResult;
+				else resolvedStates[key] = reParseResult;
+			} else resolvedStates[key] = deferredState.preliminaryResult;
+		}
+	}
+	return resolvedStates;
+}
+/**
+* Async version of resolveDeferredParseStates for async parsers.
+* @internal
+*/
+async function resolveDeferredParseStatesAsync(fieldStates) {
+	const registry = new require_dependency.DependencyRegistry();
+	for (const key of Reflect.ownKeys(fieldStates)) {
+		const fieldState = fieldStates[key];
+		if (require_dependency.isDependencySourceState(fieldState)) {
+			const depId = fieldState[require_dependency.DependencyId];
+			const result = fieldState.result;
+			if (result.success) registry.set(depId, result.value);
+		}
+	}
+	const resolvedStates = { ...fieldStates };
+	for (const key of Reflect.ownKeys(fieldStates)) {
+		const fieldState = fieldStates[key];
+		if (require_dependency.isDeferredParseState(fieldState)) {
+			const deferredState = fieldState;
+			const depId = deferredState.dependencyId;
+			if (registry.has(depId)) {
+				const dependencyValue = registry.get(depId);
+				const parser = deferredState.parser;
+				const reParseResult = parser[require_dependency.ParseWithDependency](deferredState.rawInput, dependencyValue);
+				resolvedStates[key] = await Promise.resolve(reParseResult);
+			} else resolvedStates[key] = deferredState.preliminaryResult;
+		}
+	}
+	return resolvedStates;
+}
 function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 	const label = typeof labelOrParsers === "string" ? labelOrParsers : void 0;
 	let parsers;
@@ -689,10 +756,11 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			return parseSync(context);
 		},
 		complete(state) {
+			const resolvedState = isAsync ? state : resolveDeferredParseStates(state);
 			if (!isAsync) {
 				const result = {};
 				for (const field of parserKeys) {
-					const valueResult = parsers[field].complete(state[field]);
+					const valueResult = parsers[field].complete(resolvedState[field]);
 					if (valueResult.success) result[field] = valueResult.value;
 					else return {
 						success: false,
@@ -705,9 +773,10 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				};
 			}
 			return (async () => {
+				const resolvedState$1 = await resolveDeferredParseStatesAsync(state);
 				const result = {};
 				for (const field of parserKeys) {
-					const valueResult = await parsers[field].complete(state[field]);
+					const valueResult = await parsers[field].complete(resolvedState$1[field]);
 					if (valueResult.success) result[field] = valueResult.value;
 					else return {
 						success: false,

package/dist/constructs.js

@@ -1,4 +1,5 @@
 import { message, optionName, values } from "./message.js";
+import { DependencyId, DependencyRegistry, ParseWithDependency, isDeferredParseState, isDependencySourceState } from "./dependency.js";
 import { extractArgumentMetavars, extractCommandNames, extractOptionNames } from "./usage.js";
 import { createErrorWithSuggestions, deduplicateSuggestions } from "./suggestion.js";
 
@@ -531,6 +532,72 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 	}
 	yield* deduplicateSuggestions(suggestions);
 }
+/**
+* Resolves deferred parse states in an object's field states.
+* This function builds a dependency registry from DependencySourceState fields
+* and re-parses DeferredParseState fields using the actual dependency values.
+*
+* @param fieldStates A record of field names to their state values
+* @returns The field states with deferred states resolved to their actual values
+* @internal
+*/
+function resolveDeferredParseStates(fieldStates) {
+	const registry = new DependencyRegistry();
+	for (const key of Reflect.ownKeys(fieldStates)) {
+		const fieldState = fieldStates[key];
+		if (isDependencySourceState(fieldState)) {
+			const depId = fieldState[DependencyId];
+			const result = fieldState.result;
+			if (result.success) registry.set(depId, result.value);
+		}
+	}
+	const resolvedStates = { ...fieldStates };
+	for (const key of Reflect.ownKeys(fieldStates)) {
+		const fieldState = fieldStates[key];
+		if (isDeferredParseState(fieldState)) {
+			const deferredState = fieldState;
+			const depId = deferredState.dependencyId;
+			if (registry.has(depId)) {
+				const dependencyValue = registry.get(depId);
+				const parser = deferredState.parser;
+				const reParseResult = parser[ParseWithDependency](deferredState.rawInput, dependencyValue);
+				if (reParseResult instanceof Promise) resolvedStates[key] = deferredState.preliminaryResult;
+				else resolvedStates[key] = reParseResult;
+			} else resolvedStates[key] = deferredState.preliminaryResult;
+		}
+	}
+	return resolvedStates;
+}
+/**
+* Async version of resolveDeferredParseStates for async parsers.
+* @internal
+*/
+async function resolveDeferredParseStatesAsync(fieldStates) {
+	const registry = new DependencyRegistry();
+	for (const key of Reflect.ownKeys(fieldStates)) {
+		const fieldState = fieldStates[key];
+		if (isDependencySourceState(fieldState)) {
+			const depId = fieldState[DependencyId];
+			const result = fieldState.result;
+			if (result.success) registry.set(depId, result.value);
+		}
+	}
+	const resolvedStates = { ...fieldStates };
+	for (const key of Reflect.ownKeys(fieldStates)) {
+		const fieldState = fieldStates[key];
+		if (isDeferredParseState(fieldState)) {
+			const deferredState = fieldState;
+			const depId = deferredState.dependencyId;
+			if (registry.has(depId)) {
+				const dependencyValue = registry.get(depId);
+				const parser = deferredState.parser;
+				const reParseResult = parser[ParseWithDependency](deferredState.rawInput, dependencyValue);
+				resolvedStates[key] = await Promise.resolve(reParseResult);
+			} else resolvedStates[key] = deferredState.preliminaryResult;
+		}
+	}
+	return resolvedStates;
+}
 function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 	const label = typeof labelOrParsers === "string" ? labelOrParsers : void 0;
 	let parsers;
@@ -689,10 +756,11 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			return parseSync(context);
 		},
 		complete(state) {
+			const resolvedState = isAsync ? state : resolveDeferredParseStates(state);
 			if (!isAsync) {
 				const result = {};
 				for (const field of parserKeys) {
-					const valueResult = parsers[field].complete(state[field]);
+					const valueResult = parsers[field].complete(resolvedState[field]);
 					if (valueResult.success) result[field] = valueResult.value;
 					else return {
 						success: false,
@@ -705,9 +773,10 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				};
 			}
 			return (async () => {
+				const resolvedState$1 = await resolveDeferredParseStatesAsync(state);
 				const result = {};
 				for (const field of parserKeys) {
-					const valueResult = await parsers[field].complete(state[field]);
+					const valueResult = await parsers[field].complete(resolvedState$1[field]);
 					if (valueResult.success) result[field] = valueResult.value;
 					else return {
 						success: false,