Throw a syntax error for empty type parameter/argument (babel#12088)

Joegrundman · Sep 22, 2020 · a4a14ca · a4a14ca
1 parent cb4e436
commit a4a14ca
Show file tree

Hide file tree

Showing 23 changed files with 438 additions and 1 deletion.
diff --git a/packages/babel-parser/src/plugins/typescript/index.js b/packages/babel-parser/src/plugins/typescript/index.js
@@ -73,6 +73,8 @@ const TSErrors = Object.freeze({
     "An implementation cannot be declared in ambient contexts.",
   DuplicateModifier: "Duplicate modifier: '%0'",
   EmptyHeritageClauseType: "'%0' list cannot be empty.",
+  EmptyTypeArguments: "Type argument list cannot be empty.",
+  EmptyTypeParameters: "Type parameter list cannot be empty.",
   IndexSignatureHasAbstract:
     "Index signatures cannot have the 'abstract' modifier",
   IndexSignatureHasAccessibility:
@@ -403,6 +405,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         /* bracket */ false,
         /* skipFirstToken */ true,
       );
+      if (node.params.length === 0) {
+        this.raise(node.start, TSErrors.EmptyTypeParameters);
+      }
       return this.finishNode(node, "TSTypeParameterDeclaration");
     }
 
@@ -1680,6 +1685,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
           );
         }),
       );
+      if (node.params.length === 0) {
+        this.raise(node.start, TSErrors.EmptyTypeArguments);
+      }
       // This reads the next token after the `>` too, so do this in the enclosing context.
       // But be sure not to parse a regex in the jsx expression `<C<number> />`, so set exprAllowed = false
       this.state.exprAllowed = false;

