@zjex/git-workflow 0.4.0 → 0.4.2

package/dist/index.js

@@ -94,7 +94,7 @@ import { execSync as execSync6 } from "child_process";
 import { readFileSync as readFileSync3, writeFileSync as writeFileSync4, existsSync as existsSync3, unlinkSync as unlinkSync2 } from "fs";
 import { homedir as homedir3 } from "os";
 import { join as join4 } from "path";
-import boxen from "boxen";
+import boxen2 from "boxen";
 import { select as select7 } from "@inquirer/prompts";
 import ora5 from "ora";
 import semver from "semver";
@@ -180,7 +180,7 @@ function showSimpleNotification(current, latest) {
     "gw update"
   )} ${colors.dim("\u66F4\u65B0")}`;
   console.log(
-    boxen(message, {
+    boxen2(message, {
       padding: { top: 0, bottom: 0, left: 2, right: 2 },
       margin: { top: 0, bottom: 0, left: 0, right: 0 },
       borderStyle: "round",
@@ -197,7 +197,7 @@ async function showUpdateMessage(current, latest, packageName) {
   ].join("\n");
   console.log("");
   console.log(
-    boxen(message, {
+    boxen2(message, {
       padding: { top: 1, bottom: 1, left: 3, right: 3 },
       margin: { top: 0, bottom: 0, left: 1, right: 1 },
       borderStyle: "round",
@@ -252,7 +252,7 @@ async function performUpdate(packageName) {
     clearUpdateCache();
     console.log("");
     console.log(
-      boxen(
+      boxen2(
         [
           colors.green(colors.bold("\u2728 \u66F4\u65B0\u5B8C\u6210\uFF01")),
           "",
@@ -1675,9 +1675,10 @@ async function init() {
 
 // src/commands/stash.ts
 init_utils();
-import { execSync as execSync4 } from "child_process";
+import { execSync as execSync4, spawn } from "child_process";
 import { select as select5, input as input4 } from "@inquirer/prompts";
 import ora3 from "ora";
+import boxen from "boxen";
 function parseStashList() {
   const raw = execOutput('git stash list --format="%gd|%s|%ar"');
   if (!raw) return [];
@@ -1848,18 +1849,119 @@ function applyStash(index, pop) {
 }
 async function showDiff(index) {
   try {
-    execSync4(`git stash show -p --color=always stash@{${index}}`, {
-      stdio: "inherit"
-    });
-    console.log();
+    const diffOutput = execOutput(
+      `git stash show -p --no-color stash@{${index}}`
+    );
+    if (!diffOutput) {
+      console.log(colors.yellow("\u6CA1\u6709\u5DEE\u5F02\u5185\u5BB9"));
+      await input4({
+        message: colors.dim("\u6309 Enter \u8FD4\u56DE\u83DC\u5355..."),
+        theme
+      });
+      return;
+    }
+    const statsOutput = execOutput(`git stash show --stat stash@{${index}}`);
+    const files = parseDiffByFile(diffOutput);
+    let fullOutput = "";
+    if (statsOutput) {
+      const statsBox = boxen(statsOutput, {
+        padding: { top: 0, bottom: 0, left: 1, right: 1 },
+        margin: { top: 0, bottom: 1, left: 0, right: 0 },
+        borderStyle: "double",
+        borderColor: "yellow",
+        title: `\u{1F4CA} Stash #${index} \u7EDF\u8BA1`,
+        titleAlignment: "center"
+      });
+      fullOutput += statsBox + "\n";
+    }
+    for (const file of files) {
+      const fileContent = formatFileDiff(file);
+      const fileBox = boxen(fileContent, {
+        padding: { top: 0, bottom: 0, left: 1, right: 1 },
+        margin: { top: 0, bottom: 1, left: 0, right: 0 },
+        borderStyle: "round",
+        borderColor: "cyan",
+        title: `\u{1F4C4} ${file.path}`,
+        titleAlignment: "left"
+      });
+      fullOutput += fileBox + "\n";
+    }
+    await startPager(fullOutput);
+  } catch (error) {
+    console.log(colors.red("\u65E0\u6CD5\u663E\u793A\u5DEE\u5F02"));
     await input4({
       message: colors.dim("\u6309 Enter \u8FD4\u56DE\u83DC\u5355..."),
       theme
     });
-  } catch {
-    console.log(colors.red("\u65E0\u6CD5\u663E\u793A\u5DEE\u5F02"));
   }
 }
