@zjex/git-workflow 0.3.3 → 0.3.5

package/README.md

@@ -12,7 +12,7 @@
   <a href="https://github.com/iamzjt-front-end/git-workflow"><img src="https://img.shields.io/github/stars/iamzjt-front-end/git-workflow?style=flat&colorA=18181B&colorB=F59E0B" alt="github stars"></a>
   <a href="https://github.com/iamzjt-front-end/git-workflow/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/@zjex/git-workflow?style=flat&colorA=18181B&colorB=10B981" alt="license"></a>
   <a href="https://nodejs.org"><img src="https://img.shields.io/badge/node-%3E%3D18-339933?style=flat&logo=node.js&logoColor=white&colorA=18181B" alt="node version"></a>
-  <a href="https://github.com/iamzjt-front-end/git-workflow/actions"><img src="https://img.shields.io/badge/tests-266%20passed-success?style=flat&colorA=18181B" alt="tests"></a>
+  <a href="https://github.com/iamzjt-front-end/git-workflow/actions"><img src="https://img.shields.io/badge/tests-267%20passed-success?style=flat&colorA=18181B" alt="tests"></a>
   <a href="https://github.com/iamzjt-front-end/git-workflow/issues"><img src="https://img.shields.io/github/issues/iamzjt-front-end/git-workflow?style=flat&colorA=18181B&colorB=EC4899" alt="issues"></a>
 </p>
 

package/dist/index.js

