qleaner 1.0.7 → 1.0.9

package/bin/cli.js

@@ -15,7 +15,9 @@ program
   .argument("<path>", "The path to the directory to scan for imports")
   .option("-l, --list-files", "List all the files in the project")
   .option("-i, --list-imports", "List all the imports in the project")
-  .option("-e, --exclude-dir <dir>", "Exclude directories from the scan")
+  .option("-e, --exclude-dir <dir...>", "Exclude directories from the scan")
+  .option("-f, --exclude-file <file...>", "Exclude files from the scan")
+  .option("-F, --exclude-file-print <file...>", "Do not Print the excluded files")
   .action(async (path, options) => {
     const imports = await getFiles(path, options);
   });
@@ -23,10 +25,12 @@ program
   program.command("qlean-scan")
   .description("Scan the project for unused files")
   .argument("<path>", "The path to the directory to scan for unused files")
-  .option("-e, --exclude-dir <dir>", "Exclude directories from the scan")
+  .option("-e, --exclude-dir <dir...>", "Exclude directories from the scan")
+  .option("-f, --exclude-file <file...>", "Exclude files from the scan")
+  .option("-F, --exclude-file-print <files...>", "Do not Print the excluded files")
   .action(async (path, options) => {
     const unusedFiles = await unUsedFiles(path, options);
-    console.clear()
+    // console.clear()
     unusedFiles.forEach((file) => {
       console.log(file);
     });

package/command.js

@@ -7,8 +7,15 @@ const traverse = require("@babel/traverse").default;
 
 async function getFiles(directory = "src", options) {
     const contentPaths = [`${directory}/**/*.{tsx,ts,js,jsx}`];
-    if (options.excludeDir) {
-        contentPaths.push(`!${options.excludeDir}/**`);
+    if (options.excludeDir && options.excludeDir.length > 0) {
+        options.excludeDir.forEach(dir => {
+            contentPaths.push(`!${dir}/**`);
+        });
+    }
+    if (options.excludeFile && options.excludeFile.length > 0) {
+        options.excludeFile.forEach(file => {
+            contentPaths.push(`!${directory}/**/${file}`);
+        });
     }
     const files = await fg(contentPaths);
   const imports = [];
@@ -59,8 +66,15 @@ async function getFiles(directory = "src", options) {
 
 async function unUsedFiles(directory = "src", options) {
     const contentPaths = [`${directory}/**/*.{tsx,ts,js,jsx}`];
-    if (options.excludeDir) {
-        contentPaths.push(`!${options.excludeDir}/**`);
+    if (options.excludeDir && options.excludeDir.length > 0) {
+        options.excludeDir.forEach(dir => {
+            contentPaths.push(`!${dir}/**`);
+        });
+    }
+    if (options.excludeFile && options.excludeFile.length > 0) {
+        options.excludeFile.forEach(file => {
+            contentPaths.push(`!${directory}/**/${file}`);
+        });
     }
     const files = await fg(contentPaths);
     const imports = [];
@@ -96,12 +110,16 @@ async function unUsedFiles(directory = "src", options) {
         while (!isFound && i < imports.length) {
             
             if (compareFiles(file, imports[i].from)) {
-                console.log('Found', file, imports[i].from);
                 isFound = true;
                 break;
             }else if(i === imports.length - 1) {
-                console.log('Not Found', file, imports[i].from);
-                unusedFiles.push(file);
+                if(options.excludeFilePrint && options.excludeFilePrint.length > 0) {
+                    if(!isExcludedFile(file, options.excludeFilePrint)){
+                        unusedFiles.push(file); 
+                    }
+                }else {
+                    unusedFiles.push(file);
+                }
                 break;
             }
             i++;
@@ -110,6 +128,10 @@ async function unUsedFiles(directory = "src", options) {
     return unusedFiles;
 }
 
+function isExcludedFile(file, excludeFiles) {
+    return excludeFiles.some(exclude => file.includes(exclude));
+}
+
 function compareFiles(filePath, importPath) {  
     const importNoExt = importPath.replace(/\.[^/.]+$/, "");
     const prefixImportPath = importNoExt.replace(/^(?:\.{1,2}\/|[@~]+\/)+/, "");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "qleaner",
   "packageManager": "yarn@4.6.0",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "main": "command.js",
   "bin": "./bin/cli.js",
   "scripts": {

package/src/demo/book/hidden.tsx

@@ -1 +0,0 @@
-import main from '../../main';

package/src/demo/demo.tsx

@@ -1,9 +0,0 @@
-import hello from '../hello.find';
-import hidden from '../../../demo/book/hidden'
-export default function Demo() {
-    return (
-        <div>
-            <img src="/one.png" />
-        </div>
-    )
-}

package/src/demo/functions.js

@@ -1,18 +0,0 @@
-export function demoFunction() {
-    return 'demoFunction';
-}
-export function demoFunction2() {
-    return 'demoFunction2';
-}
-export function demoFunction3() {
-    return 'demoFunction3';
-}
-export function demoFunction4() {
-    return 'demoFunction4';
-}
-export function demoFunction5() {
-    return 'demoFunction5';
-}
-export function demoFunction6() {
-    return 'demoFunction6';
-}

package/src/hello.find.tsx

@@ -1,2 +0,0 @@
-import name from './demo/functions';
-import hidden from '~/demo/book/hidden'

package/src/jambo.tsx

@@ -1,12 +0,0 @@
-import * as functions from './demo/functions';
-import hello from 'hello.find';
-export const JAMBO_JET = 'poa'
-
-export function JamboJet() {
-    return (
-        <div>
-            <img src={one} />
-            <img src={'3.png'} />
-        </div>
-    )
-}

package/src/layer/shell/shell.tsx

@@ -1 +0,0 @@
-import hidden from '../../demo/book/hidden'

package/src/main.js

@@ -1,6 +0,0 @@
-import jambo from 'jambo'
-import poa from 'poa'
-import './style.css'
-import demo from './demo/demo'
-import { JamboJet } from './jambo'
-import hidden from '@/demo/book/hidden'

package/src/poa.tsx

@@ -1,10 +0,0 @@
-import one from 'one.png'
-export default function poa() {
-    console.log('poa')
-    return (
-        <div>
-            <img src={one} />
-            <img src={'3.png'} />
-        </div>
-    )
-}

package/src/style.css

@@ -1,7 +0,0 @@
-.name {
-    background-image: url('one.png') no-repeat;
-}
-
-.user {
-    background-image: url('two.png');
-}

package/src/style.scss

@@ -1,3 +0,0 @@
-.body {
-    background-image: url('4.png');
-}