babel-source 4.6.1 → 4.6.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmQ2NzUzYWFhMzRmMDg5Nzk3ODYwNGZlM2M3ZDk2MmI0MWE1NWE0Mg==
+    OWU2YTk4NjM0ZGJjNDRiNDVmMjgzZDIwMzEyN2UxMWNiZTdhZTA3NQ==
   data.tar.gz: !binary |-
-    NGY3ZGM3NDg4YTU4ZWQxOTI2YTA4YzRlZDE2YTk2NWMxNjU1ZjA1OA==
+    YzcyODJhMGRiMDBmMmZmZDE4NjVmOWExODc0MGM3NDk5OTRmYmQ3Mw==
 SHA512:
   metadata.gz: !binary |-
-    MjgyNjhjMmRkZTliNDRkYjhiYzJhOWUwMmQ4M2E0ZWJmMzE1NDgwMzYwNzI3
-    MDhiM2RmYzBkNjEwNzlmYjQxMTcyNWJmNGM4N2MyYTFkZjRjODEwNTE4YTdm
-    ZTAyMzdmYWY4Njg0YzUyZjBhZmE4ZTk0OGRmNjliMTZiZGM5MWQ=
+    YmI2N2EyNTE3M2JkMWQ3YmQzYzJkYTI0YWQyMGJhODg2ZmMzNDllZTA3ZWMz
+    MmMxMmI0NmJiODFjYjc2OGQ0OTlmNjU5ODUzMjQ0NjU0ZmQ1OWFlYzlmMWU2
+    ZDE0MzJjODNhYTM0OWIxNGQzZjFhOWY0ZjE4NzE1MzkyOWEyMWU=
   data.tar.gz: !binary |-
-    NDUwNWVjMzhjODBiYTMyYTFlOWFjOWRhYTg4OGQzZGVmNTA2NDNmZDE3MWM5
-    OTQ0ODY4ZDNmYjM3MmM5MzJmNzUxNWNkNDA1ZTg1ZTY0Yzc4OTlmYjVlOWFj
-    MGFmNmIyOGI2MWNkYWIzZjcxYmE1NmE2NTk4NWM2MjM1YWEyZWI=
+    MWM0YmE5MDgyNmZmNjNkNmUxZmM3YTAwODQyOGJiNTc1MTQxOTllYTNkMWQ4
+    ZTBmNTdkODc0MDA4ZjMxZjY0YTM0NjVkYjQwYmJhYWU2YjlhMTc0NmQ5ZDE0
+    MzgxZjNjNmQyYjcyYTllZTNiMjM4Nzc5NGFlNDFhZmU0Zjg2NTU=

data/lib/babel.js

