@optique/config 1.0.0-dev.452 → 1.0.0-dev.454

package/dist/index.cjs

@@ -28,16 +28,6 @@ const __optique_core_message = __toESM(require("@optique/core/message"));
 
 //#region src/index.ts
 /**
-* Unique symbol for config data in annotations.
-* @since 0.10.0
-*/
-const configKey = Symbol.for("@optique/config");
-/**
-* Unique symbol for config metadata in annotations.
-* @since 1.0.0
-*/
-const configMetaKey = Symbol.for("@optique/config/meta");
-/**
 * Internal registry for active config data during config context execution.
 * This is a workaround for the limitation that object() doesn't propagate
 * annotations to child field parsers.
@@ -135,10 +125,11 @@ async function validateWithSchema(schema, rawData) {
 * ```
 */
 function createConfigContext(options) {
-	const contextId = Symbol.for(`@optique/config:${Math.random()}`);
+	const contextId = Symbol(`@optique/config:${Math.random()}`);
 	return {
 		id: contextId,
 		schema: options.schema,
+		mode: "dynamic",
 		async getAnnotations(parsed, runtimeOptions) {
 			if (!parsed) return {};
 			const opts = runtimeOptions;
@@ -179,12 +170,12 @@ function createConfigContext(options) {
 				setActiveConfig(contextId, configData);
 				if (configMeta !== void 0) {
 					setActiveConfigMeta(contextId, configMeta);
-					return {
-						[configKey]: configData,
-						[configMetaKey]: configMeta
-					};
+					return { [contextId]: {
+						data: configData,
+						meta: configMeta
+					} };
 				}
-				return { [configKey]: configData };
+				return { [contextId]: { data: configData } };
 			}
 			return {};
 		},
@@ -226,6 +217,10 @@ function createConfigContext(options) {
 * ```
 */
 function bindConfig(parser, options) {
+	const configBindStateKey = Symbol("@optique/config/bindState");
+	function isConfigBindState(value) {
+		return value != null && typeof value === "object" && configBindStateKey in value;
+	}
 	return {
 		$mode: parser.$mode,
 		$valueType: parser.$valueType,
@@ -238,83 +233,50 @@ function bindConfig(parser, options) {
 		initialState: parser.initialState,
 		parse: (context) => {
 			const annotations = (0, __optique_core_annotations.getAnnotations)(context.state);
-			const result = parser.parse(context);
-			if (!(result instanceof Promise)) {
-				if (result.success) {
+			const innerState = isConfigBindState(context.state) ? context.state.hasCliValue ? context.state.cliState : parser.initialState : context.state;
+			const innerContext = innerState !== context.state ? {
+				...context,
+				state: innerState
+			} : context;
+			const processResult = (result$1) => {
+				if (result$1.success) {
+					const cliConsumed = result$1.consumed.length > 0;
 					const newState$1 = {
-						hasCliValue: true,
-						cliState: result.next.state,
+						[configBindStateKey]: true,
+						hasCliValue: cliConsumed,
+						cliState: result$1.next.state,
 						...annotations && { [__optique_core_annotations.annotationKey]: annotations }
 					};
 					return {
 						success: true,
 						next: {
-							...result.next,
+							...result$1.next,
 							state: newState$1
 						},
-						consumed: result.consumed
+						consumed: result$1.consumed
 					};
 				}
+				if (result$1.consumed > 0) return result$1;
 				const newState = {
+					[configBindStateKey]: true,
 					hasCliValue: false,
 					...annotations && { [__optique_core_annotations.annotationKey]: annotations }
 				};
 				return {
 					success: true,
 					next: {
-						...context,
+						...innerContext,
 						state: newState
 					},
 					consumed: []
 				};
-			}
-			return result.then((res) => {
-				if (res.success) {
-					const newState$1 = {
-						hasCliValue: true,
-						cliState: res.next.state,
-						...annotations && { [__optique_core_annotations.annotationKey]: annotations }
-					};
-					return {
-						success: true,
-						next: {
-							...res.next,
-							state: newState$1
-						},
-						consumed: res.consumed
-					};
-				}
-				const newState = {
-					hasCliValue: false,
-					...annotations && { [__optique_core_annotations.annotationKey]: annotations }
-				};
-				return {
-					success: true,
-					next: {
-						...context,
-						state: newState
-					},
-					consumed: []
-				};
-			});
+			};
+			const result = parser.parse(innerContext);
+			if (result instanceof Promise) return result.then(processResult);
+			return processResult(result);
 		},
 		complete: (state) => {
-			const bindState = state;
-			if (bindState?.hasCliValue && bindState.cliState !== void 0) {
-				const innerResult = parser.complete(bindState.cliState);
-				if (innerResult instanceof Promise) return innerResult.then((res) => {
-					if (res.success) return {
-						success: true,
-						value: res.value
-					};
-					return res;
-				});
-				if (innerResult.success) return {
-					success: true,
-					value: innerResult.value
-				};
-				return innerResult;
-			}
+			if (isConfigBindState(state) && state.hasCliValue) return parser.complete(state.cliState);
 			return getConfigOrDefault(state, options);
 		},
 		suggest: parser.suggest,
@@ -332,10 +294,11 @@ function bindConfig(parser, options) {
 */
 function getConfigOrDefault(state, options) {
 	const annotations = (0, __optique_core_annotations.getAnnotations)(state);
-	let configData = annotations?.[configKey];
-	let configMeta = annotations?.[configMetaKey];
+	const contextId = options.context.id;
+	const annotationValue = annotations?.[contextId];
+	let configData = annotationValue?.data;
+	let configMeta = annotationValue?.meta;
 	if (configData === void 0 || configData === null) {
-		const contextId = options.context.id;
 		configData = getActiveConfig(contextId);
 		configMeta = getActiveConfigMeta(contextId);
 	}
@@ -364,8 +327,6 @@ function getConfigOrDefault(state, options) {
 exports.bindConfig = bindConfig;
 exports.clearActiveConfig = clearActiveConfig;
 exports.clearActiveConfigMeta = clearActiveConfigMeta;
-exports.configKey = configKey;
-exports.configMetaKey = configMetaKey;
 exports.createConfigContext = createConfigContext;
 exports.getActiveConfig = getActiveConfig;
 exports.getActiveConfigMeta = getActiveConfigMeta;

package/dist/index.d.cts

@@ -4,16 +4,6 @@ import { Parser } from "@optique/core/parser";
 
 //#region src/index.d.ts
 
-/**
- * Unique symbol for config data in annotations.
- * @since 0.10.0
- */
-declare const configKey: unique symbol;
-/**
- * Unique symbol for config metadata in annotations.
- * @since 1.0.0
- */
-declare const configMetaKey: unique symbol;
 /**
  * Metadata about the loaded config source.
  *
@@ -241,4 +231,4 @@ interface BindConfigOptions<T, TValue, TConfigMeta = ConfigMeta> {
  */
 declare function bindConfig<M extends "sync" | "async", TValue, TState, T, TConfigMeta = ConfigMeta>(parser: Parser<M, TValue, TState>, options: BindConfigOptions<T, TValue, TConfigMeta>): Parser<M, TValue, TState>;
 //#endregion
-export { BindConfigOptions, ConfigContext, ConfigContextOptions, ConfigContextRequiredOptions, ConfigLoadResult, ConfigMeta, bindConfig, clearActiveConfig, clearActiveConfigMeta, configKey, configMetaKey, createConfigContext, getActiveConfig, getActiveConfigMeta, setActiveConfig, setActiveConfigMeta };
+export { BindConfigOptions, ConfigContext, ConfigContextOptions, ConfigContextRequiredOptions, ConfigLoadResult, ConfigMeta, bindConfig, clearActiveConfig, clearActiveConfigMeta, createConfigContext, getActiveConfig, getActiveConfigMeta, setActiveConfig, setActiveConfigMeta };

package/dist/index.d.ts

@@ -4,16 +4,6 @@ import { Parser } from "@optique/core/parser";
 
 //#region src/index.d.ts
 
-/**
- * Unique symbol for config data in annotations.
- * @since 0.10.0
- */
-declare const configKey: unique symbol;
-/**
- * Unique symbol for config metadata in annotations.
- * @since 1.0.0
- */
-declare const configMetaKey: unique symbol;
 /**
  * Metadata about the loaded config source.
  *
@@ -241,4 +231,4 @@ interface BindConfigOptions<T, TValue, TConfigMeta = ConfigMeta> {
  */
 declare function bindConfig<M extends "sync" | "async", TValue, TState, T, TConfigMeta = ConfigMeta>(parser: Parser<M, TValue, TState>, options: BindConfigOptions<T, TValue, TConfigMeta>): Parser<M, TValue, TState>;
 //#endregion
-export { BindConfigOptions, ConfigContext, ConfigContextOptions, ConfigContextRequiredOptions, ConfigLoadResult, ConfigMeta, bindConfig, clearActiveConfig, clearActiveConfigMeta, configKey, configMetaKey, createConfigContext, getActiveConfig, getActiveConfigMeta, setActiveConfig, setActiveConfigMeta };
+export { BindConfigOptions, ConfigContext, ConfigContextOptions, ConfigContextRequiredOptions, ConfigLoadResult, ConfigMeta, bindConfig, clearActiveConfig, clearActiveConfigMeta, createConfigContext, getActiveConfig, getActiveConfigMeta, setActiveConfig, setActiveConfigMeta };

package/dist/index.js

@@ -5,16 +5,6 @@ import { message } from "@optique/core/message";
 
 //#region src/index.ts
 /**
-* Unique symbol for config data in annotations.
-* @since 0.10.0
-*/
-const configKey = Symbol.for("@optique/config");
-/**
-* Unique symbol for config metadata in annotations.
-* @since 1.0.0
-*/
-const configMetaKey = Symbol.for("@optique/config/meta");
-/**
 * Internal registry for active config data during config context execution.
 * This is a workaround for the limitation that object() doesn't propagate
 * annotations to child field parsers.
@@ -112,10 +102,11 @@ async function validateWithSchema(schema, rawData) {
 * ```
 */
 function createConfigContext(options) {
-	const contextId = Symbol.for(`@optique/config:${Math.random()}`);
+	const contextId = Symbol(`@optique/config:${Math.random()}`);
 	return {
 		id: contextId,
 		schema: options.schema,
+		mode: "dynamic",
 		async getAnnotations(parsed, runtimeOptions) {
 			if (!parsed) return {};
 			const opts = runtimeOptions;
@@ -156,12 +147,12 @@ function createConfigContext(options) {
 				setActiveConfig(contextId, configData);
 				if (configMeta !== void 0) {
 					setActiveConfigMeta(contextId, configMeta);
-					return {
-						[configKey]: configData,
-						[configMetaKey]: configMeta
-					};
+					return { [contextId]: {
+						data: configData,
+						meta: configMeta
+					} };
 				}
-				return { [configKey]: configData };
+				return { [contextId]: { data: configData } };
 			}
 			return {};
 		},
@@ -203,6 +194,10 @@ function createConfigContext(options) {
 * ```
 */
 function bindConfig(parser, options) {
+	const configBindStateKey = Symbol("@optique/config/bindState");
+	function isConfigBindState(value) {
+		return value != null && typeof value === "object" && configBindStateKey in value;
+	}
 	return {
 		$mode: parser.$mode,
 		$valueType: parser.$valueType,
@@ -215,83 +210,50 @@ function bindConfig(parser, options) {
 		initialState: parser.initialState,
 		parse: (context) => {
 			const annotations = getAnnotations(context.state);
-			const result = parser.parse(context);
-			if (!(result instanceof Promise)) {
-				if (result.success) {
+			const innerState = isConfigBindState(context.state) ? context.state.hasCliValue ? context.state.cliState : parser.initialState : context.state;
+			const innerContext = innerState !== context.state ? {
+				...context,
+				state: innerState
+			} : context;
+			const processResult = (result$1) => {
+				if (result$1.success) {
+					const cliConsumed = result$1.consumed.length > 0;
 					const newState$1 = {
-						hasCliValue: true,
-						cliState: result.next.state,
+						[configBindStateKey]: true,
+						hasCliValue: cliConsumed,
+						cliState: result$1.next.state,
 						...annotations && { [annotationKey]: annotations }
 					};
 					return {
 						success: true,
 						next: {
-							...result.next,
+							...result$1.next,
 							state: newState$1
 						},
-						consumed: result.consumed
+						consumed: result$1.consumed
 					};
 				}
+				if (result$1.consumed > 0) return result$1;
 				const newState = {
+					[configBindStateKey]: true,
 					hasCliValue: false,
 					...annotations && { [annotationKey]: annotations }
 				};
 				return {
 					success: true,
 					next: {
-						...context,
+						...innerContext,
 						state: newState
 					},
 					consumed: []
 				};
-			}
-			return result.then((res) => {
-				if (res.success) {
-					const newState$1 = {
-						hasCliValue: true,
-						cliState: res.next.state,
-						...annotations && { [annotationKey]: annotations }
-					};
-					return {
-						success: true,
-						next: {
-							...res.next,
-							state: newState$1
-						},
-						consumed: res.consumed
-					};
-				}
-				const newState = {
-					hasCliValue: false,
-					...annotations && { [annotationKey]: annotations }
-				};
-				return {
-					success: true,
-					next: {
-						...context,
-						state: newState
-					},
-					consumed: []
-				};
-			});
+			};
+			const result = parser.parse(innerContext);
+			if (result instanceof Promise) return result.then(processResult);
+			return processResult(result);
 		},
 		complete: (state) => {
-			const bindState = state;
-			if (bindState?.hasCliValue && bindState.cliState !== void 0) {
-				const innerResult = parser.complete(bindState.cliState);
-				if (innerResult instanceof Promise) return innerResult.then((res) => {
-					if (res.success) return {
-						success: true,
-						value: res.value
-					};
-					return res;
-				});
-				if (innerResult.success) return {
-					success: true,
-					value: innerResult.value
-				};
-				return innerResult;
-			}
+			if (isConfigBindState(state) && state.hasCliValue) return parser.complete(state.cliState);
 			return getConfigOrDefault(state, options);
 		},
 		suggest: parser.suggest,
@@ -309,10 +271,11 @@ function bindConfig(parser, options) {
 */
 function getConfigOrDefault(state, options) {
 	const annotations = getAnnotations(state);
-	let configData = annotations?.[configKey];
-	let configMeta = annotations?.[configMetaKey];
+	const contextId = options.context.id;
+	const annotationValue = annotations?.[contextId];
+	let configData = annotationValue?.data;
+	let configMeta = annotationValue?.meta;
 	if (configData === void 0 || configData === null) {
-		const contextId = options.context.id;
 		configData = getActiveConfig(contextId);
 		configMeta = getActiveConfigMeta(contextId);
 	}
@@ -338,4 +301,4 @@ function getConfigOrDefault(state, options) {
 }
 
 //#endregion
-export { bindConfig, clearActiveConfig, clearActiveConfigMeta, configKey, configMetaKey, createConfigContext, getActiveConfig, getActiveConfigMeta, setActiveConfig, setActiveConfigMeta };
+export { bindConfig, clearActiveConfig, clearActiveConfigMeta, createConfigContext, getActiveConfig, getActiveConfigMeta, setActiveConfig, setActiveConfigMeta };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/config",
-  "version": "1.0.0-dev.452+dd54f74f",
+  "version": "1.0.0-dev.454+d2244c89",
   "description": "Configuration file support for Optique with Standard Schema validation",
   "keywords": [
     "CLI",
@@ -59,14 +59,15 @@
     "@standard-schema/spec": "^1.1.0"
   },
   "dependencies": {
-    "@optique/core": "1.0.0-dev.452+dd54f74f"
+    "@optique/core": "1.0.0-dev.454+d2244c89"
   },
   "devDependencies": {
     "@standard-schema/spec": "^1.1.0",
     "@types/node": "^20.19.9",
     "tsdown": "^0.13.0",
     "typescript": "^5.8.3",
-    "zod": "^3.25.0 || ^4.0.0"
+    "zod": "^3.25.0 || ^4.0.0",
+    "@optique/env": "1.0.0-dev.454+d2244c89"
   },
   "scripts": {
     "build": "tsdown",