@tsed/cli-prompts 7.0.0-beta.11 → 7.0.0-beta.12

package/lib/esm/PromptRunner.js

@@ -1,5 +1,7 @@
 import { injectable } from "@tsed/di";
 import * as fn from "./fn/index.js";
+import { applyTransforms } from "./utils/applyTransforms.js";
+import { ensureNotCancelled } from "./utils/ensureNotCancelled.js";
 import { normalizeQuestion } from "./utils/normalizeQuestion.js";
 import { shouldAsk } from "./utils/shouldAsk.js";
 export class PromptRunner {
@@ -23,7 +25,9 @@ export class PromptRunner {
         if (!fn[type]) {
             throw new Error(`Unsupported prompt type: ${type}`);
         }
-        return fn[type](question, answers);
+        const result = await fn[type](question, answers);
+        const value = ensureNotCancelled(result);
+        return applyTransforms(question, answers, value);
     }
 }
 injectable(PromptRunner);

package/lib/esm/fn/autocomplete.js

@@ -1,60 +1,16 @@
-import { select, text } from "@clack/prompts";
-import { ensureNotCancelled } from "../utils/ensureNotCancelled.js";
+import { autocomplete as a } from "@clack/prompts";
 import { normalizeChoices } from "../utils/normalizeChoices.js";
