@zjex/git-workflow 0.0.1 → 0.1.0

package/src/commands/tag.ts

@@ -42,6 +42,14 @@ interface TagChoice {
   value: string;
 }
 
+// 获取指定前缀的最新 tag（不依赖 shell 管道）
+function getLatestTag(prefix: string): string {
+  const tags = execOutput(`git tag -l "${prefix}*" --sort=-v:refname`)
+    .split("\n")
+    .filter(Boolean);
+  return tags[0] || "";
+}
+
 export async function createTag(inputPrefix?: string): Promise<void> {
   const config = getConfig();
   const fetchSpinner = ora("正在获取 tags...").start();
@@ -60,13 +68,68 @@ export async function createTag(inputPrefix?: string): Promise<void> {
 
   if (!prefix) {
     const allTags = execOutput("git tag -l").split("\n").filter(Boolean);
+
+    // 仓库没有任何 tag 的情况
+    if (allTags.length === 0) {
+      prefix = await input({
+        message: "当前仓库没有 tag，请输入前缀 (如 v):",
+        default: "v",
+        theme,
+      });
+      if (!prefix) {
+        console.log(colors.yellow("已取消"));
+        return;
+      }
+
+      // 选择初始版本号
+      const initialVersion = await select({
+        message: "选择初始版本号:",
+        choices: [
+          { name: `${prefix}0.0.1`, value: "0.0.1" },
+          { name: `${prefix}0.1.0`, value: "0.1.0" },
+          { name: `${prefix}1.0.0`, value: "1.0.0" },
+          { name: "自定义...", value: "__custom__" },
+        ],
+        theme,
+      });
+
+      let version = initialVersion;
+      if (initialVersion === "__custom__") {
+        version = await input({
+          message: "请输入版本号 (如 0.0.1):",
+          theme,
+        });
+        if (!version) {
+          console.log(colors.yellow("已取消"));
+          return;
+        }
+      }
+
+      const newTag = `${prefix}${version}`;
+      const ok = await select({
+        message: `确认创建 ${newTag}?`,
+        choices: [
+          { name: "是", value: true },
+          { name: "否", value: false },
+        ],
+        theme,
+      });
+      if (ok) {
+        doCreateTag(newTag);
+      }
+      return;
+    }
+
+    // 从现有 tag 中提取前缀
     const prefixes = [
       ...new Set(allTags.map((t) => t.replace(/[0-9].*/, "")).filter(Boolean)),
     ];
 
     if (prefixes.length === 0) {
+      // 有 tag 但无法提取前缀（比如纯数字 tag）
       prefix = await input({
-        message: "当前仓库没有 tag，请输入新前缀 (如 v):",
+        message: "请输入 tag 前缀 (如 v):",
+        default: "v",
         theme,
       });
       if (!prefix) {
@@ -75,9 +138,7 @@ export async function createTag(inputPrefix?: string): Promise<void> {
       }
     } else {
       const prefixWithDate: PrefixInfo[] = prefixes.map((p) => {
-        const latest = execOutput(
-          `git tag -l "${p}*" --sort=-v:refname | head -1`
-        );
+        const latest = getLatestTag(p);
         const date = latest
           ? execOutput(`git log -1 --format=%ct "${latest}" 2>/dev/null`)
           : "0";
@@ -108,9 +169,7 @@ export async function createTag(inputPrefix?: string): Promise<void> {
     }
   }
 
-  const latestTag = execOutput(
-    `git tag -l "${prefix}*" --sort=-v:refname | head -1`
-  );
+  const latestTag = getLatestTag(prefix);
 
   if (!latestTag) {
     const newTag = `${prefix}1.0.0`;

package/src/config.ts

@@ -18,6 +18,24 @@ export interface GwConfig {
   defaultTagPrefix?: string;
   // 创建分支后是否自动推送，默认询问
   autoPush?: boolean;
+  // commit 时是否自动暂存所有更改，默认 true
+  autoStage?: boolean;
+  // commit 时是否使用 emoji，默认 true
+  useEmoji?: boolean;
+  // 自定义 commit 类型的 emoji
+  commitEmojis?: {
+    feat?: string;
+    fix?: string;
+    docs?: string;
+    style?: string;
+    refactor?: string;
+    perf?: string;
+    test?: string;
+    build?: string;
+    ci?: string;
+    chore?: string;
+    revert?: string;
+  };
 }
 
 const defaultConfig: GwConfig = {
@@ -26,6 +44,8 @@ const defaultConfig: GwConfig = {
   requireId: false,
   featureIdLabel: "Story ID",
   hotfixIdLabel: "Issue ID",
+  autoStage: true,
+  useEmoji: true,
 };
 
 function getGitRoot(): string {

package/src/index.ts

@@ -1,18 +1,146 @@
 // @ts-nocheck shebang handled by tsup banner
 
 import { cac } from "cac";
-import { checkGitRepo } from "./utils.js";
+import { select } from "@inquirer/prompts";
+import { ExitPromptError } from "@inquirer/core";
+import { checkGitRepo, theme, colors } from "./utils.js";
 import { createBranch, deleteBranch } from "./commands/branch.js";
 import { listTags, createTag } from "./commands/tag.js";
 import { release } from "./commands/release.js";
 import { init } from "./commands/init.js";
 import { stash } from "./commands/stash.js";
+import { commit } from "./commands/commit.js";
 import { showHelp } from "./commands/help.js";
 
-declare const __VERSION__: string;
+// 捕获 Ctrl+C 退出，静默处理
+process.on("uncaughtException", (err) => {
+  if (err instanceof ExitPromptError) {
+    process.exit(0);
+  }
+  console.error(err);
+  process.exit(1);
+});
+
+declare const __VERSION__: string | undefined;
+
+// 开发环境下从 package.json 读取版本号
+const version: string =
+  typeof __VERSION__ !== "undefined"
+    ? __VERSION__
+    : (await import("../package.json", { with: { type: "json" } })).default
+        .version;
+
+// 交互式主菜单
+async function mainMenu(): Promise<void> {
+  // ASCII Art Logo
+  console.log(
+    colors.green(`
+ ███████╗     ██╗███████╗██╗  ██╗
+ ╚══███╔╝     ██║██╔════╝╚██╗██╔╝
+   ███╔╝      ██║█████╗   ╚███╔╝ 
+  ███╔╝  ██   ██║██╔══╝   ██╔██╗ 
+ ███████╗╚█████╔╝███████╗██╔╝ ██╗
+ ╚══════╝ ╚════╝ ╚══════╝╚═╝  ╚═╝
+`)
+  );
+  console.log(colors.dim(`  git-workflow v${version}\n`));
+
+  const action = await select({
+    message: "选择操作:",
+    choices: [
+      {
+        name: `[1] ✨ 创建 feature 分支      ${colors.dim("gw f")}`,
+        value: "feature",
+      },
+      {
+        name: `[2] 🐛 创建 hotfix 分支       ${colors.dim("gw h")}`,
+        value: "hotfix",
+      },
+      {
+        name: `[3] 🗑️  删除分支               ${colors.dim("gw d")}`,
+        value: "delete",
+      },
+      {
+        name: `[4] 📝 提交代码               ${colors.dim("gw c")}`,
+        value: "commit",
+      },
+      {
+        name: `[5] 🏷️  创建 tag               ${colors.dim("gw t")}`,
+        value: "tag",
+      },
+      {
+        name: `[6] 📋 列出 tags              ${colors.dim("gw ts")}`,
+        value: "tags",
+      },
+      {
+        name: `[7] 📦 发布版本               ${colors.dim("gw r")}`,
+        value: "release",
+      },
+      {
+        name: `[8] 💾 管理 stash             ${colors.dim("gw s")}`,
+        value: "stash",
+      },
+      {
+        name: `[9] ⚙️  初始化配置             ${colors.dim("gw init")}`,
+        value: "init",
+      },
+      { name: "[0] ❓ 帮助", value: "help" },
+      { name: "[q] 退出", value: "exit" },
+    ],
+    loop: false,
+    theme,
+  });
+
+  switch (action) {
+    case "feature":
+      checkGitRepo();
+      await createBranch("feature");
+      break;
+    case "hotfix":
+      checkGitRepo();
+      await createBranch("hotfix");
+      break;
+    case "delete":
+      checkGitRepo();
+      await deleteBranch();
+      break;
+    case "tag":
+      checkGitRepo();
+      await createTag();
+      break;
+    case "tags":
+      checkGitRepo();
+      await listTags();
+      break;
+    case "commit":
+      checkGitRepo();
+      await commit();
+      break;
+    case "release":
+      await release();
+      break;
+    case "stash":
+      checkGitRepo();
+      await stash();
+      break;
+    case "init":
+      await init();
+      break;
+    case "help":
+      console.log(showHelp());
+      break;
+    case "exit":
+      break;
+  }
+}
 
 const cli = cac("gw");
 
+// 默认命令 - 显示交互式菜单
+cli.command("", "显示交互式菜单").action(() => {
+  return mainMenu();
+});
+
 cli
   .command("feature", "创建 feature 分支")
   .alias("feat")
@@ -78,11 +206,20 @@ cli
     return stash();
   });
 
+cli
+  .command("commit", "交互式提交 (Conventional Commits + Gitmoji)")
+  .alias("c")
+  .alias("cm")
+  .action(() => {
+    checkGitRepo();
+    return commit();
+  });
+
 cli.help((sections) => {
   sections.push({
     body: showHelp(),
   });
 });
-cli.version(__VERSION__);
+cli.version(version);
 
 cli.parse();