eslint-plugin-perfectionist 3.6.0 → 3.8.0

package/dist/rules/sort-astro-attributes.js

@@ -1,18 +1,16 @@
 'use strict'
 const path = require('node:path')
 const validateGroupsConfiguration = require('../utils/validate-groups-configuration.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')
 const getSourceCode = require('../utils/get-source-code.js')
 const rangeToDiff = require('../utils/range-to-diff.js')
 const getSettings = require('../utils/get-settings.js')
-const isPositive = require('../utils/is-positive.js')
 const useGroups = require('../utils/use-groups.js')
 const makeFixes = require('../utils/make-fixes.js')
-const sortNodes = require('../utils/sort-nodes.js')
 const pairwise = require('../utils/pairwise.js')
 const complete = require('../utils/complete.js')
-const compare = require('../utils/compare.js')
 const sortAstroAttributes = createEslintRule.createEslintRule({
   name: 'sort-astro-attributes',
   meta: {
@@ -36,6 +34,11 @@ const sortAstroAttributes = createEslintRule.createEslintRule({
             type: 'string',
             enum: ['asc', 'desc'],
           },
+          matcher: {
+            description: 'Specifies the string matcher.',
+            type: 'string',
+            enum: ['minimatch', 'regex'],
+          },
           ignoreCase: {
             description:
               'Controls whether sorting should be case-sensitive or not.',
@@ -91,6 +94,7 @@ const sortAstroAttributes = createEslintRule.createEslintRule({
       type: 'alphabetical',
       order: 'asc',
       ignoreCase: true,
+      matcher: 'minimatch',
       groups: [],
       customGroups: {},
     },
@@ -108,6 +112,7 @@ const sortAstroAttributes = createEslintRule.createEslintRule({
           let options = complete.complete(context.options.at(0), settings, {
             type: 'alphabetical',
             ignoreCase: true,
+            matcher: 'minimatch',
             customGroups: {},
             order: 'asc',
             groups: [],
@@ -129,7 +134,7 @@ const sortAstroAttributes = createEslintRule.createEslintRule({
                   ? attribute.name.name
                   : sourceCode.text.slice(...attribute.name.range)
               let { getGroup, defineGroup, setCustomGroups } =
-                useGroups.useGroups(options.groups)
+                useGroups.useGroups(options)
               setCustomGroups(options.customGroups, name)
               if (attribute.type === 'AstroShorthandAttribute') {
                 defineGroup('astro-shorthand')
@@ -152,17 +157,22 @@ const sortAstroAttributes = createEslintRule.createEslintRule({
             [[]],
           )
           for (let nodes of parts) {
+            let sortedNodes = sortNodesByGroups.sortNodesByGroups(
+              nodes,
+              options,
+            )
             pairwise.pairwise(nodes, (left, right) => {
-              let leftNum = getGroupNumber.getGroupNumber(options.groups, left)
-              let rightNum = getGroupNumber.getGroupNumber(
-                options.groups,
-                right,
-              )
-              if (
-                leftNum > rightNum ||
-                (leftNum === rightNum &&
-                  isPositive.isPositive(compare.compare(left, right, options)))
-              ) {
+              let indexOfLeft = sortedNodes.indexOf(left)
+              let indexOfRight = sortedNodes.indexOf(right)
+              if (indexOfLeft > indexOfRight) {
+                let leftNum = getGroupNumber.getGroupNumber(
+                  options.groups,
+                  left,
+                )
+                let rightNum = getGroupNumber.getGroupNumber(
+                  options.groups,
+                  right,
+                )
                 context.report({
                   messageId:
                     leftNum !== rightNum
@@ -175,37 +185,8 @@ const sortAstroAttributes = createEslintRule.createEslintRule({
                     rightGroup: right.group,
                   },
                   node: right.node,
-                  fix: fixer => {
-                    let grouped = {}
-                    for (let currentNode of nodes) {
-                      let groupNum = getGroupNumber.getGroupNumber(
-                        options.groups,
-                        currentNode,
-                      )
-                      if (!(groupNum in grouped)) {
-                        grouped[groupNum] = [currentNode]
-                      } else {
-                        grouped[groupNum] = sortNodes.sortNodes(
-                          [...grouped[groupNum], currentNode],
-                          options,
-                        )
-                      }
-                    }
-                    let sortedNodes = []
-                    for (let group of Object.keys(grouped).sort(
-                      (a, b) => Number(a) - Number(b),
-                    )) {
-                      sortedNodes.push(
-                        ...sortNodes.sortNodes(grouped[group], options),
-                      )
-                    }
-                    return makeFixes.makeFixes(
-                      fixer,
-                      nodes,
-                      sortedNodes,
-                      sourceCode,
-                    )
-                  },
+                  fix: fixer =>
+                    makeFixes.makeFixes(fixer, nodes, sortedNodes, sourceCode),
                 })
               }
             })

package/dist/rules/sort-astro-attributes.mjs

@@ -1,17 +1,15 @@
 import path from 'node:path'
 import { validateGroupsConfiguration } from '../utils/validate-groups-configuration.mjs'
+import { sortNodesByGroups } from '../utils/sort-nodes-by-groups.mjs'
 import { createEslintRule } from '../utils/create-eslint-rule.mjs'
 import { getGroupNumber } from '../utils/get-group-number.mjs'
 import { getSourceCode } from '../utils/get-source-code.mjs'
 import { rangeToDiff } from '../utils/range-to-diff.mjs'
 import { getSettings } from '../utils/get-settings.mjs'
-import { isPositive } from '../utils/is-positive.mjs'
 import { useGroups } from '../utils/use-groups.mjs'
 import { makeFixes } from '../utils/make-fixes.mjs'
-import { sortNodes } from '../utils/sort-nodes.mjs'
 import { pairwise } from '../utils/pairwise.mjs'
 import { complete } from '../utils/complete.mjs'
-import { compare } from '../utils/compare.mjs'
 const sortAstroAttributes = createEslintRule({
   name: 'sort-astro-attributes',
   meta: {
@@ -35,6 +33,11 @@ const sortAstroAttributes = createEslintRule({
             type: 'string',
             enum: ['asc', 'desc'],
           },
+          matcher: {
+            description: 'Specifies the string matcher.',
+            type: 'string',
+            enum: ['minimatch', 'regex'],
+          },
           ignoreCase: {
             description:
               'Controls whether sorting should be case-sensitive or not.',
@@ -90,6 +93,7 @@ const sortAstroAttributes = createEslintRule({
       type: 'alphabetical',
       order: 'asc',
       ignoreCase: true,
+      matcher: 'minimatch',
       groups: [],
       customGroups: {},
     },
@@ -107,6 +111,7 @@ const sortAstroAttributes = createEslintRule({
           let options = complete(context.options.at(0), settings, {
             type: 'alphabetical',
             ignoreCase: true,
+            matcher: 'minimatch',
             customGroups: {},
             order: 'asc',
             groups: [],
@@ -127,9 +132,8 @@ const sortAstroAttributes = createEslintRule({
                 typeof attribute.name.name === 'string'
                   ? attribute.name.name
                   : sourceCode.text.slice(...attribute.name.range)
-              let { getGroup, defineGroup, setCustomGroups } = useGroups(
-                options.groups,
-              )
+              let { getGroup, defineGroup, setCustomGroups } =
+                useGroups(options)
               setCustomGroups(options.customGroups, name)
               if (attribute.type === 'AstroShorthandAttribute') {
                 defineGroup('astro-shorthand')
@@ -152,14 +156,13 @@ const sortAstroAttributes = createEslintRule({
             [[]],
           )
           for (let nodes of parts) {
+            let sortedNodes = sortNodesByGroups(nodes, options)
             pairwise(nodes, (left, right) => {
-              let leftNum = getGroupNumber(options.groups, left)
-              let rightNum = getGroupNumber(options.groups, right)
-              if (
-                leftNum > rightNum ||
-                (leftNum === rightNum &&
-                  isPositive(compare(left, right, options)))
-              ) {
+              let indexOfLeft = sortedNodes.indexOf(left)
+              let indexOfRight = sortedNodes.indexOf(right)
+              if (indexOfLeft > indexOfRight) {
+                let leftNum = getGroupNumber(options.groups, left)
+                let rightNum = getGroupNumber(options.groups, right)
                 context.report({
                   messageId:
                     leftNum !== rightNum
@@ -172,27 +175,8 @@ const sortAstroAttributes = createEslintRule({
                     rightGroup: right.group,
                   },
                   node: right.node,
-                  fix: fixer => {
-                    let grouped = {}
-                    for (let currentNode of nodes) {
-                      let groupNum = getGroupNumber(options.groups, currentNode)
-                      if (!(groupNum in grouped)) {
-                        grouped[groupNum] = [currentNode]
-                      } else {
-                        grouped[groupNum] = sortNodes(
-                          [...grouped[groupNum], currentNode],
-                          options,
-                        )
-                      }
-                    }
-                    let sortedNodes = []
-                    for (let group of Object.keys(grouped).sort(
-                      (a, b) => Number(a) - Number(b),
-                    )) {
-                      sortedNodes.push(...sortNodes(grouped[group], options))
-                    }
-                    return makeFixes(fixer, nodes, sortedNodes, sourceCode)
-                  },
+                  fix: fixer =>
+                    makeFixes(fixer, nodes, sortedNodes, sourceCode),
                 })
               }
             })

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

@@ -1,6 +1,6 @@
 'use strict'
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' })
-const minimatch = require('minimatch')
+const matches = require('../utils/matches.js')
 const cachedGroupsByModifiersAndSelectors = /* @__PURE__ */ new Map()
 const generateOfficialGroups = (modifiers, selectors) => {
   let modifiersAndSelectorsKey = modifiers.join('&') + '/' + selectors.join('&')
@@ -119,12 +119,10 @@ const customGroupMatches = props => {
     'elementNamePattern' in props.customGroup &&
     props.customGroup.elementNamePattern
   ) {
-    let matchesElementNamePattern = minimatch.minimatch(
+    let matchesElementNamePattern = matches.matches(
       props.elementName,
       props.customGroup.elementNamePattern,
-      {
-        nocomment: true,
-      },
+      props.matcher,
     )
     if (!matchesElementNamePattern) {
       return false
@@ -136,9 +134,7 @@ const customGroupMatches = props => {
   ) {
     let decoratorPattern = props.customGroup.decoratorNamePattern
     let matchesDecoratorNamePattern = props.decorators.some(decorator =>
-      minimatch.minimatch(decorator, decoratorPattern, {
-        nocomment: true,
-      }),
+      matches.matches(decorator, decoratorPattern, props.matcher),
     )
     if (!matchesDecoratorNamePattern) {
       return false

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

@@ -1,4 +1,4 @@
-import { minimatch } from 'minimatch'
+import { matches } from '../utils/matches.mjs'
 const cachedGroupsByModifiersAndSelectors = /* @__PURE__ */ new Map()
 const generateOfficialGroups = (modifiers, selectors) => {
   let modifiersAndSelectorsKey = modifiers.join('&') + '/' + selectors.join('&')
@@ -117,12 +117,10 @@ const customGroupMatches = props => {
     'elementNamePattern' in props.customGroup &&
     props.customGroup.elementNamePattern
   ) {
-    let matchesElementNamePattern = minimatch(
+    let matchesElementNamePattern = matches(
       props.elementName,
       props.customGroup.elementNamePattern,
-      {
-        nocomment: true,
-      },
+      props.matcher,
     )
     if (!matchesElementNamePattern) {
       return false
@@ -134,9 +132,7 @@ const customGroupMatches = props => {
   ) {
     let decoratorPattern = props.customGroup.decoratorNamePattern
     let matchesDecoratorNamePattern = props.decorators.some(decorator =>
-      minimatch(decorator, decoratorPattern, {
-        nocomment: true,
-      }),
+      matches(decorator, decoratorPattern, props.matcher),
     )
     if (!matchesDecoratorNamePattern) {
       return false

package/dist/rules/sort-classes.js

@@ -38,6 +38,11 @@ const sortClasses = createEslintRule.createEslintRule({
             type: 'string',
             enum: ['asc', 'desc'],
           },
+          matcher: {
+            description: 'Specifies the string matcher.',
+            type: 'string',
+            enum: ['minimatch', 'regex'],
+          },
           ignoreCase: {
             description:
               'Controls whether sorting should be case-sensitive or not.',
@@ -45,7 +50,7 @@ const sortClasses = createEslintRule.createEslintRule({
           },
           partitionByComment: {
             description:
-              'Allows to use comments to separate the nodes into logical groups.',
+              'Allows to use comments to separate the class members into logical groups.',
             anyOf: [
               {
                 type: 'array',
@@ -145,6 +150,8 @@ const sortClasses = createEslintRule.createEslintRule({
       unexpectedClassesGroupOrder:
         'Expected "{{right}}" ({{rightGroup}}) to come before "{{left}}" ({{leftGroup}}).',
       unexpectedClassesOrder: 'Expected "{{right}}" to come before "{{left}}".',
+      unexpectedClassesDependencyOrder:
+        'Expected dependency "{{right}}" to come before "{{nodeDependentOnRight}}".',
     },
   },
   defaultOptions: [
@@ -152,6 +159,7 @@ const sortClasses = createEslintRule.createEslintRule({
       type: 'alphabetical',
       order: 'asc',
       ignoreCase: true,
+      matcher: 'minimatch',
       partitionByComment: false,
       groups: [
         'index-signature',
@@ -192,6 +200,7 @@ const sortClasses = createEslintRule.createEslintRule({
             ['get-method', 'set-method'],
             'unknown',
           ],
+          matcher: 'minimatch',
           partitionByComment: false,
           type: 'alphabetical',
           ignoreCase: true,
@@ -320,6 +329,7 @@ const sortClasses = createEslintRule.createEslintRule({
               isPartitionComment.hasPartitionComment(
                 options.partitionByComment,
                 comments,
+                options.matcher,
               )
             ) {
               accumulator.push([])
@@ -327,7 +337,7 @@ const sortClasses = createEslintRule.createEslintRule({
             let name
             let dependencies = []
             let { getGroup, defineGroup, setCustomGroups } =
-              useGroups.useGroups(options.groups)
+              useGroups.useGroups(options)
             if (member.type === 'StaticBlock') {
               name = 'static'
             } else if (member.type === 'TSIndexSignature') {
@@ -337,12 +347,10 @@ const sortClasses = createEslintRule.createEslintRule({
                   ? void 0
                   : _a2.range.at(0)) ?? member.range.at(1),
               )
+            } else if (member.key.type === 'Identifier') {
+              ;({ name } = member.key)
             } else {
-              if (member.key.type === 'Identifier') {
-                ;({ name } = member.key)
-              } else {
-                name = sourceCode.text.slice(...member.key.range)
-              }
+              name = sourceCode.text.slice(...member.key.range)
             }
             let isPrivateHash =
               'key' in member && member.key.type === 'PrivateIdentifier'
@@ -495,6 +503,7 @@ const sortClasses = createEslintRule.createEslintRule({
                     modifiers,
                     selectors,
                     decorators,
+                    matcher: options.matcher,
                   })
                 ) {
                   defineGroup(customGroup.groupName, true)
@@ -532,10 +541,11 @@ const sortClasses = createEslintRule.createEslintRule({
           },
           [[]],
         )
-        for (let nodes of formattedNodes) {
+        let sortedNodes = []
+        for (let nodes2 of formattedNodes) {
           let nodesByNonIgnoredGroupNumber = {}
           let ignoredNodeIndices = []
-          for (let [index, sortingNode] of nodes.entries()) {
+          for (let [index, sortingNode] of nodes2.entries()) {
             let groupNum = getGroupNumber.getGroupNumber(
               options.groups,
               sortingNode,
@@ -548,7 +558,6 @@ const sortClasses = createEslintRule.createEslintRule({
               nodesByNonIgnoredGroupNumber[groupNum] ?? []
             nodesByNonIgnoredGroupNumber[groupNum].push(sortingNode)
           }
-          let sortedNodes = []
           for (let groupNumber of Object.keys(
             nodesByNonIgnoredGroupNumber,
           ).sort((a, b) => Number(a) - Number(b))) {
@@ -570,39 +579,59 @@ const sortClasses = createEslintRule.createEslintRule({
             }
           }
           for (let ignoredIndex of ignoredNodeIndices) {
-            sortedNodes.splice(ignoredIndex, 0, nodes[ignoredIndex])
+            sortedNodes.splice(ignoredIndex, 0, nodes2[ignoredIndex])
           }
-          sortedNodes =
-            sortNodesByDependencies.sortNodesByDependencies(sortedNodes)
-          pairwise.pairwise(nodes, (left, right) => {
-            let leftNum = getGroupNumber.getGroupNumber(options.groups, left)
-            let rightNum = getGroupNumber.getGroupNumber(options.groups, right)
-            let isLeftOrRightIgnored =
-              leftNum === options.groups.length ||
-              rightNum === options.groups.length
-            let indexOfLeft = sortedNodes.indexOf(left)
-            let indexOfRight = sortedNodes.indexOf(right)
-            if (!isLeftOrRightIgnored && indexOfLeft > indexOfRight) {
-              context.report({
-                messageId:
-                  leftNum !== rightNum
-                    ? 'unexpectedClassesGroupOrder'
-                    : 'unexpectedClassesOrder',
-                data: {
-                  left: toSingleLine.toSingleLine(left.name),
-                  leftGroup: left.group,
-                  right: toSingleLine.toSingleLine(right.name),
-                  rightGroup: right.group,
-                },
-                node: right.node,
-                fix: fixer =>
-                  makeFixes.makeFixes(fixer, nodes, sortedNodes, sourceCode, {
-                    partitionComment: options.partitionByComment,
-                  }),
-              })
-            }
-          })
         }
+        sortedNodes =
+          sortNodesByDependencies.sortNodesByDependencies(sortedNodes)
+        let nodes = formattedNodes.flat()
+        pairwise.pairwise(nodes, (left, right) => {
+          let leftNum = getGroupNumber.getGroupNumber(options.groups, left)
+          let rightNum = getGroupNumber.getGroupNumber(options.groups, right)
+          let indexOfLeft = sortedNodes.indexOf(left)
+          let indexOfRight = sortedNodes.indexOf(right)
+          let firstUnorderedNodeDependentOnRight =
+            sortNodesByDependencies.getFirstUnorderedNodeDependentOn(
+              right,
+              nodes,
+            )
+          if (
+            firstUnorderedNodeDependentOnRight ||
+            indexOfLeft > indexOfRight
+          ) {
+            let messageId
+            if (firstUnorderedNodeDependentOnRight) {
+              messageId = 'unexpectedClassesDependencyOrder'
+            } else {
+              messageId =
+                leftNum !== rightNum
+                  ? 'unexpectedClassesGroupOrder'
+                  : 'unexpectedClassesOrder'
+            }
+            context.report({
+              messageId,
+              data: {
+                left: toSingleLine.toSingleLine(left.name),
+                leftGroup: left.group,
+                right: toSingleLine.toSingleLine(right.name),
+                rightGroup: right.group,
+                nodeDependentOnRight:
+                  firstUnorderedNodeDependentOnRight == null
+                    ? void 0
+                    : firstUnorderedNodeDependentOnRight.name,
+              },
+              node: right.node,
+              fix: fixer =>
+                makeFixes.makeFixes(
+                  fixer,
+                  nodes,
+                  sortedNodes,
+                  sourceCode,
+                  options,
+                ),
+            })
+          }
+        })
       }
     },
   }),