@zjex/git-workflow 0.3.10 → 0.4.1

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,9 +197,9 @@ 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: 1,
+      margin: { top: 0, bottom: 0, left: 1, right: 1 },
       borderStyle: "round",
       borderColor: "yellow",
       align: "center",
@@ -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")),
           "",
@@ -1138,6 +1138,98 @@ async function updateTag() {
     }
   }
 }
+async function cleanInvalidTags() {
+  const fetchSpinner = ora2("\u6B63\u5728\u83B7\u53D6 tags...").start();
+  exec("git fetch --tags", true);
+  fetchSpinner.stop();
+  divider();
+  const allTags = execOutput("git tag -l").split("\n").filter(Boolean);
+  const invalidTags = allTags.filter((tag) => !/\d/.test(tag));
+  if (invalidTags.length === 0) {
+    console.log(colors.green("\u2705 \u6CA1\u6709\u627E\u5230\u65E0\u6548\u6807\u7B7E"));
+    return;
+  }
+  console.log(colors.yellow(`\u274C \u627E\u5230 ${invalidTags.length} \u4E2A\u65E0\u6548\u6807\u7B7E\uFF1A`));
+  console.log("");
+  for (const tag of invalidTags) {
+    try {
+      const commitHash = execOutput(`git rev-list -n 1 "${tag}"`).trim();
+      const commitDate = execOutput(`git log -1 --format=%ai "${tag}"`).trim();
+      const commitMsg = execOutput(`git log -1 --format=%s "${tag}"`).trim();
+      console.log(colors.red(`  \u6807\u7B7E: ${tag}`));
+      console.log(colors.dim(`    Commit: ${commitHash}`));
+      console.log(colors.dim(`    \u65E5\u671F: ${commitDate}`));
+      console.log(colors.dim(`    \u6D88\u606F: ${commitMsg}`));
+      console.log("");
+    } catch {
+      console.log(colors.red(`  \u6807\u7B7E: ${tag}`));
+      console.log(colors.dim(`    (\u65E0\u6CD5\u83B7\u53D6\u63D0\u4EA4\u4FE1\u606F)`));
+      console.log("");
+    }
+  }
+  divider();
+  const shouldClean = await select2({
+    message: "\u662F\u5426\u5220\u9664\u8FD9\u4E9B\u65E0\u6548\u6807\u7B7E\uFF1F",
+    choices: [
+      { name: "\u662F\uFF0C\u5220\u9664\u6240\u6709\u65E0\u6548\u6807\u7B7E", value: true },
+      { name: "\u5426\uFF0C\u53D6\u6D88\u64CD\u4F5C", value: false }
+    ],
+    theme
+  });
+  if (!shouldClean) {
+    console.log(colors.yellow("\u5DF2\u53D6\u6D88"));
+    return;
+  }
+  divider();
+  const localSpinner = ora2("\u6B63\u5728\u5220\u9664\u672C\u5730\u65E0\u6548\u6807\u7B7E...").start();
+  let localSuccess = 0;
+  let localFailed = 0;
+  for (const tag of invalidTags) {
+    try {
+      execSync3(`git tag -d "${tag}"`, { stdio: "pipe" });
+      localSuccess++;
+    } catch {
+      localFailed++;
+    }
+  }
+  if (localFailed === 0) {
+    localSpinner.succeed(`\u672C\u5730\u6807\u7B7E\u5DF2\u5220\u9664: ${localSuccess} \u4E2A`);
+  } else {
+    localSpinner.warn(
+      `\u672C\u5730\u6807\u7B7E\u5220\u9664: \u6210\u529F ${localSuccess} \u4E2A\uFF0C\u5931\u8D25 ${localFailed} \u4E2A`
+    );
+  }
+  const deleteRemote = await select2({
+    message: "\u662F\u5426\u540C\u65F6\u5220\u9664\u8FDC\u7A0B\u7684\u65E0\u6548\u6807\u7B7E\uFF1F",
+    choices: [
+      { name: "\u662F", value: true },
+      { name: "\u5426", value: false }
+    ],
+    theme
+  });
+  if (deleteRemote) {
+    const remoteSpinner = ora2("\u6B63\u5728\u5220\u9664\u8FDC\u7A0B\u65E0\u6548\u6807\u7B7E...").start();
+    let remoteSuccess = 0;
+    let remoteFailed = 0;
+    for (const tag of invalidTags) {
+      try {
+        execSync3(`git push origin --delete "${tag}"`, { stdio: "pipe" });
+        remoteSuccess++;
+      } catch {
+        remoteFailed++;
+      }
+    }
+    if (remoteFailed === 0) {
+      remoteSpinner.succeed(`\u8FDC\u7A0B\u6807\u7B7E\u5DF2\u5220\u9664: ${remoteSuccess} \u4E2A`);
+    } else {
+      remoteSpinner.warn(
+        `\u8FDC\u7A0B\u6807\u7B7E\u5220\u9664: \u6210\u529F ${remoteSuccess} \u4E2A\uFF0C\u5931\u8D25 ${remoteFailed} \u4E2A`
+      );
+    }
+  }
+  console.log("");
+  console.log(colors.green("\u2728 \u6E05\u7406\u5B8C\u6210\uFF01"));
+}
 
 // src/commands/release.ts
 init_utils();
