fix: fixes complex decorators not being handled

Author: hugop95

rules/sort-classes.ts

@@ -40,7 +40,9 @@ import { doesCustomGroupMatch } from './sort-classes/does-custom-group-match'
 import { getEslintDisabledLines } from '../utils/get-eslint-disabled-lines'
 import { isNodeEslintDisabled } from '../utils/is-node-eslint-disabled'
 import { sortNodesByGroups } from '../utils/sort-nodes-by-groups'
+import { getNodeDecorators } from '../utils/get-node-decorators'
 import { createEslintRule } from '../utils/create-eslint-rule'
+import { getDecoratorName } from '../utils/get-decorator-name'
 import { reportAllErrors } from '../utils/report-all-errors'
 import { shouldPartition } from '../utils/should-partition'
 import { getGroupNumber } from '../utils/get-group-number'
@@ -319,17 +321,10 @@ export default createEslintRule<SortClassesOptions, MESSAGE_ID>({
           let decorators: string[] = []
 
           if ('decorators' in member) {
-            decorated = member.decorators.length > 0
-            for (let decorator of member.decorators) {
-              if (decorator.expression.type === 'Identifier') {
-                decorators.push(decorator.expression.name)
-              } else if (
-                decorator.expression.type === 'CallExpression' &&
-                decorator.expression.callee.type === 'Identifier'
-              ) {
-                decorators.push(decorator.expression.callee.name)
-              }
-            }
+            decorators = getNodeDecorators(member).map(decorator =>
+              getDecoratorName({ sourceCode, decorator }),
+            )
+            decorated = decorators.length > 0
           }
 
           let memberValue: undefined | string

rules/sort-decorators.ts

@@ -204,6 +204,7 @@ let sortDecorators = (
     (accumulator: SortDecoratorsSortingNode[][], decorator) => {
       let { setCustomGroups, getGroup } = useGroups(options)
       let name = getDecoratorName({
+        sourceCode,
         decorator,
       })
 

rules/sort-modules.ts

@@ -43,6 +43,7 @@ import { isNodeEslintDisabled } from '../utils/is-node-eslint-disabled'
 import { sortNodesByGroups } from '../utils/sort-nodes-by-groups'
 import { getNodeDecorators } from '../utils/get-node-decorators'
 import { createEslintRule } from '../utils/create-eslint-rule'
+import { getDecoratorName } from '../utils/get-decorator-name'
 import { reportAllErrors } from '../utils/report-all-errors'
 import { shouldPartition } from '../utils/should-partition'
 import { getGroupNumber } from '../utils/get-group-number'
@@ -257,16 +258,12 @@ let analyzeModule = ({
           if (nodeDecorators.length > 0) {
             modifiers.push('decorated')
           }
-          for (let decorator of nodeDecorators) {
-            if (decorator.expression.type === 'Identifier') {
-              decorators.push(decorator.expression.name)
-            } else if (
-              decorator.expression.type === 'CallExpression' &&
-              decorator.expression.callee.type === 'Identifier'
-            ) {
-              decorators.push(decorator.expression.callee.name)
-            }
-          }
+          decorators = nodeDecorators.map(decorator =>
+            getDecoratorName({
+              sourceCode,
+              decorator,
+            }),
+          )
           dependencies = [
             ...dependencies,
             ...(nodeToParse.superClass && 'name' in nodeToParse.superClass

test/rules/sort-classes.test.ts

@@ -7721,6 +7721,54 @@ describe(ruleName, () => {
             }
           `,
         },
+        {
+          options: [
+            {
+              customGroups: [
+                {
+                  decoratorNamePattern: 'B',
+                  groupName: 'B',
+                },
+                {
+                  decoratorNamePattern: 'A',
+                  groupName: 'A',
+                },
+              ],
+              type: 'alphabetical',
+              groups: ['B', 'A'],
+              order: 'asc',
+            },
+          ],
+          errors: [
+            {
+              data: {
+                rightGroup: 'B',
+                leftGroup: 'A',
+                right: 'b',
+                left: 'a',
+              },
+              messageId: 'unexpectedClassesGroupOrder',
+            },
+          ],
+          output: dedent`
+            class Class {
+              @B.B()
+              b() {}
+
+              @A.A.A(() => A)
+              a() {}
+            }
+          `,
+          code: dedent`
+            class Class {
+              @A.A.A(() => A)
+              a() {}
+
+              @B.B()
+              b() {}
+            }
+          `,
+        },
       ],
       valid: [],
     })

test/rules/sort-decorators.test.ts

@@ -578,6 +578,74 @@ describe(ruleName, () => {
               },
             ],
           },
+          {
+            output: dedent`
+              @B.B()
+              @A.A.A(() => A)
+              class Class {
+
+                @B.B()
+                @A.A.A(() => A)
+                property
+
+                @B.B()
+                @A.A.A(() => A)
+                accessor field
+
+                @B.B()
+                @A.A.A(() => A)
+                method(
+                  @B.B()
+                  @A.A.A(() => A)
+                  parameter) {}
+
+              }
+            `,
+            code: dedent`
+              @A.A.A(() => A)
+              @B.B()
+              class Class {
+
+                @A.A.A(() => A)
+                @B.B()
+                property
+
+                @A.A.A(() => A)
+                @B.B()
+                accessor field
+
+                @A.A.A(() => A)
+                @B.B()
+                method(
+                  @A.A.A(() => A)
+                  @B.B()
+                  parameter) {}
+
+              }
+            `,
+            errors: duplicate5Times([
+              {
+                data: {
+                  rightGroup: 'B',
+                  leftGroup: 'A',
+                  left: 'A.A.A',
+                  right: 'B.B',
+                },
+                messageId: 'unexpectedDecoratorsGroupOrder',
+              },
+            ]),
+            options: [
+              {
+                customGroups: {
+                  A: 'A',
+                  B: 'B',
+                },
+                type: 'alphabetical',
+                groups: ['B', 'A'],
+                order: 'asc',
+              },
+            ],
+          },
         ],
         valid: [],
       },

test/rules/sort-decorators/get-decorator-name.test.ts

@@ -489,6 +489,50 @@ describe(ruleName, () => {
               class AnotherClass {}
             `,
           },
+          {
+            options: [
+              {
+                customGroups: [
+                  {
+                    decoratorNamePattern: 'B',
+                    groupName: 'B',
+                  },
+                  {
+                    decoratorNamePattern: 'A',
+                    groupName: 'A',
+                  },
+                ],
+                type: 'alphabetical',
+                groups: ['B', 'A'],
+                order: 'asc',
+              },
+            ],
+            errors: [
+              {
+                data: {
+                  rightGroup: 'B',
+                  leftGroup: 'A',
+                  right: 'B',
+                  left: 'A',
+                },
+                messageId: 'unexpectedModulesGroupOrder',
+              },
+            ],
+            output: dedent`
+              @B.B()
+              class B {}
+
+              @A.A.A(() => A)
+              class A {}
+            `,
+            code: dedent`
+              @A.A.A(() => A)
+              class A {}
+
+              @B.B()
+              class B {}
+            `,
+          },
         ],
         valid: [],
       })

test/rules/sort-modules.test.ts

@@ -1,28 +1,16 @@
 import type { TSESTree } from '@typescript-eslint/types'
-
-import { AST_NODE_TYPES } from '@typescript-eslint/types'
+import type { TSESLint } from '@typescript-eslint/utils'
 
 export let getDecoratorName = ({
+  sourceCode,
   decorator,
 }: {
+  sourceCode: TSESLint.SourceCode
   decorator: TSESTree.Decorator
 }): string => {
-  switch (decorator.expression.type) {
-    case AST_NODE_TYPES.CallExpression:
-      if (decorator.expression.callee.type !== AST_NODE_TYPES.Identifier) {
-        throw new Error(
-          "Unexpected decorator expression's callee type. Please 'report this " +
-            'issue here: ' +
-            'https://github.com/azat-io/eslint-plugin-perfectionist/issues',
-        )
-      }
-      return decorator.expression.callee.name
-    case AST_NODE_TYPES.Identifier:
-      return decorator.expression.name
-    default:
-      throw new Error(
-        'Unexpected decorator expression type. Please report this issue here: ' +
-          'https://github.com/azat-io/eslint-plugin-perfectionist/issues',
-      )
+  let fullName = sourceCode.getText(decorator)
+  if (fullName.startsWith('@')) {
+    fullName = fullName.slice(1)
   }
+  return fullName.split('(')[0]!
 }