[FIX] [class-name-casing] handling of TSAbstractClassDeclaration (#187)

bradzacher · Nov 28, 2018 · 576b1aa · 576b1aa
1 parent df47571
commit 576b1aa
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 9 deletions.
diff --git a/lib/rules/class-name-casing.js b/lib/rules/class-name-casing.js
@@ -1,6 +1,7 @@
 /**
  * @fileoverview Enforces PascalCased class and interface names.
  * @author Jed Fox
+ * @author Armano <https://github.com/armano2>
  */
 "use strict";
 
@@ -54,6 +55,9 @@ module.exports = {
                 case "ClassExpression":
                     friendlyName = "Class";
                     break;
+                case "TSAbstractClassDeclaration":
+                    friendlyName = "Abstract class";
+                    break;
                 case "TSInterfaceDeclaration":
                     friendlyName = "Interface";
                     break;
@@ -74,21 +78,19 @@ module.exports = {
         //----------------------------------------------------------------------
 
         return {
-            "ClassDeclaration, TSInterfaceDeclaration"(node) {
+            "ClassDeclaration, TSInterfaceDeclaration, TSAbstractClassDeclaration, ClassExpression"(
+                node
+            ) {
                 // class expressions (i.e. export default class {}) are OK
                 if (node.id && !isPascalCase(node.id.name)) {
                     report(node);
                 }
             },
-            VariableDeclarator(node) {
-                if (node.init && node.init.type === "ClassExpression") {
-                    const id = node.id;
+            "VariableDeclarator[init.type='ClassExpression']"(node) {
+                const id = node.id;
 
-                    if (node.init.id && !isPascalCase(node.init.id.name)) {
-                        report(node.init);
-                    } else if (id && !isPascalCase(id.name)) {
-                        report(node.init, id);
-                    }
+                if (id && !node.init.id && !isPascalCase(id.name)) {
+                    report(node.init, id);
                 }
             },
         };

diff --git a/tests/lib/rules/class-name-casing.js b/tests/lib/rules/class-name-casing.js
@@ -1,6 +1,7 @@
 /**
  * @fileoverview Enforces PascalCased class and interface names.
  * @author Jed Fox
+ * @author Armano <https://github.com/armano2>
  */
 "use strict";
 
@@ -31,6 +32,8 @@ ruleTester.run("class-name-casing", rule, {
         "var Foo = class {};",
         "interface SomeInterface {}",
         "class ClassNameWithDigit2 {}",
+        "abstract class ClassNameWithDigit2 {}",
+        "var ba_zz = class Foo {};",
     ],
 
     invalid: [
@@ -65,6 +68,16 @@ ruleTester.run("class-name-casing", rule, {
                 },
             ],
         },
+        {
+            code: "const foo = class {};",
+            errors: [
+                {
+                    message: "Class 'foo' must be PascalCased",
+                    line: 1,
+                    column: 7,
+                },
+            ],
+        },
         {
             code: "var bar = class invalidName {}",
             errors: [
@@ -85,5 +98,26 @@ ruleTester.run("class-name-casing", rule, {
                 },
             ],
         },
+        {
+            code: "abstract class invalidClassName {}",
+            errors: [
+                {
+                    message:
+                        "Abstract class 'invalidClassName' must be PascalCased",
+                    line: 1,
+                    column: 16,
+                },
+            ],
+        },
+        {
+            code: "declare class invalidClassName {}",
+            errors: [
+                {
+                    message: "Class 'invalidClassName' must be PascalCased",
+                    line: 1,
+                    column: 15,
+                },
+            ],
+        },
     ],
 });