Merge pull request #3203 from samwgoldman/flow-mixins-6.x

Add support for mixins to Babel 6.x
2015-12-27 21:04:40 +00:00
parent 5fa8092725 5cfec9d8ca
commit 5ca1cf0506
10 changed files with 240 additions and 0 deletions
--- a/packages/babylon/src/plugins/flow.js
+++ b/packages/babylon/src/plugins/flow.js
@@ -109,6 +109,7 @@ pp.flowParseInterfaceish = function (node, allowStatic) {
  }

  node.extends = [];
+  node.mixins = [];

  if (this.eat(tt._extends)) {
    do {
@@ -116,6 +117,13 @@ pp.flowParseInterfaceish = function (node, allowStatic) {
    } while (this.eat(tt.comma));
  }

+  if (this.isContextual("mixins")) {
+    this.next();
+    do {
+      node.mixins.push(this.flowParseInterfaceExtends());
+    } while (this.eat(tt.comma));
+  }
+
  node.body = this.flowParseObjectType(allowStatic);
 };