@wzyjs/cli 0.3.23 → 0.3.24

package/dist/index.js

@@ -608,13 +608,17 @@ async function getLatestCommitMsg() {
 }
 function getContinuousCommitCount() {
   return new Promise((resolve, reject) => {
-    exec(`git log --oneline --format=%s`, (err, stdout) => {
+    exec(`git log -n 10 --oneline --format=%s`, (err, stdout) => {
       if (err) {
         reject(err);
         return;
       }
       const messages = stdout.split(`
-`);
+`).filter((l) => l.trim());
+      if (messages.length === 0) {
+        resolve(0);
+        return;
+      }
       const msg = messages[0];
       let count = 0;
       for (const item of messages) {
@@ -638,6 +642,14 @@ function execCommand(command) {
     });
   });
 }
+async function getMergeCommitMsg(count) {
+  const stdout = await execCommand(`git log -n ${count} --pretty=%B`);
+  const lines = stdout.split(`
+`).map((l) => l.trim()).filter((l) => l);
+  const uniqueLines = Array.from(new Set(lines));
+  return uniqueLines.join(`
+`);
+}
 var script_default = async (options) => {
   const hasChange = await execCommand("git status -s");
   if (hasChange) {
@@ -648,8 +660,17 @@ var script_default = async (options) => {
     }
   }
   const count = options?.count || await getContinuousCommitCount();
-  const command = `GIT_EDITOR=true GIT_SEQUENCE_EDITOR="sed -i -e '2,\\$s/^pick/squash/'" git rebase -i HEAD~${count}`;
-  console.log("rebase success", await execCommand(command));
+  if (count <= 0)
+    return;
+  const msg = await getMergeCommitMsg(count);
+  const currentMsg = await getLatestCommitMsg();
+  if (count > 1) {
+    const command = `GIT_EDITOR=true GIT_SEQUENCE_EDITOR="sed -i -e '2,\\$s/^pick/squash/'" git rebase -i HEAD~${count}`;
+    console.log("rebase success", await execCommand(command));
+    await execCommand(`git commit --amend -m "${msg}"`);
+  } else if (msg.trim() !== currentMsg.trim()) {
+    await execCommand(`git commit --amend -m "${msg}"`);
+  }
   if (options?.push) {
     console.log("push success", await execCommand("git push origin HEAD --force"));
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wzyjs/cli",
-  "version": "0.3.23",
+  "version": "0.3.24",
   "description": "description",
   "author": "wzy",
   "main": "index.js",
@@ -28,5 +28,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7fdb40c0c0b5fcccd0166722cd81e77df55885fb"
+  "gitHead": "82ce1f2a13a92943ae2618039c78148ff9637d52"
 }