@optique/core 0.10.0-dev.305 → 0.10.0-dev.309

package/dist/constructs.cjs

@@ -616,7 +616,7 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 function collectDependencies(state, registry) {
 	if (state === null || state === void 0) return;
 	if (require_dependency.isDependencySourceState(state)) {
-		const depId = state[require_dependency.DependencyId];
+		const depId = state[require_dependency.dependencyId];
 		const result = state.result;
 		if (result.success) registry.set(depId, result.value);
 		return;
@@ -640,6 +640,28 @@ function isPlainObject(value) {
 	return proto === Object.prototype || proto === null;
 }
 /**
+* Collects dependency values for a DeferredParseState from the registry.
+* Returns the collected values array, or null if any required dependency
+* is missing (and no default is available).
+*/
+function collectDependencyValues(deferredState, registry) {
+	const depIds = deferredState.dependencyIds;
+	if (depIds && depIds.length > 0) {
+		const defaults = deferredState.defaultValues;
+		const dependencyValues = [];
+		for (let i = 0; i < depIds.length; i++) {
+			const depId$1 = depIds[i];
+			if (registry.has(depId$1)) dependencyValues.push(registry.get(depId$1));
+			else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
+			else return null;
+		}
+		return dependencyValues;
+	}
+	const depId = deferredState.dependencyId;
+	if (registry.has(depId)) return registry.get(depId);
+	return null;
+}
+/**
 * Recursively resolves DeferredParseState objects found anywhere in the state tree.
 * Returns the resolved state (sync version).
 *
@@ -656,29 +678,11 @@ function resolveDeferred(state, registry) {
 	if (state === null || state === void 0) return state;
 	if (require_dependency.isDeferredParseState(state)) {
 		const deferredState = state;
-		const parser = deferredState.parser;
-		const depIds = deferredState.dependencyIds;
-		if (depIds && depIds.length > 0) {
-			const defaults = deferredState.defaultValues;
-			const dependencyValues = [];
-			for (let i = 0; i < depIds.length; i++) {
-				const depId$1 = depIds[i];
-				if (registry.has(depId$1)) dependencyValues.push(registry.get(depId$1));
-				else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
-				else return deferredState.preliminaryResult;
-			}
-			const reParseResult = parser[require_dependency.ParseWithDependency](deferredState.rawInput, dependencyValues);
-			if (reParseResult instanceof Promise) return deferredState.preliminaryResult;
-			return reParseResult;
-		}
-		const depId = deferredState.dependencyId;
-		if (registry.has(depId)) {
-			const dependencyValue = registry.get(depId);
-			const reParseResult = parser[require_dependency.ParseWithDependency](deferredState.rawInput, dependencyValue);
-			if (reParseResult instanceof Promise) return deferredState.preliminaryResult;
-			return reParseResult;
-		}
-		return deferredState.preliminaryResult;
+		const dependencyValue = collectDependencyValues(deferredState, registry);
+		if (dependencyValue === null) return deferredState.preliminaryResult;
+		const reParseResult = deferredState.parser[require_dependency.parseWithDependency](deferredState.rawInput, dependencyValue);
+		if (reParseResult instanceof Promise) return deferredState.preliminaryResult;
+		return reParseResult;
 	}
 	if (require_dependency.isDependencySourceState(state)) return state;
 	if (Array.isArray(state)) return state.map((item) => resolveDeferred(item, registry));
@@ -711,27 +715,10 @@ async function resolveDeferredAsync(state, registry) {
 	if (state === null || state === void 0) return state;
 	if (require_dependency.isDeferredParseState(state)) {
 		const deferredState = state;
-		const parser = deferredState.parser;
-		const depIds = deferredState.dependencyIds;
-		if (depIds && depIds.length > 0) {
-			const defaults = deferredState.defaultValues;
-			const dependencyValues = [];
-			for (let i = 0; i < depIds.length; i++) {
-				const depId$1 = depIds[i];
-				if (registry.has(depId$1)) dependencyValues.push(registry.get(depId$1));
-				else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
-				else return deferredState.preliminaryResult;
-			}
-			const reParseResult = parser[require_dependency.ParseWithDependency](deferredState.rawInput, dependencyValues);
-			return Promise.resolve(reParseResult);
-		}
-		const depId = deferredState.dependencyId;
-		if (registry.has(depId)) {
-			const dependencyValue = registry.get(depId);
-			const reParseResult = parser[require_dependency.ParseWithDependency](deferredState.rawInput, dependencyValue);
-			return Promise.resolve(reParseResult);
-		}
-		return deferredState.preliminaryResult;
+		const dependencyValue = collectDependencyValues(deferredState, registry);
+		if (dependencyValue === null) return deferredState.preliminaryResult;
+		const reParseResult = deferredState.parser[require_dependency.parseWithDependency](deferredState.rawInput, dependencyValue);
+		return Promise.resolve(reParseResult);
 	}
 	if (require_dependency.isDependencySourceState(state)) return state;
 	if (Array.isArray(state)) return Promise.all(state.map((item) => resolveDeferredAsync(item, registry)));
@@ -928,7 +915,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 						preCompletedState[fieldKey] = completed;
 						preCompletedKeys.add(fieldKey);
 					} else if (fieldState === void 0 && require_dependency.isWrappedDependencySource(fieldParser)) {
-						const pendingState = fieldParser[require_dependency.WrappedDependencySourceMarker];
+						const pendingState = fieldParser[require_dependency.wrappedDependencySourceMarker];
 						const completed = fieldParser.complete([pendingState]);
 						if (require_dependency.isDependencySourceState(completed)) {
 							preCompletedState[fieldKey] = completed;
@@ -979,7 +966,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 						preCompletedState[fieldKey] = completed;
 						preCompletedKeys.add(fieldKey);
 					} else if (fieldState === void 0 && require_dependency.isWrappedDependencySource(fieldParser)) {
-						const pendingState = fieldParser[require_dependency.WrappedDependencySourceMarker];
+						const pendingState = fieldParser[require_dependency.wrappedDependencySourceMarker];
 						const completed = await fieldParser.complete([pendingState]);
 						if (require_dependency.isDependencySourceState(completed)) {
 							preCompletedState[fieldKey] = completed;
@@ -1242,7 +1229,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 						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 pendingState = elementParser[require_dependency.wrappedDependencySourceMarker];
 						const completed = elementParser.complete([pendingState]);
 						preCompletedState[i] = completed;
 					} else preCompletedState[i] = elementState;
@@ -1291,7 +1278,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 						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 pendingState = elementParser[require_dependency.wrappedDependencySourceMarker];
 						const completed = await elementParser.complete([pendingState]);
 						preCompletedState[i] = completed;
 					} else preCompletedState[i] = elementState;

package/dist/constructs.js

@@ -1,5 +1,5 @@
 import { message, optionName, values } from "./message.js";
-import { DependencyId, DependencyRegistry, ParseWithDependency, WrappedDependencySourceMarker, isDeferredParseState, isDependencySourceState, isPendingDependencySourceState, isWrappedDependencySource } from "./dependency.js";
+import { DependencyRegistry, dependencyId, isDeferredParseState, isDependencySourceState, isPendingDependencySourceState, isWrappedDependencySource, parseWithDependency, wrappedDependencySourceMarker } from "./dependency.js";
 import { extractArgumentMetavars, extractCommandNames, extractOptionNames } from "./usage.js";
 import { createErrorWithSuggestions, deduplicateSuggestions } from "./suggestion.js";
 
@@ -616,7 +616,7 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 function collectDependencies(state, registry) {
 	if (state === null || state === void 0) return;
 	if (isDependencySourceState(state)) {
-		const depId = state[DependencyId];
+		const depId = state[dependencyId];
 		const result = state.result;
 		if (result.success) registry.set(depId, result.value);
 		return;
@@ -640,6 +640,28 @@ function isPlainObject(value) {
 	return proto === Object.prototype || proto === null;
 }
 /**
+* Collects dependency values for a DeferredParseState from the registry.
+* Returns the collected values array, or null if any required dependency
+* is missing (and no default is available).
+*/
+function collectDependencyValues(deferredState, registry) {
+	const depIds = deferredState.dependencyIds;
+	if (depIds && depIds.length > 0) {
+		const defaults = deferredState.defaultValues;
+		const dependencyValues = [];
+		for (let i = 0; i < depIds.length; i++) {
+			const depId$1 = depIds[i];
+			if (registry.has(depId$1)) dependencyValues.push(registry.get(depId$1));
+			else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
+			else return null;
+		}
+		return dependencyValues;
+	}
+	const depId = deferredState.dependencyId;
+	if (registry.has(depId)) return registry.get(depId);
+	return null;
+}
+/**
 * Recursively resolves DeferredParseState objects found anywhere in the state tree.
 * Returns the resolved state (sync version).
 *
@@ -656,29 +678,11 @@ function resolveDeferred(state, registry) {
 	if (state === null || state === void 0) return state;
 	if (isDeferredParseState(state)) {
 		const deferredState = state;
-		const parser = deferredState.parser;
-		const depIds = deferredState.dependencyIds;
-		if (depIds && depIds.length > 0) {
-			const defaults = deferredState.defaultValues;
-			const dependencyValues = [];
-			for (let i = 0; i < depIds.length; i++) {
-				const depId$1 = depIds[i];
-				if (registry.has(depId$1)) dependencyValues.push(registry.get(depId$1));
-				else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
-				else return deferredState.preliminaryResult;
-			}
-			const reParseResult = parser[ParseWithDependency](deferredState.rawInput, dependencyValues);
-			if (reParseResult instanceof Promise) return deferredState.preliminaryResult;
-			return reParseResult;
-		}
-		const depId = deferredState.dependencyId;
-		if (registry.has(depId)) {
-			const dependencyValue = registry.get(depId);
-			const reParseResult = parser[ParseWithDependency](deferredState.rawInput, dependencyValue);
-			if (reParseResult instanceof Promise) return deferredState.preliminaryResult;
-			return reParseResult;
-		}
-		return deferredState.preliminaryResult;
+		const dependencyValue = collectDependencyValues(deferredState, registry);
+		if (dependencyValue === null) return deferredState.preliminaryResult;
+		const reParseResult = deferredState.parser[parseWithDependency](deferredState.rawInput, dependencyValue);
+		if (reParseResult instanceof Promise) return deferredState.preliminaryResult;
+		return reParseResult;
 	}
 	if (isDependencySourceState(state)) return state;
 	if (Array.isArray(state)) return state.map((item) => resolveDeferred(item, registry));
@@ -711,27 +715,10 @@ async function resolveDeferredAsync(state, registry) {
 	if (state === null || state === void 0) return state;
 	if (isDeferredParseState(state)) {
 		const deferredState = state;
-		const parser = deferredState.parser;
-		const depIds = deferredState.dependencyIds;
-		if (depIds && depIds.length > 0) {
-			const defaults = deferredState.defaultValues;
-			const dependencyValues = [];
-			for (let i = 0; i < depIds.length; i++) {
-				const depId$1 = depIds[i];
-				if (registry.has(depId$1)) dependencyValues.push(registry.get(depId$1));
-				else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
-				else return deferredState.preliminaryResult;
-			}
-			const reParseResult = parser[ParseWithDependency](deferredState.rawInput, dependencyValues);
-			return Promise.resolve(reParseResult);
-		}
-		const depId = deferredState.dependencyId;
-		if (registry.has(depId)) {
-			const dependencyValue = registry.get(depId);
-			const reParseResult = parser[ParseWithDependency](deferredState.rawInput, dependencyValue);
-			return Promise.resolve(reParseResult);
-		}
-		return deferredState.preliminaryResult;
+		const dependencyValue = collectDependencyValues(deferredState, registry);
+		if (dependencyValue === null) return deferredState.preliminaryResult;
+		const reParseResult = deferredState.parser[parseWithDependency](deferredState.rawInput, dependencyValue);
+		return Promise.resolve(reParseResult);
 	}
 	if (isDependencySourceState(state)) return state;
 	if (Array.isArray(state)) return Promise.all(state.map((item) => resolveDeferredAsync(item, registry)));
@@ -928,7 +915,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 						preCompletedState[fieldKey] = completed;
 						preCompletedKeys.add(fieldKey);
 					} else if (fieldState === void 0 && isWrappedDependencySource(fieldParser)) {
-						const pendingState = fieldParser[WrappedDependencySourceMarker];
+						const pendingState = fieldParser[wrappedDependencySourceMarker];
 						const completed = fieldParser.complete([pendingState]);
 						if (isDependencySourceState(completed)) {
 							preCompletedState[fieldKey] = completed;
@@ -979,7 +966,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 						preCompletedState[fieldKey] = completed;
 						preCompletedKeys.add(fieldKey);
 					} else if (fieldState === void 0 && isWrappedDependencySource(fieldParser)) {
-						const pendingState = fieldParser[WrappedDependencySourceMarker];
+						const pendingState = fieldParser[wrappedDependencySourceMarker];
 						const completed = await fieldParser.complete([pendingState]);
 						if (isDependencySourceState(completed)) {
 							preCompletedState[fieldKey] = completed;
@@ -1242,7 +1229,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 						const completed = elementParser.complete([elementParser.initialState]);
 						preCompletedState[i] = completed;
 					} else if (elementState === void 0 && isWrappedDependencySource(elementParser)) {
-						const pendingState = elementParser[WrappedDependencySourceMarker];
+						const pendingState = elementParser[wrappedDependencySourceMarker];
 						const completed = elementParser.complete([pendingState]);
 						preCompletedState[i] = completed;
 					} else preCompletedState[i] = elementState;
@@ -1291,7 +1278,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 						const completed = await elementParser.complete([elementParser.initialState]);
 						preCompletedState[i] = completed;
 					} else if (elementState === void 0 && isWrappedDependencySource(elementParser)) {
-						const pendingState = elementParser[WrappedDependencySourceMarker];
+						const pendingState = elementParser[wrappedDependencySourceMarker];
 						const completed = await elementParser.complete([pendingState]);
 						preCompletedState[i] = completed;
 					} else preCompletedState[i] = elementState;