ast-types 0.9.2 → 0.9.6

package/def/babel6.js

@@ -1,160 +1,165 @@
 module.exports = function (fork) {
-    fork.use(require("./babel"));
-    fork.use(require("./flow"));
-
-    // 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("Directive")
-        .bases("Node")
-        .build("value")
-        .field("value", def("DirectiveLiteral"));
-
-    def("DirectiveLiteral")
-        .bases("Node", "Expression")
-        .build("value")
-        .field("value", String, defaults["use strict"]);
-
-    def("BlockStatement")
-        .bases("Statement")
-        .build("body")
-        .field("body", [def("Statement")])
-        .field("directives", [def("Directive")], defaults.emptyArray);
-
-    def("Program")
-        .bases("Node")
-        .build("body")
-        .field("body", [def("Statement")])
-        .field("directives", [def("Directive")], defaults.emptyArray);
-
-    // Split Literal
-    def("StringLiteral")
-        .bases("Literal")
-        .build("value")
-        .field("value", String);
-
-    def("NumericLiteral")
-        .bases("Literal")
-        .build("value")
-        .field("value", Number);
-
-    def("NullLiteral")
-        .bases("Literal")
-        .build();
-
-    def("BooleanLiteral")
-        .bases("Literal")
-        .build("value")
-        .field("value", Boolean);
-
-    def("RegExpLiteral")
-        .bases("Literal")
-        .build("pattern", "flags")
-        .field("pattern", String)
-        .field("flags", String);
-
-    var ObjectExpressionProperty = or(
-      def("Property"),
-      def("ObjectMethod"),
-      def("ObjectProperty"),
-      def("SpreadProperty")
-    );
-
-    // Split Property -> ObjectProperty and ObjectMethod
-    def("ObjectExpression")
-        .bases("Expression")
-        .build("properties")
-        .field("properties", [ObjectExpressionProperty]);
-
-    // ObjectMethod hoist .value properties to own properties
-    def("ObjectMethod")
-        .bases("Node", "Function")
-        .build("kind", "key", "params", "body", "computed")
-        .field("kind", or("method", "get", "set"))
-        .field("key", or(def("Literal"), def("Identifier"), def("Expression")))
-        .field("params", [def("Pattern")])
-        .field("body", def("BlockStatement"))
-        .field("computed", Boolean, defaults["false"])
-        .field("generator", Boolean, defaults["false"])
-        .field("async", Boolean, defaults["false"])
-        .field("decorators",
-            or([def("Decorator")], null),
-            defaults["null"]);
-
-    def("ObjectProperty")
-        .bases("Node")
-        .build("key", "value")
-        .field("key", or(def("Literal"), def("Identifier"), def("Expression")))
-        .field("value", or(def("Expression"), def("Pattern")))
-        .field("computed", Boolean, defaults["false"]);
-
-    var ClassBodyElement = or(
-      def("MethodDefinition"),
-      def("VariableDeclarator"),
-      def("ClassPropertyDefinition"),
-      def("ClassProperty"),
-      def("ClassMethod")
-    );
-
-    // MethodDefinition -> ClassMethod
-    def("ClassBody")
-        .bases("Declaration")
-        .build("body")
-        .field("body", [ClassBodyElement]);
-
-    def("ClassMethod")
-        .bases("Declaration", "Function")
-        .build("kind", "key", "params", "body", "computed", "static")
-        .field("kind", or("get", "set", "method", "constructor"))
-        .field("key", or(def("Literal"), def("Identifier"), def("Expression")))
-        .field("params", [def("Pattern")])
-        .field("body", def("BlockStatement"))
-        .field("computed", Boolean, defaults["false"])
-        .field("static", Boolean, defaults["false"])
-        .field("generator", Boolean, defaults["false"])
-        .field("async", Boolean, defaults["false"])
-        .field("decorators",
-            or([def("Decorator")], null),
-            defaults["null"]);
-
-    var ObjectPatternProperty = or(
-        def("Property"),
-        def("PropertyPattern"),
-        def("SpreadPropertyPattern"),
-        def("SpreadProperty"), // Used by Esprima
-        def("ObjectProperty"), // Babel 6
-        def("RestProperty") // Babel 6
-    );
-
-    // Split into RestProperty and SpreadProperty
-    def("ObjectPattern")
-        .bases("Pattern")
-        .build("properties")
-        .field("properties", [ObjectPatternProperty])
-        .field("decorators",
-               or([def("Decorator")], null),
-               defaults["null"]);
-
+  fork.use(require("./babel"));
+  fork.use(require("./flow"));
+
+  // 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("Directive")
+    .bases("Node")
+    .build("value")
+    .field("value", def("DirectiveLiteral"));
+
+  def("DirectiveLiteral")
+    .bases("Node", "Expression")
+    .build("value")
+    .field("value", String, defaults["use strict"]);
+
+  def("BlockStatement")
+    .bases("Statement")
+    .build("body")
+    .field("body", [def("Statement")])
+    .field("directives", [def("Directive")], defaults.emptyArray);
+
+  def("Program")
+    .bases("Node")
+    .build("body")
+    .field("body", [def("Statement")])
+    .field("directives", [def("Directive")], defaults.emptyArray);
+
+  // Split Literal
+  def("StringLiteral")
+    .bases("Literal")
+    .build("value")
+    .field("value", String);
+
+  def("NumericLiteral")
+    .bases("Literal")
+    .build("value")
+    .field("value", Number);
+
+  def("NullLiteral")
+    .bases("Literal")
+    .build();
+
+  def("BooleanLiteral")
+    .bases("Literal")
+    .build("value")
+    .field("value", Boolean);
+
+  def("RegExpLiteral")
+    .bases("Literal")
+    .build("pattern", "flags")
+    .field("pattern", String)
+    .field("flags", String);
+
+  var ObjectExpressionProperty = or(
+    def("Property"),
+    def("ObjectMethod"),
+    def("ObjectProperty"),
     def("SpreadProperty")
-      .bases("Node")
-      .build("argument")
-      .field("argument", def("Expression"));
-
-    def("RestProperty")
-      .bases("Node")
-      .build("argument")
-      .field("argument", def("Expression"));
-
-    def("ForAwaitStatement")
-      .bases("Statement")
-      .build("left", "right", "body")
-      .field("left", or(
-          def("VariableDeclaration"),
-          def("Expression")))
-      .field("right", def("Expression"))
-      .field("body", def("Statement"));
+  );
+
+  // Split Property -> ObjectProperty and ObjectMethod
+  def("ObjectExpression")
+    .bases("Expression")
+    .build("properties")
+    .field("properties", [ObjectExpressionProperty]);
+
+  // ObjectMethod hoist .value properties to own properties
+  def("ObjectMethod")
+    .bases("Node", "Function")
+    .build("kind", "key", "params", "body", "computed")
+    .field("kind", or("method", "get", "set"))
+    .field("key", or(def("Literal"), def("Identifier"), def("Expression")))
+    .field("params", [def("Pattern")])
+    .field("body", def("BlockStatement"))
+    .field("computed", Boolean, defaults["false"])
+    .field("generator", Boolean, defaults["false"])
+    .field("async", Boolean, defaults["false"])
+    .field("decorators",
+           or([def("Decorator")], null),
+           defaults["null"]);
+
+  def("ObjectProperty")
+    .bases("Node")
+    .build("key", "value")
+    .field("key", or(def("Literal"), def("Identifier"), def("Expression")))
+    .field("value", or(def("Expression"), def("Pattern")))
+    .field("computed", Boolean, defaults["false"]);
+
+  var ClassBodyElement = or(
+    def("MethodDefinition"),
+    def("VariableDeclarator"),
+    def("ClassPropertyDefinition"),
+    def("ClassProperty"),
+    def("ClassMethod")
+  );
+
+  // MethodDefinition -> ClassMethod
+  def("ClassBody")
+    .bases("Declaration")
+    .build("body")
+    .field("body", [ClassBodyElement]);
+
+  def("ClassMethod")
+    .bases("Declaration", "Function")
+    .build("kind", "key", "params", "body", "computed", "static")
+    .field("kind", or("get", "set", "method", "constructor"))
+    .field("key", or(def("Literal"), def("Identifier"), def("Expression")))
+    .field("params", [def("Pattern")])
+    .field("body", def("BlockStatement"))
+    .field("computed", Boolean, defaults["false"])
+    .field("static", Boolean, defaults["false"])
+    .field("generator", Boolean, defaults["false"])
+    .field("async", Boolean, defaults["false"])
+    .field("decorators",
+           or([def("Decorator")], null),
+           defaults["null"]);
+
+  var ObjectPatternProperty = or(
+    def("Property"),
+    def("PropertyPattern"),
+    def("SpreadPropertyPattern"),
+    def("SpreadProperty"), // Used by Esprima
+    def("ObjectProperty"), // Babel 6
+    def("RestProperty") // Babel 6
+  );
+
+  // Split into RestProperty and SpreadProperty
+  def("ObjectPattern")
+    .bases("Pattern")
+    .build("properties")
+    .field("properties", [ObjectPatternProperty])
+    .field("decorators",
+           or([def("Decorator")], null),
+           defaults["null"]);
+
+  def("SpreadProperty")
+    .bases("Node")
+    .build("argument")
+    .field("argument", def("Expression"));
+
+  def("RestProperty")
+    .bases("Node")
+    .build("argument")
+    .field("argument", def("Expression"));
+
+  def("ForAwaitStatement")
+    .bases("Statement")
+    .build("left", "right", "body")
+    .field("left", or(
+      def("VariableDeclaration"),
+      def("Expression")))
+    .field("right", def("Expression"))
+    .field("body", def("Statement"));
+
+  // The callee node of a dynamic import(...) expression.
+  def("Import")
+    .bases("Expression")
+    .build();
 };

