@herb-tools/tailwind-class-sorter 0.8.10 → 0.9.0

package/dist/tailwind-class-sorter.cjs

@@ -6526,7 +6526,15 @@ function requireMapGenerator () {
 	        }
 	      }
 	    } else if (this.css) {
-	      this.css = this.css.replace(/\n*\/\*#[\S\s]*?\*\/$/gm, '');
+	      let startIndex;
+	      while ((startIndex = this.css.lastIndexOf('/*#')) !== -1) {
+	        let endIndex = this.css.indexOf('*/', startIndex + 3);
+	        if (endIndex === -1) break
+	        while (startIndex > 0 && this.css[startIndex - 1] === '\n') {
+	          startIndex--;
+	        }
+	        this.css = this.css.slice(0, startIndex) + this.css.slice(endIndex + 2);
+	      }
 	    }
 	  }
 
@@ -7003,7 +7011,7 @@ function requireParser () {
 	    node.source.end.offset++;
 
 	    let text = token[1].slice(2, -2);
-	    if (/^\s*$/.test(text)) {
+	    if (!text.trim()) {
 	      node.text = '';
 	      node.raws.left = text;
 	      node.raws.right = '';
@@ -8236,10 +8244,9 @@ function requireNoWorkResult () {
 	    this._css = css;
 	    this._opts = opts;
 	    this._map = undefined;
-	    let root;
 
 	    let str = stringify;
-	    this.result = new Result(this._processor, root, this._opts);
+	    this.result = new Result(this._processor, undefined, this._opts);
 	    this.result.css = css;
 
 	    let self = this;
@@ -8249,7 +8256,7 @@ function requireNoWorkResult () {
 	      }
 	    });
 
-	    let map = new MapGenerator(str, root, this._opts, css);
+	    let map = new MapGenerator(str, undefined, this._opts, css);
 	    if (map.isMap()) {
 	      let [generatedCSS, generatedMap] = map.generate();
 	      if (generatedCSS) {
@@ -8324,7 +8331,7 @@ function requireProcessor () {
 
 	class Processor {
 	  constructor(plugins = []) {
-	    this.version = '8.5.6';
+	    this.version = '8.5.8';
 	    this.plugins = this.normalize(plugins);
 	  }
 
@@ -12195,10 +12202,10 @@ var postcssImportExports = requirePostcssImport();
 var postcssImport = /*@__PURE__*/getDefaultExportFromCjs(postcssImportExports);
 
 function expiringMap(duration) {
-    let map = new Map();
+    const map = new Map();
     return {
         get(key) {
-            let result = map.get(key);
+            const result = map.get(key);
             if (!result)
                 return undefined;
             if (result.expiration <= new Date()) {
@@ -12208,7 +12215,7 @@ function expiringMap(duration) {
             return result.value;
         },
         set(key, value) {
-            let expiration = new Date();
+            const expiration = new Date();
             expiration.setMilliseconds(expiration.getMilliseconds() + duration);
             map.set(key, {
                 value,
@@ -21346,18 +21353,18 @@ function resolveCssFrom(base, id) {
 }
 
 // @ts-check
-let sourceToPathMap = new Map();
-let sourceToEntryMap = new Map();
-let pathToContextMap = expiringMap(10_000);
+const sourceToPathMap = new Map();
+const sourceToEntryMap = new Map();
+const pathToContextMap = expiringMap(10_000);
 async function getTailwindConfig(options = {}) {
-    let pkgName = 'tailwindcss';
-    let key = [
+    const pkgName = 'tailwindcss';
+    const key = [
         options.baseDir ?? process.cwd(),
         options.tailwindStylesheet ?? '',
         options.tailwindConfig ?? '',
         pkgName,
     ].join(':');
-    let baseDir = getBaseDir(options);
+    const baseDir = getBaseDir(options);
     // Map the source file to it's associated Tailwind config file
     let configPath = sourceToPathMap.get(key);
     if (configPath === undefined) {
@@ -21370,13 +21377,13 @@ async function getTailwindConfig(options = {}) {
         sourceToEntryMap.set(key, entryPoint);
     }
     // Now see if we've loaded the Tailwind config file before (and it's still valid)
-    let contextKey = `${pkgName}:${configPath}:${entryPoint}`;
-    let existing = pathToContextMap.get(contextKey);
+    const contextKey = `${pkgName}:${configPath}:${entryPoint}`;
+    const existing = pathToContextMap.get(contextKey);
     if (existing) {
         return existing;
     }
     // By this point we know we need to load the Tailwind config file
-    let result = await loadTailwindConfig(baseDir, pkgName, configPath, entryPoint);
+    const result = await loadTailwindConfig(baseDir, pkgName, configPath, entryPoint);
     pathToContextMap.set(contextKey, result);
     return result;
 }
@@ -21393,7 +21400,7 @@ async function loadTailwindConfig(baseDir, pkgName, tailwindConfigPath, entryPoi
     let loadConfig;
     let tailwindConfig = { content: [] };
     try {
-        let pkgPath = resolveJsFrom(baseDir, pkgName);
+        const pkgPath = resolveJsFrom(baseDir, pkgName);
         let pkgJsonPath;
         try {
             const Module = require('module');
@@ -21418,14 +21425,14 @@ async function loadTailwindConfig(baseDir, pkgName, tailwindConfigPath, entryPoi
                 throw new Error('Could not find Tailwind CSS package.json');
             }
         }
-        let pkgDir = path__namespace.dirname(pkgJsonPath);
+        const pkgDir = path__namespace.dirname(pkgJsonPath);
         try {
-            let v4 = await loadV4(baseDir, pkgDir, pkgName, entryPoint);
+            const v4 = await loadV4(baseDir, pkgDir, pkgName, entryPoint);
             if (v4) {
                 return v4;
             }
         }
-        catch (err) {
+        catch (_error) {
             // V4 loading failed, will try v3 below
         }
         resolveConfig = require(path__namespace.join(pkgDir, 'resolveConfig'));
@@ -21434,7 +21441,7 @@ async function loadTailwindConfig(baseDir, pkgName, tailwindConfigPath, entryPoi
         // Prior to `tailwindcss@3.3.0` this won't exist so we load it last
         loadConfig = require(path__namespace.join(pkgDir, 'loadConfig'));
     }
-    catch (err) {
+    catch (_error) {
         // Tailwind isn't installed or loading failed, will use defaults
     }
     if (tailwindConfigPath) {
@@ -21454,7 +21461,7 @@ async function loadTailwindConfig(baseDir, pkgName, tailwindConfigPath, entryPoi
         };
     }
     tailwindConfig.content = ['no-op'];
-    let context = createContext(resolveConfig(tailwindConfig));
+    const context = createContext(resolveConfig(tailwindConfig));
     return {
         context,
         generateRules,
@@ -21466,11 +21473,11 @@ async function loadTailwindConfig(baseDir, pkgName, tailwindConfigPath, entryPoi
  * everything from working so we'll let the error handler decide how to proceed.
  */
 function createLoader({ legacy, jiti, filepath, onError, }) {
-    let cacheKey = `${+Date.now()}`;
+    const cacheKey = `${+Date.now()}`;
     async function loadFile(id, base, resourceType) {
         try {
-            let resolved = resolveJsFrom(base, id);
-            let url = require$$3$1.pathToFileURL(resolved);
+            const resolved = resolveJsFrom(base, id);
+            const url = require$$3$1.pathToFileURL(resolved);
             url.searchParams.append('t', cacheKey);
             return await jiti.import(url.href, { default: true });
         }
@@ -21479,7 +21486,7 @@ function createLoader({ legacy, jiti, filepath, onError, }) {
         }
     }
     if (legacy) {
-        let baseDir = path__namespace.dirname(filepath);
+        const baseDir = path__namespace.dirname(filepath);
         return (id) => loadFile(id, baseDir, 'module');
     }
     return async (id, base, resourceType) => {
@@ -21491,8 +21498,8 @@ function createLoader({ legacy, jiti, filepath, onError, }) {
 }
 async function loadV4(baseDir, pkgDir, pkgName, entryPoint) {
     // Import Tailwind — if this is v4 it'll have APIs we can use directly
-    let pkgPath = resolveJsFrom(baseDir, pkgName);
-    let tw = await import(require$$3$1.pathToFileURL(pkgPath).toString());
+    const pkgPath = resolveJsFrom(baseDir, pkgName);
+    const tw = await import(require$$3$1.pathToFileURL(pkgPath).toString());
     // This is not Tailwind v4
     if (!tw.__unstable__loadDesignSystem) {
         return null;
@@ -21500,11 +21507,11 @@ async function loadV4(baseDir, pkgDir, pkgName, entryPoint) {
     // If the user doesn't define an entrypoint then we use the default theme
     entryPoint = entryPoint ?? `${pkgDir}/theme.css`;
     // Create a Jiti instance that can be used to load plugins and config files
-    let jiti = createJiti((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('tailwind-class-sorter.cjs', document.baseURI).href)), {
+    const jiti = createJiti((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('tailwind-class-sorter.cjs', document.baseURI).href)), {
         moduleCache: false,
         fsCache: false,
     });
-    let importBasePath = path__namespace.dirname(entryPoint);
+    const importBasePath = path__namespace.dirname(entryPoint);
     // Resolve imports in the entrypoint to a flat CSS tree
     let css = await fs__namespace.readFile(entryPoint, 'utf-8');
     // Determine if the v4 API supports resolving `@import`
@@ -21522,13 +21529,13 @@ async function loadV4(baseDir, pkgDir, pkgName, entryPoint) {
     }
     catch { }
     if (!supportsImports) {
-        let resolveImports = postcss([postcssImport()]);
-        let result = await resolveImports.process(css, { from: entryPoint });
+        const resolveImports = postcss([postcssImport()]);
+        const result = await resolveImports.process(css, { from: entryPoint });
         css = result.css;
     }
     // Load the design system and set up a compatible context object that is
     // usable by the rest of the plugin
-    let design = await tw.__unstable__loadDesignSystem(css, {
+    const design = await tw.__unstable__loadDesignSystem(css, {
         base: importBasePath,
         // v4.0.0-alpha.25+
         loadModule: createLoader({
@@ -21546,7 +21553,7 @@ async function loadV4(baseDir, pkgDir, pkgName, entryPoint) {
             },
         }),
         loadStylesheet: async (id, base) => {
-            let resolved = resolveCssFrom(base, id);
+            const resolved = resolveCssFrom(base, id);
             return {
                 base: path__namespace.dirname(resolved),
                 content: await fs__namespace.readFile(resolved, 'utf-8'),
@@ -21649,7 +21656,7 @@ function bigSign(bigIntValue) {
     return Number(bigIntValue > 0n) - Number(bigIntValue < 0n);
 }
 function prefixCandidate(context, selector) {
-    let prefix = context.tailwindConfig.prefix;
+    const prefix = context.tailwindConfig.prefix;
     return typeof prefix === 'function' ? prefix(selector) : prefix + selector;
 }
 // Polyfill for older Tailwind CSS versions
@@ -21661,12 +21668,12 @@ function getClassOrderPolyfill(classes, { env }) {
     // that don't exist on their own. This will result in them "not existing" and
     // sorting could be weird since you still require them in order to make the
     // host utitlies work properly. (Thanks Biology)
-    let parasiteUtilities = new Set([
+    const parasiteUtilities = new Set([
         prefixCandidate(env.context, 'group'),
         prefixCandidate(env.context, 'peer'),
     ]);
-    let classNamesWithOrder = [];
-    for (let className of classes) {
+    const classNamesWithOrder = [];
+    for (const className of classes) {
         let order = env
             .generateRules(new Set([className]), env.context)
             .sort(([a], [z]) => bigSign(z - a))[0]?.[0] ?? null;
@@ -21684,7 +21691,7 @@ function reorderClasses(classList, { env }) {
     if (!env.context) {
         return classList.map(name => [name, null]);
     }
-    let orderedClasses = env.context.getClassOrder
+    const orderedClasses = env.context.getClassOrder
         ? env.context.getClassOrder(classList)
         : getClassOrderPolyfill(classList, { env });
     return orderedClasses.sort(([nameA, a], [nameZ, z]) => {
@@ -21720,8 +21727,8 @@ function sortClasses(classStr, { env, ignoreFirst = false, ignoreLast = false, r
         return ' ';
     }
     let result = '';
-    let parts = classStr.split(/([\t\r\f\n ]+)/);
-    let classes = parts.filter((_, i) => i % 2 === 0);
+    const parts = classStr.split(/([\t\r\f\n ]+)/);
+    const classes = parts.filter((_, i) => i % 2 === 0);
     let whitespace = parts.filter((_, i) => i % 2 !== 0);
     if (classes[classes.length - 1] === '') {
         classes.pop();
@@ -21737,7 +21744,7 @@ function sortClasses(classStr, { env, ignoreFirst = false, ignoreLast = false, r
     if (ignoreLast) {
         suffix = `${whitespace.pop() ?? ''}${classes.pop() ?? ''}`;
     }
-    let { classList, removedIndices } = sortClassList(classes, {
+    const { classList, removedIndices } = sortClassList(classes, {
         env,
         removeDuplicates,
     });
@@ -21762,9 +21769,9 @@ function sortClassList(classList, { env, removeDuplicates, }) {
     if (env.options.tailwindPreserveDuplicates) {
         removeDuplicates = false;
     }
-    let removedIndices = new Set();
+    const removedIndices = new Set();
     if (removeDuplicates) {
-        let seenClasses = new Set();
+        const seenClasses = new Set();
         orderedClasses = orderedClasses.filter(([cls, order], index) => {
             if (seenClasses.has(cls)) {
                 removedIndices.add(index);