eslint-plugin-perfectionist 4.1.1 → 4.2.0

package/dist/rules/sort-modules.js

@@ -1,13 +1,12 @@
 'use strict'
 const utils = require('@typescript-eslint/utils')
-const isSortable = require('utils/is-sortable')
 const commonJsonSchemas = require('../utils/common-json-schemas.js')
-const sortModules_types = require('./sort-modules.types.js')
 const sortNodesByDependencies = require('../utils/sort-nodes-by-dependencies.js')
 const validateNewlinesAndPartitionConfiguration = require('../utils/validate-newlines-and-partition-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 generatePredefinedGroups = require('../utils/generate-predefined-groups.js')
-const sortModulesUtils = require('./sort-modules-utils.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')
@@ -20,10 +19,12 @@ const createEslintRule = require('../utils/create-eslint-rule.js')
 const getLinesBetween = require('../utils/get-lines-between.js')
 const getGroupNumber = require('../utils/get-group-number.js')
 const getEnumMembers = require('../utils/get-enum-members.js')
+const sortModulesUtils = require('./sort-modules-utils.js')
 const getSourceCode = require('../utils/get-source-code.js')
 const toSingleLine = require('../utils/to-single-line.js')
 const rangeToDiff = require('../utils/range-to-diff.js')
 const getSettings = require('../utils/get-settings.js')
+const isSortable = require('../utils/is-sortable.js')
 const useGroups = require('../utils/use-groups.js')
 const makeFixes = require('../utils/make-fixes.js')
 const complete = require('../utils/complete.js')
@@ -59,49 +60,15 @@ const sortModules = createEslintRule.createEslintRule({
     schema: [
       {
         properties: {
-          customGroups: {
-            items: {
-              oneOf: [
-                {
-                  properties: {
-                    ...sortModules_types.customGroupNameJsonSchema,
-                    ...sortModules_types.customGroupSortJsonSchema,
-                    anyOf: {
-                      items: {
-                        properties: {
-                          ...sortModules_types.singleCustomGroupJsonSchema,
-                        },
-                        description: 'Custom group.',
-                        additionalProperties: false,
-                        type: 'object',
-                      },
-                      type: 'array',
-                    },
-                  },
-                  description: 'Custom group block.',
-                  additionalProperties: false,
-                  type: 'object',
-                },
-                {
-                  properties: {
-                    ...sortModules_types.customGroupNameJsonSchema,
-                    ...sortModules_types.customGroupSortJsonSchema,
-                    ...sortModules_types.singleCustomGroupJsonSchema,
-                  },
-                  description: 'Custom group.',
-                  additionalProperties: false,
-                  type: 'object',
-                },
-              ],
-            },
-            description: 'Specifies custom groups.',
-            type: 'array',
-          },
           partitionByComment: {
             ...commonJsonSchemas.partitionByCommentJsonSchema,
             description:
               'Allows to use comments to separate the modules members into logical groups.',
           },
+          customGroups: commonJsonSchemas.buildCustomGroupsArrayJsonSchema({
+            singleCustomGroupJsonSchema:
+              sortModules_types.singleCustomGroupJsonSchema,
+          }),
           partitionByNewLine: commonJsonSchemas.partitionByNewLineJsonSchema,
           specialCharacters: commonJsonSchemas.specialCharactersJsonSchema,
           newlinesBetween: commonJsonSchemas.newlinesBetweenJsonSchema,
@@ -327,7 +294,6 @@ let analyzeModule = ({
       node,
       name,
     }
-    let comments = getCommentsBefore.getCommentsBefore(node, sourceCode)
     let lastSortingNode =
       (_a = formattedNodes.at(-1)) == null ? void 0 : _a.at(-1)
     if (
@@ -341,7 +307,10 @@ let analyzeModule = ({
       (options.partitionByComment &&
         isPartitionComment.hasPartitionComment(
           options.partitionByComment,
-          comments,
+          getCommentsBefore.getCommentsBefore({
+            sourceCode,
+            node,
+          }),
         ))
     ) {
       formattedNodes.push([])
@@ -356,7 +325,10 @@ let analyzeModule = ({
             getGroupNumber.getGroupNumber(options.groups, sortingNode) ===
             options.groups.length,
           getGroupCompareOptions: groupNumber =>
-            sortModulesUtils.getCompareOptions(options, groupNumber),
+            getCustomGroupsCompareOptions.getCustomGroupsCompareOptions(
+              options,
+              groupNumber,
+            ),
           ignoreEslintDisabledNodes,
         }),
       ),

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

@@ -1,5 +1,6 @@
 'use strict'
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' })
+const commonJsonSchemas = require('../utils/common-json-schemas.js')
 let allSelectors = [
   'enum',
   'function',
@@ -10,53 +11,16 @@ let allSelectors = [
   'class',
 ]
 let allModifiers = ['async', 'declare', 'decorated', 'default', 'export']
-let customGroupSortJsonSchema = {
-  type: {
-    enum: ['alphabetical', 'line-length', 'natural', 'unsorted'],
-    description: 'Custom group sort type.',
-    type: 'string',
-  },
-  order: {
-    description: 'Custom group sort order.',
-    enum: ['desc', 'asc'],
-    type: 'string',
-  },
-}
-let customGroupNameJsonSchema = {
-  groupName: {
-    description: 'Custom group name.',
-    type: 'string',
-  },
-}
 let singleCustomGroupJsonSchema = {
-  modifiers: {
-    items: {
-      enum: allModifiers,
-      type: 'string',
-    },
-    description: 'Modifier filters.',
-    type: 'array',
-  },
-  elementValuePattern: {
-    description: 'Element value pattern filter for properties.',
-    type: 'string',
-  },
   decoratorNamePattern: {
     description: 'Decorator name pattern filter.',
     type: 'string',
   },
-  selector: {
-    description: 'Selector filter.',
-    enum: allSelectors,
-    type: 'string',
-  },
-  elementNamePattern: {
-    description: 'Element name pattern filter.',
-    type: 'string',
-  },
+  modifiers:
+    commonJsonSchemas.buildCustomGroupModifiersJsonSchema(allModifiers),
+  selector: commonJsonSchemas.buildCustomGroupSelectorJsonSchema(allSelectors),
+  elementNamePattern: commonJsonSchemas.elementNamePatternJsonSchema,
 }
 exports.allModifiers = allModifiers
 exports.allSelectors = allSelectors
-exports.customGroupNameJsonSchema = customGroupNameJsonSchema
-exports.customGroupSortJsonSchema = customGroupSortJsonSchema
 exports.singleCustomGroupJsonSchema = singleCustomGroupJsonSchema

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

@@ -67,7 +67,10 @@ const sortNamedExports = createEslintRule.createEslintRule({
           (options.partitionByComment &&
             isPartitionComment.hasPartitionComment(
               options.partitionByComment,
-              getCommentsBefore.getCommentsBefore(specifier, sourceCode),
+              getCommentsBefore.getCommentsBefore({
+                node: specifier,
+                sourceCode,
+              }),
             )) ||
           (options.partitionByNewLine &&
             lastSortingNode &&

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

@@ -76,7 +76,10 @@ const sortNamedImports = createEslintRule.createEslintRule({
           (options.partitionByComment &&
             isPartitionComment.hasPartitionComment(
               options.partitionByComment,
-              getCommentsBefore.getCommentsBefore(specifier, sourceCode),
+              getCommentsBefore.getCommentsBefore({
+                node: specifier,
+                sourceCode,
+              }),
             )) ||
           (options.partitionByNewLine &&
             lastSortingNode &&

package/dist/rules/sort-object-types-utils.js

@@ -0,0 +1,37 @@
+'use strict'
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' })
+const matches = require('../utils/matches.js')
+let customGroupMatches = props => {
+  if ('anyOf' in props.customGroup) {
+    return props.customGroup.anyOf.some(subgroup =>
+      customGroupMatches({ ...props, customGroup: subgroup }),
+    )
+  }
+  if (
+    props.customGroup.selector &&
+    !props.selectors.includes(props.customGroup.selector)
+  ) {
+    return false
+  }
+  if (props.customGroup.modifiers) {
+    for (let modifier of props.customGroup.modifiers) {
+      if (!props.modifiers.includes(modifier)) {
+        return false
+      }
+    }
+  }
+  if (
+    'elementNamePattern' in props.customGroup &&
+    props.customGroup.elementNamePattern
+  ) {
+    let matchesElementNamePattern = matches.matches(
+      props.elementName,
+      props.customGroup.elementNamePattern,
+    )
+    if (!matchesElementNamePattern) {
+      return false
+    }
+  }
+  return true
+}
+exports.customGroupMatches = customGroupMatches