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

package/dist/index.cjs

@@ -69,6 +69,42 @@ function getPromptFunctions() {
 function isExitPromptError(error) {
 	return typeof error === "object" && error != null && "name" in error && error.name === "ExitPromptError";
 }
+const deferredPromptValueKey = Symbol.for("@optique/inquirer/deferredPromptValue");
+const deferPromptUntilConfigResolvesKey = Symbol.for("@optique/config/deferPromptUntilResolved");
+const inheritParentAnnotationsKey = Symbol.for("@optique/core/inheritParentAnnotations");
+var DeferredPromptValue = class {
+	[deferredPromptValueKey] = true;
+};
+function shouldDeferPrompt(parser, state) {
+	const maybeShouldDefer = Reflect.get(parser, deferPromptUntilConfigResolvesKey);
+	return typeof maybeShouldDefer === "function" && maybeShouldDefer(state) === true;
+}
+function deferredPromptResult() {
+	return {
+		success: true,
+		value: new DeferredPromptValue()
+	};
+}
+function withAnnotationView(state, annotations, run) {
+	const annotatedState = new Proxy(state, {
+		get(target, key) {
+			if (key === __optique_core_annotations.annotationKey) return annotations;
+			const value = Reflect.get(target, key, target);
+			return typeof value === "function" ? value.bind(target) : value;
+		},
+		has(target, key) {
+			return key === __optique_core_annotations.annotationKey || Reflect.has(target, key);
+		}
+	});
+	return run(annotatedState);
+}
+function withAnnotatedInnerState(sourceState, innerState, run) {
+	const annotations = (0, __optique_core_annotations.getAnnotations)(sourceState);
+	if (annotations == null || innerState == null || typeof innerState !== "object" || typeof innerState === "object" && __optique_core_annotations.annotationKey in innerState) return run(innerState);
+	const inheritedState = (0, __optique_core_annotations.inheritAnnotations)(sourceState, innerState);
+	if (inheritedState !== innerState) return run(inheritedState);
+	return withAnnotationView(innerState, annotations, (annotatedState) => run(annotatedState));
+}
 /**
 * Wraps a parser with an interactive Inquirer.js prompt fallback.
 *
@@ -110,6 +146,16 @@ function prompt(parser, config) {
 		hasCliValue = false;
 	};
 	let promptCache = null;
+	function shouldAttemptInnerCompletion(cliState, state) {
+		if (cliState == null || cliState instanceof PromptBindInitialStateClass) return false;
+		const cliStateHasAnnotations = typeof cliState === "object" && __optique_core_annotations.annotationKey in cliState;
+		if (cliStateHasAnnotations) return true;
+		if ((0, __optique_core_annotations.getAnnotations)(state) == null || typeof cliState !== "object") return false;
+		if ("hasCliValue" in cliState) return true;
+		if (Array.isArray(cliState)) return false;
+		const prototype = Object.getPrototypeOf(cliState);
+		return prototype !== Object.prototype && prototype !== null;
+	}
 	/**
 	* Executes the configured prompt and normalizes its result.
 	*
@@ -223,11 +269,16 @@ function prompt(parser, config) {
 			throw error;
 		}
 	}
-	return {
+	function usePromptOrDefer(state, result) {
+		if (result.success) return Promise.resolve(result);
+		return shouldDeferPrompt(parser, state) ? Promise.resolve(deferredPromptResult()) : executePrompt();
+	}
+	const promptedParser = {
 		$mode: "async",
 		$valueType: parser.$valueType,
 		$stateType: parser.$stateType,
 		priority: parser.priority,
+		[inheritParentAnnotationsKey]: true,
 		usage: [{
 			type: "optional",
 			terms: parser.usage
@@ -238,13 +289,9 @@ function prompt(parser, config) {
 		parse: (context) => {
 			const annotations = (0, __optique_core_annotations.getAnnotations)(context.state);
 			const innerState = isPromptBindState(context.state) ? context.state.hasCliValue ? context.state.cliState : parser.initialState : context.state;
-			const innerStateWithAnnotations = annotations != null && (innerState == null || typeof innerState === "object" && !(__optique_core_annotations.annotationKey in innerState)) ? {
-				...innerState != null && typeof innerState === "object" ? innerState : {},
-				[__optique_core_annotations.annotationKey]: annotations
-			} : innerState;
-			const innerContext = innerStateWithAnnotations !== context.state ? {
+			const baseInnerContext = innerState !== context.state ? {
 				...context,
-				state: innerStateWithAnnotations
+				state: innerState
 			} : context;
 			const processResult = (result$1) => {
 				if (result$1.success) {
@@ -273,19 +320,25 @@ function prompt(parser, config) {
 				return {
 					success: true,
 					next: {
-						...innerContext,
+						...baseInnerContext,
 						state: nextState
 					},
 					consumed: []
 				};
 			};
-			const result = parser.parse(innerContext);
+			const result = withAnnotatedInnerState(context.state, innerState, (annotatedInnerState) => {
+				const innerContext = annotatedInnerState !== context.state ? {
+					...context,
+					state: annotatedInnerState
+				} : context;
+				return parser.parse(innerContext);
+			});
 			if (result instanceof Promise) return result.then(processResult);
 			return Promise.resolve(processResult(result));
 		},
 		complete: (state) => {
 			if (isPromptBindState(state) && state.hasCliValue) {
-				const r = parser.complete(state.cliState);
+				const r = withAnnotatedInnerState(state, state.cliState, (annotatedInnerState) => parser.complete(annotatedInnerState));
 				if (r instanceof Promise) return r;
 				return Promise.resolve(r);
 			}
@@ -295,10 +348,8 @@ function prompt(parser, config) {
 					promptCache = null;
 					return cached;
 				}
-				const innerState = parser.initialState;
-				const r = parser.complete(innerState);
-				const fallback = (res) => res.success ? Promise.resolve(res) : executePrompt();
-				const cachedResult = r instanceof Promise ? r.then(fallback) : fallback(r);
+				const r = withAnnotatedInnerState(state, parser.initialState, (annotatedInnerState) => parser.complete(annotatedInnerState));
+				const cachedResult = r instanceof Promise ? r.then((res) => usePromptOrDefer(state, res)) : usePromptOrDefer(state, r);
 				promptCache = {
 					state,
 					result: cachedResult
@@ -306,15 +357,17 @@ function prompt(parser, config) {
 				return cachedResult;
 			}
 			const cliState = isPromptBindState(state) ? state.cliState : void 0;
-			const cliStateHasAnnotations = cliState != null && typeof cliState === "object" && __optique_core_annotations.annotationKey in cliState;
-			if (cliStateHasAnnotations) {
-				const innerState = cliState;
-				const r = parser.complete(innerState);
-				const fallback = (res) => res.success ? Promise.resolve(res) : executePrompt();
-				if (r instanceof Promise) return r.then(fallback);
-				return fallback(r);
+			const cliStateIsInjectedAnnotationWrapper = cliState != null && typeof cliState === "object" && (0, __optique_core_annotations.unwrapInjectedAnnotationWrapper)(cliState) !== cliState;
+			if (shouldAttemptInnerCompletion(cliState, state)) {
+				const useCompleteResultOrPrompt = (result) => {
+					if (result.success && result.value === void 0 && cliStateIsInjectedAnnotationWrapper) return executePrompt();
+					return usePromptOrDefer(state, result);
+				};
+				const r = withAnnotatedInnerState(state, cliState, (annotatedInnerState) => parser.complete(annotatedInnerState));
+				if (r instanceof Promise) return r.then(useCompleteResultOrPrompt);
+				return useCompleteResultOrPrompt(r);
 			}
-			return executePrompt();
+			return shouldDeferPrompt(parser, state) ? Promise.resolve(deferredPromptResult()) : executePrompt();
 		},
 		suggest: (context, prefix) => {
 			const innerState = isPromptBindState(context.state) ? context.state.hasCliValue ? context.state.cliState : parser.initialState : context.state;
@@ -333,6 +386,7 @@ function prompt(parser, config) {
 			return parser.getDocFragments(state, defaultValue);
 		}
 	};
+	return promptedParser;
 }
 /** Normalize choices to the format Inquirer.js expects. */
 function normalizeChoices(choices) {

package/dist/index.js

@@ -1,5 +1,5 @@
 import { Separator, checkbox, confirm, editor, expand, input, number, password, rawlist, select } from "@inquirer/prompts";
-import { annotationKey, getAnnotations } from "@optique/core/annotations";
+import { annotationKey, getAnnotations, inheritAnnotations, unwrapInjectedAnnotationWrapper } from "@optique/core/annotations";
 import { message } from "@optique/core/message";
 
 //#region src/index.ts
@@ -46,6 +46,42 @@ function getPromptFunctions() {
 function isExitPromptError(error) {
 	return typeof error === "object" && error != null && "name" in error && error.name === "ExitPromptError";
 }
+const deferredPromptValueKey = Symbol.for("@optique/inquirer/deferredPromptValue");
+const deferPromptUntilConfigResolvesKey = Symbol.for("@optique/config/deferPromptUntilResolved");
+const inheritParentAnnotationsKey = Symbol.for("@optique/core/inheritParentAnnotations");
+var DeferredPromptValue = class {
+	[deferredPromptValueKey] = true;
+};
+function shouldDeferPrompt(parser, state) {
+	const maybeShouldDefer = Reflect.get(parser, deferPromptUntilConfigResolvesKey);
+	return typeof maybeShouldDefer === "function" && maybeShouldDefer(state) === true;
+}
+function deferredPromptResult() {
+	return {
+		success: true,
+		value: new DeferredPromptValue()
+	};
+}
+function withAnnotationView(state, annotations, run) {
+	const annotatedState = new Proxy(state, {
+		get(target, key) {
+			if (key === annotationKey) return annotations;
+			const value = Reflect.get(target, key, target);
+			return typeof value === "function" ? value.bind(target) : value;
+		},
+		has(target, key) {
+			return key === annotationKey || Reflect.has(target, key);
+		}
+	});
+	return run(annotatedState);
+}
+function withAnnotatedInnerState(sourceState, innerState, run) {
+	const annotations = getAnnotations(sourceState);
+	if (annotations == null || innerState == null || typeof innerState !== "object" || typeof innerState === "object" && annotationKey in innerState) return run(innerState);
+	const inheritedState = inheritAnnotations(sourceState, innerState);
+	if (inheritedState !== innerState) return run(inheritedState);
+	return withAnnotationView(innerState, annotations, (annotatedState) => run(annotatedState));
+}
 /**
 * Wraps a parser with an interactive Inquirer.js prompt fallback.
 *
@@ -87,6 +123,16 @@ function prompt(parser, config) {
 		hasCliValue = false;
 	};
 	let promptCache = null;
+	function shouldAttemptInnerCompletion(cliState, state) {
+		if (cliState == null || cliState instanceof PromptBindInitialStateClass) return false;
+		const cliStateHasAnnotations = typeof cliState === "object" && annotationKey in cliState;
+		if (cliStateHasAnnotations) return true;
+		if (getAnnotations(state) == null || typeof cliState !== "object") return false;
+		if ("hasCliValue" in cliState) return true;
+		if (Array.isArray(cliState)) return false;
+		const prototype = Object.getPrototypeOf(cliState);
+		return prototype !== Object.prototype && prototype !== null;
+	}
 	/**
 	* Executes the configured prompt and normalizes its result.
 	*
@@ -200,11 +246,16 @@ function prompt(parser, config) {
 			throw error;
 		}
 	}
-	return {
+	function usePromptOrDefer(state, result) {
+		if (result.success) return Promise.resolve(result);
+		return shouldDeferPrompt(parser, state) ? Promise.resolve(deferredPromptResult()) : executePrompt();
+	}
+	const promptedParser = {
 		$mode: "async",
 		$valueType: parser.$valueType,
 		$stateType: parser.$stateType,
 		priority: parser.priority,
+		[inheritParentAnnotationsKey]: true,
 		usage: [{
 			type: "optional",
 			terms: parser.usage
@@ -215,13 +266,9 @@ function prompt(parser, config) {
 		parse: (context) => {
 			const annotations = getAnnotations(context.state);
 			const innerState = isPromptBindState(context.state) ? context.state.hasCliValue ? context.state.cliState : parser.initialState : context.state;
-			const innerStateWithAnnotations = annotations != null && (innerState == null || typeof innerState === "object" && !(annotationKey in innerState)) ? {
-				...innerState != null && typeof innerState === "object" ? innerState : {},
-				[annotationKey]: annotations
-			} : innerState;
-			const innerContext = innerStateWithAnnotations !== context.state ? {
+			const baseInnerContext = innerState !== context.state ? {
 				...context,
-				state: innerStateWithAnnotations
+				state: innerState
 			} : context;
 			const processResult = (result$1) => {
 				if (result$1.success) {
@@ -250,19 +297,25 @@ function prompt(parser, config) {
 				return {
 					success: true,
 					next: {
-						...innerContext,
+						...baseInnerContext,
 						state: nextState
 					},
 					consumed: []
 				};
 			};
-			const result = parser.parse(innerContext);
+			const result = withAnnotatedInnerState(context.state, innerState, (annotatedInnerState) => {
+				const innerContext = annotatedInnerState !== context.state ? {
+					...context,
+					state: annotatedInnerState
+				} : context;
+				return parser.parse(innerContext);
+			});
 			if (result instanceof Promise) return result.then(processResult);
 			return Promise.resolve(processResult(result));
 		},
 		complete: (state) => {
 			if (isPromptBindState(state) && state.hasCliValue) {
-				const r = parser.complete(state.cliState);
+				const r = withAnnotatedInnerState(state, state.cliState, (annotatedInnerState) => parser.complete(annotatedInnerState));
 				if (r instanceof Promise) return r;
 				return Promise.resolve(r);
 			}
@@ -272,10 +325,8 @@ function prompt(parser, config) {
 					promptCache = null;
 					return cached;
 				}
-				const innerState = parser.initialState;
-				const r = parser.complete(innerState);
-				const fallback = (res) => res.success ? Promise.resolve(res) : executePrompt();
-				const cachedResult = r instanceof Promise ? r.then(fallback) : fallback(r);
+				const r = withAnnotatedInnerState(state, parser.initialState, (annotatedInnerState) => parser.complete(annotatedInnerState));
+				const cachedResult = r instanceof Promise ? r.then((res) => usePromptOrDefer(state, res)) : usePromptOrDefer(state, r);
 				promptCache = {
 					state,
 					result: cachedResult
@@ -283,15 +334,17 @@ function prompt(parser, config) {
 				return cachedResult;
 			}
 			const cliState = isPromptBindState(state) ? state.cliState : void 0;
-			const cliStateHasAnnotations = cliState != null && typeof cliState === "object" && annotationKey in cliState;
-			if (cliStateHasAnnotations) {
-				const innerState = cliState;
-				const r = parser.complete(innerState);
-				const fallback = (res) => res.success ? Promise.resolve(res) : executePrompt();
-				if (r instanceof Promise) return r.then(fallback);
-				return fallback(r);
+			const cliStateIsInjectedAnnotationWrapper = cliState != null && typeof cliState === "object" && unwrapInjectedAnnotationWrapper(cliState) !== cliState;
+			if (shouldAttemptInnerCompletion(cliState, state)) {
+				const useCompleteResultOrPrompt = (result) => {
+					if (result.success && result.value === void 0 && cliStateIsInjectedAnnotationWrapper) return executePrompt();
+					return usePromptOrDefer(state, result);
+				};
+				const r = withAnnotatedInnerState(state, cliState, (annotatedInnerState) => parser.complete(annotatedInnerState));
+				if (r instanceof Promise) return r.then(useCompleteResultOrPrompt);
+				return useCompleteResultOrPrompt(r);
 			}
-			return executePrompt();
+			return shouldDeferPrompt(parser, state) ? Promise.resolve(deferredPromptResult()) : executePrompt();
 		},
 		suggest: (context, prefix) => {
 			const innerState = isPromptBindState(context.state) ? context.state.hasCliValue ? context.state.cliState : parser.initialState : context.state;
@@ -310,6 +363,7 @@ function prompt(parser, config) {
 			return parser.getDocFragments(state, defaultValue);
 		}
 	};
+	return promptedParser;
 }
 /** Normalize choices to the format Inquirer.js expects. */
 function normalizeChoices(choices) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/inquirer",
-  "version": "1.0.0-dev.664+4cd3da03",
+  "version": "1.0.0-dev.670+a142c6c9",
   "description": "Interactive prompt support for Optique via Inquirer.js",
   "keywords": [
     "CLI",
@@ -56,13 +56,13 @@
   "sideEffects": false,
   "dependencies": {
     "@inquirer/prompts": "^8.3.0",
-    "@optique/core": "1.0.0-dev.664+4cd3da03"
+    "@optique/core": "1.0.0-dev.670+a142c6c9"
   },
   "devDependencies": {
     "@types/node": "^20.19.9",
     "tsdown": "^0.13.0",
     "typescript": "^5.8.3",
-    "@optique/env": "1.0.0-dev.664+4cd3da03"
+    "@optique/env": "1.0.0-dev.670+a142c6c9"
   },
   "scripts": {
     "build": "tsdown",