fix(13520): disallow default exporting interface without a name

babel · Jul 31, 2021 · f837612 · f837612
1 parent d3a7cd5
commit f837612
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 6 deletions.
diff --git a/packages/babel-parser/src/plugins/typescript/index.js b/packages/babel-parser/src/plugins/typescript/index.js
@@ -102,6 +102,8 @@ const TSErrors = makeErrorTemplates(
       "'override' modifier cannot appear on an index signature.",
     IndexSignatureHasStatic:
       "Index signatures cannot have the 'static' modifier.",
+    InvalidInterfaceDeclarationInExportDefault:
+      "'export default interface' must be followed by an identifier.",
     InvalidModifierOnTypeMember:
       "'%0' modifier cannot appear on a type member.",
     InvalidModifiersOrder: "'%0' modifier must precede '%1' modifier.",
@@ -2305,13 +2307,23 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       // export default interface allowed in:
       // https://github.com/Microsoft/TypeScript/pull/16040
       if (this.state.value === "interface") {
-        const result = this.tsParseDeclaration(
-          this.startNode(),
-          this.state.value,
-          true,
-        );
+        const interfaceNode = this.startNode();
+        const prevValue = this.state.value;
+        this.next();
 
-        if (result) return result;
+        if (this.state.type === tt.name) {
+          const result = this.tsParseDeclaration(
+            interfaceNode,
+            prevValue,
+            false,
+          );
+          if (result) return result;
+        } else {
+          this.raise(
+            this.state.start,
+            TSErrors.InvalidInterfaceDeclarationInExportDefault,
+          );
+        }
       }
 
       return super.parseExportDefaultExpression();

diff --git a/packages/babel-parser/test/fixtures/typescript/interface/export-default/input.ts b/packages/babel-parser/test/fixtures/typescript/interface/export-default/input.ts
@@ -0,0 +1 @@
+export default interface {}
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/export-default/output.json b/packages/babel-parser/test/fixtures/typescript/interface/export-default/output.json
@@ -0,0 +1,26 @@
+{
+  "type": "File",
+  "start":0,"end":27,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":27}},
+  "errors": [
+    "SyntaxError: 'export default interface' must be followed by an identifier. (1:25)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":27,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":27}},
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportDefaultDeclaration",
+        "start":0,"end":27,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":27}},
+        "exportKind": "value",
+        "declaration": {
+          "type": "ObjectExpression",
+          "start":25,"end":27,"loc":{"start":{"line":1,"column":25},"end":{"line":1,"column":27}},
+          "properties": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}