create-for-yeyu 2.1.0 → 3.0.1

package/dist/index.js

@@ -2,10 +2,10 @@
 
 // src/cli.ts
 import { Command } from "commander";
-import chalk2 from "chalk";
+import chalk3 from "chalk";
 
 // src/prompts.ts
-import inquirer from "inquirer";
+import { input, Separator } from "@inquirer/prompts";
 
 // src/templates.ts
 var templates = [
@@ -61,25 +61,167 @@ async function removeDirectory(projectName) {
   await fs.remove(targetPath);
 }
 
-// src/prompts.ts
-async function promptProjectName() {
-  const { projectName } = await inquirer.prompt([
-    {
-      type: "input",
-      name: "projectName",
-      message: "Enter project name:",
-      default: "my-project",
-      validate: (input) => {
-        if (!input.trim()) {
-          return "Project name cannot be empty";
+// src/utils/vim-select.ts
+import {
+  createPrompt,
+  useState,
+  useKeypress,
+  usePrefix,
+  useMemo,
+  makeTheme,
+  isUpKey,
+  isDownKey,
+  isEnterKey
+} from "@inquirer/core";
+import chalk from "chalk";
+var selectTheme = {
+  icon: { cursor: "\u276F" },
+  style: {
+    disabled: (text) => chalk.dim(`- ${text}`),
+    description: (text) => chalk.cyan(text),
+    helpTip: (text) => chalk.dim(text)
+  },
+  helpMode: "auto"
+};
+function isSeparator(item) {
+  return "type" in item && item.type === "separator";
+}
+function isSelectableChoice(item) {
+  return !isSeparator(item) && !item.disabled;
+}
+function isSeparatorInput(choice) {
+  if (typeof choice !== "object" || choice === null) return false;
+  const obj = choice;
+  return obj.type === "separator" || "separator" in obj;
+}
+function getSeparatorText(choice) {
+  if (typeof choice !== "object" || choice === null) return "\u2500".repeat(50);
+  const obj = choice;
+  return typeof obj.separator === "string" ? obj.separator : "\u2500".repeat(50);
+}
+function normalizeChoices(choices) {
+  return choices.map((choice) => {
+    if (isSeparatorInput(choice)) {
+      const separatorText = getSeparatorText(choice);
+      return {
+        type: "separator",
+        separator: chalk.dim(separatorText)
+      };
+    }
+    const typedChoice = choice;
+    const name = typedChoice.name ?? String(typedChoice.value);
+    return {
+      value: typedChoice.value,
+      name,
+      description: typedChoice.description,
+      disabled: typedChoice.disabled ?? false
+    };
+  });
+}
+function isCtrlN(key) {
+  return key.name === "n" && key.ctrl === true;
+}
+function isCtrlP(key) {
+  return key.name === "p" && key.ctrl === true;
+}
+function isJKey(key) {
+  return key.name === "j";
+}
+function isKKey(key) {
+  return key.name === "k";
+}
+var vimSelect = createPrompt(
+  (config, done) => {
+    const { loop = true } = config;
+    const theme = makeTheme(selectTheme, config.theme);
+    const prefix = usePrefix({ status: "idle", theme });
+    const items = useMemo(
+      () => normalizeChoices(config.choices),
+      [config.choices]
+    );
+    const selectableItems = useMemo(
+      () => items.filter(isSelectableChoice),
+      [items]
+    );
+    const defaultIndex = useMemo(() => {
+      if (config.default === void 0) return 0;
+      const foundIndex = selectableItems.findIndex(
+        (item) => item.value === config.default
+      );
+      return foundIndex === -1 ? 0 : foundIndex;
+    }, [config.default, selectableItems]);
+    const [active, setActive] = useState(defaultIndex);
+    const [status, setStatus] = useState("idle");
+    useKeypress((key) => {
+      if (isEnterKey(key)) {
+        const selectedChoice2 = selectableItems[active];
+        if (selectedChoice2) {
+          setStatus("done");
+          done(selectedChoice2.value);
         }
-        if (!/^[a-zA-Z0-9-_]+$/.test(input)) {
-          return "Project name can only contain letters, numbers, hyphens and underscores";
+      } else if (isUpKey(key) || isCtrlP(key) || isKKey(key)) {
+        if (loop) {
+          setActive(active === 0 ? selectableItems.length - 1 : active - 1);
+        } else {
+          setActive(Math.max(0, active - 1));
+        }
+      } else if (isDownKey(key) || isCtrlN(key) || isJKey(key)) {
+        if (loop) {
+          setActive(active === selectableItems.length - 1 ? 0 : active + 1);
+        } else {
+          setActive(Math.min(selectableItems.length - 1, active + 1));
         }
-        return true;
       }
+    });
+    const selectedChoice = selectableItems[active];
+    const message = theme.style.message(config.message, status);
+    if (status === "done") {
+      return `${prefix} ${message} ${theme.style.answer(
+        selectedChoice?.name ?? ""
+      )}`;
     }
-  ]);
+    let selectableIndex = 0;
+    const choiceLines = items.map((item) => {
+      if (isSeparator(item)) {
+        return ` ${item.separator}`;
+      }
+      if (item.disabled) {
+        const disabledLabel = typeof item.disabled === "string" ? item.disabled : "(disabled)";
+        return theme.style.disabled(`${item.name} ${disabledLabel}`);
+      }
+      const isActive = selectableIndex === active;
+      selectableIndex++;
+      const cursor = isActive ? theme.icon.cursor : " ";
+      const color = isActive ? theme.style.highlight : (x) => x;
+      return color(`${cursor} ${item.name}`);
+    });
+    const helpTip = theme.helpMode === "always" || theme.helpMode === "auto" && selectableItems.length > 6 ? theme.style.helpTip(
+      "(Use arrow keys, j/k, or ctrl+n/ctrl+p to navigate)"
+    ) : "";
+    const description = selectedChoice?.description ? `
+${theme.style.description(selectedChoice.description)}` : "";
+    return `${prefix} ${message}${helpTip}
+${choiceLines.join(
+      "\n"
+    )}${description}`;
+  }
+);
+
+// src/prompts.ts
+async function promptProjectName() {
+  const projectName = await input({
+    message: "Enter project name:",
+    default: "my-project",
+    validate: (value) => {
+      if (!value.trim()) {
+        return "Project name cannot be empty";
+      }
+      if (!/^[a-zA-Z0-9-_]+$/.test(value)) {
+        return "Project name can only contain letters, numbers, hyphens and underscores";
+      }
+      return true;
+    }
+  });
   return projectName;
 }
 async function promptTemplate() {
@@ -90,68 +232,72 @@ async function promptTemplate() {
       name: `${t.name.padEnd(20)} - ${t.description}`,
       value: t.value
     })),
-    new inquirer.Separator("\u2500".repeat(50)),
+    new Separator("\u2500".repeat(50)),
     ...officialTemplates.map((t) => ({
       name: `${t.name.padEnd(20)} - ${t.description}`,
       value: t.value
     }))
   ];
-  const { templateValue } = await inquirer.prompt([
-    {
-      type: "list",
-      name: "templateValue",
-      message: "Select a project template:",
-      choices
-    }
-  ]);
+  const templateValue = await vimSelect({
+    message: "Select a project template:",
+    choices
+  });
   const selectedTemplate = templates.find((t) => t.value === templateValue);
   if (!selectedTemplate) {
     throw new Error(`Template not found: ${templateValue}`);
   }
   return selectedTemplate;
 }
+async function promptInitGit() {
+  const initGit = await vimSelect({
+    message: "Initialize a new git repository?",
+    choices: [
+      {
+        name: "Yes",
+        value: true
+      },
+      {
+        name: "No",
+        value: false
+      }
+    ]
+  });
+  return initGit;
+}
 async function promptCustomProjectName() {
-  const { projectName } = await inquirer.prompt([
-    {
-      type: "input",
-      name: "projectName",
-      message: "Enter a new project name:",
-      validate: (input) => {
-        if (!input.trim()) {
-          return "Project name cannot be empty";
-        }
-        if (!/^[a-zA-Z0-9-_]+$/.test(input)) {
-          return "Project name can only contain letters, numbers, hyphens and underscores";
-        }
-        return true;
+  const projectName = await input({
+    message: "Enter a new project name:",
+    validate: (value) => {
+      if (!value.trim()) {
+        return "Project name cannot be empty";
+      }
+      if (!/^[a-zA-Z0-9-_]+$/.test(value)) {
+        return "Project name can only contain letters, numbers, hyphens and underscores";
       }
+      return true;
     }
-  ]);
+  });
   return projectName;
 }
 async function promptConflictResolution(projectName) {
   const suggestedName = generateUniqueProjectName(projectName);
-  const { action } = await inquirer.prompt([
-    {
-      type: "list",
-      name: "action",
-      message: `Directory "${projectName}" already exists. What would you like to do?`,
-      choices: [
-        {
-          name: "Enter a custom name",
-          value: "custom"
-        },
-        {
-          name: "Overwrite existing directory",
-          value: "overwrite"
-        },
-        {
-          name: `Rename to "${suggestedName}"`,
-          value: "rename"
-        }
-      ]
-    }
-  ]);
+  const action = await vimSelect({
+    message: `Directory "${projectName}" already exists. What would you like to do?`,
+    choices: [
+      {
+        name: "Enter a custom name",
+        value: "custom"
+      },
+      {
+        name: "Overwrite existing directory",
+        value: "overwrite"
+      },
+      {
+        name: `Rename to "${suggestedName}"`,
+        value: "rename"
+      }
+    ]
+  });
   if (action === "overwrite") {
     return {
       projectName,
@@ -179,7 +325,9 @@ async function resolveProjectName(projectName) {
 
 // src/actions/clone-repo.ts
 import degit from "degit";
+import { execa } from "execa";
 import path2 from "path";
+import fsExtra from "fs-extra";
 
 // src/utils/train-animation.ts
 import readline from "readline";
@@ -294,19 +442,19 @@ function createTrainAnimation(initialMessage) {
 }
 
 // src/utils/logger.ts
-import chalk from "chalk";
+import chalk2 from "chalk";
 var logger = {
   info: (message) => {
-    console.log(chalk.blue("\u2139"), message);
+    console.log(chalk2.blue("\u2139"), message);
   },
   success: (message) => {
-    console.log(chalk.green("\u2714"), message);
+    console.log(chalk2.green("\u2714"), message);
   },
   warning: (message) => {
-    console.log(chalk.yellow("\u26A0"), message);
+    console.log(chalk2.yellow("\u26A0"), message);
   },
   error: (message) => {
-    console.log(chalk.red("\u2716"), message);
+    console.log(chalk2.red("\u2716"), message);
   },
   log: (message) => {
     console.log(message);
@@ -314,7 +462,29 @@ var logger = {
 };
 
 // src/actions/clone-repo.ts
-async function cloneRepo(repo, projectName) {
+async function updatePackageJsonName(targetPath, projectName) {
+  try {
+    const packageJsonPath = path2.join(targetPath, "package.json");
+    const packageJsonContent = await fsExtra.readFile(packageJsonPath, "utf-8");
+    const packageJson = JSON.parse(packageJsonContent);
+    const newPackageJson = {
+      name: projectName
+    };
+    for (const [key, value] of Object.entries(packageJson)) {
+      if (key !== "name") {
+        newPackageJson[key] = value;
+      }
+    }
+    await fsExtra.writeFile(
+      packageJsonPath,
+      JSON.stringify(newPackageJson, null, 2) + "\n"
+    );
+  } catch (error) {
+    logger.warning("Failed to update package.json name field");
+  }
+}
+async function cloneRepo(repo, projectName, options = {}) {
+  const { initGit = true } = options;
   const targetPath = path2.resolve(process.cwd(), projectName);
   const train = createTrainAnimation(`Cloning template ${repo}...`);
   train.start();
@@ -326,6 +496,17 @@ async function cloneRepo(repo, projectName) {
     });
     await emitter.clone(targetPath);
     train.stop(true, "Template cloned successfully!");
+    await updatePackageJsonName(targetPath, projectName);
+    if (initGit) {
+      await execa("git", ["init"], { cwd: targetPath });
+      await execa("git", ["add", "."], { cwd: targetPath });
+      await execa(
+        "git",
+        ["commit", "-m", "initial commit from create-for-yeyu", "--no-verify"],
+        { cwd: targetPath }
+      );
+      logger.success("Git repository initialized with initial commit");
+    }
   } catch (error) {
     train.stop(false, "Failed to clone template");
     if (error instanceof Error) {
@@ -336,12 +517,12 @@ async function cloneRepo(repo, projectName) {
 }
 
 // src/actions/create-vite.ts
-import { execa } from "execa";
+import { execa as execa2 } from "execa";
 async function createViteProject(projectName) {
   logger.info("Creating project with Vite...");
   logger.log("");
   try {
-    await execa("npm", ["create", "vite@latest", projectName], {
+    await execa2("npm", ["create", "vite@latest", projectName], {
       stdio: "inherit",
       cwd: process.cwd()
     });
@@ -354,12 +535,12 @@ async function createViteProject(projectName) {
 }
 
 // src/actions/create-next.ts
-import { execa as execa2 } from "execa";
+import { execa as execa3 } from "execa";
 async function createNextProject(projectName) {
   logger.info("Creating project with Create Next App...");
   logger.log("");
   try {
-    await execa2("npx", ["create-next-app@latest", projectName], {
+    await execa3("npx", ["create-next-app@latest", projectName], {
       stdio: "inherit",
       cwd: process.cwd()
     });
@@ -440,7 +621,8 @@ async function executeTemplate(template, projectName, shouldOverwrite) {
       logger.error("Template repository not configured");
       process.exit(1);
     }
-    await cloneRepo(template.repo, projectName);
+    const initGit = await promptInitGit();
+    await cloneRepo(template.repo, projectName, { initGit });
     printSuccessMessage(projectName);
   } else if (template.type === "vite") {
     await createViteProject(projectName);
@@ -450,17 +632,17 @@ async function executeTemplate(template, projectName, shouldOverwrite) {
 }
 function printSuccessMessage(projectName) {
   console.log();
-  logger.success(chalk2.green.bold("\u{1F389} Project created successfully!"));
+  logger.success(chalk3.green.bold("\u{1F389} Project created successfully!"));
   console.log();
-  logger.log(chalk2.cyan("  Next steps:"));
-  logger.log(`    cd ${chalk2.yellow(projectName)}`);
-  logger.log(`    ${chalk2.yellow("pnpm install")}`);
-  logger.log(`    ${chalk2.yellow("pnpm dev")}`);
+  logger.log(chalk3.cyan("  Next steps:"));
+  logger.log(`    cd ${chalk3.yellow(projectName)}`);
+  logger.log(`    ${chalk3.yellow("pnpm install")}`);
+  logger.log(`    ${chalk3.yellow("pnpm dev")}`);
   console.log();
 }
 function printBanner() {
   console.log();
-  console.log(chalk2.cyan(cowsay(getGreetingMessage())));
+  console.log(chalk3.cyan(cowsay(getGreetingMessage())));
   console.log();
 }
 async function run() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-for-yeyu",
-  "version": "2.1.0",
+  "version": "3.0.1",
   "description": "A CLI tool to scaffold projects from templates",
   "type": "module",
   "bin": {
@@ -17,20 +17,21 @@
   "author": "yeyu",
   "license": "MIT",
   "dependencies": {
+    "@inquirer/core": "^11.1.0",
+    "@inquirer/prompts": "^7.2.1",
+    "@inquirer/type": "^4.0.2",
     "chalk": "^5.3.0",
-    "commander": "^12.0.0",
+    "commander": "^14.0.2",
     "degit": "^2.8.4",
-    "execa": "^8.0.1",
+    "execa": "^9.6.1",
     "fs-extra": "^11.2.0",
-    "inquirer": "^9.2.12",
-    "ora": "^8.0.1"
+    "ora": "^9.0.0"
   },
   "devDependencies": {
     "@changesets/cli": "^2.29.8",
     "@types/chalk": "^2.2.4",
     "@types/degit": "^2.8.6",
     "@types/fs-extra": "^11.0.4",
-    "@types/inquirer": "^9.0.7",
     "@types/node": "^20.11.0",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3"