ast-types 0.9.13 → 0.10.2

package/.travis.yml

@@ -1,5 +1,6 @@
 language: node_js
 node_js:
+  - "9"
   - "8"
   - "7"
   - "6"

package/def/{babel6-core.js → babel-core.js}

@@ -1,13 +1,110 @@
 module.exports = function (fork) {
-  fork.use(require("./babel"));
+  fork.use(require("./es7"));
 
-  // var types = fork.types;
   var types = fork.use(require("../lib/types"));
-  // var defaults = fork.shared.defaults;
   var defaults = fork.use(require("../lib/shared")).defaults;
   var def = types.Type.def;
   var or = types.Type.or;
 
+  def("Noop")
+    .bases("Statement")
+    .build();
+
+  def("DoExpression")
+    .bases("Expression")
+    .build("body")
+    .field("body", [def("Statement")]);
+
+  def("Super")
+    .bases("Expression")
+    .build();
+
+  def("BindExpression")
+    .bases("Expression")
+    .build("object", "callee")
+    .field("object", or(def("Expression"), null))
+    .field("callee", def("Expression"));
+
+  def("Decorator")
+    .bases("Node")
+    .build("expression")
+    .field("expression", def("Expression"));
+
+  def("Property")
+    .field("decorators",
+           or([def("Decorator")], null),
+           defaults["null"]);
+
+  def("MethodDefinition")
+    .field("decorators",
+           or([def("Decorator")], null),
+           defaults["null"]);
+
+  def("MetaProperty")
+    .bases("Expression")
+    .build("meta", "property")
+    .field("meta", def("Identifier"))
+    .field("property", def("Identifier"));
+
+  def("ParenthesizedExpression")
+    .bases("Expression")
+    .build("expression")
+    .field("expression", def("Expression"));
+
+  def("ImportSpecifier")
+    .bases("ModuleSpecifier")
+    .build("imported", "local")
+    .field("imported", def("Identifier"));
+
+  def("ImportDefaultSpecifier")
+    .bases("ModuleSpecifier")
+    .build("local");
+
+  def("ImportNamespaceSpecifier")
+    .bases("ModuleSpecifier")
+    .build("local");
+
+  def("ExportDefaultDeclaration")
+    .bases("Declaration")
+    .build("declaration")
+    .field("declaration", or(def("Declaration"), def("Expression")));
+
+  def("ExportNamedDeclaration")
+    .bases("Declaration")
+    .build("declaration", "specifiers", "source")
+    .field("declaration", or(def("Declaration"), null))
+    .field("specifiers", [def("ExportSpecifier")], defaults.emptyArray)
+    .field("source", or(def("Literal"), null), defaults["null"]);
+
+  def("ExportSpecifier")
+    .bases("ModuleSpecifier")
+    .build("local", "exported")
+    .field("exported", def("Identifier"));
+
+  def("ExportNamespaceSpecifier")
+    .bases("Specifier")
+    .build("exported")
+    .field("exported", def("Identifier"));
+
+  def("ExportDefaultSpecifier")
+    .bases("Specifier")
+    .build("exported")
+    .field("exported", def("Identifier"));
+
+  def("ExportAllDeclaration")
+    .bases("Declaration")
+    .build("exported", "source")
+    .field("exported", or(def("Identifier"), null))
+    .field("source", def("Literal"));
+
+  def("CommentBlock")
+    .bases("Comment")
+    .build("value", /*optional:*/ "leading", "trailing");
+
+  def("CommentLine")
+    .bases("Comment")
+    .build("value", /*optional:*/ "leading", "trailing");
+
   def("Directive")
     .bases("Node")
     .build("value")
@@ -39,7 +136,33 @@ module.exports = function (fork) {
   def("NumericLiteral")
     .bases("Literal")
     .build("value")
-    .field("value", Number);
+    .field("value", Number)
+    .field("raw", or(String, null), defaults["null"])
+    .field("extra", {
+      rawValue: Number,
+      raw: String
+    }, function getDefault() {
+      return {
+        rawValue: this.value,
+        raw: this.value + ""
+      }
+    });
+
+  def("BigIntLiteral")
+    .bases("Literal")
+    .build("value")
+    // Only String really seems appropriate here, since BigInt values
+    // often exceed the limits of JS numbers.
+    .field("value", or(String, Number))
+    .field("extra", {
+      rawValue: String,
+      raw: String
+    }, function getDefault() {
+      return {
+        rawValue: String(this.value),
+        raw: this.value + "n"
+      };
+    });
 
   def("NullLiteral")
     .bases("Literal")

package/def/babel.js

@@ -1,107 +1,4 @@
 module.exports = function (fork) {
-    fork.use(require("./es7"));
-
-    var types = fork.use(require("../lib/types"));
-    var defaults = fork.use(require("../lib/shared")).defaults;
-    var def = types.Type.def;
-    var or = types.Type.or;
-
-    def("Noop")
-        .bases("Node")
-        .build();
-
-    def("DoExpression")
-        .bases("Expression")
-        .build("body")
-        .field("body", [def("Statement")]);
-
-    def("Super")
-        .bases("Expression")
-        .build();
-
-    def("BindExpression")
-        .bases("Expression")
-        .build("object", "callee")
-        .field("object", or(def("Expression"), null))
-        .field("callee", def("Expression"));
-
-    def("Decorator")
-        .bases("Node")
-        .build("expression")
-        .field("expression", def("Expression"));
-
-    def("Property")
-        .field("decorators",
-            or([def("Decorator")], null),
-            defaults["null"]);
-
-    def("MethodDefinition")
-        .field("decorators",
-            or([def("Decorator")], null),
-            defaults["null"]);
-
-    def("MetaProperty")
-        .bases("Expression")
-        .build("meta", "property")
-        .field("meta", def("Identifier"))
-        .field("property", def("Identifier"));
-
-    def("ParenthesizedExpression")
-        .bases("Expression")
-        .build("expression")
-        .field("expression", def("Expression"));
-
-    def("ImportSpecifier")
-        .bases("ModuleSpecifier")
-        .build("imported", "local")
-        .field("imported", def("Identifier"));
-
-    def("ImportDefaultSpecifier")
-        .bases("ModuleSpecifier")
-        .build("local");
-
-    def("ImportNamespaceSpecifier")
-        .bases("ModuleSpecifier")
-        .build("local");
-
-    def("ExportDefaultDeclaration")
-        .bases("Declaration")
-        .build("declaration")
-        .field("declaration", or(def("Declaration"), def("Expression")));
-
-    def("ExportNamedDeclaration")
-        .bases("Declaration")
-        .build("declaration", "specifiers", "source")
-        .field("declaration", or(def("Declaration"), null))
-        .field("specifiers", [def("ExportSpecifier")], defaults.emptyArray)
-        .field("source", or(def("Literal"), null), defaults["null"]);
-
-    def("ExportSpecifier")
-        .bases("ModuleSpecifier")
-        .build("local", "exported")
-        .field("exported", def("Identifier"));
-
-    def("ExportNamespaceSpecifier")
-        .bases("Specifier")
-        .build("exported")
-        .field("exported", def("Identifier"));
-
-    def("ExportDefaultSpecifier")
-        .bases("Specifier")
-        .build("exported")
-        .field("exported", def("Identifier"));
-
-    def("ExportAllDeclaration")
-        .bases("Declaration")
-        .build("exported", "source")
-        .field("exported", or(def("Identifier"), null))
-        .field("source", def("Literal"));
-
-    def("CommentBlock")
-        .bases("Comment")
-        .build("value", /*optional:*/ "leading", "trailing");
-
-    def("CommentLine")
-        .bases("Comment")
-        .build("value", /*optional:*/ "leading", "trailing");
-};
+  fork.use(require("./babel-core"));
+  fork.use(require("./flow"));
+};

package/def/flow.js

@@ -1,349 +1,356 @@
 module.exports = function (fork) {
-    fork.use(require("./es7"));
-
-    var types = fork.use(require("../lib/types"));
-    var def = types.Type.def;
-    var or = types.Type.or;
-    var defaults = fork.use(require("../lib/shared")).defaults;
-
-    // Type Annotations
-    def("Type").bases("Node");
-
-    def("AnyTypeAnnotation")
-      .bases("Type")
-      .build();
-
-    def("EmptyTypeAnnotation")
-      .bases("Type")
-      .build();
-
-    def("MixedTypeAnnotation")
-      .bases("Type")
-      .build();
-
-    def("VoidTypeAnnotation")
-      .bases("Type")
-      .build();
-
-    def("NumberTypeAnnotation")
-      .bases("Type")
-      .build();
-
-    def("NumberLiteralTypeAnnotation")
-      .bases("Type")
-      .build("value", "raw")
-      .field("value", Number)
-      .field("raw", String);
-
-    // Babylon 6 differs in AST from Flow
-    // same as NumberLiteralTypeAnnotation
-    def("NumericLiteralTypeAnnotation")
-      .bases("Type")
-      .build("value", "raw")
-      .field("value", Number)
-      .field("raw", String);
-
-    def("StringTypeAnnotation")
-      .bases("Type")
-      .build();
-
-    def("StringLiteralTypeAnnotation")
-      .bases("Type")
-      .build("value", "raw")
-      .field("value", String)
-      .field("raw", String);
-
-    def("BooleanTypeAnnotation")
-      .bases("Type")
-      .build();
-
-    def("BooleanLiteralTypeAnnotation")
-      .bases("Type")
-      .build("value", "raw")
-      .field("value", Boolean)
-      .field("raw", String);
-
-    def("TypeAnnotation")
-      .bases("Node")
-      .build("typeAnnotation")
-      .field("typeAnnotation", def("Type"));
-
-    def("NullableTypeAnnotation")
-      .bases("Type")
-      .build("typeAnnotation")
-      .field("typeAnnotation", def("Type"));
-
-    def("NullLiteralTypeAnnotation")
-      .bases("Type")
-      .build();
-
-    def("NullTypeAnnotation")
-      .bases("Type")
-      .build();
-
-    def("ThisTypeAnnotation")
-      .bases("Type")
-      .build();
-
-    def("ExistsTypeAnnotation")
-      .bases("Type")
-      .build();
-
-    def("ExistentialTypeParam")
-      .bases("Type")
-      .build();
-
-    def("FunctionTypeAnnotation")
-      .bases("Type")
-      .build("params", "returnType", "rest", "typeParameters")
-      .field("params", [def("FunctionTypeParam")])
-      .field("returnType", def("Type"))
-      .field("rest", or(def("FunctionTypeParam"), null))
-      .field("typeParameters", or(def("TypeParameterDeclaration"), null));
-
-    def("FunctionTypeParam")
-      .bases("Node")
-      .build("name", "typeAnnotation", "optional")
-      .field("name", def("Identifier"))
-      .field("typeAnnotation", def("Type"))
-      .field("optional", Boolean);
-
-    def("ArrayTypeAnnotation")
-      .bases("Type")
-      .build("elementType")
-      .field("elementType", def("Type"));
-
-    def("ObjectTypeAnnotation")
-      .bases("Type")
-      .build("properties", "indexers", "callProperties")
-      .field("properties", [def("ObjectTypeProperty")])
-      .field("indexers", [def("ObjectTypeIndexer")], defaults.emptyArray)
-      .field("callProperties",
-        [def("ObjectTypeCallProperty")],
-        defaults.emptyArray)
-      .field("exact", Boolean, defaults["false"]);
-
-    def("ObjectTypeProperty")
-      .bases("Node")
-      .build("key", "value", "optional")
-      .field("key", or(def("Literal"), def("Identifier")))
-      .field("value", def("Type"))
-      .field("optional", Boolean)
-      .field("variance",
-        or("plus", "minus", null),
-        defaults["null"]);
-
-    def("ObjectTypeIndexer")
-      .bases("Node")
-      .build("id", "key", "value")
-      .field("id", def("Identifier"))
-      .field("key", def("Type"))
-      .field("value", def("Type"))
-      .field("variance",
-        or("plus", "minus", null),
-        defaults["null"]);
-
-    def("ObjectTypeCallProperty")
-      .bases("Node")
-      .build("value")
-      .field("value", def("FunctionTypeAnnotation"))
-      .field("static", Boolean, defaults["false"]);
-
-    def("QualifiedTypeIdentifier")
-      .bases("Node")
-      .build("qualification", "id")
-      .field("qualification",
-        or(def("Identifier"),
-          def("QualifiedTypeIdentifier")))
-      .field("id", def("Identifier"));
-
-    def("GenericTypeAnnotation")
-      .bases("Type")
-      .build("id", "typeParameters")
-      .field("id", or(def("Identifier"), def("QualifiedTypeIdentifier")))
-      .field("typeParameters", or(def("TypeParameterInstantiation"), null));
-
-    def("MemberTypeAnnotation")
-      .bases("Type")
-      .build("object", "property")
-      .field("object", def("Identifier"))
-      .field("property",
-        or(def("MemberTypeAnnotation"),
-          def("GenericTypeAnnotation")));
-
-    def("UnionTypeAnnotation")
-      .bases("Type")
-      .build("types")
-      .field("types", [def("Type")]);
-
-    def("IntersectionTypeAnnotation")
-      .bases("Type")
-      .build("types")
-      .field("types", [def("Type")]);
-
-    def("TypeofTypeAnnotation")
-      .bases("Type")
-      .build("argument")
-      .field("argument", def("Type"));
-
-    def("ObjectTypeSpreadProperty")
-      .bases("Node")
-      .build("argument")
-      .field("argument", def("Type"));
-
-    def("Identifier")
-      .field("typeAnnotation", or(def("TypeAnnotation"), null), defaults["null"]);
-
-    def("ObjectPattern")
-      .field("typeAnnotation", or(def("TypeAnnotation"), null), defaults["null"]);
-
-    def("TypeParameterDeclaration")
-      .bases("Node")
-      .build("params")
-      .field("params", [def("TypeParameter")]);
-
-    def("TypeParameterInstantiation")
-      .bases("Node")
-      .build("params")
-      .field("params", [def("Type")]);
-
-    def("TypeParameter")
-      .bases("Type")
-      .build("name", "variance", "bound")
-      .field("name", String)
-      .field("variance",
-        or("plus", "minus", null),
-        defaults["null"])
-      .field("bound",
-        or(def("TypeAnnotation"), null),
-        defaults["null"]);
-
-    def("Function")
-      .field("returnType",
-        or(def("TypeAnnotation"), null),
-        defaults["null"])
-      .field("typeParameters",
-        or(def("TypeParameterDeclaration"), null),
-        defaults["null"]);
-
-    def("ClassProperty")
-      .build("key", "value", "typeAnnotation", "static")
-      .field("value", or(def("Expression"), null))
-      .field("typeAnnotation", or(def("TypeAnnotation"), null))
-      .field("static", Boolean, defaults["false"])
-      .field("variance",
-        or("plus", "minus", null),
-        defaults["null"]);
-
-    def("ClassImplements")
-      .field("typeParameters",
-        or(def("TypeParameterInstantiation"), null),
-        defaults["null"]);
-
-    def("InterfaceDeclaration")
-      .bases("Declaration")
-      .build("id", "body", "extends")
-      .field("id", def("Identifier"))
-      .field("typeParameters",
-        or(def("TypeParameterDeclaration"), null),
-        defaults["null"])
-      .field("body", def("ObjectTypeAnnotation"))
-      .field("extends", [def("InterfaceExtends")]);
-
-    def("DeclareInterface")
-      .bases("InterfaceDeclaration")
-      .build("id", "body", "extends");
-
-    def("InterfaceExtends")
-      .bases("Node")
-      .build("id")
-      .field("id", def("Identifier"))
-      .field("typeParameters", or(def("TypeParameterInstantiation"), null));
-
-    def("TypeAlias")
-      .bases("Declaration")
-      .build("id", "typeParameters", "right")
-      .field("id", def("Identifier"))
-      .field("typeParameters", or(def("TypeParameterDeclaration"), null))
-      .field("right", def("Type"));
-
-    def("OpaqueType")
-      .bases("Declaration")
-      .build("id", "typeParameters", "impltype", "supertype")
-      .field("id", def("Identifier"))
-      .field("typeParameters", or(def("TypeParameterDeclaration"), null))
-      .field("implType", def("Type"))
-      .field("superType", def("Type"));
-
-    def("DeclareTypeAlias")
-      .bases("TypeAlias")
-      .build("id", "typeParameters", "right");
-
-    def("DeclareOpaqueType")
-      .bases("TypeAlias")
-      .build("id", "typeParameters", "supertype");
-
-    def("TypeCastExpression")
-      .bases("Expression")
-      .build("expression", "typeAnnotation")
-      .field("expression", def("Expression"))
-      .field("typeAnnotation", def("TypeAnnotation"));
-
-    def("TupleTypeAnnotation")
-      .bases("Type")
-      .build("types")
-      .field("types", [def("Type")]);
-
-    def("DeclareVariable")
-      .bases("Statement")
-      .build("id")
-      .field("id", def("Identifier"));
-
-    def("DeclareFunction")
-      .bases("Statement")
-      .build("id")
-      .field("id", def("Identifier"));
-
-    def("DeclareClass")
-      .bases("InterfaceDeclaration")
-      .build("id");
-
-    def("DeclareModule")
-      .bases("Statement")
-      .build("id", "body")
-      .field("id", or(def("Identifier"), def("Literal")))
-      .field("body", def("BlockStatement"));
-
-    def("DeclareModuleExports")
-      .bases("Statement")
-      .build("typeAnnotation")
-      .field("typeAnnotation", def("Type"));
-
-    def("DeclareExportDeclaration")
-      .bases("Declaration")
-      .build("default", "declaration", "specifiers", "source")
-      .field("default", Boolean)
-      .field("declaration", or(
-        def("DeclareVariable"),
-        def("DeclareFunction"),
-        def("DeclareClass"),
-        def("Type"), // Implies default.
-        null
-      ))
-      .field("specifiers", [or(
-        def("ExportSpecifier"),
-        def("ExportBatchSpecifier")
-      )], defaults.emptyArray)
-      .field("source", or(
-        def("Literal"),
-        null
-      ), defaults["null"]);
-
-    def("DeclareExportAllDeclaration")
-      .bases("Declaration")
-      .build("source")
-      .field("source", or(
-        def("Literal"),
-        null
-      ), defaults["null"]);
+  fork.use(require("./es7"));
+
+  var types = fork.use(require("../lib/types"));
+  var def = types.Type.def;
+  var or = types.Type.or;
+  var defaults = fork.use(require("../lib/shared")).defaults;
+
+  // Type Annotations
+  def("Type").bases("Node");
+
+  def("AnyTypeAnnotation")
+    .bases("Type")
+    .build();
+
+  def("EmptyTypeAnnotation")
+    .bases("Type")
+    .build();
+
+  def("MixedTypeAnnotation")
+    .bases("Type")
+    .build();
+
+  def("VoidTypeAnnotation")
+    .bases("Type")
+    .build();
+
+  def("NumberTypeAnnotation")
+    .bases("Type")
+    .build();
+
+  def("NumberLiteralTypeAnnotation")
+    .bases("Type")
+    .build("value", "raw")
+    .field("value", Number)
+    .field("raw", String);
+
+  // Babylon 6 differs in AST from Flow
+  // same as NumberLiteralTypeAnnotation
+  def("NumericLiteralTypeAnnotation")
+    .bases("Type")
+    .build("value", "raw")
+    .field("value", Number)
+    .field("raw", String);
+
+  def("StringTypeAnnotation")
+    .bases("Type")
+    .build();
+
+  def("StringLiteralTypeAnnotation")
+    .bases("Type")
+    .build("value", "raw")
+    .field("value", String)
+    .field("raw", String);
+
+  def("BooleanTypeAnnotation")
+    .bases("Type")
+    .build();
+
+  def("BooleanLiteralTypeAnnotation")
+    .bases("Type")
+    .build("value", "raw")
+    .field("value", Boolean)
+    .field("raw", String);
+
+  def("TypeAnnotation")
+    .bases("Node")
+    .build("typeAnnotation")
+    .field("typeAnnotation", def("Type"));
+
+  def("NullableTypeAnnotation")
+    .bases("Type")
+    .build("typeAnnotation")
+    .field("typeAnnotation", def("Type"));
+
+  def("NullLiteralTypeAnnotation")
+    .bases("Type")
+    .build();
+
+  def("NullTypeAnnotation")
+    .bases("Type")
+    .build();
+
+  def("ThisTypeAnnotation")
+    .bases("Type")
+    .build();
+
+  def("ExistsTypeAnnotation")
+    .bases("Type")
+    .build();
+
+  def("ExistentialTypeParam")
+    .bases("Type")
+    .build();
+
+  def("FunctionTypeAnnotation")
+    .bases("Type")
+    .build("params", "returnType", "rest", "typeParameters")
+    .field("params", [def("FunctionTypeParam")])
+    .field("returnType", def("Type"))
+    .field("rest", or(def("FunctionTypeParam"), null))
+    .field("typeParameters", or(def("TypeParameterDeclaration"), null));
+
+  def("FunctionTypeParam")
+    .bases("Node")
+    .build("name", "typeAnnotation", "optional")
+    .field("name", def("Identifier"))
+    .field("typeAnnotation", def("Type"))
+    .field("optional", Boolean);
+
+  def("ArrayTypeAnnotation")
+    .bases("Type")
+    .build("elementType")
+    .field("elementType", def("Type"));
+
+  def("ObjectTypeAnnotation")
+    .bases("Type")
+    .build("properties", "indexers", "callProperties")
+    .field("properties", [
+      or(def("ObjectTypeProperty"),
+         def("ObjectTypeSpreadProperty"))
+    ])
+    .field("indexers", [def("ObjectTypeIndexer")], defaults.emptyArray)
+    .field("callProperties",
+           [def("ObjectTypeCallProperty")],
+           defaults.emptyArray)
+    .field("exact", Boolean, defaults["false"]);
+
+  def("Variance")
+    .bases("Node")
+    .build("kind")
+    .field("kind", or("plus", "minus"));
+
+  var LegacyVariance = or(
+    def("Variance"),
+    "plus",
+    "minus",
+    null
+  );
+
+  def("ObjectTypeProperty")
+    .bases("Node")
+    .build("key", "value", "optional")
+    .field("key", or(def("Literal"), def("Identifier")))
+    .field("value", def("Type"))
+    .field("optional", Boolean)
+    .field("variance", LegacyVariance, defaults["null"]);
+
+  def("ObjectTypeIndexer")
+    .bases("Node")
+    .build("id", "key", "value")
+    .field("id", def("Identifier"))
+    .field("key", def("Type"))
+    .field("value", def("Type"))
+    .field("variance", LegacyVariance, defaults["null"]);
+
+  def("ObjectTypeCallProperty")
+    .bases("Node")
+    .build("value")
+    .field("value", def("FunctionTypeAnnotation"))
+    .field("static", Boolean, defaults["false"]);
+
+  def("QualifiedTypeIdentifier")
+    .bases("Node")
+    .build("qualification", "id")
+    .field("qualification",
+           or(def("Identifier"),
+              def("QualifiedTypeIdentifier")))
+    .field("id", def("Identifier"));
+
+  def("GenericTypeAnnotation")
+    .bases("Type")
+    .build("id", "typeParameters")
+    .field("id", or(def("Identifier"), def("QualifiedTypeIdentifier")))
+    .field("typeParameters", or(def("TypeParameterInstantiation"), null));
+
+  def("MemberTypeAnnotation")
+    .bases("Type")
+    .build("object", "property")
+    .field("object", def("Identifier"))
+    .field("property",
+           or(def("MemberTypeAnnotation"),
+              def("GenericTypeAnnotation")));
+
+  def("UnionTypeAnnotation")
+    .bases("Type")
+    .build("types")
+    .field("types", [def("Type")]);
+
+  def("IntersectionTypeAnnotation")
+    .bases("Type")
+    .build("types")
+    .field("types", [def("Type")]);
+
+  def("TypeofTypeAnnotation")
+    .bases("Type")
+    .build("argument")
+    .field("argument", def("Type"));
+
+  def("ObjectTypeSpreadProperty")
+    .bases("Node")
+    .build("argument")
+    .field("argument", def("Type"));
+
+  def("Identifier")
+    .field("typeAnnotation", or(def("TypeAnnotation"), null), defaults["null"]);
+
+  def("ObjectPattern")
+    .field("typeAnnotation", or(def("TypeAnnotation"), null), defaults["null"]);
+
+  def("TypeParameterDeclaration")
+    .bases("Node")
+    .build("params")
+    .field("params", [def("TypeParameter")]);
+
+  def("TypeParameterInstantiation")
+    .bases("Node")
+    .build("params")
+    .field("params", [def("Type")]);
+
+  def("TypeParameter")
+    .bases("Type")
+    .build("name", "variance", "bound")
+    .field("name", String)
+    .field("variance", LegacyVariance, defaults["null"])
+    .field("bound",
+           or(def("TypeAnnotation"), null),
+           defaults["null"]);
+
+  def("Function")
+    .field("returnType",
+           or(def("TypeAnnotation"), null),
+           defaults["null"])
+    .field("typeParameters",
+           or(def("TypeParameterDeclaration"), null),
+           defaults["null"]);
+
+  def("ClassProperty")
+    .build("key", "value", "typeAnnotation", "static")
+    .field("value", or(def("Expression"), null))
+    .field("typeAnnotation", or(def("TypeAnnotation"), null))
+    .field("static", Boolean, defaults["false"])
+    .field("variance", LegacyVariance, defaults["null"]);
+
+  def("ClassImplements")
+    .field("typeParameters",
+           or(def("TypeParameterInstantiation"), null),
+           defaults["null"]);
+
+  def("InterfaceDeclaration")
+    .bases("Declaration")
+    .build("id", "body", "extends")
+    .field("id", def("Identifier"))
+    .field("typeParameters",
+           or(def("TypeParameterDeclaration"), null),
+           defaults["null"])
+    .field("body", def("ObjectTypeAnnotation"))
+    .field("extends", [def("InterfaceExtends")]);
+
+  def("DeclareInterface")
+    .bases("InterfaceDeclaration")
+    .build("id", "body", "extends");
+
+  def("InterfaceExtends")
+    .bases("Node")
+    .build("id")
+    .field("id", def("Identifier"))
+    .field("typeParameters", or(def("TypeParameterInstantiation"), null));
+
+  def("TypeAlias")
+    .bases("Declaration")
+    .build("id", "typeParameters", "right")
+    .field("id", def("Identifier"))
+    .field("typeParameters", or(def("TypeParameterDeclaration"), null))
+    .field("right", def("Type"));
+
+  def("OpaqueType")
+    .bases("Declaration")
+    .build("id", "typeParameters", "impltype", "supertype")
+    .field("id", def("Identifier"))
+    .field("typeParameters", or(def("TypeParameterDeclaration"), null))
+    .field("implType", def("Type"))
+    .field("superType", def("Type"));
+
+  def("DeclareTypeAlias")
+    .bases("TypeAlias")
+    .build("id", "typeParameters", "right");
+
+  def("DeclareOpaqueType")
+    .bases("TypeAlias")
+    .build("id", "typeParameters", "supertype");
+
+  def("TypeCastExpression")
+    .bases("Expression")
+    .build("expression", "typeAnnotation")
+    .field("expression", def("Expression"))
+    .field("typeAnnotation", def("TypeAnnotation"));
+
+  def("TupleTypeAnnotation")
+    .bases("Type")
+    .build("types")
+    .field("types", [def("Type")]);
+
+  def("DeclareVariable")
+    .bases("Statement")
+    .build("id")
+    .field("id", def("Identifier"));
+
+  def("DeclareFunction")
+    .bases("Statement")
+    .build("id")
+    .field("id", def("Identifier"));
+
+  def("DeclareClass")
+    .bases("InterfaceDeclaration")
+    .build("id");
+
+  def("DeclareModule")
+    .bases("Statement")
+    .build("id", "body")
+    .field("id", or(def("Identifier"), def("Literal")))
+    .field("body", def("BlockStatement"));
+
+  def("DeclareModuleExports")
+    .bases("Statement")
+    .build("typeAnnotation")
+    .field("typeAnnotation", def("Type"));
+
+  def("DeclareExportDeclaration")
+    .bases("Declaration")
+    .build("default", "declaration", "specifiers", "source")
+    .field("default", Boolean)
+    .field("declaration", or(
+      def("DeclareVariable"),
+      def("DeclareFunction"),
+      def("DeclareClass"),
+      def("Type"), // Implies default.
+      null
+    ))
+    .field("specifiers", [or(
+      def("ExportSpecifier"),
+      def("ExportBatchSpecifier")
+    )], defaults.emptyArray)
+    .field("source", or(
+      def("Literal"),
+      null
+    ), defaults["null"]);
+
+  def("DeclareExportAllDeclaration")
+    .bases("Declaration")
+    .build("source")
+    .field("source", or(
+      def("Literal"),
+      null
+    ), defaults["null"]);
 };

package/def/jsx.js

@@ -63,6 +63,7 @@ module.exports = function (fork) {
     .field("children", [or(
       def("JSXElement"),
       def("JSXExpressionContainer"),
+      def("JSXFragment"),
       def("JSXText"),
       def("Literal") // TODO Esprima should return JSXText instead.
     )], defaults.emptyArray)
@@ -93,6 +94,27 @@ module.exports = function (fork) {
     .build("name")
     .field("name", JSXElementName);
 
+  def("JSXFragment")
+    .bases("Expression")
+    .build("openingElement", "closingElement", "children")
+    .field("openingElement", def("JSXOpeningFragment"))
+    .field("closingElement", def("JSXClosingFragment"))
+    .field("children", [or(
+      def("JSXElement"),
+      def("JSXExpressionContainer"),
+      def("JSXFragment"),
+      def("JSXText"),
+      def("Literal") // TODO Esprima should return JSXText instead.
+    )], defaults.emptyArray)
+
+  def("JSXOpeningFragment")
+    .bases("Node") // TODO Same concern.
+    .build();
+
+  def("JSXClosingFragment")
+    .bases("Node") // TODO Same concern.
+    .build();
+
   def("JSXText")
     .bases("Literal")
     .build("value")

package/lib/scope.js

@@ -274,6 +274,10 @@ module.exports = function (fork) {
                 bindings[pattern.name] = [patternPath];
             }
 
+        } else if (namedTypes.AssignmentPattern &&
+          namedTypes.AssignmentPattern.check(pattern)) {
+          addPattern(patternPath.get('left'), bindings);
+
         } else if (namedTypes.ObjectPattern &&
           namedTypes.ObjectPattern.check(pattern)) {
             patternPath.get('properties').each(function(propertyPath) {

package/main.js

@@ -1,17 +1,16 @@
 module.exports = require('./fork')([
-    // This core module of AST types captures ES5 as it is parsed today by
-    // git://github.com/ariya/esprima.git#master.
-    require("./def/core"),
+  // This core module of AST types captures ES5 as it is parsed today by
+  // git://github.com/ariya/esprima.git#master.
+  require("./def/core"),
 
-    // Feel free to add to or remove from this list of extension modules to
-    // configure the precise type hierarchy that you need.
-    require("./def/es6"),
-    require("./def/es7"),
-    require("./def/mozilla"),
-    require("./def/e4x"),
-    require("./def/jsx"),
-    require("./def/flow"),
-    require("./def/esprima"),
-    require("./def/babel"),
-    require("./def/babel6")
+  // Feel free to add to or remove from this list of extension modules to
+  // configure the precise type hierarchy that you need.
+  require("./def/es6"),
+  require("./def/es7"),
+  require("./def/mozilla"),
+  require("./def/e4x"),
+  require("./def/jsx"),
+  require("./def/flow"),
+  require("./def/esprima"),
+  require("./def/babel")
 ]);

package/package.json

@@ -18,7 +18,7 @@
     "transformation",
     "syntax"
   ],
-  "version": "0.9.13",
+  "version": "0.10.2",
   "homepage": "http://github.com/benjamn/ast-types",
   "repository": {
     "type": "git",
@@ -32,12 +32,12 @@
   "dependencies": {},
   "devDependencies": {
     "babel-types": "^6.26.0",
-    "babylon": "^6.16.1",
+    "babylon": "^7.0.0-beta.31",
     "espree": "^3.1.7",
     "esprima": "~4.0.0",
     "esprima-fb": "~14001.1.0-dev-harmony-fb",
-    "mocha": "^3.4.2",
-    "reify": "^0.12.0"
+    "mocha": "^5.0.0",
+    "reify": "^0.14.1"
   },
   "engines": {
     "node": ">= 0.8"

package/def/babel6.js

@@ -1,4 +0,0 @@
-module.exports = function (fork) {
-  fork.use(require("./babel6-core"));
-  fork.use(require("./flow"));
-};