@zjex/git-workflow 0.3.0 → 0.3.2

package/dist/index.js

@@ -59,9 +59,14 @@ var init_utils = __esm({
       red: (s) => `\x1B[31m${s}\x1B[0m`,
       green: (s) => `\x1B[32m${s}\x1B[0m`,
       yellow: (s) => `\x1B[33m${s}\x1B[0m`,
+      blue: (s) => `\x1B[34m${s}\x1B[0m`,
       cyan: (s) => `\x1B[36m${s}\x1B[0m`,
       dim: (s) => `\x1B[2m${s}\x1B[0m`,
       bold: (s) => `\x1B[1m${s}\x1B[0m`,
+      purple: (s) => `\x1B[35m${s}\x1B[0m`,
+      orange: (s) => `\x1B[38;5;208m${s}\x1B[0m`,
+      lightPurple: (s) => `\x1B[38;5;141m${s}\x1B[0m`,
+      white: (s) => `\x1B[37m${s}\x1B[0m`,
       reset: "\x1B[0m"
     };
     TODAY = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10).replace(/-/g, "");
@@ -1993,7 +1998,9 @@ async function callOllamaAPI(prompt, model, maxTokens) {
   }
 }
 function cleanAIResponse(response) {
-  const lines = response.split("\n").map((line) => line.trim()).filter((line) => line);
+  let cleaned = response.replace(/^[.\s`~-]+/, "").trim();
+  cleaned = cleaned.replace(/[.\s`~-]+$/, "").trim();
+  const lines = cleaned.split("\n").map((line) => line.trim()).filter((line) => line);
   const uniqueLines = [];
   const seen = /* @__PURE__ */ new Set();
   for (const line of lines) {
@@ -2253,6 +2260,7 @@ async function commit() {
     spinner.succeed("\u63D0\u4EA4\u6210\u529F");
     const commitHash = execOutput("git rev-parse --short HEAD");
     console.log(colors.dim(`commit: ${commitHash}`));
+    console.log("");
   } catch (error) {
     spinner.fail("\u63D0\u4EA4\u5931\u8D25");
     console.log("");
@@ -2264,6 +2272,7 @@ async function commit() {
     console.log(colors.yellow("\u4F60\u53EF\u4EE5\u624B\u52A8\u6267\u884C\u4EE5\u4E0B\u547D\u4EE4:"));
     console.log(colors.cyan(`  git commit -m "${message}"`));
     console.log("");
+    throw error;
   }
 }
 async function buildManualCommitMessage(config2) {
@@ -2345,83 +2354,6 @@ ${issues}`;
   return message;
 }
 
-// src/commands/help.ts
-init_utils();
-function showHelp() {
-  return `
-\u5206\u652F\u547D\u4EE4:
-  gw feature [--base <branch>]    \u521B\u5EFA feature \u5206\u652F
-  gw feat [--base <branch>]       \u540C\u4E0A (\u522B\u540D)
-  gw f [--base <branch>]          \u540C\u4E0A (\u522B\u540D)
-
-  gw hotfix [--base <branch>]     \u521B\u5EFA hotfix \u5206\u652F
-  gw fix [--base <branch>]        \u540C\u4E0A (\u522B\u540D)
-  gw h [--base <branch>]          \u540C\u4E0A (\u522B\u540D)
-
-  gw delete [branch]              \u5220\u9664\u672C\u5730/\u8FDC\u7A0B\u5206\u652F
-  gw del [branch]                 \u540C\u4E0A (\u522B\u540D)
-  gw d [branch]                   \u540C\u4E0A (\u522B\u540D)
-
-Tag \u547D\u4EE4:
-  gw tags [prefix]                \u5217\u51FA\u6240\u6709 tag\uFF0C\u53EF\u6309\u524D\u7F00\u8FC7\u6EE4
-  gw ts [prefix]                  \u540C\u4E0A (\u522B\u540D)
-
-  gw tag [prefix]                 \u4EA4\u4E92\u5F0F\u9009\u62E9\u7248\u672C\u7C7B\u578B\u5E76\u521B\u5EFA tag
-  gw t [prefix]                   \u540C\u4E0A (\u522B\u540D)
-
-  gw tag:delete                   \u5220\u9664 tag
-  gw td                           \u540C\u4E0A (\u522B\u540D)
-
-  gw tag:update                   \u91CD\u547D\u540D tag
-  gw tu                           \u540C\u4E0A (\u522B\u540D)
-
-\u53D1\u5E03\u547D\u4EE4:
-  gw release                      \u4EA4\u4E92\u5F0F\u9009\u62E9\u7248\u672C\u53F7\u5E76\u66F4\u65B0 package.json
-  gw r                            \u540C\u4E0A (\u522B\u540D)
-
-\u914D\u7F6E\u547D\u4EE4:
-  gw init                         \u521D\u59CB\u5316\u914D\u7F6E\u6587\u4EF6
-                                  \u2022 \u5168\u5C40\u914D\u7F6E: ~/.gwrc.json (\u6240\u6709\u9879\u76EE\u751F\u6548)
-                                  \u2022 \u9879\u76EE\u914D\u7F6E: .gwrc.json (\u4EC5\u5F53\u524D\u9879\u76EE)
-                                  \u8FD0\u884C\u65F6\u53EF\u9009\u62E9\u914D\u7F6E\u8303\u56F4
-
-\u66F4\u65B0\u547D\u4EE4:
-  gw update                       \u68C0\u67E5\u5E76\u66F4\u65B0\u5230\u6700\u65B0\u7248\u672C
-  gw upt                          \u540C\u4E0A (\u522B\u540D)
-
-\u6E05\u7406\u547D\u4EE4:
-  gw clean                        \u6E05\u7406\u7F13\u5B58\u6587\u4EF6
-
-Stash \u547D\u4EE4:
-  gw stash                        \u4EA4\u4E92\u5F0F\u7BA1\u7406 stash
-  gw s                            \u540C\u4E0A (\u522B\u540D)
-  gw st                           \u540C\u4E0A (\u522B\u540D)
-
-Commit \u547D\u4EE4:
-  gw commit                       \u4EA4\u4E92\u5F0F\u63D0\u4EA4 (Conventional Commits + Gitmoji)
-  gw c                            \u540C\u4E0A (\u522B\u540D)
-  gw cm                           \u540C\u4E0A (\u522B\u540D)
-
-\u793A\u4F8B:
-  gw f                            \u57FA\u4E8E main/master \u521B\u5EFA feature \u5206\u652F
-  gw f --base develop             \u57FA\u4E8E develop \u5206\u652F\u521B\u5EFA feature \u5206\u652F
-  gw h --base release             \u57FA\u4E8E release \u5206\u652F\u521B\u5EFA hotfix \u5206\u652F
-  gw d                            \u4EA4\u4E92\u5F0F\u9009\u62E9\u5E76\u5220\u9664\u5206\u652F
-  gw d feature/xxx                \u76F4\u63A5\u5220\u9664\u6307\u5B9A\u5206\u652F
-  gw ts v                         \u5217\u51FA\u6240\u6709 v \u5F00\u5934\u7684 tag
-  gw t                            \u4EA4\u4E92\u5F0F\u521B\u5EFA tag
-  gw td                           \u4EA4\u4E92\u5F0F\u5220\u9664 tag
-  gw tu                           \u4EA4\u4E92\u5F0F\u4FEE\u6539 tag
-  gw r                            \u4EA4\u4E92\u5F0F\u53D1\u5E03\u7248\u672C
-  gw s                            \u4EA4\u4E92\u5F0F\u7BA1\u7406 stash
-  gw c                            \u4EA4\u4E92\u5F0F\u63D0\u4EA4\u4EE3\u7801
-
-\u5206\u652F\u547D\u540D\u683C\u5F0F:
-  feature/${TODAY}-<Story ID>-<\u63CF\u8FF0>
-  hotfix/${TODAY}-<Issue ID>-<\u63CF\u8FF0>
-`;
-}
-
 // src/index.ts
 init_update_notifier();
 
@@ -2561,6 +2493,320 @@ async function update(currentVersion) {
   }
 }
 
+// src/commands/log.ts
+init_utils();
+import { execSync as execSync8 } from "child_process";
+import boxen3 from "boxen";
+import { spawn } from "child_process";
+function parseGitLog(output) {
+  const commits = [];
+  const lines = output.trim().split("\n");
+  for (const line of lines) {
+    if (!line.trim()) continue;
+    const parts = line.split("|");
+    if (parts.length >= 6) {
+      commits.push({
+        hash: parts[0],
+        shortHash: parts[1],
+        subject: parts[2],
+        author: parts[3],
+        date: parts[4],
+        relativeDate: parts[5],
+        refs: parts[6] || ""
+      });
+    }
+  }
+  return commits;
+}
+function getCommitTypeIcon(subject) {
+  const lowerSubject = subject.toLowerCase();
+  if (lowerSubject.includes("feat") || lowerSubject.includes("feature")) return "\u2728";
+  if (lowerSubject.includes("fix") || lowerSubject.includes("bug")) return "\u{1F41B}";
+  if (lowerSubject.includes("docs") || lowerSubject.includes("doc")) return "\u{1F4DA}";
+  if (lowerSubject.includes("style")) return "\u{1F484}";
+  if (lowerSubject.includes("refactor")) return "\u267B\uFE0F";
+  if (lowerSubject.includes("test")) return "\u{1F9EA}";
+  if (lowerSubject.includes("chore")) return "\u{1F527}";
+  if (lowerSubject.includes("perf")) return "\u26A1";
+  if (lowerSubject.includes("ci")) return "\u{1F477}";
+  if (lowerSubject.includes("build")) return "\u{1F4E6}";
+  if (lowerSubject.includes("revert")) return "\u23EA";
+  if (lowerSubject.includes("merge")) return "\u{1F500}";
+  if (lowerSubject.includes("release") || lowerSubject.includes("version")) return "\u{1F516}";
+  return "\u{1F4DD}";
+}
+function groupCommitsByDate(commits) {
+  const groups = /* @__PURE__ */ new Map();
+  for (const commit2 of commits) {
+    const date = commit2.date;
+    if (!groups.has(date)) {
+      groups.set(date, []);
+    }
+    groups.get(date).push(commit2);
+  }
+  return groups;
+}
+function formatRelativeTime(relativeDate) {
+  let result = relativeDate;
+  const timeMap = {
+    "second": "\u79D2",
+    "seconds": "\u79D2",
+    "minute": "\u5206\u949F",
+    "minutes": "\u5206\u949F",
+    "hour": "\u5C0F\u65F6",
+    "hours": "\u5C0F\u65F6",
+    "day": "\u5929",
+    "days": "\u5929",
+    "week": "\u5468",
+    "weeks": "\u5468",
+    "month": "\u4E2A\u6708",
+    "months": "\u4E2A\u6708",
+    "year": "\u5E74",
+    "years": "\u5E74",
+    "ago": "\u524D"
+  };
+  for (const [en, zh] of Object.entries(timeMap)) {
+    result = result.replace(new RegExp(`\\b${en}\\b`, "g"), zh);
+  }
+  result = result.replace(/(\d+)\s+(秒|分钟|小时|天|周|个月|年)\s+前/g, "$1$2\u524D");
+  const match = result.match(/(\d+)(分钟|小时|天|周|个月|年)前/);
+  if (match) {
+    const num = parseInt(match[1]);
+    const unit = match[2];
+    if (unit === "\u5206\u949F" && num >= 60) {
+      const hours = Math.floor(num / 60);
+      return `${hours}\u5C0F\u65F6\u524D`;
+    }
+    if (unit === "\u5C0F\u65F6" && num >= 24) {
+      const days = Math.floor(num / 24);
+      return `${days}\u5929\u524D`;
+    }
+    if (unit === "\u5929" && num >= 7 && num < 30) {
+      const weeks = Math.floor(num / 7);
+      return `${weeks}\u5468\u524D`;
+    }
+    if (unit === "\u5929" && num >= 30) {
+      const months = Math.floor(num / 30);
+      return `${months}\u4E2A\u6708\u524D`;
+    }
+    if (unit === "\u5468" && num >= 4) {
+      const months = Math.floor(num / 4);
+      return `${months}\u4E2A\u6708\u524D`;
+    }
+    if (unit === "\u4E2A\u6708" && num >= 12) {
+      const years = Math.floor(num / 12);
+      return `${years}\u5E74\u524D`;
+    }
+  }
+  return result;
+}
+function parseCommitSubject(subject) {
+  if (subject.includes(" - ")) {
+    const parts = subject.split(" - ");
+    const title = parts[0].trim();
+    const tasks = parts.slice(1).map((task) => task.trim()).filter((task) => task.length > 0);
+    return { title, tasks };
+  }
+  return { title: subject, tasks: [] };
+}
+function supportsColor() {
+  return true;
+}
+function formatTimelineStyle(commits) {
+  const groupedCommits = groupCommitsByDate(commits);
+  let output = "";
+  const sortedDates = Array.from(groupedCommits.keys()).sort(
+    (a, b) => new Date(b).getTime() - new Date(a).getTime()
+  );
+  const useColors = supportsColor() || process.env.FORCE_COLOR;
+  for (let dateIndex = 0; dateIndex < sortedDates.length; dateIndex++) {
+    const date = sortedDates[dateIndex];
+    const dateCommits = groupedCommits.get(date);
+    const dateTitle = `\u{1F4C5} Commits on ${date}`;
+    if (useColors) {
+      output += "\n" + colors.bold(colors.yellow(dateTitle)) + "\n\n";
+    } else {
+      output += "\n" + dateTitle + "\n\n";
+    }
+    for (let commitIndex = 0; commitIndex < dateCommits.length; commitIndex++) {
+      const commit2 = dateCommits[commitIndex];
+      const icon = getCommitTypeIcon(commit2.subject);
+      const { title, tasks } = parseCommitSubject(commit2.subject);
+      const commitContent = [];
+      if (useColors) {
+        commitContent.push(`${icon} ${colors.bold(colors.white(title))}`);
+      } else {
+        commitContent.push(`${icon} ${title}`);
+      }
+      if (tasks.length > 0) {
+        commitContent.push("");
+        tasks.forEach((task) => {
+          if (useColors) {
+            commitContent.push(`  ${colors.dim("\u2013")} ${colors.dim(task)}`);
+          } else {
+            commitContent.push(`  \u2013 ${task}`);
+          }
+        });
+      }
+      commitContent.push("");
+      if (useColors) {
+        commitContent.push(`${colors.dim("\u{1F464}")} ${colors.blue(commit2.author)} ${colors.dim("committed")} ${colors.green(formatRelativeTime(commit2.relativeDate))}`);
+        commitContent.push(`${colors.dim("\u{1F517}")} ${colors.orange("#" + commit2.shortHash)}`);
+        if (commit2.refs && commit2.refs.trim()) {
+          const refs = commit2.refs.trim();
+          const refParts = refs.split(", ");
+          const branches = [];
+          const tags = [];
+          refParts.forEach((ref) => {
+            if (ref.startsWith("tag: ")) {
+              tags.push(ref.replace("tag: ", ""));
+            } else if (ref.includes("/") || ref === "HEAD") {
+              branches.push(ref);
+            } else {
+              branches.push(ref);
+            }
+          });
+          if (branches.length > 0) {
+            commitContent.push(`${colors.dim("\u{1F33F}")} ${colors.lightPurple(branches.join(", "))}`);
+          }
+          if (tags.length > 0) {
+            const tagText = tags.map((tag) => `tag ${tag}`).join(", ");
+            commitContent.push(`${colors.dim("\u{1F516}")} ${colors.yellow(tagText)}`);
+          }
+        }
+      } else {
+        commitContent.push(`\u{1F464} ${commit2.author} committed ${formatRelativeTime(commit2.relativeDate)}`);
+        commitContent.push(`\u{1F517} #${commit2.shortHash}`);
+        if (commit2.refs && commit2.refs.trim()) {
+          const refs = commit2.refs.trim();
+          const refParts = refs.split(", ");
+          const branches = [];
+          const tags = [];
+          refParts.forEach((ref) => {
+            if (ref.startsWith("tag: ")) {
+              tags.push(ref.replace("tag: ", ""));
+            } else if (ref.includes("/") || ref === "HEAD") {
+              branches.push(ref);
+            } else {
+              branches.push(ref);
+            }
+          });
+          if (branches.length > 0) {
+            commitContent.push(`\u{1F33F} ${branches.join(", ")}`);
+          }
+          if (tags.length > 0) {
+            const tagText = tags.map((tag) => `tag ${tag}`).join(", ");
+            commitContent.push(`\u{1F516} ${tagText}`);
+          }
+        }
+      }
+      const commitBox = boxen3(commitContent.join("\n"), {
+        padding: { top: 0, bottom: 0, left: 1, right: 1 },
+        margin: { top: 0, bottom: 1, left: 0, right: 0 },
+        borderStyle: "round",
+        borderColor: "gray"
+      });
+      output += commitBox + "\n";
+    }
+  }
+  return output;
+}
+function startInteractivePager(content) {
+  const pager = process.env.PAGER || "less";
+  try {
+    const pagerProcess = spawn(pager, ["-R", "-S", "-F", "-X", "-i"], {
+      stdio: ["pipe", "inherit", "inherit"],
+      env: { ...process.env, LESS: "-R -S -F -X -i" }
+    });
+    pagerProcess.stdin.write(content);
+    pagerProcess.stdin.end();
+    pagerProcess.on("exit", () => {
+    });
+    pagerProcess.on("error", (err) => {
+      console.log(content);
+    });
+  } catch (error) {
+    console.log(content);
+  }
+}
+function executeTimelineLog(options) {
+  try {
+    let cmd = 'git log --pretty=format:"%H|%h|%s|%an|%ad|%ar|%D" --date=short';
+    if (options.limit && !options.interactive) cmd += ` -${options.limit}`;
+    if (options.author) cmd += ` --author="${options.author}"`;
+    if (options.since) cmd += ` --since="${options.since}"`;
+    if (options.until) cmd += ` --until="${options.until}"`;
+    if (options.grep) cmd += ` --grep="${options.grep}"`;
+    if (options.all) cmd += ` --all`;
+    if (options.interactive && !options.limit) {
+      cmd += ` -50`;
+    }
+    const output = execSync8(cmd, {
+      encoding: "utf8",
+      stdio: "pipe",
+      maxBuffer: 1024 * 1024 * 10
+    });
+    if (output.trim()) {
+      const commits = parseGitLog(output);
+      let fullOutput = "";
+      const title = `\u{1F4CA} \u5171\u663E\u793A ${commits.length} \u4E2A\u63D0\u4EA4`;
+      fullOutput += "\n" + boxen3(title, {
+        padding: { top: 0, bottom: 0, left: 2, right: 2 },
+        margin: { top: 0, bottom: 1, left: 0, right: 0 },
+        borderStyle: "double",
+        borderColor: "green",
+        textAlignment: "center"
+      }) + "\n";
+      const timelineOutput = formatTimelineStyle(commits);
+      fullOutput += timelineOutput;
+      if (options.interactive) {
+        startInteractivePager(fullOutput);
+      } else {
+        console.log(fullOutput);
+      }
+    } else {
+      const noCommitsMsg = "\n" + boxen3("\u{1F4ED} \u6CA1\u6709\u627E\u5230\u5339\u914D\u7684\u63D0\u4EA4\u8BB0\u5F55", {
+        padding: { top: 0, bottom: 0, left: 2, right: 2 },
+        borderStyle: "round",
+        borderColor: "yellow",
+        textAlignment: "center"
+      });
+      if (options.interactive) {
+        startInteractivePager(noCommitsMsg);
+      } else {
+        console.log(noCommitsMsg);
+      }
+    }
+  } catch (error) {
+    let errorMessage = "\u274C \u6267\u884C\u5931\u8D25";
+    if (error.status === 128) {
+      errorMessage = "\u274C Git\u4ED3\u5E93\u9519\u8BEF\u6216\u6CA1\u6709\u63D0\u4EA4\u8BB0\u5F55";
+    } else {
+      errorMessage = `\u274C \u6267\u884C\u5931\u8D25: ${error.message}`;
+    }
+    const errorBox = "\n" + boxen3(errorMessage, {
+      padding: { top: 0, bottom: 0, left: 2, right: 2 },
+      borderStyle: "round",
+      borderColor: "red",
+      textAlignment: "center"
+    });
+    if (options.interactive) {
+      startInteractivePager(errorBox);
+    } else {
+      console.log(errorBox);
+    }
+  }
+}
+async function log(options = {}) {
+  if (options.interactive === void 0) {
+    options.interactive = true;
+  }
+  if (!options.interactive && !options.limit) {
+    options.limit = 10;
+  }
+  executeTimelineLog(options);
+}
+
 // src/index.ts
 process.on("uncaughtException", (err) => {
   if (err instanceof ExitPromptError) {
@@ -2586,7 +2832,7 @@ process.on("SIGTERM", () => {
   console.log("");
   process.exit(0);
 });
-var version = true ? "0.3.0" : "0.0.0-dev";
+var version = true ? "0.3.2" : "0.0.0-dev";
 async function mainMenu() {
   console.log(
     colors.green(`
@@ -2644,7 +2890,11 @@ async function mainMenu() {
         value: "stash"
       },
       {
-        name: `[b] \u2699\uFE0F  \u521D\u59CB\u5316\u914D\u7F6E             ${colors.dim("gw init")}`,
+        name: `[b] \u{1F4CA} \u67E5\u770B\u65E5\u5FD7               ${colors.dim("gw log")}`,
+        value: "log"
+      },
+      {
+        name: `[c] \u2699\uFE0F  \u521D\u59CB\u5316\u914D\u7F6E             ${colors.dim("gw init")}`,
         value: "init"
       },
       { name: "[0] \u2753 \u5E2E\u52A9", value: "help" },
@@ -2693,11 +2943,15 @@ async function mainMenu() {
       checkGitRepo();
       await stash();
       break;
+    case "log":
+      checkGitRepo();
+      await log();
+      break;
     case "init":
       await init();
       break;
     case "help":
-      console.log(showHelp());
+      cli.outputHelp();
       break;
     case "exit":
       break;
@@ -2764,6 +3018,13 @@ cli.command("commit", "\u4EA4\u4E92\u5F0F\u63D0\u4EA4 (Conventional Commits + Gi
 cli.command("update", "\u68C0\u67E5\u5E76\u66F4\u65B0\u5230\u6700\u65B0\u7248\u672C").alias("upt").action(async () => {
   return update(version);
 });
+cli.command("log", "\u4EA4\u4E92\u5F0FGit\u65E5\u5FD7\u67E5\u770B (\u5206\u9875\u6A21\u5F0F)").alias("ls").alias("l").option("--limit <number>", "\u9650\u5236\u663E\u793A\u6570\u91CF").action(async (options) => {
+  await checkForUpdates(version, "@zjex/git-workflow");
+  checkGitRepo();
+  const logOptions = { interactive: true };
+  if (options.limit) logOptions.limit = parseInt(options.limit);
+  return log(logOptions);
+});
 cli.command("clean", "\u6E05\u7406\u7F13\u5B58\u6587\u4EF6").action(async () => {
   const { clearUpdateCache: clearUpdateCache3 } = await Promise.resolve().then(() => (init_update_notifier(), update_notifier_exports));
   clearUpdateCache3();
@@ -2771,15 +3032,15 @@ cli.command("clean", "\u6E05\u7406\u7F13\u5B58\u6587\u4EF6").action(async () =>
   console.log(colors.green("\u2714 \u7F13\u5B58\u5DF2\u6E05\u7406"));
   console.log("");
 });
-cli.help((sections) => {
-  sections.push({
-    body: showHelp()
-  });
-});
 cli.option("-v, --version", "\u663E\u793A\u7248\u672C\u53F7");
-var args = process.argv.slice(2);
-if (args.includes("-v") || args.includes("--version")) {
+cli.option("-h, --help", "\u663E\u793A\u5E2E\u52A9\u4FE1\u606F");
+var processArgs = process.argv.slice(2);
+if (processArgs.includes("-v") || processArgs.includes("--version")) {
   console.log(colors.yellow(`v${version}`));
   process.exit(0);
 }
+if (processArgs.includes("-h") || processArgs.includes("--help")) {
+  cli.outputHelp();
+  process.exit(0);
+}
 cli.parse();