fix(babel-parser): delete static property from class static block f…

…or TS (#13680) * Delete static modifier from static blocks node * Update tests * Address review * Address review * Add tests from review * Add tests
babel · Aug 25, 2021 · b141c85 · b141c85
1 parent 1d4bd31
commit b141c85
Show file tree

Hide file tree

Showing 36 changed files with 183 additions and 30 deletions.
diff --git a/packages/babel-parser/src/plugins/typescript/index.js b/packages/babel-parser/src/plugins/typescript/index.js
@@ -230,17 +230,22 @@ 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 (
-        allowedModifiers.indexOf(modifier) !== -1 &&
-        this.tsTryParse(this.tsNextTokenCanFollowModifier.bind(this))
-      ) {
-        return modifier;
+      if (allowedModifiers.indexOf(modifier) !== -1) {
+        if (stopOnStartOfClassStaticBlock && this.tsIsStartOfStaticBlocks()) {
+          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,34 +2381,51 @@ 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",
         "protected",
         "override",
         "abstract",
         "readonly",
+        "static",
       ];
       this.tsParseModifiers(
         member,
-        invalidModifersForStaticBlocks.concat(["static"]),
+        modifiers,
+        /* disallowedModifiers */ undefined,
+        /* errorTemplate */ undefined,
+        /* stopOnStartOfClassStaticBlock */ true,
       );
 
       const callParseClassMemberWithIsStatic = () => {
-        const isStatic = !!member.static;
-        if (isStatic && this.eat(tt.braceL)) {
-          if (this.tsHasSomeModifiers(member, invalidModifersForStaticBlocks)) {
+        if (this.tsIsStartOfStaticBlocks()) {
+          this.next(); // eat "static"
+          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) {

diff --git a/...ures/typescript/static-blocks/invalid-static-block-with-accessibility-private-01/input.ts b/...ures/typescript/static-blocks/invalid-static-block-with-accessibility-private-01/input.ts
@@ -0,0 +1,3 @@
+class Foo {
+  private static {}
+}
diff --git a/...ck-with-accessibility-private/output.json → ...with-accessibility-private-01/output.json b/...ck-with-accessibility-private/output.json → ...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": []
             }

diff --git a/...block-with-accessibility-private/input.ts → ...ck-with-accessibility-private-02/input.ts b/...block-with-accessibility-private/input.ts → ...ck-with-accessibility-private-02/input.ts
diff --git a/.../typescript/static-blocks/invalid-static-block-with-accessibility-private-02/options.json b/.../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)"
+}
diff --git a/...es/typescript/static-blocks/invalid-static-block-with-accessibility-protected-01/input.ts b/...es/typescript/static-blocks/invalid-static-block-with-accessibility-protected-01/input.ts
@@ -0,0 +1,3 @@
+class Foo {
+  protected static {}
+}
diff --git a/...-with-accessibility-protected/output.json → ...th-accessibility-protected-01/output.json b/...-with-accessibility-protected/output.json → ...th-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": []
             }

diff --git a/...ock-with-accessibility-protected/input.ts → ...-with-accessibility-protected-02/input.ts b/...ock-with-accessibility-protected/input.ts → ...-with-accessibility-protected-02/input.ts
diff --git a/...ypescript/static-blocks/invalid-static-block-with-accessibility-protected-02/options.json b/...ypescript/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)"
+}
diff --git a/...tures/typescript/static-blocks/invalid-static-block-with-accessibility-public-01/input.ts b/...tures/typescript/static-blocks/invalid-static-block-with-accessibility-public-01/input.ts
@@ -0,0 +1,3 @@
+class Foo {
+  public static {}
+}
diff --git a/...ock-with-accessibility-public/output.json → ...-with-accessibility-public-01/output.json b/...ock-with-accessibility-public/output.json → ...-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": []
             }

diff --git a/...-block-with-accessibility-public/input.ts → ...ock-with-accessibility-public-02/input.ts b/...-block-with-accessibility-public/input.ts → ...ock-with-accessibility-public-02/input.ts
diff --git a/...s/typescript/static-blocks/invalid-static-block-with-accessibility-public-02/options.json b/...s/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)"
+}
diff --git a/...tic-block-with-modifier-abstract/input.ts → ...-block-with-modifier-abstract-01/input.ts b/...tic-block-with-modifier-abstract/input.ts → ...-block-with-modifier-abstract-01/input.ts
diff --git a/...-block-with-modifier-abstract/output.json → ...ock-with-modifier-abstract-01/output.json b/...-block-with-modifier-abstract/output.json → ...ock-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": []
             }
           ]

