Add more checks

packages/babel-parser/src/plugins/typescript/index.js

@@ -253,11 +253,19 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       disallowedModifiers?: TsModifier[],
       errorTemplate?: ErrorTemplate,
     ): void {
-      const enforceOrder = (pos, before, after) => {
-        if (modified[after]) {
+      const enforceOrder = (pos, modifier, before, after) => {
+        if (modifier === before && modified[after]) {
           this.raise(pos, TSErrors.InvalidModifiersOrder, before, after);
         }
       };
+      const incompatible = (pos, modifier, mod1, mod2) => {
+        if (
+          (modified[mod1] && modifier === mod2) ||
+          (modified[mod2] && modifier === mod1)
+        ) {
+          this.raise(pos, TSErrors.IncompatibleModifiers, mod1, mod2);
+        }
+      };
 
       for (;;) {
         const startPos = this.state.start;
@@ -271,31 +279,22 @@ export default (superClass: Class<Parser>): Class<Parser> =>
           if (modified.accessibility) {
             this.raise(startPos, TSErrors.DuplicateAccessibilityModifier);
           } else {
+            enforceOrder(startPos, modifier, modifier, "override");
+            enforceOrder(startPos, modifier, modifier, "static");
+
             modified.accessibility = modifier;
           }
-          enforceOrder(startPos, modifier, "override");
         } else {
           if (Object.hasOwnProperty.call(modified, modifier)) {
             this.raise(startPos, TSErrors.DuplicateModifier, modifier);
           } else {
-            if (modifier === "static") {
-              enforceOrder(startPos, modifier, "readonly");
-              enforceOrder(startPos, modifier, "override");
-            } else if (modifier === "override") {
-              enforceOrder(startPos, modifier, "readonly");
-            }
+            enforceOrder(startPos, modifier, "static", "readonly");
+            enforceOrder(startPos, modifier, "static", "override");
+            enforceOrder(startPos, modifier, "override", "readonly");
+            enforceOrder(startPos, modifier, "abstract", "override");
 
-            if (
-              (modified.declare && modifier === "override") ||
-              (modified.override && modifier === "declare")
-            ) {
-              this.raise(
-                startPos,
-                TSErrors.IncompatibleModifiers,
-                "declare",
-                "override",
-              );
-            }
+            incompatible(startPos, modifier, "declare", "override");
+            incompatible(startPos, modifier, "static", "abstract");
           }
           modified[modifier] = true;
         }

packages/babel-parser/test/fixtures/typescript/class/modifiers-incompatible/input.ts

@@ -0,0 +1,7 @@
+abstract class A extends Base {
+  static abstract m1();
+  abstract static m1();
+
+  declare override prop1: any;
+  override declare prop2: any;
+}

packages/babel-parser/test/fixtures/typescript/class/modifiers-incompatible/output.json

@@ -0,0 +1,118 @@
+{
+  "type": "File",
+  "start":0,"end":144,"loc":{"start":{"line":1,"column":0},"end":{"line":7,"column":1}},
+  "errors": [
+    "SyntaxError: 'static' modifier cannot be used with 'abstract' modifier. (2:9)",
+    "SyntaxError: 'static' modifier cannot be used with 'abstract' modifier. (3:11)",
+    "SyntaxError: 'declare' modifier cannot be used with 'override' modifier. (5:10)",
+    "SyntaxError: 'declare' modifier cannot be used with 'override' modifier. (6:11)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":144,"loc":{"start":{"line":1,"column":0},"end":{"line":7,"column":1}},
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start":0,"end":144,"loc":{"start":{"line":1,"column":0},"end":{"line":7,"column":1}},
+        "abstract": true,
+        "id": {
+          "type": "Identifier",
+          "start":15,"end":16,"loc":{"start":{"line":1,"column":15},"end":{"line":1,"column":16},"identifierName":"A"},
+          "name": "A"
+        },
+        "superClass": {
+          "type": "Identifier",
+          "start":25,"end":29,"loc":{"start":{"line":1,"column":25},"end":{"line":1,"column":29},"identifierName":"Base"},
+          "name": "Base"
+        },
+        "body": {
+          "type": "ClassBody",
+          "start":30,"end":144,"loc":{"start":{"line":1,"column":30},"end":{"line":7,"column":1}},
+          "body": [
+            {
+              "type": "TSDeclareMethod",
+              "start":34,"end":55,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":23}},
+              "static": true,
+              "abstract": true,
+              "key": {
+                "type": "Identifier",
+                "start":50,"end":52,"loc":{"start":{"line":2,"column":18},"end":{"line":2,"column":20},"identifierName":"m1"},
+                "name": "m1"
+              },
+              "computed": false,
+              "kind": "method",
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": []
+            },
+            {
+              "type": "TSDeclareMethod",
+              "start":58,"end":79,"loc":{"start":{"line":3,"column":2},"end":{"line":3,"column":23}},
+              "abstract": true,
+              "static": true,
+              "key": {
+                "type": "Identifier",
+                "start":74,"end":76,"loc":{"start":{"line":3,"column":18},"end":{"line":3,"column":20},"identifierName":"m1"},
+                "name": "m1"
+              },
+              "computed": false,
+              "kind": "method",
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": []
+            },
+            {
+              "type": "ClassProperty",
+              "start":83,"end":111,"loc":{"start":{"line":5,"column":2},"end":{"line":5,"column":30}},
+              "declare": true,
+              "override": true,
+              "static": false,
+              "key": {
+                "type": "Identifier",
+                "start":100,"end":105,"loc":{"start":{"line":5,"column":19},"end":{"line":5,"column":24},"identifierName":"prop1"},
+                "name": "prop1"
+              },
+              "computed": false,
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start":105,"end":110,"loc":{"start":{"line":5,"column":24},"end":{"line":5,"column":29}},
+                "typeAnnotation": {
+                  "type": "TSAnyKeyword",
+                  "start":107,"end":110,"loc":{"start":{"line":5,"column":26},"end":{"line":5,"column":29}}
+                }
+              },
+              "value": null
+            },
+            {
+              "type": "ClassProperty",
+              "start":114,"end":142,"loc":{"start":{"line":6,"column":2},"end":{"line":6,"column":30}},
+              "override": true,
+              "declare": true,
+              "static": false,
+              "key": {
+                "type": "Identifier",
+                "start":131,"end":136,"loc":{"start":{"line":6,"column":19},"end":{"line":6,"column":24},"identifierName":"prop2"},
+                "name": "prop2"
+              },
+              "computed": false,
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start":136,"end":141,"loc":{"start":{"line":6,"column":24},"end":{"line":6,"column":29}},
+                "typeAnnotation": {
+                  "type": "TSAnyKeyword",
+                  "start":138,"end":141,"loc":{"start":{"line":6,"column":26},"end":{"line":6,"column":29}}
+                }
+              },
+              "value": null
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}

packages/babel-parser/test/fixtures/typescript/class/modifiers-override-invalid-order/input.ts → packages/babel-parser/test/fixtures/typescript/class/modifiers-invalid-order/input.ts

@@ -1,9 +1,9 @@
-class A extends B {
+abstract class A extends B {
   static override m1() {}
   override static m2() {}
 
-  readonly override p3;
   override readonly p4;
+  readonly override p3;
 
   public override m5() {}
   override public m6() {}
@@ -13,4 +13,16 @@ class A extends B {
 
   private override m9() {}
   override private m10() {}
+
+  abstract override m12();
+  override abstract m11();
+
+  public static m14() {}
+  static public m13() {}
+
+  protected static m16() {}
+  static protected m15() {}
+
+  private static m18() {}
+  static private m17() {}
 }