@optique/config 1.0.0-dev.1616 → 1.0.0-dev.1658

package/dist/index.cjs

@@ -23,12 +23,14 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 //#endregion
 const node_fs = __toESM(require("node:fs"));
 const node_path = __toESM(require("node:path"));
+const __optique_core_parser = __toESM(require("@optique/core/parser"));
 const __optique_core_annotations = __toESM(require("@optique/core/annotations"));
 const __optique_core_message = __toESM(require("@optique/core/message"));
 const __optique_core_mode_dispatch = __toESM(require("@optique/core/mode-dispatch"));
 
 //#region src/index.ts
 const phase2UndefinedParsedValueKey = Symbol("@optique/config/phase2UndefinedParsedValue");
+const inheritParentAnnotationsKey = Symbol.for("@optique/core/inheritParentAnnotations");
 /**
 * Internal registry for active config data during config context execution.
 * This is a workaround for the limitation that object() doesn't propagate
@@ -298,11 +300,13 @@ function bindConfig(parser, options) {
 		const annotations = (0, __optique_core_annotations.getAnnotations)(state);
 		return annotations?.[options.context.id] === phase1ConfigAnnotationMarker;
 	}
+	const getSuggestInnerState = (state) => isConfigBindState(state) ? state.cliState === void 0 ? (0, __optique_core_annotations.inheritAnnotations)(state, parser.initialState) : state.cliState : state;
 	const boundParser = {
 		$mode: parser.$mode,
 		$valueType: parser.$valueType,
 		$stateType: parser.$stateType,
 		priority: parser.priority,
+		[__optique_core_parser.unmatchedNonCliDependencySourceStateMarker]: true,
 		usage: options.default !== void 0 ? [{
 			type: "optional",
 			terms: parser.usage
@@ -310,6 +314,15 @@ function bindConfig(parser, options) {
 		leadingNames: parser.leadingNames,
 		acceptingAnyToken: parser.acceptingAnyToken,
 		initialState: parser.initialState,
+		getSuggestRuntimeNodes(state, path) {
+			const innerState = getSuggestInnerState(state);
+			const innerNodes = parser.getSuggestRuntimeNodes?.(innerState, path) ?? [];
+			return boundParser.dependencyMetadata?.source != null ? [...innerNodes, {
+				path,
+				parser: boundParser,
+				state
+			}] : innerNodes;
+		},
 		parse: (context) => {
 			const annotations = (0, __optique_core_annotations.getAnnotations)(context.state);
 			const innerState = isConfigBindState(context.state) ? context.state.hasCliValue ? context.state.cliState : parser.initialState : context.state;
@@ -356,7 +369,14 @@ function bindConfig(parser, options) {
 			if (isConfigBindState(state) && state.hasCliValue) return parser.complete(state.cliState, exec);
 			return (0, __optique_core_mode_dispatch.wrapForMode)(parser.$mode, getConfigOrDefault(state, options));
 		},
-		suggest: parser.suggest,
+		suggest: (context, prefix) => {
+			const innerState = getSuggestInnerState(context.state);
+			const innerContext = innerState !== context.state ? {
+				...context,
+				state: innerState
+			} : context;
+			return parser.suggest(innerContext, prefix);
+		},
 		shouldDeferCompletion: shouldDeferPromptUntilConfigResolves,
 		getDocFragments(state, upperDefaultValue) {
 			const defaultValue = upperDefaultValue ?? options.default;
@@ -375,6 +395,39 @@ function bindConfig(parser, options) {
 		configurable: true,
 		enumerable: false
 	});
+	Object.defineProperty(boundParser, inheritParentAnnotationsKey, {
+		value: true,
+		configurable: true,
+		enumerable: false
+	});
+	const dependencyMetadata = parser.dependencyMetadata;
+	if (dependencyMetadata != null) {
+		const sourceMetadata = dependencyMetadata.source;
+		Object.defineProperty(boundParser, "dependencyMetadata", {
+			value: sourceMetadata == null ? dependencyMetadata : {
+				...dependencyMetadata,
+				source: {
+					...sourceMetadata,
+					getMissingSourceValue: sourceMetadata.preservesSourceValue !== false && options.default !== void 0 ? () => ({
+						success: true,
+						value: options.default
+					}) : void 0,
+					extractSourceValue: (state) => {
+						if (!isConfigBindState(state)) {
+							if (sourceMetadata.preservesSourceValue) return getConfigSourceValue(state, options, state, sourceMetadata.extractSourceValue);
+							return sourceMetadata.extractSourceValue(state);
+						}
+						if (state.hasCliValue) return sourceMetadata.extractSourceValue(state.cliState);
+						const fallbackState = state.cliState ?? state;
+						if (!sourceMetadata.preservesSourceValue) return sourceMetadata.extractSourceValue(fallbackState);
+						return getConfigSourceValue(state, options, fallbackState, sourceMetadata.extractSourceValue);
+					}
+				}
+			},
+			configurable: true,
+			enumerable: false
+		});
+	}
 	return boundParser;
 }
 /**
@@ -412,6 +465,37 @@ function getConfigOrDefault(state, options) {
 		error: __optique_core_message.message`Missing required configuration value.`
 	};
 }
+/**
+* Resolves a config-backed dependency source with fallback priority.
+*
+* This first checks annotations or the active config registry via
+* {@link getConfigOrDefault}. If no config-backed value is available, it falls
+* back to `options.default` and finally delegates to the wrapped parser's
+* source extractor.
+*
+* @param state The wrapper state, which may carry config annotations.
+* @param options The binding options with lookup and default settings.
+* @param innerState The unwrapped inner state for delegated extraction.
+* @param extractInnerSourceValue The wrapped parser's source extractor.
+* @returns The resolved source value, an async source value, or `undefined`.
+* @throws {TypeError} If {@link getConfigOrDefault} rejects a thenable-returning
+*                     key callback.
+*/
+function getConfigSourceValue(state, options, innerState, extractInnerSourceValue) {
+	const annotations = (0, __optique_core_annotations.getAnnotations)(state);
+	const contextId = options.context.id;
+	const annotationValue = annotations?.[contextId];
+	const configData = annotationValue?.data ?? getActiveConfig(contextId);
+	if (configData !== void 0 && configData !== null) {
+		const resolved = getConfigOrDefault(state, options);
+		if (resolved.success) return resolved;
+	}
+	if (options.default !== void 0) return {
+		success: true,
+		value: options.default
+	};
+	return extractInnerSourceValue(innerState);
+}
 
 //#endregion
 exports.bindConfig = bindConfig;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
