@optique/inquirer 1.0.0-dev.1658 → 1.0.0-dev.1661

package/dist/index.cjs

@@ -23,6 +23,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 //#endregion
 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"));
 
 //#region src/index.ts
@@ -69,7 +70,6 @@ function getPromptFunctions() {
 function isExitPromptError(error) {
 	return typeof error === "object" && error != null && "name" in error && error.name === "ExitPromptError";
 }
-const inheritParentAnnotationsKey = Symbol.for("@optique/core/inheritParentAnnotations");
 function shouldDeferPrompt(parser, state, exec) {
 	return typeof parser.shouldDeferCompletion === "function" && parser.shouldDeferCompletion(state, exec) === true;
 }
@@ -163,6 +163,16 @@ function prompt(parser, config) {
 		const prototype = Object.getPrototypeOf(cliState);
 		return prototype !== Object.prototype && prototype !== null;
 	}
+	function hasSourceBindingMarker(state) {
+		return state != null && typeof state === "object" && "hasCliValue" in state && Object.getOwnPropertySymbols(state).length > 0;
+	}
+	function shouldCompleteFromSourceBinding(cliState, state) {
+		const cliStateIsInjectedAnnotationWrapper = cliState != null && typeof cliState === "object" && (0, __optique_core_annotations.unwrapInjectedAnnotationWrapper)(cliState) !== cliState;
+		const requiresSourceBindingForAnnotationWrapper = Reflect.get(parser, __optique_core_parser.annotationWrapperRequiresSourceBindingKey) === true;
+		const hasNestedSourceBinding = hasSourceBindingMarker(cliState) || Array.isArray(cliState) && cliState.length === 1 && (hasSourceBindingMarker(cliState[0]) || cliState[0] != null && typeof cliState[0] === "object" && __optique_core_annotations.annotationKey in cliState[0]);
+		if (cliStateIsInjectedAnnotationWrapper && requiresSourceBindingForAnnotationWrapper) return hasNestedSourceBinding;
+		return shouldAttemptInnerCompletion(cliState, state) || hasNestedSourceBinding;
+	}
 	/**
 	* Executes the configured prompt and normalizes its result.
 	*
@@ -309,7 +319,7 @@ function prompt(parser, config) {
 		$valueType: parser.$valueType,
 		$stateType: parser.$stateType,
 		priority: parser.priority,
-		[inheritParentAnnotationsKey]: true,
+		[__optique_core_parser.inheritParentAnnotationsKey]: true,
 		usage: parser.usage.length === 1 && parser.usage[0].type === "optional" ? parser.usage : [{
 			type: "optional",
 			terms: parser.usage
@@ -318,13 +328,7 @@ function prompt(parser, config) {
 		acceptingAnyToken: parser.acceptingAnyToken,
 		getSuggestRuntimeNodes(state, path) {
 			const innerState = isPromptBindState(state) ? state.cliState === void 0 ? parser.initialState : state.cliState : state;
-			const innerNodes = parser.getSuggestRuntimeNodes?.(innerState, path) ?? [];
-			if (promptedParser.dependencyMetadata?.source != null) return [{
-				path,
-				parser: promptedParser,
-				state
-			}, ...innerNodes];
-			return innerNodes;
+			return (0, __optique_core_parser.getDelegatingSuggestRuntimeNodes)(parser, promptedParser, state, path, innerState, "prepend");
 		},
 		get initialState() {
 			return new PromptBindInitialStateClass();
@@ -336,14 +340,15 @@ function prompt(parser, config) {
 				...context,
 				state: innerState
 			} : context;
-			const effectiveInnerState = annotations != null && innerState == null && Reflect.get(parser, inheritParentAnnotationsKey) === true ? (0, __optique_core_annotations.injectAnnotations)(innerState, annotations) : innerState;
+			const effectiveInnerState = annotations != null && innerState == null && Reflect.get(parser, __optique_core_parser.inheritParentAnnotationsKey) === true ? (0, __optique_core_annotations.injectAnnotations)(innerState, annotations) : innerState;
 			const processResult = (result$1) => {
 				if (result$1.success) {
+					const cliState = annotations != null && result$1.next.state != null && typeof result$1.next.state === "object" && (0, __optique_core_annotations.getAnnotations)(result$1.next.state) !== annotations ? (0, __optique_core_annotations.injectAnnotations)(result$1.next.state, annotations) : result$1.next.state;
 					const cliConsumed = result$1.consumed.length > 0;
 					const nextState$1 = {
 						[promptBindStateKey]: true,
 						hasCliValue: cliConsumed,
-						cliState: result$1.next.state,
+						cliState,
 						...annotations != null ? { [__optique_core_annotations.annotationKey]: annotations } : {}
 					};
 					return {
@@ -418,9 +423,7 @@ function prompt(parser, config) {
 				const decideFromParse = (parseResult) => {
 					const consumed = parseResult.success ? parseResult.consumed.length : 0;
 					const cliState$1 = parseResult.success && consumed === 0 ? parseResult.next.state : void 0;
-					const hasSourceBindingMarker = (s) => s != null && typeof s === "object" && "hasCliValue" in s && Object.getOwnPropertySymbols(s).length > 0;
-					const cliStateIsPassthrough = cliState$1 != null && typeof cliState$1 === "object" && (0, __optique_core_annotations.unwrapInjectedAnnotationWrapper)(cliState$1) !== cliState$1;
-					const isSourceBinding = shouldAttemptInnerCompletion(cliState$1, state) && !cliStateIsPassthrough || hasSourceBindingMarker(cliState$1) || Array.isArray(cliState$1) && cliState$1.length === 1 && (hasSourceBindingMarker(cliState$1[0]) || typeof cliState$1[0] === "object" && cliState$1[0] != null && __optique_core_annotations.annotationKey in cliState$1[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) => {
@@ -440,7 +443,7 @@ function prompt(parser, config) {
 			}
 			const cliState = isPromptBindState(state) ? state.cliState : void 0;
 			const cliStateIsInjectedAnnotationWrapper = cliState != null && typeof cliState === "object" && (0, __optique_core_annotations.unwrapInjectedAnnotationWrapper)(cliState) !== cliState;
-			if (shouldAttemptInnerCompletion(cliState, state)) {
+			if (shouldCompleteFromSourceBinding(cliState, state)) {
 				const useCompleteResultOrPrompt = (result) => {
 					if (result.success && result.value === void 0 && cliStateIsInjectedAnnotationWrapper) return executePrompt();
 					return usePromptOrDefer(state, result, exec);
@@ -475,6 +478,7 @@ function prompt(parser, config) {
 			return parser.getDocFragments(state, defaultValue);
 		}
 	};
+	(0, __optique_core_parser.defineInheritedAnnotationParser)(promptedParser);
 	if ("placeholder" in parser) Object.defineProperty(promptedParser, "placeholder", {
 		get() {
 			try {
@@ -491,18 +495,15 @@ function prompt(parser, config) {
 		configurable: true,
 		enumerable: false
 	});
-	const dependencyMetadata = parser.dependencyMetadata;
+	const dependencyMetadata = (0, __optique_core_parser.composeWrappedSourceMetadata)(parser.dependencyMetadata, (source) => ({
+		...source,
+		extractSourceValue: (state) => {
+			if (!isPromptBindState(state)) return source.extractSourceValue(state);
+			return source.extractSourceValue(state.cliState ?? state);
+		}
+	}));
 	if (dependencyMetadata != null) Object.defineProperty(promptedParser, "dependencyMetadata", {
-		value: dependencyMetadata.source == null ? dependencyMetadata : {
-			...dependencyMetadata,
-			source: {
-				...dependencyMetadata.source,
-				extractSourceValue: (state) => {
-					if (!isPromptBindState(state)) return dependencyMetadata.source?.extractSourceValue(state);
-					return dependencyMetadata.source?.extractSourceValue(state.cliState ?? state);
-				}
-			}
-		},
+		value: dependencyMetadata,
 		configurable: true,
 		enumerable: false
 	});

package/dist/index.js

@@ -1,5 +1,6 @@
 import { Separator, checkbox, confirm, editor, expand, input, number, password, rawlist, select } from "@inquirer/prompts";
 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";
 
 //#region src/index.ts
@@ -46,7 +47,6 @@ function getPromptFunctions() {
 function isExitPromptError(error) {
 	return typeof error === "object" && error != null && "name" in error && error.name === "ExitPromptError";
 }
-const inheritParentAnnotationsKey = Symbol.for("@optique/core/inheritParentAnnotations");
 function shouldDeferPrompt(parser, state, exec) {
 	return typeof parser.shouldDeferCompletion === "function" && parser.shouldDeferCompletion(state, exec) === true;
 }
@@ -140,6 +140,16 @@ function prompt(parser, config) {
 		const prototype = Object.getPrototypeOf(cliState);
 		return prototype !== Object.prototype && prototype !== null;
 	}
+	function hasSourceBindingMarker(state) {
+		return state != null && typeof state === "object" && "hasCliValue" in state && Object.getOwnPropertySymbols(state).length > 0;
+	}
+	function shouldCompleteFromSourceBinding(cliState, state) {
+		const cliStateIsInjectedAnnotationWrapper = cliState != null && typeof cliState === "object" && unwrapInjectedAnnotationWrapper(cliState) !== cliState;
+		const requiresSourceBindingForAnnotationWrapper = Reflect.get(parser, annotationWrapperRequiresSourceBindingKey) === true;
+		const hasNestedSourceBinding = hasSourceBindingMarker(cliState) || Array.isArray(cliState) && cliState.length === 1 && (hasSourceBindingMarker(cliState[0]) || cliState[0] != null && typeof cliState[0] === "object" && annotationKey in cliState[0]);
+		if (cliStateIsInjectedAnnotationWrapper && requiresSourceBindingForAnnotationWrapper) return hasNestedSourceBinding;
+		return shouldAttemptInnerCompletion(cliState, state) || hasNestedSourceBinding;
+	}
 	/**
 	* Executes the configured prompt and normalizes its result.
 	*
@@ -295,13 +305,7 @@ function prompt(parser, config) {
 		acceptingAnyToken: parser.acceptingAnyToken,
 		getSuggestRuntimeNodes(state, path) {
 			const innerState = isPromptBindState(state) ? state.cliState === void 0 ? parser.initialState : state.cliState : state;
-			const innerNodes = parser.getSuggestRuntimeNodes?.(innerState, path) ?? [];
-			if (promptedParser.dependencyMetadata?.source != null) return [{
-				path,
-				parser: promptedParser,
-				state
-			}, ...innerNodes];
-			return innerNodes;
+			return getDelegatingSuggestRuntimeNodes(parser, promptedParser, state, path, innerState, "prepend");
 		},
 		get initialState() {
 			return new PromptBindInitialStateClass();
@@ -316,11 +320,12 @@ function prompt(parser, config) {
 			const effectiveInnerState = annotations != null && innerState == null && Reflect.get(parser, inheritParentAnnotationsKey) === true ? injectAnnotations(innerState, annotations) : innerState;
 			const processResult = (result$1) => {
 				if (result$1.success) {
+					const cliState = annotations != null && result$1.next.state != null && typeof result$1.next.state === "object" && getAnnotations(result$1.next.state) !== annotations ? injectAnnotations(result$1.next.state, annotations) : result$1.next.state;
 					const cliConsumed = result$1.consumed.length > 0;
 					const nextState$1 = {
 						[promptBindStateKey]: true,
 						hasCliValue: cliConsumed,
-						cliState: result$1.next.state,
+						cliState,
 						...annotations != null ? { [annotationKey]: annotations } : {}
 					};
 					return {
@@ -395,9 +400,7 @@ function prompt(parser, config) {
 				const decideFromParse = (parseResult) => {
 					const consumed = parseResult.success ? parseResult.consumed.length : 0;
 					const cliState$1 = parseResult.success && consumed === 0 ? parseResult.next.state : void 0;
-					const hasSourceBindingMarker = (s) => s != null && typeof s === "object" && "hasCliValue" in s && Object.getOwnPropertySymbols(s).length > 0;
-					const cliStateIsPassthrough = cliState$1 != null && typeof cliState$1 === "object" && unwrapInjectedAnnotationWrapper(cliState$1) !== cliState$1;
-					const isSourceBinding = shouldAttemptInnerCompletion(cliState$1, state) && !cliStateIsPassthrough || hasSourceBindingMarker(cliState$1) || Array.isArray(cliState$1) && cliState$1.length === 1 && (hasSourceBindingMarker(cliState$1[0]) || typeof cliState$1[0] === "object" && cliState$1[0] != null && annotationKey in cliState$1[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) => {
@@ -417,7 +420,7 @@ function prompt(parser, config) {
 			}
 			const cliState = isPromptBindState(state) ? state.cliState : void 0;
 			const cliStateIsInjectedAnnotationWrapper = cliState != null && typeof cliState === "object" && unwrapInjectedAnnotationWrapper(cliState) !== cliState;
-			if (shouldAttemptInnerCompletion(cliState, state)) {
+			if (shouldCompleteFromSourceBinding(cliState, state)) {
 				const useCompleteResultOrPrompt = (result) => {
 					if (result.success && result.value === void 0 && cliStateIsInjectedAnnotationWrapper) return executePrompt();
 					return usePromptOrDefer(state, result, exec);
@@ -452,6 +455,7 @@ function prompt(parser, config) {
 			return parser.getDocFragments(state, defaultValue);
 		}
 	};
+	defineInheritedAnnotationParser(promptedParser);
 	if ("placeholder" in parser) Object.defineProperty(promptedParser, "placeholder", {
 		get() {
 			try {
@@ -468,18 +472,15 @@ function prompt(parser, config) {
 		configurable: true,
 		enumerable: false
 	});
-	const dependencyMetadata = parser.dependencyMetadata;
+	const dependencyMetadata = composeWrappedSourceMetadata(parser.dependencyMetadata, (source) => ({
+		...source,
+		extractSourceValue: (state) => {
+			if (!isPromptBindState(state)) return source.extractSourceValue(state);
+			return source.extractSourceValue(state.cliState ?? state);
+		}
+	}));
 	if (dependencyMetadata != null) Object.defineProperty(promptedParser, "dependencyMetadata", {
-		value: dependencyMetadata.source == null ? dependencyMetadata : {
-			...dependencyMetadata,
-			source: {
-				...dependencyMetadata.source,
-				extractSourceValue: (state) => {
-					if (!isPromptBindState(state)) return dependencyMetadata.source?.extractSourceValue(state);
-					return dependencyMetadata.source?.extractSourceValue(state.cliState ?? state);
-				}
-			}
-		},
+		value: dependencyMetadata,
 		configurable: true,
 		enumerable: false
 	});

package/package.json

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