@@ -1583,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 [];
@@ -1756,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:",
@@ -2482,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";
@@ -2534,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")),
             "",
@@ -2553,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")),
           "",
@@ -2581,7 +2775,7 @@ async function update(currentVersion) {
     clearUpdateCache2();
     console.log("");
     console.log(
-      boxen2(
+      boxen3(
         [
           colors.green(colors.bold("\u2728 \u66F4\u65B0\u5B8C\u6210\uFF01")),
           "",
@@ -2617,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");
@@ -2822,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",
@@ -2836,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" }
     });
@@ -2882,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",
@@ -2901,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",
@@ -2949,7 +3143,7 @@ process.on("SIGTERM", () => {
   console.log("");
   process.exit(0);
 });
-var version = true ? "0.3.10" : "0.0.0-dev";
+var version = true ? "0.4.1" : "0.0.0-dev";
 async function mainMenu() {
   console.log(
     colors.green(`
@@ -2975,7 +3169,7 @@ async function mainMenu() {
         value: "hotfix"
       },
       {
-        name: `[3] \u{1F5D1}\uFE0F  \u5220\u9664\u5206\u652F               ${colors.dim("gw d")}`,
+        name: `[3] \u{1F5D1}\uFE0F  \u5220\u9664\u5206\u652F               ${colors.dim("gw brd")}`,
         value: "delete"
       },
       {
@@ -2999,15 +3193,15 @@ async function mainMenu() {
         value: "tags"
       },
       {
-        name: `[9] \u{1F4E6} \u53D1\u5E03\u7248\u672C               ${colors.dim("gw r")}`,
+        name: `[9] \uFFFD \u53D1\u5E03\u7248\u672C               ${colors.dim("gw r")}`,
         value: "release"
       },
       {
-        name: `[a] \u{1F4BE} \u7BA1\u7406 stash             ${colors.dim("gw s")}`,
+        name: `[a] \uFFFD \u7BA1\u7406 stash             ${colors.dim("gw s")}`,
         value: "stash"
       },
       {
-        name: `[b] \u{1F4CA} \u67E5\u770B\u65E5\u5FD7               ${colors.dim("gw log")}`,
+        name: `[b] \uFFFD \u67E5\u770B\u65E5\u5FD7               ${colors.dim("gw log")}`,
         value: "log"
       },
       {
@@ -3089,7 +3283,7 @@ cli.command("hotfix", "\u521B\u5EFA hotfix \u5206\u652F").alias("fix").alias("h"
   checkGitRepo();
   return createBranch("hotfix", options.base);
 });
-cli.command("delete [branch]", "\u5220\u9664\u672C\u5730/\u8FDC\u7A0B\u5206\u652F").alias("del").alias("d").action(async (branch) => {
+cli.command("br:del [branch]", "\u5220\u9664\u672C\u5730/\u8FDC\u7A0B\u5206\u652F").alias("brd").action(async (branch) => {
   await checkForUpdates(version, "@zjex/git-workflow");
   checkGitRepo();
   return deleteBranch(branch);
@@ -3104,7 +3298,7 @@ cli.command("tag [prefix]", "\u4EA4\u4E92\u5F0F\u9009\u62E9\u7248\u672C\u7C7B\u5
   checkGitRepo();
   return createTag(prefix);
 });
-cli.command("tag:delete", "\u5220\u9664 tag").alias("td").action(async () => {
+cli.command("tag:del", "\u5220\u9664 tag").alias("td").action(async () => {
   await checkForUpdates(version, "@zjex/git-workflow");
   checkGitRepo();
   return deleteTag();
@@ -3114,6 +3308,11 @@ cli.command("tag:update", "\u91CD\u547D\u540D tag").alias("tu").action(async ()
   checkGitRepo();
   return updateTag();
 });
+cli.command("tag:clean", "\u6E05\u7406\u65E0\u6548 tag").alias("tc").action(async () => {
+  await checkForUpdates(version, "@zjex/git-workflow");
+  checkGitRepo();
+  return cleanInvalidTags();
+});
 cli.command("release", "\u4EA4\u4E92\u5F0F\u9009\u62E9\u7248\u672C\u53F7\u5E76\u66F4\u65B0 package.json").alias("r").action(async () => {
   await checkForUpdates(version, "@zjex/git-workflow");
   return release();
@@ -3142,7 +3341,7 @@ cli.command("log", "\u4EA4\u4E92\u5F0FGit\u65E5\u5FD7\u67E5\u770B (\u5206\u9875\
   if (options.limit) logOptions.limit = parseInt(options.limit);
   return log(logOptions);
 });
-cli.command("clean", "\u6E05\u7406\u7F13\u5B58\u548C\u4E34\u65F6\u6587\u4EF6").action(async () => {
+cli.command("clean", "\u6E05\u7406\u7F13\u5B58\u548C\u4E34\u65F6\u6587\u4EF6").alias("cc").action(async () => {
   const { clearUpdateCache: clearUpdateCache3 } = await Promise.resolve().then(() => (init_update_notifier(), update_notifier_exports));
   const { existsSync: existsSync5, unlinkSync: unlinkSync4, readdirSync } = await import("fs");
   const { homedir: homedir5, tmpdir: tmpdir2 } = await import("os");