@zjex/git-workflow 0.3.7 → 0.3.8

package/dist/index.js

@@ -91,9 +91,9 @@ __export(update_notifier_exports, {
   clearUpdateCache: () => clearUpdateCache
 });
 import { execSync as execSync6 } from "child_process";
-import { readFileSync as readFileSync3, writeFileSync as writeFileSync3, existsSync as existsSync3, unlinkSync } from "fs";
+import { readFileSync as readFileSync3, writeFileSync as writeFileSync4, existsSync as existsSync3, unlinkSync as unlinkSync2 } from "fs";
 import { homedir as homedir3 } from "os";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 import boxen from "boxen";
 import { select as select7 } from "@inquirer/prompts";
 import ora5 from "ora";
@@ -283,16 +283,16 @@ async function performUpdate(packageName) {
 }
 function clearUpdateCache() {
   try {
-    const cacheFile = join3(homedir3(), CACHE_FILE);
+    const cacheFile = join4(homedir3(), CACHE_FILE);
     if (existsSync3(cacheFile)) {
-      unlinkSync(cacheFile);
+      unlinkSync2(cacheFile);
     }
   } catch {
   }
 }
 function readCache() {
   try {
-    const cacheFile = join3(homedir3(), CACHE_FILE);
+    const cacheFile = join4(homedir3(), CACHE_FILE);
     if (!existsSync3(cacheFile)) {
       return null;
     }
@@ -304,8 +304,8 @@ function readCache() {
 }
 function writeCache(cache) {
   try {
-    const cacheFile = join3(homedir3(), CACHE_FILE);
-    writeFileSync3(cacheFile, JSON.stringify(cache), "utf-8");
+    const cacheFile = join4(homedir3(), CACHE_FILE);
+    writeFileSync4(cacheFile, JSON.stringify(cache), "utf-8");
   } catch {
   }
 }
@@ -1791,6 +1791,9 @@ async function dropStash(index) {
 // src/commands/commit.ts
 init_utils();
 import { execSync as execSync5 } from "child_process";
+import { writeFileSync as writeFileSync3, unlinkSync } from "fs";
+import { tmpdir } from "os";
+import { join as join3 } from "path";
 import { select as select6, input as input5, checkbox } from "@inquirer/prompts";
 import ora4 from "ora";
 
@@ -2198,45 +2201,39 @@ function formatFileStatus(status) {
 }
 async function commit() {
   const config2 = getConfig();
+  const autoStage = config2.autoStage ?? true;
+  if (autoStage) {
+    execSync5("git add -A", { stdio: "pipe" });
+  }
   let { staged, unstaged } = parseGitStatus();
-  if (unstaged.length > 0) {
-    const autoStage = config2.autoStage ?? true;
-    if (autoStage) {
-      execSync5("git add -A", { stdio: "pipe" });
-      console.log(colors.green("\u2714 \u5DF2\u81EA\u52A8\u6682\u5B58\u6240\u6709\u66F4\u6539"));
-      divider();
-      const newStatus = parseGitStatus();
-      staged = newStatus.staged;
-      unstaged = newStatus.unstaged;
-    } else if (staged.length === 0) {
-      console.log(colors.yellow("\u6CA1\u6709\u6682\u5B58\u7684\u66F4\u6539"));
-      divider();
-      console.log("\u672A\u6682\u5B58\u7684\u6587\u4EF6:");
-      for (const { status, file } of unstaged) {
-        console.log(`  ${formatFileStatus(status)} ${file}`);
-      }
-      divider();
-      const filesToStage = await checkbox({
-        message: "\u9009\u62E9\u8981\u6682\u5B58\u7684\u6587\u4EF6:",
-        choices: unstaged.map(({ status, file }) => ({
-          name: `${formatFileStatus(status)} ${file}`,
-          value: file,
-          checked: true
-        })),
-        theme
-      });
-      if (filesToStage.length === 0) {
-        console.log(colors.yellow("\u6CA1\u6709\u9009\u62E9\u4EFB\u4F55\u6587\u4EF6\uFF0C\u5DF2\u53D6\u6D88"));
-        return;
-      }
-      for (const file of filesToStage) {
-        execSync5(`git add "${file}"`, { stdio: "pipe" });
-      }
-      console.log(colors.green(`\u2714 \u5DF2\u6682\u5B58 ${filesToStage.length} \u4E2A\u6587\u4EF6`));
-      divider();
-      const newStatus = parseGitStatus();
-      staged = newStatus.staged;
+  if (staged.length === 0 && unstaged.length > 0 && !autoStage) {
+    console.log(colors.yellow("\u6CA1\u6709\u6682\u5B58\u7684\u66F4\u6539"));
+    divider();
+    console.log("\u672A\u6682\u5B58\u7684\u6587\u4EF6:");
+    for (const { status, file } of unstaged) {
+      console.log(`  ${formatFileStatus(status)} ${file}`);
     }
+    divider();
+    const filesToStage = await checkbox({
+      message: "\u9009\u62E9\u8981\u6682\u5B58\u7684\u6587\u4EF6:",
+      choices: unstaged.map(({ status, file }) => ({
+        name: `${formatFileStatus(status)} ${file}`,
+        value: file,
+        checked: true
+      })),
+      theme
+    });
+    if (filesToStage.length === 0) {
+      console.log(colors.yellow("\u6CA1\u6709\u9009\u62E9\u4EFB\u4F55\u6587\u4EF6\uFF0C\u5DF2\u53D6\u6D88"));
+      return;
+    }
+    for (const file of filesToStage) {
+      execSync5(`git add "${file}"`, { stdio: "pipe" });
+    }
+    console.log(colors.green(`\u2714 \u5DF2\u6682\u5B58 ${filesToStage.length} \u4E2A\u6587\u4EF6`));
+    divider();
+    const newStatus = parseGitStatus();
+    staged = newStatus.staged;
   }
   if (staged.length === 0) {
     console.log(colors.yellow("\u5DE5\u4F5C\u533A\u5E72\u51C0\uFF0C\u6CA1\u6709\u9700\u8981\u63D0\u4EA4\u7684\u66F4\u6539"));
@@ -2322,14 +2319,10 @@ async function commit() {
   }
   const spinner = ora4("\u6B63\u5728\u63D0\u4EA4...").start();
   try {
-    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 (autoStage) {
+      execSync5("git add -A", { stdio: "pipe" });
     }
+    const finalStatus = parseGitStatus();
     if (finalStatus.staged.length === 0) {
       spinner.fail("\u6CA1\u6709\u6682\u5B58\u7684\u6587\u4EF6\u53EF\u4EE5\u63D0\u4EA4");
       console.log("");
@@ -2340,9 +2333,18 @@ async function commit() {
       console.log("");
       return;
     }
-    execSync5(`git commit -F -`, {
-      input: message
-    });
+    const tmpFile = join3(tmpdir(), `.gw-commit-msg-${Date.now()}`);
+    try {
+      writeFileSync3(tmpFile, message, "utf-8");
+      execSync5(`git commit -F "${tmpFile}"`, {
+        stdio: ["pipe", "pipe", "pipe"]
+      });
+    } finally {
+      try {
+        unlinkSync(tmpFile);
+      } catch {
+      }
+    }
     spinner.succeed("\u63D0\u4EA4\u6210\u529F");
     const commitHash = execOutput("git rev-parse --short HEAD");
     console.log(colors.dim(`commit: ${commitHash}`));
@@ -2449,15 +2451,15 @@ import { execSync as execSync7 } from "child_process";
 import ora6 from "ora";
 import boxen2 from "boxen";
 import semver2 from "semver";
-import { existsSync as existsSync4, unlinkSync as unlinkSync2 } from "fs";
+import { existsSync as existsSync4, unlinkSync as unlinkSync3 } from "fs";
 import { homedir as homedir4 } from "os";
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 var CACHE_FILE2 = ".gw-update-check";
 function clearUpdateCache2() {
   try {
-    const cacheFile = join4(homedir4(), CACHE_FILE2);
+    const cacheFile = join5(homedir4(), CACHE_FILE2);
     if (existsSync4(cacheFile)) {
-      unlinkSync2(cacheFile);
+      unlinkSync3(cacheFile);
     }
   } catch {
   }
@@ -2914,7 +2916,7 @@ process.on("SIGTERM", () => {
   console.log("");
   process.exit(0);
 });
-var version = true ? "0.3.7" : "0.0.0-dev";
+var version = true ? "0.3.8" : "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.7",
+	"version": "0.3.8",
 	"description": "🚀 极简的 Git 工作流 CLI 工具，让分支管理和版本发布变得轻松愉快",
 	"type": "module",
 	"bin": {

package/src/commands/commit.ts

@@ -1,4 +1,7 @@
 import { execSync } from "child_process";
+import { writeFileSync, unlinkSync } from "fs";
+import { tmpdir } from "os";
+import { join } from "path";
 import { select, input, checkbox } from "@inquirer/prompts";
 import ora from "ora";
 import { colors, theme, execOutput, divider } from "../utils.js";
@@ -102,58 +105,52 @@ function formatFileStatus(status: string): string {
  */
 export async function commit(): Promise<void> {
   const config = getConfig();
-  let { staged, unstaged } = parseGitStatus();
-
-  // ========== 步骤 1: 处理未暂存的文件 ==========
-  if (unstaged.length > 0) {
-    const autoStage = config.autoStage ?? true;
+  const autoStage = config.autoStage ?? true;
 
-    if (autoStage) {
-      // 自动暂存所有文件
-      execSync("git add -A", { stdio: "pipe" });
-      console.log(colors.green("✔ 已自动暂存所有更改"));
-      divider();
-      // 重新获取状态
-      const newStatus = parseGitStatus();
-      staged = newStatus.staged;
-      unstaged = newStatus.unstaged;
-    } else if (staged.length === 0) {
-      // 没有暂存的文件，且不自动暂存，让用户选择
-      console.log(colors.yellow("没有暂存的更改"));
-      divider();
-      console.log("未暂存的文件:");
-      for (const { status, file } of unstaged) {
-        console.log(`  ${formatFileStatus(status)} ${file}`);
-      }
-      divider();
+  // ========== 步骤 1: 自动暂存（如果启用）==========
+  if (autoStage) {
+    execSync("git add -A", { stdio: "pipe" });
+  }
 
-      // 让用户选择要暂存的文件
-      const filesToStage = await checkbox({
-        message: "选择要暂存的文件:",
-        choices: unstaged.map(({ status, file }) => ({
-          name: `${formatFileStatus(status)} ${file}`,
-          value: file,
-          checked: true,
-        })),
-        theme,
-      });
+  // 获取当前状态
+  let { staged, unstaged } = parseGitStatus();
 
-      if (filesToStage.length === 0) {
-        console.log(colors.yellow("没有选择任何文件，已取消"));
-        return;
-      }
+  // ========== 步骤 2: 如果没有暂存文件，让用户选择 ==========
+  if (staged.length === 0 && unstaged.length > 0 && !autoStage) {
+    console.log(colors.yellow("没有暂存的更改"));
+    divider();
+    console.log("未暂存的文件:");
+    for (const { status, file } of unstaged) {
+      console.log(`  ${formatFileStatus(status)} ${file}`);
+    }
+    divider();
+
+    // 让用户选择要暂存的文件
+    const filesToStage = await checkbox({
+      message: "选择要暂存的文件:",
+      choices: unstaged.map(({ status, file }) => ({
+        name: `${formatFileStatus(status)} ${file}`,
+        value: file,
+        checked: true,
+      })),
+      theme,
+    });
 
-      // 暂存选中的文件
-      for (const file of filesToStage) {
-        execSync(`git add "${file}"`, { stdio: "pipe" });
-      }
-      console.log(colors.green(`✔ 已暂存 ${filesToStage.length} 个文件`));
-      divider();
+    if (filesToStage.length === 0) {
+      console.log(colors.yellow("没有选择任何文件，已取消"));
+      return;
+    }
 
-      // 重新获取状态
-      const newStatus = parseGitStatus();
-      staged = newStatus.staged;
+    // 暂存选中的文件
+    for (const file of filesToStage) {
+      execSync(`git add "${file}"`, { stdio: "pipe" });
     }
+    console.log(colors.green(`✔ 已暂存 ${filesToStage.length} 个文件`));
+    divider();
+
+    // 重新获取状态
+    const newStatus = parseGitStatus();
+    staged = newStatus.staged;
   }
 
   // ========== 步骤 2: 检查是否有文件可提交 ==========
@@ -264,18 +261,13 @@ export async function commit(): Promise<void> {
   const spinner = ora("正在提交...").start();
 
   try {
-    // 提交前再次检查是否有暂存的文件
-    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 (autoStage) {
+      execSync("git add -A", { stdio: "pipe" });
     }
 
+    // 检查是否有暂存的文件
+    const finalStatus = parseGitStatus();
     if (finalStatus.staged.length === 0) {
       spinner.fail("没有暂存的文件可以提交");
       console.log("");
@@ -287,11 +279,21 @@ export async function commit(): Promise<void> {
       return;
     }
 
-    // 处理多行消息：使用 git commit -F - 通过 stdin 传递
-    // 这样可以正确处理包含换行符的 commit message
-    execSync(`git commit -F -`, {
-      input: message,
-    });
+    // 处理多行消息：使用临时文件传递 commit message
+    const tmpFile = join(tmpdir(), `.gw-commit-msg-${Date.now()}`);
+    try {
+      writeFileSync(tmpFile, message, "utf-8");
+      execSync(`git commit -F "${tmpFile}"`, {
+        stdio: ["pipe", "pipe", "pipe"],
+      });
+    } finally {
+      // 清理临时文件
+      try {
+        unlinkSync(tmpFile);
+      } catch {
+        // 忽略删除失败
+      }
+    }
     spinner.succeed("提交成功");
 
     // 显示提交信息