@@ -100,12 +100,9 @@ async function checkForUpdates(currentVersion, packageName = "@zjex/git-workflow
   try {
     const cache = readCache();
     const now = Date.now();
-    if (cache?.latestVersion && cache.checkedVersion === currentVersion) {
-      if (cache.lastDismiss && now - cache.lastDismiss < DISMISS_INTERVAL) {
-        backgroundCheck(currentVersion, packageName);
-        return;
-      }
-      if (semver.gt(cache.latestVersion, currentVersion)) {
+    if (cache?.latestVersion && semver.gt(cache.latestVersion, currentVersion)) {
+      const isDismissed = cache.lastDismiss && now - cache.lastDismiss < DISMISS_INTERVAL;
+      if (!isDismissed) {
         if (interactive) {
           const action = await showUpdateMessage(
             currentVersion,
@@ -132,16 +129,19 @@ async function checkForUpdates(currentVersion, packageName = "@zjex/git-workflow
 function backgroundCheck(currentVersion, packageName) {
   const cache = readCache();
   const now = Date.now();
-  if (cache?.lastCheck && now - cache.lastCheck < CHECK_INTERVAL) {
+  const isUpToDate = cache?.latestVersion && !semver.gt(cache.latestVersion, currentVersion);
+  const recentlyChecked = cache?.lastCheck && now - cache.lastCheck < CHECK_INTERVAL;
+  if (isUpToDate && recentlyChecked) {
     return;
   }
-  Promise.resolve().then(async () => {
+  setImmediate(async () => {
     try {
       const latestVersion = await getLatestVersion(packageName);
       if (latestVersion) {
+        const cache2 = readCache() || {};
         writeCache({
-          ...cache,
-          lastCheck: now,
+          ...cache2,
+          lastCheck: Date.now(),
           latestVersion,
           checkedVersion: currentVersion
         });
@@ -307,13 +307,13 @@ function writeCache(cache) {
   } catch {
   }
 }
-var CHECK_INTERVAL, DISMISS_INTERVAL, CACHE_FILE;
+var DISMISS_INTERVAL, CHECK_INTERVAL, CACHE_FILE;
 var init_update_notifier = __esm({
   "src/update-notifier.ts"() {
     "use strict";
     init_utils();
-    CHECK_INTERVAL = 1e3 * 60 * 60 * 4;
     DISMISS_INTERVAL = 1e3 * 60 * 60 * 24;
+    CHECK_INTERVAL = 1e3 * 60 * 60 * 1;
     CACHE_FILE = ".gw-update-check";
   }
 });
@@ -669,13 +669,14 @@ async function listTags(prefix) {
     return;
   }
   if (prefix) {
-    console.log(colors.green(`\u4EE5 '${prefix}' \u5F00\u5934\u7684 tags:`));
-    const displayTags = tags.length > 20 ? tags.slice(-20) : tags;
-    displayTags.forEach((tag) => console.log(`  ${tag}`));
-    if (tags.length > 20) {
-      console.log(colors.yellow(`
-\u5171 ${tags.length} \u4E2A\uFF0C\u4EC5\u663E\u793A\u6700\u65B0 20 \u4E2A`));
+    console.log(
+      colors.green(`\u4EE5 '${prefix}' \u5F00\u5934\u7684 tags (\u5171 ${tags.length} \u4E2A):`)
+    );
+    if (tags.length > 5) {
+      console.log(colors.dim("  ..."));
     }
+    const displayTags = tags.slice(-5);
+    displayTags.forEach((tag) => console.log(`  ${tag}`));
     return;
   }
   const grouped = /* @__PURE__ */ new Map();
@@ -687,13 +688,12 @@ async function listTags(prefix) {
     grouped.get(prefix2).push(tag);
   });
   if (grouped.size === 1) {
-    console.log(colors.green("\u6240\u6709 tags:"));
-    const displayTags = tags.length > 20 ? tags.slice(-20) : tags;
-    displayTags.forEach((tag) => console.log(`  ${tag}`));
-    if (tags.length > 20) {
-      console.log(colors.yellow(`
-\u5171 ${tags.length} \u4E2A\uFF0C\u4EC5\u663E\u793A\u6700\u65B0 20 \u4E2A`));
+    console.log(colors.green(`\u6240\u6709 tags (\u5171 ${tags.length} \u4E2A):`));
+    if (tags.length > 5) {
+      console.log(colors.dim("  ..."));
     }
+    const displayTags = tags.slice(-5);
+    displayTags.forEach((tag) => console.log(`  ${tag}`));
     return;
   }
   console.log(colors.green("\u6240\u6709 tags (\u6309\u524D\u7F00\u5206\u7EC4):"));
@@ -2320,7 +2320,14 @@ async function commit() {
   }
   const spinner = ora4("\u6B63\u5728\u63D0\u4EA4...").start();
   try {
-    const finalStatus = parseGitStatus();
+    let finalStatus = parseGitStatus();
+    if (finalStatus.staged.length === 0 && finalStatus.unstaged.length > 0) {
+      const autoStage = config2.autoStage ?? true;
+      if (autoStage) {
+        execSync5("git add -A", { stdio: "pipe" });
+        finalStatus = parseGitStatus();
+      }
+    }
     if (finalStatus.staged.length === 0) {
       spinner.fail("\u6CA1\u6709\u6682\u5B58\u7684\u6587\u4EF6\u53EF\u4EE5\u63D0\u4EA4");
       console.log("");
@@ -2909,7 +2916,7 @@ process.on("SIGTERM", () => {
   console.log("");
   process.exit(0);
 });
-var version = true ? "0.3.3" : "0.0.0-dev";
+var version = true ? "0.3.5" : "0.0.0-dev";
 async function mainMenu() {
   console.log(
     colors.green(`

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zjex/git-workflow",
-	"version": "0.3.3",
+	"version": "0.3.5",
 	"description": "🚀 极简的 Git 工作流 CLI 工具，让分支管理和版本发布变得轻松愉快",
 	"type": "module",
 	"bin": {

package/src/commands/commit.ts

@@ -265,7 +265,17 @@ export async function commit(): Promise<void> {
 
   try {
     // 提交前再次检查是否有暂存的文件
-    const finalStatus = parseGitStatus();
+    let finalStatus = parseGitStatus();
+
+    // 如果暂存区为空，但有未暂存的更改，且开启了自动暂存，则重新暂存
+    if (finalStatus.staged.length === 0 && finalStatus.unstaged.length > 0) {
+      const autoStage = config.autoStage ?? true;
+      if (autoStage) {
+        execSync("git add -A", { stdio: "pipe" });
+        finalStatus = parseGitStatus();
+      }
+    }
+
     if (finalStatus.staged.length === 0) {
       spinner.fail("没有暂存的文件可以提交");
       console.log("");

package/src/commands/tag.ts

@@ -32,14 +32,16 @@ export async function listTags(prefix?: string): Promise<void> {
     return;
   }
 
-  // 4. 如果指定了前缀，直接显示单列（最多 20 个）
+  // 5. 如果指定了前缀，直接显示单列（最多 5 个）
   if (prefix) {
-    console.log(colors.green(`以 '${prefix}' 开头的 tags:`));
-    const displayTags = tags.length > 20 ? tags.slice(-20) : tags;
-    displayTags.forEach((tag) => console.log(`  ${tag}`));
-    if (tags.length > 20) {
-      console.log(colors.yellow(`\n共 ${tags.length} 个，仅显示最新 20 个`));
+    console.log(
+      colors.green(`以 '${prefix}' 开头的 tags (共 ${tags.length} 个):`)
+    );
+    if (tags.length > 5) {
+      console.log(colors.dim("  ..."));
     }
+    const displayTags = tags.slice(-5);
+    displayTags.forEach((tag) => console.log(`  ${tag}`));
     return;
   }
 
@@ -55,14 +57,14 @@ export async function listTags(prefix?: string): Promise<void> {
     grouped.get(prefix)!.push(tag);
   });
 
-  // 6. 如果只有一个前缀，使用单列显示（最多 20 个）
+  // 7. 如果只有一个前缀，使用单列显示（最多 5 个）
   if (grouped.size === 1) {
-    console.log(colors.green("所有 tags:"));
-    const displayTags = tags.length > 20 ? tags.slice(-20) : tags;
-    displayTags.forEach((tag) => console.log(`  ${tag}`));
-    if (tags.length > 20) {
-      console.log(colors.yellow(`\n共 ${tags.length} 个，仅显示最新 20 个`));
+    console.log(colors.green(`所有 tags (共 ${tags.length} 个):`));
+    if (tags.length > 5) {
+      console.log(colors.dim("  ..."));
     }
+    const displayTags = tags.slice(-5);
+    displayTags.forEach((tag) => console.log(`  ${tag}`));
     return;
   }
 

package/src/update-notifier.ts

@@ -8,8 +8,8 @@ import ora from "ora";
 import semver from "semver";
 import { colors } from "./utils.js";
 
-const CHECK_INTERVAL = 1000 * 60 * 60 * 4; // 4 小时检查一次
 const DISMISS_INTERVAL = 1000 * 60 * 60 * 24; // 24 小时后再次提示
+const CHECK_INTERVAL = 1000 * 60 * 60 * 1; // 已是最新版本时，1 小时检查一次
 const CACHE_FILE = ".gw-update-check";
 
 interface UpdateCache {
@@ -20,7 +20,8 @@ interface UpdateCache {
 }
 
 /**
- * 检查是否有新版本（异步静默检查）
+ * 检查是否有新版本
+ * 策略：后台异步检查，下次运行时提示
  * @param currentVersion 当前版本
  * @param packageName 包名
  * @param interactive 是否交互式（true: 显示完整提示并可选择更新，false: 只显示简单提示）
@@ -34,19 +35,17 @@ export async function checkForUpdates(
     const cache = readCache();
     const now = Date.now();
 
-    // 1. 先检查缓存中是否有新版本需要提示
-    if (cache?.latestVersion && cache.checkedVersion === currentVersion) {
-      // 如果用户在 24 小时内关闭过提示，跳过
-      if (cache.lastDismiss && now - cache.lastDismiss < DISMISS_INTERVAL) {
-        // 继续后台检查（不阻塞）
-        backgroundCheck(currentVersion, packageName);
-        return;
-      }
+    // 1. 先用缓存的结果提示用户（如果有新版本）
+    if (
+      cache?.latestVersion &&
+      semver.gt(cache.latestVersion, currentVersion)
+    ) {
+      // 检查用户是否在 24 小时内关闭过提示
+      const isDismissed =
+        cache.lastDismiss && now - cache.lastDismiss < DISMISS_INTERVAL;
 
-      // 使用 semver 比较版本
-      if (semver.gt(cache.latestVersion, currentVersion)) {
+      if (!isDismissed) {
         if (interactive) {
-          // 交互式模式：显示完整提示，可选择更新
           const action = await showUpdateMessage(
             currentVersion,
             cache.latestVersion,
@@ -59,13 +58,12 @@ export async function checkForUpdates(
             writeCache({ ...cache, lastDismiss: now });
           }
         } else {
-          // 非交互式模式：只显示简单提示
           showSimpleNotification(currentVersion, cache.latestVersion);
         }
       }
     }
 
-    // 2. 后台异步检查更新（不阻塞当前命令）
+    // 2. 后台异步检查更新（每次都检查，不阻塞）
     backgroundCheck(currentVersion, packageName);
   } catch (error) {
     // 如果是用户按 Ctrl+C，重新抛出让全局处理
@@ -78,25 +76,33 @@ export async function checkForUpdates(
 
 /**
  * 后台异步检查更新（不阻塞）
+ * - 有新版本时：每次都检查
+ * - 已是最新版本时：1 小时检查一次
  */
 function backgroundCheck(currentVersion: string, packageName: string): void {
   const cache = readCache();
   const now = Date.now();
 
-  // 如果距离上次检查不到 4 小时，跳过
-  if (cache?.lastCheck && now - cache.lastCheck < CHECK_INTERVAL) {
+  // 如果已是最新版本，且距离上次检查不到 1 小时，跳过
+  const isUpToDate =
+    cache?.latestVersion && !semver.gt(cache.latestVersion, currentVersion);
+  const recentlyChecked =
+    cache?.lastCheck && now - cache.lastCheck < CHECK_INTERVAL;
+
+  if (isUpToDate && recentlyChecked) {
     return;
   }
 
-  // 使用 Promise 异步执行，不阻塞当前命令
-  Promise.resolve().then(async () => {
+  // 使用 setImmediate 确保不阻塞主流程
+  setImmediate(async () => {
     try {
       const latestVersion = await getLatestVersion(packageName);
 
       if (latestVersion) {
+        const cache = readCache() || {};
         writeCache({
           ...cache,
-          lastCheck: now,
+          lastCheck: Date.now(),
           latestVersion,
           checkedVersion: currentVersion,
         });

package/tests/update-notifier.test.ts

@@ -153,7 +153,7 @@ describe("Update Notifier 模块测试", () => {
       consoleSpy.mockRestore();
     });
 
-    it("4小时内不应该重复检查", async () => {
+    it("已是最新版本且1小时内不应该重复检查", async () => {
       const mockCache = {
         lastCheck: Date.now(),
         latestVersion: "1.0.0",
@@ -167,14 +167,14 @@ describe("Update Notifier 模块测试", () => {
       await checkForUpdates("1.0.0");
       await vi.runAllTimersAsync();
 
-      // writeFileSync 不应该被调用（因为在4小时内）
+      // writeFileSync 不应该被调用（因为已是最新版本且在1小时内）
       expect(writeFileSync).not.toHaveBeenCalled();
     });
 
-    it("超过4小时应该重新检查", async () => {
-      const fourHoursAgo = Date.now() - 5 * 60 * 60 * 1000; // 5小时前
+    it("已是最新版本但超过1小时应该重新检查", async () => {
+      const oneHourAgo = Date.now() - 2 * 60 * 60 * 1000; // 2小时前
       const mockCache = {
-        lastCheck: fourHoursAgo,
+        lastCheck: oneHourAgo,
         latestVersion: "1.0.0",
         checkedVersion: "1.0.0",
       };
@@ -189,6 +189,28 @@ describe("Update Notifier 模块测试", () => {
       expect(writeFileSync).toHaveBeenCalled();
     });
 
+    it("有新版本时每次都应该后台检查", async () => {
+      const mockCache = {
+        lastCheck: Date.now(), // 刚刚检查过
+        latestVersion: "1.0.1", // 有新版本
+        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();
+    });
+
     it("缓存文件损坏时应该静默处理", async () => {
       vi.mocked(existsSync).mockReturnValue(true);
       vi.mocked(readFileSync).mockReturnValue("invalid json");