-import { CONTINUE, processPrompt } from "../utils/processPrompt.js";
-import { resolveListDefault } from "../utils/resolveListDefault.js";
-const SEARCH_ACTION = "__tsed_cli_search_again__";
 export async function autocomplete(question, answers) {
-    if (!question.source) {
+    if (!(question.source || question.choices)) {
         throw new Error(`Question "${question.name}" must provide a source for autocomplete prompts.`);
     }
-    let keyword = "";
-    let choices = await resolveAutocompleteChoices(question.source, answers, keyword);
-    async function display() {
-        keyword = await promptKeyword(question.message, keyword, true);
-        choices = await resolveAutocompleteChoices(question.source, answers, keyword);
-    }
-    return processPrompt(question, answers, async () => {
-        if (!choices.length) {
-            await display();
-            return CONTINUE;
-        }
-        const selection = await select({
-            message: buildAutocompleteMessage(question.message, keyword),
-            options: [
-                ...choices.map((choice) => ({
-                    label: choice.label,
-                    value: choice.value,
-                    hint: choice.hint
-                })),
-                {
-                    label: "🔍 Search again",
-                    value: SEARCH_ACTION,
-                    hint: "Type another keyword"
-                }
-            ],
-            initialValue: resolveListDefault(question, choices),
-            maxItems: question.pageSize
-        });
-        if (selection === SEARCH_ACTION) {
-            await display();
-            return CONTINUE;
-        }
-        return selection;
+    const choices = question.choices ? question.choices : question.source ? normalizeChoices(await question.source(answers)) : [];
+    return a({
+        ...question,
+        options: choices.map((choice) => ({
+            label: choice.label,
+            value: choice.value,
+            hint: choice.hint
+        }))
     });
 }
-async function resolveAutocompleteChoices(source, answers, keyword) {
-    const items = await source(answers, keyword);
-    return normalizeChoices(items);
-}
-async function promptKeyword(message, keyword, emptyState) {
-    const label = emptyState ? `${message} (no matches, type to search)` : `${message} (type to refine search)`;
-    const result = await text({
-        message: label,
-        initialValue: keyword
-    });
-    return ensureNotCancelled(result).trim();
-}
-function buildAutocompleteMessage(message, keyword) {
-    return keyword ? `${message} (filter: ${keyword})` : message;
-}

package/lib/esm/fn/checkbox.js

@@ -1,20 +1,19 @@
 import { multiselect } from "@clack/prompts";
-import { isArray } from "@tsed/core/utils/isArray";
-import { processPrompt } from "../utils/processPrompt.js";
-export async function checkbox(question, answers) {
+import { isArray } from "@tsed/core/utils/isArray.js";
+export async function checkbox(question) {
     if (!question.choices?.length) {
         throw new Error(`Question "${question.name}" does not provide any choices`);
     }
     const initialValues = resolveCheckboxDefaults(question, question.choices);
-    return processPrompt(question, answers, () => multiselect({
-        message: question.message,
+    return multiselect({
+        ...question,
         options: question.choices.map((choice) => ({
             label: choice.label,
             value: choice.value,
             hint: choice.hint
         })),
         initialValues
-    }));
+    });
 }
 function resolveCheckboxDefaults(question, choices) {
     if (isArray(question.default)) {

package/lib/esm/fn/confirm.js

@@ -1,10 +1,8 @@
 import { confirm as c } from "@clack/prompts";
 import { isBoolean } from "@tsed/core/utils/isBoolean.js";
-import { processPrompt } from "../utils/processPrompt.js";
-export async function confirm(question, answers) {
-    const initialValue = isBoolean(question.default) ? question.default : undefined;
-    return processPrompt(question, answers, () => c({
-        message: question.message,
-        initialValue
-    }));
+export async function confirm(question) {
+    return c({
+        ...question,
+        initialValue: isBoolean(question.default) ? question.default : undefined
+    });
 }

package/lib/esm/fn/input.js

@@ -1,8 +1,7 @@
 import { text } from "@clack/prompts";
-import { processPrompt } from "../utils/processPrompt.js";
-export async function input(question, answers) {
-    return processPrompt(question, answers, () => text({
-        message: question.message,
+export async function input(question) {
+    return text({
+        ...question,
         initialValue: String(question.default ?? "")
-    }));
+    });
 }

package/lib/esm/fn/list.js

@@ -1,18 +1,16 @@
 import { select } from "@clack/prompts";
-import { processPrompt } from "../utils/processPrompt.js";
 import { resolveListDefault } from "../utils/resolveListDefault.js";
-export async function list(question, answers) {
+export async function list(question) {
     if (!question.choices?.length) {
         throw new Error(`Question "${question.name}" does not provide any choices`);
     }
-    return processPrompt(question, answers, () => select({
-        message: question.message,
+    return select({
+        ...question,
         options: question.choices.map((choice) => ({
             label: choice.label,
             value: choice.value,
             hint: choice.hint
         })),
-        initialValue: resolveListDefault(question, question.choices),
-        maxItems: question.pageSize
-    }));
+        initialValue: resolveListDefault(question, question.choices)
+    });
 }

package/lib/esm/fn/password.js

@@ -1,8 +1,4 @@
 import { password as clackPassword } from "@clack/prompts";
-import { processPrompt } from "../utils/processPrompt.js";
-export async function password(question, answers) {
-    return processPrompt(question, answers, () => clackPassword({
-        message: question.message,
-        mask: question.mask === false ? undefined : String(question.mask || "•")
-    }));
+export async function password(question) {
+    return clackPassword(question);
 }

package/lib/esm/utils/normalizeChoices.js

@@ -1,9 +1,9 @@
 export function normalizeChoices(inputs = []) {
     return inputs.map((choice) => {
         if (typeof choice === "object" && choice !== null && "value" in choice) {
-            const resolvedValue = choice.value ?? choice.name;
+            const resolvedValue = choice.value ?? choice.name ?? choice.label;
             return {
-                label: choice.name ?? String(resolvedValue ?? ""),
+                label: choice.label ?? choice.name ?? String(resolvedValue ?? ""),
                 value: resolvedValue,
                 hint: choice.short,
                 checked: choice.checked

package/lib/esm/utils/normalizeQuestion.js

@@ -13,11 +13,5 @@ export async function normalizeQuestion(question, answers) {
     if ("choices" in question && question.choices?.length) {
         normalized.choices = normalizeChoices([...question.choices]);
     }
-    if ("source" in question && question.source) {
-        const source = question.source;
-        normalized.source = (state, keyword) => {
-            return source({ ...answers, ...state }, keyword);
-        };
-    }
     return normalized;
 }