@@ -318,9 +318,11 @@ exports.__esModule = true;
 },{}],4:[function(require,module,exports){
 "use strict";
 
+exports.ClassDeclaration = ClassDeclaration;
 exports.ClassBody = ClassBody;
 exports.MethodDefinition = MethodDefinition;
-exports.ClassExpression = exports.ClassDeclaration = function (node, print) {
+
+function ClassDeclaration(node, print) {
   this.push("class");
 
   if (node.id) {
@@ -328,14 +330,24 @@ exports.ClassExpression = exports.ClassDeclaration = function (node, print) {
     print(node.id);
   }
 
+  print(node.typeParameters);
+
   if (node.superClass) {
     this.push(" extends ");
     print(node.superClass);
+    print(node.superTypeParameters);
+  }
+
+  if (node["implements"]) {
+    this.push(" implements ");
+    print.join(node["implements"], { separator: ", " });
   }
 
   this.space();
   print(node.body);
-};
+}
+
+exports.ClassExpression = ClassDeclaration;
 
 function ClassBody(node, print) {
   if (node.body.length === 0) {
@@ -568,10 +580,270 @@ exports.__esModule = true;
 },{"../../types":122,"is-integer":188,"lodash/lang/isNumber":292}],7:[function(require,module,exports){
 "use strict";
 
-exports.AnyTypeAnnotation = exports.ArrayTypeAnnotation = exports.BooleanTypeAnnotation = exports.ClassProperty = exports.DeclareClass = exports.DeclareFunction = exports.DeclareModule = exports.DeclareVariable = exports.FunctionTypeAnnotation = exports.FunctionTypeParam = exports.GenericTypeAnnotation = exports.InterfaceExtends = exports.InterfaceDeclaration = exports.IntersectionTypeAnnotation = exports.NullableTypeAnnotation = exports.NumberTypeAnnotation = exports.StringLiteralTypeAnnotation = exports.StringTypeAnnotation = exports.TupleTypeAnnotation = exports.TypeofTypeAnnotation = exports.TypeAlias = exports.TypeAnnotation = exports.TypeParameterDeclaration = exports.TypeParameterInstantiation = exports.ObjectTypeAnnotation = exports.ObjectTypeCallProperty = exports.ObjectTypeIndexer = exports.ObjectTypeProperty = exports.QualifiedTypeIdentifier = exports.UnionTypeAnnotation = exports.TypeCastExpression = exports.VoidTypeAnnotation = function () {};
+var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
+
+exports.AnyTypeAnnotation = AnyTypeAnnotation;
+exports.ArrayTypeAnnotation = ArrayTypeAnnotation;
+exports.BooleanTypeAnnotation = BooleanTypeAnnotation;
+exports.ClassProperty = ClassProperty;
+exports.DeclareClass = DeclareClass;
+exports.DeclareFunction = DeclareFunction;
+exports.DeclareModule = DeclareModule;
+exports.DeclareVariable = DeclareVariable;
+exports.FunctionTypeAnnotation = FunctionTypeAnnotation;
+exports.FunctionTypeParam = FunctionTypeParam;
+exports.InterfaceExtends = InterfaceExtends;
+exports._interfaceish = _interfaceish;
+exports.InterfaceDeclaration = InterfaceDeclaration;
+exports.IntersectionTypeAnnotation = IntersectionTypeAnnotation;
+exports.NullableTypeAnnotation = NullableTypeAnnotation;
+exports.NumberTypeAnnotation = NumberTypeAnnotation;
+exports.StringLiteralTypeAnnotation = StringLiteralTypeAnnotation;
+exports.StringTypeAnnotation = StringTypeAnnotation;
+exports.TupleTypeAnnotation = TupleTypeAnnotation;
+exports.TypeofTypeAnnotation = TypeofTypeAnnotation;
+exports.TypeAlias = TypeAlias;
+exports.TypeAnnotation = TypeAnnotation;
+exports.TypeParameterInstantiation = TypeParameterInstantiation;
+exports.ObjectTypeAnnotation = ObjectTypeAnnotation;
+exports.ObjectTypeCallProperty = ObjectTypeCallProperty;
+exports.ObjectTypeIndexer = ObjectTypeIndexer;
+exports.ObjectTypeProperty = ObjectTypeProperty;
+exports.QualifiedTypeIdentifier = QualifiedTypeIdentifier;
+exports.UnionTypeAnnotation = UnionTypeAnnotation;
+exports.TypeCastExpression = TypeCastExpression;
+exports.VoidTypeAnnotation = VoidTypeAnnotation;
+
+var t = _interopRequire(require("../../types"));
+
+function AnyTypeAnnotation() {
+  this.push("any");
+}
+
+function ArrayTypeAnnotation(node, print) {
+  print(node.elementType);
+  this.push("[");
+  this.push("]");
+}
+
+function BooleanTypeAnnotation(node) {
+  this.push("bool");
+}
+
+function ClassProperty(node, print) {
+  if (node["static"]) this.push("static ");
+  print(node.key);
+  print(node.typeAnnotation);
+  this.semicolon();
+}
+
+function DeclareClass(node, print) {
+  this.push("declare class ");
+  this._interfaceish(node, print);
+}
+
+function DeclareFunction(node, print) {
+  this.push("declare function ");
+  print(node.id);
+  print(node.id.typeAnnotation.typeAnnotation);
+  this.semicolon();
+}
+
+function DeclareModule(node, print) {
+  this.push("declare module ");
+  print(node.id);
+  this.space();
+  print(node.body);
+}
+
+function DeclareVariable(node, print) {
+  this.push("declare var ");
+  print(node.id);
+  print(node.id.typeAnnotation);
+  this.semicolon();
+}
+
+function FunctionTypeAnnotation(node, print, parent) {
+  print(node.typeParameters);
+  this.push("(");
+  print.list(node.params);
+
+  if (node.rest) {
+    if (node.params.length) {
+      this.push(",");
+      this.space();
+    }
+    this.push("...");
+    print(node.rest);
+  }
+
+  this.push(")");
+
+  // this node type is overloaded, not sure why but it makes it EXTREMELY annoying
+  if (parent.type === "ObjectTypeProperty" || parent.type === "ObjectTypeCallProperty" || parent.type === "DeclareFunction") {
+    this.push(":");
+  } else {
+    this.space();
+    this.push("=>");
+  }
+
+  this.space();
+  print(node.returnType);
+}
+
+function FunctionTypeParam(node, print) {
+  print(node.name);
+  if (node.optional) this.push("?");
+  this.push(":");
+  this.space();
+  print(node.typeAnnotation);
+}
+
+function InterfaceExtends(node, print) {
+  print(node.id);
+  print(node.typeParameters);
+}
+
+exports.ClassImplements = InterfaceExtends;
+exports.GenericTypeAnnotation = InterfaceExtends;
+
+function _interfaceish(node, print) {
+  print(node.id);
+  print(node.typeParameters);
+  if (node["extends"].length) {
+    this.push(" extends ");
+    print.join(node["extends"], { separator: ", " });
+  }
+  this.space();
+  print(node.body);
+}
+
+function InterfaceDeclaration(node, print) {
+  this.push("interface ");
+  this._interfaceish(node, print);
+}
+
+function IntersectionTypeAnnotation(node, print) {
+  print.join(node.types, { separator: " & " });
+}
+
+function NullableTypeAnnotation(node, print) {
+  this.push("?");
+  print(node.typeAnnotation);
+}
+
+function NumberTypeAnnotation() {
+  this.push("number");
+}
+
+function StringLiteralTypeAnnotation(node) {
+  this._stringLiteral(node.value);
+}
+
+function StringTypeAnnotation() {
+  this.push("string");
+}
+
+function TupleTypeAnnotation(node, print) {
+  this.push("[");
+  print.join(node.types, { separator: ", " });
+  this.push("]");
+}
+
+function TypeofTypeAnnotation(node, print) {
+  this.push("typeof ");
+  print(node.argument);
+}
 
-// todo: implement these once we have a `--keep-types` option
-},{}],8:[function(require,module,exports){
+function TypeAlias(node, print) {
+  this.push("type ");
+  print(node.id);
+  print(node.typeParameters);
+  this.space();
+  this.push("=");
+  this.space();
+  print(node.right);
+  this.semicolon();
+}
+
+function TypeAnnotation(node, print) {
+  this.push(":");
+  this.space();
+  if (node.optional) this.push("?");
+  print(node.typeAnnotation);
+}
+
+function TypeParameterInstantiation(node, print) {
+  this.push("<");
+  print.join(node.params, { separator: ", " });
+  this.push(">");
+}
+
+exports.TypeParameterDeclaration = TypeParameterInstantiation;
+
+function ObjectTypeAnnotation(node, print) {
+  this.push("{");
+  var props = node.properties.concat(node.callProperties, node.indexers);
+  if (props.length) {
+    this.space();
+    print.list(props, { indent: true, separator: "; " });
+    this.space();
+  }
+  this.push("}");
+}
+
+function ObjectTypeCallProperty(node, print) {
+  if (node["static"]) this.push("static ");
+  print(node.value);
+}
+
+function ObjectTypeIndexer(node, print) {
+  if (node["static"]) this.push("static ");
+  this.push("[");
+  print(node.id);
+  this.push(":");
+  this.space();
+  print(node.key);
+  this.push("]");
+  this.push(":");
+  this.space();
+  print(node.value);
+}
+
+function ObjectTypeProperty(node, print) {
+  if (node["static"]) this.push("static ");
+  print(node.key);
+  if (node.optional) this.push("?");
+  if (!t.isFunctionTypeAnnotation(node.value)) {
+    this.push(":");
+    this.space();
+  }
+  print(node.value);
+}
+
+function QualifiedTypeIdentifier(node, print) {
+  print(node.qualification);
+  this.push(".");
+  print(node.id);
+}
+
+function UnionTypeAnnotation(node, print) {
+  print.join(node.types, { separator: " | " });
+}
+
+function TypeCastExpression(node, print) {
+  this.push("(");
+  print(node.expression);
+  print(node.typeAnnotation);
+  this.push(")");
+}
+
+function VoidTypeAnnotation(node) {
+  this.push("void");
+}
+
+exports.__esModule = true;
+},{"../../types":122}],8:[function(require,module,exports){
 "use strict";
 
 var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
@@ -678,9 +950,21 @@ exports.ArrowFunctionExpression = ArrowFunctionExpression;
 var t = _interopRequire(require("../../types"));
 
 function _params(node, print) {
+  var _this = this;
+
+  print(node.typeParameters);
   this.push("(");
-  print.list(node.params);
+  print.list(node.params, {
+    iterator: function (node) {
+      if (node.optional) _this.push("?");
+      print(node.typeAnnotation);
+    }
+  });
   this.push(")");
+
+  if (node.returnType) {
+    print(node.returnType);
+  }
 }
 
 function _method(node, print) {
@@ -1104,14 +1388,13 @@ function PrivateDeclaration(node, print) {
 }
 
 function VariableDeclarator(node, print) {
+  print(node.id);
+  print(node.id.typeAnnotation);
   if (node.init) {
-    print(node.id);
     this.space();
     this.push("=");
     this.space();
     print(node.init);
-  } else {
-    print(node.id);
   }
 }
 
@@ -1167,6 +1450,7 @@ exports.Identifier = Identifier;
 exports.VirtualPropertyExpression = VirtualPropertyExpression;
 exports.Property = Property;
 exports.Literal = Literal;
+exports._stringLiteral = _stringLiteral;
 
 var each = _interopRequire(require("lodash/collection/each"));
 
@@ -1251,14 +1535,7 @@ function Literal(node) {
   var type = typeof val;
 
   if (type === "string") {
-    val = JSON.stringify(val);
-
-    // escape illegal js but valid json unicode characters
-    val = val.replace(/[\u000A\u000D\u2028\u2029]/g, function (c) {
-      return "\\u" + ("0000" + c.charCodeAt(0).toString(16)).slice(-4);
-    });
-
-    this.push(val);
+    this._stringLiteral(val);
   } else if (type === "number") {
     this.push(val + "");
   } else if (type === "boolean") {
@@ -1270,6 +1547,17 @@ function Literal(node) {
   }
 }
 
+function _stringLiteral(val) {
+  val = JSON.stringify(val);
+
+  // escape illegal js but valid json unicode characters
+  val = val.replace(/[\u000A\u000D\u2028\u2029]/g, function (c) {
+    return "\\u" + ("0000" + c.charCodeAt(0).toString(16)).slice(-4);
+  });
+
+  this.push(val);
+}
+
 exports.__esModule = true;
 },{"lodash/collection/each":201}],15:[function(require,module,exports){
 "use strict";
@@ -1422,7 +1710,7 @@ var CodeGenerator = (function () {
 
     var opts = arguments[2] === undefined ? {} : arguments[2];
 
-    if (!node) return "";
+    if (!node) return;
 
     if (parent && parent._compact) {
       node._compact = true;
@@ -1805,6 +2093,7 @@ each(Node, function (fn, key) {
 
 var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
 
+exports.NullableTypeAnnotation = NullableTypeAnnotation;
 exports.UpdateExpression = UpdateExpression;
 exports.ObjectExpression = ObjectExpression;
 exports.Binary = Binary;
@@ -1814,6 +2103,7 @@ exports.YieldExpression = YieldExpression;
 exports.ClassExpression = ClassExpression;
 exports.UnaryLike = UnaryLike;
 exports.FunctionExpression = FunctionExpression;
+exports.ConditionalExpression = ConditionalExpression;
 
 var each = _interopRequire(require("lodash/collection/each"));
 
@@ -1827,6 +2117,12 @@ each([["||"], ["&&"], ["|"], ["^"], ["&"], ["==", "===", "!=", "!=="], ["<", ">"
   });
 });
 
+function NullableTypeAnnotation(node, parent) {
+  return t.isArrayTypeAnnotation(parent);
+}
+
+exports.FunctionTypeAnnotation = NullableTypeAnnotation;
+
 function UpdateExpression(node, parent) {
   if (t.isMemberExpression(parent) && parent.object === node) {
     // (foo++).test()
@@ -1939,7 +2235,7 @@ function FunctionExpression(node, parent) {
   }
 }
 
-exports.AssignmentExpression = exports.ConditionalExpression = function (node, parent) {
+function ConditionalExpression(node, parent) {
   if (t.isUnaryLike(parent)) {
     return true;
   }
@@ -1963,7 +2259,9 @@ exports.AssignmentExpression = exports.ConditionalExpression = function (node, p
   }
 
   return false;
-};
+}
+
+exports.AssignmentExpression = ConditionalExpression;
 exports.__esModule = true;
 },{"../../types":122,"lodash/collection/each":201}],18:[function(require,module,exports){
 "use strict";
@@ -2703,12 +3001,12 @@ var checkTransformerVisitor = {
   }
 };
 
-var checkNode = function checkNode(stack, node, scope) {
+function checkNode(stack, node, scope) {
   each(stack, function (pass) {
     if (pass.shouldRun) return;
     pass.checkNode(node, scope);
   });
-};
+}
 
 var File = (function () {
   function File(opts) {
@@ -3275,7 +3573,7 @@ var messages = _interopRequireWildcard(require("../../messages"));
 
 var esutils = _interopRequire(require("esutils"));
 
-var react = _interopRequire(require("./react"));
+var react = _interopRequireWildcard(require("./react"));
 
 var t = _interopRequire(require("../../types"));
 
@@ -3553,6 +3851,9 @@ module.exports = function (exports, opts) {
 
 var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
 
+exports.push = push;
+exports.build = build;
+
 var cloneDeep = _interopRequire(require("lodash/lang/cloneDeep"));
 
 var traverse = _interopRequire(require("../../traversal"));
@@ -3565,7 +3866,7 @@ var has = _interopRequire(require("lodash/object/has"));
 
 var t = _interopRequire(require("../../types"));
 
-exports.push = function (mutatorMap, key, kind, computed, value) {
+function push(mutatorMap, key, kind, computed, value) {
   var alias;
 
   if (t.isIdentifier(key)) {
@@ -3591,9 +3892,9 @@ exports.push = function (mutatorMap, key, kind, computed, value) {
   }
 
   map[kind] = value;
-};
+}
 
-exports.build = function (mutatorMap) {
+function build(mutatorMap) {
   var objExpr = t.objectExpression([]);
 
   each(mutatorMap, function (map) {
@@ -3630,7 +3931,9 @@ exports.build = function (mutatorMap) {
   });
 
   return objExpr;
-};
+}
+
+exports.__esModule = true;
 },{"../../traversal":117,"../../types":122,"lodash/collection/each":201,"lodash/lang/clone":284,"lodash/lang/cloneDeep":285,"lodash/object/has":300}],35:[function(require,module,exports){
 "use strict";
 
@@ -3724,6 +4027,9 @@ var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? ob
 
 var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
 
+exports.property = property;
+exports.bare = bare;
+
 var getFunctionArity = _interopRequire(require("./get-function-arity"));
 
 var util = _interopRequireWildcard(require("../../util"));
@@ -3808,7 +4114,7 @@ var visit = function visit(node, name, scope) {
   return state;
 };
 
-exports.property = function (node, file, scope) {
+function property(node, file, scope) {
   var key = t.toComputedKey(node, node.key);
   if (!t.isLiteral(key)) return node; // we can't set a function id with this
 
@@ -3818,9 +4124,9 @@ exports.property = function (node, file, scope) {
   var method = node.value;
   var state = visit(method, name, scope);
   node.value = wrap(state, method, id, scope);
-};
+}
 
-exports.bare = function (node, parent, scope) {
+function bare(node, parent, scope) {
   // has an `id` so we don't need to infer one
   if (node.id) return;
 
@@ -3842,7 +4148,9 @@ exports.bare = function (node, parent, scope) {
 
   var state = visit(node, name, scope);
   return wrap(state, node, id, scope);
-};
+}
+
+exports.__esModule = true;
 
 // otherwise it's defined somewhere in scope like:
 //
@@ -3857,11 +4165,14 @@ exports.bare = function (node, parent, scope) {
 
 var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
 
+exports.isCreateClass = isCreateClass;
+exports.isCompatTag = isCompatTag;
+
 var t = _interopRequire(require("../../types"));
 
 var isCreateClassCallExpression = t.buildMatchMemberExpression("React.createClass");
 
-exports.isCreateClass = function (node) {
+function isCreateClass(node) {
   if (!node || !t.isCallExpression(node)) return false;
 
   // not React.createClass call member object
@@ -3876,13 +4187,15 @@ exports.isCreateClass = function (node) {
   if (!t.isObjectExpression(first)) return false;
 
   return true;
-};
+}
 
-exports.isReactComponent = t.buildMatchMemberExpression("React.Component");
+var isReactComponent = exports.isReactComponent = t.buildMatchMemberExpression("React.Component");
 
-exports.isCompatTag = function (tagName) {
+function isCompatTag(tagName) {
   return tagName && /^[a-z]|\-/.test(tagName);
-};
+}
+
+exports.__esModule = true;
 },{"../../types":122}],39:[function(require,module,exports){
 "use strict";
 
@@ -4242,14 +4555,17 @@ module.exports = ReplaceSupers;
 
 var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
 
+exports.has = has;
+exports.wrap = wrap;
+
 var t = _interopRequire(require("../../types"));
 
-exports.has = function (node) {
+function has(node) {
   var first = node.body[0];
   return t.isExpressionStatement(first) && t.isLiteral(first.expression, { value: "use strict" });
-};
+}
 
-exports.wrap = function (node, callback) {
+function wrap(node, callback) {
   var useStrictNode;
   if (exports.has(node)) {
     useStrictNode = node.body.shift();
@@ -4260,7 +4576,9 @@ exports.wrap = function (node, callback) {
   if (useStrictNode) {
     node.body.unshift(useStrictNode);
   }
-};
+}
+
+exports.__esModule = true;
 },{"../../types":122}],43:[function(require,module,exports){
 "use strict";
 
@@ -5489,10 +5807,12 @@ exports.__esModule = true;
 
 var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
 
+var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
+
 exports.check = check;
 exports.ObjectExpression = ObjectExpression;
 
-var defineMap = _interopRequire(require("../../helpers/define-map"));
+var defineMap = _interopRequireWildcard(require("../../helpers/define-map"));
 
 var t = _interopRequire(require("../../../types"));
 
@@ -5529,7 +5849,7 @@ exports.ArrowFunctionExpression = ArrowFunctionExpression;
 
 var t = _interopRequire(require("../../../types"));
 
-exports.check = t.isArrowFunctionExpression;
+var check = exports.check = t.isArrowFunctionExpression;
 
 function ArrowFunctionExpression(node) {
   t.ensureBlock(node);
@@ -5547,6 +5867,8 @@ exports.__esModule = true;
 
 var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
 
+exports.BlockStatement = BlockStatement;
+
 var t = _interopRequire(require("../../../types"));
 
 var visitor = {
@@ -5572,9 +5894,9 @@ var visitor = {
   }
 };
 
-exports.optional = true;
+var optional = exports.optional = true;
 
-exports.Loop = exports.Program = exports.BlockStatement = function (node, parent, scope, file) {
+function BlockStatement(node, parent, scope, file) {
   var letRefs = node._letReferences;
   if (!letRefs) return;
 
@@ -5584,7 +5906,11 @@ exports.Loop = exports.Program = exports.BlockStatement = function (node, parent
   };
 
   scope.traverse(node, visitor, state);
-};
+}
+
+exports.Program = BlockStatement;
+exports.Loop = BlockStatement;
+exports.__esModule = true;
 },{"../../../types":122}],63:[function(require,module,exports){
 "use strict";
 
@@ -5594,6 +5920,11 @@ var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["defau
 
 var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } };
 
+exports.check = check;
+exports.VariableDeclaration = VariableDeclaration;
+exports.Loop = Loop;
+exports.BlockStatement = BlockStatement;
+
 var traverse = _interopRequire(require("../../../traversal"));
 
 var object = _interopRequire(require("../../../helpers/object"));
@@ -5606,11 +5937,7 @@ var values = _interopRequire(require("lodash/object/values"));
 
 var extend = _interopRequire(require("lodash/object/extend"));
 
-exports.check = function (node) {
-  return t.isVariableDeclaration(node) && (node.kind === "let" || node.kind === "const");
-};
-
-var isLet = function isLet(node, parent) {
+function isLet(node, parent) {
   if (!t.isVariableDeclaration(node)) return false;
   if (node._let) return true;
   if (node.kind !== "let") return false;
@@ -5627,23 +5954,27 @@ var isLet = function isLet(node, parent) {
   node._let = true;
   node.kind = "var";
   return true;
-};
+}
 
-var isLetInitable = function isLetInitable(node, parent) {
+function isLetInitable(node, parent) {
   return !t.isFor(parent) || !t.isFor(parent, { left: node });
-};
+}
 
-var isVar = function isVar(node, parent) {
+function isVar(node, parent) {
   return t.isVariableDeclaration(node, { kind: "var" }) && !isLet(node, parent);
-};
+}
 
-var standardizeLets = function standardizeLets(declars) {
+function standardizeLets(declars) {
   for (var i = 0; i < declars.length; i++) {
     delete declars[i]._let;
   }
-};
+}
+
+function check(node) {
+  return t.isVariableDeclaration(node) && (node.kind === "let" || node.kind === "const");
+}
 
-exports.VariableDeclaration = function (node, parent, scope, file) {
+function VariableDeclaration(node, parent, scope, file) {
   if (!isLet(node, parent)) return;
 
   if (isLetInitable(node) && file.transformers["es6.blockScopingTDZ"].canRun()) {
@@ -5663,9 +5994,9 @@ exports.VariableDeclaration = function (node, parent, scope, file) {
 
     return nodes;
   }
-};
+}
 
-exports.Loop = function (node, parent, scope, file) {
+function Loop(node, parent, scope, file) {
   var init = node.left || node.init;
   if (isLet(init, node)) {
     t.ensureBlock(node);
@@ -5673,14 +6004,16 @@ exports.Loop = function (node, parent, scope, file) {
   }
   var blockScoping = new BlockScoping(node, node.body, parent, scope, file);
   blockScoping.run();
-};
+}
 
-exports.Program = exports.BlockStatement = function (block, parent, scope, file) {
+function BlockStatement(block, parent, scope, file) {
   if (!t.isLoop(parent)) {
     var blockScoping = new BlockScoping(false, block, parent, scope, file);
     blockScoping.run();
   }
-};
+}
+
+exports.Program = BlockStatement;
 
 function replace(node, parent, scope, remaps) {
   if (!t.isReferencedIdentifier(node, parent)) return;
@@ -6157,6 +6490,8 @@ var BlockScoping = (function () {
 
   return BlockScoping;
 })();
+
+exports.__esModule = true;
 },{"../../../helpers/object":24,"../../../traversal":117,"../../../types":122,"../../../util":124,"lodash/object/extend":299,"lodash/object/values":303}],64:[function(require,module,exports){
 "use strict";
 
@@ -6166,11 +6501,14 @@ var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["defau
 
 var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } };
 
+exports.ClassDeclaration = ClassDeclaration;
+exports.ClassExpression = ClassExpression;
+
 var ReplaceSupers = _interopRequire(require("../../helpers/replace-supers"));
 
-var nameMethod = _interopRequire(require("../../helpers/name-method"));
+var nameMethod = _interopRequireWildcard(require("../../helpers/name-method"));
 
-var defineMap = _interopRequire(require("../../helpers/define-map"));
+var defineMap = _interopRequireWildcard(require("../../helpers/define-map"));
 
 var messages = _interopRequireWildcard(require("../../../messages"));
 
@@ -6178,13 +6516,13 @@ var util = _interopRequireWildcard(require("../../../util"));
 
 var t = _interopRequire(require("../../../types"));
 
-exports.check = t.isClass;
+var check = exports.check = t.isClass;
 
-exports.ClassDeclaration = function (node, parent, scope, file) {
+function ClassDeclaration(node, parent, scope, file) {
   return new ClassTransformer(node, file, scope, true).run();
-};
+}
 
-exports.ClassExpression = function (node, parent, scope, file) {
+function ClassExpression(node, parent, scope, file) {
   if (!node.id) {
     if (t.isProperty(parent) && parent.value === node && !parent.computed && t.isIdentifier(parent.key)) {
       // var o = { foo: class {} };
@@ -6198,7 +6536,7 @@ exports.ClassExpression = function (node, parent, scope, file) {
   }
 
   return new ClassTransformer(node, file, scope, false).run();
-};
+}
 
 var ClassTransformer = (function () {
 
@@ -6463,6 +6801,8 @@ var ClassTransformer = (function () {
 
   return ClassTransformer;
 })();
+
+exports.__esModule = true;
 },{"../../../messages":27,"../../../types":122,"../../../util":124,"../../helpers/define-map":34,"../../helpers/name-method":37,"../../helpers/replace-supers":41}],65:[function(require,module,exports){
 "use strict";
 
@@ -6470,13 +6810,17 @@ var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["defau
 
 var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
 
+exports.check = check;
+exports.Scopable = Scopable;
+exports.VariableDeclaration = VariableDeclaration;
+
 var messages = _interopRequireWildcard(require("../../../messages"));
 
 var t = _interopRequire(require("../../../types"));
 
-exports.check = function (node) {
+function check(node) {
   return t.isVariableDeclaration(node, { kind: "const" });
-};
+}
 
 var visitor = {
   enter: function enter(node, parent, scope, state) {
@@ -6509,16 +6853,18 @@ var visitor = {
   }
 };
 
-exports.Scopable = function (node, parent, scope, file) {
+function Scopable(node, parent, scope, file) {
   scope.traverse(node, visitor, {
     constants: scope.getAllBindingsOfKind("const"),
     file: file
   });
-};
+}
 
-exports.VariableDeclaration = function (node) {
+function VariableDeclaration(node) {
   if (node.kind === "const") node.kind = "let";
-};
+}
+
+exports.__esModule = true;
 },{"../../../messages":27,"../../../types":122}],66:[function(require,module,exports){
 "use strict";
 
@@ -6528,13 +6874,19 @@ var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? ob
 
 var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } };
 
+exports.ForOfStatement = ForOfStatement;
+exports.CatchClause = CatchClause;
+exports.ExpressionStatement = ExpressionStatement;
+exports.AssignmentExpression = AssignmentExpression;
+exports.VariableDeclaration = VariableDeclaration;
+
 var messages = _interopRequireWildcard(require("../../../messages"));
 
 var t = _interopRequire(require("../../../types"));
 
-exports.check = t.isPattern;
+var check = exports.check = t.isPattern;
 
-exports.ForInStatement = exports.ForOfStatement = function (node, parent, scope, file) {
+function ForOfStatement(node, parent, scope, file) {
   var left = node.left;
 
   if (t.isPattern(left)) {
@@ -6574,7 +6926,9 @@ exports.ForInStatement = exports.ForOfStatement = function (node, parent, scope,
 
   var block = node.body;
   block.body = nodes.concat(block.body);
-};
+}
+
+exports.ForInStatement = ForOfStatement;
 
 exports.Function = function (node, parent, scope, file) {
   var nodes = [];
@@ -6606,7 +6960,7 @@ exports.Function = function (node, parent, scope, file) {
   block.body = nodes.concat(block.body);
 };
 
-exports.CatchClause = function (node, parent, scope, file) {
+function CatchClause(node, parent, scope, file) {
   var pattern = node.param;
   if (!t.isPattern(pattern)) return;
 
@@ -6626,9 +6980,9 @@ exports.CatchClause = function (node, parent, scope, file) {
   node.body.body = nodes.concat(node.body.body);
 
   return node;
-};
+}
 
-exports.ExpressionStatement = function (node, parent, scope, file) {
+function ExpressionStatement(node, parent, scope, file) {
   var expr = node.expression;
   if (expr.type !== "AssignmentExpression") return;
   if (!t.isPattern(expr.left)) return;
@@ -6648,9 +7002,9 @@ exports.ExpressionStatement = function (node, parent, scope, file) {
   destructuring.init(expr.left, ref);
 
   return nodes;
-};
+}
 
-exports.AssignmentExpression = function (node, parent, scope, file) {
+function AssignmentExpression(node, parent, scope, file) {
   if (!t.isPattern(node.left)) return;
 
   var ref = scope.generateUidIdentifier("temp");
@@ -6673,18 +7027,18 @@ exports.AssignmentExpression = function (node, parent, scope, file) {
   nodes.push(ref);
 
   return t.toSequenceExpression(nodes, scope);
-};
+}
 
-var variableDeclarationHasPattern = function variableDeclarationHasPattern(node) {
+function variableDeclarationHasPattern(node) {
   for (var i = 0; i < node.declarations.length; i++) {
     if (t.isPattern(node.declarations[i].id)) {
       return true;
     }
   }
   return false;
-};
+}
 
-exports.VariableDeclaration = function (node, parent, scope, file) {
+function VariableDeclaration(node, parent, scope, file) {
   if (t.isForInStatement(parent) || t.isForOfStatement(parent)) return;
   if (!variableDeclarationHasPattern(node)) return;
 
@@ -6738,7 +7092,9 @@ exports.VariableDeclaration = function (node, parent, scope, file) {
   }
 
   return nodes;
-};
+}
+
+;
 
 var hasRest = function hasRest(pattern) {
   for (var i = 0; i < pattern.elements.length; i++) {
@@ -6989,6 +7345,8 @@ var DestructuringTransformer = (function () {
 
   return DestructuringTransformer;
 })();
+
+exports.__esModule = true;
 },{"../../../messages":27,"../../../types":122}],67:[function(require,module,exports){
 "use strict";
 
@@ -6996,15 +7354,17 @@ var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["defau
 
 var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
 
+exports.ForOfStatement = ForOfStatement;
+
 var messages = _interopRequireWildcard(require("../../../messages"));
 
 var util = _interopRequireWildcard(require("../../../util"));
 
 var t = _interopRequire(require("../../../types"));
 
-exports.check = t.isForOfStatement;
+var check = exports.check = t.isForOfStatement;
 
-exports.ForOfStatement = function (node, parent, scope, file) {
+function ForOfStatement(node, parent, scope, file) {
   var callback = spec;
   if (file.isLoose("es6.forOf")) callback = loose;
 
@@ -7033,7 +7393,7 @@ exports.ForOfStatement = function (node, parent, scope, file) {
   loop._scopeInfo = node._scopeInfo;
 
   return build.node;
-};
+}
 
 var breakVisitor = {
   enter: function enter(node, parent, scope, state) {
@@ -7159,6 +7519,7 @@ var spec = function spec(node, parent, scope, file) {
     node: template
   };
 };
+exports.__esModule = true;
 },{"../../../messages":27,"../../../types":122,"../../../util":124}],68:[function(require,module,exports){
 "use strict";
 
@@ -7390,7 +7751,7 @@ var util = _interopRequireWildcard(require("../../../util"));
 
 var t = _interopRequire(require("../../../types"));
 
-exports.check = t.isRestElement;
+var check = exports.check = t.isRestElement;
 
 var memberExpressionOptimisationVisitor = {
   enter: function enter(node, parent, scope, state) {
@@ -7416,27 +7777,26 @@ var memberExpressionOptimisationVisitor = {
       // optimise it
       var prop = parent.property;
       if (isNumber(prop.value) || t.isUnaryExpression(prop) || t.isBinaryExpression(prop)) {
-        optimizeMemberExpression(node, parent, state.method.params.length);
-        state.hasShorthand = true;
+        state.candidates.push(this);
+        state.canOptimise = true;
         return;
       }
     }
 
-    state.longForm = true;
+    state.canOptimise = false;
+    this.stop();
   }
 };
 
-function optimizeMemberExpression(node, parent, offset) {
+function optimizeMemberExpression(parent, offset) {
   var newExpr;
   var prop = parent.property;
 
   if (t.isLiteral(prop)) {
-    node.name = "arguments";
     prop.value += offset;
     prop.raw = String(prop.value);
   } else {
     // // UnaryExpression, BinaryExpression
-    node.name = "arguments";
     newExpr = t.binaryExpression("+", prop, t.literal(offset));
     parent.property = newExpr;
   }
@@ -7471,15 +7831,23 @@ exports.Function = function (node, parent, scope) {
 
   var state = {
     outerBinding: scope.getBindingIdentifier(rest.name),
-    hasShorthand: true,
-    longForm: false,
+    canOptimise: false,
+    candidates: [],
     method: node,
-    name: rest.name };
+    name: rest.name
+  };
 
   scope.traverse(node, memberExpressionOptimisationVisitor, state);
 
   // we only have shorthands and there's no other references
-  if (!state.longForm && state.hasShorthand) return;
+  if (state.canOptimise) {
+    for (var i = 0; i < state.candidates.length; i++) {
+      var candidate = state.candidates[i];
+      candidate.node = argsId;
+      optimizeMemberExpression(candidate.parent, node.params.length);
+    }
+    return;
+  }
 
   //
 
@@ -7517,6 +7885,7 @@ exports.Function = function (node, parent, scope) {
   loop._blockHoist = node.params.length + 1;
   node.body.body.unshift(loop);
 };
+exports.__esModule = true;
 },{"../../../types":122,"../../../util":124,"lodash/lang/isNumber":292}],72:[function(require,module,exports){
 "use strict";
 
@@ -7732,8 +8101,6 @@ var includes = _interopRequire(require("lodash/collection/includes"));
 
 var t = _interopRequire(require("../../../types"));
 
-exports.check = t.isSpreadElement;
-
 function getSpreadLiteral(spread, scope) {
   return scope.toArray(spread.argument, true);
 }
@@ -7773,6 +8140,8 @@ function build(props, scope) {
   return nodes;
 }
 
+var check = exports.check = t.isSpreadElement;
+
 function ArrayExpression(node, parent, scope) {
   var elements = node.elements;
   if (!hasSpread(elements)) return;
@@ -8698,6 +9067,9 @@ module.exports = {
 
 var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
 
+exports.Program = Program;
+exports.FunctionDeclaration = FunctionDeclaration;
+
 var t = _interopRequire(require("../../../types"));
 
 var functionChildrenVisitor = {
@@ -8775,18 +9147,23 @@ var go = function go(getBody, node, scope) {
   }
 };
 
-exports.Program = function (node, parent, scope) {
+function Program(node, parent, scope) {
   go(function () {
     return node.body;
   }, node, scope);
-};
+}
+
+;
 
-exports.FunctionDeclaration = exports.FunctionExpression = function (node, parent, scope) {
+function FunctionDeclaration(node, parent, scope) {
   go(function () {
     t.ensureBlock(node);
     return node.body.body;
   }, node, scope);
-};
+}
+
+exports.FunctionExpression = FunctionDeclaration;
+exports.__esModule = true;
 },{"../../../types":122}],85:[function(require,module,exports){
 "use strict";
 
@@ -8805,7 +9182,7 @@ var values = _interopRequire(require("lodash/object/values"));
 //  - 2 Priority over normal nodes
 //  - 3 We want this to be at the **very** top
 
-exports.BlockStatement = exports.Program = {
+var BlockStatement = exports.BlockStatement = {
   exit: function exit(node) {
     var hasChange = false;
     for (var i = 0; i < node.body.length; i++) {
@@ -8824,30 +9201,44 @@ exports.BlockStatement = exports.Program = {
     node.body = flatten(values(nodePriorities).reverse());
   }
 };
+
+exports.Program = BlockStatement;
+exports.__esModule = true;
 },{"lodash/array/flatten":196,"lodash/collection/groupBy":203,"lodash/object/values":303}],86:[function(require,module,exports){
 "use strict";
 
-exports.SequenceExpression = SequenceExpression;
-
-function SequenceExpression(node) {
-  if (node.expressions.length === 1) {
-    return node.expressions[0];
+var SequenceExpression = exports.SequenceExpression = {
+  exit: function exit(node) {
+    if (node.expressions.length === 1) {
+      return node.expressions[0];
+    } else if (!node.expressions.length) {
+      this.remove();
+    }
   }
-}
+};
 
+var ExpressionStatement = exports.ExpressionStatement = {
+  exit: function exit(node) {
+    if (!node.expression) this.remove();
+  }
+};
 exports.__esModule = true;
 },{}],87:[function(require,module,exports){
 "use strict";
 
 var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
 
-var useStrict = _interopRequire(require("../../helpers/use-strict"));
+var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
+
+exports.BlockStatement = BlockStatement;
+
+var useStrict = _interopRequireWildcard(require("../../helpers/use-strict"));
 
 var t = _interopRequire(require("../../../types"));
 
 var secondPass = exports.secondPass = true;
 
-exports.BlockStatement = exports.Program = function (node, parent, scope, file) {
+function BlockStatement(node, parent, scope, file) {
   if (!node._declarations) return;
 
   useStrict.wrap(node, function () {
@@ -8877,16 +9268,18 @@ exports.BlockStatement = exports.Program = function (node, parent, scope, file)
 
     node._declarations = null;
   });
-};
+}
+
+exports.Program = BlockStatement;
 exports.__esModule = true;
 },{"../../../types":122,"../../helpers/use-strict":42}],88:[function(require,module,exports){
 "use strict";
 
-var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
+var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
 
 exports.Program = Program;
 
-var useStrict = _interopRequire(require("../../helpers/use-strict"));
+var useStrict = _interopRequireWildcard(require("../../helpers/use-strict"));
 
 function Program(program, parent, scope, file) {
   if (!file.transformers["es6.modules"].canRun()) return;
@@ -9168,12 +9561,28 @@ exports.__esModule = true;
 
 var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
 
+exports.Flow = Flow;
+exports.ClassProperty = ClassProperty;
+exports.Class = Class;
 exports.TypeCastExpression = TypeCastExpression;
 exports.ImportDeclaration = ImportDeclaration;
 exports.ExportDeclaration = ExportDeclaration;
 
 var t = _interopRequire(require("../../../types"));
 
+function Flow(node) {
+  this.remove();
+}
+
+function ClassProperty(node) {
+  node.typeAnnotation = null;
+  if (!node.value) this.remove();
+}
+
+function Class(node) {
+  node["implements"] = null;
+}
+
 function TypeCastExpression(node) {
   return node.expression;
 }
@@ -9192,9 +9601,11 @@ exports.__esModule = true;
 
 var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
 
+var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
+
 exports.manipulateOptions = manipulateOptions;
 
-var react = _interopRequire(require("../../helpers/react"));
+var react = _interopRequireWildcard(require("../../helpers/react"));
 
 var t = _interopRequire(require("../../../types"));
 
@@ -9221,9 +9632,11 @@ exports.__esModule = true;
 
 var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
 
+var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
+
 exports.Program = Program;
 
-var react = _interopRequire(require("../../helpers/react"));
+var react = _interopRequireWildcard(require("../../helpers/react"));
 
 var t = _interopRequire(require("../../../types"));
 
@@ -9407,6 +9820,7 @@ var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["defau
 var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
 
 exports.Program = Program;
+exports.FunctionExpression = FunctionExpression;
 exports.ThisExpression = ThisExpression;
 exports.CallExpression = CallExpression;
 
@@ -9421,9 +9835,11 @@ function Program(program) {
   }
 }
 
-exports.FunctionDeclaration = exports.FunctionExpression = function () {
+function FunctionExpression() {
   this.skip();
-};
+}
+
+exports.FunctionDeclaration = FunctionExpression;
 
 function ThisExpression() {
   return t.identifier("undefined");
@@ -9560,6 +9976,8 @@ exports.__esModule = true;
 
 var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
 
+exports.MethodDefinition = MethodDefinition;
+
 var t = _interopRequire(require("../../../types"));
 
 var playground = exports.playground = true;
@@ -9574,7 +9992,7 @@ var visitor = {
   }
 };
 
-exports.Property = exports.MethodDefinition = function (node, parent, scope, file) {
+function MethodDefinition(node, parent, scope, file) {
   if (node.kind !== "memo") return;
   node.kind = "get";
 
@@ -9595,7 +10013,9 @@ exports.Property = exports.MethodDefinition = function (node, parent, scope, fil
   scope.traverse(value, visitor, state);
 
   return node;
-};
+}
+
+exports.Property = MethodDefinition;
 exports.__esModule = true;
 },{"../../../types":122}],107:[function(require,module,exports){
 "use strict";
@@ -9758,6 +10178,8 @@ var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["defau
 
 var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
 
+exports.ForOfStatement = ForOfStatement;
+
 var messages = _interopRequireWildcard(require("../../../messages"));
 
 var _types = require("../../../types");
@@ -9766,13 +10188,15 @@ var t = _interopRequire(_types);
 
 exports.check = _types.isFor;
 
-exports.ForInStatement = exports.ForOfStatement = function (node, parent, scope, file) {
+function ForOfStatement(node, parent, scope, file) {
   var left = node.left;
   if (t.isVariableDeclaration(left)) {
     var declar = left.declarations[0];
     if (declar.init) throw file.errorWithNode(declar, messages.get("noAssignmentsInForHead"));
   }
-};
+}
+
+exports.ForInStatement = ForOfStatement;
 exports.__esModule = true;
 },{"../../../messages":27,"../../../types":122}],113:[function(require,module,exports){
 "use strict";
@@ -9817,6 +10241,7 @@ exports.__esModule = true;
 var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
 
 exports.check = check;
+exports.Property = Property;
 
 var messages = _interopRequireWildcard(require("../../../messages"));
 
@@ -9824,11 +10249,13 @@ function check(node) {
   return node.kind === "set";
 }
 
-exports.MethodDefinition = exports.Property = function (node, parent, scope, file) {
+function Property(node, parent, scope, file) {
   if (node.kind === "set" && node.value.params.length !== 1) {
     throw file.errorWithNode(node.value, messages.get("settersInvalidParamLength"));
   }
-};
+}
+
+exports.MethodDefinition = Property;
 exports.__esModule = true;
 },{"../../../messages":27}],115:[function(require,module,exports){
 "use strict";
@@ -9937,7 +10364,7 @@ var TraversalConext = (function () {
     if (this.shouldFlatten) {
       node[key] = flatten(node[key]);
 
-      if (key === "body") {
+      if (key === "body" || key === "expressions") {
         // we can safely compact this
         node[key] = compact(node[key]);
       }
@@ -10041,7 +10468,9 @@ traverse.explode = function (obj) {
     var aliases = t.FLIPPED_ALIAS_KEYS[type];
     if (aliases) {
       for (var i = 0; i < aliases.length; i++) {
-        obj[aliases[i]] = fns;
+        var _obj = obj;
+        var _aliases$i = aliases[i];
+        if (!_obj[_aliases$i]) _obj[_aliases$i] = fns;
       }
     }
   }
@@ -10587,7 +11016,7 @@ var Scope = (function () {
     var info = this.getBindingInfo(name);
     if (!info) return;
 
-    info.identifier.typeAnnotation = info.typeAnnotation = type;
+    info.typeAnnotation = type;
   };
 
   Scope.prototype.getTypeAnnotation = function getTypeAnnotation(name, id, node) {
@@ -11012,6 +11441,39 @@ module.exports={
   "JSXMemberExpression":       ["Expression"],
   "YieldExpression":           ["Expression"],
 
+  "AnyTypeAnnotation":           ["Flow"],
+  "ArrayTypeAnnotation":         ["Flow"],
+  "BooleanTypeAnnotation":       ["Flow"],
+  "ClassImplements":             ["Flow"],
+  "DeclareClass":                ["Flow"],
+  "DeclareFunction":             ["Flow"],
+  "DeclareModule":               ["Flow"],
+  "DeclareVariable":             ["Flow"],
+  "FunctionTypeAnnotation":      ["Flow"],
+  "FunctionTypeParam":           ["Flow"],
+  "GenericTypeAnnotation":       ["Flow"],
+  "InterfaceExtends":            ["Flow"],
+  "InterfaceDeclaration":        ["Flow"],
+  "IntersectionTypeAnnotation":  ["Flow"],
+  "NullableTypeAnnotation":      ["Flow"],
+  "NumberTypeAnnotation":        ["Flow"],
+  "StringLiteralTypeAnnotation": ["Flow"],
+  "StringTypeAnnotation":        ["Flow"],
+  "TupleTypeAnnotation":         ["Flow"],
+  "TypeofTypeAnnotation":        ["Flow"],
+  "TypeAlias":                   ["Flow"],
+  "TypeAnnotation":              ["Flow"],
+  "TypeCastExpression":          ["Flow"],
+  "TypeParameterDeclaration":    ["Flow"],
+  "TypeParameterInstantiation":  ["Flow"],
+  "ObjectTypeAnnotation":        ["Flow"],
+  "ObjectTypeCallProperty":      ["Flow"],
+  "ObjectTypeIndexer":           ["Flow"],
+  "ObjectTypeProperty":          ["Flow"],
+  "QualifiedTypeIdentifier":     ["Flow"],
+  "UnionTypeAnnotation":         ["Flow"],
+  "VoidTypeAnnotation":          ["Flow"],
+
   "JSXAttribute":           ["JSX"],
   "JSXClosingElement":      ["JSX"],
   "JSXElement":             ["JSX", "Expression"],
@@ -11923,6 +12385,10 @@ t.inherits = function (child, parent) {
   child.start = parent.start;
   child.loc = parent.loc;
   child.end = parent.end;
+
+  child.typeAnnotation = parent.typeAnnotation;
+  child.returnType = parent.returnType;
+
   t.inheritsComments(child, parent);
   return child;
 };
@@ -12019,8 +12485,8 @@ toFastProperties(t.VISITOR_KEYS);
 },{"../helpers/object":24,"../helpers/to-fast-properties":26,"./alias-keys":120,"./builder-keys":121,"./visitor-keys":123,"esutils":185,"lodash/array/compact":195,"lodash/array/uniq":199,"lodash/collection/each":201,"lodash/lang/isString":295}],123:[function(require,module,exports){
 module.exports={
   "ArrayExpression":           ["elements"],
-  "ArrayPattern":              ["elements"],
-  "ArrowFunctionExpression":   ["params", "defaults", "rest", "body"],
+  "ArrayPattern":              ["elements", "typeAnnotation"],
+  "ArrowFunctionExpression":   ["params", "defaults", "rest", "body", "returnType"],
   "AssignmentExpression":      ["left", "right"],
   "AssignmentPattern":         ["left", "right"],
   "AwaitExpression":           ["argument"],
@@ -12032,8 +12498,8 @@ module.exports={
   "CallExpression":            ["callee", "arguments"],
   "CatchClause":               ["param", "body"],
   "ClassBody":                 ["body"],
-  "ClassDeclaration":          ["id", "body", "superClass"],
-  "ClassExpression":           ["id", "body", "superClass"],
+  "ClassDeclaration":          ["id", "body", "superClass", "typeParameters", "superTypeParameters", "implements"],
+  "ClassExpression":           ["id", "body", "superClass", "typeParameters", "superTypeParameters", "implements"],
   "ComprehensionBlock":        ["left", "right", "body"],
   "ComprehensionExpression":   ["filter", "blocks", "body"],
   "ConditionalExpression":     ["test", "consequent", "alternate"],
@@ -12049,9 +12515,9 @@ module.exports={
   "ForInStatement":            ["left", "right", "body"],
   "ForOfStatement":            ["left", "right", "body"],
   "ForStatement":              ["init", "test", "update", "body"],
-  "FunctionDeclaration":       ["id", "params", "defaults", "rest", "body"],
-  "FunctionExpression":        ["id", "params", "defaults", "rest", "body"],
-  "Identifier":                [],
+  "FunctionDeclaration":       ["id", "params", "defaults", "rest", "body", "returnType", "typeParameters"],
+  "FunctionExpression":        ["id", "params", "defaults", "rest", "body", "returnType", "typeParameters"],
+  "Identifier":                ["typeAnnotation"],
   "IfStatement":               ["test", "consequent", "alternate"],
   "ImportBatchSpecifier":      ["id"],
   "ImportDeclaration":         ["specifiers", "source"],
@@ -12063,11 +12529,11 @@ module.exports={
   "MethodDefinition":          ["key", "value"],
   "NewExpression":             ["callee", "arguments"],
   "ObjectExpression":          ["properties"],
-  "ObjectPattern":             ["properties"],
+  "ObjectPattern":             ["properties", "typeAnnotation"],
   "PrivateDeclaration":        ["declarations"],
   "Program":                   ["body"],
   "Property":                  ["key", "value"],
-  "RestElement":               ["argument"],
+  "RestElement":               ["argument", "typeAnnotation"],
   "ReturnStatement":           ["argument"],
   "SequenceExpression":        ["expressions"],
   "SpreadElement":             ["argument"],
@@ -12090,36 +12556,37 @@ module.exports={
   "YieldExpression":           ["argument"],
 
   "AnyTypeAnnotation":           [],
-  "ArrayTypeAnnotation":         [],
+  "ArrayTypeAnnotation":         ["elementType"],
   "BooleanTypeAnnotation":       [],
-  "ClassProperty":               ["key", "value"],
-  "DeclareClass":                [],
-  "DeclareFunction":             [],
-  "DeclareModule":               [],
-  "DeclareVariable":             [],
-  "FunctionTypeAnnotation":      [],
-  "FunctionTypeParam":           [],
-  "GenericTypeAnnotation":       [],
-  "InterfaceExtends":            [],
-  "InterfaceDeclaration":        [],
-  "IntersectionTypeAnnotation":  [],
-  "NullableTypeAnnotation":      [],
+  "ClassImplements":             ["id", "typeParameters"],
+  "ClassProperty":               ["key", "value", "typeAnnotation"],
+  "DeclareClass":                ["id", "typeParameters", "extends", "body"],
+  "DeclareFunction":             ["id"],
+  "DeclareModule":               ["id", "body"],
+  "DeclareVariable":             ["id"],
+  "FunctionTypeAnnotation":      ["typeParameters", "params", "rest", "returnType"],
+  "FunctionTypeParam":           ["name", "typeAnnotation"],
+  "GenericTypeAnnotation":       ["id", "typeParameters"],
+  "InterfaceExtends":            ["id", "typeParameters"],
+  "InterfaceDeclaration":        ["id", "typeParameters", "extends", "body"],
+  "IntersectionTypeAnnotation":  ["types"],
+  "NullableTypeAnnotation":      ["typeAnnotation"],
   "NumberTypeAnnotation":        [],
   "StringLiteralTypeAnnotation": [],
   "StringTypeAnnotation":        [],
-  "TupleTypeAnnotation":         [],
-  "TypeofTypeAnnotation":        [],
-  "TypeAlias":                   [],
-  "TypeAnnotation":              [],
+  "TupleTypeAnnotation":         ["types"],
+  "TypeofTypeAnnotation":        ["argument"],
+  "TypeAlias":                   ["id", "typeParameters", "right"],
+  "TypeAnnotation":              ["typeAnnotation"],
   "TypeCastExpression":          ["expression"],
-  "TypeParameterDeclaration":    [],
-  "TypeParameterInstantiation":  [],
-  "ObjectTypeAnnotation":        [],
-  "ObjectTypeCallProperty":      [],
-  "ObjectTypeIndexer":           [],
-  "ObjectTypeProperty":          [],
-  "QualifiedTypeIdentifier":     [],
-  "UnionTypeAnnotation":         [],
+  "TypeParameterDeclaration":    ["params"],
+  "TypeParameterInstantiation":  ["params"],
+  "ObjectTypeAnnotation":        ["key", "value"],
+  "ObjectTypeCallProperty":      ["value"],
+  "ObjectTypeIndexer":           ["id", "key", "value"],
+  "ObjectTypeProperty":          ["key", "value"],
+  "QualifiedTypeIdentifier":     ["id", "qualification"],
+  "UnionTypeAnnotation":         ["types"],
   "VoidTypeAnnotation":          [],
 
   "JSXAttribute":              ["name", "value"],
@@ -12179,7 +12646,10 @@ var fs = _interopRequire(require("fs"));
 
 var t = _interopRequire(require("./types"));
 
-exports.inherits = require("util").inherits;
+var _util = require("util");
+
+exports.inherits = _util.inherits;
+exports.inspect = _util.inspect;
 var debug = exports.debug = buildDebug("babel");
 
 function canCompile(filename, altExts) {
@@ -12798,25 +13268,29 @@ exports.__esModule = true;
 
   // The ECMAScript 3 reserved word list.
 
-  var isReservedWord3 = function anonymous(str) {
+  var isReservedWord3 = function anonymous(str
+/**/) {
 switch(str.length){case 6:switch(str){case "double":case "export":case "import":case "native":case "public":case "static":case "throws":return true}return false;case 4:switch(str){case "byte":case "char":case "enum":case "goto":case "long":return true}return false;case 5:switch(str){case "class":case "final":case "float":case "short":case "super":return true}return false;case 7:switch(str){case "boolean":case "extends":case "package":case "private":return true}return false;case 9:switch(str){case "interface":case "protected":case "transient":return true}return false;case 8:switch(str){case "abstract":case "volatile":return true}return false;case 10:return str === "implements";case 3:return str === "int";case 12:return str === "synchronized";}
 };
 
   // ECMAScript 5 reserved words.
 
-  var isReservedWord5 = function anonymous(str) {
+  var isReservedWord5 = function anonymous(str
+/**/) {
 switch(str.length){case 5:switch(str){case "class":case "super":case "const":return true}return false;case 6:switch(str){case "export":case "import":return true}return false;case 4:return str === "enum";case 7:return str === "extends";}
 };
 
   // The additional reserved words in strict mode.
 
-  var isStrictReservedWord = function anonymous(str) {
+  var isStrictReservedWord = function anonymous(str
+/**/) {
 switch(str.length){case 9:switch(str){case "interface":case "protected":return true}return false;case 7:switch(str){case "package":case "private":return true}return false;case 6:switch(str){case "public":case "static":return true}return false;case 10:return str === "implements";case 3:return str === "let";case 5:return str === "yield";}
 };
 
   // The forbidden variable names in strict mode.
 
-  var isStrictBadIdWord = function anonymous(str) {
+  var isStrictBadIdWord = function anonymous(str
+/**/) {
 switch(str){case "eval":case "arguments":return true}return false;
 };
 
@@ -12824,13 +13298,15 @@ switch(str){case "eval":case "arguments":return true}return false;
 
   var ecma5AndLessKeywords = "break case catch continue debugger default do else finally for function if return switch throw try var while with null true false instanceof typeof void delete new in this";
 
-  var isEcma5AndLessKeyword = function anonymous(str) {
+  var isEcma5AndLessKeyword = function anonymous(str
+/**/) {
 switch(str.length){case 4:switch(str){case "case":case "else":case "with":case "null":case "true":case "void":case "this":return true}return false;case 5:switch(str){case "break":case "catch":case "throw":case "while":case "false":return true}return false;case 3:switch(str){case "for":case "try":case "var":case "new":return true}return false;case 6:switch(str){case "return":case "switch":case "typeof":case "delete":return true}return false;case 8:switch(str){case "continue":case "debugger":case "function":return true}return false;case 2:switch(str){case "do":case "if":case "in":return true}return false;case 7:switch(str){case "default":case "finally":return true}return false;case 10:return str === "instanceof";}
 };
 
   var ecma6AndLessKeywords = ecma5AndLessKeywords + " let const class extends export import yield";
 
-  var isEcma6Keyword = function anonymous(str) {
+  var isEcma6Keyword = function anonymous(str
+/**/) {
 switch(str.length){case 5:switch(str){case "break":case "catch":case "throw":case "while":case "false":case "const":case "class":case "yield":return true}return false;case 4:switch(str){case "case":case "else":case "with":case "null":case "true":case "void":case "this":return true}return false;case 6:switch(str){case "return":case "switch":case "typeof":case "delete":case "export":case "import":return true}return false;case 3:switch(str){case "for":case "try":case "var":case "new":case "let":return true}return false;case 8:switch(str){case "continue":case "debugger":case "function":return true}return false;case 7:switch(str){case "default":case "finally":case "extends":return true}return false;case 2:switch(str){case "do":case "if":case "in":return true}return false;case 10:return str === "instanceof";}
 };
 
@@ -15640,7 +16116,7 @@ switch(str.length){case 5:switch(str){case "break":case "catch":case "throw":cas
           var listItem = exprList[i];
           if (listItem.type === "TypeCastExpression") {
             var expr = listItem.expression;
-            expr.returnType = listItem.typeAnnotation;
+            expr.typeAnnotation = listItem.typeAnnotation;
             exprList[i] = expr;
           }
         }
@@ -44650,7 +45126,7 @@ module.exports = function (str) {
 module.exports={
   "name": "babel",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "repository": "babel/babel",
@@ -44685,7 +45161,7 @@ module.exports={
     "test": "make test"
   },
   "dependencies": {
-    "acorn-babel": "0.11.1-35",
+    "acorn-babel": "0.11.1-37",
     "ast-types": "~0.6.1",
     "chalk": "^1.0.0",
     "chokidar": "^0.12.6",