fix(sort-modules): fix decorator dependencies not detected

Author: hugop95

rules/sort-modules.ts

@@ -378,18 +378,6 @@ let extractDependencies = (
 ): string[] => {
   let dependencies: string[] = []
 
-  let isPropertyOrAccessor = (
-    node: TSESTree.Node,
-  ): node is TSESTree.PropertyDefinition | TSESTree.AccessorProperty =>
-    node.type === 'PropertyDefinition' || node.type === 'AccessorProperty'
-
-  let isArrowFunction = (
-    node: TSESTree.Node,
-  ): node is TSESTree.PropertyDefinition | TSESTree.AccessorProperty =>
-    isPropertyOrAccessor(node) &&
-    node.value !== null &&
-    node.value.type === 'ArrowFunctionExpression'
-
   /**
    * Search static methods only if there is a static block or a static property
    * that is not an arrow function
@@ -412,6 +400,10 @@ let extractDependencies = (
       return
     }
 
+    if ('decorators' in nodeValue) {
+      traverseNode(nodeValue.decorators)
+    }
+
     if (
       nodeValue.type === 'NewExpression' &&
       nodeValue.callee.type === 'Identifier'
@@ -525,3 +517,15 @@ let extractDependencies = (
   checkNode(expression)
   return dependencies
 }
+
+let isPropertyOrAccessor = (
+  node: TSESTree.Node,
+): node is TSESTree.PropertyDefinition | TSESTree.AccessorProperty =>
+  node.type === 'PropertyDefinition' || node.type === 'AccessorProperty'
+
+let isArrowFunction = (
+  node: TSESTree.Node,
+): node is TSESTree.PropertyDefinition | TSESTree.AccessorProperty =>
+  isPropertyOrAccessor(node) &&
+  node.value !== null &&
+  node.value.type === 'ArrowFunctionExpression'

test/rules/sort-modules.test.ts

@@ -1811,7 +1811,7 @@ describe(ruleName, () => {
               options: [
                 {
                   ...options,
-                  groups: [],
+                  groups: ['unknown'],
                 },
               ],
             },
@@ -1829,7 +1829,7 @@ describe(ruleName, () => {
               options: [
                 {
                   ...options,
-                  groups: [],
+                  groups: ['unknown'],
                 },
               ],
               code: dedent`
@@ -1843,6 +1843,57 @@ describe(ruleName, () => {
         },
       )
 
+      ruleTester.run(
+        `${ruleName}(${type}) detects dependencies in decorators`,
+        rule,
+        {
+          invalid: [
+            {
+              output: dedent`
+                enum B {}
+
+                class A {
+                  @SomeDecorator({
+                    a: {
+                      b: c.concat([B])
+                    }
+                  })
+                  property
+                }
+              `,
+              code: dedent`
+                class A {
+                  @SomeDecorator({
+                    a: {
+                      b: c.concat([B])
+                    }
+                  })
+                  property
+                }
+
+                enum B {}
+              `,
+              errors: [
+                {
+                  data: {
+                    nodeDependentOnRight: 'A',
+                    right: 'B',
+                  },
+                  messageId: 'unexpectedModulesDependencyOrder',
+                },
+              ],
+              options: [
+                {
+                  ...options,
+                  groups: ['unknown'],
+                },
+              ],
+            },
+          ],
+          valid: [],
+        },
+      )
+
       ruleTester.run(
         `${ruleName}(${type}) detects and ignores circular dependencies`,
         rule,