@zjex/git-workflow 0.0.1

package/src/commands/stash.ts

@@ -0,0 +1,290 @@
+import { execSync } from "child_process";
+import { select, input } from "@inquirer/prompts";
+import ora from "ora";
+import {
+  colors,
+  theme,
+  divider,
+  execOutput,
+  type BranchType,
+} from "../utils.js";
+import { getBranchName } from "./branch.js";
+
+interface StashEntry {
+  index: number;
+  branch: string;
+  message: string;
+  date: string;
+  files: string[];
+}
+
+function parseStashList(): StashEntry[] {
+  const raw = execOutput('git stash list --format="%gd|%s|%ar"');
+  if (!raw) return [];
+
+  return raw
+    .split("\n")
+    .filter(Boolean)
+    .map((line) => {
+      const [ref, subject, date] = line.split("|");
+      const index = parseInt(ref.match(/stash@\{(\d+)\}/)?.[1] || "0");
+
+      const branchMatch = subject.match(/(?:WIP on|On) ([^:]+):/);
+      const branch = branchMatch?.[1] || "unknown";
+
+      let message = subject.replace(/(?:WIP on|On) [^:]+:\s*/, "");
+      if (subject.startsWith("WIP")) {
+        message = message.replace(/^[a-f0-9]+ /, "");
+      }
+      message = message || "(no message)";
+
+      const filesRaw = execOutput(
+        `git stash show stash@{${index}} --name-only 2>/dev/null`
+      );
+      const files = filesRaw ? filesRaw.split("\n").filter(Boolean) : [];
+
+      return { index, branch, message, date, files };
+    });
+}
+
+function formatStashChoice(entry: StashEntry): string {
+  const fileCount = entry.files.length;
+  const filesInfo = fileCount > 0 ? colors.dim(` (${fileCount} 文件)`) : "";
+  return `${colors.yellow(`[${entry.index}]`)} ${colors.green(entry.branch)} ${
+    entry.message
+  }${filesInfo} ${colors.dim(entry.date)}`;
+}
+
+function showStashDetail(entry: StashEntry): void {
+  console.log();
+  console.log(colors.yellow(`Stash #${entry.index}`));
+  console.log(`分支: ${colors.green(entry.branch)}`);
+  console.log(`消息: ${entry.message}`);
+  console.log(`时间: ${colors.dim(entry.date)}`);
+
+  if (entry.files.length > 0) {
+    console.log(`文件 (${entry.files.length}):`);
+    entry.files
+      .slice(0, 10)
+      .forEach((f) => console.log(`  ${colors.dim("•")} ${f}`));
+    if (entry.files.length > 10) {
+      console.log(colors.dim(`  ... 还有 ${entry.files.length - 10} 个文件`));
+    }
+  }
+}
+
+export async function stash(): Promise<void> {
+  const entries = parseStashList();
+
+  if (entries.length === 0) {
+    console.log(colors.yellow("没有 stash 记录"));
+
+    const status = execOutput("git status --porcelain");
+    if (status) {
+      const doStash = await select({
+        message: "检测到未提交的变更，是否创建 stash?",
+        choices: [
+          { name: "是", value: true },
+          { name: "否", value: false },
+        ],
+        theme,
+      });
+      if (doStash) {
+        await createStash();
+      }
+    }
+    return;
+  }
+
+  console.log(colors.green(`共 ${entries.length} 个 stash:\n`));
+
+  const choices = entries.map((entry) => ({
+    name: formatStashChoice(entry),
+    value: entry.index.toString(),
+  }));
+  choices.push({ name: colors.dim("+ 创建新 stash"), value: "__new__" });
+  choices.push({ name: colors.dim("取消"), value: "__cancel__" });
+
+  const selected = await select({
+    message: "选择 stash:",
+    choices,
+    theme,
+  });
+
+  if (selected === "__cancel__") {
+    return;
+  }
+
+  if (selected === "__new__") {
+    await createStash();
+    return;
+  }
+
+  const entry = entries.find((e) => e.index.toString() === selected)!;
+  await showStashActions(entry);
+}
+
+async function showStashActions(entry: StashEntry): Promise<void> {
+  showStashDetail(entry);
+  divider();
+
+  const action = await select({
+    message: "操作:",
+    choices: [
+      { name: "应用 (保留 stash)", value: "apply" },
+      { name: "弹出 (应用并删除)", value: "pop" },
+      { name: "创建分支", value: "branch" },
+      { name: "查看差异", value: "diff" },
+      { name: "删除", value: "drop" },
+      { name: "返回列表", value: "back" },
+      { name: "取消", value: "cancel" },
+    ],
+    theme,
+  });
+
+  switch (action) {
+    case "apply":
+      applyStash(entry.index, false);
+      break;
+    case "pop":
+      applyStash(entry.index, true);
+      break;
+    case "branch":
+      await createBranchFromStash(entry.index);
+      break;
+    case "diff":
+      await showDiff(entry.index);
+      await showStashActions(entry);
+      break;
+    case "drop":
+      await dropStash(entry.index);
+      break;
+    case "back":
+      await stash();
+      break;
+  }
+}
+
+async function createStash(): Promise<void> {
+  const status = execOutput("git status --porcelain");
+  if (!status) {
+    console.log(colors.yellow("没有需要 stash 的变更"));
+    return;
+  }
+
+  const hasUntracked = status.split("\n").some((line) => line.startsWith("??"));
+
+  let includeUntracked = false;
+  if (hasUntracked) {
+    includeUntracked = await select({
+      message: "检测到未跟踪的文件，是否一并 stash?",
+      choices: [
+        { name: "是 (包含未跟踪文件)", value: true },
+        { name: "否 (仅已跟踪文件)", value: false },
+      ],
+      theme,
+    });
+  }
+
+  const message = await input({
+    message: "Stash 消息 (可选):",
+    theme,
+  });
+
+  const spinner = ora("创建 stash...").start();
+  try {
+    let cmd = "git stash push";
+    if (includeUntracked) cmd += " -u";
+    if (message) cmd += ` -m "${message.replace(/"/g, '\\"')}"`;
+    execSync(cmd, { stdio: "pipe" });
+    spinner.succeed("Stash 创建成功");
+    await stash();
+  } catch {
+    spinner.fail("Stash 创建失败");
+  }
+}
+
+function applyStash(index: number, pop: boolean): void {
+  const action = pop ? "pop" : "apply";
+  const spinner = ora(`${pop ? "弹出" : "应用"} stash...`).start();
+
+  try {
+    execSync(`git stash ${action} stash@{${index}}`, { stdio: "pipe" });
+    spinner.succeed(`Stash ${pop ? "已弹出" : "已应用"}`);
+  } catch {
+    spinner.fail("操作失败，可能存在冲突");
+    const status = execOutput("git status --porcelain");
+    if (status.includes("UU") || status.includes("AA")) {
+      console.log(colors.yellow("\n存在冲突，请手动解决后提交"));
+    }
+  }
+}
+
+async function showDiff(index: number): Promise<void> {
+  try {
+    execSync(`git stash show -p --color=always stash@{${index}}`, {
+      stdio: "inherit",
+    });
+    console.log();
+    await input({
+      message: colors.dim("按 Enter 返回菜单..."),
+      theme,
+    });
+  } catch {
+    console.log(colors.red("无法显示差异"));
+  }
+}
+
+async function createBranchFromStash(index: number): Promise<void> {
+  const type = await select({
+    message: "选择分支类型:",
+    choices: [
+      { name: "feature", value: "feature" as BranchType },
+      { name: "hotfix", value: "hotfix" as BranchType },
+      { name: "取消", value: "__cancel__" },
+    ],
+    theme,
+  });
+
+  if (type === "__cancel__") {
+    console.log(colors.yellow("已取消"));
+    return;
+  }
+
+  const branchName = await getBranchName(type as BranchType);
+  if (!branchName) return;
+
+  const spinner = ora(`创建分支 ${branchName}...`).start();
+  try {
+    execSync(`git stash branch "${branchName}" stash@{${index}}`, {
+      stdio: "pipe",
+    });
+    spinner.succeed(`分支已创建: ${branchName} (stash 已自动弹出)`);
+  } catch {
+    spinner.fail("创建分支失败");
+  }
+}
+
+async function dropStash(index: number): Promise<void> {
+  const confirmed = await select({
+    message: `确认删除 stash@{${index}}?`,
+    choices: [
+      { name: "是", value: true },
+      { name: "否", value: false },
+    ],
+    theme,
+  });
+
+  if (!confirmed) {
+    console.log(colors.yellow("已取消"));
+    return;
+  }
+
+  const spinner = ora("删除 stash...").start();
+  try {
+    execSync(`git stash drop stash@{${index}}`, { stdio: "pipe" });
+    spinner.succeed("Stash 已删除");
+  } catch {
+    spinner.fail("删除失败");
+  }
+}

