eslint-plugin-absolute 0.11.7 → 0.11.8

package/dist/index.js

@@ -1343,6 +1343,20 @@ var sortKeysFixable = createRule({
       }
       return prevEnd;
     };
+    const compareProps = (left, right) => {
+      if (variablesBeforeFunctions) {
+        const leftIsFunc = isFunctionProperty(left);
+        const rightIsFunc = isFunctionProperty(right);
+        if (leftIsFunc !== rightIsFunc) {
+          return leftIsFunc ? 1 : SORT_BEFORE;
+        }
+      }
+      let res = compareKeys(getPropertyKeyName(left), getPropertyKeyName(right));
+      if (order === "desc") {
+        res = -res;
+      }
+      return res;
+    };
     const buildSortedText = (fixableProps, rangeStart) => {
       const chunks = [];
       for (let idx = 0;idx < fixableProps.length; idx++) {
@@ -1357,22 +1371,7 @@ var sortKeysFixable = createRule({
         const text = sourceCode.text.slice(chunkStart, fullEnd);
         chunks.push({ prop, text });
       }
-      const sorted = chunks.slice().sort((left, right) => {
-        if (variablesBeforeFunctions) {
-          const leftIsFunc = isFunctionProperty(left.prop);
-          const rightIsFunc = isFunctionProperty(right.prop);
-          if (leftIsFunc !== rightIsFunc) {
-            return leftIsFunc ? 1 : SORT_BEFORE;
-          }
-        }
-        const leftKey = getPropertyKeyName(left.prop);
-        const rightKey = getPropertyKeyName(right.prop);
-        let res = compareKeys(leftKey, rightKey);
-        if (order === "desc") {
-          res = -res;
-        }
-        return res;
-      });
+      const sorted = chunks.slice().sort((left, right) => compareProps(left.prop, right.prop));
       const firstPropLine = fixableProps[0].loc.start.line;
       const lastPropLine = fixableProps[fixableProps.length - 1].loc.start.line;
       const isMultiline = firstPropLine !== lastPropLine;
@@ -1396,26 +1395,34 @@ ${indent}`;
         return separator + stripped;
       }).join("");
     };
-    const getFixableProps = (node) => node.properties.filter((prop) => prop.type === "Property" && !prop.computed && (prop.key.type === "Identifier" || prop.key.type === "Literal"));
     const checkObjectExpression = (node) => {
       if (node.properties.length < minKeys) {
         return;
       }
+      const segments = [];
+      let currentSegment = [];
+      for (const prop of node.properties) {
+        if (prop.type === "Property") {
+          currentSegment.push(prop);
+          continue;
+        }
+        if (currentSegment.length > 0) {
+          segments.push(currentSegment);
+          currentSegment = [];
+        }
+      }
+      if (currentSegment.length > 0) {
+        segments.push(currentSegment);
+      }
       let autoFixable = true;
       const keys = node.properties.map((prop) => {
-        let keyName = null;
-        let isFunc = false;
         if (prop.type !== "Property") {
-          autoFixable = false;
-          return {
-            isFunction: isFunc,
-            keyName,
-            node: prop
-          };
+          return { isFunction: false, keyName: null, node: prop };
         }
         if (prop.computed) {
           autoFixable = false;
         }
+        let keyName = null;
         if (prop.key.type === "Identifier") {
           keyName = prop.key.name;
         } else if (prop.key.type === "Literal") {
@@ -1424,11 +1431,8 @@ ${indent}`;
         } else {
           autoFixable = false;
         }
-        if (isFunctionProperty(prop)) {
-          isFunc = true;
-        }
         return {
-          isFunction: isFunc,
+          isFunction: isFunctionProperty(prop),
           keyName,
           node: prop
         };
@@ -1436,30 +1440,23 @@ ${indent}`;
       if (hasDuplicatePropertyNames(node.properties)) {
         autoFixable = false;
       }
-      if (autoFixable) {
-        const impureCount = keys.filter((key) => key.node.type === "Property" && !isPureRuntimeExpression(key.node.value, getStableLocalsForNode(key.node))).length;
-        autoFixable = impureCount <= 1;
-      }
+      const isSegmentFixable = (segment) => segment.filter((prop) => !isPureRuntimeExpression(prop.value, getStableLocalsForNode(prop))).length <= 1;
+      const isSegmentSorted = (segment) => segment.every((prop, idx) => idx === 0 || compareProps(segment[idx - 1], prop) <= 0);
       let fixProvided = false;
       const createReportWithFix = (curr, shouldFix) => {
         context.report({
           fix: shouldFix ? (fixer) => {
-            const fixableProps = getFixableProps(node);
-            if (fixableProps.length < minKeys) {
-              return null;
-            }
-            const [firstProp] = fixableProps;
-            const lastProp = fixableProps[fixableProps.length - 1];
-            if (!firstProp || !lastProp) {
-              return null;
-            }
-            const firstLeading = getLeadingComments(firstProp, null);
-            const [firstLeadingComment] = firstLeading;
-            const rangeStart = firstLeadingComment ? firstLeadingComment.range[0] : firstProp.range[0];
-            const lastTrailing = getTrailingComments(lastProp, null);
-            const rangeEnd = lastTrailing.length > 0 ? lastTrailing[lastTrailing.length - 1].range[1] : lastProp.range[1];
-            const sortedText = buildSortedText(fixableProps, rangeStart);
-            return fixer.replaceTextRange([rangeStart, rangeEnd], sortedText);
+            const fixes = segments.filter((segment) => segment.length >= minKeys && isSegmentFixable(segment) && !isSegmentSorted(segment)).map((segment) => {
+              const [firstProp] = segment;
+              const lastProp = segment[segment.length - 1];
+              const firstLeading = getLeadingComments(firstProp, null);
+              const [firstLeadingComment] = firstLeading;
+              const rangeStart = firstLeadingComment ? firstLeadingComment.range[0] : firstProp.range[0];
+              const lastTrailing = getTrailingComments(lastProp, null);
+              const rangeEnd = lastTrailing.length > 0 ? lastTrailing[lastTrailing.length - 1].range[1] : lastProp.range[1];
+              return fixer.replaceTextRange([rangeStart, rangeEnd], buildSortedText(segment, rangeStart));
+            });
+            return fixes.length > 0 ? fixes : null;
           } : null,
           messageId: "unsorted",
           node: curr.node.type === "Property" ? curr.node.key : curr.node

package/package.json

@@ -41,5 +41,5 @@
 		"typecheck": "bun run tsc --noEmit"
 	},
 	"type": "module",
-	"version": "0.11.7"
+	"version": "0.11.8"
 }