fix: prevent order changes when adding new elements in line-length so…

…rting
azat-io · Sep 6, 2023 · c0e2e60 · c0e2e60
1 parent 59c8f67
commit c0e2e60
Show file tree

Hide file tree

Showing 27 changed files with 169 additions and 88 deletions.
diff --git a/rules/sort-array-includes.ts b/rules/sort-array-includes.ts
@@ -5,6 +5,7 @@ import type { SortingNode } from '../typings'
 import { createEslintRule } from '../utils/create-eslint-rule'
 import { toSingleLine } from '../utils/to-single-line'
 import { rangeToDiff } from '../utils/range-to-diff'
+import { isPositive } from '../utils/is-positive'
 import { SortOrder, SortType } from '../typings'
 import { sortNodes } from '../utils/sort-nodes'
 import { makeFixes } from '../utils/make-fixes'
@@ -137,7 +138,7 @@ export default createEslintRule<Options, MESSAGE_ID>({
             ) {
               compareValue = true
             } else {
-              compareValue = compare(left, right, options)
+              compareValue = isPositive(compare(left, right, options))
             }
 
             if (compareValue) {

diff --git a/rules/sort-astro-attributes.ts b/rules/sort-astro-attributes.ts
@@ -8,6 +8,7 @@ import type { SortingNode } from '../typings'
 import { createEslintRule } from '../utils/create-eslint-rule'
 import { getGroupNumber } from '../utils/get-group-number'
 import { rangeToDiff } from '../utils/range-to-diff'
+import { isPositive } from '../utils/is-positive'
 import { SortOrder, SortType } from '../typings'
 import { useGroups } from '../utils/use-groups'
 import { makeFixes } from '../utils/make-fixes'
@@ -159,7 +160,8 @@ export default createEslintRule<Options<string[]>, MESSAGE_ID>({
 
               if (
                 leftNum > rightNum ||
-                (leftNum === rightNum && compare(left, right, options))
+                (leftNum === rightNum &&
+                  isPositive(compare(left, right, options)))
               ) {
                 context.report({
                   messageId: 'unexpectedAstroAttributesOrder',

diff --git a/rules/sort-classes.ts b/rules/sort-classes.ts
@@ -4,9 +4,10 @@ import type { SortingNode } from '../typings'
 
 import { createEslintRule } from '../utils/create-eslint-rule'
 import { getGroupNumber } from '../utils/get-group-number'
-import { toSingleLine } from '../utils/to-single-line'
 import { getNodeRange } from '../utils/get-node-range'
+import { toSingleLine } from '../utils/to-single-line'
 import { rangeToDiff } from '../utils/range-to-diff'
+import { isPositive } from '../utils/is-positive'
 import { SortOrder, SortType } from '../typings'
 import { useGroups } from '../utils/use-groups'
 import { sortNodes } from '../utils/sort-nodes'
@@ -172,7 +173,8 @@ export default createEslintRule<Options, MESSAGE_ID>({
           if (
             left.name !== right.name &&
             (leftNum > rightNum ||
-              (leftNum === rightNum && compare(left, right, options)))
+              (leftNum === rightNum &&
+                isPositive(compare(left, right, options))))
           ) {
             context.report({
               messageId: 'unexpectedClassesOrder',

diff --git a/rules/sort-enums.ts b/rules/sort-enums.ts
@@ -3,6 +3,7 @@ import type { SortingNode } from '../typings'
 import { createEslintRule } from '../utils/create-eslint-rule'
 import { toSingleLine } from '../utils/to-single-line'
 import { rangeToDiff } from '../utils/range-to-diff'
+import { isPositive } from '../utils/is-positive'
 import { SortOrder, SortType } from '../typings'
 import { sortNodes } from '../utils/sort-nodes'
 import { makeFixes } from '../utils/make-fixes'
@@ -90,7 +91,7 @@ export default createEslintRule<Options, MESSAGE_ID>({
         }))
 
         pairwise(nodes, (left, right) => {
-          if (compare(left, right, options)) {
+          if (isPositive(compare(left, right, options))) {
             context.report({
               messageId: 'unexpectedEnumsOrder',
               data: {

diff --git a/rules/sort-exports.ts b/rules/sort-exports.ts
@@ -4,6 +4,7 @@ import type { SortingNode } from '../typings'
 
 import { createEslintRule } from '../utils/create-eslint-rule'
 import { rangeToDiff } from '../utils/range-to-diff'
+import { isPositive } from '../utils/is-positive'
 import { SortOrder, SortType } from '../typings'
 import { sortNodes } from '../utils/sort-nodes'
 import { makeFixes } from '../utils/make-fixes'
@@ -104,7 +105,7 @@ export default createEslintRule<Options, MESSAGE_ID>({
 
         for (let nodes of parts) {
           pairwise(nodes, (left, right) => {
-            if (compare(left, right, options)) {
+            if (isPositive(compare(left, right, options))) {
               context.report({
                 messageId: 'unexpectedExportsOrder',
                 data: {

diff --git a/rules/sort-imports.ts b/rules/sort-imports.ts
@@ -11,6 +11,7 @@ import { createEslintRule } from '../utils/create-eslint-rule'
 import { getGroupNumber } from '../utils/get-group-number'
 import { getNodeRange } from '../utils/get-node-range'
 import { rangeToDiff } from '../utils/range-to-diff'
+import { isPositive } from '../utils/is-positive'
 import { SortOrder, SortType } from '../typings'
 import { useGroups } from '../utils/use-groups'
 import { sortNodes } from '../utils/sort-nodes'
@@ -454,7 +455,8 @@ export default createEslintRule<Options<string[]>, MESSAGE_ID>({
               ) &&
               !hasContentBetweenNodes(left, right) &&
               (leftNum > rightNum ||
-                (leftNum === rightNum && compare(left, right, options)))
+                (leftNum === rightNum &&
+                  isPositive(compare(left, right, options))))
             ) {
               context.report({
                 messageId: 'unexpectedImportsOrder',

diff --git a/rules/sort-interfaces.ts b/rules/sort-interfaces.ts
@@ -6,6 +6,7 @@ import { createEslintRule } from '../utils/create-eslint-rule'
 import { getGroupNumber } from '../utils/get-group-number'
 import { toSingleLine } from '../utils/to-single-line'
 import { rangeToDiff } from '../utils/range-to-diff'
+import { isPositive } from '../utils/is-positive'
 import { SortOrder, SortType } from '../typings'
 import { useGroups } from '../utils/use-groups'
 import { sortNodes } from '../utils/sort-nodes'
@@ -170,7 +171,8 @@ export default createEslintRule<Options<string[]>, MESSAGE_ID>({
 
               if (
                 leftNum > rightNum ||
-                (leftNum === rightNum && compare(left, right, options))
+                (leftNum === rightNum &&
+                  isPositive(compare(left, right, options)))
               ) {
                 context.report({
                   messageId: 'unexpectedInterfacePropertiesOrder',

diff --git a/rules/sort-jsx-props.ts b/rules/sort-jsx-props.ts
@@ -7,6 +7,7 @@ import type { SortingNode } from '../typings'
 import { createEslintRule } from '../utils/create-eslint-rule'
 import { getGroupNumber } from '../utils/get-group-number'
 import { rangeToDiff } from '../utils/range-to-diff'
+import { isPositive } from '../utils/is-positive'
 import { SortOrder, SortType } from '../typings'
 import { useGroups } from '../utils/use-groups'
 import { makeFixes } from '../utils/make-fixes'
@@ -156,7 +157,8 @@ export default createEslintRule<Options<string[]>, MESSAGE_ID>({
 
               if (
                 leftNum > rightNum ||
-                (leftNum === rightNum && compare(left, right, options))
+                (leftNum === rightNum &&
+                  isPositive(compare(left, right, options)))
               ) {
                 context.report({
                   messageId: 'unexpectedJSXPropsOrder',

diff --git a/rules/sort-maps.ts b/rules/sort-maps.ts
@@ -5,6 +5,7 @@ import type { SortingNode } from '../typings'
 import { createEslintRule } from '../utils/create-eslint-rule'
 import { toSingleLine } from '../utils/to-single-line'
 import { rangeToDiff } from '../utils/range-to-diff'
+import { isPositive } from '../utils/is-positive'
 import { SortOrder, SortType } from '../typings'
 import { sortNodes } from '../utils/sort-nodes'
 import { makeFixes } from '../utils/make-fixes'
@@ -129,7 +130,7 @@ export default createEslintRule<Options, MESSAGE_ID>({
             })
 
             pairwise(nodes, (left, right) => {
-              if (compare(left, right, options)) {
+              if (isPositive(compare(left, right, options))) {
                 context.report({
                   messageId: 'unexpectedMapElementsOrder',
                   data: {

diff --git a/rules/sort-named-exports.ts b/rules/sort-named-exports.ts
@@ -2,6 +2,7 @@ import type { SortingNode } from '../typings'
 
 import { createEslintRule } from '../utils/create-eslint-rule'
 import { rangeToDiff } from '../utils/range-to-diff'
+import { isPositive } from '../utils/is-positive'
 import { SortOrder, SortType } from '../typings'
 import { sortNodes } from '../utils/sort-nodes'
 import { makeFixes } from '../utils/make-fixes'
@@ -84,7 +85,7 @@ export default createEslintRule<Options, MESSAGE_ID>({
         }))
 
         pairwise(nodes, (left, right) => {
-          if (compare(left, right, options)) {
+          if (isPositive(compare(left, right, options))) {
             context.report({
               messageId: 'unexpectedNamedExportsOrder',
               data: {

diff --git a/rules/sort-named-imports.ts b/rules/sort-named-imports.ts
@@ -2,6 +2,7 @@ import type { SortingNode } from '../typings'
 
 import { createEslintRule } from '../utils/create-eslint-rule'
 import { rangeToDiff } from '../utils/range-to-diff'
+import { isPositive } from '../utils/is-positive'
 import { SortOrder, SortType } from '../typings'
 import { sortNodes } from '../utils/sort-nodes'
 import { makeFixes } from '../utils/make-fixes'
@@ -88,7 +89,7 @@ export default createEslintRule<Options, MESSAGE_ID>({
         }))
 
         pairwise(nodes, (left, right) => {
-          if (compare(left, right, options)) {
+          if (isPositive(compare(left, right, options))) {
             context.report({
               messageId: 'unexpectedNamedImportsOrder',
               data: {

diff --git a/rules/sort-object-types.ts b/rules/sort-object-types.ts
@@ -4,6 +4,7 @@ import { createEslintRule } from '../utils/create-eslint-rule'
 import { getGroupNumber } from '../utils/get-group-number'
 import { toSingleLine } from '../utils/to-single-line'
 import { rangeToDiff } from '../utils/range-to-diff'
+import { isPositive } from '../utils/is-positive'
 import { SortOrder, SortType } from '../typings'
 import { sortNodes } from '../utils/sort-nodes'
 import { makeFixes } from '../utils/make-fixes'
@@ -149,7 +150,7 @@ export default createEslintRule<Options<string[]>, MESSAGE_ID>({
 
           if (
             leftNum > rightNum ||
-            (leftNum === rightNum && compare(left, right, options))
+            (leftNum === rightNum && isPositive(compare(left, right, options)))
           ) {
             context.report({
               messageId: 'unexpectedObjectTypesOrder',

diff --git a/rules/sort-objects.ts b/rules/sort-objects.ts
@@ -9,6 +9,7 @@ import { createEslintRule } from '../utils/create-eslint-rule'
 import { getGroupNumber } from '../utils/get-group-number'
 import { toSingleLine } from '../utils/to-single-line'
 import { rangeToDiff } from '../utils/range-to-diff'
+import { isPositive } from '../utils/is-positive'
 import { SortOrder, SortType } from '../typings'
 import { useGroups } from '../utils/use-groups'
 import { makeFixes } from '../utils/make-fixes'
@@ -273,7 +274,8 @@ export default createEslintRule<Options, MESSAGE_ID>({
 
             if (
               leftNum > rightNum ||
-              (leftNum === rightNum && compare(left, right, options))
+              (leftNum === rightNum &&
+                isPositive(compare(left, right, options)))
             ) {
               let fix:
                 | ((fixer: TSESLint.RuleFixer) => TSESLint.RuleFix[])

diff --git a/rules/sort-svelte-attributes.ts b/rules/sort-svelte-attributes.ts
@@ -8,6 +8,7 @@ import type { SortingNode } from '../typings'
 import { createEslintRule } from '../utils/create-eslint-rule'
 import { getGroupNumber } from '../utils/get-group-number'
 import { rangeToDiff } from '../utils/range-to-diff'
+import { isPositive } from '../utils/is-positive'
 import { SortOrder, SortType } from '../typings'
 import { useGroups } from '../utils/use-groups'
 import { sortNodes } from '../utils/sort-nodes'
@@ -166,7 +167,8 @@ export default createEslintRule<Options<string[]>, MESSAGE_ID>({
 
               if (
                 leftNum > rightNum ||
-                (leftNum === rightNum && compare(left, right, options))
+                (leftNum === rightNum &&
+                  isPositive(compare(left, right, options)))
               ) {
                 context.report({
                   messageId: 'unexpectedSvelteAttributesOrder',

diff --git a/rules/sort-union-types.ts b/rules/sort-union-types.ts
@@ -3,6 +3,7 @@ import type { SortingNode } from '../typings'
 import { createEslintRule } from '../utils/create-eslint-rule'
 import { toSingleLine } from '../utils/to-single-line'
 import { rangeToDiff } from '../utils/range-to-diff'
+import { isPositive } from '../utils/is-positive'
 import { SortOrder, SortType } from '../typings'
 import { sortNodes } from '../utils/sort-nodes'
 import { makeFixes } from '../utils/make-fixes'
@@ -94,7 +95,7 @@ export default createEslintRule<Options, MESSAGE_ID>({
       }))
 
       pairwise(nodes, (left, right) => {
-        let compareValue = compare(left, right, options)
+        let compareValue = isPositive(compare(left, right, options))
 
         if (options['nullable-last']) {
           if (left.group === 'nullable' && right.group === 'unknown') {

diff --git a/rules/sort-vue-attributes.ts b/rules/sort-vue-attributes.ts
@@ -8,6 +8,7 @@ import type { SortingNode } from '../typings'
 import { createEslintRule } from '../utils/create-eslint-rule'
 import { getGroupNumber } from '../utils/get-group-number'
 import { rangeToDiff } from '../utils/range-to-diff'
+import { isPositive } from '../utils/is-positive'
 import { SortOrder, SortType } from '../typings'
 import { useGroups } from '../utils/use-groups'
 import { sortNodes } from '../utils/sort-nodes'
@@ -170,7 +171,8 @@ export default createEslintRule<Options<string[]>, MESSAGE_ID>({
 
               if (
                 leftNum > rightNum ||
-                (leftNum === rightNum && compare(left, right, options))
+                (leftNum === rightNum &&
+                  isPositive(compare(left, right, options)))
               ) {
                 context.report({
                   messageId: 'unexpectedVueAttributesOrder',

diff --git a/test/sort-array-includes.test.ts b/test/sort-array-includes.test.ts
@@ -520,8 +520,8 @@ describe(RULE_NAME, () => {
               [
                 'Armored Titan',
                 'Attack Titan',
-                'Cart Titan',
                 ...otherTitans,
+                'Cart Titan',
                 'Beast Titan',
                 'War Hammer Titan',
               ].includes(titan)
@@ -530,8 +530,8 @@ describe(RULE_NAME, () => {
               [
                 'War Hammer Titan',
                 'Armored Titan',
-                ...otherTitans,
                 'Attack Titan',
+                ...otherTitans,
                 'Beast Titan',
                 'Cart Titan',
               ].includes(titan)
@@ -542,7 +542,7 @@ describe(RULE_NAME, () => {
                 messageId: 'unexpectedArrayIncludesOrder',
                 data: {
                   left: 'Cart Titan',
-                  right: '...otherTitans',
+                  right: 'Beast Titan',
                 },
               },
               {
@@ -582,8 +582,8 @@ describe(RULE_NAME, () => {
           `,
           output: dedent`
             [
-              ...lowerRanks,
               ...upperRanks,
+              ...lowerRanks,
               ...demons,
             ].includes('Nezuko Kamado')
           `,
@@ -619,7 +619,7 @@ describe(RULE_NAME, () => {
               ['Genos', 'Bang', 'King',, 'Saitama'].includes(hero)
             `,
             output: dedent`
-              ['Saitama', 'Genos', 'King',, 'Bang'].includes(hero)
+              ['Saitama', 'Genos', 'Bang',, 'King'].includes(hero)
             `,
             options: [options],
             errors: [

diff --git a/test/sort-classes.test.ts b/test/sort-classes.test.ts
@@ -480,8 +480,8 @@ describe(RULE_NAME, () => {
                 x() {}
                 b() {}
                 get z() {}
-                set c() {}
                 get c() {}
+                set c() {}
               }
             `,
             output: dedent`
@@ -995,8 +995,8 @@ describe(RULE_NAME, () => {
                 x() {}
                 b() {}
                 get z() {}
-                set c() {}
                 get c() {}
+                set c() {}
               }
             `,
             output: dedent`
@@ -1161,13 +1161,13 @@ describe(RULE_NAME, () => {
                 this.stressLevel = value
               }
 
-              increaseStressLevel(level) {
-                this.setStressLevel(this.stressLevel + (level ?? 10))
-              }
-
               decreaseStressLevel(level) {
                 this.setStressLevel(this.stressLevel - (level ?? 10))
               }
+
+              increaseStressLevel(level) {
+                this.setStressLevel(this.stressLevel + (level ?? 10))
+              }
             }
           `,
           options: [

diff --git a/test/sort-exports.test.ts b/test/sort-exports.test.ts
@@ -328,8 +328,8 @@ describe(RULE_NAME, () => {
             export { Daimon1, Daimon2 } from 'police'
           `,
           output: dedent`
-            export { Daimon1, Daimon2 } from 'police'
             export { HiroshiOdokawa } from 'cab-park'
+            export { Daimon1, Daimon2 } from 'police'
             export { Shibagaki, Baba } from 'radio'
             export { Gouriki } from 'hospital'
           `,

diff --git a/test/sort-maps.test.ts b/test/sort-maps.test.ts
@@ -709,8 +709,8 @@ describe(RULE_NAME, () => {
           output: dedent`
             new Map([
               [3, 'three'],
-              [1, 'one'],
               [2, 'two'],
+              [1, 'one'],
             ])
           `,
           options: [options],
@@ -754,8 +754,8 @@ describe(RULE_NAME, () => {
           output: dedent`
             let apps = new Map([
               weatherApp,
-              musicApp,
               booksApp,
+              musicApp,
               mapsApp,
             ])
           `,