@uxf/scripts 11.28.2 → 11.32.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/scripts",
-  "version": "11.28.2",
+  "version": "11.32.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -27,9 +27,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "axios": "1.6.7",
-    "cheerio": "1.0.0-rc.12",
-    "dayjs": "1.11.10",
+    "axios": "1.7.5",
+    "cheerio": "1.0.0",
+    "dayjs": "1.11.13",
     "fast-glob": "3.3.2",
     "madge": "8.0.0",
     "yargs": "17.7.2"

package/src/GitLab.js

@@ -21,7 +21,7 @@ async function getAll(url, config) {
         const response = await axios.get(url, {
             ...config,
             params: {
-                ...(config.params ?? {}),
+                ...config.params,
                 per_page: "100",
                 page: nextPage,
             },

package/src/shared/load-page-imports.js

@@ -5,7 +5,14 @@ const fs = require("fs");
 
 function getTSConfig() {
     const tsConfigPath = path.resolve(process.cwd(), "tsconfig.json");
-    return fs.existsSync(tsConfigPath) ? tsConfigPath : undefined;
+
+    if (fs.existsSync(tsConfigPath)) {
+        console.log("TS config loaded: " + tsConfigPath);
+        return tsConfigPath;
+    }
+
+    console.log("TS config not found.");
+    return undefined;
 }
 
 function getTree(subtree, tree, destination, viewedFiles = []) {
@@ -33,7 +40,7 @@ function getTree(subtree, tree, destination, viewedFiles = []) {
 }
 
 module.exports = function loadPageImports(directory, fileExtensions = ["ts", "tsx"]) {
-    const pages = fg.sync(directory);
+    const pages = fg.sync(directory).map(path.normalize);
 
     return madge(process.cwd(), { tsConfig: getTSConfig(), fileExtensions }).then((res) => {
         const tree = res.obj();
@@ -42,7 +49,10 @@ module.exports = function loadPageImports(directory, fileExtensions = ["ts", "ts
             const filesOnPath = [];
             getTree([currentValue], tree, filesOnPath);
 
-            previousValue[currentValue] = Array.from(new Set(filesOnPath.flat(Number.POSITIVE_INFINITY)));
+            const uniqueImports = Array.from(new Set(filesOnPath.flat(Number.POSITIVE_INFINITY)));
+            uniqueImports.sort();
+
+            previousValue[currentValue] = uniqueImports;
 
             return previousValue;
         }, {});

package/src/uxf-unused/cli.js

@@ -10,18 +10,19 @@ module.exports = async () => {
         .option("p", { alias: "pagesDirectory", default: "src/pages/**/*.(ts|tsx)" })
         .option("f", { alias: "allFilesDirectory", default: "src/**/*.(ts|tsx)" })
         .option("r", { alias: "removeFiles", boolean: true, default: false })
+        .option("d", { alias: "debug", boolean: true, default: false })
         .option("h", { alias: "help" })
         .strict(false)
         .exitProcess(false);
 
     try {
-        const { help, pagesDirectory, allFilesDirectory, removeFiles } = cli.parse(argv.slice(2));
+        const { help, pagesDirectory, allFilesDirectory, removeFiles, debug } = cli.parse(argv.slice(2));
 
         if (Boolean(help)) {
             return 0;
         }
 
-        await require("./index")(pagesDirectory, allFilesDirectory, removeFiles);
+        await require("./index")(pagesDirectory, allFilesDirectory, removeFiles, debug);
     } catch (e) {
         console.error(e);
         return 1;

package/src/uxf-unused/index.js

@@ -8,22 +8,52 @@ function unique(value, index, array) {
     return array.indexOf(value) === index;
 }
 
-async function main(pagesDirectory, allFilesDirectory, shouldRemoveFiles) {
+async function main(pagesDirectory, allFilesDirectory, shouldRemoveFiles, isDebug = false) {
     const pageImports = await loadPageImports(pagesDirectory);
 
+    if (isDebug) {
+        fs.writeFileSync(
+            path.resolve(process.cwd(), "uxf-unused-1-page-imports.json"),
+            JSON.stringify(pageImports, null, "    "),
+        );
+    }
+
     const pages = Object.keys(pageImports);
 
     const usedFiles = Object.values(pageImports).flat().filter(unique).map(path.normalize);
+
+    if (isDebug) {
+        fs.writeFileSync(
+            path.resolve(process.cwd(), "uxf-unused-2-used-files.json"),
+            JSON.stringify(usedFiles, null, "    "),
+        );
+    }
+
     const allFiles = fg.sync(allFilesDirectory).map(path.normalize);
 
-    allFiles
-        .filter((e) => !usedFiles.includes(e) && !pages.includes(e))
-        .forEach((unusedFile) => {
-            if (shouldRemoveFiles) {
-                fs.rmSync(unusedFile);
-            }
-            console.log(unusedFile);
-        });
+    if (isDebug) {
+        fs.writeFileSync(
+            path.resolve(process.cwd(), "uxf-unused-3-all-files.json"),
+            JSON.stringify(allFiles, null, "    "),
+        );
+    }
+
+    const unusedFiles = allFiles.filter((e) => !usedFiles.includes(e) && !pages.includes(e));
+    unusedFiles.sort();
+
+    if (isDebug) {
+        fs.writeFileSync(
+            path.resolve(process.cwd(), "uxf-unused-4-unused-files.json"),
+            JSON.stringify(unusedFiles, null, "    "),
+        );
+    }
+
+    unusedFiles.forEach((unusedFile) => {
+        if (shouldRemoveFiles) {
+            fs.rmSync(unusedFile);
+        }
+        console.log(unusedFile);
+    });
 }
 
 module.exports = main;