fix(eslint-plugin): [no-extran-class] allowWithDecorator should ignor…

…e other errors (#3160)
typescript-eslint · Mar 15, 2021 · a148673 · a148673
1 parent d9e7916
commit a148673
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/packages/eslint-plugin/src/rules/no-extraneous-class.ts b/packages/eslint-plugin/src/rules/no-extraneous-class.ts
@@ -79,13 +79,13 @@ export default util.createRule<Options, MessageIds>({
           | TSESTree.ClassExpression
           | undefined;
 
-        if (!parent || parent.superClass) {
+        if (!parent || parent.superClass || isAllowWithDecorator(parent)) {
           return;
         }
 
         const reportNode = 'id' in parent && parent.id ? parent.id : parent;
         if (node.body.length === 0) {
-          if (allowEmpty || isAllowWithDecorator(parent)) {
+          if (allowEmpty) {
             return;
           }
 

diff --git a/packages/eslint-plugin/tests/rules/no-extraneous-class.test.ts b/packages/eslint-plugin/tests/rules/no-extraneous-class.test.ts
@@ -76,6 +76,19 @@ class Foo {}
       `,
       options: [{ allowWithDecorator: true }],
     },
+    {
+      code: `
+@FooDecorator
+class Foo {
+  constructor(foo: Foo) {
+    foo.subscribe(a => {
+      console.log(a);
+    });
+  }
+}
+      `,
+      options: [{ allowWithDecorator: true }],
+    },
   ],
 
   invalid: [
@@ -150,5 +163,23 @@ class Foo {}
         },
       ],
     },
+    {
+      code: `
+@FooDecorator
+class Foo {
+  constructor(foo: Foo) {
+    foo.subscribe(a => {
+      console.log(a);
+    });
+  }
+}
+      `,
+      options: [{ allowWithDecorator: false }],
+      errors: [
+        {
+          messageId: 'onlyConstructor',
+        },
+      ],
+    },
   ],
 });