@zjex/git-workflow 0.5.2 → 0.6.0

package/tests/tag.test.ts

@@ -1,46 +1,89 @@
 import { describe, it, expect } from "vitest";
+import {
+  extractTagPrefix,
+  getLatestTagCommand,
+  isValidVersionTag,
+  normalizeTagLookupStrategy,
+  shouldFetchAllTagsForCreateTag,
+} from "../src/tag-utils";
 
 describe("Tag 功能测试", () => {
+  describe("Tag 策略", () => {
+    it("默认应该使用 latest 策略", () => {
+      expect(normalizeTagLookupStrategy(undefined)).toBe("latest");
+      expect(normalizeTagLookupStrategy("unknown")).toBe("latest");
+    });
+
+    it("应该识别 latest 策略", () => {
+      expect(normalizeTagLookupStrategy("latest")).toBe("latest");
+    });
+
+    it("all 策略应该始终全量拉取 tags", () => {
+      expect(shouldFetchAllTagsForCreateTag("all", "v")).toBe(true);
+      expect(shouldFetchAllTagsForCreateTag("all")).toBe(true);
+    });
+
+    it("latest 策略在已知前缀时不应该全量拉取 tags", () => {
+      expect(shouldFetchAllTagsForCreateTag("latest", "v")).toBe(false);
+    });
+
+    it("latest 策略在未知前缀时应该回退为全量拉取", () => {
+      expect(shouldFetchAllTagsForCreateTag("latest")).toBe(true);
+    });
+
+    it("应该生成全量排序的最新 tag 查询命令", () => {
+      expect(getLatestTagCommand("v", "all")).toBe(
+        'git tag -l "v*" --sort=-v:refname',
+      );
+    });
+
+    it("应该生成按时间获取最新 tag 的查询命令", () => {
+      expect(getLatestTagCommand("v", "latest")).toBe(
+        'git for-each-ref --sort=-creatordate --format="%(refname:short)" "refs/tags/v*"',
+      );
+    });
+  });
+
   describe("前缀提取", () => {
     it("应该正确提取 v 前缀", () => {
       const tag = "v0.1.0";
-      const prefix = tag.replace(/[0-9].*/, "");
+      const prefix = extractTagPrefix(tag);
       expect(prefix).toBe("v");
     });
 
     it("应该正确提取 release- 前缀", () => {
       const tag = "release-1.0.0";
-      const prefix = tag.replace(/[0-9].*/, "");
+      const prefix = extractTagPrefix(tag);
       expect(prefix).toBe("release-");
     });
 
     it("应该正确提取 @ 开头的 scope 前缀", () => {
       const tag = "@scope/package@1.0.0";
-      const prefix = tag.replace(/[0-9].*/, "");
+      const prefix = extractTagPrefix(tag);
       expect(prefix).toBe("@scope/package@");
     });
 
     it("应该正确处理无前缀 tag", () => {
       const tag = "1.0.0";
-      const prefix = tag.replace(/[0-9].*/, "") || "(无前缀)";
+      const prefix = extractTagPrefix(tag) || "(无前缀)";
       expect(prefix).toBe("(无前缀)");
     });
 
     it("应该正确提取 g 前缀", () => {
       const tag = "g0.1.0";
-      const prefix = tag.replace(/[0-9].*/, "");
+      const prefix = extractTagPrefix(tag);
       expect(prefix).toBe("g");
     });
 
     it("应该正确提取带下划线的前缀", () => {
       const tag = "version_1.0.0";
-      const prefix = tag.replace(/[0-9].*/, "");
+      const prefix = extractTagPrefix(tag);
       expect(prefix).toBe("version_");
     });
 
     it("应该正确提取带点的前缀", () => {
       const tag = "v.1.0.0";
-      const prefix = tag.replace(/[0-9].*/, "");
+      const prefix = extractTagPrefix(tag);
       expect(prefix).toBe("v.");
     });
   });
@@ -51,7 +94,7 @@ describe("Tag 功能测试", () => {
       const grouped = new Map<string, string[]>();
 
       tags.forEach((tag) => {
-        const prefix = tag.replace(/[0-9].*/, "") || "(无前缀)";
+        const prefix = extractTagPrefix(tag) || "(无前缀)";
         if (!grouped.has(prefix)) {
           grouped.set(prefix, []);
         }
@@ -75,7 +118,7 @@ describe("Tag 功能测试", () => {
       const grouped = new Map<string, string[]>();
 
       tags.forEach((tag) => {
-        const prefix = tag.replace(/[0-9].*/, "") || "(无前缀)";
+        const prefix = extractTagPrefix(tag) || "(无前缀)";
         if (!grouped.has(prefix)) {
           grouped.set(prefix, []);
         }
@@ -94,7 +137,7 @@ describe("Tag 功能测试", () => {
       const grouped = new Map<string, string[]>();
 
       tags.forEach((tag) => {
-        const prefix = tag.replace(/[0-9].*/, "") || "(无前缀)";
+        const prefix = extractTagPrefix(tag) || "(无前缀)";
         if (!grouped.has(prefix)) {
           grouped.set(prefix, []);
         }
@@ -397,56 +440,56 @@ describe("Tag 功能测试", () => {
   describe("无效标签检测", () => {
     it("应该识别不包含数字的标签为无效", () => {
       const tag = "vnull";
-      const isInvalid = !/\d/.test(tag);
+      const isInvalid = !isValidVersionTag(tag);
 
       expect(isInvalid).toBe(true);
     });
 
     it("应该识别 vundefined 为无效标签", () => {
       const tag = "vundefined";
-      const isInvalid = !/\d/.test(tag);
+      const isInvalid = !isValidVersionTag(tag);
 
       expect(isInvalid).toBe(true);
     });
 
     it("应该识别空版本号为无效标签", () => {
       const tag = "v";
-      const isInvalid = !/\d/.test(tag);
+      const isInvalid = !isValidVersionTag(tag);
 
       expect(isInvalid).toBe(true);
     });
 
     it("应该识别纯字母标签为无效", () => {
       const tag = "release";
-      const isInvalid = !/\d/.test(tag);
+      const isInvalid = !isValidVersionTag(tag);
 
       expect(isInvalid).toBe(true);
     });
 
     it("应该识别包含数字的标签为有效", () => {
       const tag = "v1.0.0";
-      const isValid = /\d/.test(tag);
+      const isValid = isValidVersionTag(tag);
 
       expect(isValid).toBe(true);
     });
 
     it("应该识别预发布版本为有效", () => {
       const tag = "v1.0.0-beta.1";
-      const isValid = /\d/.test(tag);
+      const isValid = isValidVersionTag(tag);
 
       expect(isValid).toBe(true);
     });
 
     it("应该识别无前缀版本号为有效", () => {
       const tag = "1.0.0";
-      const isValid = /\d/.test(tag);
+      const isValid = isValidVersionTag(tag);
 
       expect(isValid).toBe(true);
     });
 
     it("应该识别带前缀的单数字版本为有效", () => {
       const tag = "v1";
-      const isValid = /\d/.test(tag);
+      const isValid = isValidVersionTag(tag);
 
       expect(isValid).toBe(true);
     });
@@ -463,7 +506,7 @@ describe("Tag 功能测试", () => {
         "v",
         "v2.0.0",
       ];
-      const invalidTags = allTags.filter((tag) => !/\d/.test(tag));
+      const invalidTags = allTags.filter((tag) => !isValidVersionTag(tag));
 
       expect(invalidTags).toEqual(["vnull", "vundefined", "v"]);
       expect(invalidTags.length).toBe(3);
@@ -471,7 +514,7 @@ describe("Tag 功能测试", () => {
 
     it("应该在没有无效标签时返回空数组", () => {
       const allTags = ["v1.0.0", "v1.1.0", "v2.0.0", "release-1.0.0"];
-      const invalidTags = allTags.filter((tag) => !/\d/.test(tag));
+      const invalidTags = allTags.filter((tag) => !isValidVersionTag(tag));
 
       expect(invalidTags).toEqual([]);
       expect(invalidTags.length).toBe(0);
@@ -479,7 +522,7 @@ describe("Tag 功能测试", () => {
 
     it("应该在全是无效标签时返回所有标签", () => {
       const allTags = ["vnull", "vundefined", "v", "release"];
-      const invalidTags = allTags.filter((tag) => !/\d/.test(tag));
+      const invalidTags = allTags.filter((tag) => !isValidVersionTag(tag));
 
       expect(invalidTags).toEqual(allTags);
       expect(invalidTags.length).toBe(4);
@@ -493,7 +536,7 @@ describe("Tag 功能测试", () => {
         "vundefined",
         "v2.0.0-beta.1",
       ];
-      const validTags = allTags.filter((tag) => /\d/.test(tag));
+      const validTags = allTags.filter(isValidVersionTag);
 
       expect(validTags).toEqual(["v1.0.0", "v1.1.0", "v2.0.0-beta.1"]);
       expect(validTags.length).toBe(3);
@@ -501,7 +544,7 @@ describe("Tag 功能测试", () => {
 
     it("应该处理空标签列表", () => {
       const allTags: string[] = [];
-      const invalidTags = allTags.filter((tag) => !/\d/.test(tag));
+      const invalidTags = allTags.filter((tag) => !isValidVersionTag(tag));
 
       expect(invalidTags).toEqual([]);
       expect(invalidTags.length).toBe(0);
@@ -516,7 +559,7 @@ describe("Tag 功能测试", () => {
         "g1.0.0",
         "tag",
       ];
-      const invalidTags = allTags.filter((tag) => !/\d/.test(tag));
+      const invalidTags = allTags.filter((tag) => !isValidVersionTag(tag));
 
       expect(invalidTags).toEqual(["vnull", "release-", "hotfix", "tag"]);
       expect(invalidTags.length).toBe(4);

package/tests/update-notifier.test.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
-import { execSync } from "child_process";
+import { execSync, spawn } from "child_process";
 import { readFileSync, writeFileSync, existsSync, unlinkSync } from "fs";
 import { homedir } from "os";
 import { checkForUpdates, clearUpdateCache } from "../src/update-notifier";
@@ -28,6 +28,11 @@ describe("Update Notifier 模块测试", () => {
     vi.clearAllMocks();
     vi.mocked(homedir).mockReturnValue("/home/user");
     vi.useFakeTimers();
+    
+    // Mock spawn 返回一个带 unref 的对象
+    vi.mocked(spawn).mockReturnValue({
+      unref: vi.fn(),
+    } as any);
   });
 
   afterEach(() => {
@@ -62,16 +67,20 @@ describe("Update Notifier 模块测试", () => {
   });
 
   describe("checkForUpdates 函数", () => {
-    it("没有缓存时应该后台检查", async () => {
+    it("没有缓存时应该启动后台检查", async () => {
       vi.mocked(existsSync).mockReturnValue(false);
-      vi.mocked(execSync).mockReturnValue("1.0.1" as any);
 
       await checkForUpdates("1.0.0");
 
-      // 等待异步操作
-      await vi.runAllTimersAsync();
-
-      expect(writeFileSync).toHaveBeenCalled();
+      // 没有缓存时应该启动子进程检查
+      expect(spawn).toHaveBeenCalledWith(
+        "node",
+        expect.arrayContaining(["-e", expect.any(String)]),
+        expect.objectContaining({
+          detached: true,
+          stdio: "ignore",
+        })
+      );
     });
 
     it("版本相同时不应该显示提示", async () => {
@@ -153,61 +162,20 @@ describe("Update Notifier 模块测试", () => {
       consoleSpy.mockRestore();
     });
 
-    it("每次运行都应该后台检查最新版本", async () => {
-      const mockCache = {
-        lastCheck: Date.now(),
-        latestVersion: "1.0.0",
-        checkedVersion: "1.0.0",
-      };
-
-      vi.mocked(existsSync).mockReturnValue(true);
-      vi.mocked(readFileSync).mockReturnValue(JSON.stringify(mockCache));
-      vi.mocked(execSync).mockReturnValue("1.0.1" as any);
-
-      await checkForUpdates("1.0.0");
-      await vi.runAllTimersAsync();
-
-      // 每次运行都应该后台检查
-      expect(writeFileSync).toHaveBeenCalled();
-    });
-
-    it("后台检查应该更新缓存中的最新版本", async () => {
-      const mockCache = {
-        lastCheck: Date.now() - 2 * 60 * 60 * 1000,
-        latestVersion: "1.0.0",
-        checkedVersion: "1.0.0",
-      };
-
-      vi.mocked(existsSync).mockReturnValue(true);
-      vi.mocked(readFileSync).mockReturnValue(JSON.stringify(mockCache));
-      vi.mocked(execSync).mockReturnValue("1.0.1" as any);
-
-      await checkForUpdates("1.0.0");
-      await vi.runAllTimersAsync();
-
-      expect(writeFileSync).toHaveBeenCalled();
-    });
-
-    it("有新版本时每次都应该后台检查", async () => {
+    it("每次运行都应该启动后台检查", async () => {
       const mockCache = {
         lastCheck: Date.now(), // 刚刚检查过
-        latestVersion: "1.0.1", // 有新版本
+        latestVersion: "1.0.0",
         checkedVersion: "1.0.0",
       };
 
       vi.mocked(existsSync).mockReturnValue(true);
       vi.mocked(readFileSync).mockReturnValue(JSON.stringify(mockCache));
-      vi.mocked(execSync).mockReturnValue("1.0.2" as any);
-
-      const consoleSpy = vi.spyOn(console, "log").mockImplementation(() => {});
 
       await checkForUpdates("1.0.0");
-      await vi.runAllTimersAsync();
-
-      // 即使刚检查过，有新版本时也应该继续检查
-      expect(writeFileSync).toHaveBeenCalled();
 
-      consoleSpy.mockRestore();
+      // 每次都应该启动子进程检查
+      expect(spawn).toHaveBeenCalled();
     });
 
     it("缓存文件损坏时应该静默处理", async () => {
@@ -310,7 +278,7 @@ describe("Update Notifier 模块测试", () => {
         { current: "1.0.0", latest: "1.0.1", shouldShow: true },
         { current: "1.0.0", latest: "1.1.0", shouldShow: true },
         { current: "1.0.0", latest: "2.0.0", shouldShow: true },
-        { current: "1.0.1", latest: "1.0.0", shouldShow: true }, // 回滚场景也应该提示
+        { current: "1.0.1", latest: "1.0.0", shouldShow: false }, // 本地版本更高，不提示
         { current: "1.0.0", latest: "1.0.0", shouldShow: false },
       ];
 
@@ -343,23 +311,8 @@ describe("Update Notifier 模块测试", () => {
   });
 
   describe("缓存读写", () => {
-    it("应该正确写入缓存", async () => {
-      vi.mocked(existsSync).mockReturnValue(false);
-      vi.mocked(execSync).mockReturnValue("1.0.1" as any);
-
-      await checkForUpdates("1.0.0");
-      await vi.runAllTimersAsync();
-
-      expect(writeFileSync).toHaveBeenCalledWith(
-        "/home/user/.gw-update-check",
-        expect.stringContaining("1.0.1"),
-        "utf-8"
-      );
-    });
-
     it("写入缓存失败时应该静默处理", async () => {
       vi.mocked(existsSync).mockReturnValue(false);
-      vi.mocked(execSync).mockReturnValue("1.0.1" as any);
       vi.mocked(writeFileSync).mockImplementation(() => {
         throw new Error("Write failed");
       });
@@ -380,24 +333,24 @@ describe("Update Notifier 模块测试", () => {
   describe("网络请求", () => {
     it("获取最新版本失败时应该静默处理", async () => {
       vi.mocked(existsSync).mockReturnValue(false);
-      vi.mocked(execSync).mockImplementation(() => {
-        throw new Error("Network error");
+      vi.mocked(spawn).mockImplementation(() => {
+        throw new Error("Spawn error");
       });
 
       await expect(checkForUpdates("1.0.0")).resolves.not.toThrow();
     });
 
-    it("应该使用正确的 npm 命令", async () => {
+    it("后台检查应该使用正确的参数", async () => {
       vi.mocked(existsSync).mockReturnValue(false);
-      vi.mocked(execSync).mockReturnValue("1.0.1" as any);
 
       await checkForUpdates("1.0.0", "@zjex/git-workflow");
-      await vi.runAllTimersAsync();
 
-      expect(execSync).toHaveBeenCalledWith(
-        "npm view @zjex/git-workflow version",
+      expect(spawn).toHaveBeenCalledWith(
+        "node",
+        expect.arrayContaining(["-e", expect.stringContaining("npm view @zjex/git-workflow version")]),
         expect.objectContaining({
-          timeout: 3000,
+          detached: true,
+          stdio: "ignore",
         })
       );
     });