@putout/babel 3.0.0 → 3.1.0

package/bundle/index.js

@@ -507,9 +507,9 @@ var require_picocolors = __commonJS({
         module2.exports.createColors = createColors2;
     }
 });
-// node_modules/js-tokens/index.js
+// node_modules/@babel/code-frame/node_modules/js-tokens/index.js
 var require_js_tokens = __commonJS({
-    "node_modules/js-tokens/index.js": function(exports2, module2) {
+    "node_modules/@babel/code-frame/node_modules/js-tokens/index.js": function(exports2, module2) {
         var Identifier2;
         var JSXIdentifier2;
         var JSXPunctuator;
@@ -2104,12 +2104,12 @@ var require_browser = __commonJS({
 var require_has_flag = __commonJS({
     "node_modules/has-flag/index.js": function(exports2, module2) {
         "use strict";
-        module2.exports = function(flag, argv) {
-            argv = argv || process.argv;
+        module2.exports = function(flag) {
+            var argv = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : process.argv;
             var prefix2 = flag.startsWith("-") ? "" : flag.length === 1 ? "-" : "--";
-            var pos = argv.indexOf(prefix2 + flag);
-            var terminatorPos = argv.indexOf("--");
-            return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
+            var position = argv.indexOf(prefix2 + flag);
+            var terminatorPosition = argv.indexOf("--");
+            return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
         };
     }
 });
@@ -2118,16 +2118,23 @@ var require_supports_color = __commonJS({
     "node_modules/supports-color/index.js": function(exports2, module2) {
         "use strict";
         var os = require("os");
+        var tty = require("tty");
         var hasFlag = require_has_flag();
         var env = process.env;
         var forceColor;
-        if (hasFlag("no-color") || hasFlag("no-colors") || hasFlag("color=false")) {
-            forceColor = false;
+        if (hasFlag("no-color") || hasFlag("no-colors") || hasFlag("color=false") || hasFlag("color=never")) {
+            forceColor = 0;
         } else if (hasFlag("color") || hasFlag("colors") || hasFlag("color=true") || hasFlag("color=always")) {
-            forceColor = true;
+            forceColor = 1;
         }
         if ("FORCE_COLOR" in env) {
-            forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
+            if (env.FORCE_COLOR === "true") {
+                forceColor = 1;
+            } else if (env.FORCE_COLOR === "false") {
+                forceColor = 0;
+            } else {
+                forceColor = env.FORCE_COLOR.length === 0 ? 1 : Math.min(parseInt(env.FORCE_COLOR, 10), 3);
+            }
         }
         function translateLevel(level) {
             if (level === 0) {
@@ -2140,8 +2147,8 @@ var require_supports_color = __commonJS({
                 has16m: level >= 3
             };
         }
-        function supportsColor(stream) {
-            if (forceColor === false) {
+        function supportsColor(haveStream, streamIsTTY) {
+            if (forceColor === 0) {
                 return 0;
             }
             if (hasFlag("color=16m") || hasFlag("color=full") || hasFlag("color=truecolor")) {
@@ -2150,13 +2157,16 @@ var require_supports_color = __commonJS({
             if (hasFlag("color=256")) {
                 return 2;
             }
-            if (stream && !stream.isTTY && forceColor !== true) {
+            if (haveStream && !streamIsTTY && forceColor === void 0) {
                 return 0;
             }
-            var min = forceColor ? 1 : 0;
+            var min = forceColor || 0;
+            if (env.TERM === "dumb") {
+                return min;
+            }
             if (process.platform === "win32") {
                 var osRelease = os.release().split(".");
-                if (Number(process.versions.node.split(".")[0]) >= 8 && Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
+                if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
                     return Number(osRelease[2]) >= 14931 ? 3 : 2;
                 }
                 return 1;
@@ -2166,7 +2176,9 @@ var require_supports_color = __commonJS({
                     "TRAVIS",
                     "CIRCLECI",
                     "APPVEYOR",
-                    "GITLAB_CI"
+                    "GITLAB_CI",
+                    "GITHUB_ACTIONS",
+                    "BUILDKITE"
                 ].some(function(sign) {
                     return sign in env;
                 }) || env.CI_NAME === "codeship") {
@@ -2198,19 +2210,16 @@ var require_supports_color = __commonJS({
             if ("COLORTERM" in env) {
                 return 1;
             }
-            if (env.TERM === "dumb") {
-                return min;
-            }
             return min;
         }
         function getSupportLevel(stream) {
-            var level = supportsColor(stream);
+            var level = supportsColor(stream, stream && stream.isTTY);
             return translateLevel(level);
         }
         module2.exports = {
             supportsColor: getSupportLevel,
-            stdout: getSupportLevel(process.stdout),
-            stderr: getSupportLevel(process.stderr)
+            stdout: translateLevel(supportsColor(true, tty.isatty(1))),
+            stderr: translateLevel(supportsColor(true, tty.isatty(2)))
         };
     }
 });
@@ -5075,6 +5084,7 @@ var require_globals = __commonJS({
                 assertType: false,
                 beforeAll: false,
                 beforeEach: false,
+                chai: false,
                 describe: false,
                 expect: false,
                 expectTypeOf: false,
@@ -6298,6 +6308,9 @@ __export(lib_exports, {
     TSTYPE_TYPES: function() {
         return TSTYPE_TYPES;
     },
+    TSTemplateLiteralType: function() {
+        return tsTemplateLiteralType;
+    },
     TSThisType: function() {
         return tsThisType;
     },
@@ -7246,6 +7259,9 @@ __export(lib_exports, {
     assertTSSymbolKeyword: function() {
         return assertTSSymbolKeyword;
     },
+    assertTSTemplateLiteralType: function() {
+        return assertTSTemplateLiteralType;
+    },
     assertTSThisType: function() {
         return assertTSThisType;
     },
@@ -8506,6 +8522,9 @@ __export(lib_exports, {
     isTSSymbolKeyword: function() {
         return isTSSymbolKeyword;
     },
+    isTSTemplateLiteralType: function() {
+        return isTSTemplateLiteralType;
+    },
     isTSThisType: function() {
         return isTSThisType;
     },
@@ -9103,6 +9122,9 @@ __export(lib_exports, {
     tsSymbolKeyword: function() {
         return tsSymbolKeyword;
     },
+    tsTemplateLiteralType: function() {
+        return tsTemplateLiteralType;
+    },
     tsThisType: function() {
         return tsThisType;
     },
@@ -11745,6 +11767,11 @@ function isTSMappedType(node, opts) {
     if (node.type !== "TSMappedType") return false;
     return opts == null || shallowEqual(node, opts);
 }
+function isTSTemplateLiteralType(node, opts) {
+    if (!node) return false;
+    if (node.type !== "TSTemplateLiteralType") return false;
+    return opts == null || shallowEqual(node, opts);
+}
 function isTSLiteralType(node, opts) {
     if (!node) return false;
     if (node.type !== "TSLiteralType") return false;
@@ -12376,6 +12403,7 @@ function isDeclaration(node, opts) {
         case "TSTypeAliasDeclaration":
         case "TSEnumDeclaration":
         case "TSModuleDeclaration":
+        case "TSImportEqualsDeclaration":
             break;
         case "Placeholder":
             if (node.expectedNode === "Declaration") break;
@@ -12444,6 +12472,7 @@ function isTSEntityName(node, opts) {
     if (!node) return false;
     switch(node.type){
         case "Identifier":
+        case "ThisExpression":
         case "TSQualifiedName":
             break;
         case "Placeholder":
@@ -12888,6 +12917,7 @@ function isTypeScript(node, opts) {
         case "TSTypeOperator":
         case "TSIndexedAccessType":
         case "TSMappedType":
+        case "TSTemplateLiteralType":
         case "TSLiteralType":
         case "TSClassImplements":
         case "TSInterfaceHeritage":
@@ -12968,6 +12998,7 @@ function isTSType(node, opts) {
         case "TSTypeOperator":
         case "TSIndexedAccessType":
         case "TSMappedType":
+        case "TSTemplateLiteralType":
         case "TSLiteralType":
         case "TSClassImplements":
         case "TSInterfaceHeritage":
@@ -12995,6 +13026,7 @@ function isTSBaseType(node, opts) {
         case "TSUnknownKeyword":
         case "TSVoidKeyword":
         case "TSThisType":
+        case "TSTemplateLiteralType":
         case "TSLiteralType":
             break;
         default:
@@ -14747,7 +14779,8 @@ defineType$4("SwitchStatement", {
 });
 defineType$4("ThisExpression", {
     aliases: [
-        "Expression"
+        "Expression",
+        "TSEntityName"
     ]
 });
 defineType$4("ThrowStatement", {
@@ -15978,6 +16011,10 @@ defineType$4("ClassPrivateProperty", {
             validate: assertValueType("boolean"),
             optional: true
         },
+        optional: {
+            validate: assertValueType("boolean"),
+            optional: true
+        },
         definite: {
             validate: assertValueType("boolean"),
             optional: true
@@ -17431,6 +17468,7 @@ defineType("TSPropertySignature", {
         readonly: validateOptional(bool),
         typeAnnotation: validateOptionalType("TSTypeAnnotation"),
         kind: {
+            optional: true,
             validate: assertOneOf("get", "set")
         }
     })
@@ -17754,6 +17792,26 @@ defineType("TSMappedType", {
         nameType: validateOptionalType("TSType")
     })
 });
+defineType("TSTemplateLiteralType", {
+    aliases: [
+        "TSType",
+        "TSBaseType"
+    ],
+    visitor: [
+        "quasis",
+        "types"
+    ],
+    fields: {
+        quasis: validateArrayOfType("TemplateElement"),
+        types: {
+            validate: chain(assertValueType("array"), assertEach(assertNodeType("TSType")), function(node, key, val) {
+                if (node.quasis.length !== val.length + 1) {
+                    throw new TypeError("Number of ".concat(node.type, " quasis should be exactly one more than the number of types.\nExpected ").concat(val.length + 1, " quasis but got ").concat(node.quasis.length));
+                }
+            })
+        }
+    }
+});
 defineType("TSLiteralType", {
     aliases: [
         "TSType",
@@ -17998,21 +18056,21 @@ defineType("TSImportType", {
 });
 defineType("TSImportEqualsDeclaration", {
     aliases: [
-        "Statement"
+        "Statement",
+        "Declaration"
     ],
     visitor: [
         "id",
         "moduleReference"
     ],
-    fields: {
-        isExport: validate$2(bool),
+    fields: Object.assign({}, {}, {
         id: validateType("Identifier"),
         moduleReference: validateType("TSEntityName", "TSExternalModuleReference"),
         importKind: {
             validate: assertOneOf("type", "value"),
             optional: true
         }
-    }
+    })
 });
 defineType("TSExternalModuleReference", {
     visitor: [
@@ -20235,8 +20293,7 @@ function tsPropertySignature(key) {
     var node = {
         type: "TSPropertySignature",
         key: key,
-        typeAnnotation: typeAnnotation2,
-        kind: null
+        typeAnnotation: typeAnnotation2
     };
     var defs = NODE_FIELDS.TSPropertySignature;
     validate(defs.key, node, "key", key, 1);
@@ -20555,6 +20612,17 @@ function tsMappedType(key, constraint) {
     validate(defs.typeAnnotation, node, "typeAnnotation", typeAnnotation2, 1);
     return node;
 }
+function tsTemplateLiteralType(quasis, types2) {
+    var node = {
+        type: "TSTemplateLiteralType",
+        quasis: quasis,
+        types: types2
+    };
+    var defs = NODE_FIELDS.TSTemplateLiteralType;
+    validate(defs.quasis, node, "quasis", quasis, 1);
+    validate(defs.types, node, "types", types2, 1);
+    return node;
+}
 function tsLiteralType(literal) {
     var node = {
         type: "TSLiteralType",
@@ -20743,8 +20811,7 @@ function tsImportEqualsDeclaration(id, moduleReference) {
     var node = {
         type: "TSImportEqualsDeclaration",
         id: id,
-        moduleReference: moduleReference,
-        isExport: null
+        moduleReference: moduleReference
     };
     var defs = NODE_FIELDS.TSImportEqualsDeclaration;
     validate(defs.id, node, "id", id, 1);
@@ -21579,6 +21646,9 @@ function assertTSIndexedAccessType(node, opts) {
 function assertTSMappedType(node, opts) {
     assert("TSMappedType", node, opts);
 }
+function assertTSTemplateLiteralType(node, opts) {
+    assert("TSTemplateLiteralType", node, opts);
+}
 function assertTSLiteralType(node, opts) {
     assert("TSLiteralType", node, opts);
 }
@@ -21945,7 +22015,7 @@ function createFlowUnionType(types2) {
     }
 }
 function getQualifiedName(node) {
-    return isIdentifier(node) ? node.name : "".concat(node.right.name, ".").concat(getQualifiedName(node.left));
+    return isIdentifier(node) ? node.name : isThisExpression(node) ? "this" : "".concat(node.right.name, ".").concat(getQualifiedName(node.left));
 }
 function removeTypeDuplicates(nodesIn) {
     var nodes2 = Array.from(nodesIn);
@@ -22856,6 +22926,9 @@ var keys = {
     ImportDeclaration: [
         "specifiers"
     ],
+    TSImportEqualsDeclaration: [
+        "id"
+    ],
     ExportSpecifier: [
         "exported"
     ],
@@ -23636,9 +23709,9 @@ var UnparenthesizedPipeBodyDescriptions = /* @__PURE__ */ new Set([
     "ConditionalExpression",
     "YieldExpression"
 ]);
-var PipelineOperatorErrors = {
+var PipelineOperatorErrors = Object.assign({
     PipeBodyIsTighter: "Unexpected yield after pipeline body; any yield expression acting as Hack-style pipe body must be parenthesized due to its loose operator precedence.",
-    PipeTopicRequiresHackPipes: 'Topic reference is used, but the pipelineOperator plugin was not passed a "proposal": "hack" or "smart" option.',
+    PipeTopicRequiresHackPipes: 'Topic references are only supported when using the `"proposal": "hack"` version of the pipeline proposal.',
     PipeTopicUnbound: "Topic reference is unbound; it must be inside a pipe body.",
     PipeTopicUnconfiguredToken: function(param) {
         var token = param.token;
@@ -23650,14 +23723,8 @@ var PipelineOperatorErrors = {
         return "Hack-style pipe body cannot be an unparenthesized ".concat(toNodeDescription({
             type: type
         }), "; please wrap it in parentheses.");
-    },
-    PipelineBodyNoArrow: 'Unexpected arrow "=>" after pipeline body; arrow function in pipeline body must be parenthesized.',
-    PipelineBodySequenceExpression: "Pipeline body may not be a comma-separated sequence expression.",
-    PipelineHeadSequenceExpression: "Pipeline head should not be a comma-separated sequence expression.",
-    PipelineTopicUnused: "Pipeline is in topic style but does not use topic reference.",
-    PrimaryTopicNotAllowed: "Topic reference was used in a lexical context without topic binding.",
-    PrimaryTopicRequiresSmartPipeline: 'Topic reference is used, but the pipelineOperator plugin was not passed a "proposal": "hack" or "smart" option.'
-};
+    }
+}, {});
 var _excluded = [
     "message"
 ];
@@ -24039,17 +24106,18 @@ var estree = function(superClass) {
                     if (typeParameters) {
                         delete node.typeParameters;
                         funcNode.typeParameters = typeParameters;
-                        funcNode.start = typeParameters.start;
-                        funcNode.loc.start = typeParameters.loc.start;
+                        this.resetStartLocationFromNode(funcNode, typeParameters);
                     }
                     if (type === "ClassPrivateMethod") {
                         node.computed = false;
                     }
-                    if (node.abstract && this.hasPlugin("typescript")) {
+                    if (this.hasPlugin("typescript")) {
                         if (!funcNode.body) {
                             funcNode.type = "TSEmptyBodyFunctionExpression";
                         }
-                        return this.finishNode(node, "TSAbstractMethodDefinition");
+                        if (node.abstract) {
+                            return this.finishNode(node, "TSAbstractMethodDefinition");
+                        }
                     }
                     return this.finishNode(node, "MethodDefinition");
                 }
@@ -33758,7 +33826,7 @@ var typescript = function(superClass) {
                     }
                     this.expect(11);
                     if (this.eat(16)) {
-                        node.qualifier = this.tsParseEntityName();
+                        node.qualifier = this.tsParseEntityName(1 | 2);
                     }
                     if (this.match(47)) {
                         {
@@ -33770,14 +33838,24 @@ var typescript = function(superClass) {
             },
             {
                 key: "tsParseEntityName",
-                value: function tsParseEntityName() {
-                    var allowReservedWords = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true;
-                    var entity = this.parseIdentifier(allowReservedWords);
+                value: function tsParseEntityName(flags) {
+                    var entity;
+                    if (flags & 1 && this.match(78)) {
+                        if (flags & 2) {
+                            entity = this.parseIdentifier(true);
+                        } else {
+                            var node = this.startNode();
+                            this.next();
+                            entity = this.finishNode(node, "ThisExpression");
+                        }
+                    } else {
+                        entity = this.parseIdentifier(!!(flags & 1));
+                    }
                     while(this.eat(16)){
-                        var node = this.startNodeAtNode(entity);
-                        node.left = entity;
-                        node.right = this.parseIdentifier(allowReservedWords);
-                        entity = this.finishNode(node, "TSQualifiedName");
+                        var node1 = this.startNodeAtNode(entity);
+                        node1.left = entity;
+                        node1.right = this.parseIdentifier(!!(flags & 1));
+                        entity = this.finishNode(node1, "TSQualifiedName");
                     }
                     return entity;
                 }
@@ -33786,7 +33864,7 @@ var typescript = function(superClass) {
                 key: "tsParseTypeReference",
                 value: function tsParseTypeReference() {
                     var node = this.startNode();
-                    node.typeName = this.tsParseEntityName();
+                    node.typeName = this.tsParseEntityName(1);
                     if (!this.hasPrecedingLineBreak() && this.match(47)) {
                         {
                             node.typeArguments = this.tsParseTypeArguments();
@@ -33822,7 +33900,9 @@ var typescript = function(superClass) {
                     if (this.match(83)) {
                         node.exprName = this.tsParseImportType();
                     } else {
-                        node.exprName = this.tsParseEntityName();
+                        {
+                            node.exprName = this.tsParseEntityName(1);
+                        }
                     }
                     if (!this.hasPrecedingLineBreak() && this.match(47)) {
                         {
@@ -34157,8 +34237,9 @@ var typescript = function(superClass) {
             {
                 key: "tsParseTupleElementType",
                 value: function tsParseTupleElementType() {
-                    var startLoc = this.state.startLoc;
+                    var restStartLoc = this.state.startLoc;
                     var rest = this.eat(21);
+                    var startLoc = this.state.startLoc;
                     var labeled;
                     var label;
                     var optional;
@@ -34173,12 +34254,11 @@ var typescript = function(superClass) {
                         type = this.tsParseType();
                     } else if (chAfterWord === 63) {
                         optional = true;
-                        var startLoc2 = this.state.startLoc;
                         var wordName = this.state.value;
                         var typeOrLabel = this.tsParseNonArrayType();
                         if (this.lookaheadCharCode() === 58) {
                             labeled = true;
-                            label = this.createIdentifier(this.startNodeAt(startLoc2), wordName);
+                            label = this.createIdentifier(this.startNodeAt(startLoc), wordName);
                             this.expect(17);
                             this.expect(14);
                             type = this.tsParseType();
@@ -34195,7 +34275,7 @@ var typescript = function(superClass) {
                     if (labeled) {
                         var labeledNode;
                         if (label) {
-                            labeledNode = this.startNodeAtNode(label);
+                            labeledNode = this.startNodeAt(startLoc);
                             labeledNode.optional = optional;
                             labeledNode.label = label;
                             labeledNode.elementType = type;
@@ -34204,7 +34284,7 @@ var typescript = function(superClass) {
                                 this.raise(TSErrors.TupleOptionalAfterType, this.state.lastTokStartLoc);
                             }
                         } else {
-                            labeledNode = this.startNodeAtNode(type);
+                            labeledNode = this.startNodeAt(startLoc);
                             labeledNode.optional = optional;
                             this.raise(TSErrors.InvalidTupleMemberLabel, type);
                             labeledNode.label = type;
@@ -34212,12 +34292,12 @@ var typescript = function(superClass) {
                         }
                         type = this.finishNode(labeledNode, "TSNamedTupleMember");
                     } else if (optional) {
-                        var optionalTypeNode = this.startNodeAtNode(type);
+                        var optionalTypeNode = this.startNodeAt(startLoc);
                         optionalTypeNode.typeAnnotation = type;
                         type = this.finishNode(optionalTypeNode, "TSOptionalType");
                     }
                     if (rest) {
-                        var restNode = this.startNodeAt(startLoc);
+                        var restNode = this.startNodeAt(restStartLoc);
                         restNode.typeAnnotation = type;
                         type = this.finishNode(restNode, "TSRestType");
                     }
@@ -34271,9 +34351,32 @@ var typescript = function(superClass) {
             {
                 key: "tsParseTemplateLiteralType",
                 value: function tsParseTemplateLiteralType() {
-                    var node = this.startNode();
-                    node.literal = _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseTemplate", this).call(this, false);
-                    return this.finishNode(node, "TSLiteralType");
+                    {
+                        var startLoc = this.state.startLoc;
+                        var curElt = this.parseTemplateElement(false);
+                        var quasis = [
+                            curElt
+                        ];
+                        if (curElt.tail) {
+                            var node = this.startNodeAt(startLoc);
+                            var literal = this.startNodeAt(startLoc);
+                            literal.expressions = [];
+                            literal.quasis = quasis;
+                            node.literal = this.finishNode(literal, "TemplateLiteral");
+                            return this.finishNode(node, "TSLiteralType");
+                        } else {
+                            var substitutions = [];
+                            while(!curElt.tail){
+                                substitutions.push(this.tsParseType());
+                                this.readTemplateContinuation();
+                                quasis.push(curElt = this.parseTemplateElement(false));
+                            }
+                            var node1 = this.startNodeAt(startLoc);
+                            node1.types = substitutions;
+                            node1.quasis = quasis;
+                            return this.finishNode(node1, "TSTemplateLiteralType");
+                        }
+                    }
                 }
             },
             {
@@ -34361,15 +34464,16 @@ var typescript = function(superClass) {
             {
                 key: "tsParseArrayTypeOrHigher",
                 value: function tsParseArrayTypeOrHigher() {
+                    var startLoc = this.state.startLoc;
                     var type = this.tsParseNonArrayType();
                     while(!this.hasPrecedingLineBreak() && this.eat(0)){
                         if (this.match(3)) {
-                            var node = this.startNodeAtNode(type);
+                            var node = this.startNodeAt(startLoc);
                             node.elementType = type;
                             this.expect(3);
                             type = this.finishNode(node, "TSArrayType");
                         } else {
-                            var node1 = this.startNodeAtNode(type);
+                            var node1 = this.startNodeAt(startLoc);
                             node1.objectType = type;
                             node1.indexType = this.tsParseType();
                             this.expect(3);
@@ -34708,8 +34812,8 @@ var typescript = function(superClass) {
                     var originalStartLoc = this.state.startLoc;
                     var delimitedList = this.tsParseDelimitedList("HeritageClauseElement", function() {
                         var node = _this.startNode();
-                        node.expression = _this.tsParseEntityName();
                         {
+                            node.expression = _this.tsParseEntityName(1);
                             if (_this.match(47)) {
                                 node.typeArguments = _this.tsParseTypeArguments();
                             }
@@ -34901,7 +35005,7 @@ var typescript = function(superClass) {
                 key: "tsParseModuleOrNamespaceDeclaration",
                 value: function tsParseModuleOrNamespaceDeclaration(node) {
                     var nested = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
-                    node.id = this.tsParseEntityName();
+                    node.id = this.tsParseEntityName(1);
                     if (node.id.type === "Identifier") {
                         this.checkIdentifier(node.id, 1024);
                     }
@@ -34942,7 +35046,6 @@ var typescript = function(superClass) {
             {
                 key: "tsParseImportEqualsDeclaration",
                 value: function tsParseImportEqualsDeclaration(node, maybeDefaultIdentifier, isExport) {
-                    node.isExport = isExport || false;
                     node.id = maybeDefaultIdentifier || this.parseIdentifier();
                     this.checkIdentifier(node.id, 4096);
                     this.expect(29);
@@ -34964,7 +35067,7 @@ var typescript = function(superClass) {
             {
                 key: "tsParseModuleReference",
                 value: function tsParseModuleReference() {
-                    return this.tsIsExternalModuleReference() ? this.tsParseExternalModuleReference() : this.tsParseEntityName(false);
+                    return this.tsIsExternalModuleReference() ? this.tsParseExternalModuleReference() : this.tsParseEntityName(0);
                 }
             },
             {
@@ -35544,15 +35647,20 @@ var typescript = function(superClass) {
                 key: "parseExport",
                 value: function parseExport(node, decorators) {
                     if (this.match(83)) {
+                        var nodeImportEquals = this.startNode();
                         this.next();
-                        var nodeImportEquals = node;
                         var maybeDefaultIdentifier = null;
                         if (this.isContextual(130) && this.isPotentialImportPhase(false)) {
                             maybeDefaultIdentifier = this.parseMaybeImportPhase(nodeImportEquals, false);
                         } else {
                             nodeImportEquals.importKind = "value";
                         }
-                        return this.tsParseImportEqualsDeclaration(nodeImportEquals, maybeDefaultIdentifier, true);
+                        var declaration = this.tsParseImportEqualsDeclaration(nodeImportEquals, maybeDefaultIdentifier, true);
+                        {
+                            node.declaration = declaration;
+                            node.specifiers = [];
+                            return this.finishNode(node, "ExportNamedDeclaration");
+                        }
                     } else if (this.eat(29)) {
                         var assign = node;
                         assign.expression = _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseExpression", this).call(this);
@@ -35833,7 +35941,7 @@ var typescript = function(superClass) {
                     if (declaration.type === "TSInterfaceDeclaration" || declaration.type === "TSTypeAliasDeclaration" || isDeclare) {
                         node.exportKind = "type";
                     }
-                    if (isDeclare) {
+                    if (isDeclare && declaration.type !== "TSImportEqualsDeclaration") {
                         this.resetStartLocation(declaration, startLoc);
                         declaration.declare = true;
                     }
@@ -36998,11 +37106,6 @@ function validatePlugins(pluginsMap) {
                     pluginsMap.get("recordAndTuple")
                 ]), "`."));
             }
-        } else if (proposal === "smart" && tupleSyntaxIsHash) {
-            throw new Error('Plugin conflict between `["pipelineOperator", { proposal: "smart" }]` and `'.concat(JSON.stringify([
-                "recordAndTuple",
-                pluginsMap.get("recordAndTuple")
-            ]), "`."));
         }
     }
     if (pluginsMap.has("moduleAttributes")) {
@@ -37309,16 +37412,6 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                             prec = tokenOperatorPrecedence(42);
                         }
                         this.next();
-                        if (op === 39 && this.hasPlugin([
-                            "pipelineOperator",
-                            {
-                                proposal: "minimal"
-                            }
-                        ])) {
-                            if (this.state.type === 96 && this.prodParam.hasAwait) {
-                                throw this.raise(Errors.UnexpectedAwaitAfterPipelineBody, this.state.startLoc);
-                            }
-                        }
                         node.right = this.parseExprOpRightExpr(op, prec);
                         var finishedNode = this.finishNode(node, logical || coalesce ? "LogicalExpression" : "BinaryExpression");
                         var nextOp = this.state.type;
@@ -37335,7 +37428,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
             key: "parseExprOpRightExpr",
             value: function parseExprOpRightExpr(op, prec) {
                 var _this = this;
-                var startLoc = this.state.startLoc;
+                this.state.startLoc;
                 switch(op){
                     case 39:
                         switch(this.getPluginOption("pipelineOperator", "proposal")){
@@ -37343,13 +37436,6 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                                 return this.withTopicBindingContext(function() {
                                     return _this.parseHackPipeBody();
                                 });
-                            case "smart":
-                                return this.withTopicBindingContext(function() {
-                                    if (_this.prodParam.hasYield && _this.isContextual(108)) {
-                                        throw _this.raise(Errors.PipeBodyIsTighter, _this.state.startLoc);
-                                    }
-                                    return _this.parseSmartPipelineBodyInStyle(_this.parseExprOpBaseRightExpr(op, prec), startLoc);
-                                });
                             case "fsharp":
                                 return this.withSoloAwaitPermittingContext(function() {
                                     return _this.parseFSharpPipelineBody(prec);
@@ -37926,12 +38012,13 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
             key: "finishTopicReference",
             value: function finishTopicReference(node, startLoc, pipeProposal, tokenType) {
                 if (this.testTopicReferenceConfiguration(pipeProposal, startLoc, tokenType)) {
-                    var nodeType = pipeProposal === "smart" ? "PipelinePrimaryTopicReference" : "TopicReference";
-                    if (!this.topicReferenceIsAllowedInCurrentContext()) {
-                        this.raise(pipeProposal === "smart" ? Errors.PrimaryTopicNotAllowed : Errors.PipeTopicUnbound, startLoc);
+                    {
+                        if (!this.topicReferenceIsAllowedInCurrentContext()) {
+                            this.raise(Errors.PipeTopicUnbound, startLoc);
+                        }
+                        this.registerTopicReference();
+                        return this.finishNode(node, "TopicReference");
                     }
-                    this.registerTopicReference();
-                    return this.finishNode(node, nodeType);
                 } else {
                     throw this.raise(Errors.PipeTopicUnconfiguredToken, startLoc, {
                         token: tokenLabelName(tokenType)
@@ -39036,23 +39123,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
         {
             key: "withSmartMixTopicForbiddingContext",
             value: function withSmartMixTopicForbiddingContext(callback) {
-                if (this.hasPlugin([
-                    "pipelineOperator",
-                    {
-                        proposal: "smart"
-                    }
-                ])) {
-                    var outerContextTopicState = this.state.topicContext;
-                    this.state.topicContext = {
-                        maxNumOfResolvableTopics: 0,
-                        maxTopicIndex: null
-                    };
-                    try {
-                        return callback();
-                    } finally{
-                        this.state.topicContext = outerContextTopicState;
-                    }
-                } else {
+                {
                     return callback();
                 }
             }
@@ -44116,18 +44187,51 @@ function TSAsExpression(node, parent) {
     }
     return Binary(node, parent);
 }
+function TSConditionalType$1(node, parent) {
+    var parentType = parent.type;
+    if (parentType === "TSArrayType" || parentType === "TSIndexedAccessType" && parent.objectType === node || parentType === "TSOptionalType" || parentType === "TSTypeOperator" || parentType === "TSTypeParameter") {
+        return true;
+    }
+    if ((parentType === "TSIntersectionType" || parentType === "TSUnionType") && parent.types[0] === node) {
+        return true;
+    }
+    if (parentType === "TSConditionalType" && (parent.checkType === node || parent.extendsType === node)) {
+        return true;
+    }
+    return false;
+}
 function TSUnionType$1(node, parent) {
     var parentType = parent.type;
-    return parentType === "TSArrayType" || parentType === "TSOptionalType" || parentType === "TSIntersectionType" || parentType === "TSRestType";
+    return parentType === "TSIntersectionType" || parentType === "TSTypeOperator" || parentType === "TSArrayType" || parentType === "TSIndexedAccessType" && parent.objectType === node || parentType === "TSOptionalType";
+}
+function TSIntersectionType$1(node, parent) {
+    var parentType = parent.type;
+    return parentType === "TSTypeOperator" || parentType === "TSArrayType" || parentType === "TSIndexedAccessType" && parent.objectType === node || parentType === "TSOptionalType";
 }
 function TSInferType$1(node, parent) {
     var parentType = parent.type;
-    return parentType === "TSArrayType" || parentType === "TSOptionalType";
+    if (parentType === "TSArrayType" || parentType === "TSIndexedAccessType" && parent.objectType === node || parentType === "TSOptionalType") {
+        return true;
+    }
+    if (node.typeParameter.constraint) {
+        if ((parentType === "TSIntersectionType" || parentType === "TSUnionType") && parent.types[0] === node) {
+            return true;
+        }
+    }
+    return false;
+}
+function TSTypeOperator$1(node, parent) {
+    var parentType = parent.type;
+    return parentType === "TSArrayType" || parentType === "TSIndexedAccessType" && parent.objectType === node || parentType === "TSOptionalType";
 }
 function TSInstantiationExpression$1(node, parent) {
     var parentType = parent.type;
     return (parentType === "CallExpression" || parentType === "OptionalCallExpression" || parentType === "NewExpression" || parentType === "TSInstantiationExpression") && !!parent.typeArguments;
 }
+function TSFunctionType$1(node, parent) {
+    var parentType = parent.type;
+    return parentType === "TSIntersectionType" || parentType === "TSUnionType" || parentType === "TSTypeOperator" || parentType === "TSOptionalType" || parentType === "TSArrayType" || parentType === "TSIndexedAccessType" && parent.objectType === node || parentType === "TSConditionalType" && (parent.checkType === node || parent.extendsType === node);
+}
 function BinaryExpression(node, parent, tokenContext, inForStatementInit) {
     return node.operator === "in" && inForStatementInit;
 }
@@ -44243,11 +44347,15 @@ var parens = /* @__PURE__ */ Object.freeze({
     OptionalMemberExpression: OptionalMemberExpression$1,
     SequenceExpression: SequenceExpression$1,
     TSAsExpression: TSAsExpression,
+    TSConditionalType: TSConditionalType$1,
+    TSConstructorType: TSFunctionType$1,
+    TSFunctionType: TSFunctionType$1,
     TSInferType: TSInferType$1,
     TSInstantiationExpression: TSInstantiationExpression$1,
-    TSIntersectionType: TSUnionType$1,
+    TSIntersectionType: TSIntersectionType$1,
     TSSatisfiesExpression: TSAsExpression,
     TSTypeAssertion: UnaryLike,
+    TSTypeOperator: TSTypeOperator$1,
     TSUnionType: TSUnionType$1,
     UnaryLike: UnaryLike,
     UnionTypeAnnotation: UnionTypeAnnotation$1,
@@ -44746,19 +44854,21 @@ function TaggedTemplateExpression(node) {
 function TemplateElement() {
     throw new Error("TemplateElement printing is handled in TemplateLiteral");
 }
-function TemplateLiteral(node) {
+function _printTemplate(node, substitutions) {
     var quasis = node.quasis;
     var partRaw = "`";
-    for(var i = 0; i < quasis.length; i++){
+    for(var i = 0; i < quasis.length - 1; i++){
         partRaw += quasis[i].value.raw;
-        if (i + 1 < quasis.length) {
-            this.token(partRaw + "${", true);
-            this.print(node.expressions[i]);
-            partRaw = "}";
-        }
+        this.token(partRaw + "${", true);
+        this.print(substitutions[i]);
+        partRaw = "}";
     }
+    partRaw += quasis[quasis.length - 1].value.raw;
     this.token(partRaw + "`", true);
 }
+function TemplateLiteral(node) {
+    this._printTemplate(node, node.expressions);
+}
 var isCallExpression3 = lib_exports.isCallExpression, isLiteral2 = lib_exports.isLiteral, isMemberExpression2 = lib_exports.isMemberExpression, isNewExpression3 = lib_exports.isNewExpression, isPattern2 = lib_exports.isPattern;
 function UnaryExpression(node) {
     var operator = node.operator;
@@ -45406,11 +45516,14 @@ function ClassAccessorProperty(node) {
 }
 function ClassPrivateProperty(node) {
     this.printJoin(node.decorators);
-    if (node.static) {
-        this.word("static");
-        this.space();
-    }
+    this.tsPrintClassMemberModifiers(node);
     this.print(node.key);
+    if (node.optional) {
+        this.tokenChar(63);
+    }
+    if (node.definite) {
+        this.tokenChar(33);
+    }
     this.print(node.typeAnnotation);
     if (node.value) {
         this.space();
@@ -47199,6 +47312,9 @@ function tokenIfPlusMinus(self, tok) {
         self.token(tok);
     }
 }
+function TSTemplateLiteralType(node) {
+    this._printTemplate(node, node.types);
+}
 function TSLiteralType(node) {
     this.print(node.literal);
 }
@@ -47350,11 +47466,7 @@ function TSImportType(node) {
     }
 }
 function TSImportEqualsDeclaration(node) {
-    var isExport = node.isExport, id = node.id, moduleReference = node.moduleReference;
-    if (isExport) {
-        this.word("export");
-        this.space();
-    }
+    var id = node.id, moduleReference = node.moduleReference;
     this.word("import");
     this.space();
     this.print(id);
@@ -47401,19 +47513,20 @@ function tsPrintSignatureDeclarationBase(node) {
     this.print(returnType);
 }
 function tsPrintClassMemberModifiers(node) {
-    var isField = node.type === "ClassAccessorProperty" || node.type === "ClassProperty";
+    var isPrivateField = node.type === "ClassPrivateProperty";
+    var isPublicField = node.type === "ClassAccessorProperty" || node.type === "ClassProperty";
     printModifiersList(this, node, [
-        isField && node.declare && "declare",
-        node.accessibility
+        isPublicField && node.declare && "declare",
+        !isPrivateField && node.accessibility
     ]);
     if (node.static) {
         this.word("static");
         this.space();
     }
     printModifiersList(this, node, [
-        node.override && "override",
-        node.abstract && "abstract",
-        isField && node.readonly && "readonly"
+        !isPrivateField && node.override && "override",
+        !isPrivateField && node.abstract && "abstract",
+        (isPublicField || isPrivateField) && node.readonly && "readonly"
     ]);
 }
 function printBraced(printer, node, cb) {
@@ -47683,6 +47796,7 @@ var generatorFunctions = /* @__PURE__ */ Object.freeze({
     TSSatisfiesExpression: TSTypeExpression2,
     TSStringKeyword: TSStringKeyword,
     TSSymbolKeyword: TSSymbolKeyword,
+    TSTemplateLiteralType: TSTemplateLiteralType,
     TSThisType: TSThisType,
     TSTupleType: TSTupleType,
     TSTypeAliasDeclaration: TSTypeAliasDeclaration,
@@ -47738,6 +47852,7 @@ var generatorFunctions = /* @__PURE__ */ Object.freeze({
     _params: _params,
     _predicate: _predicate,
     _printAttributes: _printAttributes,
+    _printTemplate: _printTemplate,
     _shouldPrintArrowParamsParens: _shouldPrintArrowParamsParens,
     _shouldPrintDecoratorsBeforeExport: _shouldPrintDecoratorsBeforeExport,
     _variance: _variance,
@@ -49153,7 +49268,7 @@ function verify$1(visitor) {
             }
             if (shouldIgnoreKey(nodeType)) continue;
             if (!TYPES2.includes(nodeType)) {
-                throw new Error("You gave us a visitor for the node type ".concat(nodeType, " but it's not a valid type in @babel/traverse ", "8.0.0-alpha.15"));
+                throw new Error("You gave us a visitor for the node type ".concat(nodeType, " but it's not a valid type in @babel/traverse ", "8.0.0-alpha.16"));
             }
             var visitors2 = visitor[nodeType];
             if ((typeof visitors2 === "undefined" ? "undefined" : _type_of(visitors2)) === "object") {
@@ -49809,7 +49924,15 @@ var collectorVisitor = {
         var parent = path.scope.getBlockParent();
         parent.registerDeclaration(path);
     },
+    TSImportEqualsDeclaration: function TSImportEqualsDeclaration(path) {
+        var parent = path.scope.getBlockParent();
+        parent.registerDeclaration(path);
+    },
     ReferencedIdentifier: function ReferencedIdentifier(path, state) {
+        if (isTSQualifiedName(path.parent) && path.parent.right === path.node) {
+            return;
+        }
+        if (path.parentPath.isTSImportEqualsDeclaration()) return;
         state.references.push(path);
     },
     ForXStatement: function ForXStatement(path, state) {