@optique/config 1.0.0-dev.664 → 1.0.0-dev.670

package/dist/index.cjs

@@ -28,6 +28,10 @@ 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 deferPromptUntilConfigResolvesKey = Symbol.for("@optique/config/deferPromptUntilResolved");
+const phase1ConfigAnnotationsKey = Symbol.for("@optique/config/phase1PromptAnnotations");
+const phase2UndefinedParsedValueKey = Symbol.for("@optique/config/phase2UndefinedParsedValue");
+const deferredPromptValueKey = Symbol.for("@optique/inquirer/deferredPromptValue");
 /**
 * Internal registry for active config data during config context execution.
 * This is a workaround for the limitation that object() doesn't propagate
@@ -40,6 +44,117 @@ const activeConfigRegistry = /* @__PURE__ */ new Map();
 * @internal
 */
 const activeConfigMetaRegistry = /* @__PURE__ */ new Map();
+const phase1ConfigAnnotationMarker = Symbol("@optique/config/phase1Annotation");
+function isDeferredPromptValue(value) {
+	return value != null && typeof value === "object" && deferredPromptValueKey in value;
+}
+function isPhase2UndefinedParsedValue(value) {
+	return value != null && typeof value === "object" && phase2UndefinedParsedValueKey in value;
+}
+function isPlainObject(value) {
+	const proto = Object.getPrototypeOf(value);
+	return proto === Object.prototype || proto === null;
+}
+function shouldSkipCollectionOwnKey(value, key) {
+	if (Array.isArray(value)) return key === "length" || typeof key === "string" && Number.isInteger(Number(key)) && String(Number(key)) === key;
+	return false;
+}
+function containsDeferredPromptValuesInOwnProperties(value, seen) {
+	for (const key of Reflect.ownKeys(value)) {
+		if (shouldSkipCollectionOwnKey(value, key)) continue;
+		const descriptor = Object.getOwnPropertyDescriptor(value, key);
+		if (descriptor != null && "value" in descriptor && containsDeferredPromptValues(descriptor.value, seen)) return true;
+	}
+	return false;
+}
+function copySanitizedOwnProperties(source, target, seen) {
+	for (const key of Reflect.ownKeys(source)) {
+		if (shouldSkipCollectionOwnKey(source, key)) continue;
+		const descriptor = Object.getOwnPropertyDescriptor(source, key);
+		if (descriptor == null) continue;
+		if ("value" in descriptor) descriptor.value = stripDeferredPromptValues(descriptor.value, seen);
+		Object.defineProperty(target, key, descriptor);
+	}
+}
+function containsDeferredPromptValues(value, seen = /* @__PURE__ */ new WeakSet()) {
+	if (isDeferredPromptValue(value)) return true;
+	if (value == null || typeof value !== "object") return false;
+	if (seen.has(value)) return false;
+	seen.add(value);
+	if (Array.isArray(value)) {
+		if (value.some((item) => containsDeferredPromptValues(item, seen))) return true;
+		return containsDeferredPromptValuesInOwnProperties(value, seen);
+	}
+	if (value instanceof Set) {
+		for (const entryValue of value) if (containsDeferredPromptValues(entryValue, seen)) return true;
+		return containsDeferredPromptValuesInOwnProperties(value, seen);
+	}
+	if (value instanceof Map) {
+		for (const [key, entryValue] of value) if (containsDeferredPromptValues(key, seen) || containsDeferredPromptValues(entryValue, seen)) return true;
+		return containsDeferredPromptValuesInOwnProperties(value, seen);
+	}
+	return containsDeferredPromptValuesInOwnProperties(value, seen);
+}
+function createSanitizedNonPlainView(value, seen) {
+	const proxy = new Proxy(value, {
+		get(target, key, receiver) {
+			const descriptor = Object.getOwnPropertyDescriptor(target, key);
+			if (descriptor != null && "value" in descriptor) return stripDeferredPromptValues(descriptor.value, seen);
+			return Reflect.get(target, key, receiver);
+		},
+		getOwnPropertyDescriptor(target, key) {
+			const descriptor = Object.getOwnPropertyDescriptor(target, key);
+			if (descriptor == null || !("value" in descriptor)) return descriptor;
+			return {
+				...descriptor,
+				value: stripDeferredPromptValues(descriptor.value, seen)
+			};
+		}
+	});
+	seen.set(value, proxy);
+	return proxy;
+}
+function stripDeferredPromptValues(value, seen = /* @__PURE__ */ new WeakMap()) {
+	if (isDeferredPromptValue(value)) return void 0;
+	if (value == null || typeof value !== "object") return value;
+	const cached = seen.get(value);
+	if (cached !== void 0) return cached;
+	if (Array.isArray(value)) {
+		if (!containsDeferredPromptValues(value)) return value;
+		const clone$1 = new Array(value.length);
+		seen.set(value, clone$1);
+		for (let i = 0; i < value.length; i++) clone$1[i] = stripDeferredPromptValues(value[i], seen);
+		copySanitizedOwnProperties(value, clone$1, seen);
+		return clone$1;
+	}
+	if (value instanceof Set) {
+		if (!containsDeferredPromptValues(value)) return value;
+		const clone$1 = /* @__PURE__ */ new Set();
+		seen.set(value, clone$1);
+		for (const entryValue of value) clone$1.add(stripDeferredPromptValues(entryValue, seen));
+		copySanitizedOwnProperties(value, clone$1, seen);
+		return clone$1;
+	}
+	if (value instanceof Map) {
+		if (!containsDeferredPromptValues(value)) return value;
+		const clone$1 = /* @__PURE__ */ new Map();
+		seen.set(value, clone$1);
+		for (const [key, entryValue] of value) clone$1.set(stripDeferredPromptValues(key, seen), stripDeferredPromptValues(entryValue, seen));
+		copySanitizedOwnProperties(value, clone$1, seen);
+		return clone$1;
+	}
+	if (!isPlainObject(value)) return containsDeferredPromptValues(value) ? createSanitizedNonPlainView(value, seen) : value;
+	if (!containsDeferredPromptValues(value)) return value;
+	const clone = Object.create(Object.getPrototypeOf(value));
+	seen.set(value, clone);
+	for (const key of Reflect.ownKeys(value)) {
+		const descriptor = Object.getOwnPropertyDescriptor(value, key);
+		if (descriptor == null) continue;
+		if ("value" in descriptor) descriptor.value = stripDeferredPromptValues(descriptor.value, seen);
+		Object.defineProperty(clone, key, descriptor);
+	}
+	return clone;
+}
 /**
 * Sets active config data for a context.
 * @internal
@@ -130,15 +245,20 @@ function validateWithSchema(schema, rawData) {
 */
 function createConfigContext(options) {
 	const contextId = Symbol(`@optique/config:${Math.random()}`);
-	return {
+	const context = {
 		id: contextId,
 		schema: options.schema,
 		mode: "dynamic",
+		[phase1ConfigAnnotationsKey](parsed, annotations) {
+			if (parsed === void 0) return { [contextId]: phase1ConfigAnnotationMarker };
+			return Object.getOwnPropertySymbols(annotations).includes(contextId) ? void 0 : { [contextId]: void 0 };
+		},
 		getAnnotations(parsed, runtimeOptions) {
 			if (parsed === void 0) return {};
 			const opts = runtimeOptions;
 			if (!opts || !opts.getConfigPath && !opts.load) throw new TypeError("Either getConfigPath or load must be provided in the runner options when using ConfigContext.");
-			const parsedValue = parsed;
+			const parsedValue = isPhase2UndefinedParsedValue(parsed) ? void 0 : stripDeferredPromptValues(parsed);
+			const parsedPlaceholder = parsedValue;
 			const buildAnnotations = (configData, configMeta) => {
 				if (configData === void 0 || configData === null) return {};
 				setActiveConfig(contextId, configData);
@@ -157,12 +277,12 @@ function createConfigContext(options) {
 				return buildAnnotations(validated, configMeta);
 			};
 			if (opts.load) {
-				const loaded = opts.load(parsedValue);
+				const loaded = opts.load(parsedPlaceholder);
 				if (loaded instanceof Promise) return loaded.then(({ config, meta }) => validateAndBuildAnnotations(config, meta));
 				return validateAndBuildAnnotations(loaded.config, loaded.meta);
 			}
 			if (opts.getConfigPath) {
-				const configPath = opts.getConfigPath(parsedValue);
+				const configPath = opts.getConfigPath(parsedPlaceholder);
 				if (!configPath) return {};
 				const absoluteConfigPath = (0, node_path.resolve)(configPath);
 				const singleFileMeta = {
@@ -191,6 +311,7 @@ function createConfigContext(options) {
 			clearActiveConfigMeta(contextId);
 		}
 	};
+	return context;
 }
 /**
 * Binds a parser to configuration values with fallback priority.
@@ -228,7 +349,11 @@ function bindConfig(parser, options) {
 	function isConfigBindState(value) {
 		return value != null && typeof value === "object" && configBindStateKey in value;
 	}
-	return {
+	function shouldDeferPromptUntilConfigResolves(state) {
+		const annotations = (0, __optique_core_annotations.getAnnotations)(state);
+		return annotations?.[options.context.id] === phase1ConfigAnnotationMarker;
+	}
+	const boundParser = {
 		$mode: parser.$mode,
 		$valueType: parser.$valueType,
 		$stateType: parser.$stateType,
@@ -285,11 +410,13 @@ function bindConfig(parser, options) {
 			return (0, __optique_core_mode_dispatch.wrapForMode)(parser.$mode, getConfigOrDefault(state, options));
 		},
 		suggest: parser.suggest,
+		[deferPromptUntilConfigResolvesKey]: shouldDeferPromptUntilConfigResolves,
 		getDocFragments(state, upperDefaultValue) {
 			const defaultValue = upperDefaultValue ?? options.default;
 			return parser.getDocFragments(state, defaultValue);
 		}
 	};
+	return boundParser;
 }
 /**
 * Helper function to get value from config or default.

package/dist/index.js

@@ -5,6 +5,10 @@ import { message } from "@optique/core/message";
 import { mapModeValue, wrapForMode } from "@optique/core/mode-dispatch";
 
 //#region src/index.ts
+const deferPromptUntilConfigResolvesKey = Symbol.for("@optique/config/deferPromptUntilResolved");
+const phase1ConfigAnnotationsKey = Symbol.for("@optique/config/phase1PromptAnnotations");
+const phase2UndefinedParsedValueKey = Symbol.for("@optique/config/phase2UndefinedParsedValue");
+const deferredPromptValueKey = Symbol.for("@optique/inquirer/deferredPromptValue");
 /**
 * Internal registry for active config data during config context execution.
 * This is a workaround for the limitation that object() doesn't propagate
@@ -17,6 +21,117 @@ const activeConfigRegistry = /* @__PURE__ */ new Map();
 * @internal
 */
 const activeConfigMetaRegistry = /* @__PURE__ */ new Map();
+const phase1ConfigAnnotationMarker = Symbol("@optique/config/phase1Annotation");
+function isDeferredPromptValue(value) {
+	return value != null && typeof value === "object" && deferredPromptValueKey in value;
+}
+function isPhase2UndefinedParsedValue(value) {
+	return value != null && typeof value === "object" && phase2UndefinedParsedValueKey in value;
+}
+function isPlainObject(value) {
+	const proto = Object.getPrototypeOf(value);
+	return proto === Object.prototype || proto === null;
+}
+function shouldSkipCollectionOwnKey(value, key) {
+	if (Array.isArray(value)) return key === "length" || typeof key === "string" && Number.isInteger(Number(key)) && String(Number(key)) === key;
+	return false;
+}
+function containsDeferredPromptValuesInOwnProperties(value, seen) {
+	for (const key of Reflect.ownKeys(value)) {
+		if (shouldSkipCollectionOwnKey(value, key)) continue;
+		const descriptor = Object.getOwnPropertyDescriptor(value, key);
+		if (descriptor != null && "value" in descriptor && containsDeferredPromptValues(descriptor.value, seen)) return true;
+	}
+	return false;
+}
+function copySanitizedOwnProperties(source, target, seen) {
+	for (const key of Reflect.ownKeys(source)) {
+		if (shouldSkipCollectionOwnKey(source, key)) continue;
+		const descriptor = Object.getOwnPropertyDescriptor(source, key);
+		if (descriptor == null) continue;
+		if ("value" in descriptor) descriptor.value = stripDeferredPromptValues(descriptor.value, seen);
+		Object.defineProperty(target, key, descriptor);
+	}
+}
+function containsDeferredPromptValues(value, seen = /* @__PURE__ */ new WeakSet()) {
+	if (isDeferredPromptValue(value)) return true;
+	if (value == null || typeof value !== "object") return false;
+	if (seen.has(value)) return false;
+	seen.add(value);
+	if (Array.isArray(value)) {
+		if (value.some((item) => containsDeferredPromptValues(item, seen))) return true;
+		return containsDeferredPromptValuesInOwnProperties(value, seen);
+	}
+	if (value instanceof Set) {
+		for (const entryValue of value) if (containsDeferredPromptValues(entryValue, seen)) return true;
+		return containsDeferredPromptValuesInOwnProperties(value, seen);
+	}
+	if (value instanceof Map) {
+		for (const [key, entryValue] of value) if (containsDeferredPromptValues(key, seen) || containsDeferredPromptValues(entryValue, seen)) return true;
+		return containsDeferredPromptValuesInOwnProperties(value, seen);
+	}
+	return containsDeferredPromptValuesInOwnProperties(value, seen);
+}
+function createSanitizedNonPlainView(value, seen) {
+	const proxy = new Proxy(value, {
+		get(target, key, receiver) {
+			const descriptor = Object.getOwnPropertyDescriptor(target, key);
+			if (descriptor != null && "value" in descriptor) return stripDeferredPromptValues(descriptor.value, seen);
+			return Reflect.get(target, key, receiver);
+		},
+		getOwnPropertyDescriptor(target, key) {
+			const descriptor = Object.getOwnPropertyDescriptor(target, key);
+			if (descriptor == null || !("value" in descriptor)) return descriptor;
+			return {
+				...descriptor,
+				value: stripDeferredPromptValues(descriptor.value, seen)
+			};
+		}
+	});
+	seen.set(value, proxy);
+	return proxy;
+}
+function stripDeferredPromptValues(value, seen = /* @__PURE__ */ new WeakMap()) {
+	if (isDeferredPromptValue(value)) return void 0;
+	if (value == null || typeof value !== "object") return value;
+	const cached = seen.get(value);
+	if (cached !== void 0) return cached;
+	if (Array.isArray(value)) {
+		if (!containsDeferredPromptValues(value)) return value;
+		const clone$1 = new Array(value.length);
+		seen.set(value, clone$1);
+		for (let i = 0; i < value.length; i++) clone$1[i] = stripDeferredPromptValues(value[i], seen);
+		copySanitizedOwnProperties(value, clone$1, seen);
+		return clone$1;
+	}
+	if (value instanceof Set) {
+		if (!containsDeferredPromptValues(value)) return value;
+		const clone$1 = /* @__PURE__ */ new Set();
+		seen.set(value, clone$1);
+		for (const entryValue of value) clone$1.add(stripDeferredPromptValues(entryValue, seen));
+		copySanitizedOwnProperties(value, clone$1, seen);
+		return clone$1;
+	}
+	if (value instanceof Map) {
+		if (!containsDeferredPromptValues(value)) return value;
+		const clone$1 = /* @__PURE__ */ new Map();
+		seen.set(value, clone$1);
+		for (const [key, entryValue] of value) clone$1.set(stripDeferredPromptValues(key, seen), stripDeferredPromptValues(entryValue, seen));
+		copySanitizedOwnProperties(value, clone$1, seen);
+		return clone$1;
+	}
+	if (!isPlainObject(value)) return containsDeferredPromptValues(value) ? createSanitizedNonPlainView(value, seen) : value;
+	if (!containsDeferredPromptValues(value)) return value;
+	const clone = Object.create(Object.getPrototypeOf(value));
+	seen.set(value, clone);
+	for (const key of Reflect.ownKeys(value)) {
+		const descriptor = Object.getOwnPropertyDescriptor(value, key);
+		if (descriptor == null) continue;
+		if ("value" in descriptor) descriptor.value = stripDeferredPromptValues(descriptor.value, seen);
+		Object.defineProperty(clone, key, descriptor);
+	}
+	return clone;
+}
 /**
 * Sets active config data for a context.
 * @internal
@@ -107,15 +222,20 @@ function validateWithSchema(schema, rawData) {
 */
 function createConfigContext(options) {
 	const contextId = Symbol(`@optique/config:${Math.random()}`);
-	return {
+	const context = {
 		id: contextId,
 		schema: options.schema,
 		mode: "dynamic",
+		[phase1ConfigAnnotationsKey](parsed, annotations) {
+			if (parsed === void 0) return { [contextId]: phase1ConfigAnnotationMarker };
+			return Object.getOwnPropertySymbols(annotations).includes(contextId) ? void 0 : { [contextId]: void 0 };
+		},
 		getAnnotations(parsed, runtimeOptions) {
 			if (parsed === void 0) return {};
 			const opts = runtimeOptions;
 			if (!opts || !opts.getConfigPath && !opts.load) throw new TypeError("Either getConfigPath or load must be provided in the runner options when using ConfigContext.");
-			const parsedValue = parsed;
+			const parsedValue = isPhase2UndefinedParsedValue(parsed) ? void 0 : stripDeferredPromptValues(parsed);
+			const parsedPlaceholder = parsedValue;
 			const buildAnnotations = (configData, configMeta) => {
 				if (configData === void 0 || configData === null) return {};
 				setActiveConfig(contextId, configData);
@@ -134,12 +254,12 @@ function createConfigContext(options) {
 				return buildAnnotations(validated, configMeta);
 			};
 			if (opts.load) {
-				const loaded = opts.load(parsedValue);
+				const loaded = opts.load(parsedPlaceholder);
 				if (loaded instanceof Promise) return loaded.then(({ config, meta }) => validateAndBuildAnnotations(config, meta));
 				return validateAndBuildAnnotations(loaded.config, loaded.meta);
 			}
 			if (opts.getConfigPath) {
-				const configPath = opts.getConfigPath(parsedValue);
+				const configPath = opts.getConfigPath(parsedPlaceholder);
 				if (!configPath) return {};
 				const absoluteConfigPath = resolve(configPath);
 				const singleFileMeta = {
@@ -168,6 +288,7 @@ function createConfigContext(options) {
 			clearActiveConfigMeta(contextId);
 		}
 	};
+	return context;
 }
 /**
 * Binds a parser to configuration values with fallback priority.
@@ -205,7 +326,11 @@ function bindConfig(parser, options) {
 	function isConfigBindState(value) {
 		return value != null && typeof value === "object" && configBindStateKey in value;
 	}
-	return {
+	function shouldDeferPromptUntilConfigResolves(state) {
+		const annotations = getAnnotations(state);
+		return annotations?.[options.context.id] === phase1ConfigAnnotationMarker;
+	}
+	const boundParser = {
 		$mode: parser.$mode,
 		$valueType: parser.$valueType,
 		$stateType: parser.$stateType,
@@ -262,11 +387,13 @@ function bindConfig(parser, options) {
 			return wrapForMode(parser.$mode, getConfigOrDefault(state, options));
 		},
 		suggest: parser.suggest,
+		[deferPromptUntilConfigResolvesKey]: shouldDeferPromptUntilConfigResolves,
 		getDocFragments(state, upperDefaultValue) {
 			const defaultValue = upperDefaultValue ?? options.default;
 			return parser.getDocFragments(state, defaultValue);
 		}
 	};
+	return boundParser;
 }
 /**
 * Helper function to get value from config or default.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/config",
-  "version": "1.0.0-dev.664+4cd3da03",
+  "version": "1.0.0-dev.670+a142c6c9",
   "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.664+4cd3da03"
+    "@optique/core": "1.0.0-dev.670+a142c6c9"
   },
   "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.664+4cd3da03"
+    "@optique/env": "1.0.0-dev.670+a142c6c9"
   },
   "scripts": {
     "build": "tsdown",