ast-types 0.13.4 → 0.15.0

package/def/es6.js

@@ -1,9 +1,9 @@
 "use strict";;
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-var core_1 = tslib_1.__importDefault(require("./core"));
-var types_1 = tslib_1.__importDefault(require("../lib/types"));
-var shared_1 = tslib_1.__importDefault(require("../lib/shared"));
+var core_1 = (0, tslib_1.__importDefault)(require("./core"));
+var types_1 = (0, tslib_1.__importDefault)(require("../lib/types"));
+var shared_1 = (0, tslib_1.__importDefault)(require("../lib/shared"));
 function default_1(fork) {
     fork.use(core_1.default);
     var types = fork.use(types_1.default);
@@ -14,7 +14,7 @@ function default_1(fork) {
         .field("generator", Boolean, defaults["false"])
         .field("expression", Boolean, defaults["false"])
         .field("defaults", [or(def("Expression"), null)], defaults.emptyArray)
-        // TODO This could be represented as a RestElement in .params.
+        // Legacy
         .field("rest", or(def("Identifier"), null), defaults["null"]);
     // The ESTree way of representing a ...rest parameter.
     def("RestElement")
@@ -28,11 +28,11 @@ function default_1(fork) {
         .build("argument")
         .field("argument", def("Pattern"));
     def("FunctionDeclaration")
-        .build("id", "params", "body", "generator", "expression");
+        .build("id", "params", "body", "generator", "expression")
+        // May be `null` in the context of `export default function () {}`
+        .field("id", or(def("Identifier"), null));
     def("FunctionExpression")
         .build("id", "params", "body", "generator", "expression");
-    // The Parser API calls this ArrowExpression, but Esprima and all other
-    // actual parsers use ArrowFunctionExpression.
     def("ArrowFunctionExpression")
         .bases("Function", "Expression")
         .build("params", "body", "expression")
@@ -95,14 +95,6 @@ function default_1(fork) {
         .bases("Pattern")
         .build("elements")
         .field("elements", [or(def("Pattern"), null)]);
-    def("MethodDefinition")
-        .bases("Declaration")
-        .build("kind", "key", "value", "static")
-        .field("kind", or("constructor", "method", "get", "set"))
-        .field("key", def("Expression"))
-        .field("value", def("Function"))
-        .field("computed", Boolean, defaults["false"])
-        .field("static", Boolean, defaults["false"]);
     def("SpreadElement")
         .bases("Node")
         .build("argument")
@@ -124,6 +116,14 @@ function default_1(fork) {
         .build("left", "right")
         .field("left", def("Pattern"))
         .field("right", def("Expression"));
+    def("MethodDefinition")
+        .bases("Declaration")
+        .build("kind", "key", "value", "static")
+        .field("kind", or("constructor", "method", "get", "set"))
+        .field("key", def("Expression"))
+        .field("value", def("Function"))
+        .field("computed", Boolean, defaults["false"])
+        .field("static", Boolean, defaults["false"]);
     var ClassBodyElement = or(def("MethodDefinition"), def("VariableDeclarator"), def("ClassPropertyDefinition"), def("ClassProperty"));
     def("ClassProperty")
         .bases("Declaration")
@@ -151,6 +151,9 @@ function default_1(fork) {
         .field("id", or(def("Identifier"), null), defaults["null"])
         .field("body", def("ClassBody"))
         .field("superClass", or(def("Expression"), null), defaults["null"]);
+    def("Super")
+        .bases("Expression")
+        .build();
     // Specifier and ModuleSpecifier are abstract non-standard types
     // introduced for definitional convenience.
     def("Specifier").bases("Node");
@@ -169,19 +172,19 @@ function default_1(fork) {
         // optional in the Babel/Acorn AST format.
         .field("id", or(def("Identifier"), null), defaults["null"])
         .field("name", or(def("Identifier"), null), defaults["null"]);
-    // Like ModuleSpecifier, except type:"ImportSpecifier" and buildable.
     // import {<id [as name]>} from ...;
     def("ImportSpecifier")
         .bases("ModuleSpecifier")
-        .build("id", "name");
-    // import <* as id> from ...;
-    def("ImportNamespaceSpecifier")
-        .bases("ModuleSpecifier")
-        .build("id");
+        .build("imported", "local")
+        .field("imported", def("Identifier"));
     // import <id> from ...;
     def("ImportDefaultSpecifier")
         .bases("ModuleSpecifier")
-        .build("id");
+        .build("local");
+    // import <* as id> from ...;
+    def("ImportNamespaceSpecifier")
+        .bases("ModuleSpecifier")
+        .build("local");
     def("ImportDeclaration")
         .bases("Declaration")
         .build("specifiers", "source", "importKind")
@@ -190,6 +193,24 @@ function default_1(fork) {
         .field("importKind", or("value", "type"), function () {
         return "value";
     });
+    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("ExportDefaultDeclaration")
+        .bases("Declaration")
+        .build("declaration")
+        .field("declaration", or(def("Declaration"), def("Expression")));
+    def("ExportAllDeclaration")
+        .bases("Declaration")
+        .build("source")
+        .field("source", def("Literal"));
     def("TaggedTemplateExpression")
         .bases("Expression")
         .build("tag", "quasi")
@@ -205,6 +226,11 @@ function default_1(fork) {
         .build("value", "tail")
         .field("value", { "cooked": String, "raw": String })
         .field("tail", Boolean);
+    def("MetaProperty")
+        .bases("Expression")
+        .build("meta", "property")
+        .field("meta", def("Identifier"))
+        .field("property", def("Identifier"));
 }
 exports.default = default_1;
 module.exports = exports["default"];

package/def/esprima.js

@@ -1,11 +1,11 @@
 "use strict";;
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-var es7_1 = tslib_1.__importDefault(require("./es7"));
-var types_1 = tslib_1.__importDefault(require("../lib/types"));
-var shared_1 = tslib_1.__importDefault(require("../lib/shared"));
+var es_proposals_1 = (0, tslib_1.__importDefault)(require("./es-proposals"));
+var types_1 = (0, tslib_1.__importDefault)(require("../lib/types"));
+var shared_1 = (0, tslib_1.__importDefault)(require("../lib/shared"));
 function default_1(fork) {
-    fork.use(es7_1.default);
+    fork.use(es_proposals_1.default);
     var types = fork.use(types_1.default);
     var defaults = fork.use(shared_1.default).defaults;
     var def = types.Type.def;

package/def/flow.js

@@ -1,12 +1,12 @@
 "use strict";;
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-var es7_1 = tslib_1.__importDefault(require("./es7"));
-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"));
+var es_proposals_1 = (0, tslib_1.__importDefault)(require("./es-proposals"));
+var type_annotations_1 = (0, tslib_1.__importDefault)(require("./type-annotations"));
+var types_1 = (0, tslib_1.__importDefault)(require("../lib/types"));
+var shared_1 = (0, 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;
@@ -28,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")
@@ -43,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();
@@ -92,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")
@@ -128,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")
@@ -149,6 +161,17 @@ function default_1(fork) {
         .build("object", "property")
         .field("object", def("Identifier"))
         .field("property", or(def("MemberTypeAnnotation"), def("GenericTypeAnnotation")));
+    def("IndexedAccessType")
+        .bases("FlowType")
+        .build("objectType", "indexType")
+        .field("objectType", def("FlowType"))
+        .field("indexType", def("FlowType"));
+    def("OptionalIndexedAccessType")
+        .bases("FlowType")
+        .build("objectType", "indexType", "optional")
+        .field("objectType", def("FlowType"))
+        .field("indexType", def("FlowType"))
+        .field('optional', Boolean);
     def("UnionTypeAnnotation")
         .bases("FlowType")
         .build("types")
@@ -183,10 +206,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")
@@ -221,19 +245,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")
@@ -250,7 +275,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");
@@ -268,13 +294,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")
@@ -283,10 +313,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,11 +1,11 @@
 "use strict";;
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-var es7_1 = tslib_1.__importDefault(require("./es7"));
-var types_1 = tslib_1.__importDefault(require("../lib/types"));
-var shared_1 = tslib_1.__importDefault(require("../lib/shared"));
+var es_proposals_1 = (0, tslib_1.__importDefault)(require("./es-proposals"));
+var types_1 = (0, tslib_1.__importDefault)(require("../lib/types"));
+var shared_1 = (0, tslib_1.__importDefault)(require("../lib/shared"));
 function default_1(fork) {
-    fork.use(es7_1.default);
+    fork.use(es_proposals_1.default);
     var types = fork.use(types_1.default);
     var def = types.Type.def;
     var or = types.Type.or;
@@ -16,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")
@@ -42,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
@@ -65,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/operators/core.d.ts

@@ -0,0 +1,5 @@
+export default function (): {
+    BinaryOperators: string[];
+    AssignmentOperators: string[];
+    LogicalOperators: string[];
+};

package/def/operators/core.js

@@ -0,0 +1,25 @@
+"use strict";;
+Object.defineProperty(exports, "__esModule", { value: true });
+function default_1() {
+    return {
+        BinaryOperators: [
+            "==", "!=", "===", "!==",
+            "<", "<=", ">", ">=",
+            "<<", ">>", ">>>",
+            "+", "-", "*", "/", "%",
+            "&",
+            "|", "^", "in",
+            "instanceof",
+        ],
+        AssignmentOperators: [
+            "=", "+=", "-=", "*=", "/=", "%=",
+            "<<=", ">>=", ">>>=",
+            "|=", "^=", "&=",
+        ],
+        LogicalOperators: [
+            "||", "&&",
+        ],
+    };
+}
+exports.default = default_1;
+module.exports = exports["default"];

package/def/operators/es2016.d.ts

@@ -0,0 +1,5 @@
+export default function (fork: import("../../types").Fork): {
+    BinaryOperators: string[];
+    AssignmentOperators: string[];
+    LogicalOperators: string[];
+};

package/def/operators/es2016.js

@@ -0,0 +1,19 @@
+"use strict";;
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+var core_1 = (0, tslib_1.__importDefault)(require("./core"));
+function default_1(fork) {
+    var result = fork.use(core_1.default);
+    // Exponentiation operators. Must run before BinaryOperators or
+    // AssignmentOperators are used (hence before fork.use(es6Def)).
+    // https://github.com/tc39/proposal-exponentiation-operator
+    if (result.BinaryOperators.indexOf("**") < 0) {
+        result.BinaryOperators.push("**");
+    }
+    if (result.AssignmentOperators.indexOf("**=") < 0) {
+        result.AssignmentOperators.push("**=");
+    }
+    return result;
+}
+exports.default = default_1;
+module.exports = exports["default"];

package/def/operators/es2020.d.ts

@@ -0,0 +1,5 @@
+export default function (fork: import("../../types").Fork): {
+    BinaryOperators: string[];
+    AssignmentOperators: string[];
+    LogicalOperators: string[];
+};

package/def/operators/es2020.js

@@ -0,0 +1,15 @@
+"use strict";;
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+var es2016_1 = (0, tslib_1.__importDefault)(require("./es2016"));
+function default_1(fork) {
+    var result = fork.use(es2016_1.default);
+    // Nullish coalescing. Must run before LogicalOperators is used.
+    // https://github.com/tc39/proposal-nullish-coalescing
+    if (result.LogicalOperators.indexOf("??") < 0) {
+        result.LogicalOperators.push("??");
+    }
+    return result;
+}
+exports.default = default_1;
+module.exports = exports["default"];

package/def/operators/es2021.d.ts

@@ -0,0 +1,5 @@
+export default function (fork: import("../../types").Fork): {
+    BinaryOperators: string[];
+    AssignmentOperators: string[];
+    LogicalOperators: string[];
+};

package/def/operators/es2021.js

@@ -0,0 +1,18 @@
+"use strict";;
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+var es2020_1 = (0, tslib_1.__importDefault)(require("./es2020"));
+function default_1(fork) {
+    var result = fork.use(es2020_1.default);
+    // Logical assignment operators. Must run before AssignmentOperators is used.
+    // https://github.com/tc39/proposal-logical-assignment
+    result.LogicalOperators.forEach(function (op) {
+        var assignOp = op + "=";
+        if (result.AssignmentOperators.indexOf(assignOp) < 0) {
+            result.AssignmentOperators.push(assignOp);
+        }
+    });
+    return result;
+}
+exports.default = default_1;
+module.exports = exports["default"];

package/def/type-annotations.js

@@ -6,8 +6,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-var types_1 = tslib_1.__importDefault(require("../lib/types"));
-var shared_1 = tslib_1.__importDefault(require("../lib/shared"));
+var types_1 = (0, tslib_1.__importDefault)(require("../lib/types"));
+var shared_1 = (0, 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,10 +1,10 @@
 "use strict";;
 Object.defineProperty(exports, "__esModule", { value: true });
 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"));
+var babel_core_1 = (0, tslib_1.__importDefault)(require("./babel-core"));
+var type_annotations_1 = (0, tslib_1.__importDefault)(require("./type-annotations"));
+var types_1 = (0, tslib_1.__importDefault)(require("../lib/types"));
+var shared_1 = (0, 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.
@@ -74,6 +74,7 @@ function default_1(fork) {
         "TSUndefinedKeyword",
         "TSUnknownKeyword",
         "TSVoidKeyword",
+        "TSIntrinsicKeyword",
         "TSThisType",
     ].forEach(function (keywordType) {
         def(keywordType)
@@ -88,6 +89,12 @@ function default_1(fork) {
         .bases("TSType")
         .build("literal")
         .field("literal", or(def("NumericLiteral"), def("StringLiteral"), def("BooleanLiteral"), def("TemplateLiteral"), def("UnaryExpression")));
+    def("TemplateLiteral")
+        // The TemplateLiteral type appears to be reused for TypeScript template
+        // literal types (instead of introducing a new TSTemplateLiteralType type),
+        // so we allow the templateLiteral.expressions array to be either all
+        // expressions or all TypeScript types.
+        .field("expressions", or([def("Expression")], [def("TSType")]));
     ["TSUnionType",
         "TSIntersectionType",
     ].forEach(function (typeName) {

package/fork.js

@@ -1,11 +1,11 @@
 "use strict";;
 Object.defineProperty(exports, "__esModule", { value: true });
 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"));
+var types_1 = (0, tslib_1.__importDefault)(require("./lib/types"));
+var path_visitor_1 = (0, tslib_1.__importDefault)(require("./lib/path-visitor"));
+var equiv_1 = (0, tslib_1.__importDefault)(require("./lib/equiv"));
+var path_1 = (0, tslib_1.__importDefault)(require("./lib/path"));
+var node_path_1 = (0, tslib_1.__importDefault)(require("./lib/node-path"));
 function default_1(defs) {
     var fork = createFork();
     var types = fork.use(types_1.default);