eslint-plugin-perfectionist 4.6.0 → 4.7.0

package/dist/index.js

@@ -29,7 +29,7 @@ let plugin = {
     'sort-named-imports': sortNamedImports,
     'sort-named-exports': sortNamedExports,
     'sort-object-types': sortObjectTypes.default,
-    'sort-union-types': sortUnionTypes,
+    'sort-union-types': sortUnionTypes.default,
     'sort-switch-case': sortSwitchCase,
     'sort-decorators': sortDecorators,
     'sort-interfaces': sortInterfaces,

package/dist/rules/sort-array-includes.js

@@ -4,7 +4,9 @@ Object.defineProperties(exports, {
   [Symbol.toStringTag]: { value: 'Module' },
 })
 const commonJsonSchemas = require('../utils/common-json-schemas.js')
+const validateNewlinesAndPartitionConfiguration = require('../utils/validate-newlines-and-partition-configuration.js')
 const validateGeneratedGroupsConfiguration = require('../utils/validate-generated-groups-configuration.js')
+const validateCustomSortConfiguration = require('../utils/validate-custom-sort-configuration.js')
 const types = require('./sort-array-includes/types.js')
 const getCustomGroupsCompareOptions = require('../utils/get-custom-groups-compare-options.js')
 const doesCustomGroupMatch = require('./sort-array-includes/does-custom-group-match.js')
@@ -12,28 +14,23 @@ const getMatchingContextOptions = require('../utils/get-matching-context-options
 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 hasPartitionComment = require('../utils/has-partition-comment.js')
-const createNodeIndexMap = require('../utils/create-node-index-map.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 getLinesBetween = require('../utils/get-lines-between.js')
-const getGroupNumber = require('../utils/get-group-number.js')
+const reportAllErrors = require('../utils/report-all-errors.js')
+const shouldPartition = require('../utils/should-partition.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 makeFixes = require('../utils/make-fixes.js')
 const useGroups = require('../utils/use-groups.js')
 const complete = require('../utils/complete.js')
-const pairwise = require('../utils/pairwise.js')
 let cachedGroupsByModifiersAndSelectors = /* @__PURE__ */ new Map()
 let defaultOptions = {
   groupKind: 'literals-first',
   specialCharacters: 'keep',
   partitionByComment: false,
   partitionByNewLine: false,
+  newlinesBetween: 'ignore',
   useConfigurationIf: {},
   type: 'alphabetical',
   ignoreCase: true,
@@ -46,11 +43,7 @@ let defaultOptions = {
 let jsonSchema = {
   items: {
     properties: {
-      partitionByComment: {
-        ...commonJsonSchemas.partitionByCommentJsonSchema,
-        description:
-          'Allows you to use comments to separate the array members into logical groups.',
-      },
+      ...commonJsonSchemas.commonJsonSchemas,
       groupKind: {
         enum: ['mixed', 'literals-first', 'spreads-first'],
         description: 'Specifies top-level groups.',
@@ -61,13 +54,10 @@ let jsonSchema = {
       }),
       useConfigurationIf: commonJsonSchemas.buildUseConfigurationIfJsonSchema(),
       type: commonJsonSchemas.buildTypeJsonSchema({ withUnsorted: true }),
+      partitionByComment: commonJsonSchemas.partitionByCommentJsonSchema,
       partitionByNewLine: commonJsonSchemas.partitionByNewLineJsonSchema,
-      specialCharacters: commonJsonSchemas.specialCharactersJsonSchema,
-      ignoreCase: commonJsonSchemas.ignoreCaseJsonSchema,
-      alphabet: commonJsonSchemas.alphabetJsonSchema,
-      locales: commonJsonSchemas.localesJsonSchema,
+      newlinesBetween: commonJsonSchemas.newlinesBetweenJsonSchema,
       groups: commonJsonSchemas.groupsJsonSchema,
-      order: commonJsonSchemas.orderJsonSchema,
     },
     additionalProperties: false,
     type: 'object',
@@ -90,6 +80,10 @@ const sortArrayIncludes = createEslintRule.createEslintRule({
             : node.object.arguments
         sortArray({
           availableMessageIds: {
+            missedSpacingBetweenMembers:
+              'missedSpacingBetweenArrayIncludesMembers',
+            extraSpacingBetweenMembers:
+              'extraSpacingBetweenArrayIncludesMembers',
             unexpectedGroupOrder: 'unexpectedArrayIncludesGroupOrder',
             unexpectedOrder: 'unexpectedArrayIncludesOrder',
           },
@@ -103,6 +97,10 @@ const sortArrayIncludes = createEslintRule.createEslintRule({
     messages: {
       unexpectedArrayIncludesGroupOrder:
         'Expected "{{right}}" ({{rightGroup}}) to come before "{{left}}" ({{leftGroup}}).',
+      missedSpacingBetweenArrayIncludesMembers:
+        'Missed spacing between "{{left}}" and "{{right}}" members.',
+      extraSpacingBetweenArrayIncludesMembers:
+        'Extra spacing between "{{left}}" and "{{right}}" members.',
       unexpectedArrayIncludesOrder:
         'Expected "{{right}}" to come before "{{left}}".',
     },
@@ -144,12 +142,16 @@ let sortArray = ({ availableMessageIds, elements, context }) => {
     ...completeOptions,
     type,
   }
+  validateCustomSortConfiguration.validateCustomSortConfiguration(options)
   validateGeneratedGroupsConfiguration.validateGeneratedGroupsConfiguration({
     customGroups: options.customGroups,
     selectors: types.allSelectors,
     groups: options.groups,
     modifiers: [],
   })
+  validateNewlinesAndPartitionConfiguration.validateNewlinesAndPartitionConfiguration(
+    options,
+  )
   let eslintDisabledLines = getEslintDisabledLines.getEslintDisabledLines({
     ruleName: context.id,
     sourceCode,
@@ -207,20 +209,12 @@ let sortArray = ({ availableMessageIds, elements, context }) => {
       let lastSortingNode =
         (_a = accumulator.at(-1)) == null ? void 0 : _a.at(-1)
       if (
-        hasPartitionComment.hasPartitionComment({
-          comments: getCommentsBefore.getCommentsBefore({
-            node: element,
-            sourceCode,
-          }),
-          partitionByComment: options.partitionByComment,
-        }) ||
-        (options.partitionByNewLine &&
-          lastSortingNode &&
-          getLinesBetween.getLinesBetween(
-            sourceCode,
-            lastSortingNode,
-            sortingNode,
-          ))
+        shouldPartition.shouldPartition({
+          lastSortingNode,
+          sortingNode,
+          sourceCode,
+          options,
+        })
       ) {
         accumulator.push([])
       }
@@ -244,7 +238,7 @@ let sortArray = ({ availableMessageIds, elements, context }) => {
           groupKind === 'any' || currentNode.groupKind === groupKind,
       ),
     )
-    let sortNodesIgnoringEslintDisabledNodes = ignoreEslintDisabledNodes =>
+    let sortNodesExcludingEslintDisabled = ignoreEslintDisabledNodes =>
       filteredGroupKindNodes.flatMap(groupedNodes =>
         sortNodesByGroups.sortNodesByGroups(groupedNodes, options, {
           getGroupCompareOptions: groupNumber =>
@@ -255,44 +249,13 @@ let sortArray = ({ availableMessageIds, elements, context }) => {
           ignoreEslintDisabledNodes,
         }),
       )
-    let sortedNodes = sortNodesIgnoringEslintDisabledNodes(false)
-    let sortedNodesExcludingEslintDisabled =
-      sortNodesIgnoringEslintDisabledNodes(true)
-    let nodeIndexMap = createNodeIndexMap.createNodeIndexMap(sortedNodes)
-    pairwise.pairwise(nodes, (left, right) => {
-      let leftIndex = nodeIndexMap.get(left)
-      let rightIndex = nodeIndexMap.get(right)
-      let leftNumber = getGroupNumber.getGroupNumber(options.groups, left)
-      let rightNumber = getGroupNumber.getGroupNumber(options.groups, right)
-      let indexOfRightExcludingEslintDisabled =
-        sortedNodesExcludingEslintDisabled.indexOf(right)
-      if (
-        leftIndex < rightIndex &&
-        leftIndex < indexOfRightExcludingEslintDisabled
-      ) {
-        return
-      }
-      context.report({
-        fix: fixer =>
-          makeFixes.makeFixes({
-            sortedNodes: sortedNodesExcludingEslintDisabled,
-            sourceCode,
-            options,
-            fixer,
-            nodes,
-          }),
-        data: {
-          right: toSingleLine.toSingleLine(right.name),
-          left: toSingleLine.toSingleLine(left.name),
-          rightGroup: right.group,
-          leftGroup: left.group,
-        },
-        messageId:
-          leftNumber === rightNumber
-            ? availableMessageIds.unexpectedOrder
-            : availableMessageIds.unexpectedGroupOrder,
-        node: right.node,
-      })
+    reportAllErrors.reportAllErrors({
+      sortNodesExcludingEslintDisabled,
+      availableMessageIds,
+      sourceCode,
+      options,
+      context,
+      nodes,
     })
   }
 }

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

@@ -26,10 +26,6 @@ let allModifiers = [
   'optional',
 ]
 let singleCustomGroupJsonSchema = {
-  elementValuePattern: {
-    description: 'Element value pattern filter for properties.',
-    type: 'string',
-  },
   decoratorNamePattern: {
     description: 'Decorator name pattern filter.',
     type: 'string',
@@ -37,6 +33,7 @@ let singleCustomGroupJsonSchema = {
   modifiers:
     commonJsonSchemas.buildCustomGroupModifiersJsonSchema(allModifiers),
   selector: commonJsonSchemas.buildCustomGroupSelectorJsonSchema(allSelectors),
+  elementValuePattern: commonJsonSchemas.elementValuePatternJsonSchema,
   elementNamePattern: commonJsonSchemas.elementNamePatternJsonSchema,
 }
 exports.allModifiers = allModifiers