package/def/core.js

@@ -36,8 +36,9 @@ module.exports = function (fork) {
 
     def("File")
         .bases("Node")
-        .build("program")
-        .field("program", def("Program"));
+        .build("program", "name")
+        .field("program", def("Program"))
+        .field("name", or(String, null), defaults["null"]);
 
     def("Program")
         .bases("Node")

package/def/esprima.js

@@ -80,13 +80,19 @@ module.exports = function (fork) {
 
     def("ImportDeclaration")
       .bases("Declaration")
-      .build("specifiers", "source")
+      .build("specifiers", "source", "importKind")
       .field("specifiers", [or(
         def("ImportSpecifier"),
         def("ImportNamespaceSpecifier"),
         def("ImportDefaultSpecifier")
       )], defaults.emptyArray)
-      .field("source", def("Literal"));
+      .field("source", def("Literal"))
+      .field("importKind", or(
+        "value",
+        "type"
+      ), function() {
+        return "value";
+      });
 
     def("Block")
       .bases("Comment")

package/def/flow.js

@@ -35,6 +35,14 @@ module.exports = function (fork) {
       .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();
@@ -310,4 +318,12 @@ module.exports = function (fork) {
         def("Literal"),
         null
       ), defaults["null"]);
+
+    def("DeclareExportAllDeclaration")
+      .bases("Declaration")
+      .build("source")
+      .field("source", or(
+        def("Literal"),
+        null
+      ), defaults["null"]);
 };

package/package.json

@@ -18,7 +18,7 @@
     "transformation",
     "syntax"
   ],
-  "version": "0.9.2",
+  "version": "0.9.6",
   "homepage": "http://github.com/benjamn/ast-types",
   "repository": {
     "type": "git",