revert: back to 3.17.0 equivalent

Author: francoismassart

README.md

@@ -41,7 +41,6 @@ You can can the same information on your favorite command line software as well.
 
 ## Latest changelog
 
-- perf: [`no-custom-classname` optimization](https://github.com/francoismassart/eslint-plugin-tailwindcss/pull/338) (by [XantreDev](https://github.com/XantreDev) 🙏)
 - fix: [support `tag.div` and `tag(Component)`](https://github.com/francoismassart/eslint-plugin-tailwindcss/pull/302) (by [nihalgonsalves](https://github.com/nihalgonsalves) 🙏)
 - feat: [**support flat config and ESLint 9**](https://github.com/francoismassart/eslint-plugin-tailwindcss/pull/330) (by [kazupon](https://github.com/kazupon) 🙏)
 - feat: new rule [**`no-unnecessary-arbitrary-value`**](docs/rules/no-unnecessary-arbitrary-value.md) 🎉

lib/util/cssFiles.js

@@ -3,17 +3,12 @@
 const fg = require('fast-glob');
 const fs = require('fs');
 const postcss = require('postcss');
+const removeDuplicatesFromArray = require('./removeDuplicatesFromArray');
 
-const classRegexp = /\.([^\.\,\s\n\:\(\)\[\]\'~\+\>\*\\]*)/gim;
-
+let previousGlobsResults = [];
 let lastUpdate = null;
 let classnamesFromFiles = [];
 
-/**
- * @type {Map<string, number}
- */
-const prevEditedTimestamp = new Map()
-
 /**
  * Read CSS files and extract classnames
  * @param {Array} patterns Glob patterns to locate files
@@ -22,56 +17,27 @@ const prevEditedTimestamp = new Map()
  */
 const generateClassnamesListSync = (patterns, refreshRate = 5_000) => {
   const now = new Date().getTime();
+  const files = fg.sync(patterns, { suppressErrors: true });
+  const newGlobs = previousGlobsResults.flat().join(',') != files.flat().join(',');
   const expired = lastUpdate === null || now - lastUpdate > refreshRate;
-
-  if (!expired) {
-    return classnamesFromFiles;
-  }
-  const files = fg.sync(patterns, { suppressErrors: true, stats: true });
-  lastUpdate = now;
-
-  /**
-   * @type {Set<string}
-   */
-  const detectedClassnames = new Set();
-  /**
-   * @type {Set<string>}
-   */
-  const filesSet = new Set();
-  for (const { path: file, stats } of files) {
-    filesSet.add(file);
-    if (!stats) {} 
-    // file is not changed -> we do need to do extra work
-    else if (prevEditedTimestamp.get(file) === stats.mtimeMs) {
-      continue;
-    } else {
-      prevEditedTimestamp.set(file, stats.mtimeMs);
+  if (newGlobs || expired) {
+    previousGlobsResults = files;
+    lastUpdate = now;
+    let detectedClassnames = [];
+    for (const file of files) {
+      const data = fs.readFileSync(file, 'utf-8');
+      const root = postcss.parse(data);
+      root.walkRules((rule) => {
+        const regexp = /\.([^\.\,\s\n\:\(\)\[\]\'~\+\>\*\\]*)/gim;
+        const matches = [...rule.selector.matchAll(regexp)];
+        const classnames = matches.map((arr) => arr[1]);
+        detectedClassnames.push(...classnames);
+      });
+      detectedClassnames = removeDuplicatesFromArray(detectedClassnames);
     }
-    const data = fs.readFileSync(file, 'utf-8');
-    const root = postcss.parse(data);
-    root.walkRules((rule) => {
-      for (const match of rule.selector.matchAll(classRegexp)) {
-        detectedClassnames.add(match[1]);
-      }
-    });
+    classnamesFromFiles = detectedClassnames;
   }
-  // avoiding memory leak
-  {
-    /**
-     * @type {string[]}
-     */
-    const keysToDelete = []
-    for (const cachedFilePath of prevEditedTimestamp.keys()) {
-      if (!filesSet.has(cachedFilePath)) {
-        keysToDelete.push(cachedFilePath);
-      }
-    }
-    for (const key of keysToDelete) {
-      prevEditedTimestamp.delete(key);
-    }
- }
-  classnamesFromFiles = [...detectedClassnames];
-  return classnamesFromFiles
+  return classnamesFromFiles;
 };
 
 module.exports = generateClassnamesListSync;

tests/lib/rules/no-custom-classname.js

@@ -441,11 +441,10 @@ ruleTester.run("no-custom-classname", rule, {
       options: [
         {
           cssFiles: ["./tests/lib/**/*.css"],
-          cssFilesRefreshRate: 0,
         },
       ],
     },
-    ...["myTag", "myTag.subTag", "myTag(SomeComponent)"].map((tag) => ({
+    ...(['myTag', 'myTag.subTag', 'myTag(SomeComponent)'].map(tag => ({
       code: `
       ${tag}\`
         sm:w-6
@@ -456,7 +455,7 @@ ruleTester.run("no-custom-classname", rule, {
         lg:w-4
       \`;`,
       options: [{ tags: ["myTag"] }],
-    })),
+    }))),
     {
       code: `
       <div class="flex flex-row-reverse space-x-4 space-x-reverse">
@@ -1225,7 +1224,7 @@ ruleTester.run("no-custom-classname", rule, {
       ],
       errors: generateErrors("dark"),
     },
-    ...["myTag", "myTag.subTag", "myTag(SomeComponent)"].flatMap((tag) => [
+    ...(['myTag', 'myTag.subTag', 'myTag(SomeComponent)'].flatMap(tag => ([
       {
         code: `
         ${tag}\`
@@ -1273,7 +1272,7 @@ ruleTester.run("no-custom-classname", rule, {
         options: [{ tags: ["myTag"] }],
         errors: generateErrors("custom-2 custom-1"),
       },
-    ]),
+    ]))),
     {
       code: `
       <div class="bg-red-600 p-10">