eslint-plugin-perfectionist 4.3.0 → 4.4.0

package/dist/rules/sort-imports.js

@@ -9,6 +9,7 @@ const getOptionsWithCleanGroups = require('../utils/get-options-with-clean-group
 const getEslintDisabledLines = require('../utils/get-eslint-disabled-lines.js')
 const isNodeEslintDisabled = require('../utils/is-node-eslint-disabled.js')
 const getTypescriptImport = require('../utils/get-typescript-import.js')
+const createNodeIndexMap = require('../utils/create-node-index-map.js')
 const isPartitionComment = require('../utils/is-partition-comment.js')
 const sortNodesByGroups = require('../utils/sort-nodes-by-groups.js')
 const getCommentsBefore = require('../utils/get-comments-before.js')
@@ -132,11 +133,18 @@ 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.endsWith(extension))
     }
     let flatGroups = new Set(options.groups.flat())
     let shouldRegroupSideEffectNodes = flatGroups.has('side-effect')
@@ -330,24 +338,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,
-                }),
-              )) ||
+            isPartitionComment.hasPartitionComment(
+              options.partitionByComment,
+              getCommentsBefore.getCommentsBefore({
+                node: sortingNode.node,
+                sourceCode,
+              }),
+            ) ||
             (options.partitionByNewLine &&
               lastSortingNode &&
               getLinesBetween.getLinesBetween(
@@ -358,9 +364,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 +385,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
@@ -517,10 +525,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,6 +5,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 isPartitionComment = require('../utils/is-partition-comment.js')
 const sortNodesByGroups = require('../utils/sort-nodes-by-groups.js')
 const getCommentsBefore = require('../utils/get-comments-before.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,
-                }),
-              )) ||
+            isPartitionComment.hasPartitionComment(
+              options.partitionByComment,
+              getCommentsBefore.getCommentsBefore({
+                tokenValueToIgnoreBefore: '&',
+                node: type,
+                sourceCode,
+              }),
+            ) ||
             (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,6 +3,7 @@ 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 createNodeIndexMap = require('../utils/create-node-index-map.js')
 const isPartitionComment = require('../utils/is-partition-comment.js')
 const getCommentsBefore = require('../utils/get-comments-before.js')
 const createEslintRule = require('../utils/create-eslint-rule.js')
@@ -94,14 +95,13 @@ const sortMaps = createEslintRule.createEslintRule({
             name,
           }
           if (
-            (options.partitionByComment &&
-              isPartitionComment.hasPartitionComment(
-                options.partitionByComment,
-                getCommentsBefore.getCommentsBefore({
-                  node: element,
-                  sourceCode,
-                }),
-              )) ||
+            isPartitionComment.hasPartitionComment(
+              options.partitionByComment,
+              getCommentsBefore.getCommentsBefore({
+                node: element,
+                sourceCode,
+              }),
+            ) ||
             (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',

package/dist/rules/sort-modules.js

@@ -10,6 +10,7 @@ const getCustomGroupsCompareOptions = require('../utils/get-custom-groups-compar
 const generatePredefinedGroups = require('../utils/generate-predefined-groups.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 isPartitionComment = require('../utils/is-partition-comment.js')
 const sortNodesByGroups = require('../utils/sort-nodes-by-groups.js')
 const getNewlinesErrors = require('../utils/get-newlines-errors.js')
@@ -76,10 +77,10 @@ const sortModules = 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',
@@ -260,14 +261,14 @@ let analyzeModule = ({
       continue
     }
     let { defineGroup, getGroup } = useGroups.useGroups(options)
-    for (let officialGroup of generatePredefinedGroups.generatePredefinedGroups(
+    for (let predefinedGroup of generatePredefinedGroups.generatePredefinedGroups(
       {
         cache: cachedGroupsByModifiersAndSelectors,
         selectors: [selector],
         modifiers,
       },
     )) {
-      defineGroup(officialGroup)
+      defineGroup(predefinedGroup)
     }
     for (let customGroup of options.customGroups) {
       if (
@@ -295,8 +296,8 @@ let analyzeModule = ({
       dependencyName: name,
       group: getGroup(),
       dependencies,
-      node,
       name,
+      node,
     }
     let lastSortingNode =
       (_a = formattedNodes.at(-1)) == null ? void 0 : _a.at(-1)
@@ -308,14 +309,13 @@ let analyzeModule = ({
           lastSortingNode,
           sortingNode,
         )) ||
-      (options.partitionByComment &&
-        isPartitionComment.hasPartitionComment(
-          options.partitionByComment,
-          getCommentsBefore.getCommentsBefore({
-            sourceCode,
-            node,
-          }),
-        ))
+      isPartitionComment.hasPartitionComment(
+        options.partitionByComment,
+        getCommentsBefore.getCommentsBefore({
+          sourceCode,
+          node,
+        }),
+      )
     ) {
       formattedNodes.push([])
     }
@@ -344,11 +344,12 @@ let analyzeModule = ({
   let sortedNodesExcludingEslintDisabled =
     sortNodesIgnoringEslintDisabledNodes(true)
   let nodes = formattedNodes.flat()
+  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 = []
@@ -356,8 +357,8 @@ let analyzeModule = ({
       sortNodesByDependencies.getFirstUnorderedNodeDependentOn(right, nodes)
     if (
       firstUnorderedNodeDependentOnRight ||
-      indexOfLeft > indexOfRight ||
-      indexOfLeft >= indexOfRightExcludingEslintDisabled
+      leftIndex > rightIndex ||
+      leftIndex >= indexOfRightExcludingEslintDisabled
     ) {
       if (firstUnorderedNodeDependentOnRight) {
         messageIds.push('unexpectedModulesDependencyOrder')

package/dist/rules/sort-named-exports.js

@@ -3,6 +3,7 @@ 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 createNodeIndexMap = require('../utils/create-node-index-map.js')
 const isPartitionComment = require('../utils/is-partition-comment.js')
 const getCommentsBefore = require('../utils/get-comments-before.js')
 const createEslintRule = require('../utils/create-eslint-rule.js')
@@ -67,14 +68,13 @@ const sortNamedExports = createEslintRule.createEslintRule({
           name,
         }
         if (
-          (options.partitionByComment &&
-            isPartitionComment.hasPartitionComment(
-              options.partitionByComment,
-              getCommentsBefore.getCommentsBefore({
-                node: specifier,
-                sourceCode,
-              }),
-            )) ||
+          isPartitionComment.hasPartitionComment(
+            options.partitionByComment,
+            getCommentsBefore.getCommentsBefore({
+              node: specifier,
+              sourceCode,
+            }),
+          ) ||
           (options.partitionByNewLine &&
             lastSortingNode &&
             getLinesBetween.getLinesBetween(
@@ -111,14 +111,15 @@ const sortNamedExports = 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
           }
@@ -160,9 +161,9 @@ const sortNamedExports = 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-named-imports.js

@@ -3,6 +3,7 @@ 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 createNodeIndexMap = require('../utils/create-node-index-map.js')
 const isPartitionComment = require('../utils/is-partition-comment.js')
 const getCommentsBefore = require('../utils/get-comments-before.js')
 const createEslintRule = require('../utils/create-eslint-rule.js')
@@ -76,14 +77,13 @@ const sortNamedImports = createEslintRule.createEslintRule({
           name,
         }
         if (
-          (options.partitionByComment &&
-            isPartitionComment.hasPartitionComment(
-              options.partitionByComment,
-              getCommentsBefore.getCommentsBefore({
-                node: specifier,
-                sourceCode,
-              }),
-            )) ||
+          isPartitionComment.hasPartitionComment(
+            options.partitionByComment,
+            getCommentsBefore.getCommentsBefore({
+              node: specifier,
+              sourceCode,
+            }),
+          ) ||
           (options.partitionByNewLine &&
             lastSortingNode &&
             getLinesBetween.getLinesBetween(
@@ -120,14 +120,15 @@ const sortNamedImports = 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
           }
@@ -173,9 +174,9 @@ const sortNamedImports = 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',