@henryqw/pi-ask-question 0.1.7 → 0.1.9

package/README.md

@@ -41,7 +41,6 @@ pi remove npm:@henryqw/pi-ask-question
 ## Development
 
 ```bash
-npm test --workspace @henryqw/pi-ask-question
 npm run typecheck --workspace @henryqw/pi-ask-question
 npm run pack:check --workspace @henryqw/pi-ask-question
 ```

package/extensions/ask-question.ts

@@ -3,6 +3,7 @@ import {
 	Editor,
 	type EditorTheme,
 	Key,
+	type KeyId,
 	matchesKey,
 	Text,
 	visibleWidth,
@@ -18,7 +19,9 @@ interface QuestionOption {
 type DisplayOption = QuestionOption & { isOther?: boolean };
 
 const CUSTOM_OPTION_LABEL = "Something else.";
-const NUMBER_KEYS = ["1", "2", "3", "4"] as const;
+// Models are told to omit "(Recommended)" from labels but don't always comply; normalize instead of duplicating.
+const RECOMMENDED_SUFFIX = /\s*\(recommended\)\s*$/i;
+const withRecommended = (label: string): string => `${label.replace(RECOMMENDED_SUFFIX, "")} (Recommended)`;
 
 interface QuestionDetails {
 	question: string;
@@ -72,8 +75,7 @@ export default function askQuestionExtension(pi: ExtensionAPI): void {
 				};
 			}
 			let validationError: string | undefined;
-			if (suppliedOptions.length < 1 || suppliedOptions.length > 3) validationError = "1 to 3 options required";
-			else if (!question) validationError = "Question must not be blank";
+			if (!question) validationError = "Question must not be blank";
 			else if (suppliedOptions.some((option) => !option.label)) validationError = "Option labels must not be blank";
 			else if (new Set(options.map((option) => option.toLowerCase())).size !== options.length) validationError = "Option labels must be unique";
 			else if (options.some((option) => option.toLowerCase() === CUSTOM_OPTION_LABEL.toLowerCase())) validationError = `Option label "${CUSTOM_OPTION_LABEL}" is reserved`;
@@ -136,7 +138,7 @@ export default function askQuestionExtension(pi: ExtensionAPI): void {
 							return;
 						}
 
-						const numberIndex = NUMBER_KEYS.findIndex((key, index) => index < allOptions.length && matchesKey(data, key));
+						const numberIndex = allOptions.findIndex((_, index) => matchesKey(data, `${index + 1}` as KeyId));
 						if (numberIndex >= 0) {
 							optionIndex = numberIndex;
 							selectOption();
@@ -154,11 +156,10 @@ export default function askQuestionExtension(pi: ExtensionAPI): void {
 						if (cachedLines) return cachedLines;
 						const lines: string[] = [];
 						const renderWidth = Math.max(1, width);
-						const addWrapped = (text: string): void => { lines.push(...wrapTextWithAnsi(text, renderWidth)); };
 						const addWrappedWithPrefix = (prefix: string, text: string): void => {
 							const prefixWidth = visibleWidth(prefix);
 							if (prefixWidth >= renderWidth) {
-								addWrapped(prefix + text);
+								lines.push(...wrapTextWithAnsi(prefix + text, renderWidth));
 								return;
 							}
 							const wrapped = wrapTextWithAnsi(text, renderWidth - prefixWidth);
@@ -175,7 +176,7 @@ export default function askQuestionExtension(pi: ExtensionAPI): void {
 							const option = allOptions[index]!;
 							const selected = index === optionIndex;
 							const prefix = selected ? theme.fg("accent", "> ") : "  ";
-							const label = `${index + 1}. ${option.label}${index === 0 ? " (Recommended)" : ""}${option.isOther && editMode ? " ✎" : ""}`;
+							const label = `${index + 1}. ${index === 0 ? withRecommended(option.label) : option.label}${option.isOther && editMode ? " ✎" : ""}`;
 							addWrappedWithPrefix(prefix, theme.fg(selected || (option.isOther && editMode) ? "accent" : "text", label));
 							if (option.description) addWrappedWithPrefix("     ", theme.fg("muted", option.description));
 						}
@@ -230,7 +231,7 @@ export default function askQuestionExtension(pi: ExtensionAPI): void {
 			const options = Array.isArray(args.options) ? args.options : [];
 			if (options.length) {
 				const labels = options.map((option: QuestionOption) => option.label);
-				const numbered = [...labels, CUSTOM_OPTION_LABEL].map((option, index) => `${index + 1}. ${option}${index === 0 ? " (Recommended)" : ""}`);
+				const numbered = [...labels, CUSTOM_OPTION_LABEL].map((option, index) => `${index + 1}. ${index === 0 ? withRecommended(option) : option}`);
 				text += `\n${theme.fg("dim", `  Options: ${numbered.join(", ")}`)}`;
 			}
 			return new Text(text, 0, 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-ask-question",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Ask Pi users one interactive question with choices or a custom answer.",
   "keywords": [
     "pi-package",
@@ -19,7 +19,6 @@
     "LICENSE"
   ],
   "scripts": {
-    "test": "node --test test/*.test.ts",
     "test:manual": "pi --no-extensions -e ./extensions/ask-question.ts --tools ask_question --no-session \"We need storage for a small team app. Before making changes, ask me to choose storage.\"",
     "typecheck": "tsc --noEmit --allowImportingTsExtensions --target ES2022 --module NodeNext --moduleResolution NodeNext --skipLibCheck extensions/ask-question.ts",
     "pack:check": "npm pack --dry-run"