eslint-plugin-perfectionist 3.8.0 → 3.9.0

package/dist/rules/sort-classes.js

@@ -3,6 +3,7 @@ const sortClassesUtils = require('./sort-classes-utils.js')
 const sortClasses_types = require('./sort-classes.types.js')
 const sortNodesByDependencies = require('../utils/sort-nodes-by-dependencies.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')
 const createEslintRule = require('../utils/create-eslint-rule.js')
 const getGroupNumber = require('../utils/get-group-number.js')
@@ -11,7 +12,6 @@ const toSingleLine = require('../utils/to-single-line.js')
 const rangeToDiff = require('../utils/range-to-diff.js')
 const getSettings = require('../utils/get-settings.js')
 const useGroups = require('../utils/use-groups.js')
-const sortNodes = require('../utils/sort-nodes.js')
 const makeFixes = require('../utils/make-fixes.js')
 const complete = require('../utils/complete.js')
 const pairwise = require('../utils/pairwise.js')
@@ -48,6 +48,12 @@ const sortClasses = createEslintRule.createEslintRule({
               'Controls whether sorting should be case-sensitive or not.',
             type: 'boolean',
           },
+          specialCharacters: {
+            description:
+              'Controls how special characters should be handled before sorting.',
+            type: 'string',
+            enum: ['remove', 'trim', 'keep'],
+          },
           partitionByComment: {
             description:
               'Allows to use comments to separate the class members into logical groups.',
@@ -159,6 +165,7 @@ const sortClasses = createEslintRule.createEslintRule({
       type: 'alphabetical',
       order: 'asc',
       ignoreCase: true,
+      specialCharacters: 'keep',
       matcher: 'minimatch',
       partitionByComment: false,
       groups: [
@@ -204,9 +211,14 @@ const sortClasses = createEslintRule.createEslintRule({
           partitionByComment: false,
           type: 'alphabetical',
           ignoreCase: true,
+          specialCharacters: 'keep',
           customGroups: [],
           order: 'asc',
         })
+        sortClassesUtils.validateGroupsConfiguration(
+          options.groups,
+          options.customGroups,
+        )
         let sourceCode = getSourceCode.getSourceCode(context)
         let className = (_a = node.parent.id) == null ? void 0 : _a.name
         let getDependencyName = (nodeName, isStatic) =>
@@ -228,12 +240,6 @@ const sortClasses = createEslintRule.createEslintRule({
         let extractDependencies = (expression, isMemberStatic) => {
           let dependencies = []
           let checkNode = nodeValue => {
-            if (
-              nodeValue.type === 'ArrowFunctionExpression' ||
-              nodeValue.type === 'FunctionExpression'
-            ) {
-              return
-            }
             if (
               nodeValue.type === 'MemberExpression' &&
               (nodeValue.object.type === 'ThisExpression' ||
@@ -369,6 +375,7 @@ const sortClasses = createEslintRule.createEslintRule({
                 }
               }
             }
+            let memberValue
             let modifiers = []
             let selectors = []
             if (
@@ -479,6 +486,9 @@ const sortClasses = createEslintRule.createEslintRule({
               if (isFunctionProperty) {
                 selectors.push('function-property')
               }
+              if (!isFunctionProperty && member.value) {
+                memberValue = sourceCode.getText(member.value)
+              }
               selectors.push('property')
               if (
                 member.type === 'PropertyDefinition' &&
@@ -500,6 +510,7 @@ const sortClasses = createEslintRule.createEslintRule({
                   sortClassesUtils.customGroupMatches({
                     customGroup,
                     elementName: name,
+                    elementValue: memberValue,
                     modifiers,
                     selectors,
                     decorators,
@@ -523,7 +534,7 @@ const sortClasses = createEslintRule.createEslintRule({
               )) == null
                 ? void 0
                 : _d.at(-1)
-            let value = {
+            let sortingNode = {
               size: overloadSignatureGroupMember
                 ? rangeToDiff.rangeToDiff(overloadSignatureGroupMember.range)
                 : rangeToDiff.rangeToDiff(member.range),
@@ -536,52 +547,22 @@ const sortClasses = createEslintRule.createEslintRule({
                 modifiers.includes('static'),
               ),
             }
-            accumulator.at(-1).push(value)
+            accumulator.at(-1).push(sortingNode)
             return accumulator
           },
           [[]],
         )
-        let sortedNodes = []
-        for (let nodes2 of formattedNodes) {
-          let nodesByNonIgnoredGroupNumber = {}
-          let ignoredNodeIndices = []
-          for (let [index, sortingNode] of nodes2.entries()) {
-            let groupNum = getGroupNumber.getGroupNumber(
-              options.groups,
-              sortingNode,
-            )
-            if (groupNum === options.groups.length) {
-              ignoredNodeIndices.push(index)
-              continue
-            }
-            nodesByNonIgnoredGroupNumber[groupNum] =
-              nodesByNonIgnoredGroupNumber[groupNum] ?? []
-            nodesByNonIgnoredGroupNumber[groupNum].push(sortingNode)
-          }
-          for (let groupNumber of Object.keys(
-            nodesByNonIgnoredGroupNumber,
-          ).sort((a, b) => Number(a) - Number(b))) {
-            let compareOptions = sortClassesUtils.getCompareOptions(
-              options,
-              Number(groupNumber),
-            )
-            if (!compareOptions) {
-              sortedNodes.push(
-                ...nodesByNonIgnoredGroupNumber[Number(groupNumber)],
-              )
-            } else {
-              sortedNodes.push(
-                ...sortNodes.sortNodes(
-                  nodesByNonIgnoredGroupNumber[Number(groupNumber)],
-                  compareOptions,
-                ),
-              )
-            }
-          }
-          for (let ignoredIndex of ignoredNodeIndices) {
-            sortedNodes.splice(ignoredIndex, 0, nodes2[ignoredIndex])
-          }
-        }
+        let sortedNodes = formattedNodes
+          .map(nodes2 =>
+            sortNodesByGroups.sortNodesByGroups(nodes2, options, {
+              getGroupCompareOptions: groupNumber =>
+                sortClassesUtils.getCompareOptions(options, groupNumber),
+              isNodeIgnored: sortingNode =>
+                getGroupNumber.getGroupNumber(options.groups, sortingNode) ===
+                options.groups.length,
+            }),
+          )
+          .flat()
         sortedNodes =
           sortNodesByDependencies.sortNodesByDependencies(sortedNodes)
         let nodes = formattedNodes.flat()

package/dist/rules/sort-classes.mjs

@@ -1,4 +1,5 @@
 import {
+  validateGroupsConfiguration,
   getOverloadSignatureGroups,
   generateOfficialGroups,
   customGroupMatches,
@@ -14,6 +15,7 @@ import {
   getFirstUnorderedNodeDependentOn,
 } from '../utils/sort-nodes-by-dependencies.mjs'
 import { hasPartitionComment } from '../utils/is-partition-comment.mjs'
+import { sortNodesByGroups } from '../utils/sort-nodes-by-groups.mjs'
 import { getCommentsBefore } from '../utils/get-comments-before.mjs'
 import { createEslintRule } from '../utils/create-eslint-rule.mjs'
 import { getGroupNumber } from '../utils/get-group-number.mjs'
@@ -22,7 +24,6 @@ import { toSingleLine } from '../utils/to-single-line.mjs'
 import { rangeToDiff } from '../utils/range-to-diff.mjs'
 import { getSettings } from '../utils/get-settings.mjs'
 import { useGroups } from '../utils/use-groups.mjs'
-import { sortNodes } from '../utils/sort-nodes.mjs'
 import { makeFixes } from '../utils/make-fixes.mjs'
 import { complete } from '../utils/complete.mjs'
 import { pairwise } from '../utils/pairwise.mjs'
@@ -59,6 +60,12 @@ const sortClasses = createEslintRule({
               'Controls whether sorting should be case-sensitive or not.',
             type: 'boolean',
           },
+          specialCharacters: {
+            description:
+              'Controls how special characters should be handled before sorting.',
+            type: 'string',
+            enum: ['remove', 'trim', 'keep'],
+          },
           partitionByComment: {
             description:
               'Allows to use comments to separate the class members into logical groups.',
@@ -170,6 +177,7 @@ const sortClasses = createEslintRule({
       type: 'alphabetical',
       order: 'asc',
       ignoreCase: true,
+      specialCharacters: 'keep',
       matcher: 'minimatch',
       partitionByComment: false,
       groups: [
@@ -215,9 +223,11 @@ const sortClasses = createEslintRule({
           partitionByComment: false,
           type: 'alphabetical',
           ignoreCase: true,
+          specialCharacters: 'keep',
           customGroups: [],
           order: 'asc',
         })
+        validateGroupsConfiguration(options.groups, options.customGroups)
         let sourceCode = getSourceCode(context)
         let className = (_a = node.parent.id) == null ? void 0 : _a.name
         let getDependencyName = (nodeName, isStatic) =>
@@ -239,12 +249,6 @@ const sortClasses = createEslintRule({
         let extractDependencies = (expression, isMemberStatic) => {
           let dependencies = []
           let checkNode = nodeValue => {
-            if (
-              nodeValue.type === 'ArrowFunctionExpression' ||
-              nodeValue.type === 'FunctionExpression'
-            ) {
-              return
-            }
             if (
               nodeValue.type === 'MemberExpression' &&
               (nodeValue.object.type === 'ThisExpression' ||
@@ -375,6 +379,7 @@ const sortClasses = createEslintRule({
                 }
               }
             }
+            let memberValue
             let modifiers = []
             let selectors = []
             if (
@@ -485,6 +490,9 @@ const sortClasses = createEslintRule({
               if (isFunctionProperty) {
                 selectors.push('function-property')
               }
+              if (!isFunctionProperty && member.value) {
+                memberValue = sourceCode.getText(member.value)
+              }
               selectors.push('property')
               if (
                 member.type === 'PropertyDefinition' &&
@@ -506,6 +514,7 @@ const sortClasses = createEslintRule({
                   customGroupMatches({
                     customGroup,
                     elementName: name,
+                    elementValue: memberValue,
                     modifiers,
                     selectors,
                     decorators,
@@ -529,7 +538,7 @@ const sortClasses = createEslintRule({
               )) == null
                 ? void 0
                 : _d.at(-1)
-            let value = {
+            let sortingNode = {
               size: overloadSignatureGroupMember
                 ? rangeToDiff(overloadSignatureGroupMember.range)
                 : rangeToDiff(member.range),
@@ -542,46 +551,22 @@ const sortClasses = createEslintRule({
                 modifiers.includes('static'),
               ),
             }
-            accumulator.at(-1).push(value)
+            accumulator.at(-1).push(sortingNode)
             return accumulator
           },
           [[]],
         )
-        let sortedNodes = []
-        for (let nodes2 of formattedNodes) {
-          let nodesByNonIgnoredGroupNumber = {}
-          let ignoredNodeIndices = []
-          for (let [index, sortingNode] of nodes2.entries()) {
-            let groupNum = getGroupNumber(options.groups, sortingNode)
-            if (groupNum === options.groups.length) {
-              ignoredNodeIndices.push(index)
-              continue
-            }
-            nodesByNonIgnoredGroupNumber[groupNum] =
-              nodesByNonIgnoredGroupNumber[groupNum] ?? []
-            nodesByNonIgnoredGroupNumber[groupNum].push(sortingNode)
-          }
-          for (let groupNumber of Object.keys(
-            nodesByNonIgnoredGroupNumber,
-          ).sort((a, b) => Number(a) - Number(b))) {
-            let compareOptions = getCompareOptions(options, Number(groupNumber))
-            if (!compareOptions) {
-              sortedNodes.push(
-                ...nodesByNonIgnoredGroupNumber[Number(groupNumber)],
-              )
-            } else {
-              sortedNodes.push(
-                ...sortNodes(
-                  nodesByNonIgnoredGroupNumber[Number(groupNumber)],
-                  compareOptions,
-                ),
-              )
-            }
-          }
-          for (let ignoredIndex of ignoredNodeIndices) {
-            sortedNodes.splice(ignoredIndex, 0, nodes2[ignoredIndex])
-          }
-        }
+        let sortedNodes = formattedNodes
+          .map(nodes2 =>
+            sortNodesByGroups(nodes2, options, {
+              getGroupCompareOptions: groupNumber =>
+                getCompareOptions(options, groupNumber),
+              isNodeIgnored: sortingNode =>
+                getGroupNumber(options.groups, sortingNode) ===
+                options.groups.length,
+            }),
+          )
+          .flat()
         sortedNodes = sortNodesByDependencies(sortedNodes)
         let nodes = formattedNodes.flat()
         pairwise(nodes, (left, right) => {

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

@@ -59,6 +59,10 @@ const singleCustomGroupJsonSchema = {
     description: 'Element name pattern filter.',
     type: 'string',
   },
+  elementValuePattern: {
+    description: 'Element value pattern filter for properties.',
+    type: 'string',
+  },
   decoratorNamePattern: {
     description: 'Decorator name pattern filter.',
     type: 'string',

package/dist/rules/sort-classes.types.mjs

@@ -57,6 +57,10 @@ const singleCustomGroupJsonSchema = {
     description: 'Element name pattern filter.',
     type: 'string',
   },
+  elementValuePattern: {
+    description: 'Element value pattern filter for properties.',
+    type: 'string',
+  },
   decoratorNamePattern: {
     description: 'Decorator name pattern filter.',
     type: 'string',

package/dist/rules/sort-enums.js

@@ -45,6 +45,12 @@ const sortEnums = createEslintRule.createEslintRule({
               'Controls whether sorting should be case-sensitive or not.',
             type: 'boolean',
           },
+          specialCharacters: {
+            description:
+              'Controls how special characters should be handled before sorting.',
+            type: 'string',
+            enum: ['remove', 'trim', 'keep'],
+          },
           sortByValue: {
             description: 'Compare enum values instead of names.',
             type: 'boolean',
@@ -92,6 +98,7 @@ const sortEnums = createEslintRule.createEslintRule({
       type: 'alphabetical',
       order: 'asc',
       ignoreCase: true,
+      specialCharacters: 'keep',
       matcher: 'minimatch',
       sortByValue: false,
       partitionByComment: false,
@@ -123,6 +130,7 @@ const sortEnums = createEslintRule.createEslintRule({
           type: 'alphabetical',
           matcher: 'minimatch',
           ignoreCase: true,
+          specialCharacters: 'keep',
           order: 'asc',
           sortByValue: false,
           forceNumericSort: false,
@@ -213,6 +221,7 @@ const sortEnums = createEslintRule.createEslintRule({
               : options.type,
           order: options.order,
           ignoreCase: options.ignoreCase,
+          specialCharacters: options.specialCharacters,
           // Get the enum value rather than the name if needed
           nodeValueGetter:
             options.sortByValue || (isNumericEnum && options.forceNumericSort)

package/dist/rules/sort-enums.mjs

@@ -47,6 +47,12 @@ const sortEnums = createEslintRule({
               'Controls whether sorting should be case-sensitive or not.',
             type: 'boolean',
           },
+          specialCharacters: {
+            description:
+              'Controls how special characters should be handled before sorting.',
+            type: 'string',
+            enum: ['remove', 'trim', 'keep'],
+          },
           sortByValue: {
             description: 'Compare enum values instead of names.',
             type: 'boolean',
@@ -94,6 +100,7 @@ const sortEnums = createEslintRule({
       type: 'alphabetical',
       order: 'asc',
       ignoreCase: true,
+      specialCharacters: 'keep',
       matcher: 'minimatch',
       sortByValue: false,
       partitionByComment: false,
@@ -125,6 +132,7 @@ const sortEnums = createEslintRule({
           type: 'alphabetical',
           matcher: 'minimatch',
           ignoreCase: true,
+          specialCharacters: 'keep',
           order: 'asc',
           sortByValue: false,
           forceNumericSort: false,
@@ -211,6 +219,7 @@ const sortEnums = createEslintRule({
               : options.type,
           order: options.order,
           ignoreCase: options.ignoreCase,
+          specialCharacters: options.specialCharacters,
           // Get the enum value rather than the name if needed
           nodeValueGetter:
             options.sortByValue || (isNumericEnum && options.forceNumericSort)

package/dist/rules/sort-exports.js

@@ -43,6 +43,12 @@ const sortExports = createEslintRule.createEslintRule({
               'Controls whether sorting should be case-sensitive or not.',
             type: 'boolean',
           },
+          specialCharacters: {
+            description:
+              'Controls how special characters should be handled before sorting.',
+            type: 'string',
+            enum: ['remove', 'trim', 'keep'],
+          },
           partitionByComment: {
             description:
               'Allows you to use comments to separate the exports into logical groups.',
@@ -84,6 +90,7 @@ const sortExports = createEslintRule.createEslintRule({
       type: 'alphabetical',
       order: 'asc',
       ignoreCase: true,
+      specialCharacters: 'keep',
       matcher: 'minimatch',
       partitionByComment: false,
       partitionByNewLine: false,
@@ -95,6 +102,7 @@ const sortExports = createEslintRule.createEslintRule({
     let options = complete.complete(context.options.at(0), settings, {
       type: 'alphabetical',
       ignoreCase: true,
+      specialCharacters: 'keep',
       order: 'asc',
       matcher: 'minimatch',
       partitionByComment: false,

package/dist/rules/sort-exports.mjs

@@ -42,6 +42,12 @@ const sortExports = createEslintRule({
               'Controls whether sorting should be case-sensitive or not.',
             type: 'boolean',
           },
+          specialCharacters: {
+            description:
+              'Controls how special characters should be handled before sorting.',
+            type: 'string',
+            enum: ['remove', 'trim', 'keep'],
+          },
           partitionByComment: {
             description:
               'Allows you to use comments to separate the exports into logical groups.',
@@ -83,6 +89,7 @@ const sortExports = createEslintRule({
       type: 'alphabetical',
       order: 'asc',
       ignoreCase: true,
+      specialCharacters: 'keep',
       matcher: 'minimatch',
       partitionByComment: false,
       partitionByNewLine: false,
@@ -94,6 +101,7 @@ const sortExports = createEslintRule({
     let options = complete(context.options.at(0), settings, {
       type: 'alphabetical',
       ignoreCase: true,
+      specialCharacters: 'keep',
       order: 'asc',
       matcher: 'minimatch',
       partitionByComment: false,