@unocss/eslint-plugin 0.65.0-beta.2 → 0.65.0-beta.3

package/dist/index.cjs

@@ -5,6 +5,7 @@ const utils = require('@typescript-eslint/utils');
 const synckit = require('synckit');
 const dirs = require('./dirs.cjs');
 const MagicString = require('magic-string');
+const types = require('@typescript-eslint/types');
 require('node:url');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
@@ -279,24 +280,30 @@ const order = createRule({
   },
   defaultOptions: [],
   create(context) {
-    function checkLiteral(node) {
+    function checkLiteral(node, addSpace) {
       if (typeof node.value !== "string" || !node.value.trim())
         return;
       const input = node.value;
-      const sorted = syncAction(
+      let sorted = syncAction(
         context.settings.unocss?.configPath,
         "sort",
         input
       ).trim();
+      if (addSpace === "before")
+        sorted = ` ${sorted}`;
+      else if (addSpace === "after")
+        sorted += " ";
       if (sorted !== input) {
+        const nodeOrToken = node.type === "SvelteLiteral" ? { type: types.AST_TOKEN_TYPES.String, value: node.value, loc: node.loc, range: node.range } : node;
         context.report({
-          node,
+          node: nodeOrToken,
+          loc: node.loc,
           messageId: "invalid-order",
           fix(fixer) {
             if (AST_NODES_WITH_QUOTES.includes(node.type))
               return fixer.replaceTextRange([node.range[0] + 1, node.range[1] - 1], sorted);
             else
-              return fixer.replaceText(node, sorted);
+              return fixer.replaceText(nodeOrToken, sorted);
           }
         });
       }
@@ -310,8 +317,30 @@ const order = createRule({
       },
       SvelteAttribute(node) {
         if (node.key.name === "class") {
-          if (node.value?.[0].type === "SvelteLiteral")
-            checkLiteral(node.value[0]);
+          let checkExpressionRecursively = function(expression) {
+            if (expression.type !== "ConditionalExpression")
+              return;
+            if (expression.consequent.type === "Literal") {
+              checkLiteral(expression.consequent);
+            }
+            if (expression.alternate) {
+              if (expression.alternate.type === "ConditionalExpression") {
+                checkExpressionRecursively(expression.alternate);
+              } else if (expression.alternate.type === "Literal") {
+                checkLiteral(expression.alternate);
+              }
+            }
+          };
+          if (!node.value.length)
+            return;
+          node.value.forEach((obj, i) => {
+            if (obj.type === "SvelteMustacheTag") {
+              checkExpressionRecursively(obj.expression);
+            } else if (obj.type === "SvelteLiteral") {
+              const addSpace = node.value?.[i - 1]?.type === "SvelteMustacheTag" ? "before" : node.value?.[i + 1]?.type === "SvelteMustacheTag" ? "after" : void 0;
+              checkLiteral(obj, addSpace);
+            }
+          });
         }
       }
     };

package/dist/index.mjs

@@ -3,6 +3,7 @@ import { ESLintUtils } from '@typescript-eslint/utils';
 import { createSyncFn } from 'synckit';
 import { distDir } from './dirs.mjs';
 import MagicString from 'magic-string';
+import { AST_TOKEN_TYPES } from '@typescript-eslint/types';
 import 'node:url';
 
 const CLASS_FIELDS = ["class", "classname"];
@@ -273,24 +274,30 @@ const order = createRule({
   },
   defaultOptions: [],
   create(context) {
-    function checkLiteral(node) {
+    function checkLiteral(node, addSpace) {
       if (typeof node.value !== "string" || !node.value.trim())
         return;
       const input = node.value;
-      const sorted = syncAction(
+      let sorted = syncAction(
         context.settings.unocss?.configPath,
         "sort",
         input
       ).trim();
+      if (addSpace === "before")
+        sorted = ` ${sorted}`;
+      else if (addSpace === "after")
+        sorted += " ";
       if (sorted !== input) {
+        const nodeOrToken = node.type === "SvelteLiteral" ? { type: AST_TOKEN_TYPES.String, value: node.value, loc: node.loc, range: node.range } : node;
         context.report({
-          node,
+          node: nodeOrToken,
+          loc: node.loc,
           messageId: "invalid-order",
           fix(fixer) {
             if (AST_NODES_WITH_QUOTES.includes(node.type))
               return fixer.replaceTextRange([node.range[0] + 1, node.range[1] - 1], sorted);
             else
-              return fixer.replaceText(node, sorted);
+              return fixer.replaceText(nodeOrToken, sorted);
           }
         });
       }
@@ -304,8 +311,30 @@ const order = createRule({
       },
       SvelteAttribute(node) {
         if (node.key.name === "class") {
-          if (node.value?.[0].type === "SvelteLiteral")
-            checkLiteral(node.value[0]);
+          let checkExpressionRecursively = function(expression) {
+            if (expression.type !== "ConditionalExpression")
+              return;
+            if (expression.consequent.type === "Literal") {
+              checkLiteral(expression.consequent);
+            }
+            if (expression.alternate) {
+              if (expression.alternate.type === "ConditionalExpression") {
+                checkExpressionRecursively(expression.alternate);
+              } else if (expression.alternate.type === "Literal") {
+                checkLiteral(expression.alternate);
+              }
+            }
+          };
+          if (!node.value.length)
+            return;
+          node.value.forEach((obj, i) => {
+            if (obj.type === "SvelteMustacheTag") {
+              checkExpressionRecursively(obj.expression);
+            } else if (obj.type === "SvelteLiteral") {
+              const addSpace = node.value?.[i - 1]?.type === "SvelteMustacheTag" ? "before" : node.value?.[i + 1]?.type === "SvelteMustacheTag" ? "after" : void 0;
+              checkLiteral(obj, addSpace);
+            }
+          });
         }
       }
     };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/eslint-plugin",
   "type": "module",
-  "version": "0.65.0-beta.2",
+  "version": "0.65.0-beta.3",
   "description": "ESLint plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -38,12 +38,13 @@
     "@typescript-eslint/utils": "^8.12.2",
     "magic-string": "^0.30.12",
     "synckit": "^0.9.2",
-    "@unocss/config": "0.65.0-beta.2",
-    "@unocss/core": "0.65.0-beta.2"
+    "@unocss/core": "0.65.0-beta.3",
+    "@unocss/config": "0.65.0-beta.3"
   },
   "devDependencies": {
+    "svelte-eslint-parser": "^0.42.0",
     "vue-eslint-parser": "^9.4.3",
-    "@unocss/eslint-plugin": "0.65.0-beta.2"
+    "@unocss/eslint-plugin": "0.65.0-beta.3"
   },
   "scripts": {
     "build": "unbuild",