clear_node_modules 1.2.0 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clear_node_modules",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "help you remove all large file of node_modules in dist dir!",
   "main": "index.js",
   "directories": {
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/mooniitt/clear_node_modules#readme",
   "dependencies": {
-    "clear_node_modules": "^1.1.4",
+    "clear_node_modules": "^1.2.0",
     "ora": "^3.0.0",
     "rimraf": "^2.6.2"
   }

package/src/lib.js

@@ -2,6 +2,9 @@ const fs = require("fs");
 const path = require("path");
 const rimraf = require("rimraf");
 const ora = require("ora");
+const { promisify } = require("util");
+
+const rimrafAsync = promisify(rimraf);
 
 function getDirSize(dir) {
   let total = 0;
@@ -18,42 +21,52 @@ function getDirSize(dir) {
 }
 
 function wrap(LIMIT_SIZE, NODE_MODULES) {
-  return function clearDir(dirPath) {
-    if (!fs.existsSync(dirPath) || !fs.statSync(dirPath).isDirectory()) return;
-
-    const entries = fs.readdirSync(dirPath);
-    if (entries.length === 0) return;
-
-    const dirSize = getDirSize(dirPath);
-    if (dirSize / 1024 < LIMIT_SIZE) return;
-
-    for (const entry of entries) {
-      const subPath = path.join(dirPath, entry);
-      if (entry === NODE_MODULES && fs.statSync(subPath).isDirectory()) {
-        const spinner = ora(`Removing ${subPath}`).start();
-        rimraf(subPath, (err) => {
-          if (err) {
-            spinner.fail(`Failed to remove ${subPath}: ${err.message}`);
-          } else {
-            spinner.succeed(`Done ${subPath}`);
-          }
-        });
-      } else if (fs.statSync(subPath).isDirectory()) {
-        clearDir(subPath);
+  return async function clearDir(dirPath) {
+    const tasks = [];
+
+    async function recurse(currentPath) {
+      if (
+        !fs.existsSync(currentPath) ||
+        !fs.statSync(currentPath).isDirectory()
+      )
+        return;
+
+      const entries = fs.readdirSync(currentPath);
+      if (entries.length === 0) return;
+
+      const dirSize = getDirSize(currentPath);
+      if (dirSize / 1024 < LIMIT_SIZE) return;
+
+      for (const entry of entries) {
+        const subPath = path.join(currentPath, entry);
+        if (entry === NODE_MODULES && fs.statSync(subPath).isDirectory()) {
+          const spinner = ora(`Removing ${subPath}`).start();
+          const task = rimrafAsync(subPath)
+            .then(() => spinner.succeed(`Done ${subPath}`))
+            .catch((err) =>
+              spinner.fail(`Failed to remove ${subPath}: ${err.message}`)
+            );
+          tasks.push(task);
+        } else if (fs.statSync(subPath).isDirectory()) {
+          await recurse(subPath);
+        }
       }
     }
+
+    await recurse(dirPath);
+    await Promise.all(tasks);
   };
 }
 
-function clearFunc(
+async function clearFunc(
   disDir = "./",
   LIMIT_SIZE = 0,
   NODE_MODULES = "node_modules"
 ) {
   console.log("");
   const clearDir = wrap(LIMIT_SIZE, NODE_MODULES);
-  clearDir(path.resolve(disDir));
-  console.log("");
+  await clearDir(path.resolve(disDir));
+  console.log("\nAll done!\n");
 }
 
 module.exports = clearFunc;