qleaner 1.0.23 → 1.0.24

package/command.js

@@ -4,7 +4,6 @@ const Table = require("cli-table3");
 const parser = require("@babel/parser");
 const traverse = require("@babel/traverse").default;
 const path = require("path");
-const cliProgress = require("cli-progress");
 const { createResolver } = require("./utils/resolver");
 const {
   loadCache,
@@ -15,14 +14,6 @@ const {
 const { isExcludedFile, compareFiles } = require("./utils/utils");
 
 async function getFiles(directory = "src", options, chalk) {
-  const bars = new cliProgress.MultiBar({
-    clearOnComplete: false,
-    hideCursor: true,
-    format: chalk.cyan('{name}') +
-    ' |' + '{bar}' + '| ' +
-    '{value}/{total} files || {status}'
-  }, cliProgress.Presets.shades_grey);
-
   const contentPaths = [`${directory}/**/*.{tsx,ts,js,jsx}`];
   if (options.excludeDir && options.excludeDir.length > 0) {
     options.excludeDir.forEach((dir) => {
@@ -38,12 +29,11 @@ async function getFiles(directory = "src", options, chalk) {
   const files = await fg(contentPaths);
   const imports = [];
   
-  const scanBar = bars.create(files.length, 0, {
-    name: 'Scanning Files',
-    status: 'Scanning...',
-  });
-
+  let index = 0;
   for (const file of files) {
+    index++;
+    console.clear();
+    console.log('Scanning file...', index, 'of', files.length);
     const code = fs.readFileSync(file, "utf8");
     const ast = parser.parse(code, {
       sourceType: "module",
@@ -71,10 +61,7 @@ async function getFiles(directory = "src", options, chalk) {
     //     }
     //   },
     // });
-    scanBar.increment();
   }
-  
-  bars.stop();
 
   if (options.table) {
     const tableImports = new Table({
@@ -125,14 +112,6 @@ async function getFiles(directory = "src", options, chalk) {
 }
 
 async function unUsedFiles(chalk, directory = "src", options) {
-  const bars = new cliProgress.MultiBar({
-    clearOnComplete: false,
-    hideCursor: true,
-    format: chalk.cyan('{name}') +
-    ' |' + '{bar}' + '| ' +
-    '{value}/{total} files || {status}'
-  }, cliProgress.Presets.shades_grey);
-
   const resolver = createResolver(directory);
   const cache = loadCache(process.cwd());
   const contentPaths = [`${directory}/**/*.{tsx,ts,js,jsx}`];
@@ -151,15 +130,13 @@ async function unUsedFiles(chalk, directory = "src", options) {
   let imports = [];
   const unusedFiles = [];
 
-  const scanBar = bars.create(files.length, 0, {
-    name: 'Scanning Files',
-    status: 'Scanning...',
-  });
-
   // debug log
   // let debugCount = 0;
-  let i = 0;
+  let index = 0;
   for (const file of files) {
+    index++;
+    console.clear();
+    console.log('Checking file...', index, 'of', files.length);
     const code = fs.readFileSync(file, "utf8");
     if (needsRebuild(file, code, cache)) {
       const ast = parser.parse(code, {
@@ -193,9 +170,6 @@ async function unUsedFiles(chalk, directory = "src", options) {
       // debugCount++;
       // console.log('cache hit', debugCount);
     }
-    scanBar.update(++i, {
-      status: 'Scanning...',
-    });
   }
 
   // imports beings empty shows all the files were cached
@@ -203,14 +177,13 @@ async function unUsedFiles(chalk, directory = "src", options) {
     imports = cache[directory]? cache[directory].imports: [];
   }
 
-  const checkBar = bars.create(files.length, 0, {
-    name: 'Checking Usage',
-    status: 'Checking...',
-  });
 
   // debugCount = 0;
-  i = 0;
+  index = 0;
   for (const file of files) {
+    index++;
+    console.clear();
+    console.log('Checking file...', index, 'of', files.length);
     const code = fs.readFileSync(file, "utf8");
     if (!cache[file].isImported || needsRebuild(file, code, cache)) {
       let i = 0;
@@ -240,12 +213,8 @@ async function unUsedFiles(chalk, directory = "src", options) {
       // debugCount++;
       // console.log("debug hit", debugCount);
     }
-    checkBar.update(++i, {
-      status: 'Checking...',
-    });
   }
   
-  bars.stop();
   cache[directory] =  {
     imports: imports,
   }

package/controllers/image.js

@@ -6,7 +6,6 @@ const traverse = require("@babel/traverse").default;
 const Table = require("cli-table3");
 const { getCssImages } = require("../utils/cssImages");
 const { askDeleteFiles } = require("../utils/utils");
-const cliProgress = require("cli-progress");
 
 // Regex for matching url("x.png") or url('x.png') or bg-[url('x.png')]
 const URL_EXTRACT_REGEX = /url\((['"]?)([^"')]+)\1\)/gi;
@@ -108,14 +107,6 @@ function extractFromJSXStyle(node, file, collected) {
  * MAIN FUNCTION
  */
 async function getUnusedImages(chalk, imageDirectory, codeDirectory, options) {
-    const bars = new cliProgress.MultiBar({
-        clearOnComplete: false,
-        hideCursor: true,
-        format: chalk.cyan('{name}') +
-        ' |' + '{bar}' + '| ' +
-        '{value}/{total} files || {status}'
-    }, cliProgress.Presets.shades_grey)
-
   const used = new Set();
   const unusedImages = [];
 
@@ -124,13 +115,11 @@ async function getUnusedImages(chalk, imageDirectory, codeDirectory, options) {
 
   // ---- Scan Code Files ----
   const codeFiles = await fg([`${codeDirectory}/**/*.{js,jsx,ts,tsx}`]);
-  const codeBar = bars.create(codeFiles.length, 0, {
-    name: 'Code Files',
-    status: 'Scanning...',
-  });
-
-
+  let index = 0;
   for (const file of codeFiles) {
+    index++;
+    console.clear();
+    console.log('Scanning code files...', index, 'of', codeFiles.length);
     const code = fs.readFileSync(file, "utf8");
 
     const ast = parser.parse(code, {
@@ -253,41 +242,37 @@ async function getUnusedImages(chalk, imageDirectory, codeDirectory, options) {
         extracted.forEach((v) => used.add(JSON.stringify({ path: v, file })));
       },
     });
-    codeBar.increment();
   }
 
   // Add CSS images
-  const cssImages = await getCssImages(codeDirectory, bars);
+  const cssImages = await getCssImages(codeDirectory);
   cssImages.forEach((img) =>
     used.add(JSON.stringify({ path: img.value, file: img.file }))
   );
-  const normalizeBar = bars.create(used.size, 0, {
-    name: 'Normalizing Images',
-    status: 'Normalizing...',
-  });
 
   // Normalize all used images
   const normalizedUsed = new Set();
+  index = 0;
   for (const entry of used) {
-    normalizeBar.increment();
+    index++;
+    console.clear();
+    console.log('Normalizing images...', index, 'of', used.size);
     const { path: p } = JSON.parse(entry);
     const normalized = normalize(p, imageDirectory);
     if (normalized) normalizedUsed.add(normalized);
   }
 
-  const unusedBar = bars.create(imageFiles.length, 0, {
-    name: 'Determining Unused Images',
-    status: 'Determining...',
-  });
   // ---- Determine unused ----
+  index = 0;
   for (const img of imageFiles) {
-    unusedBar.increment();
+    index++;
+    console.clear();
+    console.log('Determining unused images...', index, 'of', imageFiles.length);
     const full = path.resolve(img);
     if (!normalizedUsed.has(full)) {
       unusedImages.push(full);
     }
   }
-  bars.stop();
   // ---- Output table or list ----
   if (options.table) {
     const table = new Table({

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "qleaner",
   "packageManager": "yarn@4.6.0",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "main": "command.js",
   "bin": "./bin/cli.js",
   "scripts": {
     "start": "node ./bin/cli.js",
-    "resolve": "node ./utils/resolver.js"
+    "resolve": "node ./utils/resolver.js",
+    "scan": "node ./scanning.js"
   },
   "devDependencies": {
     "@types/node": "^20.10.5",

package/utils/cssImages.js

@@ -20,17 +20,16 @@ function extractCssImages(cssContent, images, file) {
   return images
 }
 
-async function getCssImages(directory = "src", bars) {
+async function getCssImages(directory = "src") {
   const cssFiles = await fg([
     `${directory}/**/*.{css,scss}`,
   ]);
   let images = [];
-  const cssBar = bars.create(cssFiles.length, 0, {
-    name: 'CSS Files',
-    status: 'Scanning...',
-  });
+  let index = 0;
   for (const file of cssFiles) {
-    cssBar.increment();
+    index++;
+    console.clear();
+    console.log('Scanning CSS files...', index, 'of', cssFiles.length);
     const css = fs.readFileSync(file, "utf-8");
     images = extractCssImages(css, images, file);
   }