@unocss/eslint-plugin 66.3.3 → 66.4.0

package/dist/index.cjs

@@ -276,10 +276,39 @@ const order = createRule({
     messages: {
       "invalid-order": "UnoCSS utilities are not ordered"
     },
-    schema: []
+    schema: [
+      {
+        type: "object",
+        properties: {
+          unoFunctions: {
+            type: "array",
+            items: { type: "string" }
+          },
+          unoVariables: {
+            type: "array",
+            items: { type: "string" }
+          }
+        }
+      }
+    ]
   },
-  defaultOptions: [],
+  defaultOptions: [
+    {
+      unoFunctions: ["clsx", "classnames"],
+      unoVariables: ["^cls", "classNames?$"]
+      // for example `clsButton = ''` or `buttonClassNames = {}`
+    }
+  ],
   create(context) {
+    let { unoFunctions = ["clsx", "classnames"], unoVariables = ["^cls", "classNames?$"] } = context.options[0] || {};
+    unoFunctions = unoFunctions.map((name) => name.toLowerCase());
+    function isUnoFunction(name) {
+      return unoFunctions.includes(name.toLowerCase());
+    }
+    const unoVariablesRegexes = unoVariables.map((regex) => new RegExp(regex, "i"));
+    function isUnoVariable(name) {
+      return unoVariablesRegexes.some((reg) => reg.test(name));
+    }
     function checkLiteral(node, addSpace) {
       if (typeof node.value !== "string" || !node.value.trim())
         return;
@@ -308,13 +337,84 @@ const order = createRule({
         });
       }
     }
+    function checkTemplateElement(quasi) {
+      const input = quasi.value.raw;
+      if (!input)
+        return;
+      const getRange = () => {
+        const text = context.sourceCode.getText(quasi);
+        const raw = quasi.value.raw;
+        if (!text.includes(raw))
+          return;
+        const rawStart = text.indexOf(raw);
+        const start = quasi.range[0] + rawStart;
+        const end = quasi.range[0] + rawStart + raw.length;
+        if (start < quasi.range[0] || end > quasi.range[1])
+          return;
+        return [start, end];
+      };
+      const realRange = getRange();
+      if (!realRange)
+        return;
+      let sorted = syncAction(
+        context.settings.unocss?.configPath,
+        "sort",
+        input
+      ).trim();
+      if (/^\s/.test(input))
+        sorted = ` ${sorted}`;
+      if (/\s$/.test(input))
+        sorted += " ";
+      if (sorted !== input) {
+        context.report({
+          node: quasi,
+          loc: quasi.loc,
+          messageId: "invalid-order",
+          fix(fixer) {
+            const realRange2 = getRange();
+            if (!realRange2)
+              return null;
+            return fixer.replaceTextRange(realRange2, sorted);
+          }
+        });
+      }
+    }
+    function isPossibleLiteral(node) {
+      return node.type === "Literal" || node.type === "TemplateLiteral" || node.type === "TaggedTemplateExpression";
+    }
+    function checkPossibleLiteral(...nodes) {
+      nodes.forEach((node) => {
+        if (!isPossibleLiteral(node))
+          return;
+        if (node.type === "Literal" && typeof node.value === "string") {
+          return checkLiteral(node);
+        }
+        const isSimpleTemplateLiteral = (node2) => {
+          return node2.expressions.length === 0 && node2.quasis.length === 1;
+        };
+        if (node.type === "TemplateLiteral" && isSimpleTemplateLiteral(node)) {
+          return checkTemplateElement(node.quasis[0]);
+        }
+        const isStringRaw = (tag) => {
+          return tag.type === "MemberExpression" && tag.object.type === "Identifier" && tag.object.name === "String" && tag.property.type === "Identifier" && tag.property.name === "raw";
+        };
+        if (node.type === "TaggedTemplateExpression" && isStringRaw(node.tag) && isSimpleTemplateLiteral(node.quasi)) {
+          return checkTemplateElement(node.quasi.quasis[0]);
+        }
+        if (node.type === "TemplateLiteral" && node.expressions.length > 0 && node.quasis.length > 0) {
+          return void node.quasis.forEach((quasi) => {
+            checkTemplateElement(quasi);
+          });
+        }
+      });
+    }
     const scriptVisitor = {
       JSXAttribute(node) {
         if (typeof node.name.name === "string" && CLASS_FIELDS.includes(node.name.name.toLowerCase()) && node.value) {
-          if (node.value.type === "Literal")
-            checkLiteral(node.value);
-          else if (node.value.type === "JSXExpressionContainer" && node.value.expression.type === "Literal")
-            checkLiteral(node.value.expression);
+          if (isPossibleLiteral(node.value))
+            return checkPossibleLiteral(node.value);
+          else if (node.value.type === "JSXExpressionContainer" && isPossibleLiteral(node.value.expression))
+            return checkPossibleLiteral(node.value.expression);
         }
       },
       SvelteAttribute(node) {
@@ -344,6 +444,56 @@ const order = createRule({
             }
           });
         }
+      },
+      // for Future node types
+      // https://typescript-eslint.io/play/#ts=5.8.3&showAST=es&fileType=.tsx&code=PTAEDMCcHsFtQBYBckAcDOAuEB3PA6AO1VgCt18BjOYVAQ0oGs6BzAU2EoBt0APAfgZIAlgDc2AFToAjALzUAJm1AAoEKG59OPXvgX4k6FUu51IywnVht09Sss29QAbxWhQSAJ6plAYS506OgAanRcAK7KsqD%2BgegAgpCQdJ6gAD4xAUEAIsKUItCWkKkZ6EiQwoQs6aCE4bDSbJA10sIslUg1dVxcLdDQXGx0hDXhhErglWwKANxuHt5%2BWei5%2BcKFZqnRAEps1JAKADxlFVUANKDDngB8c%2B5ePplxiclbT0GhEWwA2gC6dxAxmtChodAAKfCQyqocKGTDvEJhSJ-ACU8JOlRYcwAvsY9gFzIDCMCRo4IVDiLCsKC%2BPhYh8kT9fmjQBiqnMVNRCGUPDYkABGUDRcqRTmFHlIPkAJiFEDC6DYYu5nUlZQAzLKRYquTy2LxynR6egAHJWKKgADksEgAFoACyoXgWlSDTqmIKm6zo8qY0bjNiTQjTFRqMDoYSwVCDDSBbXLT3msnzC2oG38x2ga02qWOi1neaqgWgfiW6RcaBMC2geEWwiFNh5gvS0AAMhbpfLlfz7mcoAARAg2D1oH34VqLn2cNBIFwFKO5TxlNj8yiQ%2BpYNPlEgEMNQPXQ6AAAaFwVt3llGVni3gQZOw%2BgQD6coB6M1AABloO1KGEAKK8VDmIJ1kIA93FAG1QEGcAkDHPlT3bQspRA9xwIqFhkBrG89SrV9hElZIuAPQBRU0AODkjxPVt22vW8LXvQBJb0AGBVABBNQAwFzXMAD0lSMAklVkfSqA9OXjM1ZSTe5YIoo9MN4Q9u3PIsz0PKTQAAEmcPUDSNBNsRkpsyjg0AAGU%2BJYfBkhwRTb1AaQWBtb5RDMMEbRtdA4DYAAdAB9eyKhkQYUV%2BHSxL0iSjNOEyzIsvUrJsuyHKclzrE87zhF8th-JUtT9WSTSzW0lcgA&eslintrc=N4KABGBEBOCuA2BTAzpAXGYBfEWg&tsconfig=N4KABGBEDGD2C2AHAlgGwKYCcDyiAuysAdgM6QBcYoEEkJemy0eAcgK6qoDCAFutAGsylBm3TgwAXxCSgA&tokens=false
+      CallExpression(node) {
+        if (!(node.callee.type === "Identifier" && isUnoFunction(node.callee.name)))
+          return;
+        node.arguments.forEach((arg) => {
+          if (isPossibleLiteral(arg)) {
+            return checkPossibleLiteral(arg);
+          }
+          if (arg.type === "ConditionalExpression") {
+            return checkPossibleLiteral(arg.consequent, arg.alternate);
+          }
+          if (arg.type === "LogicalExpression") {
+            return checkPossibleLiteral(arg.left, arg.right);
+          }
+          if (arg.type === "ObjectExpression") {
+            const keys = arg.properties.filter((p) => p.type === "Property").map((p) => p.key);
+            return checkPossibleLiteral(...keys);
+          }
+        });
+      },
+      // https://typescript-eslint.io/play/#ts=5.8.2&showAST=es&fileType=.tsx&code=MYewdgzgLgBApgDygJwIYGEA2qIQHKoC2cMAvDAOQBeAtAIwAMDFAUCwPTswBuqyAlqgBGmEgBM4wbGij9wLUJFhSIAIQCuUKODKVCyeq0XQYKjVvAAmXQAN99GABIA3ohQZsuAsQC%2BNheAmZpraYADMtvZ0Tq5IaFg4%2BERwfjA4poFQbJwwIEIAVpKwElJ8qLLyxrBCUGAJXskQus4sMDASAGao6phQAFx6mDSWAA4IFAA0rTAA7vxQABYAonGoAzYdoggw83CEEDTAcGBQcMgwQgDmNDMLuzCnSDQiqMAA1jFu8Z5JvjZTbQQAxabTaAE8BhRCENRuNpj4WAiOFx0lV2pJpOU5GAAkoLrV6r84BBrOQQeiuj1%2BoNhmNJtMgTByeDIdDaXC2gifGkmlUgA&eslintrc=N4KABGBEBOCuA2BTAzpAXGYBfEWg&tsconfig=N4KABGBEDGD2C2AHAlgGwKYCcDyiAuysAdgM6QBcYoEEkJemy0eAcgK6qoDCAFutAGsylBm3TgwAXxCSgA&tokens=false
+      VariableDeclarator(node) {
+        if (node.id.type !== "Identifier" || !node.init || !isUnoVariable(node.id.name))
+          return;
+        if (isPossibleLiteral(node.init)) {
+          return checkPossibleLiteral(node.init);
+        }
+        if (node.init.type === "TSAsExpression" && isPossibleLiteral(node.init.expression)) {
+          return checkPossibleLiteral(node.init.expression);
+        }
+        function handleObjectExpression(node2) {
+          node2.properties.forEach((p) => {
+            if (p.type !== "Property")
+              return;
+            if (isPossibleLiteral(p.value)) {
+              return checkPossibleLiteral(p.value);
+            }
+            if (p.value.type === "ObjectExpression") {
+              return handleObjectExpression(p.value);
+            }
+          });
+        }
+        if (node.init.type === "ObjectExpression") {
+          return handleObjectExpression(node.init);
+        }
+        if (node.init.type === "TSAsExpression" && node.init.expression.type === "ObjectExpression") {
+          return handleObjectExpression(node.init.expression);
+        }
       }
     };
     const templateBodyVisitor = {

package/dist/index.mjs

@@ -270,10 +270,39 @@ const order = createRule({
     messages: {
       "invalid-order": "UnoCSS utilities are not ordered"
     },
-    schema: []
+    schema: [
+      {
+        type: "object",
+        properties: {
+          unoFunctions: {
+            type: "array",
+            items: { type: "string" }
+          },
+          unoVariables: {
+            type: "array",
+            items: { type: "string" }
+          }
+        }
+      }
+    ]
   },
-  defaultOptions: [],
+  defaultOptions: [
+    {
+      unoFunctions: ["clsx", "classnames"],
+      unoVariables: ["^cls", "classNames?$"]
+      // for example `clsButton = ''` or `buttonClassNames = {}`
+    }
+  ],
   create(context) {
+    let { unoFunctions = ["clsx", "classnames"], unoVariables = ["^cls", "classNames?$"] } = context.options[0] || {};
+    unoFunctions = unoFunctions.map((name) => name.toLowerCase());
+    function isUnoFunction(name) {
+      return unoFunctions.includes(name.toLowerCase());
+    }
+    const unoVariablesRegexes = unoVariables.map((regex) => new RegExp(regex, "i"));
+    function isUnoVariable(name) {
+      return unoVariablesRegexes.some((reg) => reg.test(name));
+    }
     function checkLiteral(node, addSpace) {
       if (typeof node.value !== "string" || !node.value.trim())
         return;
@@ -302,13 +331,84 @@ const order = createRule({
         });
       }
     }
+    function checkTemplateElement(quasi) {
+      const input = quasi.value.raw;
+      if (!input)
+        return;
+      const getRange = () => {
+        const text = context.sourceCode.getText(quasi);
+        const raw = quasi.value.raw;
+        if (!text.includes(raw))
+          return;
+        const rawStart = text.indexOf(raw);
+        const start = quasi.range[0] + rawStart;
+        const end = quasi.range[0] + rawStart + raw.length;
+        if (start < quasi.range[0] || end > quasi.range[1])
+          return;
+        return [start, end];
+      };
+      const realRange = getRange();
+      if (!realRange)
+        return;
+      let sorted = syncAction(
+        context.settings.unocss?.configPath,
+        "sort",
+        input
+      ).trim();
+      if (/^\s/.test(input))
+        sorted = ` ${sorted}`;
+      if (/\s$/.test(input))
+        sorted += " ";
+      if (sorted !== input) {
+        context.report({
+          node: quasi,
+          loc: quasi.loc,
+          messageId: "invalid-order",
+          fix(fixer) {
+            const realRange2 = getRange();
+            if (!realRange2)
+              return null;
+            return fixer.replaceTextRange(realRange2, sorted);
+          }
+        });
+      }
+    }
+    function isPossibleLiteral(node) {
+      return node.type === "Literal" || node.type === "TemplateLiteral" || node.type === "TaggedTemplateExpression";
+    }
+    function checkPossibleLiteral(...nodes) {
+      nodes.forEach((node) => {
+        if (!isPossibleLiteral(node))
+          return;
+        if (node.type === "Literal" && typeof node.value === "string") {
+          return checkLiteral(node);
+        }
+        const isSimpleTemplateLiteral = (node2) => {
+          return node2.expressions.length === 0 && node2.quasis.length === 1;
+        };
+        if (node.type === "TemplateLiteral" && isSimpleTemplateLiteral(node)) {
+          return checkTemplateElement(node.quasis[0]);
+        }
+        const isStringRaw = (tag) => {
+          return tag.type === "MemberExpression" && tag.object.type === "Identifier" && tag.object.name === "String" && tag.property.type === "Identifier" && tag.property.name === "raw";
+        };
+        if (node.type === "TaggedTemplateExpression" && isStringRaw(node.tag) && isSimpleTemplateLiteral(node.quasi)) {
+          return checkTemplateElement(node.quasi.quasis[0]);
+        }
+        if (node.type === "TemplateLiteral" && node.expressions.length > 0 && node.quasis.length > 0) {
+          return void node.quasis.forEach((quasi) => {
+            checkTemplateElement(quasi);
+          });
+        }
+      });
+    }
     const scriptVisitor = {
       JSXAttribute(node) {
         if (typeof node.name.name === "string" && CLASS_FIELDS.includes(node.name.name.toLowerCase()) && node.value) {
-          if (node.value.type === "Literal")
-            checkLiteral(node.value);
-          else if (node.value.type === "JSXExpressionContainer" && node.value.expression.type === "Literal")
-            checkLiteral(node.value.expression);
+          if (isPossibleLiteral(node.value))
+            return checkPossibleLiteral(node.value);
+          else if (node.value.type === "JSXExpressionContainer" && isPossibleLiteral(node.value.expression))
+            return checkPossibleLiteral(node.value.expression);
         }
       },
       SvelteAttribute(node) {
@@ -338,6 +438,56 @@ const order = createRule({
             }
           });
         }
+      },
+      // for Future node types
+      // https://typescript-eslint.io/play/#ts=5.8.3&showAST=es&fileType=.tsx&code=PTAEDMCcHsFtQBYBckAcDOAuEB3PA6AO1VgCt18BjOYVAQ0oGs6BzAU2EoBt0APAfgZIAlgDc2AFToAjALzUAJm1AAoEKG59OPXvgX4k6FUu51IywnVht09Sss29QAbxWhQSAJ6plAYS506OgAanRcAK7KsqD%2BgegAgpCQdJ6gAD4xAUEAIsKUItCWkKkZ6EiQwoQs6aCE4bDSbJA10sIslUg1dVxcLdDQXGx0hDXhhErglWwKANxuHt5%2BWei5%2BcKFZqnRAEps1JAKADxlFVUANKDDngB8c%2B5ePplxiclbT0GhEWwA2gC6dxAxmtChodAAKfCQyqocKGTDvEJhSJ-ACU8JOlRYcwAvsY9gFzIDCMCRo4IVDiLCsKC%2BPhYh8kT9fmjQBiqnMVNRCGUPDYkABGUDRcqRTmFHlIPkAJiFEDC6DYYu5nUlZQAzLKRYquTy2LxynR6egAHJWKKgADksEgAFoACyoXgWlSDTqmIKm6zo8qY0bjNiTQjTFRqMDoYSwVCDDSBbXLT3msnzC2oG38x2ga02qWOi1neaqgWgfiW6RcaBMC2geEWwiFNh5gvS0AAMhbpfLlfz7mcoAARAg2D1oH34VqLn2cNBIFwFKO5TxlNj8yiQ%2BpYNPlEgEMNQPXQ6AAAaFwVt3llGVni3gQZOw%2BgQD6coB6M1AABloO1KGEAKK8VDmIJ1kIA93FAG1QEGcAkDHPlT3bQspRA9xwIqFhkBrG89SrV9hElZIuAPQBRU0AODkjxPVt22vW8LXvQBJb0AGBVABBNQAwFzXMAD0lSMAklVkfSqA9OXjM1ZSTe5YIoo9MN4Q9u3PIsz0PKTQAAEmcPUDSNBNsRkpsyjg0AAGU%2BJYfBkhwRTb1AaQWBtb5RDMMEbRtdA4DYAAdAB9eyKhkQYUV%2BHSxL0iSjNOEyzIsvUrJsuyHKclzrE87zhF8th-JUtT9WSTSzW0lcgA&eslintrc=N4KABGBEBOCuA2BTAzpAXGYBfEWg&tsconfig=N4KABGBEDGD2C2AHAlgGwKYCcDyiAuysAdgM6QBcYoEEkJemy0eAcgK6qoDCAFutAGsylBm3TgwAXxCSgA&tokens=false
+      CallExpression(node) {
+        if (!(node.callee.type === "Identifier" && isUnoFunction(node.callee.name)))
+          return;
+        node.arguments.forEach((arg) => {
+          if (isPossibleLiteral(arg)) {
+            return checkPossibleLiteral(arg);
+          }
+          if (arg.type === "ConditionalExpression") {
+            return checkPossibleLiteral(arg.consequent, arg.alternate);
+          }
+          if (arg.type === "LogicalExpression") {
+            return checkPossibleLiteral(arg.left, arg.right);
+          }
+          if (arg.type === "ObjectExpression") {
+            const keys = arg.properties.filter((p) => p.type === "Property").map((p) => p.key);
+            return checkPossibleLiteral(...keys);
+          }
+        });
+      },
+      // https://typescript-eslint.io/play/#ts=5.8.2&showAST=es&fileType=.tsx&code=MYewdgzgLgBApgDygJwIYGEA2qIQHKoC2cMAvDAOQBeAtAIwAMDFAUCwPTswBuqyAlqgBGmEgBM4wbGij9wLUJFhSIAIQCuUKODKVCyeq0XQYKjVvAAmXQAN99GABIA3ohQZsuAsQC%2BNheAmZpraYADMtvZ0Tq5IaFg4%2BERwfjA4poFQbJwwIEIAVpKwElJ8qLLyxrBCUGAJXskQus4sMDASAGao6phQAFx6mDSWAA4IFAA0rTAA7vxQABYAonGoAzYdoggw83CEEDTAcGBQcMgwQgDmNDMLuzCnSDQiqMAA1jFu8Z5JvjZTbQQAxabTaAE8BhRCENRuNpj4WAiOFx0lV2pJpOU5GAAkoLrV6r84BBrOQQeiuj1%2BoNhmNJtMgTByeDIdDaXC2gifGkmlUgA&eslintrc=N4KABGBEBOCuA2BTAzpAXGYBfEWg&tsconfig=N4KABGBEDGD2C2AHAlgGwKYCcDyiAuysAdgM6QBcYoEEkJemy0eAcgK6qoDCAFutAGsylBm3TgwAXxCSgA&tokens=false
+      VariableDeclarator(node) {
+        if (node.id.type !== "Identifier" || !node.init || !isUnoVariable(node.id.name))
+          return;
+        if (isPossibleLiteral(node.init)) {
+          return checkPossibleLiteral(node.init);
+        }
+        if (node.init.type === "TSAsExpression" && isPossibleLiteral(node.init.expression)) {
+          return checkPossibleLiteral(node.init.expression);
+        }
+        function handleObjectExpression(node2) {
+          node2.properties.forEach((p) => {
+            if (p.type !== "Property")
+              return;
+            if (isPossibleLiteral(p.value)) {
+              return checkPossibleLiteral(p.value);
+            }
+            if (p.value.type === "ObjectExpression") {
+              return handleObjectExpression(p.value);
+            }
+          });
+        }
+        if (node.init.type === "ObjectExpression") {
+          return handleObjectExpression(node.init);
+        }
+        if (node.init.type === "TSAsExpression" && node.init.expression.type === "ObjectExpression") {
+          return handleObjectExpression(node.init.expression);
+        }
       }
     };
     const templateBodyVisitor = {

package/dist/worker.mjs

@@ -9,16 +9,21 @@ async function sortRules(rules, uno) {
     uno.config.details = true;
   const expandedResult = parseVariantGroup(rules);
   rules = expandedResult.expanded;
-  const result = await Promise.all(rules.split(/\s+/g).map(async (i) => {
+  const result = [];
+  const arr = rules.split(/\s+/g);
+  for (const i of arr) {
+    if (!i)
+      continue;
     const token = await uno.parseToken(i);
     if (token == null) {
       unknown.push(i);
-      return void 0;
+      result.push(void 0);
+      continue;
     }
     const variantRank = (token[0][5]?.variantHandlers?.length || 0) * 1e5;
     const order = token[0][0] + variantRank;
-    return [order, i];
-  }));
+    result.push([order, i]);
+  }
   let sorted = result.filter(notNull).sort((a, b) => {
     let result2 = a[0] - b[0];
     if (result2 === 0)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/eslint-plugin",
   "type": "module",
-  "version": "66.3.3",
+  "version": "66.4.0",
   "description": "ESLint plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -35,18 +35,18 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@typescript-eslint/utils": "^8.35.1",
+    "@typescript-eslint/utils": "^8.38.0",
     "magic-string": "^0.30.17",
-    "synckit": "^0.11.8",
-    "@unocss/config": "66.3.3",
-    "@unocss/core": "66.3.3",
-    "@unocss/rule-utils": "66.3.3"
+    "synckit": "^0.11.11",
+    "@unocss/config": "66.4.0",
+    "@unocss/rule-utils": "66.4.0",
+    "@unocss/core": "66.4.0"
   },
   "devDependencies": {
     "@typescript/native-preview": "latest",
-    "svelte-eslint-parser": "^1.2.0",
+    "svelte-eslint-parser": "^1.3.1",
     "vue-eslint-parser": "^10.2.0",
-    "@unocss/eslint-plugin": "66.3.3"
+    "@unocss/eslint-plugin": "66.4.0"
   },
   "scripts": {
     "build": "unbuild",