clear_node_modules 1.4.3 → 1.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clear_node_modules",
-  "version": "1.4.3",
+  "version": "1.5.0",
   "description": "Recursively remove node_modules folders from current directory and subdirectories",
   "main": "index.js",
   "bin": {
@@ -31,7 +31,7 @@
   },
   "homepage": "https://github.com/mooniitt/clear_node_modules#readme",
   "dependencies": {
-    "ora": "^3.0.0",
-    "rimraf": "^2.6.2"
+    "ora": "^5.4.1",
+    "rimraf": "^5.0.0"
   }
 }

package/src/lib.js

@@ -1,10 +1,7 @@
 const fs = require("fs");
 const path = require("path");
-const rimraf = require("rimraf");
+const { rimraf } = require("rimraf");
 const ora = require("ora");
-const { promisify } = require("util");
-
-const rimrafAsync = promisify(rimraf);
 
 // 格式化文件大小
 function formatSize(bytes) {
@@ -40,11 +37,9 @@ function getDirSize(dir) {
 
 function wrap(LIMIT_SIZE, NODE_MODULES) {
   return async function clearDir(dirPath) {
-    const tasks = [];
-    let totalCount = 0;
-    let doneCount = 0;
+    const foldersToDelete = [];
     let totalFreed = 0;
-    let failedCount = 0;
+    let skippedCount = 0;
 
     // 扫描阶段
     const scanSpinner = ora("🔍 Scanning for node_modules...").start();
@@ -61,7 +56,8 @@ function wrap(LIMIT_SIZE, NODE_MODULES) {
           try {
             if (entry.isSymbolicLink()) continue;
             if (entry.name === NODE_MODULES && entry.isDirectory()) {
-              totalCount++;
+              const size = getDirSize(subPath);
+              foldersToDelete.push({ path: subPath, size });
             } else if (entry.isDirectory()) {
               scan(subPath);
             }
@@ -76,77 +72,50 @@ function wrap(LIMIT_SIZE, NODE_MODULES) {
 
     scan(dirPath);
     
-    if (totalCount === 0) {
+    if (foldersToDelete.length === 0) {
       scanSpinner.info("No node_modules found.");
       return;
     }
     
-    scanSpinner.succeed(`Found ${totalCount} node_modules folder(s)`);
+    scanSpinner.succeed(`Found ${foldersToDelete.length} node_modules folder(s)`);
     console.log("");
 
-    async function recurse(currentPath) {
-      try {
-        if (!fs.existsSync(currentPath)) return;
-        const stat = fs.lstatSync(currentPath);
-        if (!stat.isDirectory() || stat.isSymbolicLink()) return;
-
-        const entries = fs.readdirSync(currentPath, { withFileTypes: true });
-        if (entries.length === 0) return;
-
-        for (const entry of entries) {
-          const subPath = path.join(currentPath, entry.name);
-          try {
-            if (entry.isSymbolicLink()) continue;
-            
-            if (entry.name === NODE_MODULES && entry.isDirectory()) {
-              const dirSize = getDirSize(subPath);
-              const sizeMB = dirSize / 1024 / 1024;
-              
-              if (sizeMB < LIMIT_SIZE) {
-                doneCount++;
-                console.log(`  ⏭️  [${doneCount}/${totalCount}] Skipped (${formatSize(dirSize)}) ${subPath}`);
-                continue;
-              }
+    // 串行删除，避免进度混乱
+    const total = foldersToDelete.length;
+    for (let i = 0; i < foldersToDelete.length; i++) {
+      const { path: folderPath, size } = foldersToDelete[i];
+      const sizeMB = size / 1024 / 1024;
+      const progress = `[${i + 1}/${total}]`;
+      
+      if (sizeMB < LIMIT_SIZE) {
+        skippedCount++;
+        console.log(`  ⏭️  ${progress} Skipped (${formatSize(size)}) ${folderPath}`);
+        continue;
+      }
 
-              const spinner = ora({
-                text: `[${++doneCount}/${totalCount}] Removing ${formatSize(dirSize)} - ${subPath}`,
-                prefixText: "  "
-              }).start();
-              
-              const task = rimrafAsync(subPath)
-                .then(() => {
-                  totalFreed += dirSize;
-                  spinner.succeed(`[${doneCount}/${totalCount}] ✓ Freed ${formatSize(dirSize)} - ${subPath}`);
-                })
-                .catch((err) => {
-                  failedCount++;
-                  spinner.fail(`[${doneCount}/${totalCount}] ✗ Failed - ${subPath}: ${err.message}`);
-                });
-              tasks.push(task);
-            } else if (entry.isDirectory()) {
-              await recurse(subPath);
-            }
-          } catch (e) {
-            continue;
-          }
-        }
-      } catch (e) {
-        // 忽略
+      const spinner = ora({
+        text: `${progress} Removing ${formatSize(size)} - ${folderPath}`,
+        prefixText: "  "
+      }).start();
+      
+      try {
+        await rimraf(folderPath);
+        totalFreed += size;
+        spinner.succeed(`${progress} Freed ${formatSize(size)} - ${folderPath}`);
+      } catch (err) {
+        spinner.fail(`${progress} Failed - ${folderPath}: ${err.message}`);
       }
     }
-
-    await recurse(dirPath);
-    await Promise.all(tasks);
     
     // 汇总信息
     console.log("");
     console.log("─".repeat(50));
     console.log(`  ✨ Completed!`);
-    console.log(`     📁 Processed: ${totalCount} folder(s)`);
-    console.log(`     💾 Freed: ${formatSize(totalFreed)}`);
-    if (failedCount > 0) {
-      console.log(`     ⚠️  Failed: ${failedCount}`);
+    console.log(`     📁 Total: ${total} folder(s)`);
+    if (skippedCount > 0) {
+      console.log(`     ⏭️  Skipped: ${skippedCount}`);
     }
+    console.log(`     💾 Freed: ${formatSize(totalFreed)}`);
     console.log("─".repeat(50));
   };
 }