+import { Parser } from "@optique/core/parser";
 import { StandardSchemaV1 } from "@standard-schema/spec";
 import { ParserValuePlaceholder, SourceContext } from "@optique/core/context";
-import { Parser } from "@optique/core/parser";
 
 //#region src/index.d.ts
 

package/dist/index.js

@@ -1,11 +1,13 @@
 import { readFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
-import { annotationKey, getAnnotations } from "@optique/core/annotations";
+import { unmatchedNonCliDependencySourceStateMarker } from "@optique/core/parser";
+import { annotationKey, getAnnotations, inheritAnnotations } from "@optique/core/annotations";
 import { message } from "@optique/core/message";
 import { mapModeValue, wrapForMode } from "@optique/core/mode-dispatch";
 
 //#region src/index.ts
 const phase2UndefinedParsedValueKey = Symbol("@optique/config/phase2UndefinedParsedValue");
+const inheritParentAnnotationsKey = Symbol.for("@optique/core/inheritParentAnnotations");
 /**
 * Internal registry for active config data during config context execution.
 * This is a workaround for the limitation that object() doesn't propagate
@@ -275,11 +277,13 @@ function bindConfig(parser, options) {
 		const annotations = getAnnotations(state);
 		return annotations?.[options.context.id] === phase1ConfigAnnotationMarker;
 	}
+	const getSuggestInnerState = (state) => isConfigBindState(state) ? state.cliState === void 0 ? inheritAnnotations(state, parser.initialState) : state.cliState : state;
 	const boundParser = {
 		$mode: parser.$mode,
 		$valueType: parser.$valueType,
 		$stateType: parser.$stateType,
 		priority: parser.priority,
+		[unmatchedNonCliDependencySourceStateMarker]: true,
 		usage: options.default !== void 0 ? [{
 			type: "optional",
 			terms: parser.usage
@@ -287,6 +291,15 @@ function bindConfig(parser, options) {
 		leadingNames: parser.leadingNames,
 		acceptingAnyToken: parser.acceptingAnyToken,
 		initialState: parser.initialState,
+		getSuggestRuntimeNodes(state, path) {
+			const innerState = getSuggestInnerState(state);
+			const innerNodes = parser.getSuggestRuntimeNodes?.(innerState, path) ?? [];
+			return boundParser.dependencyMetadata?.source != null ? [...innerNodes, {
+				path,
+				parser: boundParser,
+				state
+			}] : innerNodes;
+		},
 		parse: (context) => {
 			const annotations = getAnnotations(context.state);
 			const innerState = isConfigBindState(context.state) ? context.state.hasCliValue ? context.state.cliState : parser.initialState : context.state;
@@ -333,7 +346,14 @@ function bindConfig(parser, options) {
 			if (isConfigBindState(state) && state.hasCliValue) return parser.complete(state.cliState, exec);
 			return wrapForMode(parser.$mode, getConfigOrDefault(state, options));
 		},
-		suggest: parser.suggest,
+		suggest: (context, prefix) => {
+			const innerState = getSuggestInnerState(context.state);
+			const innerContext = innerState !== context.state ? {
+				...context,
+				state: innerState
+			} : context;
+			return parser.suggest(innerContext, prefix);
+		},
 		shouldDeferCompletion: shouldDeferPromptUntilConfigResolves,
 		getDocFragments(state, upperDefaultValue) {
 			const defaultValue = upperDefaultValue ?? options.default;
@@ -352,6 +372,39 @@ function bindConfig(parser, options) {
 		configurable: true,
 		enumerable: false
 	});
+	Object.defineProperty(boundParser, inheritParentAnnotationsKey, {
+		value: true,
+		configurable: true,
+		enumerable: false
+	});
+	const dependencyMetadata = parser.dependencyMetadata;
+	if (dependencyMetadata != null) {
+		const sourceMetadata = dependencyMetadata.source;
+		Object.defineProperty(boundParser, "dependencyMetadata", {
+			value: sourceMetadata == null ? dependencyMetadata : {
+				...dependencyMetadata,
+				source: {
+					...sourceMetadata,
+					getMissingSourceValue: sourceMetadata.preservesSourceValue !== false && options.default !== void 0 ? () => ({
+						success: true,
+						value: options.default
+					}) : void 0,
+					extractSourceValue: (state) => {
+						if (!isConfigBindState(state)) {
+							if (sourceMetadata.preservesSourceValue) return getConfigSourceValue(state, options, state, sourceMetadata.extractSourceValue);
+							return sourceMetadata.extractSourceValue(state);
+						}
+						if (state.hasCliValue) return sourceMetadata.extractSourceValue(state.cliState);
+						const fallbackState = state.cliState ?? state;
+						if (!sourceMetadata.preservesSourceValue) return sourceMetadata.extractSourceValue(fallbackState);
+						return getConfigSourceValue(state, options, fallbackState, sourceMetadata.extractSourceValue);
+					}
+				}
+			},
+			configurable: true,
+			enumerable: false
+		});
+	}
 	return boundParser;
 }
 /**
@@ -389,6 +442,37 @@ function getConfigOrDefault(state, options) {
 		error: message`Missing required configuration value.`
 	};
 }
+/**
+* Resolves a config-backed dependency source with fallback priority.
+*
+* This first checks annotations or the active config registry via
+* {@link getConfigOrDefault}. If no config-backed value is available, it falls
+* back to `options.default` and finally delegates to the wrapped parser's
+* source extractor.
+*
+* @param state The wrapper state, which may carry config annotations.
+* @param options The binding options with lookup and default settings.
+* @param innerState The unwrapped inner state for delegated extraction.
+* @param extractInnerSourceValue The wrapped parser's source extractor.
+* @returns The resolved source value, an async source value, or `undefined`.
+* @throws {TypeError} If {@link getConfigOrDefault} rejects a thenable-returning
+*                     key callback.
+*/
+function getConfigSourceValue(state, options, innerState, extractInnerSourceValue) {
+	const annotations = getAnnotations(state);
+	const contextId = options.context.id;
+	const annotationValue = annotations?.[contextId];
+	const configData = annotationValue?.data ?? getActiveConfig(contextId);
+	if (configData !== void 0 && configData !== null) {
+		const resolved = getConfigOrDefault(state, options);
+		if (resolved.success) return resolved;
+	}
+	if (options.default !== void 0) return {
+		success: true,
+		value: options.default
+	};
+	return extractInnerSourceValue(innerState);
+}
 
 //#endregion
 export { bindConfig, clearActiveConfig, clearActiveConfigMeta, createConfigContext, getActiveConfig, getActiveConfigMeta, setActiveConfig, setActiveConfigMeta };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/config",
-  "version": "1.0.0-dev.1616+17abc525",
+  "version": "1.0.0-dev.1658+b57e115b",
   "description": "Configuration file support for Optique with Standard Schema validation",
   "keywords": [
     "CLI",
@@ -59,7 +59,7 @@
     "@standard-schema/spec": "^1.1.0"
   },
   "dependencies": {
-    "@optique/core": "1.0.0-dev.1616+17abc525"
+    "@optique/core": "1.0.0-dev.1658+b57e115b"
   },
   "devDependencies": {
     "@standard-schema/spec": "^1.1.0",
@@ -67,7 +67,7 @@
     "tsdown": "^0.13.0",
     "typescript": "^5.8.3",
     "zod": "^3.25.0 || ^4.0.0",
-    "@optique/env": "1.0.0-dev.1616+17abc525"
+    "@optique/env": "1.0.0-dev.1658+b57e115b"
   },
   "scripts": {
     "build": "tsdown",