ast-types 0.13.3 → 0.14.2

package/def/flow.js

@@ -1,14 +1,12 @@
 "use strict";;
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var es7_1 = __importDefault(require("./es7"));
-var type_annotations_1 = __importDefault(require("./type-annotations"));
-var types_1 = __importDefault(require("../lib/types"));
-var shared_1 = __importDefault(require("../lib/shared"));
+var tslib_1 = require("tslib");
+var es_proposals_1 = tslib_1.__importDefault(require("./es-proposals"));
+var type_annotations_1 = tslib_1.__importDefault(require("./type-annotations"));
+var types_1 = tslib_1.__importDefault(require("../lib/types"));
+var shared_1 = tslib_1.__importDefault(require("../lib/shared"));
 function default_1(fork) {
-    fork.use(es7_1.default);
+    fork.use(es_proposals_1.default);
     fork.use(type_annotations_1.default);
     var types = fork.use(types_1.default);
     var def = types.Type.def;
@@ -30,9 +28,15 @@ function default_1(fork) {
     def("VoidTypeAnnotation")
         .bases("FlowType")
         .build();
+    def("SymbolTypeAnnotation")
+        .bases("FlowType")
+        .build();
     def("NumberTypeAnnotation")
         .bases("FlowType")
         .build();
+    def("BigIntTypeAnnotation")
+        .bases("FlowType")
+        .build();
     def("NumberLiteralTypeAnnotation")
         .bases("FlowType")
         .build("value", "raw")
@@ -45,6 +49,11 @@ function default_1(fork) {
         .build("value", "raw")
         .field("value", Number)
         .field("raw", String);
+    def("BigIntLiteralTypeAnnotation")
+        .bases("FlowType")
+        .build("value", "raw")
+        .field("value", null)
+        .field("raw", String);
     def("StringTypeAnnotation")
         .bases("FlowType")
         .build();
@@ -94,7 +103,7 @@ function default_1(fork) {
     def("FunctionTypeParam")
         .bases("Node")
         .build("name", "typeAnnotation", "optional")
-        .field("name", def("Identifier"))
+        .field("name", or(def("Identifier"), null))
         .field("typeAnnotation", def("FlowType"))
         .field("optional", Boolean);
     def("ArrayTypeAnnotation")
@@ -130,7 +139,8 @@ function default_1(fork) {
         .field("id", def("Identifier"))
         .field("key", def("FlowType"))
         .field("value", def("FlowType"))
-        .field("variance", LegacyVariance, defaults["null"]);
+        .field("variance", LegacyVariance, defaults["null"])
+        .field("static", Boolean, defaults["false"]);
     def("ObjectTypeCallProperty")
         .bases("Node")
         .build("value")
@@ -185,10 +195,11 @@ function default_1(fork) {
         .field("params", [def("FlowType")]);
     def("TypeParameter")
         .bases("FlowType")
-        .build("name", "variance", "bound")
+        .build("name", "variance", "bound", "default")
         .field("name", String)
         .field("variance", LegacyVariance, defaults["null"])
-        .field("bound", or(def("TypeAnnotation"), null), defaults["null"]);
+        .field("bound", or(def("TypeAnnotation"), null), defaults["null"])
+        .field("default", or(def("FlowType"), null), defaults["null"]);
     def("ClassProperty")
         .field("variance", LegacyVariance, defaults["null"]);
     def("ClassImplements")
@@ -223,19 +234,20 @@ function default_1(fork) {
         .field("id", def("Identifier"))
         .field("typeParameters", or(def("TypeParameterDeclaration"), null))
         .field("right", def("FlowType"));
+    def("DeclareTypeAlias")
+        .bases("TypeAlias")
+        .build("id", "typeParameters", "right");
     def("OpaqueType")
         .bases("Declaration")
         .build("id", "typeParameters", "impltype", "supertype")
         .field("id", def("Identifier"))
         .field("typeParameters", or(def("TypeParameterDeclaration"), null))
         .field("impltype", def("FlowType"))
-        .field("supertype", def("FlowType"));
-    def("DeclareTypeAlias")
-        .bases("TypeAlias")
-        .build("id", "typeParameters", "right");
+        .field("supertype", or(def("FlowType"), null));
     def("DeclareOpaqueType")
-        .bases("TypeAlias")
-        .build("id", "typeParameters", "supertype");
+        .bases("OpaqueType")
+        .build("id", "typeParameters", "supertype")
+        .field("impltype", or(def("FlowType"), null));
     def("TypeCastExpression")
         .bases("Expression")
         .build("expression", "typeAnnotation")
@@ -252,7 +264,8 @@ function default_1(fork) {
     def("DeclareFunction")
         .bases("Statement")
         .build("id")
-        .field("id", def("Identifier"));
+        .field("id", def("Identifier"))
+        .field("predicate", or(def("FlowPredicate"), null), defaults["null"]);
     def("DeclareClass")
         .bases("InterfaceDeclaration")
         .build("id");
@@ -270,13 +283,17 @@ function default_1(fork) {
         .build("default", "declaration", "specifiers", "source")
         .field("default", Boolean)
         .field("declaration", or(def("DeclareVariable"), def("DeclareFunction"), def("DeclareClass"), def("FlowType"), // Implies default.
-    null))
+    def("TypeAlias"), // Implies named type
+    def("DeclareOpaqueType"), // Implies named opaque type
+    def("InterfaceDeclaration"), 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"]);
+    def("ImportDeclaration")
+        .field("importKind", or("value", "type", "typeof"), function () { return "value"; });
     def("FlowPredicate").bases("Flow");
     def("InferredPredicate")
         .bases("FlowPredicate")
@@ -285,10 +302,48 @@ function default_1(fork) {
         .bases("FlowPredicate")
         .build("value")
         .field("value", def("Expression"));
+    def("Function")
+        .field("predicate", or(def("FlowPredicate"), null), defaults["null"]);
     def("CallExpression")
         .field("typeArguments", or(null, def("TypeParameterInstantiation")), defaults["null"]);
     def("NewExpression")
         .field("typeArguments", or(null, def("TypeParameterInstantiation")), defaults["null"]);
+    // Enums
+    def("EnumDeclaration")
+        .bases("Declaration")
+        .build("id", "body")
+        .field("id", def("Identifier"))
+        .field("body", or(def("EnumBooleanBody"), def("EnumNumberBody"), def("EnumStringBody"), def("EnumSymbolBody")));
+    def("EnumBooleanBody")
+        .build("members", "explicitType")
+        .field("members", [def("EnumBooleanMember")])
+        .field("explicitType", Boolean);
+    def("EnumNumberBody")
+        .build("members", "explicitType")
+        .field("members", [def("EnumNumberMember")])
+        .field("explicitType", Boolean);
+    def("EnumStringBody")
+        .build("members", "explicitType")
+        .field("members", or([def("EnumStringMember")], [def("EnumDefaultedMember")]))
+        .field("explicitType", Boolean);
+    def("EnumSymbolBody")
+        .build("members")
+        .field("members", [def("EnumDefaultedMember")]);
+    def("EnumBooleanMember")
+        .build("id", "init")
+        .field("id", def("Identifier"))
+        .field("init", or(def("Literal"), Boolean));
+    def("EnumNumberMember")
+        .build("id", "init")
+        .field("id", def("Identifier"))
+        .field("init", def("Literal"));
+    def("EnumStringMember")
+        .build("id", "init")
+        .field("id", def("Identifier"))
+        .field("init", def("Literal"));
+    def("EnumDefaultedMember")
+        .build("id")
+        .field("id", def("Identifier"));
 }
 exports.default = default_1;
 module.exports = exports["default"];

package/def/jsx.js

@@ -1,13 +1,11 @@
 "use strict";;
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var es7_1 = __importDefault(require("./es7"));
-var types_1 = __importDefault(require("../lib/types"));
-var shared_1 = __importDefault(require("../lib/shared"));
+var tslib_1 = require("tslib");
+var es2020_1 = tslib_1.__importDefault(require("./es2020"));
+var types_1 = tslib_1.__importDefault(require("../lib/types"));
+var shared_1 = tslib_1.__importDefault(require("../lib/shared"));
 function default_1(fork) {
-    fork.use(es7_1.default);
+    fork.use(es2020_1.default);
     var types = fork.use(types_1.default);
     var def = types.Type.def;
     var or = types.Type.or;
@@ -18,6 +16,8 @@ function default_1(fork) {
         .field("name", or(def("JSXIdentifier"), def("JSXNamespacedName")))
         .field("value", or(def("Literal"), // attr="value"
     def("JSXExpressionContainer"), // attr={value}
+    def("JSXElement"), // attr=<div />
+    def("JSXFragment"), // attr=<></>
     null // attr= or just attr
     ), defaults["null"]);
     def("JSXIdentifier")
@@ -44,14 +44,15 @@ function default_1(fork) {
     def("JSXExpressionContainer")
         .bases("Expression")
         .build("expression")
-        .field("expression", def("Expression"));
+        .field("expression", or(def("Expression"), def("JSXEmptyExpression")));
+    var JSXChildren = [or(def("JSXText"), def("JSXExpressionContainer"), def("JSXSpreadChild"), def("JSXElement"), def("JSXFragment"), def("Literal") // Legacy: Esprima should return JSXText instead.
+        )];
     def("JSXElement")
         .bases("Expression")
         .build("openingElement", "closingElement", "children")
         .field("openingElement", def("JSXOpeningElement"))
         .field("closingElement", or(def("JSXClosingElement"), null), defaults["null"])
-        .field("children", [or(def("JSXElement"), def("JSXExpressionContainer"), def("JSXFragment"), def("JSXText"), def("Literal") // TODO Esprima should return JSXText instead.
-        )], defaults.emptyArray)
+        .field("children", JSXChildren, defaults.emptyArray)
         .field("name", JSXElementName, function () {
         // Little-known fact: the `this` object inside a default function
         // is none other than the partially-built object itself, and any
@@ -67,37 +68,39 @@ function default_1(fork) {
         return this.openingElement.attributes;
     }, true); // hidden from traversal
     def("JSXOpeningElement")
-        .bases("Node") // TODO Does this make sense? Can't really be an JSXElement.
+        .bases("Node")
         .build("name", "attributes", "selfClosing")
         .field("name", JSXElementName)
         .field("attributes", JSXAttributes, defaults.emptyArray)
         .field("selfClosing", Boolean, defaults["false"]);
     def("JSXClosingElement")
-        .bases("Node") // TODO Same concern.
+        .bases("Node")
         .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);
+        .build("openingFragment", "closingFragment", "children")
+        .field("openingFragment", def("JSXOpeningFragment"))
+        .field("closingFragment", def("JSXClosingFragment"))
+        .field("children", JSXChildren, defaults.emptyArray);
     def("JSXOpeningFragment")
-        .bases("Node") // TODO Same concern.
+        .bases("Node")
         .build();
     def("JSXClosingFragment")
-        .bases("Node") // TODO Same concern.
+        .bases("Node")
         .build();
     def("JSXText")
         .bases("Literal")
-        .build("value")
-        .field("value", String);
-    def("JSXEmptyExpression").bases("Expression").build();
-    // This PR has caused many people issues, but supporting it seems like a
-    // good idea anyway: https://github.com/babel/babel/pull/4988
+        .build("value", "raw")
+        .field("value", String)
+        .field("raw", String, function () {
+        return this.value;
+    });
+    def("JSXEmptyExpression")
+        .bases("Node")
+        .build();
     def("JSXSpreadChild")
-        .bases("Expression")
+        .bases("Node")
         .build("expression")
         .field("expression", def("Expression"));
 }

package/def/type-annotations.js

@@ -4,12 +4,10 @@
  * These defs could not be defined in ./flow.ts or ./typescript.ts directly
  * because they use the same name.
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var types_1 = __importDefault(require("../lib/types"));
-var shared_1 = __importDefault(require("../lib/shared"));
+var tslib_1 = require("tslib");
+var types_1 = tslib_1.__importDefault(require("../lib/types"));
+var shared_1 = tslib_1.__importDefault(require("../lib/shared"));
 function default_1(fork) {
     var types = fork.use(types_1.default);
     var def = types.Type.def;

package/def/typescript.js

@@ -1,12 +1,10 @@
 "use strict";;
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var babel_core_1 = __importDefault(require("./babel-core"));
-var type_annotations_1 = __importDefault(require("./type-annotations"));
-var types_1 = __importDefault(require("../lib/types"));
-var shared_1 = __importDefault(require("../lib/shared"));
+var tslib_1 = require("tslib");
+var babel_core_1 = tslib_1.__importDefault(require("./babel-core"));
+var type_annotations_1 = tslib_1.__importDefault(require("./type-annotations"));
+var types_1 = tslib_1.__importDefault(require("../lib/types"));
+var shared_1 = tslib_1.__importDefault(require("../lib/shared"));
 function default_1(fork) {
     // Since TypeScript is parsed by Babylon, include the core Babylon types
     // but omit the Flow-related types.
@@ -166,7 +164,13 @@ function default_1(fork) {
     def("TSTupleType")
         .bases("TSType")
         .build("elementTypes")
-        .field("elementTypes", [def("TSType")]);
+        .field("elementTypes", [or(def("TSType"), def("TSNamedTupleMember"))]);
+    def("TSNamedTupleMember")
+        .bases("TSType")
+        .build("label", "elementType", "optional")
+        .field("label", def("Identifier"))
+        .field("optional", Boolean, defaults["false"])
+        .field("elementType", def("TSType"));
     def("TSRestType")
         .bases("TSType")
         .build("typeAnnotation")
@@ -210,10 +214,11 @@ function default_1(fork) {
         .field("optional", Boolean, defaults["false"])
         .field("parameters", ParametersType);
     def("TSTypePredicate")
-        .bases("TSTypeAnnotation")
-        .build("parameterName", "typeAnnotation")
+        .bases("TSTypeAnnotation", "TSType")
+        .build("parameterName", "typeAnnotation", "asserts")
         .field("parameterName", or(def("Identifier"), def("TSThisType")))
-        .field("typeAnnotation", def("TSTypeAnnotation"));
+        .field("typeAnnotation", or(def("TSTypeAnnotation"), null), defaults["null"])
+        .field("asserts", Boolean, defaults["false"]);
     ["TSCallSignatureDeclaration",
         "TSConstructSignatureDeclaration",
     ].forEach(function (typeName) {

package/fork.d.ts

@@ -37,6 +37,6 @@ export default function (defs: Def[]): {
     Path: import("./lib/path").PathConstructor;
     NodePath: import("./lib/node-path").NodePathConstructor;
     PathVisitor: import("./lib/path-visitor").PathVisitorConstructor;
-    use: <T>(plugin: Plugin<T>) => T;
+    use: <T_1>(plugin: Plugin<T_1>) => T_1;
     visit: <M = {}>(node: import("./lib/types").ASTNode, methods?: import("./main").Visitor<M> | undefined) => any;
 };

package/fork.js

@@ -1,13 +1,11 @@
 "use strict";;
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var types_1 = __importDefault(require("./lib/types"));
-var path_visitor_1 = __importDefault(require("./lib/path-visitor"));
-var equiv_1 = __importDefault(require("./lib/equiv"));
-var path_1 = __importDefault(require("./lib/path"));
-var node_path_1 = __importDefault(require("./lib/node-path"));
+var tslib_1 = require("tslib");
+var types_1 = tslib_1.__importDefault(require("./lib/types"));
+var path_visitor_1 = tslib_1.__importDefault(require("./lib/path-visitor"));
+var equiv_1 = tslib_1.__importDefault(require("./lib/equiv"));
+var path_1 = tslib_1.__importDefault(require("./lib/path"));
+var node_path_1 = tslib_1.__importDefault(require("./lib/node-path"));
 function default_1(defs) {
     var fork = createFork();
     var types = fork.use(types_1.default);