@zjex/git-workflow 0.4.6 → 0.4.7

package/dist/index.js

@@ -84,7 +84,8 @@ function execAsync(command, spinner) {
 ${stdoutOutput}`));
         }
         if (errorOutput) {
-          console.log(colors.dim(`[DEBUG] \u9519\u8BEF\u8F93\u51FA:
+          const label = code === 0 ? "\u8F93\u51FA\u4FE1\u606F" : "\u9519\u8BEF\u8F93\u51FA";
+          console.log(colors.dim(`[DEBUG] ${label}:
 ${errorOutput}`));
         }
       }
@@ -1059,6 +1060,25 @@ async function createTag(inputPrefix) {
 }
 async function doCreateTag(tagName) {
   divider();
+  const hasCommits = execOutput("git rev-parse HEAD 2>/dev/null");
+  if (!hasCommits) {
+    console.log(colors.red("\u5F53\u524D\u4ED3\u5E93\u6CA1\u6709\u4EFB\u4F55\u63D0\u4EA4"));
+    console.log("");
+    console.log(colors.dim("  \u63D0\u793A: \u9700\u8981\u5148\u521B\u5EFA\u81F3\u5C11\u4E00\u4E2A\u63D0\u4EA4\u624D\u80FD\u6253 tag:"));
+    console.log(colors.cyan("  git add ."));
+    console.log(colors.cyan('  git commit -m "Initial commit"'));
+    console.log(colors.cyan("  gw tag"));
+    return;
+  }
+  const existingTags = execOutput("git tag -l").split("\n").filter(Boolean);
+  if (existingTags.includes(tagName)) {
+    console.log(colors.red(`Tag ${tagName} \u5DF2\u5B58\u5728`));
+    console.log("");
+    console.log(colors.dim("  \u63D0\u793A: \u5982\u9700\u91CD\u65B0\u521B\u5EFA\uFF0C\u8BF7\u5148\u5220\u9664\u65E7 tag:"));
+    console.log(colors.cyan(`  git tag -d ${tagName}`));
+    console.log(colors.cyan(`  git push origin --delete ${tagName}`));
+    return;
+  }
   const spinner = ora2(`\u6B63\u5728\u521B\u5EFA tag: ${tagName}`).start();
   const success = await execWithSpinner(
     `git tag -a "${tagName}" -m "Release ${tagName}"`,
@@ -1206,9 +1226,12 @@ async function updateTag() {
     spinner.fail("tag \u91CD\u547D\u540D\u5931\u8D25");
     return;
   }
-  const deleteSuccess = await execAsync(`git tag -d "${oldTag}"`, spinner);
-  if (!deleteSuccess) {
+  const deleteResult = await execAsync(`git tag -d "${oldTag}"`, spinner);
+  if (!deleteResult.success) {
     spinner.fail("\u5220\u9664\u65E7 tag \u5931\u8D25");
+    if (deleteResult.error) {
+      console.log(colors.dim(`  ${deleteResult.error}`));
+    }
     return;
   }
   spinner.succeed(`Tag \u5DF2\u91CD\u547D\u540D: ${oldTag} \u2192 ${newTag}`);
@@ -1222,26 +1245,32 @@ async function updateTag() {
   });
   if (pushRemote) {
     const pushSpinner = ora2("\u6B63\u5728\u540C\u6B65\u5230\u8FDC\u7A0B...").start();
-    const pushNewSuccess = await execAsync(
+    const pushNewResult = await execAsync(
       `git push origin "${newTag}"`,
       pushSpinner
     );
-    if (!pushNewSuccess) {
+    if (!pushNewResult.success) {
       pushSpinner.warn(
         `\u8FDC\u7A0B\u540C\u6B65\u5931\u8D25\uFF0C\u53EF\u7A0D\u540E\u624B\u52A8\u6267\u884C:
   git push origin ${newTag}
   git push origin --delete ${oldTag}`
       );
+      if (pushNewResult.error) {
+        console.log(colors.dim(`  ${pushNewResult.error}`));
+      }
       return;
     }
-    const deleteOldSuccess = await execAsync(
+    const deleteOldResult = await execAsync(
       `git push origin --delete "${oldTag}"`,
       pushSpinner
     );
-    if (!deleteOldSuccess) {
+    if (!deleteOldResult.success) {
       pushSpinner.warn(
         `\u8FDC\u7A0B\u65E7 tag \u5220\u9664\u5931\u8D25\uFF0C\u53EF\u7A0D\u540E\u624B\u52A8\u6267\u884C: git push origin --delete ${oldTag}`
       );
+      if (deleteOldResult.error) {
+        console.log(colors.dim(`  ${deleteOldResult.error}`));
+      }
       return;
     }
     pushSpinner.succeed(`\u8FDC\u7A0B tag \u5DF2\u540C\u6B65: ${oldTag} \u2192 ${newTag}`);
@@ -1294,8 +1323,8 @@ async function cleanInvalidTags() {
   let localSuccess = 0;
   let localFailed = 0;
   for (const tag of invalidTags) {
-    const success = await execAsync(`git tag -d "${tag}"`, localSpinner);
-    if (success) {
+    const result = await execAsync(`git tag -d "${tag}"`, localSpinner);
+    if (result.success) {
       localSuccess++;
     } else {
       localFailed++;
@@ -1321,11 +1350,11 @@ async function cleanInvalidTags() {
     let remoteSuccess = 0;
     let remoteFailed = 0;
     for (const tag of invalidTags) {
-      const success = await execAsync(
+      const result = await execAsync(
         `git push origin --delete "${tag}"`,
         remoteSpinner
       );
-      if (success) {
+      if (result.success) {
         remoteSuccess++;
       } else {
         remoteFailed++;
@@ -2806,16 +2835,28 @@ function clearUpdateCache2() {
   }
 }
 async function getLatestVersion2(packageName) {
-  try {
-    const result = execSync4(`npm view ${packageName} version`, {
-      encoding: "utf-8",
-      timeout: 3e3,
-      stdio: ["pipe", "pipe", "ignore"]
+  return new Promise((resolve) => {
+    const npmView = spawn3("npm", ["view", packageName, "version"], {
+      stdio: ["ignore", "pipe", "ignore"],
+      timeout: 5e3
     });
-    return result.trim();
-  } catch {
-    return null;
-  }
+    let output = "";
+    if (npmView.stdout) {
+      npmView.stdout.on("data", (data) => {
+        output += data.toString();
+      });
+    }
+    npmView.on("close", (code) => {
+      if (code === 0 && output.trim()) {
+        resolve(output.trim());
+      } else {
+        resolve(null);
+      }
+    });
+    npmView.on("error", () => {
+      resolve(null);
+    });
+  });
 }
 function isUsingVolta2() {
   try {
@@ -3586,7 +3627,7 @@ process.on("SIGTERM", () => {
   console.log("");
   process.exit(0);
 });
-var version = true ? "0.4.6" : "0.0.0-dev";
+var version = true ? "0.4.7" : "0.0.0-dev";
 async function mainMenu() {
   console.log(
     colors.green(`

package/docs/.vitepress/config.ts

@@ -54,6 +54,8 @@ export default defineConfig({
           items: [
             { text: "开发指南", link: "/guide/development" },
             { text: "测试指南", link: "/guide/testing" },
+            { text: "Debug 模式", link: "/guide/debug-mode" },
+            { text: "命令引号处理", link: "/guide/command-quotes-handling" },
             { text: "API 文档", link: "/guide/api" },
             { text: "贡献指南", link: "/guide/contributing" },
           ],

package/package.json

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

package/scripts/generate-changelog-manual.js

@@ -30,7 +30,7 @@ for (let i = 0; i < tags.length; i++) {
   if (!previousTag) break;
 
   changelog += `## [${currentTag}](https://github.com/iamzjt-front-end/git-workflow/compare/${previousTag}...${currentTag}) (${getTagDate(
-    currentTag
+    currentTag,
   )})\n\n`;
 
   // 获取该版本的提交
@@ -39,79 +39,30 @@ for (let i = 0; i < tags.length; i++) {
     {
       encoding: "utf8",
       env: { ...process.env, LANG: "zh_CN.UTF-8", LC_ALL: "zh_CN.UTF-8" },
-    }
+    },
   )
     .trim()
     .split("\n")
     .filter(Boolean);
 
-  // 按类型分组
-  const groups = {
-    "✨ Features": [],
-    "🐛 Bug Fixes": [],
-    "📖 Documentation": [],
-    "🎨 Styles": [],
-    "♻️ Refactors": [],
-    "⚡ Performance": [],
-    "✅ Tests": [],
-    "🔧 Chore": [],
-    "🤖 CI": [],
+  // 格式化消息：处理多行内容（用 - 分隔的子任务）
+  const formatMessage = (msg, commitLink) => {
+    const parts = msg.split(" - ");
+    if (parts.length === 1) {
+      // 没有子任务，直接返回
+      return `${msg} ${commitLink}`;
+    }
+    // 有子任务，主标题后面加 commit hash，子任务换行缩进
+    const mainTitle = parts[0];
+    const subTasks = parts.slice(1);
+    return `${mainTitle} ${commitLink}\n  - ${subTasks.join("\n  - ")}`;
   };
 
+  // 直接输出提交信息，不分组
   commits.forEach((commit) => {
     const [message, hash] = commit.split("|");
     const link = `([${hash}](https://github.com/iamzjt-front-end/git-workflow/commit/${hash}))`;
-
-    if (message.match(/^(feat|✨)/i)) {
-      groups["✨ Features"].push(
-        `- ${message.replace(/^(feat|✨)[:(]\w*\)?:?\s*/i, "")} ${link}`
-      );
-    } else if (message.match(/^(fix|🐛)/i)) {
-      groups["🐛 Bug Fixes"].push(
-        `- ${message.replace(/^(fix|🐛)[:(]\w*\)?:?\s*/i, "")} ${link}`
-      );
-    } else if (message.match(/^(docs|📖|📝)/i)) {
-      groups["📖 Documentation"].push(
-        `- ${message.replace(/^(docs|📖|📝)[:(]\w*\)?:?\s*/i, "")} ${link}`
-      );
-    } else if (message.match(/^(style|🎨)/i)) {
-      groups["🎨 Styles"].push(
-        `- ${message.replace(/^(style|🎨)[:(]\w*\)?:?\s*/i, "")} ${link}`
-      );
-    } else if (message.match(/^(refactor|♻️)/i)) {
-      groups["♻️ Refactors"].push(
-        `- ${message.replace(/^(refactor|♻️)[:(]\w*\)?:?\s*/i, "")} ${link}`
-      );
-    } else if (message.match(/^(perf|⚡)/i)) {
-      groups["⚡ Performance"].push(
-        `- ${message.replace(/^(perf|⚡)[:(]\w*\)?:?\s*/i, "")} ${link}`
-      );
-    } else if (message.match(/^(test|✅)/i)) {
-      groups["✅ Tests"].push(
-        `- ${message.replace(/^(test|✅)[:(]\w*\)?:?\s*/i, "")} ${link}`
-      );
-    } else if (message.match(/^(chore|🔧|🏡)/i)) {
-      groups["🔧 Chore"].push(
-        `- ${message.replace(/^(chore|🔧|🏡)[:(]\w*\)?:?\s*/i, "")} ${link}`
-      );
-    } else if (message.match(/^(ci|🤖)/i)) {
-      groups["🤖 CI"].push(
-        `- ${message.replace(/^(ci|🤖)[:(]\w*\)?:?\s*/i, "")} ${link}`
-      );
-    } else {
-      groups["🔧 Chore"].push(`- ${message} ${link}`);
-    }
-  });
-
-  // 输出各分组
-  Object.entries(groups).forEach(([title, items]) => {
-    if (items.length > 0) {
-      changelog += `### ${title}\n\n`;
-      items.forEach((item) => {
-        changelog += `${item}\n`;
-      });
-      changelog += "\n";
-    }
+    changelog += `- ${formatMessage(message, link)}\n`;
   });
 
   changelog += "\n";

package/src/commands/tag.ts

@@ -418,6 +418,29 @@ export async function createTag(inputPrefix?: string): Promise<void> {
 async function doCreateTag(tagName: string): Promise<void> {
   divider();
 
+  // 检查是否有提交
+  const hasCommits = execOutput("git rev-parse HEAD 2>/dev/null");
+  if (!hasCommits) {
+    console.log(colors.red("当前仓库没有任何提交"));
+    console.log("");
+    console.log(colors.dim("  提示: 需要先创建至少一个提交才能打 tag:"));
+    console.log(colors.cyan("  git add ."));
+    console.log(colors.cyan('  git commit -m "Initial commit"'));
+    console.log(colors.cyan("  gw tag"));
+    return;
+  }
+
+  // 检查 tag 是否已存在
+  const existingTags = execOutput("git tag -l").split("\n").filter(Boolean);
+  if (existingTags.includes(tagName)) {
+    console.log(colors.red(`Tag ${tagName} 已存在`));
+    console.log("");
+    console.log(colors.dim("  提示: 如需重新创建，请先删除旧 tag:"));
+    console.log(colors.cyan(`  git tag -d ${tagName}`));
+    console.log(colors.cyan(`  git push origin --delete ${tagName}`));
+    return;
+  }
+
   const spinner = ora(`正在创建 tag: ${tagName}`).start();
   const success = await execWithSpinner(
     `git tag -a "${tagName}" -m "Release ${tagName}"`,
@@ -614,9 +637,12 @@ export async function updateTag(): Promise<void> {
   }
 
   // 删除旧 tag
-  const deleteSuccess = await execAsync(`git tag -d "${oldTag}"`, spinner);
-  if (!deleteSuccess) {
+  const deleteResult = await execAsync(`git tag -d "${oldTag}"`, spinner);
+  if (!deleteResult.success) {
     spinner.fail("删除旧 tag 失败");
+    if (deleteResult.error) {
+      console.log(colors.dim(`  ${deleteResult.error}`));
+    }
     return;
   }
 
@@ -635,26 +661,32 @@ export async function updateTag(): Promise<void> {
     const pushSpinner = ora("正在同步到远程...").start();
 
     // 推送新 tag
-    const pushNewSuccess = await execAsync(
+    const pushNewResult = await execAsync(
       `git push origin "${newTag}"`,
       pushSpinner,
     );
-    if (!pushNewSuccess) {
+    if (!pushNewResult.success) {
       pushSpinner.warn(
         `远程同步失败，可稍后手动执行:\n  git push origin ${newTag}\n  git push origin --delete ${oldTag}`,
       );
+      if (pushNewResult.error) {
+        console.log(colors.dim(`  ${pushNewResult.error}`));
+      }
       return;
     }
 
     // 删除远程旧 tag
-    const deleteOldSuccess = await execAsync(
+    const deleteOldResult = await execAsync(
       `git push origin --delete "${oldTag}"`,
       pushSpinner,
     );
-    if (!deleteOldSuccess) {
+    if (!deleteOldResult.success) {
       pushSpinner.warn(
         `远程旧 tag 删除失败，可稍后手动执行: git push origin --delete ${oldTag}`,
       );
+      if (deleteOldResult.error) {
+        console.log(colors.dim(`  ${deleteOldResult.error}`));
+      }
       return;
     }
 
@@ -729,8 +761,8 @@ export async function cleanInvalidTags(): Promise<void> {
   let localFailed = 0;
 
   for (const tag of invalidTags) {
-    const success = await execAsync(`git tag -d "${tag}"`, localSpinner);
-    if (success) {
+    const result = await execAsync(`git tag -d "${tag}"`, localSpinner);
+    if (result.success) {
       localSuccess++;
     } else {
       localFailed++;
@@ -761,11 +793,11 @@ export async function cleanInvalidTags(): Promise<void> {
     let remoteFailed = 0;
 
     for (const tag of invalidTags) {
-      const success = await execAsync(
+      const result = await execAsync(
         `git push origin --delete "${tag}"`,
         remoteSpinner,
       );
-      if (success) {
+      if (result.success) {
         remoteSuccess++;
       } else {
         remoteFailed++;

package/src/commands/update.ts

@@ -27,16 +27,32 @@ function clearUpdateCache(): void {
  * 获取 npm 上的最新版本
  */
 async function getLatestVersion(packageName: string): Promise<string | null> {
-  try {
-    const result = execSync(`npm view ${packageName} version`, {
-      encoding: "utf-8",
-      timeout: 3000,
-      stdio: ["pipe", "pipe", "ignore"],
+  return new Promise((resolve) => {
+    const npmView = spawn("npm", ["view", packageName, "version"], {
+      stdio: ["ignore", "pipe", "ignore"],
+      timeout: 5000,
     });
-    return result.trim();
-  } catch {
-    return null;
-  }
+
+    let output = "";
+
+    if (npmView.stdout) {
+      npmView.stdout.on("data", (data) => {
+        output += data.toString();
+      });
+    }
+
+    npmView.on("close", (code) => {
+      if (code === 0 && output.trim()) {
+        resolve(output.trim());
+      } else {
+        resolve(null);
+      }
+    });
+
+    npmView.on("error", () => {
+      resolve(null);
+    });
+  });
 }
 
 /**

package/src/utils.ts

@@ -166,7 +166,9 @@ export function execAsync(
           console.log(colors.dim(`[DEBUG] 标准输出:\n${stdoutOutput}`));
         }
         if (errorOutput) {
-          console.log(colors.dim(`[DEBUG] 错误输出:\n${errorOutput}`));
+          // 根据退出码决定标签：成功时显示"输出信息"，失败时显示"错误输出"
+          const label = code === 0 ? "输出信息" : "错误输出";
+          console.log(colors.dim(`[DEBUG] ${label}:\n${errorOutput}`));
         }
       }