diff --git a/packages/babel-parser/test/fixtures/typescript/class/empty-type-parameters/input.ts b/packages/babel-parser/test/fixtures/typescript/class/empty-type-parameters/input.ts
@@ -0,0 +1 @@
+class C<> {}
diff --git a/packages/babel-parser/test/fixtures/typescript/class/empty-type-parameters/output.json b/packages/babel-parser/test/fixtures/typescript/class/empty-type-parameters/output.json
@@ -0,0 +1,36 @@
+{
+  "type": "File",
+  "start":0,"end":12,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":12}},
+  "errors": [
+    "SyntaxError: Type parameter list cannot be empty. (1:7)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":12,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":12}},
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start":0,"end":12,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":12}},
+        "id": {
+          "type": "Identifier",
+          "start":6,"end":7,"loc":{"start":{"line":1,"column":6},"end":{"line":1,"column":7},"identifierName":"C"},
+          "name": "C"
+        },
+        "typeParameters": {
+          "type": "TSTypeParameterDeclaration",
+          "start":7,"end":9,"loc":{"start":{"line":1,"column":7},"end":{"line":1,"column":9}},
+          "params": []
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start":10,"end":12,"loc":{"start":{"line":1,"column":10},"end":{"line":1,"column":12}},
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/function/empty-type-parameters/input.ts b/packages/babel-parser/test/fixtures/typescript/function/empty-type-parameters/input.ts
@@ -0,0 +1 @@
+function foo<>() {}
diff --git a/packages/babel-parser/test/fixtures/typescript/function/empty-type-parameters/output.json b/packages/babel-parser/test/fixtures/typescript/function/empty-type-parameters/output.json
@@ -0,0 +1,39 @@
+{
+  "type": "File",
+  "start":0,"end":19,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":19}},
+  "errors": [
+    "SyntaxError: Type parameter list cannot be empty. (1:12)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":19,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":19}},
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start":0,"end":19,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":19}},
+        "id": {
+          "type": "Identifier",
+          "start":9,"end":12,"loc":{"start":{"line":1,"column":9},"end":{"line":1,"column":12},"identifierName":"foo"},
+          "name": "foo"
+        },
+        "generator": false,
+        "async": false,
+        "typeParameters": {
+          "type": "TSTypeParameterDeclaration",
+          "start":12,"end":14,"loc":{"start":{"line":1,"column":12},"end":{"line":1,"column":14}},
+          "params": []
+        },
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start":17,"end":19,"loc":{"start":{"line":1,"column":17},"end":{"line":1,"column":19}},
+          "body": [],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/.../typescript/type-arguments/empty/input.ts → ...pt/type-arguments/empty-function/input.ts b/.../typescript/type-arguments/empty/input.ts → ...pt/type-arguments/empty-function/input.ts
diff --git a/...pescript/type-arguments/empty/output.json → ...type-arguments/empty-function/output.json b/...pescript/type-arguments/empty/output.json → ...type-arguments/empty-function/output.json
@@ -1,6 +1,9 @@
 {
   "type": "File",
   "start":0,"end":7,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":7}},
+  "errors": [
+    "SyntaxError: Type argument list cannot be empty. (1:3)"
+  ],
   "program": {
     "type": "Program",
     "start":0,"end":7,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":7}},

diff --git a/...ges/babel-parser/test/fixtures/typescript/type-arguments/empty-interface-extends/input.ts b/...ges/babel-parser/test/fixtures/typescript/type-arguments/empty-interface-extends/input.ts
@@ -0,0 +1 @@
+interface A extends B<> {}
diff --git a/.../babel-parser/test/fixtures/typescript/type-arguments/empty-interface-extends/output.json b/.../babel-parser/test/fixtures/typescript/type-arguments/empty-interface-extends/output.json
@@ -0,0 +1,46 @@
+{
+  "type": "File",
+  "start":0,"end":26,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":26}},
+  "errors": [
+    "SyntaxError: Type argument list cannot be empty. (1:21)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":26,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":26}},
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSInterfaceDeclaration",
+        "start":0,"end":26,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":26}},
+        "id": {
+          "type": "Identifier",
+          "start":10,"end":11,"loc":{"start":{"line":1,"column":10},"end":{"line":1,"column":11},"identifierName":"A"},
+          "name": "A"
+        },
+        "extends": [
+          {
+            "type": "TSExpressionWithTypeArguments",
+            "start":20,"end":23,"loc":{"start":{"line":1,"column":20},"end":{"line":1,"column":23}},
+            "expression": {
+              "type": "Identifier",
+              "start":20,"end":21,"loc":{"start":{"line":1,"column":20},"end":{"line":1,"column":21},"identifierName":"B"},
+              "name": "B"
+            },
+            "typeParameters": {
+              "type": "TSTypeParameterInstantiation",
+              "start":21,"end":23,"loc":{"start":{"line":1,"column":21},"end":{"line":1,"column":23}},
+              "params": []
+            }
+          }
+        ],
+        "body": {
+          "type": "TSInterfaceBody",
+          "start":24,"end":26,"loc":{"start":{"line":1,"column":24},"end":{"line":1,"column":26}},
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/.../babel-parser/test/fixtures/typescript/type-arguments/empty-interface-implements/input.ts b/.../babel-parser/test/fixtures/typescript/type-arguments/empty-interface-implements/input.ts
@@ -0,0 +1 @@
+class A implements B<> {}
diff --git a/...bel-parser/test/fixtures/typescript/type-arguments/empty-interface-implements/output.json b/...bel-parser/test/fixtures/typescript/type-arguments/empty-interface-implements/output.json
@@ -0,0 +1,47 @@
+{
+  "type": "File",
+  "start":0,"end":25,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":25}},
+  "errors": [
+    "SyntaxError: Type argument list cannot be empty. (1:20)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":25,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":25}},
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start":0,"end":25,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":25}},
+        "id": {
+          "type": "Identifier",
+          "start":6,"end":7,"loc":{"start":{"line":1,"column":6},"end":{"line":1,"column":7},"identifierName":"A"},
+          "name": "A"
+        },
+        "superClass": null,
+        "implements": [
+          {
+            "type": "TSExpressionWithTypeArguments",
+            "start":19,"end":22,"loc":{"start":{"line":1,"column":19},"end":{"line":1,"column":22}},
+            "expression": {
+              "type": "Identifier",
+              "start":19,"end":20,"loc":{"start":{"line":1,"column":19},"end":{"line":1,"column":20},"identifierName":"B"},
+              "name": "B"
+            },
+            "typeParameters": {
+              "type": "TSTypeParameterInstantiation",
+              "start":20,"end":22,"loc":{"start":{"line":1,"column":20},"end":{"line":1,"column":22}},
+              "params": []
+            }
+          }
+        ],
+        "body": {
+          "type": "ClassBody",
+          "start":23,"end":25,"loc":{"start":{"line":1,"column":23},"end":{"line":1,"column":25}},
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/empty-new/input.ts b/packages/babel-parser/test/fixtures/typescript/type-arguments/empty-new/input.ts
@@ -0,0 +1 @@
+new A<>();
diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/empty-new/output.json b/packages/babel-parser/test/fixtures/typescript/type-arguments/empty-new/output.json
@@ -0,0 +1,35 @@
+{
+  "type": "File",
+  "start":0,"end":10,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":10}},
+  "errors": [
+    "SyntaxError: Type argument list cannot be empty. (1:5)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":10,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":10}},
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start":0,"end":10,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":10}},
+        "expression": {
+          "type": "NewExpression",
+          "start":0,"end":9,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":9}},
+          "callee": {
+            "type": "Identifier",
+            "start":4,"end":5,"loc":{"start":{"line":1,"column":4},"end":{"line":1,"column":5},"identifierName":"A"},
+            "name": "A"
+          },
+          "typeParameters": {
+            "type": "TSTypeParameterInstantiation",
+            "start":5,"end":7,"loc":{"start":{"line":1,"column":5},"end":{"line":1,"column":7}},
+            "params": []
+          },
+          "arguments": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/empty-superclass/input.ts b/packages/babel-parser/test/fixtures/typescript/type-arguments/empty-superclass/input.ts
@@ -0,0 +1 @@
+class A extends B<> {}
diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/empty-superclass/output.json b/packages/babel-parser/test/fixtures/typescript/type-arguments/empty-superclass/output.json
@@ -0,0 +1,40 @@
+{
+  "type": "File",
+  "start":0,"end":22,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":22}},
+  "errors": [
+    "SyntaxError: Type argument list cannot be empty. (1:17)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":22,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":22}},
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start":0,"end":22,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":22}},
+        "id": {
+          "type": "Identifier",
+          "start":6,"end":7,"loc":{"start":{"line":1,"column":6},"end":{"line":1,"column":7},"identifierName":"A"},
+          "name": "A"
+        },
+        "superClass": {
+          "type": "Identifier",
+          "start":16,"end":17,"loc":{"start":{"line":1,"column":16},"end":{"line":1,"column":17},"identifierName":"B"},
+          "name": "B"
+        },
+        "superTypeParameters": {
+          "type": "TSTypeParameterInstantiation",
+          "start":17,"end":19,"loc":{"start":{"line":1,"column":17},"end":{"line":1,"column":19}},
+          "params": []
+        },
+        "body": {
+          "type": "ClassBody",
+          "start":20,"end":22,"loc":{"start":{"line":1,"column":20},"end":{"line":1,"column":22}},
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/empty-tsx/input.ts b/packages/babel-parser/test/fixtures/typescript/type-arguments/empty-tsx/input.ts
@@ -0,0 +1 @@
+var a = <Comp<>></Comp>
diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/empty-tsx/options.json b/packages/babel-parser/test/fixtures/typescript/type-arguments/empty-tsx/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["jsx", "typescript"]
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/empty-tsx/output.json b/packages/babel-parser/test/fixtures/typescript/type-arguments/empty-tsx/output.json
@@ -0,0 +1,62 @@
+{
+  "type": "File",
+  "start":0,"end":23,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":23}},
+  "errors": [
+    "SyntaxError: Type argument list cannot be empty. (1:13)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":23,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":23}},
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start":0,"end":23,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":23}},
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start":4,"end":23,"loc":{"start":{"line":1,"column":4},"end":{"line":1,"column":23}},
+            "id": {
+              "type": "Identifier",
+              "start":4,"end":5,"loc":{"start":{"line":1,"column":4},"end":{"line":1,"column":5},"identifierName":"a"},
+              "name": "a"
+            },
+            "init": {
+              "type": "JSXElement",
+              "start":8,"end":23,"loc":{"start":{"line":1,"column":8},"end":{"line":1,"column":23}},
+              "openingElement": {
+                "type": "JSXOpeningElement",
+                "start":8,"end":16,"loc":{"start":{"line":1,"column":8},"end":{"line":1,"column":16}},
+                "name": {
+                  "type": "JSXIdentifier",
+                  "start":9,"end":13,"loc":{"start":{"line":1,"column":9},"end":{"line":1,"column":13}},
+                  "name": "Comp"
+                },
+                "typeParameters": {
+                  "type": "TSTypeParameterInstantiation",
+                  "start":13,"end":15,"loc":{"start":{"line":1,"column":13},"end":{"line":1,"column":15}},
+                  "params": []
+                },
+                "attributes": [],
+                "selfClosing": false
+              },
+              "closingElement": {
+                "type": "JSXClosingElement",
+                "start":16,"end":23,"loc":{"start":{"line":1,"column":16},"end":{"line":1,"column":23}},
+                "name": {
+                  "type": "JSXIdentifier",
+                  "start":18,"end":22,"loc":{"start":{"line":1,"column":18},"end":{"line":1,"column":22}},
+                  "name": "Comp"
+                }
+              },
+              "children": []
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/empty-type-import/input.ts b/packages/babel-parser/test/fixtures/typescript/type-arguments/empty-type-import/input.ts
@@ -0,0 +1 @@
+let a: import("")<>;