eslint-plugin-perfectionist 4.2.0 → 4.4.0

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

@@ -1,8 +1,10 @@
 'use strict'
 const commonJsonSchemas = require('../utils/common-json-schemas.js')
+const validateCustomSortConfiguration = require('../utils/validate-custom-sort-configuration.js')
 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')
@@ -22,6 +24,7 @@ let defaultOptions = {
   ignoreCase: true,
   customGroups: {},
   locales: 'en-US',
+  alphabet: '',
   order: 'asc',
   groups: [],
 }
@@ -37,6 +40,7 @@ const sortJsxProps = createEslintRule.createEslintRule({
         settings,
         defaultOptions,
       )
+      validateCustomSortConfiguration.validateCustomSortConfiguration(options)
       validateGroupsConfiguration.validateGroupsConfiguration(
         options.groups,
         ['multiline', 'shorthand', 'unknown'],
@@ -75,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 = {
@@ -102,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
           }
@@ -154,10 +158,11 @@ const sortJsxProps = createEslintRule.createEslintRule({
           specialCharacters: commonJsonSchemas.specialCharactersJsonSchema,
           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

@@ -1,7 +1,9 @@
 'use strict'
 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')
@@ -22,6 +24,7 @@ let defaultOptions = {
   type: 'alphabetical',
   ignoreCase: true,
   locales: 'en-US',
+  alphabet: '',
   order: 'asc',
 }
 const sortMaps = createEslintRule.createEslintRule({
@@ -47,6 +50,7 @@ const sortMaps = createEslintRule.createEslintRule({
         settings,
         defaultOptions,
       )
+      validateCustomSortConfiguration.validateCustomSortConfiguration(options)
       let sourceCode = getSourceCode.getSourceCode(context)
       let eslintDisabledLines = getEslintDisabledLines.getEslintDisabledLines({
         ruleName: context.id,
@@ -91,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(
@@ -117,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
             }
@@ -161,9 +165,10 @@ const sortMaps = createEslintRule.createEslintRule({
           partitionByNewLine: commonJsonSchemas.partitionByNewLineJsonSchema,
           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

@@ -3,12 +3,14 @@ const utils = require('@typescript-eslint/utils')
 const commonJsonSchemas = require('../utils/common-json-schemas.js')
 const sortNodesByDependencies = require('../utils/sort-nodes-by-dependencies.js')
 const validateNewlinesAndPartitionConfiguration = require('../utils/validate-newlines-and-partition-configuration.js')
+const validateGeneratedGroupsConfiguration = require('../utils/validate-generated-groups-configuration.js')
 const sortModules_types = require('./sort-modules.types.js')
-const validateGeneratedGroupsConfiguration = require('./validate-generated-groups-configuration.js')
-const getCustomGroupsCompareOptions = require('./get-custom-groups-compare-options.js')
+const validateCustomSortConfiguration = require('../utils/validate-custom-sort-configuration.js')
+const getCustomGroupsCompareOptions = require('../utils/get-custom-groups-compare-options.js')
 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')
@@ -53,6 +55,7 @@ let defaultOptions = {
   ignoreCase: true,
   customGroups: [],
   locales: 'en-US',
+  alphabet: '',
   order: 'asc',
 }
 const sortModules = createEslintRule.createEslintRule({
@@ -73,10 +76,11 @@ const sortModules = createEslintRule.createEslintRule({
           specialCharacters: commonJsonSchemas.specialCharactersJsonSchema,
           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',
@@ -108,6 +112,7 @@ const sortModules = createEslintRule.createEslintRule({
       settings,
       defaultOptions,
     )
+    validateCustomSortConfiguration.validateCustomSortConfiguration(options)
     validateGeneratedGroupsConfiguration.validateGeneratedGroupsConfiguration({
       customGroups: options.customGroups,
       modifiers: sortModules_types.allModifiers,
@@ -256,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 (
@@ -291,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)
@@ -304,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([])
     }
@@ -340,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 = []
@@ -352,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

@@ -1,7 +1,9 @@
 'use strict'
 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')
@@ -22,6 +24,7 @@ let defaultOptions = {
   groupKind: 'mixed',
   ignoreCase: true,
   locales: 'en-US',
+  alphabet: '',
   order: 'asc',
 }
 const sortNamedExports = createEslintRule.createEslintRule({
@@ -37,6 +40,7 @@ const sortNamedExports = createEslintRule.createEslintRule({
         settings,
         defaultOptions,
       )
+      validateCustomSortConfiguration.validateCustomSortConfiguration(options)
       let sourceCode = getSourceCode.getSourceCode(context)
       let eslintDisabledLines = getEslintDisabledLines.getEslintDisabledLines({
         ruleName: context.id,
@@ -64,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(
@@ -108,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
           }
@@ -156,9 +160,10 @@ const sortNamedExports = createEslintRule.createEslintRule({
           partitionByNewLine: commonJsonSchemas.partitionByNewLineJsonSchema,
           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

@@ -1,7 +1,9 @@
 'use strict'
 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')
@@ -23,6 +25,7 @@ let defaultOptions = {
   groupKind: 'mixed',
   ignoreCase: true,
   locales: 'en-US',
+  alphabet: '',
   order: 'asc',
 }
 const sortNamedImports = createEslintRule.createEslintRule({
@@ -41,6 +44,7 @@ const sortNamedImports = createEslintRule.createEslintRule({
         settings,
         defaultOptions,
       )
+      validateCustomSortConfiguration.validateCustomSortConfiguration(options)
       let sourceCode = getSourceCode.getSourceCode(context)
       let eslintDisabledLines = getEslintDisabledLines.getEslintDisabledLines({
         ruleName: context.id,
@@ -73,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(
@@ -117,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
           }
@@ -169,9 +173,10 @@ const sortNamedImports = createEslintRule.createEslintRule({
           partitionByNewLine: commonJsonSchemas.partitionByNewLineJsonSchema,
           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',