package/src/commands/tag.ts

@@ -0,0 +1,277 @@
+import { execSync } from "child_process";
+import { select, input } from "@inquirer/prompts";
+import ora from "ora";
+import { colors, theme, exec, execOutput, divider } from "../utils.js";
+import { getConfig } from "../config.js";
+
+export async function listTags(prefix?: string): Promise<void> {
+  const spinner = ora("正在获取 tags...").start();
+  exec("git fetch --tags", true);
+  spinner.stop();
+
+  const pattern = prefix ? `${prefix}*` : "";
+  const tags = execOutput(`git tag -l ${pattern} --sort=-v:refname`)
+    .split("\n")
+    .filter(Boolean);
+
+  if (tags.length === 0) {
+    console.log(
+      colors.yellow(prefix ? `没有 '${prefix}' 开头的 tag` : "没有 tag")
+    );
+    return;
+  }
+
+  console.log(
+    colors.green(prefix ? `以 '${prefix}' 开头的 tags:` : "所有 tags:")
+  );
+  tags.slice(0, 20).forEach((tag) => console.log(`  ${tag}`));
+
+  if (tags.length > 20) {
+    console.log(colors.yellow(`\n共 ${tags.length} 个，仅显示前 20 个`));
+  }
+}
+
+interface PrefixInfo {
+  prefix: string;
+  latest: string;
+  date: number;
+}
+
+interface TagChoice {
+  name: string;
+  value: string;
+}
+
+export async function createTag(inputPrefix?: string): Promise<void> {
+  const config = getConfig();
+  const fetchSpinner = ora("正在获取 tags...").start();
+  exec("git fetch --tags", true);
+  fetchSpinner.stop();
+
+  divider();
+
+  let prefix = inputPrefix;
+
+  // 如果没有指定前缀，优先使用配置文件中的默认前缀
+  if (!prefix && config.defaultTagPrefix) {
+    prefix = config.defaultTagPrefix;
+    console.log(colors.dim(`(使用配置的默认前缀: ${prefix})`));
+  }
+
+  if (!prefix) {
+    const allTags = execOutput("git tag -l").split("\n").filter(Boolean);
+    const prefixes = [
+      ...new Set(allTags.map((t) => t.replace(/[0-9].*/, "")).filter(Boolean)),
+    ];
+
+    if (prefixes.length === 0) {
+      prefix = await input({
+        message: "当前仓库没有 tag，请输入新前缀 (如 v):",
+        theme,
+      });
+      if (!prefix) {
+        console.log(colors.yellow("已取消"));
+        return;
+      }
+    } else {
+      const prefixWithDate: PrefixInfo[] = prefixes.map((p) => {
+        const latest = execOutput(
+          `git tag -l "${p}*" --sort=-v:refname | head -1`
+        );
+        const date = latest
+          ? execOutput(`git log -1 --format=%ct "${latest}" 2>/dev/null`)
+          : "0";
+        return { prefix: p, latest, date: parseInt(date) || 0 };
+      });
+      prefixWithDate.sort((a, b) => b.date - a.date);
+
+      const choices: TagChoice[] = prefixWithDate.map(
+        ({ prefix: p, latest }) => {
+          return { name: `${p} (最新: ${latest})`, value: p };
+        }
+      );
+      choices.push({ name: "输入新前缀...", value: "__new__" });
+
+      prefix = await select({
+        message: "选择 tag 前缀:",
+        choices,
+        theme,
+      });
+
+      if (prefix === "__new__") {
+        prefix = await input({ message: "请输入新前缀:", theme });
+        if (!prefix) {
+          console.log(colors.yellow("已取消"));
+          return;
+        }
+      }
+    }
+  }
+
+  const latestTag = execOutput(
+    `git tag -l "${prefix}*" --sort=-v:refname | head -1`
+  );
+
+  if (!latestTag) {
+    const newTag = `${prefix}1.0.0`;
+    console.log(
+      colors.yellow(`未找到 '${prefix}' 开头的 tag，将创建 ${newTag}`)
+    );
+    const ok = await select({
+      message: `确认创建 ${newTag}?`,
+      choices: [
+        { name: "是", value: true },
+        { name: "否", value: false },
+      ],
+      theme,
+    });
+    if (ok) {
+      doCreateTag(newTag);
+    }
+    return;
+  }
+
+  console.log(colors.yellow(`当前最新 tag: ${latestTag}`));
+
+  divider();
+
+  const version = latestTag.slice(prefix.length);
+
+  // 解析版本号，支持预发布版本如 1.0.0-beta.1
+  const preReleaseMatch = version.match(
+    /^(\d+)\.(\d+)\.(\d+)-([a-zA-Z]+)\.(\d+)$/
+  );
+  const match3 = version.match(/^(\d+)\.(\d+)\.(\d+)$/);
+  const match2 = version.match(/^(\d+)\.(\d+)$/);
+  const match1 = version.match(/^(\d+)$/);
+
+  let choices: TagChoice[] = [];
+
+  if (preReleaseMatch) {
+    // 预发布版本: 1.0.0-beta.1
+    const [, majorStr, minorStr, patchStr, preTag, preNumStr] = preReleaseMatch;
+    const major = Number(majorStr);
+    const minor = Number(minorStr);
+    const patch = Number(patchStr);
+    const preNum = Number(preNumStr);
+    const baseVersion = `${major}.${minor}.${patch}`;
+
+    choices = [
+      {
+        name: `pre    → ${prefix}${baseVersion}-${preTag}.${preNum + 1}`,
+        value: `${prefix}${baseVersion}-${preTag}.${preNum + 1}`,
+      },
+      {
+        name: `release→ ${prefix}${baseVersion}`,
+        value: `${prefix}${baseVersion}`,
+      },
+      {
+        name: `patch  → ${prefix}${major}.${minor}.${patch + 1}`,
+        value: `${prefix}${major}.${minor}.${patch + 1}`,
+      },
+      {
+        name: `minor  → ${prefix}${major}.${minor + 1}.0`,
+        value: `${prefix}${major}.${minor + 1}.0`,
+      },
+      {
+        name: `major  → ${prefix}${major + 1}.0.0`,
+        value: `${prefix}${major + 1}.0.0`,
+      },
+    ];
+  } else if (match3) {
+    const [, majorStr, minorStr, patchStr] = match3;
+    const major = Number(majorStr);
+    const minor = Number(minorStr);
+    const patch = Number(patchStr);
+    choices = [
+      {
+        name: `patch  → ${prefix}${major}.${minor}.${patch + 1}`,
+        value: `${prefix}${major}.${minor}.${patch + 1}`,
+      },
+      {
+        name: `minor  → ${prefix}${major}.${minor + 1}.0`,
+        value: `${prefix}${major}.${minor + 1}.0`,
+      },
+      {
+        name: `major  → ${prefix}${major + 1}.0.0`,
+        value: `${prefix}${major + 1}.0.0`,
+      },
+      {
+        name: `alpha  → ${prefix}${major}.${minor}.${patch + 1}-alpha.1`,
+        value: `${prefix}${major}.${minor}.${patch + 1}-alpha.1`,
+      },
+      {
+        name: `beta   → ${prefix}${major}.${minor}.${patch + 1}-beta.1`,
+        value: `${prefix}${major}.${minor}.${patch + 1}-beta.1`,
+      },
+      {
+        name: `rc     → ${prefix}${major}.${minor}.${patch + 1}-rc.1`,
+        value: `${prefix}${major}.${minor}.${patch + 1}-rc.1`,
+      },
+    ];
+  } else if (match2) {
+    const [, majorStr, minorStr] = match2;
+    const major = Number(majorStr);
+    const minor = Number(minorStr);
+    choices = [
+      {
+        name: `minor  → ${prefix}${major}.${minor + 1}`,
+        value: `${prefix}${major}.${minor + 1}`,
+      },
+      {
+        name: `major  → ${prefix}${major + 1}.0`,
+        value: `${prefix}${major + 1}.0`,
+      },
+    ];
+  } else if (match1) {
+    const num = Number(match1[1]);
+    choices = [
+      { name: `next   → ${prefix}${num + 1}`, value: `${prefix}${num + 1}` },
+    ];
+  } else {
+    console.log(colors.red(`无法解析版本号: ${version}`));
+    return;
+  }
+
+  choices.push({ name: "取消", value: "__cancel__" });
+
+  const nextTag = await select({
+    message: "选择版本类型:",
+    choices,
+    theme,
+  });
+
+  if (nextTag === "__cancel__") {
+    console.log(colors.yellow("已取消"));
+    return;
+  }
+
+  doCreateTag(nextTag);
+}
+
+function doCreateTag(tagName: string): void {
+  divider();
+
+  const spinner = ora(`正在创建 tag: ${tagName}`).start();
+
+  try {
+    execSync(`git tag -a "${tagName}" -m "Release ${tagName}"`, {
+      stdio: "pipe",
+    });
+    spinner.succeed(`Tag 创建成功: ${tagName}`);
+  } catch {
+    spinner.fail("tag 创建失败");
+    return;
+  }
+
+  const pushSpinner = ora("正在推送到远程...").start();
+
+  try {
+    execSync(`git push origin "${tagName}"`, { stdio: "pipe" });
+    pushSpinner.succeed(`Tag 已推送: ${tagName}`);
+  } catch {
+    pushSpinner.warn(
+      `远程推送失败，可稍后手动执行: git push origin ${tagName}`
+    );
+  }
+}

