refactor(sort-objects): improved nodes comparison flow

azat-io · Sep 19, 2024 · a739296 · a739296
1 parent ed7fdea
commit a739296
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/rules/sort-objects.ts b/rules/sort-objects.ts
@@ -435,6 +435,13 @@ export default createEslintRule<Options, MESSAGE_ID>({
             [[]],
           )
 
+        let formattedMembers = formatProperties(node.properties)
+        let sortedNodes = sortNodesByDependencies(
+          formattedMembers
+            .map(nodes => sortNodesByGroups(nodes, options))
+            .flat(),
+        )
+        let nodes = formattedMembers.flat()
         for (let nodes of formatProperties(node.properties)) {
           let sortedNodes = sortNodesByDependencies(
             sortNodesByGroups(nodes, options),
@@ -447,12 +454,6 @@ export default createEslintRule<Options, MESSAGE_ID>({
             if (indexOfLeft > indexOfRight) {
               let firstUnorderedNodeDependentOnRight =
                 getFirstUnorderedNodeDependentOn(right, nodes)
-              let fix:
-                | ((fixer: TSESLint.RuleFixer) => TSESLint.RuleFix[])
-                | undefined = fixer =>
-                makeFixes(fixer, nodes, sortedNodes, sourceCode, {
-                  partitionComment: options.partitionByComment,
-                })
               let leftNum = getGroupNumber(options.groups, left)
               let rightNum = getGroupNumber(options.groups, right)
               let messageId: MESSAGE_ID