ast-types 0.11.6 → 0.11.7

package/def/es6.js

@@ -88,6 +88,9 @@ module.exports = function (fork) {
     .field("shorthand", Boolean, defaults["false"])
     .field("computed", Boolean, defaults["false"]);
 
+  def("ObjectProperty")
+    .field("shorthand", Boolean, defaults["false"]);
+
   def("PropertyPattern")
     .bases("Pattern")
     .build("key", "pattern")

package/def/flow.js

@@ -1,5 +1,6 @@
 module.exports = function (fork) {
   fork.use(require("./es7"));
+  fork.use(require("./type-annotations"));
 
   var types = fork.use(require("../lib/types"));
   var def = types.Type.def;
@@ -206,12 +207,6 @@ module.exports = function (fork) {
     .build("argument")
     .field("argument", def("FlowType"));
 
-  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")
@@ -231,33 +226,9 @@ module.exports = function (fork) {
            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"]);
 
-  ["ClassDeclaration",
-   "ClassExpression",
-  ].forEach(typeName => {
-    def(typeName)
-      .field("typeParameters",
-             or(def("TypeParameterDeclaration"), null),
-             defaults["null"])
-      .field("superTypeParameters",
-             or([def("GenericTypeAnnotation")], null),
-             defaults["null"]);
-  });
-
   def("ClassImplements")
     .bases("Node")
     .build("id")
@@ -267,13 +238,6 @@ module.exports = function (fork) {
            or(def("TypeParameterInstantiation"), null),
            defaults["null"]);
 
-  ["ClassDeclaration",
-   "ClassExpression",
-  ].forEach(typeName => {
-    def(typeName)
-      .field("implements", [def("ClassImplements")], defaults.emptyArray);
-  });
-
   def("InterfaceDeclaration")
     .bases("Declaration")
     .build("id", "body", "extends")

package/def/type-annotations.js

@@ -0,0 +1,61 @@
+/**
+ * Type annotation defs shared between Flow and TypeScript.
+ * These defs could not be defined in ./flow.js or ./typescript.js directly
+ * because they use the same name.
+ */
+module.exports = function (fork) {
+  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;
+
+  var TypeAnnotation = or(
+    def("TypeAnnotation"),
+    def("TSTypeAnnotation"),
+    null
+  );
+
+  var TypeParamDecl = or(
+    def("TypeParameterDeclaration"),
+    def("TSTypeParameterDeclaration"),
+    null
+  );
+
+  def("Identifier")
+    .field("typeAnnotation", TypeAnnotation, defaults["null"]);
+
+  def("ObjectPattern")
+    .field("typeAnnotation", TypeAnnotation, defaults["null"]);
+
+  def("Function")
+    .field("returnType", TypeAnnotation, defaults["null"])
+    .field("typeParameters", TypeParamDecl, defaults["null"]);
+
+  def("ClassProperty")
+    .build("key", "value", "typeAnnotation", "static")
+    .field("value", or(def("Expression"), null))
+    .field("static", Boolean, defaults["false"])
+    .field("typeAnnotation", TypeAnnotation, defaults["null"]);
+
+  ["ClassDeclaration",
+    "ClassExpression",
+  ].forEach(typeName => {
+    def(typeName)
+      .field("typeParameters", TypeParamDecl, defaults["null"])
+      .field("superTypeParameters",
+             or(def("TypeParameterInstantiation"),
+                def("TSTypeParameterInstantiation"),
+                null),
+             defaults["null"]);
+  });
+
+  ["ClassDeclaration",
+   "ClassExpression",
+  ].forEach(typeName => {
+    def(typeName)
+      .field("implements",
+             or([def("ClassImplements")],
+                [def("TSExpressionWithTypeArguments")]),
+             defaults.emptyArray);
+  });
+};

package/def/typescript.js

@@ -2,6 +2,7 @@ module.exports = function (fork) {
   // Since TypeScript is parsed by Babylon, include the core Babylon types
   // but omit the Flow-related types.
   fork.use(require("./babel-core"));
+  fork.use(require("./type-annotations"));
 
   var types = fork.use(require("../lib/types"));
   var n = types.namedTypes;
@@ -202,9 +203,9 @@ module.exports = function (fork) {
   def("TSMappedType")
     .bases("TSType")
     .build("typeParameter", "typeAnnotation")
-    .field("readonly", Boolean, defaults["false"])
+    .field("readonly", or(Boolean, "+", "-"), defaults["false"])
     .field("typeParameter", def("TSTypeParameter"))
-    .field("optional", Boolean, defaults["false"])
+    .field("optional", or(Boolean, "+", "-"), defaults["false"])
     .field("typeAnnotation",
            or(def("TSType"), null),
            defaults["null"]);
@@ -300,7 +301,7 @@ module.exports = function (fork) {
   def("TSTypeQuery")
     .bases("TSType")
     .build("exprName")
-    .field("exprName", def("Identifier"));
+    .field("exprName", IdOrQualifiedName);
 
   // Inferred from Babylon's tsParseTypeMember method.
   var TSTypeMember = or(
@@ -318,6 +319,7 @@ module.exports = function (fork) {
 
   def("TSTypeParameter")
     .bases("Identifier")
+    .build("name", "constraint", "default")
     .field("name", String)
     .field("constraint", or(def("TSType"), null), defaults["null"])
     .field("default", or(def("TSType"), null), defaults["null"]);
@@ -423,15 +425,6 @@ module.exports = function (fork) {
            defaults["null"])
     .field("body", def("TSInterfaceBody"));
 
-  ["ClassDeclaration",
-   "ClassExpression",
-  ].forEach(typeName => {
-    def(typeName)
-      .field("implements",
-             [def("TSExpressionWithTypeArguments")],
-             defaults.emptyArray);
-  });
-
   def("TSParameterProperty")
     .bases("Pattern")
     .build("parameter")

package/package.json

@@ -1,7 +1,7 @@
 {
   "author": "Ben Newman <bn@cs.stanford.edu>",
   "name": "ast-types",
-  "version": "0.11.6",
+  "version": "0.11.7",
   "description": "Esprima-compatible implementation of the Mozilla JS Parser API",
   "keywords": [
     "ast",