disallow mixins/implements in flow interface (#15479)

babel · Mar 9, 2023 · 6e3dffe · 6e3dffe
1 parent d251d86
commit 6e3dffe
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 17 deletions.
diff --git a/packages/babel-parser/src/plugins/flow/index.ts b/packages/babel-parser/src/plugins/flow/index.ts
@@ -692,16 +692,13 @@ export default (superClass: typeof Parser) =>
       node: Undone<N.FlowDeclareInterface>,
     ): N.FlowDeclareInterface {
       this.next();
-      this.flowParseInterfaceish(node);
+      this.flowParseInterfaceish(node, /* isClass */ false);
       return this.finishNode(node, "DeclareInterface");
     }
 
     // Interfaces
 
-    flowParseInterfaceish(
-      node: Undone<N.FlowDeclare>,
-      isClass: boolean = false,
-    ): void {
+    flowParseInterfaceish(node: Undone<N.FlowDeclare>, isClass: boolean): void {
       node.id = this.flowParseRestrictedIdentifier(
         /* liberal */ !isClass,
         /* declaration */ true,
@@ -729,18 +726,18 @@ export default (superClass: typeof Parser) =>
         } while (!isClass && this.eat(tt.comma));
       }
 
-      if (this.isContextual(tt._mixins)) {
-        this.next();
-        do {
-          node.mixins.push(this.flowParseInterfaceExtends());
-        } while (this.eat(tt.comma));
-      }
+      if (isClass) {
+        if (this.eatContextual(tt._mixins)) {
+          do {
+            node.mixins.push(this.flowParseInterfaceExtends());
+          } while (this.eat(tt.comma));
+        }
 
-      if (this.isContextual(tt._implements)) {
-        this.next();
-        do {
-          node.implements.push(this.flowParseInterfaceExtends());
-        } while (this.eat(tt.comma));
+        if (this.eatContextual(tt._implements)) {
+          do {
+            node.implements.push(this.flowParseInterfaceExtends());
+          } while (this.eat(tt.comma));
+        }
       }
 
       node.body = this.flowParseObjectType({
@@ -766,7 +763,7 @@ export default (superClass: typeof Parser) =>
     }
 
     flowParseInterface(node: Undone<N.FlowInterface>): N.FlowInterface {
-      this.flowParseInterfaceish(node);
+      this.flowParseInterfaceish(node, /* isClass */ false);
       return this.finishNode(node, "InterfaceDeclaration");
     }
 

diff --git a/packages/babel-parser/test/fixtures/flow/interface-types/invalid-declare-implements/input.js b/packages/babel-parser/test/fixtures/flow/interface-types/invalid-declare-implements/input.js
@@ -0,0 +1 @@
+declare interface A implements I { p: string }
diff --git a/...s/babel-parser/test/fixtures/flow/interface-types/invalid-declare-implements/options.json b/...s/babel-parser/test/fixtures/flow/interface-types/invalid-declare-implements/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \"{\" (1:20)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/interface-types/invalid-declare-mixins/input.js b/packages/babel-parser/test/fixtures/flow/interface-types/invalid-declare-mixins/input.js
@@ -0,0 +1 @@
+declare interface A mixins M { p: string }
diff --git a/packages/babel-parser/test/fixtures/flow/interface-types/invalid-declare-mixins/options.json b/packages/babel-parser/test/fixtures/flow/interface-types/invalid-declare-mixins/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \"{\" (1:20)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/interface-types/invalid-implements/input.js b/packages/babel-parser/test/fixtures/flow/interface-types/invalid-implements/input.js
@@ -0,0 +1 @@
+interface A implements I { p: string }
diff --git a/packages/babel-parser/test/fixtures/flow/interface-types/invalid-implements/options.json b/packages/babel-parser/test/fixtures/flow/interface-types/invalid-implements/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \"{\" (1:12)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/interface-types/invalid-mixins/input.js b/packages/babel-parser/test/fixtures/flow/interface-types/invalid-mixins/input.js
@@ -0,0 +1 @@
+interface A mixins M { p: string }
diff --git a/packages/babel-parser/test/fixtures/flow/interface-types/invalid-mixins/options.json b/packages/babel-parser/test/fixtures/flow/interface-types/invalid-mixins/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \"{\" (1:12)"
+}