@optique/inquirer 1.0.0-dev.1903 → 1.0.0-dev.1972

package/README.md

@@ -9,7 +9,7 @@ when no CLI value is provided.  The fallback priority is:
 CLI arguments > interactive prompt.
 
 Because interactive prompts are inherently asynchronous, the returned parser
-always has `$mode: "async"`.
+always has `mode: "async"`.
 
 [Optique]: https://optique.dev/
 [Inquirer.js]: https://github.com/SBoudrias/Inquirer.js

package/dist/index.cjs

@@ -23,7 +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_extension = __toESM(require("@optique/core/extension"));
 const __optique_core_message = __toESM(require("@optique/core/message"));
 
 //#region src/index.ts
@@ -92,25 +92,12 @@ function deferredPromptResult(placeholderValue) {
 		deferredKeys: keys
 	};
 }
-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 (annotations == null || innerState == null || typeof innerState !== "object" || (0, __optique_core_annotations.getAnnotations)(innerState) != null) return run(innerState);
+	const inheritedState = (0, __optique_core_extension.inheritAnnotations)(sourceState, innerState);
 	if (inheritedState !== innerState) return run(inheritedState);
-	return withAnnotationView(innerState, annotations, (annotatedState) => run(annotatedState));
+	return run((0, __optique_core_extension.withAnnotationView)(innerState, annotations));
 }
 /**
 * Wraps a parser with an interactive Inquirer.js prompt fallback.
@@ -119,7 +106,7 @@ function withAnnotatedInnerState(sourceState, innerState, run) {
 * that value is used directly. When no CLI value is found, an interactive
 * prompt is shown to the user.
 *
-* The returned parser always has `$mode: "async"` because Inquirer.js prompts
+* The returned parser always has `mode: "async"` because Inquirer.js prompts
 * are inherently asynchronous.
 *
 * Example:
@@ -150,7 +137,7 @@ function prompt(parser, config) {
 	const cfg = config;
 	function shouldAttemptInnerCompletion(cliState, state) {
 		if (cliState == null) return false;
-		const cliStateHasAnnotations = typeof cliState === "object" && __optique_core_annotations.annotationKey in cliState;
+		const cliStateHasAnnotations = (0, __optique_core_annotations.getAnnotations)(cliState) != null;
 		if (cliStateHasAnnotations) return true;
 		if ((0, __optique_core_annotations.getAnnotations)(state) == null || typeof cliState !== "object") return false;
 		if ("hasCliValue" in cliState) return true;
@@ -162,9 +149,9 @@ function prompt(parser, config) {
 		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]);
+		const cliStateIsInjectedAnnotationWrapper = cliState != null && typeof cliState === "object" && (0, __optique_core_extension.unwrapInjectedAnnotationState)(cliState) !== cliState;
+		const requiresSourceBindingForAnnotationWrapper = (0, __optique_core_extension.getTraits)(parser).requiresSourceBinding === true;
+		const hasNestedSourceBinding = hasSourceBindingMarker(cliState) || Array.isArray(cliState) && cliState.length === 1 && (hasSourceBindingMarker(cliState[0]) || cliState[0] != null && typeof cliState[0] === "object" && (0, __optique_core_annotations.getAnnotations)(cliState[0]) != null);
 		if (cliStateIsInjectedAnnotationWrapper && requiresSourceBindingForAnnotationWrapper) return hasNestedSourceBinding;
 		return shouldAttemptInnerCompletion(cliState, state) || hasNestedSourceBinding;
 	}
@@ -301,11 +288,10 @@ function prompt(parser, config) {
 		return validatePromptedValue(result);
 	}
 	const promptedParser = {
-		$mode: "async",
+		mode: "async",
 		$valueType: parser.$valueType,
 		$stateType: parser.$stateType,
 		priority: parser.priority,
-		[__optique_core_parser.inheritParentAnnotationsKey]: true,
 		usage: parser.usage.length === 1 && parser.usage[0].type === "optional" ? parser.usage : [{
 			type: "optional",
 			terms: parser.usage
@@ -314,7 +300,7 @@ function prompt(parser, config) {
 		acceptingAnyToken: parser.acceptingAnyToken,
 		getSuggestRuntimeNodes(state, path) {
 			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");
+			return (0, __optique_core_extension.delegateSuggestNodes)(parser, promptedParser, state, path, innerState, "prepend");
 		},
 		initialState: {
 			[promptBindStateKey]: true,
@@ -327,17 +313,16 @@ function prompt(parser, config) {
 				...context,
 				state: innerState
 			} : context;
-			const effectiveInnerState = annotations != null && innerState == null && Reflect.get(parser, __optique_core_parser.inheritParentAnnotationsKey) === true ? (0, __optique_core_annotations.injectAnnotations)(innerState, annotations) : innerState;
+			const effectiveInnerState = annotations != null && innerState == null && (0, __optique_core_extension.getTraits)(parser).inheritsAnnotations === true ? (0, __optique_core_extension.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 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_extension.injectAnnotations)(result$1.next.state, annotations) : result$1.next.state;
 					const cliConsumed = result$1.consumed.length > 0;
-					const nextState$1 = {
+					const nextState$1 = (0, __optique_core_extension.injectAnnotations)({
 						[promptBindStateKey]: true,
 						hasCliValue: cliConsumed,
-						cliState,
-						...annotations != null ? { [__optique_core_annotations.annotationKey]: annotations } : {}
-					};
+						cliState
+					}, annotations);
 					return {
 						success: true,
 						...result$1.provisional ? { provisional: true } : {},
@@ -349,11 +334,10 @@ function prompt(parser, config) {
 					};
 				}
 				if (result$1.consumed > 0) return result$1;
-				const nextState = {
+				const nextState = (0, __optique_core_extension.injectAnnotations)({
 					[promptBindStateKey]: true,
-					hasCliValue: false,
-					...annotations != null ? { [__optique_core_annotations.annotationKey]: annotations } : {}
-				};
+					hasCliValue: false
+				}, annotations);
 				return {
 					success: true,
 					next: {
@@ -383,7 +367,7 @@ function prompt(parser, config) {
 			const annotations = (0, __optique_core_annotations.getAnnotations)(state);
 			const innerInitialState = parser.initialState;
 			const shouldInheritInitialStateAnnotations = annotations != null && (innerInitialState == null || typeof innerInitialState === "object");
-			const effectiveInitialState = shouldInheritInitialStateAnnotations ? (0, __optique_core_annotations.inheritAnnotations)(state, innerInitialState) : innerInitialState;
+			const effectiveInitialState = shouldInheritInitialStateAnnotations ? (0, __optique_core_extension.inheritAnnotations)(state, innerInitialState) : innerInitialState;
 			const readPlaceholder = () => {
 				try {
 					return "placeholder" in parser ? parser.placeholder : void 0;
@@ -404,7 +388,7 @@ function prompt(parser, config) {
 			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 cliStateIsInjected = cliState != null && typeof cliState === "object" && (0, __optique_core_extension.unwrapInjectedAnnotationState)(cliState) !== cliState;
 				const isSourceBinding = shouldCompleteFromSourceBinding(cliState, state);
 				if (!isSourceBinding) return finalizePrompt();
 				const completeState = parseResult.success ? parseResult.next.state : effectiveInitialState;
@@ -453,7 +437,7 @@ function prompt(parser, config) {
 			return parser.getDocFragments(state, defaultValue);
 		}
 	};
-	(0, __optique_core_parser.defineInheritedAnnotationParser)(promptedParser);
+	(0, __optique_core_extension.defineTraits)(promptedParser, { inheritsAnnotations: true });
 	if ("placeholder" in parser) Object.defineProperty(promptedParser, "placeholder", {
 		get() {
 			try {
@@ -470,7 +454,7 @@ function prompt(parser, config) {
 		configurable: true,
 		enumerable: false
 	});
-	const dependencyMetadata = (0, __optique_core_parser.composeWrappedSourceMetadata)(parser.dependencyMetadata, (source) => ({
+	const dependencyMetadata = (0, __optique_core_extension.mapSourceMetadata)(parser, (source) => ({
 		...source,
 		extractSourceValue: (state) => {
 			if (!isPromptBindState(state)) return source.extractSourceValue(state);

package/dist/index.d.cts

@@ -328,7 +328,7 @@ type BasePromptConfig<T> = T extends boolean ? ConfirmConfig : T extends number
  * that value is used directly. When no CLI value is found, an interactive
  * prompt is shown to the user.
  *
- * The returned parser always has `$mode: "async"` because Inquirer.js prompts
+ * The returned parser always has `mode: "async"` because Inquirer.js prompts
  * are inherently asynchronous.
  *
  * Example:

package/dist/index.d.ts

@@ -328,7 +328,7 @@ type BasePromptConfig<T> = T extends boolean ? ConfirmConfig : T extends number
  * that value is used directly. When no CLI value is found, an interactive
  * prompt is shown to the user.
  *
- * The returned parser always has `$mode: "async"` because Inquirer.js prompts
+ * The returned parser always has `mode: "async"` because Inquirer.js prompts
  * are inherently asynchronous.
  *
  * Example:

package/dist/index.js

@@ -1,6 +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 { getAnnotations } from "@optique/core/annotations";
+import { defineTraits, delegateSuggestNodes, getTraits, inheritAnnotations, injectAnnotations, mapSourceMetadata, unwrapInjectedAnnotationState, withAnnotationView } from "@optique/core/extension";
 import { message } from "@optique/core/message";
 
 //#region src/index.ts
@@ -69,25 +69,12 @@ function deferredPromptResult(placeholderValue) {
 		deferredKeys: keys
 	};
 }
-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);
+	if (annotations == null || innerState == null || typeof innerState !== "object" || getAnnotations(innerState) != null) return run(innerState);
 	const inheritedState = inheritAnnotations(sourceState, innerState);
 	if (inheritedState !== innerState) return run(inheritedState);
-	return withAnnotationView(innerState, annotations, (annotatedState) => run(annotatedState));
+	return run(withAnnotationView(innerState, annotations));
 }
 /**
 * Wraps a parser with an interactive Inquirer.js prompt fallback.
@@ -96,7 +83,7 @@ function withAnnotatedInnerState(sourceState, innerState, run) {
 * that value is used directly. When no CLI value is found, an interactive
 * prompt is shown to the user.
 *
-* The returned parser always has `$mode: "async"` because Inquirer.js prompts
+* The returned parser always has `mode: "async"` because Inquirer.js prompts
 * are inherently asynchronous.
 *
 * Example:
@@ -127,7 +114,7 @@ function prompt(parser, config) {
 	const cfg = config;
 	function shouldAttemptInnerCompletion(cliState, state) {
 		if (cliState == null) return false;
-		const cliStateHasAnnotations = typeof cliState === "object" && annotationKey in cliState;
+		const cliStateHasAnnotations = getAnnotations(cliState) != null;
 		if (cliStateHasAnnotations) return true;
 		if (getAnnotations(state) == null || typeof cliState !== "object") return false;
 		if ("hasCliValue" in cliState) return true;
@@ -139,9 +126,9 @@ function prompt(parser, config) {
 		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]);
+		const cliStateIsInjectedAnnotationWrapper = cliState != null && typeof cliState === "object" && unwrapInjectedAnnotationState(cliState) !== cliState;
+		const requiresSourceBindingForAnnotationWrapper = getTraits(parser).requiresSourceBinding === true;
+		const hasNestedSourceBinding = hasSourceBindingMarker(cliState) || Array.isArray(cliState) && cliState.length === 1 && (hasSourceBindingMarker(cliState[0]) || cliState[0] != null && typeof cliState[0] === "object" && getAnnotations(cliState[0]) != null);
 		if (cliStateIsInjectedAnnotationWrapper && requiresSourceBindingForAnnotationWrapper) return hasNestedSourceBinding;
 		return shouldAttemptInnerCompletion(cliState, state) || hasNestedSourceBinding;
 	}
@@ -278,11 +265,10 @@ function prompt(parser, config) {
 		return validatePromptedValue(result);
 	}
 	const promptedParser = {
-		$mode: "async",
+		mode: "async",
 		$valueType: parser.$valueType,
 		$stateType: parser.$stateType,
 		priority: parser.priority,
-		[inheritParentAnnotationsKey]: true,
 		usage: parser.usage.length === 1 && parser.usage[0].type === "optional" ? parser.usage : [{
 			type: "optional",
 			terms: parser.usage
@@ -291,7 +277,7 @@ function prompt(parser, config) {
 		acceptingAnyToken: parser.acceptingAnyToken,
 		getSuggestRuntimeNodes(state, path) {
 			const innerState = isPromptBindState(state) ? state.cliState === void 0 ? parser.initialState : state.cliState : state;
-			return getDelegatingSuggestRuntimeNodes(parser, promptedParser, state, path, innerState, "prepend");
+			return delegateSuggestNodes(parser, promptedParser, state, path, innerState, "prepend");
 		},
 		initialState: {
 			[promptBindStateKey]: true,
@@ -304,17 +290,16 @@ function prompt(parser, config) {
 				...context,
 				state: innerState
 			} : context;
-			const effectiveInnerState = annotations != null && innerState == null && Reflect.get(parser, inheritParentAnnotationsKey) === true ? injectAnnotations(innerState, annotations) : innerState;
+			const effectiveInnerState = annotations != null && innerState == null && getTraits(parser).inheritsAnnotations === 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 = {
+					const nextState$1 = injectAnnotations({
 						[promptBindStateKey]: true,
 						hasCliValue: cliConsumed,
-						cliState,
-						...annotations != null ? { [annotationKey]: annotations } : {}
-					};
+						cliState
+					}, annotations);
 					return {
 						success: true,
 						...result$1.provisional ? { provisional: true } : {},
@@ -326,11 +311,10 @@ function prompt(parser, config) {
 					};
 				}
 				if (result$1.consumed > 0) return result$1;
-				const nextState = {
+				const nextState = injectAnnotations({
 					[promptBindStateKey]: true,
-					hasCliValue: false,
-					...annotations != null ? { [annotationKey]: annotations } : {}
-				};
+					hasCliValue: false
+				}, annotations);
 				return {
 					success: true,
 					next: {
@@ -381,7 +365,7 @@ function prompt(parser, config) {
 			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 cliStateIsInjected = cliState != null && typeof cliState === "object" && unwrapInjectedAnnotationState(cliState) !== cliState;
 				const isSourceBinding = shouldCompleteFromSourceBinding(cliState, state);
 				if (!isSourceBinding) return finalizePrompt();
 				const completeState = parseResult.success ? parseResult.next.state : effectiveInitialState;
@@ -430,7 +414,7 @@ function prompt(parser, config) {
 			return parser.getDocFragments(state, defaultValue);
 		}
 	};
-	defineInheritedAnnotationParser(promptedParser);
+	defineTraits(promptedParser, { inheritsAnnotations: true });
 	if ("placeholder" in parser) Object.defineProperty(promptedParser, "placeholder", {
 		get() {
 			try {
@@ -447,7 +431,7 @@ function prompt(parser, config) {
 		configurable: true,
 		enumerable: false
 	});
-	const dependencyMetadata = composeWrappedSourceMetadata(parser.dependencyMetadata, (source) => ({
+	const dependencyMetadata = mapSourceMetadata(parser, (source) => ({
 		...source,
 		extractSourceValue: (state) => {
 			if (!isPromptBindState(state)) return source.extractSourceValue(state);

package/package.json

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