diff --git a/...fixtures/typescript/static-blocks/invalid-static-block-with-modifier-abstract-02/input.ts b/...fixtures/typescript/static-blocks/invalid-static-block-with-modifier-abstract-02/input.ts
@@ -0,0 +1,3 @@
+class Foo {
+  static abstract {}
+}
diff --git a/...ures/typescript/static-blocks/invalid-static-block-with-modifier-abstract-02/options.json b/...ures/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)"
+}
diff --git a/...tic-block-with-modifier-override/input.ts → ...-block-with-modifier-override-01/input.ts b/...tic-block-with-modifier-override/input.ts → ...-block-with-modifier-override-01/input.ts
diff --git a/...atic-block-with-modifier-override-01/invalid-static-block-with-modifier-abstract/input.ts b/...atic-block-with-modifier-override-01/invalid-static-block-with-modifier-abstract/input.ts
@@ -0,0 +1,3 @@
+class Foo {
+  abstract static {}
+}
diff --git a/...c-block-with-modifier-override-01/invalid-static-block-with-modifier-abstract/output.json b/...c-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": []
+  }
+}
diff --git a/...-block-with-modifier-override/output.json → ...ock-with-modifier-override-01/output.json b/...-block-with-modifier-override/output.json → ...ock-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": []
             }
           ]

diff --git a/...fixtures/typescript/static-blocks/invalid-static-block-with-modifier-override-02/input.ts b/...fixtures/typescript/static-blocks/invalid-static-block-with-modifier-override-02/input.ts
@@ -0,0 +1,3 @@
+class Foo {
+  static override {}
+}
diff --git a/...ures/typescript/static-blocks/invalid-static-block-with-modifier-override-02/options.json b/...ures/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)"
+}
diff --git a/...t/fixtures/typescript/static-blocks/invalid-static-block-with-modifier-static/output.json b/...t/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",

diff --git a/...atic-blocks-with-modifer-declare/input.ts → ...c-blocks-with-modifer-declare-01/input.ts b/...atic-blocks-with-modifer-declare/input.ts → ...c-blocks-with-modifer-declare-01/input.ts
diff --git a/...c-blocks-with-modifer-declare/output.json → ...locks-with-modifer-declare-01/output.json b/...c-blocks-with-modifer-declare/output.json → ...locks-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": []
             }
           ]

diff --git a/.../fixtures/typescript/static-blocks/invalid-static-blocks-with-modifer-declare-02/input.ts b/.../fixtures/typescript/static-blocks/invalid-static-blocks-with-modifer-declare-02/input.ts
@@ -0,0 +1,3 @@
+class Foo {
+  static declare {}
+}
diff --git a/...tures/typescript/static-blocks/invalid-static-blocks-with-modifer-declare-02/options.json b/...tures/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)"
+}
diff --git a/...ic-blocks-with-modifier-readonly/input.ts → ...blocks-with-modifier-readonly-01/input.ts b/...ic-blocks-with-modifier-readonly/input.ts → ...blocks-with-modifier-readonly-01/input.ts
diff --git a/...blocks-with-modifier-readonly/output.json → ...cks-with-modifier-readonly-01/output.json b/...blocks-with-modifier-readonly/output.json → ...cks-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": []
             }
           ]

diff --git a/...ixtures/typescript/static-blocks/invalid-static-blocks-with-modifier-readonly-02/input.ts b/...ixtures/typescript/static-blocks/invalid-static-blocks-with-modifier-readonly-02/input.ts
@@ -0,0 +1,3 @@
+class Foo {
+  static readonly {}
+}
diff --git a/...res/typescript/static-blocks/invalid-static-blocks-with-modifier-readonly-02/options.json b/...res/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)"
+}
diff --git a/...est/fixtures/typescript/static-blocks/static-blocks-and-proptery-named-static/output.json b/...est/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": []
             }
           ]