eslint-plugin-tailwind-variants 2.0.1 → 2.0.3

package/dist/rules/sort-custom-properties.js

@@ -19,6 +19,12 @@ export const MESSAGE_IDS = {
     patternTooLong: "patternTooLong",
     unsortedCustomProperties: "unsortedCustomProperties",
 };
+function isNodeWithOffset(node) {
+    return (node.loc != null &&
+        typeof node.loc.start.offset ===
+            "number" &&
+        typeof node.loc.end.offset === "number");
+}
 export const rule = createRule({
     name: "sort-custom-properties",
     meta: {
@@ -138,21 +144,33 @@ export const rule = createRule({
                             }
                             return a.property.localeCompare(b.property);
                         });
-                        const getFullLine = (node) => {
-                            const lines = sourceCode.lines;
-                            const startLine = node.loc.start.line - 1;
-                            return lines[startLine];
+                        const allNodesHaveOffsets = sorted.every((item) => isNodeWithOffset(item.node));
+                        if (!allNodesHaveOffsets)
+                            return null;
+                        const getFullDeclaration = (node) => {
+                            const lineStartIndex = sourceCode.getIndexFromLoc({
+                                column: 1,
+                                line: node.loc.start.line,
+                            });
+                            const endIndex = node.loc.end.offset + 1; // Include semicolon
+                            return sourceCode.text.slice(lineStartIndex, endIndex);
                         };
                         const fixes = currentBlockProperties.map((prop, index) => {
                             const sortedNode = sorted[index].node;
-                            const sortedLine = getFullLine(sortedNode);
+                            const sortedDeclaration = getFullDeclaration(sortedNode);
+                            // Column is 1-based in ESLint loc
                             const currentLineStart = sourceCode.getIndexFromLoc({
                                 column: 1,
                                 line: prop.node.loc.start.line,
                             });
+                            let endLine = prop.node.loc.end.line + 1;
+                            const nextProp = currentBlockProperties[index + 1];
+                            if (nextProp) {
+                                endLine = nextProp.node.loc.start.line;
+                            }
                             const currentLineEnd = sourceCode.getIndexFromLoc({
                                 column: 1,
-                                line: prop.node.loc.start.line + 1,
+                                line: endLine,
                             });
                             let replacement = "";
                             if (emptyLineBetweenGroups && index > 0) {
@@ -162,7 +180,7 @@ export const rule = createRule({
                                     replacement = "\n";
                                 }
                             }
-                            replacement += sortedLine + "\n";
+                            replacement += sortedDeclaration + "\n";
                             return fixer.replaceTextRange([currentLineStart, currentLineEnd], replacement);
                         });
                         return fixes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-tailwind-variants",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "ESLint plugin for Tailwind Variants",
   "repository": {
     "type": "git",