fix(babel-parser): delete static property from class static block for TS (#13680)

* Delete static modifier from static blocks node

* Update tests

* Address review

* Address review

* Add tests from review

* Add tests

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

@@ -230,18 +230,23 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     }
 
     /** Parses a modifier matching one the given modifier names. */
-    tsParseModifier<T: TsModifier>(allowedModifiers: T[]): ?T {
+    tsParseModifier<T: TsModifier>(
+      allowedModifiers: T[],
+      stopOnStartOfClassStaticBlock?: boolean,
+    ): ?T {
       if (!this.match(tt.name)) {
         return undefined;
       }
 
       const modifier = this.state.value;
-      if (
+      if (allowedModifiers.indexOf(modifier) !== -1) {
-        allowedModifiers.indexOf(modifier) !== -1 &&
+        if (stopOnStartOfClassStaticBlock && this.tsIsStartOfStaticBlocks()) {
-        this.tsTryParse(this.tsNextTokenCanFollowModifier.bind(this))
+          return undefined;
-      ) {
+        }
+        if (this.tsTryParse(this.tsNextTokenCanFollowModifier.bind(this))) {
           return modifier;
         }
+      }
       return undefined;
     }
 
@@ -258,6 +263,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       allowedModifiers: TsModifier[],
       disallowedModifiers?: TsModifier[],
       errorTemplate?: ErrorTemplate,
+      stopOnStartOfClassStaticBlock?: boolean,
     ): void {
       const enforceOrder = (pos, modifier, before, after) => {
         if (modifier === before && modified[after]) {
@@ -277,6 +283,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         const startPos = this.state.start;
         const modifier: ?TsModifier = this.tsParseModifier(
           allowedModifiers.concat(disallowedModifiers ?? []),
+          stopOnStartOfClassStaticBlock,
         );
 
         if (!modifier) break;
@@ -2374,12 +2381,19 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       });
     }
 
+    tsIsStartOfStaticBlocks() {
+      return (
+        this.isContextual("static") &&
+        this.lookaheadCharCode() === charCodes.leftCurlyBrace
+      );
+    }
+
     parseClassMember(
       classBody: N.ClassBody,
       member: any,
       state: N.ParseClassMemberState,
     ): void {
-      const invalidModifersForStaticBlocks = [
+      const modifiers = [
         "declare",
         "private",
         "public",
@@ -2387,21 +2401,31 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         "override",
         "abstract",
         "readonly",
+        "static",
       ];
       this.tsParseModifiers(
         member,
-        invalidModifersForStaticBlocks.concat(["static"]),
+        modifiers,
+        /* disallowedModifiers */ undefined,
+        /* errorTemplate */ undefined,
+        /* stopOnStartOfClassStaticBlock */ true,
       );
 
       const callParseClassMemberWithIsStatic = () => {
-        const isStatic = !!member.static;
+        if (this.tsIsStartOfStaticBlocks()) {
-        if (isStatic && this.eat(tt.braceL)) {
+          this.next(); // eat "static"
-          if (this.tsHasSomeModifiers(member, invalidModifersForStaticBlocks)) {
+          this.next(); // eat "{"
+          if (this.tsHasSomeModifiers(member, modifiers)) {
             this.raise(this.state.pos, TSErrors.StaticBlockCannotHaveModifier);
           }
           this.parseClassStaticBlock(classBody, ((member: any): N.StaticBlock));
         } else {
-          this.parseClassMemberWithIsStatic(classBody, member, state, isStatic);
+          this.parseClassMemberWithIsStatic(
+            classBody,
+            member,
+            state,
+            !!member.static,
+          );
         }
       };
       if (member.declare) {

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-block-with-accessibility-private-01/input.ts

@@ -0,0 +1,3 @@
+class Foo {
+  private static {}
+}

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-block-with-accessibility-private-01/output.json

@@ -2,7 +2,6 @@
   "type": "File",
   "start":0,"end":33,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
   "errors": [
-    "SyntaxError: 'private' modifier must precede 'static' modifier. (2:9)",
     "SyntaxError: Static class blocks cannot have any modifier. (2:19)"
   ],
   "program": {
@@ -27,7 +26,6 @@
             {
               "type": "StaticBlock",
               "start":14,"end":31,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":19}},
-              "static": true,
               "accessibility": "private",
               "body": []
             }

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-block-with-accessibility-private-02/options.json

@@ -0,0 +1,12 @@
+{
+  "plugins": [
+    [
+      "classStaticBlock"
+    ],
+    [
+      "typescript"
+    ]
+  ],
+  "sourceType": "module",
+  "throws": "Unexpected token (2:17)"
+}

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-block-with-accessibility-protected-01/input.ts

@@ -0,0 +1,3 @@
+class Foo {
+  protected static {}
+}

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-block-with-accessibility-protected-01/output.json

@@ -2,7 +2,6 @@
   "type": "File",
   "start":0,"end":35,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
   "errors": [
-    "SyntaxError: 'protected' modifier must precede 'static' modifier. (2:9)",
     "SyntaxError: Static class blocks cannot have any modifier. (2:21)"
   ],
   "program": {
@@ -27,7 +26,6 @@
             {
               "type": "StaticBlock",
               "start":14,"end":33,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":21}},
-              "static": true,
               "accessibility": "protected",
               "body": []
             }

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-block-with-accessibility-protected-02/options.json

@@ -0,0 +1,12 @@
+{
+  "plugins": [
+    [
+      "classStaticBlock"
+    ],
+    [
+      "typescript"
+    ]
+  ],
+  "sourceType": "module",
+  "throws": "Unexpected token (2:19)"
+}

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-block-with-accessibility-public-01/input.ts

@@ -0,0 +1,3 @@
+class Foo {
+  public static {}
+}

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-block-with-accessibility-public-01/output.json

@@ -2,7 +2,6 @@
   "type": "File",
   "start":0,"end":32,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
   "errors": [
-    "SyntaxError: 'public' modifier must precede 'static' modifier. (2:9)",
     "SyntaxError: Static class blocks cannot have any modifier. (2:18)"
   ],
   "program": {
@@ -27,7 +26,6 @@
             {
               "type": "StaticBlock",
               "start":14,"end":30,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":18}},
-              "static": true,
               "accessibility": "public",
               "body": []
             }

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-block-with-accessibility-public-02/options.json

@@ -0,0 +1,12 @@
+{
+  "plugins": [
+    [
+      "classStaticBlock"
+    ],
+    [
+      "typescript"
+    ]
+  ],
+  "sourceType": "module",
+  "throws": "Unexpected token (2:16)"
+}

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-block-with-modifier-abstract-01/output.json

@@ -2,7 +2,6 @@
   "type": "File",
   "start":0,"end":34,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
   "errors": [
-    "SyntaxError: 'static' modifier cannot be used with 'abstract' modifier. (2:11)",
     "SyntaxError: Static class blocks cannot have any modifier. (2:20)"
   ],
   "program": {
@@ -28,7 +27,6 @@
               "type": "StaticBlock",
               "start":14,"end":32,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":20}},
               "abstract": true,
-              "static": true,
               "body": []
             }
           ]

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-block-with-modifier-abstract-02/input.ts

@@ -0,0 +1,3 @@
+class Foo {
+  static abstract {}
+}

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-block-with-modifier-abstract-02/options.json

@@ -0,0 +1,12 @@
+{
+  "plugins": [
+    [
+      "classStaticBlock"
+    ],
+    [
+      "typescript"
+    ]
+  ],
+  "sourceType": "module",
+  "throws": "Unexpected token (2:18)"
+}

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-block-with-modifier-override-01/invalid-static-block-with-modifier-abstract/input.ts

@@ -0,0 +1,3 @@
+class Foo {
+  abstract static {}
+}

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-block-with-modifier-override-01/invalid-static-block-with-modifier-abstract/output.json

@@ -0,0 +1,38 @@
+{
+  "type": "File",
+  "start":0,"end":34,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
+  "errors": [
+    "SyntaxError: Static class blocks cannot have any modifier. (2:20)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":34,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start":0,"end":34,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
+        "id": {
+          "type": "Identifier",
+          "start":6,"end":9,"loc":{"start":{"line":1,"column":6},"end":{"line":1,"column":9},"identifierName":"Foo"},
+          "name": "Foo"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start":10,"end":34,"loc":{"start":{"line":1,"column":10},"end":{"line":3,"column":1}},
+          "body": [
+            {
+              "type": "StaticBlock",
+              "start":14,"end":32,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":20}},
+              "abstract": true,
+              "body": []
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-block-with-modifier-override-01/output.json

@@ -2,7 +2,6 @@
   "type": "File",
   "start":0,"end":34,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
   "errors": [
-    "SyntaxError: 'static' modifier must precede 'override' modifier. (2:11)",
     "SyntaxError: Static class blocks cannot have any modifier. (2:20)"
   ],
   "program": {
@@ -28,7 +27,6 @@
               "type": "StaticBlock",
               "start":14,"end":32,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":20}},
               "override": true,
-              "static": true,
               "body": []
             }
           ]

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-block-with-modifier-override-02/input.ts

@@ -0,0 +1,3 @@
+class Foo {
+  static override {}
+}

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-block-with-modifier-override-02/options.json

@@ -0,0 +1,12 @@
+{
+  "plugins": [
+    [
+      "classStaticBlock"
+    ],
+    [
+      "typescript"
+    ]
+  ],
+  "sourceType": "module",
+  "throws": "Unexpected token (2:18)"
+}

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-block-with-modifier-static/output.json

@@ -2,7 +2,7 @@
   "type": "File",
   "start":0,"end":32,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
   "errors": [
-    "SyntaxError: Duplicate modifier: 'static'. (2:9)"
+    "SyntaxError: Static class blocks cannot have any modifier. (2:18)"
   ],
   "program": {
     "type": "Program",

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-blocks-with-modifer-declare-01/output.json

@@ -27,7 +27,6 @@
               "type": "StaticBlock",
               "start":14,"end":31,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":19}},
               "declare": true,
-              "static": true,
               "body": []
             }
           ]

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-blocks-with-modifer-declare-02/input.ts

@@ -0,0 +1,3 @@
+class Foo {
+  static declare {}
+}

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-blocks-with-modifer-declare-02/options.json

@@ -0,0 +1,12 @@
+{
+  "plugins": [
+    [
+      "classStaticBlock"
+    ],
+    [
+      "typescript"
+    ]
+  ],
+  "sourceType": "module",
+  "throws": "Unexpected token (2:17)"
+}

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-blocks-with-modifier-readonly-01/output.json

@@ -2,7 +2,6 @@
   "type": "File",
   "start":0,"end":34,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
   "errors": [
-    "SyntaxError: 'static' modifier must precede 'readonly' modifier. (2:11)",
     "SyntaxError: Static class blocks cannot have any modifier. (2:20)"
   ],
   "program": {
@@ -28,7 +27,6 @@
               "type": "StaticBlock",
               "start":14,"end":32,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":20}},
               "readonly": true,
-              "static": true,
               "body": []
             }
           ]

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-blocks-with-modifier-readonly-02/input.ts

@@ -0,0 +1,3 @@
+class Foo {
+  static readonly {}
+}

packages/babel-parser/test/fixtures/typescript/static-blocks/invalid-static-blocks-with-modifier-readonly-02/options.json

@@ -0,0 +1,12 @@
+{
+  "plugins": [
+    [
+      "classStaticBlock"
+    ],
+    [
+      "typescript"
+    ]
+  ],
+  "sourceType": "module",
+  "throws": "Unexpected token (2:18)"
+}

packages/babel-parser/test/fixtures/typescript/static-blocks/static-blocks-and-proptery-named-static/output.json

@@ -35,7 +35,6 @@
             {
               "type": "StaticBlock",
               "start":24,"end":33,"loc":{"start":{"line":3,"column":2},"end":{"line":3,"column":11}},
-              "static": true,
               "body": []
             }
           ]

packages/babel-parser/test/fixtures/typescript/static-blocks/static-blocks-and-static-property-named-static/output.json

@@ -35,7 +35,6 @@
             {
               "type": "StaticBlock",
               "start":31,"end":40,"loc":{"start":{"line":3,"column":2},"end":{"line":3,"column":11}},
-              "static": true,
               "body": []
             }
           ]

packages/babel-parser/test/fixtures/typescript/static-blocks/static-blocks-and-static-property/output.json

@@ -35,7 +35,6 @@
             {
               "type": "StaticBlock",
               "start":28,"end":37,"loc":{"start":{"line":3,"column":2},"end":{"line":3,"column":11}},
-              "static": true,
               "body": []
             }
           ]

packages/babel-parser/test/fixtures/typescript/static-blocks/static-blocks/output.json

@@ -23,7 +23,6 @@
             {
               "type": "StaticBlock",
               "start":14,"end":23,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":11}},
-              "static": true,
               "body": []
             }
           ]