@tyyyho/treg 0.1.19 → 0.1.21

package/README.zh-hant.md

@@ -29,12 +29,12 @@ npx @tyyyho/treg init
 執行 `init` 後，`treg` 會依序詢問：
 
 1. 套件管理器（`pnpm|npm|yarn|bun`）
-2. 要加入的功能（預設勾選 `all`）
+2. 要加入的功能（可複選，預設全勾）
 3. 測試工具（僅在選到 `test` 時詢問，支援 `skip`）
 4. Formatter（僅在選到 `format` 時詢問）
 5. AI 工具（`Claude|Codex|Gemini` 可複選，僅在選到 AI skill guidance 時詢問）
 
-預設 `all` 內容：
+預設勾選功能：
 
 - lint
 - format

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

@@ -1,5 +1,4 @@
 import { stdin as input, stdout as output } from "node:process";
-import { createInterface } from "node:readline/promises";
 const DEFAULT_AI_TOOLS = ["claude", "codex", "gemini"];
 const PACKAGE_MANAGER_CHOICES = [
     { value: "pnpm", label: "pnpm" },
@@ -22,10 +21,6 @@ const AI_TOOL_CHOICES = [
     { value: "gemini", label: "Gemini" },
 ];
 const FEATURE_CHOICES = [
-    {
-        value: "all",
-        label: "all (lint, format, TypeScript, test, husky, AI skill guidance)",
-    },
     { value: "lint", label: "lint" },
     { value: "format", label: "format" },
     { value: "typescript", label: "TypeScript" },
@@ -33,85 +28,8 @@ const FEATURE_CHOICES = [
     { value: "husky", label: "husky" },
     { value: "skills", label: "AI skill guidance" },
 ];
-function formatChoices(choices) {
-    return choices
-        .map((choice, index) => `  ${index + 1}. ${choice.label}`)
-        .join("\n");
-}
-function parseSingleChoice(rawInput, choices, defaultValue) {
-    const normalized = rawInput.trim().toLowerCase();
-    if (!normalized) {
-        return { ok: true, value: defaultValue };
-    }
-    const byIndex = Number.parseInt(normalized, 10);
-    if (!Number.isNaN(byIndex) && String(byIndex) === normalized) {
-        const selected = choices[byIndex - 1];
-        if (selected) {
-            return { ok: true, value: selected.value };
-        }
-    }
-    const byValue = choices.find(choice => choice.value === normalized);
-    if (byValue) {
-        return { ok: true, value: byValue.value };
-    }
-    return {
-        ok: false,
-        error: `Invalid input: ${rawInput}. Please enter a listed number or option name.`,
-    };
-}
-function parseMultiChoice(rawInput, choices, defaultValues) {
-    const normalized = rawInput.trim().toLowerCase();
-    if (!normalized) {
-        return { ok: true, value: [...defaultValues] };
-    }
-    if (normalized === "skip" || normalized === "none") {
-        return { ok: true, value: [] };
-    }
-    const tokens = normalized
-        .split(",")
-        .map(item => item.trim())
-        .filter(Boolean);
-    if (tokens.length === 0) {
-        return { ok: false, error: "Please enter at least one option." };
-    }
-    const selected = new Set();
-    for (const token of tokens) {
-        const byIndex = Number.parseInt(token, 10);
-        if (!Number.isNaN(byIndex) && String(byIndex) === token) {
-            const item = choices[byIndex - 1];
-            if (!item) {
-                return {
-                    ok: false,
-                    error: `Invalid index: ${token}. Please choose from listed options.`,
-                };
-            }
-            selected.add(item.value);
-            continue;
-        }
-        const byValue = choices.find(choice => choice.value === token);
-        if (!byValue) {
-            return {
-                ok: false,
-                error: `Invalid option: ${token}. Please choose from listed options.`,
-            };
-        }
-        selected.add(byValue.value);
-    }
-    return { ok: true, value: [...selected] };
-}
+let promptsModulePromise = null;
 function toFeatureSelection(selected) {
-    if (selected.includes("all")) {
-        return {
-            enabledFeatures: {
-                lint: true,
-                format: true,
-                typescript: true,
-                test: true,
-                husky: true,
-            },
-            skills: true,
-        };
-    }
     return {
         enabledFeatures: {
             lint: selected.includes("lint"),
@@ -123,15 +41,41 @@ function toFeatureSelection(selected) {
         skills: selected.includes("skills"),
     };
 }
-async function askUntilValid(ask, prompt, parser) {
-    while (true) {
-        const raw = await ask(prompt);
-        const parsed = parser(raw);
-        if (parsed.ok && parsed.value !== undefined) {
-            return parsed.value;
-        }
-        console.log(parsed.error ?? "Invalid input");
+function mapChoiceOptions(choices) {
+    return choices.map(choice => ({ value: choice, label: choice.label }));
+}
+function unwrapPromptResult(value, prompts) {
+    if (prompts.isCancel(value)) {
+        prompts.cancel("Prompt cancelled by user");
+        throw new Error("Prompt cancelled by user");
+    }
+    return value;
+}
+async function getPrompts() {
+    if (!promptsModulePromise) {
+        promptsModulePromise = import("@clack/prompts");
     }
+    return promptsModulePromise;
+}
+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;
+}
+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) {
@@ -151,71 +95,52 @@ export async function collectInitPrompts(defaults) {
             aiTools: [...DEFAULT_AI_TOOLS],
         };
     }
-    const rl = createInterface({ input, output });
-    try {
-        console.log("\nInit setup");
-        console.log("\n1) Package manager");
-        console.log(formatChoices(PACKAGE_MANAGER_CHOICES));
-        const pm = await askUntilValid(rl.question.bind(rl), `Select package manager [default: ${defaults.pm}]: `, answer => parseSingleChoice(answer, PACKAGE_MANAGER_CHOICES, defaults.pm));
-        console.log("\n2) Features");
-        console.log(formatChoices(FEATURE_CHOICES));
-        const featureAnswers = await askUntilValid(rl.question.bind(rl), "Select features (comma-separated, default: all): ", answer => parseMultiChoice(answer, FEATURE_CHOICES, ["all"]));
-        const featureSelection = toFeatureSelection(featureAnswers);
-        let testRunner = defaults.testRunner;
-        const enabledFeatures = { ...featureSelection.enabledFeatures };
-        if (featureSelection.enabledFeatures.test) {
-            console.log("\n3) Test runner");
-            console.log(formatChoices(TEST_RUNNER_CHOICES));
-            const selectedTestRunner = await askUntilValid(rl.question.bind(rl), `Select test runner [default: ${defaults.testRunner}, or skip]: `, answer => parseSingleChoice(answer, TEST_RUNNER_CHOICES, defaults.testRunner));
-            if (selectedTestRunner === "skip") {
-                enabledFeatures.test = false;
-                console.log("Test feature disabled by selection: skip");
-            }
-            else {
-                testRunner = selectedTestRunner;
-            }
+    console.log("\nInit setup");
+    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) {
+        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");
         }
         else {
-            console.log("\n3) Test runner skipped (test feature not selected)");
-        }
-        let formatter = defaults.formatter;
-        if (featureSelection.enabledFeatures.format) {
-            console.log("\n4) Formatter");
-            console.log(formatChoices(FORMATTER_CHOICES));
-            formatter = await askUntilValid(rl.question.bind(rl), `Select formatter [default: ${defaults.formatter}]: `, answer => parseSingleChoice(answer, FORMATTER_CHOICES, defaults.formatter));
+            testRunner = selectedTestRunner;
         }
-        else {
-            console.log("\n4) Formatter skipped (format feature not selected)");
-        }
-        let aiTools = [];
-        let skills = featureSelection.skills;
-        if (skills) {
-            console.log("\n5) AI tools");
-            console.log(formatChoices(AI_TOOL_CHOICES));
-            console.log("Type 'skip' to disable AI skill guidance.");
-            aiTools = await askUntilValid(rl.question.bind(rl), "Select AI tools (comma-separated, default: all): ", answer => parseMultiChoice(answer, AI_TOOL_CHOICES, DEFAULT_AI_TOOLS));
-            if (aiTools.length === 0) {
-                skills = false;
-            }
-        }
-        else {
-            console.log("\n5) AI tools skipped (AI skill guidance not selected)");
+    }
+    else {
+        console.log("3) Test runner skipped (test feature not selected)");
+    }
+    let formatter = defaults.formatter;
+    if (featureSelection.enabledFeatures.format) {
+        formatter = await promptSingleChoice("4) Formatter", FORMATTER_CHOICES, defaults.formatter);
+    }
+    else {
+        console.log("4) Formatter skipped (format feature not selected)");
+    }
+    let aiTools = [];
+    let skills = featureSelection.skills;
+    if (skills) {
+        aiTools = await promptMultiChoice("5) AI tools", AI_TOOL_CHOICES, DEFAULT_AI_TOOLS);
+        if (aiTools.length === 0) {
+            skills = false;
         }
-        return {
-            pm,
-            formatter,
-            testRunner,
-            enabledFeatures,
-            skills,
-            aiTools,
-        };
     }
-    finally {
-        rl.close();
+    else {
+        console.log("5) AI tools skipped (AI skill guidance not selected)");
     }
+    return {
+        pm,
+        formatter,
+        testRunner,
+        enabledFeatures,
+        skills,
+        aiTools,
+    };
 }
 export const __testables__ = {
-    parseSingleChoice,
-    parseMultiChoice,
     toFeatureSelection,
 };

package/dist/init-project/mrm-rules/ai-skills.js

@@ -1,8 +1,6 @@
 import { existsSync } from "node:fs";
 import { promises as fs } from "node:fs";
 import path from "node:path";
-const START_MARKER = "<!-- treg:skills:start -->";
-const END_MARKER = "<!-- treg:skills:end -->";
 const SKILL_SECTION_HEADING = "## treg AI Skills";
 const SKILLS_BASE_DIR = "skills";
 const AI_TOOL_DOCS = {
@@ -155,12 +153,6 @@ function upsertSkillSection(content, nextSection) {
         const rebuilt = `${before}\n\n${nextSection.trim()}\n`;
         return after ? `${rebuilt}\n${after}\n` : `${rebuilt}`;
     };
-    const start = content.indexOf(START_MARKER);
-    const end = content.indexOf(END_MARKER);
-    if (start !== -1 && end !== -1 && end > start) {
-        const suffixStart = end + END_MARKER.length;
-        return replaceSection(start, suffixStart);
-    }
     const headingStart = content.indexOf(SKILL_SECTION_HEADING);
     if (headingStart !== -1) {
         const nextHeading = content.indexOf("\n## ", headingStart + 1);
@@ -172,10 +164,6 @@ function upsertSkillSection(content, nextSection) {
     }
     return `${content.trimEnd()}\n\n${nextSection.trim()}\n`;
 }
-function buildInitialAiDocContent(fileName) {
-    const baseName = path.basename(fileName, path.extname(fileName));
-    return `# ${baseName}\n`;
-}
 export async function runAiSkillsRule(context) {
     const { projectDir, dryRun, aiTools } = context;
     const targetFiles = resolveSkillsDocs(projectDir, aiTools);
@@ -189,9 +177,7 @@ export async function runAiSkillsRule(context) {
             continue;
         }
         const exists = existsSync(targetFile);
-        const current = exists
-            ? await fs.readFile(targetFile, "utf8")
-            : buildInitialAiDocContent(targetFile);
+        const current = exists ? await fs.readFile(targetFile, "utf8") : "";
         const updated = upsertSkillSection(current, section);
         if (updated !== current) {
             await fs.mkdir(path.dirname(targetFile), { recursive: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tyyyho/treg",
-  "version": "0.1.19",
+  "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": {