package/src/config.ts

@@ -0,0 +1,88 @@
+import { existsSync, readFileSync } from "fs";
+import { join } from "path";
+import { execOutput } from "./utils.js";
+
+export interface GwConfig {
+  // 默认基础分支，不设置则自动检测 main/master
+  baseBranch?: string;
+  // feature 分支前缀，默认 "feature"
+  featurePrefix: string;
+  // hotfix 分支前缀，默认 "hotfix"
+  hotfixPrefix: string;
+  // 是否要求必填 ID，默认 false
+  requireId: boolean;
+  // ID 标签名称
+  featureIdLabel: string;
+  hotfixIdLabel: string;
+  // 默认 tag 前缀
+  defaultTagPrefix?: string;
+  // 创建分支后是否自动推送，默认询问
+  autoPush?: boolean;
+}
+
+const defaultConfig: GwConfig = {
+  featurePrefix: "feature",
+  hotfixPrefix: "hotfix",
+  requireId: false,
+  featureIdLabel: "Story ID",
+  hotfixIdLabel: "Issue ID",
+};
+
+function getGitRoot(): string {
+  return execOutput("git rev-parse --show-toplevel");
+}
+
+function findConfigFile(): string | null {
+  const configNames = [".gwrc.json", ".gwrc", "gw.config.json"];
+
+  // 先在当前目录找
+  for (const name of configNames) {
+    if (existsSync(name)) {
+      return name;
+    }
+  }
+
+  // 再在 git 根目录找
+  try {
+    const gitRoot = getGitRoot();
+    if (gitRoot) {
+      for (const name of configNames) {
+        const configPath = join(gitRoot, name);
+        if (existsSync(configPath)) {
+          return configPath;
+        }
+      }
+    }
+  } catch {
+    // 不在 git 仓库中
+  }
+
+  return null;
+}
+
+export function loadConfig(): GwConfig {
+  const configPath = findConfigFile();
+
+  if (!configPath) {
+    return defaultConfig;
+  }
+
+  try {
+    const content = readFileSync(configPath, "utf-8");
+    const userConfig = JSON.parse(content) as Partial<GwConfig>;
+    return { ...defaultConfig, ...userConfig };
+  } catch (e) {
+    console.warn(`配置文件解析失败: ${configPath}`);
+    return defaultConfig;
+  }
+}
+
+// 全局配置实例
+let config: GwConfig | null = null;
+
+export function getConfig(): GwConfig {
+  if (!config) {
+    config = loadConfig();
+  }
+  return config;
+}