refactor: for rebase

azat-io · Sep 19, 2024 · 74dcebd · 74dcebd
1 parent a739296
commit 74dcebd
Showing 1 changed file with 34 additions and 41 deletions.
diff --git a/rules/sort-objects.ts b/rules/sort-objects.ts
@@ -442,48 +442,41 @@ export default createEslintRule<Options, MESSAGE_ID>({
             .flat(),
         )
         let nodes = formattedMembers.flat()
-        for (let nodes of formatProperties(node.properties)) {
-          let sortedNodes = sortNodesByDependencies(
-            sortNodesByGroups(nodes, options),
-          )
-
-          pairwise(nodes, (left, right) => {
-            let indexOfLeft = sortedNodes.indexOf(left)
-            let indexOfRight = sortedNodes.indexOf(right)
-
-            if (indexOfLeft > indexOfRight) {
-              let firstUnorderedNodeDependentOnRight =
-                getFirstUnorderedNodeDependentOn(right, nodes)
-              let leftNum = getGroupNumber(options.groups, left)
-              let rightNum = getGroupNumber(options.groups, right)
-              let messageId: MESSAGE_ID
-              if (firstUnorderedNodeDependentOnRight) {
-                messageId = 'unexpectedObjectsDependencyOrder'
-              } else {
-                messageId =
-                  leftNum !== rightNum
-                    ? 'unexpectedObjectsGroupOrder'
-                    : 'unexpectedObjectsOrder'
-              }
-              context.report({
-                messageId,
-                data: {
-                  left: toSingleLine(left.name),
-                  leftGroup: left.group,
-                  right: toSingleLine(right.name),
-                  rightGroup: right.group,
-                  nodeDependentOnRight:
-                    firstUnorderedNodeDependentOnRight?.name,
-                },
-                node: right.node,
-                fix: (fixer: TSESLint.RuleFixer) =>
-                  makeFixes(fixer, nodes, sortedNodes, sourceCode, {
-                    partitionComment: options.partitionByComment,
-                  }),
-              })
+        pairwise(nodes, (left, right) => {
+          let indexOfLeft = sortedNodes.indexOf(left)
+          let indexOfRight = sortedNodes.indexOf(right)
+
+          if (indexOfLeft > indexOfRight) {
+            let firstUnorderedNodeDependentOnRight =
+              getFirstUnorderedNodeDependentOn(right, nodes)
+            let leftNum = getGroupNumber(options.groups, left)
+            let rightNum = getGroupNumber(options.groups, right)
+            let messageId: MESSAGE_ID
+            if (firstUnorderedNodeDependentOnRight) {
+              messageId = 'unexpectedObjectsDependencyOrder'
+            } else {
+              messageId =
+                leftNum !== rightNum
+                  ? 'unexpectedObjectsGroupOrder'
+                  : 'unexpectedObjectsOrder'
             }
-          })
-        }
+            context.report({
+              messageId,
+              data: {
+                left: toSingleLine(left.name),
+                leftGroup: left.group,
+                right: toSingleLine(right.name),
+                rightGroup: right.group,
+                nodeDependentOnRight: firstUnorderedNodeDependentOnRight?.name,
+              },
+              node: right.node,
+              fix: (fixer: TSESLint.RuleFixer) =>
+                makeFixes(fixer, nodes, sortedNodes, sourceCode, {
+                  partitionComment: options.partitionByComment,
+                }),
+            })
+          }
+        })
       }
     }