@tyyyho/treg 0.1.20 → 0.1.21

package/dist/init-project/init-prompts.js

@@ -1,5 +1,4 @@
 import { stdin as input, stdout as output } from "node:process";
-import { clearScreenDown, cursorTo, emitKeypressEvents, moveCursor as moveTerminalCursor, } from "node:readline";
 const DEFAULT_AI_TOOLS = ["claude", "codex", "gemini"];
 const PACKAGE_MANAGER_CHOICES = [
     { value: "pnpm", label: "pnpm" },
@@ -29,29 +28,7 @@ const FEATURE_CHOICES = [
     { value: "husky", label: "husky" },
     { value: "skills", label: "AI skill guidance" },
 ];
-function moveCursorIndex(currentIndex, delta, size) {
-    if (size <= 0) {
-        return 0;
-    }
-    return (currentIndex + delta + size) % size;
-}
-function toggleSelectedValue(selectedValues, value) {
-    const next = new Set(selectedValues);
-    if (next.has(value)) {
-        next.delete(value);
-        return next;
-    }
-    next.add(value);
-    return next;
-}
-function selectAllValues(choices) {
-    return new Set(choices.map(choice => choice.value));
-}
-function getSelectedValuesInOrder(choices, selectedValues) {
-    return choices
-        .filter(choice => selectedValues.has(choice.value))
-        .map(choice => choice.value);
-}
+let promptsModulePromise = null;
 function toFeatureSelection(selected) {
     return {
         enabledFeatures: {
@@ -64,171 +41,41 @@ function toFeatureSelection(selected) {
         skills: selected.includes("skills"),
     };
 }
-function renderFrame(lines, previousLineCount) {
-    if (previousLineCount > 0) {
-        moveTerminalCursor(output, 0, -previousLineCount);
-        cursorTo(output, 0);
-        clearScreenDown(output);
-    }
-    output.write(lines.join("\n"));
-    output.write("\n");
-    return lines.length;
+function mapChoiceOptions(choices) {
+    return choices.map(choice => ({ value: choice, label: choice.label }));
 }
-function isConfirmKey(key) {
-    return key.name === "return" || key.name === "enter";
+function unwrapPromptResult(value, prompts) {
+    if (prompts.isCancel(value)) {
+        prompts.cancel("Prompt cancelled by user");
+        throw new Error("Prompt cancelled by user");
+    }
+    return value;
 }
-function isSelectAllKey(key) {
-    return key.name === "a" && !key.ctrl && !key.meta;
+async function getPrompts() {
+    if (!promptsModulePromise) {
+        promptsModulePromise = import("@clack/prompts");
+    }
+    return promptsModulePromise;
 }
-function ensureRawMode() {
-    emitKeypressEvents(input);
-    input.setRawMode(true);
-    input.resume();
-    output.write("\x1b[?25l");
-    return () => {
-        input.setRawMode(false);
-        output.write("\x1b[?25h");
+async function promptSingleChoice(message, choices, defaultValue) {
+    const prompts = await getPrompts();
+    const defaultChoice = choices.find(choice => choice.value === defaultValue);
+    const options = {
+        message,
+        options: mapChoiceOptions(choices),
     };
+    const result = await prompts.select(defaultChoice ? { ...options, initialValue: defaultChoice } : options);
+    return unwrapPromptResult(result, prompts).value;
 }
-function buildSingleSelectLines(title, choices, highlightedIndex) {
-    return [
-        title,
-        ...choices.map((choice, index) => {
-            const cursor = index === highlightedIndex ? ">" : " ";
-            return `${cursor} ${choice.label}`;
-        }),
-        "Use up/down arrows to move, Enter to confirm.",
-    ];
-}
-function buildMultiSelectLines(title, choices, selectedValues, highlightedIndex, allowSelectAll) {
-    const controls = allowSelectAll
-        ? "Use up/down arrows to move, Space to toggle, A to select all, Enter to confirm."
-        : "Use up/down arrows to move, Space to toggle, Enter to confirm.";
-    return [
-        title,
-        ...choices.map((choice, index) => {
-            const cursor = index === highlightedIndex ? ">" : " ";
-            const mark = selectedValues.has(choice.value) ? "x" : " ";
-            return `${cursor} [${mark}] ${choice.label}`;
-        }),
-        controls,
-    ];
-}
-async function promptSingleChoice(title, choices, defaultValue) {
-    const defaultIndex = choices.findIndex(choice => choice.value === defaultValue);
-    let highlightedIndex = defaultIndex >= 0 ? defaultIndex : 0;
-    let renderedLineCount = 0;
-    const restore = ensureRawMode();
-    try {
-        renderedLineCount = renderFrame(buildSingleSelectLines(title, choices, highlightedIndex), renderedLineCount);
-        return await new Promise((resolve, reject) => {
-            let settled = false;
-            const onKeypress = (_, key) => {
-                if (key.ctrl && key.name === "c") {
-                    if (settled) {
-                        return;
-                    }
-                    settled = true;
-                    cleanup();
-                    reject(new Error("Prompt cancelled by user"));
-                    return;
-                }
-                if (key.name === "up") {
-                    highlightedIndex = moveCursorIndex(highlightedIndex, -1, choices.length);
-                    renderedLineCount = renderFrame(buildSingleSelectLines(title, choices, highlightedIndex), renderedLineCount);
-                    return;
-                }
-                if (key.name === "down") {
-                    highlightedIndex = moveCursorIndex(highlightedIndex, 1, choices.length);
-                    renderedLineCount = renderFrame(buildSingleSelectLines(title, choices, highlightedIndex), renderedLineCount);
-                    return;
-                }
-                if (isConfirmKey(key)) {
-                    const selected = choices[highlightedIndex];
-                    if (selected) {
-                        if (settled) {
-                            return;
-                        }
-                        settled = true;
-                        cleanup();
-                        resolve(selected.value);
-                    }
-                }
-            };
-            const cleanup = () => {
-                input.off("keypress", onKeypress);
-            };
-            input.on("keypress", onKeypress);
-        });
-    }
-    finally {
-        restore();
-        output.write("\n");
-    }
-}
-async function promptMultiChoice(title, choices, options) {
-    let highlightedIndex = 0;
-    let selectedValues = new Set(options.defaultValues);
-    let renderedLineCount = 0;
-    const allowSelectAll = options.allowSelectAll ?? false;
-    const restore = ensureRawMode();
-    try {
-        renderedLineCount = renderFrame(buildMultiSelectLines(title, choices, selectedValues, highlightedIndex, allowSelectAll), renderedLineCount);
-        return await new Promise((resolve, reject) => {
-            let settled = false;
-            const onKeypress = (_, key) => {
-                if (key.ctrl && key.name === "c") {
-                    if (settled) {
-                        return;
-                    }
-                    settled = true;
-                    cleanup();
-                    reject(new Error("Prompt cancelled by user"));
-                    return;
-                }
-                if (key.name === "up") {
-                    highlightedIndex = moveCursorIndex(highlightedIndex, -1, choices.length);
-                    renderedLineCount = renderFrame(buildMultiSelectLines(title, choices, selectedValues, highlightedIndex, allowSelectAll), renderedLineCount);
-                    return;
-                }
-                if (key.name === "down") {
-                    highlightedIndex = moveCursorIndex(highlightedIndex, 1, choices.length);
-                    renderedLineCount = renderFrame(buildMultiSelectLines(title, choices, selectedValues, highlightedIndex, allowSelectAll), renderedLineCount);
-                    return;
-                }
-                if (key.name === "space") {
-                    const highlighted = choices[highlightedIndex];
-                    if (!highlighted) {
-                        return;
-                    }
-                    selectedValues = toggleSelectedValue(selectedValues, highlighted.value);
-                    renderedLineCount = renderFrame(buildMultiSelectLines(title, choices, selectedValues, highlightedIndex, allowSelectAll), renderedLineCount);
-                    return;
-                }
-                if (allowSelectAll && isSelectAllKey(key)) {
-                    selectedValues = selectAllValues(choices);
-                    renderedLineCount = renderFrame(buildMultiSelectLines(title, choices, selectedValues, highlightedIndex, allowSelectAll), renderedLineCount);
-                    return;
-                }
-                if (isConfirmKey(key)) {
-                    if (settled) {
-                        return;
-                    }
-                    settled = true;
-                    cleanup();
-                    resolve(getSelectedValuesInOrder(choices, selectedValues));
-                }
-            };
-            const cleanup = () => {
-                input.off("keypress", onKeypress);
-            };
-            input.on("keypress", onKeypress);
-        });
-    }
-    finally {
-        restore();
-        output.write("\n");
-    }
+async function promptMultiChoice(message, choices, defaultValues) {
+    const prompts = await getPrompts();
+    const result = await prompts.multiselect({
+        message,
+        options: mapChoiceOptions(choices),
+        initialValues: choices.filter(choice => defaultValues.includes(choice.value)),
+        required: false,
+    });
+    return unwrapPromptResult(result, prompts).map(choice => choice.value);
 }
 export async function collectInitPrompts(defaults) {
     if (!input.isTTY || !output.isTTY) {
@@ -249,19 +96,13 @@ export async function collectInitPrompts(defaults) {
         };
     }
     console.log("\nInit setup");
-    console.log("\n1) Package manager");
-    const pm = await promptSingleChoice("Select package manager:", PACKAGE_MANAGER_CHOICES, defaults.pm);
-    console.log("\n2) Features");
-    const featureAnswers = await promptMultiChoice("Select features:", FEATURE_CHOICES, {
-        defaultValues: FEATURE_CHOICES.map(choice => choice.value),
-        allowSelectAll: true,
-    });
+    const pm = await promptSingleChoice("1) Package manager", PACKAGE_MANAGER_CHOICES, defaults.pm);
+    const featureAnswers = await promptMultiChoice("2) Features", FEATURE_CHOICES, FEATURE_CHOICES.map(choice => choice.value));
     const featureSelection = toFeatureSelection(featureAnswers);
     let testRunner = defaults.testRunner;
     const enabledFeatures = { ...featureSelection.enabledFeatures };
     if (featureSelection.enabledFeatures.test) {
-        console.log("\n3) Test runner");
-        const selectedTestRunner = await promptSingleChoice("Select test runner:", TEST_RUNNER_CHOICES, defaults.testRunner);
+        const selectedTestRunner = await promptSingleChoice("3) Test runner", TEST_RUNNER_CHOICES, defaults.testRunner);
         if (selectedTestRunner === "skip") {
             enabledFeatures.test = false;
             console.log("Test feature disabled by selection: skip");
@@ -271,30 +112,25 @@ export async function collectInitPrompts(defaults) {
         }
     }
     else {
-        console.log("\n3) Test runner skipped (test feature not selected)");
+        console.log("3) Test runner skipped (test feature not selected)");
     }
     let formatter = defaults.formatter;
     if (featureSelection.enabledFeatures.format) {
-        console.log("\n4) Formatter");
-        formatter = await promptSingleChoice("Select formatter:", FORMATTER_CHOICES, defaults.formatter);
+        formatter = await promptSingleChoice("4) Formatter", FORMATTER_CHOICES, defaults.formatter);
     }
     else {
-        console.log("\n4) Formatter skipped (format feature not selected)");
+        console.log("4) Formatter skipped (format feature not selected)");
     }
     let aiTools = [];
     let skills = featureSelection.skills;
     if (skills) {
-        console.log("\n5) AI tools");
-        aiTools = await promptMultiChoice("Select AI tools:", AI_TOOL_CHOICES, {
-            defaultValues: DEFAULT_AI_TOOLS,
-            allowSelectAll: true,
-        });
+        aiTools = await promptMultiChoice("5) AI tools", AI_TOOL_CHOICES, DEFAULT_AI_TOOLS);
         if (aiTools.length === 0) {
             skills = false;
         }
     }
     else {
-        console.log("\n5) AI tools skipped (AI skill guidance not selected)");
+        console.log("5) AI tools skipped (AI skill guidance not selected)");
     }
     return {
         pm,
@@ -306,9 +142,5 @@ export async function collectInitPrompts(defaults) {
     };
 }
 export const __testables__ = {
-    moveCursorIndex,
-    toggleSelectedValue,
-    selectAllValues,
-    getSelectedValuesInOrder,
     toFeatureSelection,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tyyyho/treg",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "CLI tool for initializing development conventions in existing projects.",
   "license": "MIT",
   "repository": {
@@ -34,6 +34,7 @@
     "prepublishOnly": "pnpm format:check && pnpm lint:check && pnpm type:check && pnpm test && pnpm build"
   },
   "dependencies": {
+    "@clack/prompts": "^1.1.0",
     "mrm-core": "^7.1.22"
   },
   "devDependencies": {