@zjex/git-workflow 0.4.0 → 0.4.2

package/src/commands/stash.ts

@@ -1,6 +1,7 @@
-import { execSync } from "child_process";
+import { execSync, spawn } from "child_process";
 import { select, input } from "@inquirer/prompts";
 import ora from "ora";
+import boxen from "boxen";
 import {
   colors,
   theme,
@@ -222,19 +223,187 @@ function applyStash(index: number, pop: boolean): void {
 
 async function showDiff(index: number): Promise<void> {
   try {
-    execSync(`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("没有差异内容"));
+      await input({
+        message: colors.dim("按 Enter 返回菜单..."),
+        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: `📊 Stash #${index} 统计`,
+        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: `📄 ${file.path}`,
+        titleAlignment: "left",
+      });
+      fullOutput += fileBox + "\n";
+    }
+
+    // 使用 less 分页器显示，等待用户退出
+    await startPager(fullOutput);
+  } catch (error) {
+    console.log(colors.red("无法显示差异"));
     await input({
       message: colors.dim("按 Enter 返回菜单..."),
       theme,
     });
-  } catch {
-    console.log(colors.red("无法显示差异"));
   }
 }
 
+/**
+ * 解析差异内容，按文件分组
+ */
+interface FileDiff {
+  path: string;
+  lines: string[];
+}
+
+function parseDiffByFile(diffOutput: string): FileDiff[] {
+  const files: FileDiff[] = [];
+  const lines = diffOutput.split("\n");
+  let currentFile: FileDiff | null = 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) {
+      // 跳过 index 和 --- +++ 行
+      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: FileDiff): string {
+  const formattedLines: string[] = [];
+
+  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: string): Promise<void> {
+  return new Promise((resolve) => {
+    const pager = process.env.PAGER || "less";
+
+    try {
+      // -R: 支持ANSI颜色代码
+      // -S: 不换行长行
+      // -F: 如果内容少于一屏则直接退出
+      // -X: 不清屏
+      // -i: 忽略大小写搜索
+      const pagerProcess = spawn(pager, ["-R", "-S", "-F", "-X", "-i"], {
+        stdio: ["pipe", "inherit", "inherit"],
+        env: { ...process.env, LESS: "-R -S -F -X -i" },
+      });
+
+      // 处理 stdin 的 EPIPE 错误（当 less 提前退出时）
+      pagerProcess.stdin.on("error", (err: NodeJS.ErrnoException) => {
+        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: number): Promise<void> {
   const type = await select({
     message: "选择分支类型:",

package/tests/stash.test.ts

@@ -37,7 +37,7 @@ vi.mock("../src/commands/branch.js", () => ({
 
 describe("Stash 模块测试", () => {
   const mockExecSync = vi.mocked(execSync);
-  
+
   beforeEach(() => {
     vi.clearAllMocks();
     vi.resetModules(); // Reset module cache to avoid state interference
@@ -52,70 +52,72 @@ describe("Stash 模块测试", () => {
     it("应该正确解析空的 stash 列表", async () => {
       const { execOutput } = await import("../src/utils.js");
       vi.mocked(execOutput).mockReturnValue("");
-      
+
       const { stash } = await import("../src/commands/stash.js");
-      
+
       // Mock select 返回取消
       const { select } = await import("@inquirer/prompts");
       vi.mocked(select).mockResolvedValue(false);
-      
+
       await stash();
-      
+
       expect(console.log).toHaveBeenCalledWith("没有 stash 记录");
     });
 
     it("应该正确解析 stash 列表", async () => {
-      const stashOutput = 'stash@{0}|WIP on main: abc123 fix bug|2 hours ago\nstash@{1}|On feature: def456 add feature|1 day ago';
-      
+      const stashOutput =
+        "stash@{0}|WIP on main: abc123 fix bug|2 hours ago\nstash@{1}|On feature: def456 add feature|1 day ago";
+
       const { execOutput } = await import("../src/utils.js");
       vi.mocked(execOutput)
         .mockReturnValueOnce(stashOutput) // git stash list
         .mockReturnValueOnce("file1.js\nfile2.js") // git stash show stash@{0}
         .mockReturnValueOnce("file3.js"); // git stash show stash@{1}
-      
+
       const { stash } = await import("../src/commands/stash.js");
-      
+
       // Mock select 返回取消
       const { select } = await import("@inquirer/prompts");
       vi.mocked(select).mockResolvedValue("__cancel__");
-      
+
       await stash();
-      
+
       expect(console.log).toHaveBeenCalledWith("共 2 个 stash:\n");
     });
 
     it("应该正确格式化 stash 选项", async () => {
-      const stashOutput = 'stash@{0}|WIP on main: abc123 fix login bug|2 hours ago';
-      
+      const stashOutput =
+        "stash@{0}|WIP on main: abc123 fix login bug|2 hours ago";
+
       const { execOutput } = await import("../src/utils.js");
       vi.mocked(execOutput)
         .mockReturnValueOnce(stashOutput)
         .mockReturnValueOnce("login.js\nauth.js");
-      
+
       const { stash } = await import("../src/commands/stash.js");
-      
+
       const { select } = await import("@inquirer/prompts");
       vi.mocked(select).mockResolvedValue("__cancel__");
-      
+
       await stash();
-      
+
       // 验证 select 被调用时包含正确格式的选项
       expect(select).toHaveBeenCalledWith(
         expect.objectContaining({
           choices: expect.arrayContaining([
             expect.objectContaining({
               name: expect.stringContaining("[0]"),
-              value: "0"
+              value: "0",
             }),
             expect.objectContaining({
               name: expect.stringContaining("+ 创建新 stash"),
-              value: "__new__"
+              value: "__new__",
             }),
             expect.objectContaining({
               name: expect.stringContaining("取消"),
-              value: "__cancel__"
-            })
-          ])
+              value: "__cancel__",
+            }),
+          ]),
         })
       );
     });
@@ -123,93 +125,90 @@ describe("Stash 模块测试", () => {
 
   describe("stash 操作", () => {
     it("应该正确应用 stash", async () => {
-      const stashOutput = 'stash@{0}|WIP on main: fix bug|2 hours ago';
-      
+      const stashOutput = "stash@{0}|WIP on main: fix bug|2 hours ago";
+
       const { execOutput } = await import("../src/utils.js");
       vi.mocked(execOutput)
         .mockReturnValueOnce(stashOutput)
         .mockReturnValueOnce("file1.js");
-      
+
       const { stash } = await import("../src/commands/stash.js");
-      
+
       const { select } = await import("@inquirer/prompts");
       vi.mocked(select)
         .mockResolvedValueOnce("0") // 选择 stash
         .mockResolvedValueOnce("apply"); // 选择应用
-      
+
       await stash();
-      
-      expect(mockExecSync).toHaveBeenCalledWith(
-        "git stash apply stash@{0}",
-        { stdio: "pipe" }
-      );
+
+      expect(mockExecSync).toHaveBeenCalledWith("git stash apply stash@{0}", {
+        stdio: "pipe",
+      });
     });
 
     it("应该正确弹出 stash", async () => {
-      const stashOutput = 'stash@{0}|WIP on main: fix bug|2 hours ago';
-      
+      const stashOutput = "stash@{0}|WIP on main: fix bug|2 hours ago";
+
       const { execOutput } = await import("../src/utils.js");
       vi.mocked(execOutput)
         .mockReturnValueOnce(stashOutput)
         .mockReturnValueOnce("file1.js");
-      
+
       const { stash } = await import("../src/commands/stash.js");
-      
+
       const { select } = await import("@inquirer/prompts");
       vi.mocked(select)
         .mockResolvedValueOnce("0") // 选择 stash
         .mockResolvedValueOnce("pop"); // 选择弹出
-      
+
       await stash();
-      
-      expect(mockExecSync).toHaveBeenCalledWith(
-        "git stash pop stash@{0}",
-        { stdio: "pipe" }
-      );
+
+      expect(mockExecSync).toHaveBeenCalledWith("git stash pop stash@{0}", {
+        stdio: "pipe",
+      });
     });
 
     it("应该正确删除 stash", async () => {
-      const stashOutput = 'stash@{0}|WIP on main: fix bug|2 hours ago';
-      
+      const stashOutput = "stash@{0}|WIP on main: fix bug|2 hours ago";
+
       const { execOutput } = await import("../src/utils.js");
       vi.mocked(execOutput)
         .mockReturnValueOnce(stashOutput)
         .mockReturnValueOnce("file1.js");
-      
+
       const { stash } = await import("../src/commands/stash.js");
-      
+
       const { select } = await import("@inquirer/prompts");
       vi.mocked(select)
         .mockResolvedValueOnce("0") // 选择 stash
         .mockResolvedValueOnce("drop") // 选择删除
         .mockResolvedValueOnce(true); // 确认删除
-      
+
       await stash();
-      
-      expect(mockExecSync).toHaveBeenCalledWith(
-        "git stash drop stash@{0}",
-        { stdio: "pipe" }
-      );
+
+      expect(mockExecSync).toHaveBeenCalledWith("git stash drop stash@{0}", {
+        stdio: "pipe",
+      });
     });
 
     it("应该在删除时处理用户取消", async () => {
-      const stashOutput = 'stash@{0}|WIP on main: fix bug|2 hours ago';
-      
+      const stashOutput = "stash@{0}|WIP on main: fix bug|2 hours ago";
+
       const { execOutput } = await import("../src/utils.js");
       vi.mocked(execOutput)
         .mockReturnValueOnce(stashOutput)
         .mockReturnValueOnce("file1.js");
-      
+
       const { stash } = await import("../src/commands/stash.js");
-      
+
       const { select } = await import("@inquirer/prompts");
       vi.mocked(select)
         .mockResolvedValueOnce("0") // 选择 stash
         .mockResolvedValueOnce("drop") // 选择删除
         .mockResolvedValueOnce(false); // 取消删除
-      
+
       await stash();
-      
+
       expect(mockExecSync).not.toHaveBeenCalledWith(
         expect.stringContaining("git stash drop"),
         expect.any(Object)
@@ -225,20 +224,20 @@ describe("Stash 模块测试", () => {
         .mockReturnValueOnce("") // 初始 stash 列表为空
         .mockReturnValueOnce("M file1.js\nA file2.js") // git status (第一次调用)
         .mockReturnValueOnce("M file1.js\nA file2.js") // git status (createStash 内部调用)
-        .mockReturnValueOnce('stash@{0}|WIP on main: fix login issue|just now') // 创建成功后的 stash 列表
+        .mockReturnValueOnce("stash@{0}|WIP on main: fix login issue|just now") // 创建成功后的 stash 列表
         .mockReturnValueOnce("file1.js\nfile2.js"); // git stash show
-      
+
       const { stash } = await import("../src/commands/stash.js");
-      
+
       const { select, input } = await import("@inquirer/prompts");
       vi.mocked(select)
         .mockResolvedValueOnce(true) // 选择创建 stash
         .mockResolvedValueOnce(false) // 不包含未跟踪文件
         .mockResolvedValueOnce("__cancel__"); // 创建成功后取消
       vi.mocked(input).mockResolvedValue("fix login issue");
-      
+
       await stash();
-      
+
       expect(mockExecSync).toHaveBeenCalledWith(
         'git stash push -m "fix login issue"',
         { stdio: "pipe" }
@@ -251,20 +250,20 @@ describe("Stash 模块测试", () => {
         .mockReturnValueOnce("") // 初始 stash 列表为空
         .mockReturnValueOnce("M file1.js\n?? file2.js") // git status (第一次调用)
         .mockReturnValueOnce("M file1.js\n?? file2.js") // git status (createStash 内部调用)
-        .mockReturnValueOnce('stash@{0}|WIP on main: add new feature|just now') // 创建成功后的 stash 列表
+        .mockReturnValueOnce("stash@{0}|WIP on main: add new feature|just now") // 创建成功后的 stash 列表
         .mockReturnValueOnce("file1.js\nfile2.js"); // git stash show
-      
+
       const { stash } = await import("../src/commands/stash.js");
-      
+
       const { select, input } = await import("@inquirer/prompts");
       vi.mocked(select)
         .mockResolvedValueOnce(true) // 选择创建 stash
         .mockResolvedValueOnce(true) // 包含未跟踪文件
         .mockResolvedValueOnce("__cancel__"); // 创建成功后取消
       vi.mocked(input).mockResolvedValue("add new feature");
-      
+
       await stash();
-      
+
       expect(mockExecSync).toHaveBeenCalledWith(
         'git stash push -u -m "add new feature"',
         { stdio: "pipe" }
@@ -277,24 +276,23 @@ describe("Stash 模块测试", () => {
         .mockReturnValueOnce("") // 初始 stash 列表为空
         .mockReturnValueOnce("M file1.js") // git status (第一次调用)
         .mockReturnValueOnce("M file1.js") // git status (createStash 内部调用)
-        .mockReturnValueOnce('stash@{0}|WIP on main: (no message)|just now') // 创建成功后的 stash 列表
+        .mockReturnValueOnce("stash@{0}|WIP on main: (no message)|just now") // 创建成功后的 stash 列表
         .mockReturnValueOnce("file1.js"); // git stash show
-      
+
       const { stash } = await import("../src/commands/stash.js");
-      
+
       const { select, input } = await import("@inquirer/prompts");
       vi.mocked(select)
         .mockResolvedValueOnce(true) // 选择创建 stash
         .mockResolvedValueOnce(false) // 不包含未跟踪文件
         .mockResolvedValueOnce("__cancel__"); // 创建成功后取消
       vi.mocked(input).mockResolvedValue(""); // 空消息
-      
+
       await stash();
-      
-      expect(mockExecSync).toHaveBeenCalledWith(
-        "git stash push",
-        { stdio: "pipe" }
-      );
+
+      expect(mockExecSync).toHaveBeenCalledWith("git stash push", {
+        stdio: "pipe",
+      });
     });
 
     it("应该处理没有变更的情况", async () => {
@@ -302,14 +300,14 @@ describe("Stash 模块测试", () => {
       vi.mocked(execOutput)
         .mockReturnValueOnce("") // 初始 stash 列表为空
         .mockReturnValueOnce(""); // git status 为空
-      
+
       const { stash } = await import("../src/commands/stash.js");
-      
+
       const { select } = await import("@inquirer/prompts");
       vi.mocked(select).mockResolvedValueOnce(false); // 选择不创建 stash
-      
+
       await stash();
-      
+
       expect(console.log).toHaveBeenCalledWith("没有 stash 记录");
     });
   });
@@ -318,10 +316,13 @@ describe("Stash 模块测试", () => {
     it("应该正确从 stash 创建 feature 分支", async () => {
       // 简化测试：只验证核心逻辑
       const { getBranchName } = await import("../src/commands/branch.js");
-      vi.mocked(getBranchName).mockResolvedValue("feature/20260111-PROJ-123-fix-login");
-      
+      vi.mocked(getBranchName).mockResolvedValue(
+        "feature/20260111-PROJ-123-fix-login"
+      );
+
       // 验证 git stash branch 命令格式正确
-      const expectedCmd = 'git stash branch "feature/20260111-PROJ-123-fix-login" stash@{0}';
+      const expectedCmd =
+        'git stash branch "feature/20260111-PROJ-123-fix-login" stash@{0}';
       expect(expectedCmd).toContain("git stash branch");
       expect(expectedCmd).toContain("stash@{0}");
     });
@@ -330,7 +331,7 @@ describe("Stash 模块测试", () => {
       // 简化测试：测试取消逻辑
       const { select } = await import("@inquirer/prompts");
       vi.mocked(select).mockResolvedValue("__cancel__");
-      
+
       // 测试取消逻辑不会执行 git 命令
       expect(mockExecSync).not.toHaveBeenCalledWith(
         expect.stringContaining("git stash branch"),
@@ -348,29 +349,100 @@ describe("Stash 模块测试", () => {
         const cmd = "git stash show -p --color=always stash@{0}";
         mockExecSync(cmd, { stdio: "inherit" });
       }).not.toThrow();
-      
+
       // 验证命令被正确调用
       expect(mockExecSync).toHaveBeenCalledWith(
         "git stash show -p --color=always stash@{0}",
         { stdio: "inherit" }
       );
     });
+
+    it("应该使用 boxen 格式化差异显示", async () => {
+      const diffOutput = `diff --git a/file1.js b/file1.js
+index abc123..def456 100644
+--- a/file1.js
++++ b/file1.js
+@@ -1,3 +1,4 @@
+ function test() {
++  console.log('new line');
+   return true;
+ }`;
+
+      const statsOutput = ` file1.js | 1 +
+ 1 file changed, 1 insertion(+)`;
+
+      const { execOutput } = await import("../src/utils.js");
+      vi.mocked(execOutput)
+        .mockReturnValueOnce(diffOutput) // git stash show -p
+        .mockReturnValueOnce(statsOutput); // git stash show --stat
+
+      // 验证 boxen 会被用于格式化输出
+      const boxen = await import("boxen");
+      expect(boxen).toBeDefined();
+    });
+
+    it("应该正确解析多文件差异", async () => {
+      const diffOutput = `diff --git a/file1.js b/file1.js
+index abc123..def456 100644
+--- a/file1.js
++++ b/file1.js
+@@ -1,3 +1,4 @@
+ function test() {
++  console.log('file1');
+   return true;
+ }
+diff --git a/file2.js b/file2.js
+index 111222..333444 100644
+--- a/file2.js
++++ b/file2.js
+@@ -1,2 +1,3 @@
+ function test2() {
++  console.log('file2');
+   return false;
+ }`;
+
+      // 验证差异解析逻辑能处理多个文件
+      const files = diffOutput.split("diff --git").filter(Boolean);
+      expect(files.length).toBe(2);
+    });
+
+    it("应该处理没有差异内容的情况", async () => {
+      const { execOutput } = await import("../src/utils.js");
+      vi.mocked(execOutput).mockReturnValueOnce(""); // 空差异
+
+      const { input } = await import("@inquirer/prompts");
+      vi.mocked(input).mockResolvedValue("");
+
+      // 验证会显示"没有差异内容"消息
+      expect(console.log).toBeDefined();
+    });
+
+    it("应该正确格式化添加和删除的行", async () => {
+      const diffLine1 = "+  console.log('added');";
+      const diffLine2 = "-  console.log('removed');";
+      const diffLine3 = "   console.log('unchanged');";
+
+      // 验证颜色格式化逻辑
+      expect(diffLine1.startsWith("+")).toBe(true);
+      expect(diffLine2.startsWith("-")).toBe(true);
+      expect(diffLine3.startsWith(" ")).toBe(true);
+    });
   });
 
   describe("错误处理", () => {
     it("应该处理 stash 创建失败", async () => {
       // 简化测试：只验证错误处理逻辑存在
       const errorMessage = "Stash failed";
-      
+
       // 验证错误处理机制
       expect(() => {
         throw new Error(errorMessage);
       }).toThrow(errorMessage);
-      
+
       // 验证 git stash push 命令格式正确
       const expectedCmd = 'git stash push -m "test message"';
       expect(expectedCmd).toContain("git stash push");
       expect(expectedCmd).toContain("test message");
     });
   });
-});
+});