eslint-plugin-perfectionist 3.3.0 → 3.4.0

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

@@ -1,4 +1,5 @@
 'use strict'
+const validateGroupsConfiguration = require('../utils/validate-groups-configuration.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')
@@ -83,6 +84,25 @@ const sortUnionTypes = createEslintRule.createEslintRule({
         order: 'asc',
         groups: [],
       })
+      validateGroupsConfiguration.validateGroupsConfiguration(
+        options.groups,
+        [
+          'intersection',
+          'conditional',
+          'function',
+          'operator',
+          'keyword',
+          'literal',
+          'nullish',
+          'unknown',
+          'import',
+          'object',
+          'named',
+          'tuple',
+          'union',
+        ],
+        [],
+      )
       let sourceCode = getSourceCode.getSourceCode(context)
       let nodes = node.types.map(type => {
         let { getGroup, defineGroup } = useGroups.useGroups(options.groups)

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

@@ -1,3 +1,4 @@
+import { validateGroupsConfiguration } from '../utils/validate-groups-configuration.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'
@@ -82,6 +83,25 @@ const sortUnionTypes = createEslintRule({
         order: 'asc',
         groups: [],
       })
+      validateGroupsConfiguration(
+        options.groups,
+        [
+          'intersection',
+          'conditional',
+          'function',
+          'operator',
+          'keyword',
+          'literal',
+          'nullish',
+          'unknown',
+          'import',
+          'object',
+          'named',
+          'tuple',
+          'union',
+        ],
+        [],
+      )
       let sourceCode = getSourceCode(context)
       let nodes = node.types.map(type => {
         let { getGroup, defineGroup } = useGroups(options.groups)

package/dist/rules/sort-variable-declarations.js

@@ -1,15 +1,14 @@
 'use strict'
+const sortNodesByDependencies = require('../utils/sort-nodes-by-dependencies.js')
 const createEslintRule = require('../utils/create-eslint-rule.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 isPositive = require('../utils/is-positive.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')
-const compare = require('../utils/compare.js')
 const sortVariableDeclarations = createEslintRule.createEslintRule({
   name: 'sort-variable-declarations',
   meta: {
@@ -118,8 +117,13 @@ const sortVariableDeclarations = createEslintRule.createEslintRule({
             name,
           }
         })
+        let sortedNodes = sortNodesByDependencies.sortNodesByDependencies(
+          sortNodes.sortNodes(nodes, options),
+        )
         pairwise.pairwise(nodes, (left, right) => {
-          if (isPositive.isPositive(compare.compare(left, right, options))) {
+          let indexOfLeft = sortedNodes.indexOf(left)
+          let indexOfRight = sortedNodes.indexOf(right)
+          if (indexOfLeft > indexOfRight) {
             context.report({
               messageId: 'unexpectedVariableDeclarationsOrder',
               data: {
@@ -128,12 +132,7 @@ const sortVariableDeclarations = createEslintRule.createEslintRule({
               },
               node: right.node,
               fix: fixer =>
-                makeFixes.makeFixes(
-                  fixer,
-                  nodes,
-                  sortNodes.sortNodes(nodes, options),
-                  sourceCode,
-                ),
+                makeFixes.makeFixes(fixer, nodes, sortedNodes, sourceCode),
             })
           }
         })

package/dist/rules/sort-variable-declarations.mjs

@@ -1,14 +1,13 @@
+import { sortNodesByDependencies } from '../utils/sort-nodes-by-dependencies.mjs'
 import { createEslintRule } from '../utils/create-eslint-rule.mjs'
 import { getSourceCode } from '../utils/get-source-code.mjs'
 import { toSingleLine } from '../utils/to-single-line.mjs'
 import { rangeToDiff } from '../utils/range-to-diff.mjs'
 import { getSettings } from '../utils/get-settings.mjs'
-import { isPositive } from '../utils/is-positive.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'
-import { compare } from '../utils/compare.mjs'
 const sortVariableDeclarations = createEslintRule({
   name: 'sort-variable-declarations',
   meta: {
@@ -117,8 +116,11 @@ const sortVariableDeclarations = createEslintRule({
             name,
           }
         })
+        let sortedNodes = sortNodesByDependencies(sortNodes(nodes, options))
         pairwise(nodes, (left, right) => {
-          if (isPositive(compare(left, right, options))) {
+          let indexOfLeft = sortedNodes.indexOf(left)
+          let indexOfRight = sortedNodes.indexOf(right)
+          if (indexOfLeft > indexOfRight) {
             context.report({
               messageId: 'unexpectedVariableDeclarationsOrder',
               data: {
@@ -126,8 +128,7 @@ const sortVariableDeclarations = createEslintRule({
                 right: toSingleLine(right.name),
               },
               node: right.node,
-              fix: fixer =>
-                makeFixes(fixer, nodes, sortNodes(nodes, options), sourceCode),
+              fix: fixer => makeFixes(fixer, nodes, sortedNodes, sourceCode),
             })
           }
         })

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

@@ -1,5 +1,6 @@
 'use strict'
 const path = require('node:path')
+const validateGroupsConfiguration = require('../utils/validate-groups-configuration.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')
@@ -111,6 +112,11 @@ const sortVueAttributes = createEslintRule.createEslintRule({
             order: 'asc',
             groups: [],
           })
+          validateGroupsConfiguration.validateGroupsConfiguration(
+            options.groups,
+            ['multiline', 'shorthand', 'unknown'],
+            Object.keys(options.customGroups),
+          )
           let parts = node.attributes.reduce(
             (accumulator, attribute) => {
               if (

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

@@ -1,4 +1,5 @@
 import path from 'node:path'
+import { validateGroupsConfiguration } from '../utils/validate-groups-configuration.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'
@@ -110,6 +111,11 @@ const sortVueAttributes = createEslintRule({
             order: 'asc',
             groups: [],
           })
+          validateGroupsConfiguration(
+            options.groups,
+            ['multiline', 'shorthand', 'unknown'],
+            Object.keys(options.customGroups),
+          )
           let parts = node.attributes.reduce(
             (accumulator, attribute) => {
               if (

package/dist/utils/compare.js

@@ -2,12 +2,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' })
 const naturalCompare = require('natural-compare-lite')
 let compare = (a, b, options) => {
-  var _a, _b
-  if ((_a = b.dependencies) == null ? void 0 : _a.includes(a.name)) {
-    return -1
-  } else if ((_b = a.dependencies) == null ? void 0 : _b.includes(b.name)) {
-    return 1
-  }
   let orderCoefficient = options.order === 'asc' ? 1 : -1
   let sortingFunction
   let formatString =

package/dist/utils/compare.mjs

@@ -1,11 +1,5 @@
 import naturalCompare from 'natural-compare-lite'
 let compare = (a, b, options) => {
-  var _a, _b
-  if ((_a = b.dependencies) == null ? void 0 : _a.includes(a.name)) {
-    return -1
-  } else if ((_b = a.dependencies) == null ? void 0 : _b.includes(b.name)) {
-    return 1
-  }
   let orderCoefficient = options.order === 'asc' ? 1 : -1
   let sortingFunction
   let formatString =

package/dist/utils/sort-nodes-by-dependencies.js

@@ -0,0 +1,30 @@
+'use strict'
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' })
+let sortNodesByDependencies = nodes => {
+  let result = []
+  let visitedNodes = /* @__PURE__ */ new Set()
+  let inProcessNodes = /* @__PURE__ */ new Set()
+  let visitNode = node => {
+    if (visitedNodes.has(node)) {
+      return
+    }
+    if (inProcessNodes.has(node)) {
+      return
+    }
+    inProcessNodes.add(node)
+    let dependentNodes = nodes.filter(n =>
+      node.dependencies.includes(n.dependencyName ?? n.name),
+    )
+    for (let dependentNode of dependentNodes) {
+      visitNode(dependentNode)
+    }
+    visitedNodes.add(node)
+    inProcessNodes.delete(node)
+    result.push(node)
+  }
+  for (let node of nodes) {
+    visitNode(node)
+  }
+  return result
+}
+exports.sortNodesByDependencies = sortNodesByDependencies

package/dist/utils/sort-nodes-by-dependencies.mjs

@@ -0,0 +1,28 @@
+let sortNodesByDependencies = nodes => {
+  let result = []
+  let visitedNodes = /* @__PURE__ */ new Set()
+  let inProcessNodes = /* @__PURE__ */ new Set()
+  let visitNode = node => {
+    if (visitedNodes.has(node)) {
+      return
+    }
+    if (inProcessNodes.has(node)) {
+      return
+    }
+    inProcessNodes.add(node)
+    let dependentNodes = nodes.filter(n =>
+      node.dependencies.includes(n.dependencyName ?? n.name),
+    )
+    for (let dependentNode of dependentNodes) {
+      visitNode(dependentNode)
+    }
+    visitedNodes.add(node)
+    inProcessNodes.delete(node)
+    result.push(node)
+  }
+  for (let node of nodes) {
+    visitNode(node)
+  }
+  return result
+}
+export { sortNodesByDependencies }

package/dist/utils/validate-groups-configuration.js

@@ -0,0 +1,19 @@
+'use strict'
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' })
+let validateGroupsConfiguration = (
+  groups,
+  allowedPredefinedGroups,
+  allowedCustomGroups,
+) => {
+  let allowedGroupsSet = /* @__PURE__ */ new Set([
+    ...allowedPredefinedGroups,
+    ...allowedCustomGroups,
+  ])
+  let invalidGroups = groups
+    .flat()
+    .filter(group => !allowedGroupsSet.has(group))
+  if (invalidGroups.length) {
+    throw new Error('Invalid group(s): ' + invalidGroups.join(', '))
+  }
+}
+exports.validateGroupsConfiguration = validateGroupsConfiguration

package/dist/utils/validate-groups-configuration.mjs

@@ -0,0 +1,17 @@
+let validateGroupsConfiguration = (
+  groups,
+  allowedPredefinedGroups,
+  allowedCustomGroups,
+) => {
+  let allowedGroupsSet = /* @__PURE__ */ new Set([
+    ...allowedPredefinedGroups,
+    ...allowedCustomGroups,
+  ])
+  let invalidGroups = groups
+    .flat()
+    .filter(group => !allowedGroupsSet.has(group))
+  if (invalidGroups.length) {
+    throw new Error('Invalid group(s): ' + invalidGroups.join(', '))
+  }
+}
+export { validateGroupsConfiguration }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-plugin-perfectionist",
   "description": "ESLint plugin for sorting various data such as objects, imports, types, enums, JSX props, etc.",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "homepage": "https://perfectionist.dev",
   "repository": "azat-io/eslint-plugin-perfectionist",
   "author": "Azat S. <to@azat.io>",
@@ -53,9 +53,9 @@
     "vue-eslint-parser": ">=9.0.0"
   },
   "dependencies": {
-    "@typescript-eslint/types": "^8.3.0",
-    "@typescript-eslint/utils": "^8.3.0",
-    "minimatch": "^10.0.1",
+    "@typescript-eslint/types": "^8.4.0",
+    "@typescript-eslint/utils": "^8.4.0",
+    "minimatch": "^9.0.5",
     "natural-compare-lite": "^1.4.0"
   }
 }