+function parseDiffByFile(diffOutput) {
+  const files = [];
+  const lines = diffOutput.split("\n");
+  let currentFile = null;
+  for (const line of lines) {
+    if (line.startsWith("diff --git")) {
+      if (currentFile && currentFile.lines.length > 0) {
+        files.push(currentFile);
+      }
+      const match = line.match(/diff --git a\/(.*?) b\/(.*?)$/);
+      const path = match ? match[2] : "unknown";
+      currentFile = { path, lines: [] };
+    } else if (currentFile) {
+      if (line.startsWith("index ") || line.startsWith("--- ") || line.startsWith("+++ ")) {
+        continue;
+      }
+      currentFile.lines.push(line);
+    }
+  }
+  if (currentFile && currentFile.lines.length > 0) {
+    files.push(currentFile);
+  }
+  return files;
+}
+function formatFileDiff(file) {
+  const formattedLines = [];
+  for (const line of file.lines) {
+    if (line.startsWith("@@")) {
+      formattedLines.push(colors.blue(line));
+    } else if (line.startsWith("+")) {
+      formattedLines.push(colors.green(line));
+    } else if (line.startsWith("-")) {
+      formattedLines.push(colors.red(line));
+    } else {
+      formattedLines.push(colors.dim(line));
+    }
+  }
+  return formattedLines.join("\n");
+}
+function startPager(content) {
+  return new Promise((resolve) => {
+    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.on("error", (err) => {
+        if (err.code !== "EPIPE") {
+          console.error(err);
+        }
+      });
+      pagerProcess.stdin.write(content);
+      pagerProcess.stdin.end();
+      pagerProcess.on("exit", () => {
+        resolve();
+      });
+      pagerProcess.on("error", () => {
+        console.log(content);
+        resolve();
+      });
+    } catch (error) {
+      console.log(content);
+      resolve();
+    }
+  });
+}
 async function createBranchFromStash(index) {
   const type = await select5({
     message: "\u9009\u62E9\u5206\u652F\u7C7B\u578B:",
@@ -2574,7 +2676,7 @@ init_update_notifier();
 init_utils();
 import { execSync as execSync7 } from "child_process";
 import ora6 from "ora";
-import boxen2 from "boxen";
+import boxen3 from "boxen";
 import semver2 from "semver";
 import { existsSync as existsSync4, unlinkSync as unlinkSync3 } from "fs";
 import { homedir as homedir4 } from "os";
@@ -2626,7 +2728,7 @@ async function update(currentVersion) {
     spinner.stop();
     if (semver2.gte(currentVersion, latestVersion)) {
       console.log(
-        boxen2(
+        boxen3(
           [
             colors.green(colors.bold("\u2705 \u5DF2\u662F\u6700\u65B0\u7248\u672C")),
             "",
@@ -2645,7 +2747,7 @@ async function update(currentVersion) {
     }
     const versionText = `${currentVersion}  \u2192  ${latestVersion}`;
     console.log(
-      boxen2(
+      boxen3(
         [
           colors.yellow(colors.bold("\u{1F389} \u53D1\u73B0\u65B0\u7248\u672C\uFF01")),
           "",
@@ -2673,7 +2775,7 @@ async function update(currentVersion) {
     clearUpdateCache2();
     console.log("");
     console.log(
-      boxen2(
+      boxen3(
         [
           colors.green(colors.bold("\u2728 \u66F4\u65B0\u5B8C\u6210\uFF01")),
           "",
@@ -2709,8 +2811,8 @@ 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";
+import boxen4 from "boxen";
+import { spawn as spawn2 } from "child_process";
 function parseGitLog(output) {
   const commits = [];
   const lines = output.trim().split("\n");
@@ -2914,7 +3016,7 @@ function formatTimelineStyle(commits) {
           }
         }
       }
-      const commitBox = boxen3(commitContent.join("\n"), {
+      const commitBox = boxen4(commitContent.join("\n"), {
         padding: { top: 0, bottom: 0, left: 1, right: 1 },
         margin: { top: 0, bottom: 0, left: 0, right: 0 },
         borderStyle: "round",
@@ -2928,7 +3030,7 @@ function formatTimelineStyle(commits) {
 function startInteractivePager(content) {
   const pager = process.env.PAGER || "less";
   try {
-    const pagerProcess = spawn(pager, ["-R", "-S", "-F", "-X", "-i"], {
+    const pagerProcess = spawn2(pager, ["-R", "-S", "-F", "-X", "-i"], {
       stdio: ["pipe", "inherit", "inherit"],
       env: { ...process.env, LESS: "-R -S -F -X -i" }
     });
@@ -2974,7 +3076,7 @@ function executeTimelineLog(options) {
         console.log(fullOutput);
       }
     } else {
-      const noCommitsMsg = "\n" + boxen3("\u{1F4ED} \u6CA1\u6709\u627E\u5230\u5339\u914D\u7684\u63D0\u4EA4\u8BB0\u5F55", {
+      const noCommitsMsg = "\n" + boxen4("\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",
@@ -2993,7 +3095,7 @@ function executeTimelineLog(options) {
     } else {
       errorMessage = `\u274C \u6267\u884C\u5931\u8D25: ${error.message}`;
     }
-    const errorBox = "\n" + boxen3(errorMessage, {
+    const errorBox = "\n" + boxen4(errorMessage, {
       padding: { top: 0, bottom: 0, left: 2, right: 2 },
       borderStyle: "round",
       borderColor: "red",
@@ -3041,7 +3143,7 @@ process.on("SIGTERM", () => {
   console.log("");
   process.exit(0);
 });
-var version = true ? "0.4.0" : "0.0.0-dev";
+var version = true ? "0.4.2" : "0.0.0-dev";
 async function mainMenu() {
   console.log(
     colors.green(`

package/docs/.vitepress/config.ts

@@ -1,168 +1,179 @@
-import { defineConfig } from 'vitepress'
+import { defineConfig } from "vitepress";
 
 export default defineConfig({
-  title: 'Git Workflow',
-  description: '🚀 极简的 Git 工作流 CLI 工具，让分支管理和版本发布变得轻松愉快',
-  
+  title: "Git Workflow",
+  description:
+    "🚀 极简的 Git 工作流 CLI 工具，让分支管理和版本发布变得轻松愉快",
+
   // 基础配置
-  base: '/git-workflow/',
-  lang: 'zh-CN',
-  
+  base: "/git-workflow/",
+  lang: "zh-CN",
+
   // 主题配置
   themeConfig: {
     // Logo
-    logo: '/logo.svg',
-    
+    logo: "/logo.svg",
+
     // 导航栏
     nav: [
-      { text: '首页', link: '/' },
-      { text: '快速开始', link: '/guide/getting-started' },
-      { text: '命令参考', link: '/commands/' },
-      { text: '配置', link: '/config/' },
-      { text: 'GitHub', link: 'https://github.com/iamzjt-front-end/git-workflow' }
+      { text: "首页", link: "/" },
+      { text: "快速开始", link: "/guide/getting-started" },
+      { text: "命令参考", link: "/commands/" },
+      { text: "配置", link: "/config/" },
     ],
 
     // 侧边栏
     sidebar: {
-      '/guide/': [
+      "/guide/": [
         {
-          text: '指南',
+          text: "指南",
           items: [
-            { text: '介绍', link: '/guide/' },
-            { text: '快速开始', link: '/guide/getting-started' },
-            { text: '安装', link: '/guide/installation' },
-            { text: '基础用法', link: '/guide/basic-usage' },
-            { text: '最佳实践', link: '/guide/best-practices' }
-          ]
+            { text: "介绍", link: "/guide/" },
+            { text: "快速开始", link: "/guide/getting-started" },
+            { text: "安装", link: "/guide/installation" },
+            { text: "基础用法", link: "/guide/basic-usage" },
+            { text: "最佳实践", link: "/guide/best-practices" },
+          ],
         },
         {
-          text: '核心功能',
+          text: "核心功能",
           items: [
-            { text: 'AI 智能提交', link: '/guide/ai-commit' },
-            { text: '分支管理', link: '/guide/branch-management' },
-            { text: 'Tag 管理', link: '/guide/tag-management' },
-            { text: 'Stash 管理', link: '/guide/stash-management' },
-            { text: '版本发布', link: '/guide/release-management' }
-          ]
+            { text: "AI 智能提交", link: "/guide/ai-commit" },
+            { text: "分支管理", link: "/guide/branch-management" },
+            { text: "Tag 管理", link: "/guide/tag-management" },
+            { text: "Stash 管理", link: "/guide/stash-management" },
+            { text: "版本发布", link: "/guide/release-management" },
+          ],
         },
         {
-          text: '高级用法',
-          items: [
-            { text: '团队协作', link: '/guide/team-collaboration' },
-            { text: '工作流集成', link: '/guide/workflow-integration' },
-            { text: '自动化脚本', link: '/guide/automation' }
-          ]
-        }
-      ],
-      '/commands/': [
+          text: "团队协作",
+          items: [{ text: "团队协作指南", link: "/guide/team-collaboration" }],
+        },
         {
-          text: '命令参考',
+          text: "开发与贡献",
           items: [
-            { text: '概览', link: '/commands/' },
-            { text: '交互式菜单', link: '/commands/interactive' },
-            { text: '分支命令', link: '/commands/branch' },
-            { text: '提交命令', link: '/commands/commit' },
-            { text: '日志命令', link: '/commands/log' },
-            { text: 'Tag 命令', link: '/commands/tag' },
-            { text: 'Stash 命令', link: '/commands/stash' },
-            { text: '版本命令', link: '/commands/release' },
-            { text: '配置命令', link: '/commands/config' },
-            { text: '更新命令', link: '/commands/update' },
-            { text: '帮助命令', link: '/commands/help' }
-          ]
-        }
+            { text: "开发指南", link: "/guide/development" },
+            { text: "测试指南", link: "/guide/testing" },
+            { text: "API 文档", link: "/guide/api" },
+            { text: "贡献指南", link: "/guide/contributing" },
+          ],
+        },
       ],
-      '/config/': [
+      "/commands/": [
         {
-          text: '配置',
+          text: "命令参考",
           items: [
-            { text: '配置概览', link: '/config/' },
-            { text: '配置文件', link: '/config/config-file' },
-            { text: 'AI 配置', link: '/config/ai-config' },
-            { text: '分支配置', link: '/config/branch-config' },
-            { text: '提交配置', link: '/config/commit-config' },
-            { text: '配置示例', link: '/config/examples' }
-          ]
-        }
+            { text: "概览", link: "/commands/" },
+            { text: "交互式菜单", link: "/commands/interactive" },
+            { text: "分支命令", link: "/commands/branch" },
+            { text: "提交命令", link: "/commands/commit" },
+            { text: "日志命令", link: "/commands/log" },
+            { text: "Tag 命令", link: "/commands/tag" },
+            { text: "Stash 命令", link: "/commands/stash" },
+            { text: "版本命令", link: "/commands/release" },
+            { text: "配置命令", link: "/commands/config" },
+            { text: "更新命令", link: "/commands/update" },
+            { text: "帮助命令", link: "/commands/help" },
+          ],
+        },
       ],
-      '/api/': [
+      "/config/": [
         {
-          text: 'API 参考',
+          text: "配置",
           items: [
-            { text: 'CLI API', link: '/api/cli' },
-            { text: '配置 API', link: '/api/config' },
-            { text: '工具函数', link: '/api/utils' }
-          ]
-        }
-      ]
+            { text: "配置概览", link: "/config/" },
+            { text: "配置文件", link: "/config/config-file" },
+            { text: "AI 配置", link: "/config/ai-config" },
+            { text: "分支配置", link: "/config/branch-config" },
+            { text: "提交配置", link: "/config/commit-config" },
+            { text: "配置示例", link: "/config/examples" },
+          ],
+        },
+      ],
     },
 
     // 社交链接
     socialLinks: [
-      { icon: 'github', link: 'https://github.com/iamzjt-front-end/git-workflow' },
-      { icon: 'npm', link: 'https://www.npmjs.com/package/@zjex/git-workflow' }
+      {
+        icon: "github",
+        link: "https://github.com/iamzjt-front-end/git-workflow",
+      },
+      { icon: "npm", link: "https://www.npmjs.com/package/@zjex/git-workflow" },
     ],
 
     // 页脚
     footer: {
-      message: 'Released under the MIT License.',
-      copyright: 'Copyright © 2026 zjex'
+      message: "Released under the MIT License.",
+      copyright: "Copyright © 2026 zjex",
     },
 
     // 搜索
     search: {
-      provider: 'local'
+      provider: "local",
     },
 
     // 编辑链接
     editLink: {
-      pattern: 'https://github.com/iamzjt-front-end/git-workflow/edit/main/docs/:path',
-      text: '在 GitHub 上编辑此页'
+      pattern:
+        "https://github.com/iamzjt-front-end/git-workflow/edit/main/docs/:path",
+      text: "在 GitHub 上编辑此页",
     },
 
     // 最后更新时间
     lastUpdated: {
-      text: '最后更新',
+      text: "最后更新",
       formatOptions: {
-        dateStyle: 'short',
-        timeStyle: 'medium'
-      }
+        dateStyle: "short",
+        timeStyle: "medium",
+      },
     },
 
     // 大纲配置
     outline: {
       level: [2, 3],
-      label: '页面导航'
+      label: "页面导航",
     },
 
     // 返回顶部
-    returnToTopLabel: '返回顶部',
+    returnToTopLabel: "返回顶部",
 
     // 深色模式切换
-    darkModeSwitchLabel: '主题',
-    lightModeSwitchTitle: '切换到浅色模式',
-    darkModeSwitchTitle: '切换到深色模式'
+    darkModeSwitchLabel: "主题",
+    lightModeSwitchTitle: "切换到浅色模式",
+    darkModeSwitchTitle: "切换到深色模式",
   },
 
   // Markdown 配置
   markdown: {
     lineNumbers: true,
     theme: {
-      light: 'github-light',
-      dark: 'github-dark'
-    }
+      light: "github-light",
+      dark: "github-dark",
+    },
   },
 
   // 头部配置
   head: [
-    ['link', { rel: 'icon', type: 'image/svg+xml', href: '/git-workflow/favicon.svg' }],
-    ['link', { rel: 'apple-touch-icon', href: '/git-workflow/logo.svg' }],
-    ['meta', { name: 'theme-color', content: '#646cff' }],
-    ['meta', { name: 'og:type', content: 'website' }],
-    ['meta', { name: 'og:locale', content: 'zh-CN' }],
-    ['meta', { name: 'og:site_name', content: 'Git Workflow' }],
-    ['meta', { name: 'og:image', content: '/git-workflow/logo.svg' }],
-    ['meta', { name: 'og:title', content: 'Git Workflow - 极简的 Git 工作流 CLI 工具' }],
-    ['meta', { name: 'og:description', content: '让分支管理和版本发布变得轻松愉快' }]
-  ]
-})
+    [
+      "link",
+      { rel: "icon", type: "image/svg+xml", href: "/git-workflow/favicon.svg" },
+    ],
+    ["link", { rel: "apple-touch-icon", href: "/git-workflow/logo.svg" }],
+    ["meta", { name: "theme-color", content: "#646cff" }],
+    ["meta", { name: "og:type", content: "website" }],
+    ["meta", { name: "og:locale", content: "zh-CN" }],
+    ["meta", { name: "og:site_name", content: "Git Workflow" }],
+    ["meta", { name: "og:image", content: "/git-workflow/logo.svg" }],
+    [
+      "meta",
+      {
+        name: "og:title",
+        content: "Git Workflow - 极简的 Git 工作流 CLI 工具",
+      },
+    ],
+    [
+      "meta",
+      { name: "og:description", content: "让分支管理和版本发布变得轻松愉快" },
+    ],
+  ],
+});