@harryisfish/gitt 1.1.1 → 1.2.0

package/dist/commands/clean.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cleanDeletedBranches = cleanDeletedBranches;
 const simple_git_1 = require("simple-git");
+const listr2_1 = require("listr2");
 const errors_1 = require("../errors");
 const errors_2 = require("../errors");
 const git = (0, simple_git_1.simpleGit)();
@@ -11,30 +12,51 @@ const git = (0, simple_git_1.simpleGit)();
  */
 async function cleanDeletedBranches() {
     try {
-        console.log('Switching to main branch...');
-        await git.checkout('main');
-        console.log('Pulling latest code...');
-        await git.pull();
-        console.log('Cleaning up remotely deleted branches...');
-        // 获取最新的远程分支信息
-        await git.fetch(['--prune']);
-        // 获取所有分支信息
-        const branchSummary = await git.branch(['-vv']);
-        // 找出已经在远程被删除的分支
-        const deletedBranches = branchSummary.all.filter(branch => {
-            const branchInfo = branchSummary.branches[branch];
-            return branchInfo.label && branchInfo.label.includes(': gone]');
-        });
-        if (deletedBranches.length === 0) {
-            console.log('No branches need to be cleaned up.');
-            return;
-        }
-        console.log('The following branches will be deleted:', deletedBranches.join(', '));
-        // 删除这些分支
-        for (const branch of deletedBranches) {
-            await git.branch(['-D', branch]);
-            console.log(`Deleted branch: ${branch}`);
-        }
+        const tasks = new listr2_1.Listr([
+            {
+                title: 'Switch to main branch',
+                task: async () => {
+                    await git.checkout('main');
+                }
+            },
+            {
+                title: 'Pull latest code',
+                task: async () => {
+                    await git.pull();
+                }
+            },
+            {
+                title: 'Fetch and prune remote branches',
+                task: async (ctx) => {
+                    await git.fetch(['--prune']);
+                    const branchSummary = await git.branch(['-vv']);
+                    const deletedBranches = branchSummary.all.filter(branch => {
+                        const branchInfo = branchSummary.branches[branch];
+                        return branchInfo.label && branchInfo.label.includes(': gone]');
+                    });
+                    ctx.deletedBranches = deletedBranches;
+                }
+            },
+            {
+                title: 'Delete branches removed on remote',
+                enabled: (ctx) => Array.isArray(ctx.deletedBranches),
+                skip: (ctx) => {
+                    if (!ctx.deletedBranches || ctx.deletedBranches.length === 0) {
+                        return 'No branches need to be cleaned up';
+                    }
+                    return false;
+                },
+                task: (ctx) => {
+                    return new listr2_1.Listr((ctx.deletedBranches || []).map(branch => ({
+                        title: `Delete ${branch}`,
+                        task: async () => {
+                            await git.branch(['-D', branch]);
+                        }
+                    })), { concurrent: false });
+                }
+            }
+        ]);
+        await tasks.run();
         (0, errors_2.printSuccess)('Branch cleanup completed');
     }
     catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@harryisfish/gitt",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "A command-line tool to help you manage Git repositories and remote repositories, such as keeping in sync, pushing, pulling, etc.",
   "main": "dist/index.js",
   "bin": {
@@ -38,7 +38,8 @@
   },
   "dependencies": {
     "@inquirer/prompts": "^3.3.0",
-    "simple-git": "^3.22.0"
+    "simple-git": "^3.22.0",
+    "listr2": "^8.0.0"
   },
   "engines": {
     "node": ">=14.0.0"