@optique/inquirer 1.0.0-dev.1734 → 1.0.0-dev.1737

package/dist/index.cjs

@@ -25,7 +25,6 @@ const __inquirer_prompts = __toESM(require("@inquirer/prompts"));
 const __optique_core_annotations = __toESM(require("@optique/core/annotations"));
 const __optique_core_parser = __toESM(require("@optique/core/parser"));
 const __optique_core_message = __toESM(require("@optique/core/message"));
-const __optique_core_modifiers = __toESM(require("@optique/core/modifiers"));
 
 //#region src/index.ts
 const promptFunctionsOverrideSymbol = Symbol.for("@optique/inquirer/prompt-functions");
@@ -149,13 +148,8 @@ function prompt(parser, config) {
 		return value != null && typeof value === "object" && promptBindStateKey in value;
 	}
 	const cfg = config;
-	const PromptBindInitialStateClass = class {
-		[promptBindStateKey] = true;
-		hasCliValue = false;
-	};
-	const promptCache = /* @__PURE__ */ new WeakMap();
 	function shouldAttemptInnerCompletion(cliState, state) {
-		if (cliState == null || cliState instanceof PromptBindInitialStateClass) return false;
+		if (cliState == null) 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;
@@ -306,22 +300,12 @@ function prompt(parser, config) {
 		const result = await executePromptRaw();
 		return validatePromptedValue(result);
 	}
-	function usePromptOrDefer(state, result, exec) {
-		if (result.success) return Promise.resolve(result);
-		if (!shouldDeferPrompt(parser, state, exec)) return executePrompt();
-		let ph;
-		try {
-			ph = "placeholder" in parser ? parser.placeholder : void 0;
-		} catch {}
-		return Promise.resolve(deferredPromptResult(ph));
-	}
 	const promptedParser = {
 		$mode: "async",
 		$valueType: parser.$valueType,
 		$stateType: parser.$stateType,
 		priority: parser.priority,
 		[__optique_core_parser.inheritParentAnnotationsKey]: true,
-		[__optique_core_modifiers.optionalStyleWrapperKey]: true,
 		usage: parser.usage.length === 1 && parser.usage[0].type === "optional" ? parser.usage : [{
 			type: "optional",
 			terms: parser.usage
@@ -332,8 +316,9 @@ function prompt(parser, config) {
 			const innerState = isPromptBindState(state) ? state.cliState === void 0 ? parser.initialState : state.cliState : state;
 			return (0, __optique_core_parser.getDelegatingSuggestRuntimeNodes)(parser, promptedParser, state, path, innerState, "prepend");
 		},
-		get initialState() {
-			return new PromptBindInitialStateClass();
+		initialState: {
+			[promptBindStateKey]: true,
+			hasCliValue: false
 		},
 		parse: (context) => {
 			const annotations = (0, __optique_core_annotations.getAnnotations)(context.state);
@@ -394,75 +379,66 @@ function prompt(parser, config) {
 				if (r instanceof Promise) return r;
 				return Promise.resolve(r);
 			}
-			if (state instanceof PromptBindInitialStateClass) {
-				if (promptCache.has(state)) {
-					const cached = promptCache.get(state);
-					promptCache.delete(state);
-					return cached;
+			const isProbe = exec?.phase === "parse";
+			const annotations = (0, __optique_core_annotations.getAnnotations)(state);
+			const innerInitialState = parser.initialState;
+			const effectiveInitialState = annotations != null && innerInitialState == null ? (0, __optique_core_annotations.injectAnnotations)(innerInitialState, annotations) : innerInitialState;
+			const finalizePrompt = () => {
+				if (shouldDeferPrompt(parser, state, exec)) {
+					let ph;
+					try {
+						ph = "placeholder" in parser ? parser.placeholder : void 0;
+					} catch {}
+					return Promise.resolve(deferredPromptResult(ph));
 				}
-				const hasDeferHook = typeof parser.shouldDeferCompletion === "function";
-				const annotations = (0, __optique_core_annotations.getAnnotations)(state);
-				const innerInitialState = parser.initialState;
-				const effectiveInitialState = annotations != null && innerInitialState == null ? (0, __optique_core_annotations.injectAnnotations)(innerInitialState, annotations) : innerInitialState;
-				if (hasDeferHook) {
-					const annotatedR = withAnnotatedInnerState(state, effectiveInitialState, (annotatedInnerState) => parser.complete(annotatedInnerState, exec));
-					const usePromptOrDeferSentinel = (res) => {
-						if (res.success && res.value === void 0) return usePromptOrDefer(state, {
-							success: false,
-							error: []
-						}, exec);
-						return usePromptOrDefer(state, res, exec);
-					};
-					const cachedResult$1 = annotatedR instanceof Promise ? annotatedR.then(usePromptOrDeferSentinel) : usePromptOrDeferSentinel(annotatedR);
-					promptCache.set(state, cachedResult$1);
-					return cachedResult$1;
+				if (isProbe) {
+					let ph;
+					try {
+						ph = "placeholder" in parser ? parser.placeholder : void 0;
+					} catch {}
+					return Promise.resolve({
+						success: true,
+						value: ph
+					});
 				}
+				return executePrompt();
+			};
+			const hasDeferHook = typeof parser.shouldDeferCompletion === "function";
+			const decideFromParse = (parseResult) => {
+				const consumed = parseResult.success ? parseResult.consumed.length : 0;
+				const cliState = parseResult.success && consumed === 0 ? parseResult.next.state : void 0;
+				const cliStateIsInjected = cliState != null && typeof cliState === "object" && (0, __optique_core_annotations.unwrapInjectedAnnotationWrapper)(cliState) !== cliState;
+				const isSourceBinding = shouldCompleteFromSourceBinding(cliState, state);
+				if (!isSourceBinding) return finalizePrompt();
+				const completeState = parseResult.success ? parseResult.next.state : effectiveInitialState;
+				const innerR = parser.complete(completeState, exec);
+				const handleCompleteResult = (res) => {
+					if (res.success && res.value === void 0 && cliStateIsInjected) return finalizePrompt();
+					if (!res.success) return finalizePrompt();
+					return Promise.resolve(res);
+				};
+				if (innerR instanceof Promise) return innerR.then(handleCompleteResult);
+				return handleCompleteResult(innerR);
+			};
+			return hasDeferHook ? (() => {
+				const innerR = withAnnotatedInnerState(state, effectiveInitialState, (annotatedInnerState) => parser.complete(annotatedInnerState, exec));
+				const handleDeferHookResult = (res) => {
+					if (res.success && res.value === void 0) return finalizePrompt();
+					if (!res.success) return finalizePrompt();
+					return Promise.resolve(res);
+				};
+				if (innerR instanceof Promise) return innerR.then(handleDeferHookResult);
+				return handleDeferHookResult(innerR);
+			})() : (() => {
 				const simParseR = withAnnotatedInnerState(state, effectiveInitialState, (annotatedState) => parser.parse({
 					buffer: [],
 					state: annotatedState,
 					optionsTerminated: false,
 					usage: parser.usage
 				}));
-				const decideFromParse = (parseResult) => {
-					const consumed = parseResult.success ? parseResult.consumed.length : 0;
-					const cliState$1 = parseResult.success && consumed === 0 ? parseResult.next.state : void 0;
-					const isSourceBinding = shouldCompleteFromSourceBinding(cliState$1, state);
-					if (isSourceBinding) {
-						const cliStateIsInjected = cliState$1 != null && typeof cliState$1 === "object" && (0, __optique_core_annotations.unwrapInjectedAnnotationWrapper)(cliState$1) !== cliState$1;
-						const handleCompleteResult = (res) => {
-							if (res.success && res.value === void 0 && cliStateIsInjected) return executePrompt();
-							return usePromptOrDefer(state, res, exec);
-						};
-						const completeState = parseResult.success ? parseResult.next.state : effectiveInitialState;
-						const completeR = parser.complete(completeState, exec);
-						if (completeR instanceof Promise) return completeR.then(handleCompleteResult);
-						return handleCompleteResult(completeR);
-					}
-					return executePrompt();
-				};
-				const cachedResult = simParseR instanceof Promise ? simParseR.then(decideFromParse) : decideFromParse(simParseR);
-				promptCache.set(state, cachedResult);
-				return cachedResult;
-			}
-			const cliState = isPromptBindState(state) ? state.cliState : void 0;
-			const cliStateIsInjectedAnnotationWrapper = cliState != null && typeof cliState === "object" && (0, __optique_core_annotations.unwrapInjectedAnnotationWrapper)(cliState) !== cliState;
-			if (shouldCompleteFromSourceBinding(cliState, state)) {
-				const useCompleteResultOrPrompt = (result) => {
-					if (result.success && result.value === void 0 && cliStateIsInjectedAnnotationWrapper) return executePrompt();
-					return usePromptOrDefer(state, result, exec);
-				};
-				const r = withAnnotatedInnerState(state, cliState, (annotatedInnerState) => parser.complete(annotatedInnerState, exec));
-				if (r instanceof Promise) return r.then(useCompleteResultOrPrompt);
-				return useCompleteResultOrPrompt(r);
-			}
-			if (shouldDeferPrompt(parser, state, exec)) {
-				let ph;
-				try {
-					ph = "placeholder" in parser ? parser.placeholder : void 0;
-				} catch {}
-				return Promise.resolve(deferredPromptResult(ph));
-			}
-			return executePrompt();
+				if (simParseR instanceof Promise) return simParseR.then(decideFromParse);
+				return decideFromParse(simParseR);
+			})();
 		},
 		suggest: (context, prefix) => {
 			const innerState = isPromptBindState(context.state) ? context.state.cliState === void 0 ? parser.initialState : context.state.cliState : context.state;

package/dist/index.js

@@ -2,7 +2,6 @@ import { Separator, checkbox, confirm, editor, expand, input, number, password,
 import { annotationKey, getAnnotations, inheritAnnotations, injectAnnotations, unwrapInjectedAnnotationWrapper } from "@optique/core/annotations";
 import { annotationWrapperRequiresSourceBindingKey, composeWrappedSourceMetadata, defineInheritedAnnotationParser, getDelegatingSuggestRuntimeNodes, inheritParentAnnotationsKey } from "@optique/core/parser";
 import { message } from "@optique/core/message";
-import { optionalStyleWrapperKey } from "@optique/core/modifiers";
 
 //#region src/index.ts
 const promptFunctionsOverrideSymbol = Symbol.for("@optique/inquirer/prompt-functions");
@@ -126,13 +125,8 @@ function prompt(parser, config) {
 		return value != null && typeof value === "object" && promptBindStateKey in value;
 	}
 	const cfg = config;
-	const PromptBindInitialStateClass = class {
-		[promptBindStateKey] = true;
-		hasCliValue = false;
-	};
-	const promptCache = /* @__PURE__ */ new WeakMap();
 	function shouldAttemptInnerCompletion(cliState, state) {
-		if (cliState == null || cliState instanceof PromptBindInitialStateClass) return false;
+		if (cliState == null) return false;
 		const cliStateHasAnnotations = typeof cliState === "object" && annotationKey in cliState;
 		if (cliStateHasAnnotations) return true;
 		if (getAnnotations(state) == null || typeof cliState !== "object") return false;
@@ -283,22 +277,12 @@ function prompt(parser, config) {
 		const result = await executePromptRaw();
 		return validatePromptedValue(result);
 	}
-	function usePromptOrDefer(state, result, exec) {
-		if (result.success) return Promise.resolve(result);
-		if (!shouldDeferPrompt(parser, state, exec)) return executePrompt();
-		let ph;
-		try {
-			ph = "placeholder" in parser ? parser.placeholder : void 0;
-		} catch {}
-		return Promise.resolve(deferredPromptResult(ph));
-	}
 	const promptedParser = {
 		$mode: "async",
 		$valueType: parser.$valueType,
 		$stateType: parser.$stateType,
 		priority: parser.priority,
 		[inheritParentAnnotationsKey]: true,
-		[optionalStyleWrapperKey]: true,
 		usage: parser.usage.length === 1 && parser.usage[0].type === "optional" ? parser.usage : [{
 			type: "optional",
 			terms: parser.usage
@@ -309,8 +293,9 @@ function prompt(parser, config) {
 			const innerState = isPromptBindState(state) ? state.cliState === void 0 ? parser.initialState : state.cliState : state;
 			return getDelegatingSuggestRuntimeNodes(parser, promptedParser, state, path, innerState, "prepend");
 		},
-		get initialState() {
-			return new PromptBindInitialStateClass();
+		initialState: {
+			[promptBindStateKey]: true,
+			hasCliValue: false
 		},
 		parse: (context) => {
 			const annotations = getAnnotations(context.state);
@@ -371,75 +356,66 @@ function prompt(parser, config) {
 				if (r instanceof Promise) return r;
 				return Promise.resolve(r);
 			}
-			if (state instanceof PromptBindInitialStateClass) {
-				if (promptCache.has(state)) {
-					const cached = promptCache.get(state);
-					promptCache.delete(state);
-					return cached;
+			const isProbe = exec?.phase === "parse";
+			const annotations = getAnnotations(state);
+			const innerInitialState = parser.initialState;
+			const effectiveInitialState = annotations != null && innerInitialState == null ? injectAnnotations(innerInitialState, annotations) : innerInitialState;
+			const finalizePrompt = () => {
+				if (shouldDeferPrompt(parser, state, exec)) {
+					let ph;
+					try {
+						ph = "placeholder" in parser ? parser.placeholder : void 0;
+					} catch {}
+					return Promise.resolve(deferredPromptResult(ph));
 				}
-				const hasDeferHook = typeof parser.shouldDeferCompletion === "function";
-				const annotations = getAnnotations(state);
-				const innerInitialState = parser.initialState;
-				const effectiveInitialState = annotations != null && innerInitialState == null ? injectAnnotations(innerInitialState, annotations) : innerInitialState;
-				if (hasDeferHook) {
-					const annotatedR = withAnnotatedInnerState(state, effectiveInitialState, (annotatedInnerState) => parser.complete(annotatedInnerState, exec));
-					const usePromptOrDeferSentinel = (res) => {
-						if (res.success && res.value === void 0) return usePromptOrDefer(state, {
-							success: false,
-							error: []
-						}, exec);
-						return usePromptOrDefer(state, res, exec);
-					};
-					const cachedResult$1 = annotatedR instanceof Promise ? annotatedR.then(usePromptOrDeferSentinel) : usePromptOrDeferSentinel(annotatedR);
-					promptCache.set(state, cachedResult$1);
-					return cachedResult$1;
+				if (isProbe) {
+					let ph;
+					try {
+						ph = "placeholder" in parser ? parser.placeholder : void 0;
+					} catch {}
+					return Promise.resolve({
+						success: true,
+						value: ph
+					});
 				}
+				return executePrompt();
+			};
+			const hasDeferHook = typeof parser.shouldDeferCompletion === "function";
+			const decideFromParse = (parseResult) => {
+				const consumed = parseResult.success ? parseResult.consumed.length : 0;
+				const cliState = parseResult.success && consumed === 0 ? parseResult.next.state : void 0;
+				const cliStateIsInjected = cliState != null && typeof cliState === "object" && unwrapInjectedAnnotationWrapper(cliState) !== cliState;
+				const isSourceBinding = shouldCompleteFromSourceBinding(cliState, state);
+				if (!isSourceBinding) return finalizePrompt();
+				const completeState = parseResult.success ? parseResult.next.state : effectiveInitialState;
+				const innerR = parser.complete(completeState, exec);
+				const handleCompleteResult = (res) => {
+					if (res.success && res.value === void 0 && cliStateIsInjected) return finalizePrompt();
+					if (!res.success) return finalizePrompt();
+					return Promise.resolve(res);
+				};
+				if (innerR instanceof Promise) return innerR.then(handleCompleteResult);
+				return handleCompleteResult(innerR);
+			};
+			return hasDeferHook ? (() => {
+				const innerR = withAnnotatedInnerState(state, effectiveInitialState, (annotatedInnerState) => parser.complete(annotatedInnerState, exec));
+				const handleDeferHookResult = (res) => {
+					if (res.success && res.value === void 0) return finalizePrompt();
+					if (!res.success) return finalizePrompt();
+					return Promise.resolve(res);
+				};
+				if (innerR instanceof Promise) return innerR.then(handleDeferHookResult);
+				return handleDeferHookResult(innerR);
+			})() : (() => {
 				const simParseR = withAnnotatedInnerState(state, effectiveInitialState, (annotatedState) => parser.parse({
 					buffer: [],
 					state: annotatedState,
 					optionsTerminated: false,
 					usage: parser.usage
 				}));
-				const decideFromParse = (parseResult) => {
-					const consumed = parseResult.success ? parseResult.consumed.length : 0;
-					const cliState$1 = parseResult.success && consumed === 0 ? parseResult.next.state : void 0;
-					const isSourceBinding = shouldCompleteFromSourceBinding(cliState$1, state);
-					if (isSourceBinding) {
-						const cliStateIsInjected = cliState$1 != null && typeof cliState$1 === "object" && unwrapInjectedAnnotationWrapper(cliState$1) !== cliState$1;
-						const handleCompleteResult = (res) => {
-							if (res.success && res.value === void 0 && cliStateIsInjected) return executePrompt();
-							return usePromptOrDefer(state, res, exec);
-						};
-						const completeState = parseResult.success ? parseResult.next.state : effectiveInitialState;
-						const completeR = parser.complete(completeState, exec);
-						if (completeR instanceof Promise) return completeR.then(handleCompleteResult);
-						return handleCompleteResult(completeR);
-					}
-					return executePrompt();
-				};
-				const cachedResult = simParseR instanceof Promise ? simParseR.then(decideFromParse) : decideFromParse(simParseR);
-				promptCache.set(state, cachedResult);
-				return cachedResult;
-			}
-			const cliState = isPromptBindState(state) ? state.cliState : void 0;
-			const cliStateIsInjectedAnnotationWrapper = cliState != null && typeof cliState === "object" && unwrapInjectedAnnotationWrapper(cliState) !== cliState;
-			if (shouldCompleteFromSourceBinding(cliState, state)) {
-				const useCompleteResultOrPrompt = (result) => {
-					if (result.success && result.value === void 0 && cliStateIsInjectedAnnotationWrapper) return executePrompt();
-					return usePromptOrDefer(state, result, exec);
-				};
-				const r = withAnnotatedInnerState(state, cliState, (annotatedInnerState) => parser.complete(annotatedInnerState, exec));
-				if (r instanceof Promise) return r.then(useCompleteResultOrPrompt);
-				return useCompleteResultOrPrompt(r);
-			}
-			if (shouldDeferPrompt(parser, state, exec)) {
-				let ph;
-				try {
-					ph = "placeholder" in parser ? parser.placeholder : void 0;
-				} catch {}
-				return Promise.resolve(deferredPromptResult(ph));
-			}
-			return executePrompt();
+				if (simParseR instanceof Promise) return simParseR.then(decideFromParse);
+				return decideFromParse(simParseR);
+			})();
 		},
 		suggest: (context, prefix) => {
 			const innerState = isPromptBindState(context.state) ? context.state.cliState === void 0 ? parser.initialState : context.state.cliState : context.state;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/inquirer",
-  "version": "1.0.0-dev.1734+46c419e1",
+  "version": "1.0.0-dev.1737+f1436575",
   "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.1734+46c419e1"
+    "@optique/core": "1.0.0-dev.1737+f1436575"
   },
   "devDependencies": {
     "@types/node": "^20.19.9",
     "tsdown": "^0.13.0",
     "typescript": "^5.8.3",
-    "@optique/env": "1.0.0-dev.1734+46c419e1"
+    "@optique/env": "1.0.0-dev.1737+f1436575"
   },
   "scripts": {
     "build": "tsdown",