@optique/config 1.3.0-dev.2444 → 1.3.0-dev.2452

package/dist/index.cjs

@@ -266,9 +266,10 @@ function bindConfig(parser, options) {
 	function isConfigBindState(value) {
 		return value != null && typeof value === "object" && configBindStateKey in value;
 	}
-	function shouldDeferPromptUntilConfigResolves(state, _exec) {
+	function shouldDeferCompletion(state, exec) {
 		const annotations = (0, __optique_core_annotations.getAnnotations)(state);
-		return annotations?.[options.context.id] === phase1ConfigAnnotationMarker;
+		if (annotations?.[options.context.id] === phase1ConfigAnnotationMarker) return true;
+		return typeof parser.shouldDeferCompletion === "function" && parser.shouldDeferCompletion(getInnerState(state), exec) === true;
 	}
 	function getInnerState(state) {
 		if (!isConfigBindState(state)) return state;
@@ -362,7 +363,7 @@ function bindConfig(parser, options) {
 		},
 		complete: (state, exec) => {
 			if (isConfigBindState(state) && state.hasCliValue) return parser.complete(state.cliState, exec);
-			return getConfigOrDefault(state, options, parser.mode, parser);
+			return getConfigOrDefault(state, options, parser.mode, parser, getInnerState(state), exec);
 		},
 		suggest: (context, prefix) => {
 			const innerState = getInnerState(context.state);
@@ -372,7 +373,7 @@ function bindConfig(parser, options) {
 			} : context;
 			return parser.suggest(innerContext, prefix);
 		},
-		shouldDeferCompletion: shouldDeferPromptUntilConfigResolves,
+		shouldDeferCompletion,
 		getDocFragments(state, upperDefaultValue) {
 			const defaultValue = upperDefaultValue ?? options.default;
 			return parser.getDocFragments(state, defaultValue);
@@ -446,11 +447,14 @@ function bindConfig(parser, options) {
 *                 config-sourced value or the configured `default`
 *                 against the inner CLI parser's constraints (see
 *                 issue #414).
+* @throws {Error} Propagates errors thrown by `innerParser.complete()` when
+*                 falling through to a deferred inner parser.
 */
-function getConfigOrDefault(state, options, mode, innerParser) {
+function getConfigOrDefault(state, options, mode, innerParser, innerState, exec) {
 	const annotations = (0, __optique_core_annotations.getAnnotations)(state);
 	const contextId = options.context.id;
 	const configContextAbsent = annotations != null && !(contextId in annotations);
+	const configPending = annotations?.[contextId] === phase1ConfigAnnotationMarker;
 	const annotationValue = annotations?.[contextId];
 	const configData = annotationValue?.data;
 	const configMeta = annotationValue?.meta;
@@ -461,10 +465,16 @@ function getConfigOrDefault(state, options, mode, innerParser) {
 	} else configValue = configData[options.key];
 	if (configValue !== void 0) return validateFallbackValue(mode, innerParser, configValue);
 	if (options.default !== void 0) return validateFallbackValue(mode, innerParser, options.default);
+	if (configPending && innerParser != null && typeof innerParser.shouldDeferCompletion === "function" && innerParser.shouldDeferCompletion(innerState ?? innerParser.initialState, exec) === true) return (0, __optique_core_extension.wrapForMode)(mode, {
+		success: true,
+		value: void 0,
+		deferred: true
+	});
 	if (configContextAbsent) return (0, __optique_core_extension.wrapForMode)(mode, {
 		success: false,
 		error: __optique_core_message.message`Configuration value could not be read: the config context was not passed to run()'s contexts option.`
 	});
+	if (!configPending && annotations != null && contextId in annotations && innerParser != null && typeof innerParser.shouldDeferCompletion === "function" && innerParser.shouldDeferCompletion(innerState ?? innerParser.initialState, exec) === true) return innerParser.complete(innerState ?? innerParser.initialState, exec);
 	return (0, __optique_core_extension.wrapForMode)(mode, {
 		success: false,
 		error: __optique_core_message.message`Missing required configuration value.`

package/dist/index.js

@@ -243,9 +243,10 @@ function bindConfig(parser, options) {
 	function isConfigBindState(value) {
 		return value != null && typeof value === "object" && configBindStateKey in value;
 	}
-	function shouldDeferPromptUntilConfigResolves(state, _exec) {
+	function shouldDeferCompletion(state, exec) {
 		const annotations = getAnnotations(state);
-		return annotations?.[options.context.id] === phase1ConfigAnnotationMarker;
+		if (annotations?.[options.context.id] === phase1ConfigAnnotationMarker) return true;
+		return typeof parser.shouldDeferCompletion === "function" && parser.shouldDeferCompletion(getInnerState(state), exec) === true;
 	}
 	function getInnerState(state) {
 		if (!isConfigBindState(state)) return state;
@@ -339,7 +340,7 @@ function bindConfig(parser, options) {
 		},
 		complete: (state, exec) => {
 			if (isConfigBindState(state) && state.hasCliValue) return parser.complete(state.cliState, exec);
-			return getConfigOrDefault(state, options, parser.mode, parser);
+			return getConfigOrDefault(state, options, parser.mode, parser, getInnerState(state), exec);
 		},
 		suggest: (context, prefix) => {
 			const innerState = getInnerState(context.state);
@@ -349,7 +350,7 @@ function bindConfig(parser, options) {
 			} : context;
 			return parser.suggest(innerContext, prefix);
 		},
-		shouldDeferCompletion: shouldDeferPromptUntilConfigResolves,
+		shouldDeferCompletion,
 		getDocFragments(state, upperDefaultValue) {
 			const defaultValue = upperDefaultValue ?? options.default;
 			return parser.getDocFragments(state, defaultValue);
@@ -423,11 +424,14 @@ function bindConfig(parser, options) {
 *                 config-sourced value or the configured `default`
 *                 against the inner CLI parser's constraints (see
 *                 issue #414).
+* @throws {Error} Propagates errors thrown by `innerParser.complete()` when
+*                 falling through to a deferred inner parser.
 */
-function getConfigOrDefault(state, options, mode, innerParser) {
+function getConfigOrDefault(state, options, mode, innerParser, innerState, exec) {
 	const annotations = getAnnotations(state);
 	const contextId = options.context.id;
 	const configContextAbsent = annotations != null && !(contextId in annotations);
+	const configPending = annotations?.[contextId] === phase1ConfigAnnotationMarker;
 	const annotationValue = annotations?.[contextId];
 	const configData = annotationValue?.data;
 	const configMeta = annotationValue?.meta;
@@ -438,10 +442,16 @@ function getConfigOrDefault(state, options, mode, innerParser) {
 	} else configValue = configData[options.key];
 	if (configValue !== void 0) return validateFallbackValue(mode, innerParser, configValue);
 	if (options.default !== void 0) return validateFallbackValue(mode, innerParser, options.default);
+	if (configPending && innerParser != null && typeof innerParser.shouldDeferCompletion === "function" && innerParser.shouldDeferCompletion(innerState ?? innerParser.initialState, exec) === true) return wrapForMode(mode, {
+		success: true,
+		value: void 0,
+		deferred: true
+	});
 	if (configContextAbsent) return wrapForMode(mode, {
 		success: false,
 		error: message`Configuration value could not be read: the config context was not passed to run()'s contexts option.`
 	});
+	if (!configPending && annotations != null && contextId in annotations && innerParser != null && typeof innerParser.shouldDeferCompletion === "function" && innerParser.shouldDeferCompletion(innerState ?? innerParser.initialState, exec) === true) return innerParser.complete(innerState ?? innerParser.initialState, exec);
 	return wrapForMode(mode, {
 		success: false,
 		error: message`Missing required configuration value.`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/config",
-  "version": "1.3.0-dev.2444",
+  "version": "1.3.0-dev.2452",
   "description": "Configuration file support for Optique with Standard Schema validation",
   "keywords": [
     "CLI",
@@ -65,10 +65,10 @@
     "@standard-schema/spec": "^1.1.0"
   },
   "dependencies": {
-    "@optique/core": "1.3.0-dev.2444+f99a5325"
+    "@optique/core": "1.3.0-dev.2452+0b677f5c"
   },
   "devDependencies": {
-    "@optique/env": "1.3.0-dev.2444+f99a5325",
+    "@optique/env": "1.3.0-dev.2452+0b677f5c",
     "@standard-schema/spec": "^1.1.0",
     "@types/node": "^24.0.0",
     "fast-check": "^4.7.0",