eslint-plugin-perfectionist 4.3.0 → 4.5.0

package/dist/rules/sort-enums.js

@@ -4,7 +4,8 @@ const sortNodesByDependencies = require('../utils/sort-nodes-by-dependencies.js'
 const validateCustomSortConfiguration = require('../utils/validate-custom-sort-configuration.js')
 const getEslintDisabledLines = require('../utils/get-eslint-disabled-lines.js')
 const isNodeEslintDisabled = require('../utils/is-node-eslint-disabled.js')
-const isPartitionComment = require('../utils/is-partition-comment.js')
+const hasPartitionComment = require('../utils/has-partition-comment.js')
+const createNodeIndexMap = require('../utils/create-node-index-map.js')
 const getCommentsBefore = require('../utils/get-comments-before.js')
 const createEslintRule = require('../utils/create-eslint-rule.js')
 const getLinesBetween = require('../utils/get-lines-between.js')
@@ -54,30 +55,29 @@ const sortEnums = createEslintRule.createEslintRule({
       })
       let extractDependencies = (expression, enumName) => {
         let dependencies = []
-        let checkNode = nodeValue => {
+        let stack = [expression]
+        while (stack.length) {
+          let node = stack.pop()
           if (
-            nodeValue.type === 'MemberExpression' &&
-            nodeValue.object.type === 'Identifier' &&
-            nodeValue.object.name === enumName &&
-            nodeValue.property.type === 'Identifier'
+            node.type === 'MemberExpression' &&
+            node.object.type === 'Identifier' &&
+            node.object.name === enumName &&
+            node.property.type === 'Identifier'
           ) {
-            dependencies.push(nodeValue.property.name)
-          } else if (nodeValue.type === 'Identifier') {
-            dependencies.push(nodeValue.name)
+            dependencies.push(node.property.name)
+          } else if (node.type === 'Identifier') {
+            dependencies.push(node.name)
           }
-          if ('left' in nodeValue) {
-            checkNode(nodeValue.left)
+          if ('left' in node) {
+            stack.push(node.left)
           }
-          if ('right' in nodeValue) {
-            checkNode(nodeValue.right)
+          if ('right' in node) {
+            stack.push(node.right)
           }
-          if ('expressions' in nodeValue) {
-            for (let currentExpression of nodeValue.expressions) {
-              checkNode(currentExpression)
-            }
+          if ('expressions' in node) {
+            stack.push(...node.expressions)
           }
         }
-        checkNode(expression)
         return dependencies
       }
       let formattedMembers = members.reduce(
@@ -109,14 +109,13 @@ const sortEnums = createEslintRule.createEslintRule({
             dependencies,
           }
           if (
-            (options.partitionByComment &&
-              isPartitionComment.hasPartitionComment(
-                options.partitionByComment,
-                getCommentsBefore.getCommentsBefore({
-                  node: member,
-                  sourceCode,
-                }),
-              )) ||
+            hasPartitionComment.hasPartitionComment({
+              comments: getCommentsBefore.getCommentsBefore({
+                node: member,
+                sourceCode,
+              }),
+              partitionByComment: options.partitionByComment,
+            }) ||
             (options.partitionByNewLine &&
               lastSortingNode &&
               getLinesBetween.getLinesBetween(
@@ -139,7 +138,7 @@ const sortEnums = createEslintRule.createEslintRule({
           !Number.isNaN(sortingNode.numericValue),
       )
       let compareOptions = {
-        // Get the enum value rather than the name if needed
+        // Get the enum value rather than the name if needed.
         nodeValueGetter:
           options.sortByValue || (isNumericEnum && options.forceNumericSort)
             ? sortingNode => {
@@ -161,7 +160,10 @@ const sortEnums = createEslintRule.createEslintRule({
                 return ''
               }
             : null,
-        // If the enum is numeric, and we sort by value, always use the `natural` sort type, which will correctly sort them.
+        /**
+         * If the enum is numeric, and we sort by value, always use the
+         * `natural` sort type, which will correctly sort them.
+         */
         type:
           isNumericEnum && (options.forceNumericSort || options.sortByValue)
             ? 'natural'
@@ -186,14 +188,15 @@ const sortEnums = createEslintRule.createEslintRule({
       let sortedNodes = sortNodesIgnoringEslintDisabledNodes(false)
       let sortedNodesExcludingEslintDisabled =
         sortNodesIgnoringEslintDisabledNodes(true)
+      let nodeIndexMap = createNodeIndexMap.createNodeIndexMap(sortedNodes)
       pairwise.pairwise(sortingNodes, (left, right) => {
-        let indexOfLeft = sortedNodes.indexOf(left)
-        let indexOfRight = sortedNodes.indexOf(right)
+        let leftIndex = nodeIndexMap.get(left)
+        let rightIndex = nodeIndexMap.get(right)
         let indexOfRightExcludingEslintDisabled =
           sortedNodesExcludingEslintDisabled.indexOf(right)
         if (
-          indexOfLeft < indexOfRight &&
-          indexOfLeft < indexOfRightExcludingEslintDisabled
+          leftIndex < rightIndex &&
+          leftIndex < indexOfRightExcludingEslintDisabled
         ) {
           return
         }
@@ -249,9 +252,9 @@ const sortEnums = createEslintRule.createEslintRule({
           specialCharacters: commonJsonSchemas.specialCharactersJsonSchema,
           ignoreCase: commonJsonSchemas.ignoreCaseJsonSchema,
           alphabet: commonJsonSchemas.alphabetJsonSchema,
+          type: commonJsonSchemas.buildTypeJsonSchema(),
           locales: commonJsonSchemas.localesJsonSchema,
           order: commonJsonSchemas.orderJsonSchema,
-          type: commonJsonSchemas.typeJsonSchema,
         },
         additionalProperties: false,
         type: 'object',

package/dist/rules/sort-exports.js

@@ -3,7 +3,8 @@ const commonJsonSchemas = require('../utils/common-json-schemas.js')
 const validateCustomSortConfiguration = require('../utils/validate-custom-sort-configuration.js')
 const getEslintDisabledLines = require('../utils/get-eslint-disabled-lines.js')
 const isNodeEslintDisabled = require('../utils/is-node-eslint-disabled.js')
-const isPartitionComment = require('../utils/is-partition-comment.js')
+const hasPartitionComment = require('../utils/has-partition-comment.js')
+const createNodeIndexMap = require('../utils/create-node-index-map.js')
 const getCommentsBefore = require('../utils/get-comments-before.js')
 const createEslintRule = require('../utils/create-eslint-rule.js')
 const getLinesBetween = require('../utils/get-lines-between.js')
@@ -57,13 +58,13 @@ const sortExports = createEslintRule.createEslintRule({
       let lastNode = (_a = parts.at(-1)) == null ? void 0 : _a.at(-1)
       if (
         (partitionComment &&
-          isPartitionComment.hasPartitionComment(
-            partitionComment,
-            getCommentsBefore.getCommentsBefore({
+          hasPartitionComment.hasPartitionComment({
+            comments: getCommentsBefore.getCommentsBefore({
               sourceCode,
               node,
             }),
-          )) ||
+            partitionByComment: options.partitionByComment,
+          })) ||
         (options.partitionByNewLine &&
           lastNode &&
           getLinesBetween.getLinesBetween(sourceCode, lastNode, sortingNode))
@@ -98,14 +99,15 @@ const sortExports = createEslintRule.createEslintRule({
           let sortedNodes = sortNodesExcludingEslintDisabled(false)
           let sortedNodesExcludingEslintDisabled =
             sortNodesExcludingEslintDisabled(true)
+          let nodeIndexMap = createNodeIndexMap.createNodeIndexMap(sortedNodes)
           pairwise.pairwise(nodes, (left, right) => {
-            let indexOfLeft = sortedNodes.indexOf(left)
-            let indexOfRight = sortedNodes.indexOf(right)
+            let leftIndex = nodeIndexMap.get(left)
+            let rightIndex = nodeIndexMap.get(right)
             let indexOfRightExcludingEslintDisabled =
               sortedNodesExcludingEslintDisabled.indexOf(right)
             if (
-              indexOfLeft < indexOfRight &&
-              indexOfLeft < indexOfRightExcludingEslintDisabled
+              leftIndex < rightIndex &&
+              leftIndex < indexOfRightExcludingEslintDisabled
             ) {
               return
             }
@@ -154,9 +156,9 @@ const sortExports = createEslintRule.createEslintRule({
           specialCharacters: commonJsonSchemas.specialCharactersJsonSchema,
           ignoreCase: commonJsonSchemas.ignoreCaseJsonSchema,
           alphabet: commonJsonSchemas.alphabetJsonSchema,
+          type: commonJsonSchemas.buildTypeJsonSchema(),
           locales: commonJsonSchemas.localesJsonSchema,
           order: commonJsonSchemas.orderJsonSchema,
-          type: commonJsonSchemas.typeJsonSchema,
         },
         additionalProperties: false,
         type: 'object',

package/dist/rules/sort-heritage-clauses.js

@@ -4,6 +4,7 @@ const validateCustomSortConfiguration = require('../utils/validate-custom-sort-c
 const validateGroupsConfiguration = require('../utils/validate-groups-configuration.js')
 const getEslintDisabledLines = require('../utils/get-eslint-disabled-lines.js')
 const isNodeEslintDisabled = require('../utils/is-node-eslint-disabled.js')
+const createNodeIndexMap = require('../utils/create-node-index-map.js')
 const sortNodesByGroups = require('../utils/sort-nodes-by-groups.js')
 const createEslintRule = require('../utils/create-eslint-rule.js')
 const getGroupNumber = require('../utils/get-group-number.js')
@@ -35,10 +36,10 @@ const sortHeritageClauses = createEslintRule.createEslintRule({
           customGroups: commonJsonSchemas.customGroupsJsonSchema,
           ignoreCase: commonJsonSchemas.ignoreCaseJsonSchema,
           alphabet: commonJsonSchemas.alphabetJsonSchema,
+          type: commonJsonSchemas.buildTypeJsonSchema(),
           locales: commonJsonSchemas.localesJsonSchema,
           groups: commonJsonSchemas.groupsJsonSchema,
           order: commonJsonSchemas.orderJsonSchema,
-          type: commonJsonSchemas.typeJsonSchema,
         },
         additionalProperties: false,
         type: 'object',
@@ -82,7 +83,7 @@ const sortHeritageClauses = createEslintRule.createEslintRule({
   name: 'sort-heritage-clauses',
 })
 let sortHeritageClauses$1 = (context, options, heritageClauses) => {
-  if (!heritageClauses || !isSortable.isSortable(heritageClauses)) {
+  if (!isSortable.isSortable(heritageClauses)) {
     return
   }
   let sourceCode = getSourceCode.getSourceCode(context)
@@ -112,14 +113,15 @@ let sortHeritageClauses$1 = (context, options, heritageClauses) => {
   let sortedNodes = sortNodesExcludingEslintDisabled(false)
   let sortedNodesExcludingEslintDisabled =
     sortNodesExcludingEslintDisabled(true)
+  let nodeIndexMap = createNodeIndexMap.createNodeIndexMap(sortedNodes)
   pairwise.pairwise(nodes, (left, right) => {
-    let indexOfLeft = sortedNodes.indexOf(left)
-    let indexOfRight = sortedNodes.indexOf(right)
+    let leftIndex = nodeIndexMap.get(left)
+    let rightIndex = nodeIndexMap.get(right)
     let indexOfRightExcludingEslintDisabled =
       sortedNodesExcludingEslintDisabled.indexOf(right)
     if (
-      indexOfLeft < indexOfRight &&
-      indexOfLeft < indexOfRightExcludingEslintDisabled
+      leftIndex < rightIndex &&
+      leftIndex < indexOfRightExcludingEslintDisabled
     ) {
       return
     }

package/dist/{utils → rules/sort-imports}/get-typescript-import.js

@@ -20,7 +20,10 @@ let getTypescriptImport = () => {
         : (_documentCurrentScript &&
             _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' &&
             _documentCurrentScript.src) ||
-            new URL('utils/get-typescript-import.js', document.baseURI).href,
+            new URL(
+              'rules/sort-imports/get-typescript-import.js',
+              document.baseURI,
+            ).href,
     )('typescript')
   } catch (_error) {
     return null

package/dist/rules/sort-imports.js

@@ -3,13 +3,14 @@ const node_module = require('node:module')
 const commonJsonSchemas = require('../utils/common-json-schemas.js')
 const validateNewlinesAndPartitionConfiguration = require('../utils/validate-newlines-and-partition-configuration.js')
 const validateCustomSortConfiguration = require('../utils/validate-custom-sort-configuration.js')
+const readClosestTsConfigByPath = require('./sort-imports/read-closest-ts-config-by-path.js')
 const validateGroupsConfiguration = require('../utils/validate-groups-configuration.js')
-const readClosestTsConfigByPath = require('../utils/read-closest-ts-config-by-path.js')
 const getOptionsWithCleanGroups = require('../utils/get-options-with-clean-groups.js')
 const getEslintDisabledLines = require('../utils/get-eslint-disabled-lines.js')
+const getTypescriptImport = require('./sort-imports/get-typescript-import.js')
 const isNodeEslintDisabled = require('../utils/is-node-eslint-disabled.js')
-const getTypescriptImport = require('../utils/get-typescript-import.js')
-const isPartitionComment = require('../utils/is-partition-comment.js')
+const hasPartitionComment = require('../utils/has-partition-comment.js')
+const createNodeIndexMap = require('../utils/create-node-index-map.js')
 const sortNodesByGroups = require('../utils/sort-nodes-by-groups.js')
 const getCommentsBefore = require('../utils/get-comments-before.js')
 const makeNewlinesFixes = require('../utils/make-newlines-fixes.js')
@@ -132,10 +133,19 @@ const sortImports = createEslintRule.createEslintRule({
       node.specifiers.length ===
         0 /* Avoid matching on named imports without specifiers */ &&
       !/\}\s*from\s+/u.test(sourceCode.getText(node))
+    let styleExtensions = [
+      '.less',
+      '.scss',
+      '.sass',
+      '.styl',
+      '.pcss',
+      '.css',
+      '.sss',
+    ]
     let isStyle = value => {
       let [cleanedValue] = value.split('?')
-      return ['.less', '.scss', '.sass', '.styl', '.pcss', '.css', '.sss'].some(
-        extension => cleanedValue.endsWith(extension),
+      return styleExtensions.some(extension =>
+        cleanedValue == null ? void 0 : cleanedValue.endsWith(extension),
       )
     }
     let flatGroups = new Set(options.groups.flat())
@@ -186,10 +196,12 @@ const sortImports = createEslintRule.createEslintRule({
           'ws',
         ]
         let builtinPrefixOnlyModules = ['sea', 'sqlite', 'test']
+        let valueToCheck = value.startsWith('node:')
+          ? value.split('node:')[1]
+          : value
         return (
-          node_module.builtinModules.includes(
-            value.startsWith('node:') ? value.split('node:')[1] : value,
-          ) ||
+          (!!valueToCheck &&
+            node_module.builtinModules.includes(valueToCheck)) ||
           builtinPrefixOnlyModules.some(
             module2 => `node:${module2}` === value,
           ) ||
@@ -330,24 +342,22 @@ const sortImports = createEslintRule.createEslintRule({
     }
     return {
       'Program:exit': () => {
-        var _a
         let hasContentBetweenNodes = (left, right) =>
           !!sourceCode.getTokensBetween(left.node, right.node, {
             includeComments: false,
           }).length
         let formattedMembers = [[]]
         for (let sortingNode of nodes) {
-          let lastSortingNode =
-            (_a = formattedMembers.at(-1)) == null ? void 0 : _a.at(-1)
+          let lastGroup = formattedMembers.at(-1)
+          let lastSortingNode = lastGroup == null ? void 0 : lastGroup.at(-1)
           if (
-            (options.partitionByComment &&
-              isPartitionComment.hasPartitionComment(
-                options.partitionByComment,
-                getCommentsBefore.getCommentsBefore({
-                  node: sortingNode.node,
-                  sourceCode,
-                }),
-              )) ||
+            hasPartitionComment.hasPartitionComment({
+              comments: getCommentsBefore.getCommentsBefore({
+                node: sortingNode.node,
+                sourceCode,
+              }),
+              partitionByComment: options.partitionByComment,
+            }) ||
             (options.partitionByNewLine &&
               lastSortingNode &&
               getLinesBetween.getLinesBetween(
@@ -358,9 +368,10 @@ const sortImports = createEslintRule.createEslintRule({
             (lastSortingNode &&
               hasContentBetweenNodes(lastSortingNode, sortingNode))
           ) {
-            formattedMembers.push([])
+            lastGroup = []
+            formattedMembers.push(lastGroup)
           }
-          formattedMembers.at(-1).push(sortingNode)
+          lastGroup.push(sortingNode)
         }
         for (let nodeList of formattedMembers) {
           let sortNodesExcludingEslintDisabled = ignoreEslintDisabledNodes =>
@@ -378,20 +389,21 @@ const sortImports = createEslintRule.createEslintRule({
           let sortedNodes = sortNodesExcludingEslintDisabled(false)
           let sortedNodesExcludingEslintDisabled =
             sortNodesExcludingEslintDisabled(true)
+          let nodeIndexMap = createNodeIndexMap.createNodeIndexMap(sortedNodes)
           pairwise.pairwise(nodeList, (left, right) => {
             let leftNumber = getGroupNumber.getGroupNumber(options.groups, left)
             let rightNumber = getGroupNumber.getGroupNumber(
               options.groups,
               right,
             )
-            let indexOfLeft = sortedNodes.indexOf(left)
-            let indexOfRight = sortedNodes.indexOf(right)
+            let leftIndex = nodeIndexMap.get(left)
+            let rightIndex = nodeIndexMap.get(right)
             let indexOfRightExcludingEslintDisabled =
               sortedNodesExcludingEslintDisabled.indexOf(right)
             let messageIds = []
             if (
-              indexOfLeft > indexOfRight ||
-              indexOfLeft >= indexOfRightExcludingEslintDisabled
+              leftIndex > rightIndex ||
+              leftIndex >= indexOfRightExcludingEslintDisabled
             ) {
               messageIds.push(
                 leftNumber === rightNumber
@@ -402,12 +414,15 @@ const sortImports = createEslintRule.createEslintRule({
             messageIds = [
               ...messageIds,
               ...getNewlinesErrors.getNewlinesErrors({
+                options: {
+                  ...options,
+                  customGroups: [],
+                },
                 missedSpacingError: 'missedSpacingBetweenImports',
                 extraSpacingError: 'extraSpacingBetweenImports',
                 rightNum: rightNumber,
                 leftNum: leftNumber,
                 sourceCode,
-                options,
                 right,
                 left,
               }),
@@ -423,10 +438,13 @@ const sortImports = createEslintRule.createEslintRule({
                     fixer,
                   }),
                   ...makeNewlinesFixes.makeNewlinesFixes({
+                    options: {
+                      ...options,
+                      customGroups: [],
+                    },
                     sortedNodes: sortedNodesExcludingEslintDisabled,
                     nodes: nodeList,
                     sourceCode,
-                    options,
                     fixer,
                   }),
                 ],
@@ -517,10 +535,10 @@ const sortImports = createEslintRule.createEslintRule({
           newlinesBetween: commonJsonSchemas.newlinesBetweenJsonSchema,
           ignoreCase: commonJsonSchemas.ignoreCaseJsonSchema,
           alphabet: commonJsonSchemas.alphabetJsonSchema,
+          type: commonJsonSchemas.buildTypeJsonSchema(),
           locales: commonJsonSchemas.localesJsonSchema,
           groups: commonJsonSchemas.groupsJsonSchema,
           order: commonJsonSchemas.orderJsonSchema,
-          type: commonJsonSchemas.typeJsonSchema,
         },
         definitions: {
           'max-line-length-requires-line-length-type': {

package/dist/rules/sort-interfaces.js

@@ -6,6 +6,7 @@ let defaultOptions = {
   partitionByNewLine: false,
   newlinesBetween: 'ignore',
   specialCharacters: 'keep',
+  useConfigurationIf: {},
   type: 'alphabetical',
   groupKind: 'mixed',
   ignorePattern: [],
@@ -33,7 +34,7 @@ const sortInterfaces = createEslintRule.createEslintRule({
       description: 'Enforce sorted interface properties.',
       recommended: true,
     },
-    schema: [sortObjectTypes.jsonSchema],
+    schema: sortObjectTypes.jsonSchema,
     type: 'suggestion',
     fixable: 'code',
   },

package/dist/rules/sort-intersection-types.js

@@ -5,7 +5,8 @@ const validateCustomSortConfiguration = require('../utils/validate-custom-sort-c
 const validateGroupsConfiguration = require('../utils/validate-groups-configuration.js')
 const getEslintDisabledLines = require('../utils/get-eslint-disabled-lines.js')
 const isNodeEslintDisabled = require('../utils/is-node-eslint-disabled.js')
-const isPartitionComment = require('../utils/is-partition-comment.js')
+const hasPartitionComment = require('../utils/has-partition-comment.js')
+const createNodeIndexMap = require('../utils/create-node-index-map.js')
 const sortNodesByGroups = require('../utils/sort-nodes-by-groups.js')
 const getCommentsBefore = require('../utils/get-comments-before.js')
 const makeNewlinesFixes = require('../utils/make-newlines-fixes.js')
@@ -72,7 +73,6 @@ const sortIntersectionTypes = createEslintRule.createEslintRule({
       })
       let formattedMembers = node.types.reduce(
         (accumulator, type) => {
-          var _a, _b
           let { defineGroup, getGroup } = useGroups.useGroups(options)
           switch (type.type) {
             case 'TSTemplateLiteralType':
@@ -131,8 +131,8 @@ const sortIntersectionTypes = createEslintRule.createEslintRule({
               defineGroup('union')
               break
           }
-          let lastSortingNode =
-            (_a = accumulator.at(-1)) == null ? void 0 : _a.at(-1)
+          let lastGroup = accumulator.at(-1)
+          let lastSortingNode = lastGroup == null ? void 0 : lastGroup.at(-1)
           let sortingNode = {
             isEslintDisabled: isNodeEslintDisabled.isNodeEslintDisabled(
               type,
@@ -144,15 +144,14 @@ const sortIntersectionTypes = createEslintRule.createEslintRule({
             node: type,
           }
           if (
-            (options.partitionByComment &&
-              isPartitionComment.hasPartitionComment(
-                options.partitionByComment,
-                getCommentsBefore.getCommentsBefore({
-                  tokenValueToIgnoreBefore: '&',
-                  node: type,
-                  sourceCode,
-                }),
-              )) ||
+            hasPartitionComment.hasPartitionComment({
+              comments: getCommentsBefore.getCommentsBefore({
+                tokenValueToIgnoreBefore: '&',
+                node: type,
+                sourceCode,
+              }),
+              partitionByComment: options.partitionByComment,
+            }) ||
             (options.partitionByNewLine &&
               lastSortingNode &&
               getLinesBetween.getLinesBetween(
@@ -161,9 +160,10 @@ const sortIntersectionTypes = createEslintRule.createEslintRule({
                 sortingNode,
               ))
           ) {
-            accumulator.push([])
+            lastGroup = []
+            accumulator.push(lastGroup)
           }
-          ;(_b = accumulator.at(-1)) == null ? void 0 : _b.push(sortingNode)
+          lastGroup == null ? void 0 : lastGroup.push(sortingNode)
           return accumulator
         },
         [[]],
@@ -176,17 +176,18 @@ const sortIntersectionTypes = createEslintRule.createEslintRule({
         let sortedNodes = sortNodesExcludingEslintDisabled(false)
         let sortedNodesExcludingEslintDisabled =
           sortNodesExcludingEslintDisabled(true)
+        let nodeIndexMap = createNodeIndexMap.createNodeIndexMap(sortedNodes)
         pairwise.pairwise(nodes, (left, right) => {
           let leftNumber = getGroupNumber.getGroupNumber(options.groups, left)
           let rightNumber = getGroupNumber.getGroupNumber(options.groups, right)
-          let indexOfLeft = sortedNodes.indexOf(left)
-          let indexOfRight = sortedNodes.indexOf(right)
+          let leftIndex = nodeIndexMap.get(left)
+          let rightIndex = nodeIndexMap.get(right)
           let indexOfRightExcludingEslintDisabled =
             sortedNodesExcludingEslintDisabled.indexOf(right)
           let messageIds = []
           if (
-            indexOfLeft > indexOfRight ||
-            indexOfLeft >= indexOfRightExcludingEslintDisabled
+            leftIndex > rightIndex ||
+            leftIndex >= indexOfRightExcludingEslintDisabled
           ) {
             messageIds.push(
               leftNumber === rightNumber
@@ -253,10 +254,10 @@ const sortIntersectionTypes = createEslintRule.createEslintRule({
           newlinesBetween: commonJsonSchemas.newlinesBetweenJsonSchema,
           ignoreCase: commonJsonSchemas.ignoreCaseJsonSchema,
           alphabet: commonJsonSchemas.alphabetJsonSchema,
+          type: commonJsonSchemas.buildTypeJsonSchema(),
           locales: commonJsonSchemas.localesJsonSchema,
           groups: commonJsonSchemas.groupsJsonSchema,
           order: commonJsonSchemas.orderJsonSchema,
-          type: commonJsonSchemas.typeJsonSchema,
         },
         additionalProperties: false,
         type: 'object',

package/dist/rules/sort-jsx-props.js

@@ -4,6 +4,7 @@ const validateCustomSortConfiguration = require('../utils/validate-custom-sort-c
 const validateGroupsConfiguration = require('../utils/validate-groups-configuration.js')
 const getEslintDisabledLines = require('../utils/get-eslint-disabled-lines.js')
 const isNodeEslintDisabled = require('../utils/is-node-eslint-disabled.js')
+const createNodeIndexMap = require('../utils/create-node-index-map.js')
 const sortNodesByGroups = require('../utils/sort-nodes-by-groups.js')
 const createEslintRule = require('../utils/create-eslint-rule.js')
 const getGroupNumber = require('../utils/get-group-number.js')
@@ -78,8 +79,7 @@ const sortJsxProps = createEslintRule.createEslintRule({
           setCustomGroups(options.customGroups, name)
           if (attribute.value === null) {
             defineGroup('shorthand')
-          }
-          if (attribute.loc.start.line !== attribute.loc.end.line) {
+          } else if (attribute.loc.start.line !== attribute.loc.end.line) {
             defineGroup('multiline')
           }
           let jsxNode = {
@@ -105,14 +105,15 @@ const sortJsxProps = createEslintRule.createEslintRule({
         let sortedNodes = sortNodesExcludingEslintDisabled(false)
         let sortedNodesExcludingEslintDisabled =
           sortNodesExcludingEslintDisabled(true)
+        let nodeIndexMap = createNodeIndexMap.createNodeIndexMap(sortedNodes)
         pairwise.pairwise(nodes, (left, right) => {
-          let indexOfLeft = sortedNodes.indexOf(left)
-          let indexOfRight = sortedNodes.indexOf(right)
+          let leftIndex = nodeIndexMap.get(left)
+          let rightIndex = nodeIndexMap.get(right)
           let indexOfRightExcludingEslintDisabled =
             sortedNodesExcludingEslintDisabled.indexOf(right)
           if (
-            indexOfLeft < indexOfRight &&
-            indexOfLeft < indexOfRightExcludingEslintDisabled
+            leftIndex < rightIndex &&
+            leftIndex < indexOfRightExcludingEslintDisabled
           ) {
             return
           }
@@ -158,10 +159,10 @@ const sortJsxProps = createEslintRule.createEslintRule({
           customGroups: commonJsonSchemas.customGroupsJsonSchema,
           ignoreCase: commonJsonSchemas.ignoreCaseJsonSchema,
           alphabet: commonJsonSchemas.alphabetJsonSchema,
+          type: commonJsonSchemas.buildTypeJsonSchema(),
           locales: commonJsonSchemas.localesJsonSchema,
           groups: commonJsonSchemas.groupsJsonSchema,
           order: commonJsonSchemas.orderJsonSchema,
-          type: commonJsonSchemas.typeJsonSchema,
         },
         additionalProperties: false,
         type: 'object',

package/dist/rules/sort-maps.js

@@ -3,7 +3,8 @@ const commonJsonSchemas = require('../utils/common-json-schemas.js')
 const validateCustomSortConfiguration = require('../utils/validate-custom-sort-configuration.js')
 const getEslintDisabledLines = require('../utils/get-eslint-disabled-lines.js')
 const isNodeEslintDisabled = require('../utils/is-node-eslint-disabled.js')
-const isPartitionComment = require('../utils/is-partition-comment.js')
+const hasPartitionComment = require('../utils/has-partition-comment.js')
+const createNodeIndexMap = require('../utils/create-node-index-map.js')
 const getCommentsBefore = require('../utils/get-comments-before.js')
 const createEslintRule = require('../utils/create-eslint-rule.js')
 const getLinesBetween = require('../utils/get-lines-between.js')
@@ -94,14 +95,13 @@ const sortMaps = createEslintRule.createEslintRule({
             name,
           }
           if (
-            (options.partitionByComment &&
-              isPartitionComment.hasPartitionComment(
-                options.partitionByComment,
-                getCommentsBefore.getCommentsBefore({
-                  node: element,
-                  sourceCode,
-                }),
-              )) ||
+            hasPartitionComment.hasPartitionComment({
+              comments: getCommentsBefore.getCommentsBefore({
+                node: element,
+                sourceCode,
+              }),
+              partitionByComment: options.partitionByComment,
+            }) ||
             (options.partitionByNewLine &&
               lastSortingNode &&
               getLinesBetween.getLinesBetween(
@@ -120,14 +120,15 @@ const sortMaps = createEslintRule.createEslintRule({
           let sortedNodes = sortNodesExcludingEslintDisabled(false)
           let sortedNodesExcludingEslintDisabled =
             sortNodesExcludingEslintDisabled(true)
+          let nodeIndexMap = createNodeIndexMap.createNodeIndexMap(sortedNodes)
           pairwise.pairwise(nodes, (left, right) => {
-            let indexOfLeft = sortedNodes.indexOf(left)
-            let indexOfRight = sortedNodes.indexOf(right)
+            let leftIndex = nodeIndexMap.get(left)
+            let rightIndex = nodeIndexMap.get(right)
             let indexOfRightExcludingEslintDisabled =
               sortedNodesExcludingEslintDisabled.indexOf(right)
             if (
-              indexOfLeft < indexOfRight &&
-              indexOfLeft < indexOfRightExcludingEslintDisabled
+              leftIndex < rightIndex &&
+              leftIndex < indexOfRightExcludingEslintDisabled
             ) {
               return
             }
@@ -165,9 +166,9 @@ const sortMaps = createEslintRule.createEslintRule({
           specialCharacters: commonJsonSchemas.specialCharactersJsonSchema,
           ignoreCase: commonJsonSchemas.ignoreCaseJsonSchema,
           alphabet: commonJsonSchemas.alphabetJsonSchema,
+          type: commonJsonSchemas.buildTypeJsonSchema(),
           locales: commonJsonSchemas.localesJsonSchema,
           order: commonJsonSchemas.orderJsonSchema,
-          type: commonJsonSchemas.typeJsonSchema,
         },
         additionalProperties: false,
         type: 'object',