@putout/babel 2.10.2 → 3.0.0

package/bundle/index.js

@@ -5068,6 +5068,24 @@ var require_globals = __commonJS({
                 uniq: false,
                 which: false
             },
+            vitest: {
+                afterAll: false,
+                afterEach: false,
+                assert: false,
+                assertType: false,
+                beforeAll: false,
+                beforeEach: false,
+                describe: false,
+                expect: false,
+                expectTypeOf: false,
+                it: false,
+                onTestFailed: false,
+                onTestFinished: false,
+                suite: false,
+                test: false,
+                vi: false,
+                vitest: false
+            },
             webextensions: {
                 browser: false,
                 chrome: false,
@@ -5400,8 +5418,8 @@ var require_globals2 = __commonJS({
     }
 });
 // lib/index.mjs
-var lib_exports2 = {};
-__export(lib_exports2, {
+var index_exports = {};
+__export(index_exports, {
     codeFrameColumns: function() {
         return codeFrameColumns;
     },
@@ -5427,7 +5445,7 @@ __export(lib_exports2, {
         return lib_exports;
     }
 });
-module.exports = __toCommonJS(lib_exports2);
+module.exports = __toCommonJS(index_exports);
 // node_modules/@babel/types/lib/index.js
 var lib_exports = {};
 __export(lib_exports, {
@@ -6160,6 +6178,9 @@ __export(lib_exports, {
     TSENTITYNAME_TYPES: function() {
         return TSENTITYNAME_TYPES;
     },
+    TSEnumBody: function() {
+        return tsEnumBody;
+    },
     TSEnumDeclaration: function() {
         return tsEnumDeclaration;
     },
@@ -7111,6 +7132,9 @@ __export(lib_exports, {
     assertTSEntityName: function() {
         return assertTSEntityName;
     },
+    assertTSEnumBody: function() {
+        return assertTSEnumBody;
+    },
     assertTSEnumDeclaration: function() {
         return assertTSEnumDeclaration;
     },
@@ -8368,6 +8392,9 @@ __export(lib_exports, {
     isTSEntityName: function() {
         return isTSEntityName;
     },
+    isTSEnumBody: function() {
+        return isTSEnumBody;
+    },
     isTSEnumDeclaration: function() {
         return isTSEnumDeclaration;
     },
@@ -8962,6 +8989,9 @@ __export(lib_exports, {
     tsDeclareMethod: function() {
         return tsDeclareMethod;
     },
+    tsEnumBody: function() {
+        return tsEnumBody;
+    },
     tsEnumDeclaration: function() {
         return tsEnumDeclaration;
     },
@@ -11765,6 +11795,11 @@ function isTSTypeAssertion(node, opts) {
     if (node.type !== "TSTypeAssertion") return false;
     return opts == null || shallowEqual(node, opts);
 }
+function isTSEnumBody(node, opts) {
+    if (!node) return false;
+    if (node.type !== "TSEnumBody") return false;
+    return opts == null || shallowEqual(node, opts);
+}
 function isTSEnumDeclaration(node, opts) {
     if (!node) return false;
     if (node.type !== "TSEnumDeclaration") return false;
@@ -12863,6 +12898,7 @@ function isTypeScript(node, opts) {
         case "TSAsExpression":
         case "TSSatisfiesExpression":
         case "TSTypeAssertion":
+        case "TSEnumBody":
         case "TSEnumDeclaration":
         case "TSEnumMember":
         case "TSModuleDeclaration":
@@ -13842,7 +13878,6 @@ defineType$4("CallExpression", {
     visitor: [
         "callee",
         "arguments",
-        "typeParameters",
         "typeArguments"
     ],
     builder: [
@@ -13856,14 +13891,14 @@ defineType$4("CallExpression", {
         callee: {
             validate: assertNodeType("Expression", "Super", "V8IntrinsicIdentifier")
         },
-        arguments: validateArrayOfType("Expression", "SpreadElement", "ArgumentPlaceholder")
-    }, {}, {
+        arguments: validateArrayOfType("Expression", "SpreadElement", "ArgumentPlaceholder"),
         typeArguments: {
-            validate: assertNodeType("TypeParameterInstantiation"),
+            validate: assertNodeType("TypeParameterInstantiation", "TSTypeParameterInstantiation"),
             optional: true
-        },
-        typeParameters: {
-            validate: assertNodeType("TSTypeParameterInstantiation"),
+        }
+    }, {}, process.env.BABEL_TYPES_8_BREAKING ? {} : {
+        optional: {
+            validate: assertValueType("boolean"),
             optional: true
         }
     })
@@ -14104,6 +14139,7 @@ defineType$4("FunctionDeclaration", {
         "id",
         "typeParameters",
         "params",
+        "predicate",
         "returnType",
         "body"
     ],
@@ -14961,6 +14997,7 @@ defineType$4("ArrowFunctionExpression", {
     visitor: [
         "typeParameters",
         "params",
+        "predicate",
         "returnType",
         "body"
     ],
@@ -15556,7 +15593,7 @@ defineType$4("Super", void 0);
 defineType$4("TaggedTemplateExpression", {
     visitor: [
         "tag",
-        "typeParameters",
+        "typeArguments",
         "quasi"
     ],
     builder: [
@@ -15566,18 +15603,17 @@ defineType$4("TaggedTemplateExpression", {
     aliases: [
         "Expression"
     ],
-    fields: {
+    fields: _define_property({
         tag: {
             validate: assertNodeType("Expression")
         },
         quasi: {
             validate: assertNodeType("TemplateLiteral")
-        },
-        typeParameters: {
-            validate: assertNodeType("TypeParameterInstantiation", "TSTypeParameterInstantiation"),
-            optional: true
         }
-    }
+    }, "typeArguments", {
+        validate: assertNodeType("TypeParameterInstantiation", "TSTypeParameterInstantiation"),
+        optional: true
+    })
 });
 defineType$4("TemplateElement", {
     builder: [
@@ -15766,7 +15802,6 @@ defineType$4("OptionalCallExpression", {
     visitor: [
         "callee",
         "arguments",
-        "typeParameters",
         "typeArguments"
     ],
     builder: [
@@ -15777,7 +15812,7 @@ defineType$4("OptionalCallExpression", {
     aliases: [
         "Expression"
     ],
-    fields: {
+    fields: Object.assign({
         callee: {
             validate: assertNodeType("Expression")
         },
@@ -15786,18 +15821,15 @@ defineType$4("OptionalCallExpression", {
             validate: chain(assertValueType("boolean"), assertOptionalChainStart())
         },
         typeArguments: {
-            validate: assertNodeType("TypeParameterInstantiation"),
-            optional: true
-        },
-        typeParameters: {
-            validate: assertNodeType("TSTypeParameterInstantiation"),
+            validate: assertNodeType("TypeParameterInstantiation", "TSTypeParameterInstantiation"),
             optional: true
         }
-    }
+    }, {})
 });
 defineType$4("ClassProperty", {
     visitor: [
         "decorators",
+        "variance",
         "key",
         "typeAnnotation",
         "value"
@@ -15907,6 +15939,7 @@ defineType$4("ClassAccessorProperty", {
 defineType$4("ClassPrivateProperty", {
     visitor: [
         "decorators",
+        "variance",
         "key",
         "typeAnnotation",
         "value"
@@ -16107,9 +16140,13 @@ defineType$3("ClassImplements", {
 });
 defineInterfaceishType("DeclareClass");
 defineType$3("DeclareFunction", {
-    visitor: [
+    builder: [
         "id"
     ],
+    visitor: [
+        "id",
+        "predicate"
+    ],
     aliases: [
         "FlowDeclaration",
         "Statement",
@@ -16254,8 +16291,15 @@ defineType$3("ExistsTypeAnnotation", {
     ]
 });
 defineType$3("FunctionTypeAnnotation", {
+    builder: [
+        "typeParameters",
+        "params",
+        "rest",
+        "returnType"
+    ],
     visitor: [
         "typeParameters",
+        "this",
         "params",
         "rest",
         "returnType"
@@ -16752,9 +16796,13 @@ defineType$3("EnumBooleanMember", {
     aliases: [
         "EnumMember"
     ],
-    visitor: [
+    builder: [
         "id"
     ],
+    visitor: [
+        "id",
+        "init"
+    ],
     fields: {
         id: validateType("Identifier"),
         init: validateType("BooleanLiteral")
@@ -16955,12 +17003,13 @@ defineType$2("JSXOpeningElement", {
     ],
     visitor: [
         "name",
+        "typeArguments",
         "attributes"
     ],
     aliases: [
         "Immutable"
     ],
-    fields: {
+    fields: Object.assign({
         name: {
             validate: assertNodeType("JSXIdentifier", "JSXMemberExpression", "JSXNamespacedName")
         },
@@ -16968,11 +17017,11 @@ defineType$2("JSXOpeningElement", {
             default: false
         },
         attributes: validateArrayOfType("JSXAttribute", "JSXSpreadAttribute"),
-        typeParameters: {
+        typeArguments: {
             validate: assertNodeType("TypeParameterInstantiation", "TSTypeParameterInstantiation"),
             optional: true
         }
-    }
+    }, {})
 });
 defineType$2("JSXSpreadAttribute", {
     visitor: [
@@ -17522,12 +17571,11 @@ defineType("TSTypeQuery", {
     ],
     visitor: [
         "exprName",
-        "typeParameters"
+        "typeArguments"
     ],
-    fields: {
-        exprName: validateType("TSEntityName", "TSImportType"),
-        typeParameters: validateOptionalType("TSTypeParameterInstantiation")
-    }
+    fields: _define_property({
+        exprName: validateType("TSEntityName", "TSImportType")
+    }, "typeArguments", validateOptionalType("TSTypeParameterInstantiation"))
 });
 defineType("TSTypeLiteral", {
     aliases: [
@@ -17741,22 +17789,33 @@ defineType("TSLiteralType", {
         }
     }
 });
-var expressionWithTypeArguments = {
-    aliases: [
-        "TSType"
-    ],
-    visitor: [
-        "expression",
-        "typeParameters"
-    ],
-    fields: {
-        expression: validateType("TSEntityName"),
-        typeParameters: validateOptionalType("TSTypeParameterInstantiation")
-    }
-};
 {
-    defineType("TSClassImplements", expressionWithTypeArguments);
-    defineType("TSInterfaceHeritage", expressionWithTypeArguments);
+    defineType("TSClassImplements", {
+        aliases: [
+            "TSType"
+        ],
+        visitor: [
+            "expression",
+            "typeArguments"
+        ],
+        fields: {
+            expression: validateType("TSEntityName"),
+            typeArguments: validateOptionalType("TSTypeParameterInstantiation")
+        }
+    });
+    defineType("TSInterfaceHeritage", {
+        aliases: [
+            "TSType"
+        ],
+        visitor: [
+            "expression",
+            "typeArguments"
+        ],
+        fields: {
+            expression: validateType("TSEntityName"),
+            typeArguments: validateOptionalType("TSTypeParameterInstantiation")
+        }
+    });
 }defineType("TSInterfaceDeclaration", {
     aliases: [
         "Statement",
@@ -17807,12 +17866,11 @@ defineType("TSInstantiationExpression", {
     ],
     visitor: [
         "expression",
-        "typeParameters"
+        "typeArguments"
     ],
-    fields: {
-        expression: validateType("Expression"),
-        typeParameters: validateOptionalType("TSTypeParameterInstantiation")
-    }
+    fields: _define_property({
+        expression: validateType("Expression")
+    }, "typeArguments", validateOptionalType("TSTypeParameterInstantiation"))
 });
 var TSTypeExpression = {
     aliases: [
@@ -17846,24 +17904,32 @@ defineType("TSTypeAssertion", {
         expression: validateType("Expression")
     }
 });
-defineType("TSEnumDeclaration", {
-    aliases: [
-        "Statement",
-        "Declaration"
-    ],
+defineType("TSEnumBody", {
     visitor: [
-        "id",
         "members"
     ],
     fields: {
-        declare: validateOptional(bool),
-        const: validateOptional(bool),
-        id: validateType("Identifier"),
-        members: validateArrayOfType("TSEnumMember"),
-        initializer: validateOptionalType("Expression")
+        members: validateArrayOfType("TSEnumMember")
     }
 });
-defineType("TSEnumMember", {
+{
+    defineType("TSEnumDeclaration", {
+        aliases: [
+            "Statement",
+            "Declaration"
+        ],
+        visitor: [
+            "id",
+            "body"
+        ],
+        fields: {
+            declare: validateOptional(bool),
+            const: validateOptional(bool),
+            id: validateType("Identifier"),
+            body: validateType("TSEnumBody")
+        }
+    });
+}defineType("TSEnumMember", {
     visitor: [
         "id",
         "initializer"
@@ -17906,24 +17972,29 @@ defineType("TSModuleBlock", {
         body: validateArrayOfType("Statement")
     }
 });
+var _obj2;
 defineType("TSImportType", {
     aliases: [
         "TSType"
     ],
+    builder: [
+        "argument",
+        "qualifier",
+        "typeArguments"
+    ],
     visitor: [
         "argument",
+        "options",
         "qualifier",
-        "typeParameters"
+        "typeArguments"
     ],
-    fields: {
-        argument: validateType("StringLiteral"),
-        qualifier: validateOptionalType("TSEntityName"),
-        typeParameters: validateOptionalType("TSTypeParameterInstantiation"),
-        options: {
-            validate: assertNodeType("Expression"),
-            optional: true
-        }
-    }
+    fields: (_obj2 = {
+        argument: validateType("TSLiteralType"),
+        qualifier: validateOptionalType("TSEntityName")
+    }, _define_property(_obj2, "typeArguments", validateOptionalType("TSTypeParameterInstantiation")), _define_property(_obj2, "options", {
+        validate: assertNodeType("Expression"),
+        optional: true
+    }), _obj2)
 });
 defineType("TSImportEqualsDeclaration", {
     aliases: [
@@ -18019,6 +18090,7 @@ defineType("TSTypeParameter", {
         "name"
     ],
     visitor: [
+        "name",
         "constraint",
         "default"
     ],
@@ -20325,15 +20397,15 @@ function tsTypePredicate(parameterName) {
     return node;
 }
 function tsTypeQuery(exprName) {
-    var typeParameters = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
+    var typeArguments = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
     var node = {
         type: "TSTypeQuery",
         exprName: exprName,
-        typeParameters: typeParameters
+        typeArguments: typeArguments
     };
     var defs = NODE_FIELDS.TSTypeQuery;
     validate(defs.exprName, node, "exprName", exprName, 1);
-    validate(defs.typeParameters, node, "typeParameters", typeParameters, 1);
+    validate(defs.typeArguments, node, "typeArguments", typeArguments, 1);
     return node;
 }
 function tsTypeLiteral(members) {
@@ -20493,27 +20565,27 @@ function tsLiteralType(literal) {
     return node;
 }
 function tsClassImplements(expression2) {
-    var typeParameters = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
+    var typeArguments = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
     var node = {
         type: "TSClassImplements",
         expression: expression2,
-        typeParameters: typeParameters
+        typeArguments: typeArguments
     };
     var defs = NODE_FIELDS.TSClassImplements;
     validate(defs.expression, node, "expression", expression2, 1);
-    validate(defs.typeParameters, node, "typeParameters", typeParameters, 1);
+    validate(defs.typeArguments, node, "typeArguments", typeArguments, 1);
     return node;
 }
 function tsInterfaceHeritage(expression2) {
-    var typeParameters = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
+    var typeArguments = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
     var node = {
         type: "TSInterfaceHeritage",
         expression: expression2,
-        typeParameters: typeParameters
+        typeArguments: typeArguments
     };
     var defs = NODE_FIELDS.TSInterfaceHeritage;
     validate(defs.expression, node, "expression", expression2, 1);
-    validate(defs.typeParameters, node, "typeParameters", typeParameters, 1);
+    validate(defs.typeArguments, node, "typeArguments", typeArguments, 1);
     return node;
 }
 function tsInterfaceDeclaration(id) {
@@ -20556,15 +20628,15 @@ function tsTypeAliasDeclaration(id) {
     return node;
 }
 function tsInstantiationExpression(expression2) {
-    var typeParameters = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
+    var typeArguments = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
     var node = {
         type: "TSInstantiationExpression",
         expression: expression2,
-        typeParameters: typeParameters
+        typeArguments: typeArguments
     };
     var defs = NODE_FIELDS.TSInstantiationExpression;
     validate(defs.expression, node, "expression", expression2, 1);
-    validate(defs.typeParameters, node, "typeParameters", typeParameters, 1);
+    validate(defs.typeArguments, node, "typeArguments", typeArguments, 1);
     return node;
 }
 function tsAsExpression(expression2, typeAnnotation2) {
@@ -20600,15 +20672,24 @@ function tsTypeAssertion(typeAnnotation2, expression2) {
     validate(defs.expression, node, "expression", expression2, 1);
     return node;
 }
-function tsEnumDeclaration(id, members) {
+function tsEnumBody(members) {
+    var node = {
+        type: "TSEnumBody",
+        members: members
+    };
+    var defs = NODE_FIELDS.TSEnumBody;
+    validate(defs.members, node, "members", members, 1);
+    return node;
+}
+function tsEnumDeclaration(id, body) {
     var node = {
         type: "TSEnumDeclaration",
         id: id,
-        members: members
+        body: body
     };
     var defs = NODE_FIELDS.TSEnumDeclaration;
     validate(defs.id, node, "id", id, 1);
-    validate(defs.members, node, "members", members, 1);
+    validate(defs.body, node, "body", body, 1);
     return node;
 }
 function tsEnumMember(id) {
@@ -20645,17 +20726,17 @@ function tsModuleBlock(body) {
     return node;
 }
 function tsImportType(argument) {
-    var qualifier = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null, typeParameters = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : null;
+    var qualifier = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null, typeArguments = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : null;
     var node = {
         type: "TSImportType",
         argument: argument,
         qualifier: qualifier,
-        typeParameters: typeParameters
+        typeArguments: typeArguments
     };
     var defs = NODE_FIELDS.TSImportType;
     validate(defs.argument, node, "argument", argument, 1);
     validate(defs.qualifier, node, "qualifier", qualifier, 1);
-    validate(defs.typeParameters, node, "typeParameters", typeParameters, 1);
+    validate(defs.typeArguments, node, "typeArguments", typeArguments, 1);
     return node;
 }
 function tsImportEqualsDeclaration(id, moduleReference) {
@@ -21528,6 +21609,9 @@ function assertTSSatisfiesExpression(node, opts) {
 function assertTSTypeAssertion(node, opts) {
     assert("TSTypeAssertion", node, opts);
 }
+function assertTSEnumBody(node, opts) {
+    assert("TSEnumBody", node, opts);
+}
 function assertTSEnumDeclaration(node, opts) {
     assert("TSEnumDeclaration", node, opts);
 }
@@ -23669,6 +23753,71 @@ function ParseErrorEnum(argument, syntaxPlugin) {
     return ParseErrorConstructors;
 }
 var Errors = Object.assign({}, ParseErrorEnum(ModuleErrors), ParseErrorEnum(StandardErrors), ParseErrorEnum(StrictModeErrors), ParseErrorEnum(_templateObject())(PipelineOperatorErrors));
+function createDefaultOptions() {
+    return {
+        sourceType: "script",
+        sourceFilename: void 0,
+        startIndex: 0,
+        startColumn: 0,
+        startLine: 1,
+        allowAwaitOutsideFunction: false,
+        allowReturnOutsideFunction: false,
+        allowNewTargetOutsideFunction: false,
+        allowImportExportEverywhere: false,
+        allowSuperOutsideMethod: false,
+        allowUndeclaredExports: false,
+        plugins: [],
+        strictMode: null,
+        ranges: false,
+        tokens: false,
+        createImportExpressions: true,
+        createParenthesizedExpressions: false,
+        errorRecovery: false,
+        attachComment: true,
+        annexB: true
+    };
+}
+function getOptions(opts) {
+    var options = createDefaultOptions();
+    if (opts == null) {
+        return options;
+    }
+    if (opts.annexB != null && opts.annexB !== false) {
+        throw new Error("The `annexB` option can only be set to `false`.");
+    }
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = Object.keys(options)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var key = _step.value;
+            if (opts[key] != null) options[key] = opts[key];
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    if (options.startLine === 1) {
+        if (opts.startIndex == null && options.startColumn > 0) {
+            options.startIndex = options.startColumn;
+        } else if (opts.startColumn == null && options.startIndex > 0) {
+            options.startColumn = options.startIndex;
+        }
+    } else if (opts.startColumn == null || opts.startIndex == null) {
+        {
+            throw new Error("With a `startLine > 1` you must also specify `startIndex` and `startColumn`.");
+        }
+    }
+    return options;
+}
 var defineProperty = Object.defineProperty;
 var toUnenumerable = function(object, key) {
     if (object) {
@@ -23696,7 +23845,7 @@ var estree = function(superClass) {
                 key: "parse",
                 value: function parse() {
                     var file2 = toESTreeLocation(_get(_get_prototype_of(ESTreeParserMixin.prototype), "parse", this).call(this));
-                    if (this.options.tokens) {
+                    if (this.optionFlags & 128) {
                         file2.tokens = file2.tokens.map(toESTreeLocation);
                     }
                     return file2;
@@ -23829,21 +23978,6 @@ var estree = function(superClass) {
                     delete node.directives;
                 }
             },
-            {
-                key: "pushClassMethod",
-                value: function pushClassMethod(classBody2, method, isGenerator, isAsync, isConstructor, allowsDirectSuper) {
-                    this.parseMethod(method, isGenerator, isAsync, isConstructor, allowsDirectSuper, "ClassMethod", true);
-                    var typeParameters = method.typeParameters;
-                    if (typeParameters) {
-                        delete method.typeParameters;
-                        var fn = method.value;
-                        fn.typeParameters = typeParameters;
-                        fn.start = typeParameters.start;
-                        fn.loc.start = typeParameters.loc.start;
-                    }
-                    classBody2.body.push(method);
-                }
-            },
             {
                 key: "parsePrivateName",
                 value: function parsePrivateName() {
@@ -23901,9 +24035,22 @@ var estree = function(superClass) {
                     funcNode.type = "FunctionExpression";
                     delete funcNode.kind;
                     node.value = funcNode;
+                    var typeParameters = node.typeParameters;
+                    if (typeParameters) {
+                        delete node.typeParameters;
+                        funcNode.typeParameters = typeParameters;
+                        funcNode.start = typeParameters.start;
+                        funcNode.loc.start = typeParameters.loc.start;
+                    }
                     if (type === "ClassPrivateMethod") {
                         node.computed = false;
                     }
+                    if (node.abstract && this.hasPlugin("typescript")) {
+                        if (!funcNode.body) {
+                            funcNode.type = "TSEmptyBodyFunctionExpression";
+                        }
+                        return this.finishNode(node, "TSAbstractMethodDefinition");
+                    }
                     return this.finishNode(node, "MethodDefinition");
                 }
             },
@@ -23924,7 +24071,11 @@ var estree = function(superClass) {
                     var propertyNode = (_$_get = _get(_get_prototype_of(ESTreeParserMixin.prototype), "parseClassProperty", this)).call.apply(_$_get, [
                         this
                     ].concat(_to_consumable_array(args)));
-                    propertyNode.type = "PropertyDefinition";
+                    if (propertyNode.abstract && this.hasPlugin("typescript")) {
+                        propertyNode.type = "TSAbstractPropertyDefinition";
+                    } else {
+                        propertyNode.type = "PropertyDefinition";
+                    }
                     return propertyNode;
                 }
             },
@@ -23938,7 +24089,11 @@ var estree = function(superClass) {
                     var propertyNode = (_$_get = _get(_get_prototype_of(ESTreeParserMixin.prototype), "parseClassPrivateProperty", this)).call.apply(_$_get, [
                         this
                     ].concat(_to_consumable_array(args)));
-                    propertyNode.type = "PropertyDefinition";
+                    if (propertyNode.abstract && this.hasPlugin("typescript")) {
+                        propertyNode.type = "TSAbstractPropertyDefinition";
+                    } else {
+                        propertyNode.type = "PropertyDefinition";
+                    }
                     propertyNode.computed = false;
                     return propertyNode;
                 }
@@ -26244,6 +26399,14 @@ var CommentsParser = /*#__PURE__*/ function(BaseParser) {
                             case "ImportDeclaration":
                                 adjustInnerComments(node, node.specifiers, commentWS);
                                 break;
+                            case "TSEnumDeclaration":
+                                {
+                                    setInnerComments(node, comments);
+                                }
+                                break;
+                            case "TSEnumBody":
+                                adjustInnerComments(node, node.members, commentWS);
+                                break;
                             default:
                                 {
                                     setInnerComments(node, comments);
@@ -26910,7 +27073,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
         __publicField(_this, "tokens", []);
         __publicField(_this, "errorHandlers_readInt", {
             invalidDigit: function(pos, lineStart, curLine, radix) {
-                if (!_this.options.errorRecovery) return false;
+                if (!(_this.optionFlags & 1024)) return false;
                 _this.raise(Errors.InvalidDigit, buildPosition(pos, lineStart, curLine), {
                     radix: radix
                 });
@@ -26958,7 +27121,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
             key: "next",
             value: function next() {
                 this.checkKeywordEscapes();
-                if (this.options.tokens) {
+                if (this.optionFlags & 128) {
                     this.pushToken(new Token(this.state));
                 }
                 this.state.lastTokEndLoc = this.state.endLoc;
@@ -27125,7 +27288,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                     end: this.sourceToOffsetPos(end + commentEnd.length),
                     loc: new SourceLocation(startLoc, this.state.curPosition())
                 };
-                if (this.options.tokens) this.pushToken(comment);
+                if (this.optionFlags & 128) this.pushToken(comment);
                 return comment;
             }
         },
@@ -27151,7 +27314,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                     end: this.sourceToOffsetPos(end),
                     loc: new SourceLocation(startLoc, this.state.curPosition())
                 };
-                if (this.options.tokens) this.pushToken(comment);
+                if (this.optionFlags & 128) this.pushToken(comment);
                 return comment;
             }
         },
@@ -27159,7 +27322,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
             key: "skipSpace",
             value: function skipSpace() {
                 var spaceStart = this.state.pos;
-                var comments = [];
+                var comments = this.optionFlags & 2048 ? [] : null;
                 loop: while(this.state.pos < this.length){
                     var ch = this.input.charCodeAt(this.state.pos);
                     switch(ch){
@@ -27186,7 +27349,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                                         var comment = this.skipBlockComment("*/");
                                         if (comment !== void 0) {
                                             this.addComment(comment);
-                                            if (this.options.attachComment) comments.push(comment);
+                                            comments === null || comments === void 0 ? void 0 : comments.push(comment);
                                         }
                                         break;
                                     }
@@ -27195,7 +27358,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                                         var comment1 = this.skipLineComment(2);
                                         if (comment1 !== void 0) {
                                             this.addComment(comment1);
-                                            if (this.options.attachComment) comments.push(comment1);
+                                            comments === null || comments === void 0 ? void 0 : comments.push(comment1);
                                         }
                                         break;
                                     }
@@ -27206,24 +27369,24 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                         default:
                             if (isWhitespace(ch)) {
                                 ++this.state.pos;
-                            } else if (ch === 45 && !this.inModule && this.options.annexB) {
+                            } else if (ch === 45 && !this.inModule && this.optionFlags & 4096) {
                                 var pos = this.state.pos;
                                 if (this.input.charCodeAt(pos + 1) === 45 && this.input.charCodeAt(pos + 2) === 62 && (spaceStart === 0 || this.state.lineStart > spaceStart)) {
                                     var comment2 = this.skipLineComment(3);
                                     if (comment2 !== void 0) {
                                         this.addComment(comment2);
-                                        if (this.options.attachComment) comments.push(comment2);
+                                        comments === null || comments === void 0 ? void 0 : comments.push(comment2);
                                     }
                                 } else {
                                     break loop;
                                 }
-                            } else if (ch === 60 && !this.inModule && this.options.annexB) {
+                            } else if (ch === 60 && !this.inModule && this.optionFlags & 4096) {
                                 var pos1 = this.state.pos;
                                 if (this.input.charCodeAt(pos1 + 1) === 33 && this.input.charCodeAt(pos1 + 2) === 45 && this.input.charCodeAt(pos1 + 3) === 45) {
                                     var comment3 = this.skipLineComment(4);
                                     if (comment3 !== void 0) {
                                         this.addComment(comment3);
-                                        if (this.options.attachComment) comments.push(comment3);
+                                        comments === null || comments === void 0 ? void 0 : comments.push(comment3);
                                     }
                                 } else {
                                     break loop;
@@ -27233,7 +27396,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                             }
                     }
                 }
-                if (comments.length > 0) {
+                if ((comments === null || comments === void 0 ? void 0 : comments.length) > 0) {
                     var end = this.state.pos;
                     var commentWhitespace = {
                         start: this.sourceToOffsetPos(spaceStart),
@@ -27958,7 +28121,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                 var details = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
                 var loc = _instanceof(at, Position) ? at : at.loc.start;
                 var error = toParseError(loc, details);
-                if (!this.options.errorRecovery) throw error;
+                if (!(this.optionFlags & 1024)) throw error;
                 if (!this.isLookahead) this.state.errors.push(error);
                 return error;
             }
@@ -28675,7 +28838,7 @@ var Node = function Node(parser, pos, loc) {
     this.start = pos;
     this.end = 0;
     this.loc = new SourceLocation(loc);
-    if (parser === null || parser === void 0 ? void 0 : parser.options.ranges) this.range = [
+    if ((parser === null || parser === void 0 ? void 0 : parser.optionFlags) & 64) this.range = [
         pos,
         0
     ];
@@ -28758,8 +28921,10 @@ var NodeUtils = /*#__PURE__*/ function(UtilParser) {
                 node.type = type;
                 node.end = endLoc.index;
                 node.loc.end = endLoc;
-                if (this.options.ranges) node.range[1] = endLoc.index;
-                if (this.options.attachComment) this.processComment(node);
+                if (this.optionFlags & 64) node.range[1] = endLoc.index;
+                if (this.optionFlags & 2048) {
+                    this.processComment(node);
+                }
                 return node;
             }
         },
@@ -28768,7 +28933,7 @@ var NodeUtils = /*#__PURE__*/ function(UtilParser) {
             value: function resetStartLocation(node, startLoc) {
                 node.start = startLoc.index;
                 node.loc.start = startLoc;
-                if (this.options.ranges) node.range[0] = startLoc.index;
+                if (this.optionFlags & 64) node.range[0] = startLoc.index;
             }
         },
         {
@@ -28777,7 +28942,7 @@ var NodeUtils = /*#__PURE__*/ function(UtilParser) {
                 var endLoc = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : this.state.lastTokEndLoc;
                 node.end = endLoc.index;
                 node.loc.end = endLoc;
-                if (this.options.ranges) node.range[1] = endLoc.index;
+                if (this.optionFlags & 64) node.range[1] = endLoc.index;
             }
         },
         {
@@ -29407,31 +29572,63 @@ var flow = function(superClass) {
                     return this.finishNode(node, "TypeParameterDeclaration");
                 }
             },
+            {
+                key: "flowInTopLevelContext",
+                value: function flowInTopLevelContext(cb) {
+                    if (this.curContext() !== types.brace) {
+                        var oldContext = this.state.context;
+                        this.state.context = [
+                            oldContext[0]
+                        ];
+                        try {
+                            return cb();
+                        } finally{
+                            this.state.context = oldContext;
+                        }
+                    } else {
+                        return cb();
+                    }
+                }
+            },
+            {
+                key: "flowParseTypeParameterInstantiationInExpression",
+                value: function flowParseTypeParameterInstantiationInExpression() {
+                    if (this.reScan_lt() !== 47) return;
+                    return this.flowParseTypeParameterInstantiation();
+                }
+            },
             {
                 key: "flowParseTypeParameterInstantiation",
                 value: function flowParseTypeParameterInstantiation() {
+                    var _this = this;
                     var node = this.startNode();
                     var oldInType = this.state.inType;
-                    node.params = [];
                     this.state.inType = true;
-                    this.expect(47);
-                    var oldNoAnonFunctionType = this.state.noAnonFunctionType;
-                    this.state.noAnonFunctionType = false;
-                    while(!this.match(48)){
-                        node.params.push(this.flowParseType());
-                        if (!this.match(48)) {
-                            this.expect(12);
+                    node.params = [];
+                    this.flowInTopLevelContext(function() {
+                        _this.expect(47);
+                        var oldNoAnonFunctionType = _this.state.noAnonFunctionType;
+                        _this.state.noAnonFunctionType = false;
+                        while(!_this.match(48)){
+                            node.params.push(_this.flowParseType());
+                            if (!_this.match(48)) {
+                                _this.expect(12);
+                            }
                         }
+                        _this.state.noAnonFunctionType = oldNoAnonFunctionType;
+                    });
+                    this.state.inType = oldInType;
+                    if (!this.state.inType && this.curContext() === types.brace) {
+                        this.reScan_lt_gt();
                     }
-                    this.state.noAnonFunctionType = oldNoAnonFunctionType;
                     this.expect(48);
-                    this.state.inType = oldInType;
                     return this.finishNode(node, "TypeParameterInstantiation");
                 }
             },
             {
                 key: "flowParseTypeParameterInstantiationCallOrNew",
                 value: function flowParseTypeParameterInstantiationCallOrNew() {
+                    if (this.reScan_lt() !== 47) return;
                     var node = this.startNode();
                     var oldInType = this.state.inType;
                     node.params = [];
@@ -30694,9 +30891,9 @@ var flow = function(superClass) {
                 key: "parseClassSuper",
                 value: function parseClassSuper(node) {
                     _get(_get_prototype_of(FlowParserMixin.prototype), "parseClassSuper", this).call(this, node);
-                    if (node.superClass && this.match(47)) {
+                    if (node.superClass && (this.match(47) || this.match(51))) {
                         {
-                            node.superTypeArguments = this.flowParseTypeParameterInstantiation();
+                            node.superTypeArguments = this.flowParseTypeParameterInstantiationInExpression();
                         }
                     }
                     if (this.isContextual(113)) {
@@ -31105,12 +31302,12 @@ var flow = function(superClass) {
                         this.next();
                         var node = this.startNodeAt(startLoc);
                         node.callee = base;
-                        node.typeArguments = this.flowParseTypeParameterInstantiation();
+                        node.typeArguments = this.flowParseTypeParameterInstantiationInExpression();
                         this.expect(10);
                         node.arguments = this.parseCallExpressionArguments(11);
                         node.optional = true;
                         return this.finishCallExpression(node, true);
-                    } else if (!noCalls && this.shouldParseTypes() && this.match(47)) {
+                    } else if (!noCalls && this.shouldParseTypes() && (this.match(47) || this.match(51))) {
                         var node1 = this.startNodeAt(startLoc);
                         node1.callee = base;
                         var result = this.tryParse(function() {
@@ -31660,6 +31857,17 @@ var flow = function(superClass) {
                     return this.finishNode(node, "EnumDeclaration");
                 }
             },
+            {
+                key: "jsxParseOpeningElementAfterName",
+                value: function jsxParseOpeningElementAfterName(node) {
+                    if (this.shouldParseTypes()) {
+                        if (this.match(47) || this.match(51)) {
+                            node.typeArguments = this.flowParseTypeParameterInstantiationInExpression();
+                        }
+                    }
+                    return _get(_get_prototype_of(FlowParserMixin.prototype), "jsxParseOpeningElementAfterName", this).call(this, node);
+                }
+            },
             {
                 key: "isLookaheadToken_lt",
                 value: function isLookaheadToken_lt() {
@@ -31671,6 +31879,31 @@ var flow = function(superClass) {
                     return false;
                 }
             },
+            {
+                key: "reScan_lt_gt",
+                value: function reScan_lt_gt() {
+                    var type = this.state.type;
+                    if (type === 47) {
+                        this.state.pos -= 1;
+                        this.readToken_lt();
+                    } else if (type === 48) {
+                        this.state.pos -= 1;
+                        this.readToken_gt();
+                    }
+                }
+            },
+            {
+                key: "reScan_lt",
+                value: function reScan_lt() {
+                    var type = this.state.type;
+                    if (type === 51) {
+                        this.state.pos -= 2;
+                        this.finishOp(47, 1);
+                        return 47;
+                    }
+                    return type;
+                }
+            },
             {
                 key: "maybeUnwrapTypeCastExpression",
                 value: function maybeUnwrapTypeCastExpression(node) {
@@ -33509,8 +33742,14 @@ var typescript = function(superClass) {
                     this.expect(10);
                     if (!this.match(134)) {
                         this.raise(TSErrors.UnsupportedImportTypeArgument, this.state.startLoc);
+                        {
+                            node.argument = this.tsParseNonConditionalType();
+                        }
+                    } else {
+                        {
+                            node.argument = this.tsParseLiteralTypeNode();
+                        }
                     }
-                    node.argument = _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseExprAtom", this).call(this);
                     if (this.eat(12) && !this.match(11)) {
                         node.options = _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseMaybeAssignAllowIn", this).call(this);
                         this.eat(12);
@@ -33522,7 +33761,9 @@ var typescript = function(superClass) {
                         node.qualifier = this.tsParseEntityName();
                     }
                     if (this.match(47)) {
-                        node.typeParameters = this.tsParseTypeArguments();
+                        {
+                            node.typeArguments = this.tsParseTypeArguments();
+                        }
                     }
                     return this.finishNode(node, "TSImportType");
                 }
@@ -33584,7 +33825,9 @@ var typescript = function(superClass) {
                         node.exprName = this.tsParseEntityName();
                     }
                     if (!this.hasPrecedingLineBreak() && this.match(47)) {
-                        node.typeParameters = this.tsParseTypeArguments();
+                        {
+                            node.typeArguments = this.tsParseTypeArguments();
+                        }
                     }
                     return this.finishNode(node, "TSTypeQuery");
                 }
@@ -34084,7 +34327,7 @@ var typescript = function(superClass) {
                             return this.tsParseTupleType();
                         case 10:
                             {
-                                if (!this.options.createParenthesizedExpressions) {
+                                if (!(this.optionFlags & 512)) {
                                     var startLoc = this.state.startLoc;
                                     this.next();
                                     var type = this.tsParseType();
@@ -34466,10 +34709,12 @@ var typescript = function(superClass) {
                     var delimitedList = this.tsParseDelimitedList("HeritageClauseElement", function() {
                         var node = _this.startNode();
                         node.expression = _this.tsParseEntityName();
-                        if (_this.match(47)) {
-                            node.typeParameters = _this.tsParseTypeArguments();
+                        {
+                            if (_this.match(47)) {
+                                node.typeArguments = _this.tsParseTypeArguments();
+                            }
+                            return _this.finishNode(node, token === "extends" ? "TSInterfaceHeritage" : "TSClassImplements");
                         }
-                        return _this.finishNode(node, token === "extends" ? "TSInterfaceHeritage" : "TSClassImplements");
                     });
                     if (!delimitedList.length) {
                         this.raise(TSErrors.EmptyHeritageClauseType, originalStartLoc, {
@@ -34524,16 +34769,20 @@ var typescript = function(superClass) {
                 }
             },
             {
-                key: "tsInNoContext",
-                value: function tsInNoContext(cb) {
-                    var oldContext = this.state.context;
-                    this.state.context = [
-                        oldContext[0]
-                    ];
-                    try {
+                key: "tsInTopLevelContext",
+                value: function tsInTopLevelContext(cb) {
+                    if (this.curContext() !== types.brace) {
+                        var oldContext = this.state.context;
+                        this.state.context = [
+                            oldContext[0]
+                        ];
+                        try {
+                            return cb();
+                        } finally{
+                            this.state.context = oldContext;
+                        }
+                    } else {
                         return cb();
-                    } finally{
-                        this.state.context = oldContext;
                     }
                 }
             },
@@ -34621,10 +34870,20 @@ var typescript = function(superClass) {
                     this.expectContextual(126);
                     node.id = this.parseIdentifier();
                     this.checkIdentifier(node.id, node.const ? 8971 : 8459);
+                    {
+                        node.body = this.tsParseEnumBody();
+                    }
+                    return this.finishNode(node, "TSEnumDeclaration");
+                }
+            },
+            {
+                key: "tsParseEnumBody",
+                value: function tsParseEnumBody() {
+                    var node = this.startNode();
                     this.expect(5);
                     node.members = this.tsParseDelimitedList("EnumMembers", this.tsParseEnumMember.bind(this));
                     this.expect(8);
-                    return this.finishNode(node, "TSEnumDeclaration");
+                    return this.finishNode(node, "TSEnumBody");
                 }
             },
             {
@@ -34920,7 +35179,7 @@ var typescript = function(superClass) {
                     var _this = this;
                     var node = this.startNode();
                     node.params = this.tsInType(function() {
-                        return _this.tsInNoContext(function() {
+                        return _this.tsInTopLevelContext(function() {
                             _this.expect(47);
                             return _this.tsParseDelimitedList("TypeParametersOrArguments", _this.tsParseType.bind(_this));
                         });
@@ -35128,7 +35387,9 @@ var typescript = function(superClass) {
                             }
                             if (tokenIsTemplate(_this.state.type)) {
                                 var result2 = _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseTaggedTemplateExpression", _this).call(_this, base, startLoc, state);
-                                result2.typeParameters = typeArguments;
+                                {
+                                    result2.typeArguments = typeArguments;
+                                }
                                 return result2;
                             }
                             if (!noCalls && _this.eat(10)) {
@@ -35136,7 +35397,9 @@ var typescript = function(superClass) {
                                 node2.callee = base;
                                 node2.arguments = _this.parseCallExpressionArguments(11);
                                 _this.tsCheckForInvalidTypeCasts(node2.arguments);
-                                node2.typeParameters = typeArguments;
+                                {
+                                    node2.typeArguments = typeArguments;
+                                }
                                 if (state.optionalChainMember) {
                                     node2.optional = isOptionalCall;
                                 }
@@ -35148,7 +35411,9 @@ var typescript = function(superClass) {
                             }
                             var node = _this.startNodeAt(startLoc);
                             node.expression = base;
-                            node.typeParameters = typeArguments;
+                            {
+                                node.typeArguments = typeArguments;
+                            }
                             return _this.finishNode(node, "TSInstantiationExpression");
                         });
                         if (missingParenErrorLoc) {
@@ -35171,7 +35436,9 @@ var typescript = function(superClass) {
                     _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseNewCallee", this).call(this, node);
                     var callee = node.callee;
                     if (callee.type === "TSInstantiationExpression" && !((_callee_extra = callee.extra) === null || _callee_extra === void 0 ? void 0 : _callee_extra.parenthesized)) {
-                        node.typeParameters = callee.typeParameters;
+                        {
+                            node.typeArguments = callee.typeArguments;
+                        }
                         node.callee = callee.expression;
                     }
                 }
@@ -35957,17 +36224,19 @@ var typescript = function(superClass) {
             },
             {
                 key: "parseMaybeDecoratorArguments",
-                value: function parseMaybeDecoratorArguments(expr) {
+                value: function parseMaybeDecoratorArguments(expr, startLoc) {
                     if (this.match(47) || this.match(51)) {
                         var typeArguments = this.tsParseTypeArgumentsInExpression();
                         if (this.match(10)) {
-                            var call2 = _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseMaybeDecoratorArguments", this).call(this, expr);
-                            call2.typeParameters = typeArguments;
+                            var call2 = _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseMaybeDecoratorArguments", this).call(this, expr, startLoc);
+                            {
+                                call2.typeArguments = typeArguments;
+                            }
                             return call2;
                         }
                         this.unexpected(null, 10);
                     }
-                    return _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseMaybeDecoratorArguments", this).call(this, expr);
+                    return _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseMaybeDecoratorArguments", this).call(this, expr, startLoc);
                 }
             },
             {
@@ -36095,7 +36364,11 @@ var typescript = function(superClass) {
                         var typeArguments = this.tsTryParseAndCatch(function() {
                             return _this.tsParseTypeArgumentsInExpression();
                         });
-                        if (typeArguments) node.typeParameters = typeArguments;
+                        if (typeArguments) {
+                            {
+                                node.typeArguments = typeArguments;
+                            }
+                        }
                     }
                     return _get(_get_prototype_of(TypeScriptParserMixin.prototype), "jsxParseOpeningElementAfterName", this).call(this, node);
                 }
@@ -36170,8 +36443,9 @@ var typescript = function(superClass) {
                 value: function parseMethod(node, isGenerator, isAsync, isConstructor, allowDirectSuper, type, inClassScope) {
                     var method = _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseMethod", this).call(this, node, isGenerator, isAsync, isConstructor, allowDirectSuper, type, inClassScope);
                     if (method.abstract) {
-                        var hasBody = this.hasPlugin("estree") ? !!method.value.body : !!method.body;
-                        if (hasBody) {
+                        var hasEstreePlugin = this.hasPlugin("estree");
+                        var methodFn = hasEstreePlugin ? method.value : method;
+                        if (methodFn.body) {
                             var key = method.key;
                             this.raise(TSErrors.AbstractMethodHasImplementation, method, {
                                 methodName: key.type === "Identifier" && !method.computed ? key.name : "[".concat(this.input.slice(this.offsetToSourcePos(key.start), this.offsetToSourcePos(key.end)), "]")
@@ -36784,71 +37058,6 @@ var mixinPlugins = {
     placeholders: placeholders
 };
 var mixinPluginNames = Object.keys(mixinPlugins);
-function createDefaultOptions() {
-    return {
-        sourceType: "script",
-        sourceFilename: void 0,
-        startIndex: 0,
-        startColumn: 0,
-        startLine: 1,
-        allowAwaitOutsideFunction: false,
-        allowReturnOutsideFunction: false,
-        allowNewTargetOutsideFunction: false,
-        allowImportExportEverywhere: false,
-        allowSuperOutsideMethod: false,
-        allowUndeclaredExports: false,
-        plugins: [],
-        strictMode: null,
-        ranges: false,
-        tokens: false,
-        createImportExpressions: true,
-        createParenthesizedExpressions: false,
-        errorRecovery: false,
-        attachComment: true,
-        annexB: true
-    };
-}
-function getOptions(opts) {
-    var options = createDefaultOptions();
-    if (opts == null) {
-        return options;
-    }
-    if (opts.annexB != null && opts.annexB !== false) {
-        throw new Error("The `annexB` option can only be set to `false`.");
-    }
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-    try {
-        for(var _iterator = Object.keys(options)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var key = _step.value;
-            if (opts[key] != null) options[key] = opts[key];
-        }
-    } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
-        try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
-            }
-        } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
-            }
-        }
-    }
-    if (options.startLine === 1) {
-        if (opts.startIndex == null && options.startColumn > 0) {
-            options.startIndex = options.startColumn;
-        } else if (opts.startColumn == null && options.startIndex > 0) {
-            options.startColumn = options.startIndex;
-        }
-    } else if (opts.startColumn == null || opts.startIndex == null) {
-        {
-            throw new Error("With a `startLine > 1` you must also specify `startIndex` and `startColumn`.");
-        }
-    }
-    return options;
-}
 var ExpressionParser = /*#__PURE__*/ function(LValParser) {
     "use strict";
     _inherits(ExpressionParser, LValParser);
@@ -36901,7 +37110,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 this.finalizeRemainingComments();
                 expr.comments = this.comments;
                 expr.errors = this.state.errors;
-                if (this.options.tokens) {
+                if (this.optionFlags & 128) {
                     expr.tokens = this.tokens;
                 }
                 return expr;
@@ -37523,7 +37732,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                             return this.parseImportMetaProperty(node);
                         }
                         if (this.match(10)) {
-                            if (this.options.createImportExpressions) {
+                            if (this.optionFlags & 256) {
                                 return this.parseImportCall(node);
                             } else {
                                 return this.finishNode(node, "Import");
@@ -37792,9 +38001,9 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
             value: function parseSuper() {
                 var node = this.startNode();
                 this.next();
-                if (this.match(10) && !this.scope.allowDirectSuper && !this.options.allowSuperOutsideMethod) {
+                if (this.match(10) && !this.scope.allowDirectSuper && !(this.optionFlags & 16)) {
                     this.raise(Errors.SuperNotAllowed, node);
-                } else if (!this.scope.allowSuper && !this.options.allowSuperOutsideMethod) {
+                } else if (!this.scope.allowSuper && !(this.optionFlags & 16)) {
                     this.raise(Errors.UnexpectedSuper, node);
                 }
                 if (!this.match(10) && !this.match(0) && !this.match(16)) {
@@ -37860,7 +38069,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 } else if (this.isContextual(105) || this.isContextual(97)) {
                     var isSource = this.isContextual(105);
                     this.expectPlugin(isSource ? "sourcePhaseImports" : "deferredImportEvaluation");
-                    if (!this.options.createImportExpressions) {
+                    if (!(this.optionFlags & 256)) {
                         throw this.raise(Errors.DynamicImportPhaseRequiresImportExpressions, this.state.startLoc, {
                             phase: this.state.value
                         });
@@ -38013,7 +38222,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
         {
             key: "wrapParenthesis",
             value: function wrapParenthesis(startLoc, expression2) {
-                if (!this.options.createParenthesizedExpressions) {
+                if (!(this.optionFlags & 512)) {
                     this.addExtra(expression2, "parenthesized", true);
                     this.addExtra(expression2, "parenStart", startLoc.index);
                     this.takeSurroundingComments(expression2, startLoc.index, this.state.lastTokEndLoc.index);
@@ -38053,7 +38262,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                     var meta = this.createIdentifier(this.startNodeAtNode(node), "new");
                     this.next();
                     var metaProp = this.parseMetaProperty(node, meta, "target");
-                    if (!this.scope.inNonArrowFunction && !this.scope.inClass && !this.options.allowNewTargetOutsideFunction) {
+                    if (!this.scope.inNonArrowFunction && !this.scope.inClass && !(this.optionFlags & 4)) {
                         this.raise(Errors.UnexpectedNewTarget, metaProp);
                     }
                     return metaProp;
@@ -38669,7 +38878,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
         {
             key: "recordAwaitIfAllowed",
             value: function recordAwaitIfAllowed() {
-                var isAwaitAllowed = this.prodParam.hasAwait || this.options.allowAwaitOutsideFunction && !this.scope.inFunction;
+                var isAwaitAllowed = this.prodParam.hasAwait || this.optionFlags & 1 && !this.scope.inFunction;
                 if (isAwaitAllowed && !this.scope.inFunction) {
                     this.state.hasTopLevelAwait = true;
                 }
@@ -38684,7 +38893,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 if (this.eat(55)) {
                     this.raise(Errors.ObsoleteAwaitStar, node);
                 }
-                if (!this.scope.inFunction && !this.options.allowAwaitOutsideFunction) {
+                if (!this.scope.inFunction && !(this.optionFlags & 1)) {
                     if (this.isAmbiguousAwait()) {
                         this.ambiguousScriptDifferentAst = true;
                     } else {
@@ -38981,7 +39190,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
             value: function parseTopLevel(file2, program3) {
                 file2.program = this.parseProgram(program3);
                 file2.comments = this.comments;
-                if (this.options.tokens) {
+                if (this.optionFlags & 128) {
                     file2.tokens = babel7CompatTokens(this.tokens, this.input, this.startIndex);
                 }
                 return this.finishNode(file2, "File");
@@ -38995,7 +39204,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 program3.interpreter = this.parseInterpreterDirective();
                 this.parseBlockBody(program3, true, true, end);
                 if (this.inModule) {
-                    if (!this.options.allowUndeclaredExports && this.scope.undefinedExports.size > 0) {
+                    if (!(this.optionFlags & 32) && this.scope.undefinedExports.size > 0) {
                         var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                         try {
                             for(var _iterator = Array.from(this.scope.undefinedExports)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
@@ -39281,7 +39490,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                         }
                     case 82:
                         {
-                            if (!this.options.allowImportExportEverywhere && !topLevel) {
+                            if (!(this.optionFlags & 8) && !topLevel) {
                                 this.raise(Errors.UnexpectedImportExport, this.state.startLoc);
                             }
                             this.next();
@@ -39323,7 +39532,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
         {
             key: "assertModuleNodeAllowed",
             value: function assertModuleNodeAllowed(node) {
-                if (!this.options.allowImportExportEverywhere && !this.inModule) {
+                if (!(this.optionFlags & 8) && !this.inModule) {
                     this.raise(Errors.ImportOutsideModule, node);
                 }
             }
@@ -39339,12 +39548,13 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
             key: "maybeTakeDecorators",
             value: function maybeTakeDecorators(maybeDecorators, classNode, exportNode) {
                 if (maybeDecorators) {
-                    if (classNode.decorators && classNode.decorators.length > 0) {
-                        var _classNode_decorators;
+                    var _classNode_decorators;
+                    if ((_classNode_decorators = classNode.decorators) === null || _classNode_decorators === void 0 ? void 0 : _classNode_decorators.length) {
+                        var _classNode_decorators1;
                         if (typeof this.getPluginOption("decorators", "decoratorsBeforeExport") !== "boolean") {
                             this.raise(Errors.DecoratorsBeforeAfterExport, classNode.decorators[0]);
                         }
-                        (_classNode_decorators = classNode.decorators).unshift.apply(_classNode_decorators, _to_consumable_array(maybeDecorators));
+                        (_classNode_decorators1 = classNode.decorators).unshift.apply(_classNode_decorators1, _to_consumable_array(maybeDecorators));
                     } else {
                         classNode.decorators = maybeDecorators;
                     }
@@ -39399,7 +39609,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                         this.expect(11);
                         expr = this.wrapParenthesis(startLoc2, expr);
                         var paramsStartLoc = this.state.startLoc;
-                        node.expression = this.parseMaybeDecoratorArguments(expr);
+                        node.expression = this.parseMaybeDecoratorArguments(expr, startLoc2);
                         if (this.getPluginOption("decorators", "allowCallParenthesized") === false && node.expression !== expr) {
                             this.raise(Errors.DecoratorArgumentsOutsideParentheses, paramsStartLoc);
                         }
@@ -39417,7 +39627,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                             node2.computed = false;
                             expr = this.finishNode(node2, "MemberExpression");
                         }
-                        node.expression = this.parseMaybeDecoratorArguments(expr);
+                        node.expression = this.parseMaybeDecoratorArguments(expr, startLoc);
                     }
                 } else {
                     node.expression = this.parseExprSubscripts();
@@ -39427,9 +39637,9 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
         },
         {
             key: "parseMaybeDecoratorArguments",
-            value: function parseMaybeDecoratorArguments(expr) {
+            value: function parseMaybeDecoratorArguments(expr, startLoc) {
                 if (this.eat(10)) {
-                    var node = this.startNodeAtNode(expr);
+                    var node = this.startNodeAt(startLoc);
                     node.callee = expr;
                     node.arguments = this.parseCallExpressionArguments(11);
                     this.toReferencedList(node.arguments);
@@ -39606,7 +39816,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
         {
             key: "parseReturnStatement",
             value: function parseReturnStatement(node) {
-                if (!this.prodParam.hasReturn && !this.options.allowReturnOutsideFunction) {
+                if (!this.prodParam.hasReturn && !(this.optionFlags & 2)) {
                     this.raise(Errors.IllegalReturn, this.state.startLoc);
                 }
                 this.next();
@@ -41235,6 +41445,47 @@ var Parser = /*#__PURE__*/ function(StatementParser) {
         _this.plugins = pluginsMap;
         _this.filename = options.sourceFilename;
         _this.startIndex = options.startIndex;
+        var optionFlags = 0;
+        if (options.allowAwaitOutsideFunction) {
+            optionFlags |= 1;
+        }
+        if (options.allowReturnOutsideFunction) {
+            optionFlags |= 2;
+        }
+        if (options.allowImportExportEverywhere) {
+            optionFlags |= 8;
+        }
+        if (options.allowSuperOutsideMethod) {
+            optionFlags |= 16;
+        }
+        if (options.allowUndeclaredExports) {
+            optionFlags |= 32;
+        }
+        if (options.allowNewTargetOutsideFunction) {
+            optionFlags |= 4;
+        }
+        if (options.ranges) {
+            optionFlags |= 64;
+        }
+        if (options.tokens) {
+            optionFlags |= 128;
+        }
+        if (options.createImportExpressions) {
+            optionFlags |= 256;
+        }
+        if (options.createParenthesizedExpressions) {
+            optionFlags |= 512;
+        }
+        if (options.errorRecovery) {
+            optionFlags |= 1024;
+        }
+        if (options.attachComment) {
+            optionFlags |= 2048;
+        }
+        if (options.annexB) {
+            optionFlags |= 4096;
+        }
+        _this.optionFlags = optionFlags;
         return _this;
     }
     _create_class(Parser, [
@@ -43875,7 +44126,7 @@ function TSInferType$1(node, parent) {
 }
 function TSInstantiationExpression$1(node, parent) {
     var parentType = parent.type;
-    return (parentType === "CallExpression" || parentType === "OptionalCallExpression" || parentType === "NewExpression" || parentType === "TSInstantiationExpression") && !!parent.typeParameters;
+    return (parentType === "CallExpression" || parentType === "OptionalCallExpression" || parentType === "NewExpression" || parentType === "TSInstantiationExpression") && !!parent.typeArguments;
 }
 function BinaryExpression(node, parent, tokenContext, inForStatementInit) {
     return node.operator === "in" && inForStatementInit;
@@ -44487,7 +44738,9 @@ function childrenIterator(node) {
 }
 function TaggedTemplateExpression(node) {
     this.print(node.tag);
-    this.print(node.typeParameters);
+    {
+        this.print(node.typeArguments);
+    }
     this.print(node.quasi);
 }
 function TemplateElement() {
@@ -44563,7 +44816,6 @@ function NewExpression(node, parent) {
         return;
     }
     this.print(node.typeArguments);
-    this.print(node.typeParameters);
     if (node.optional) {
         this.token("?.");
     }
@@ -44622,7 +44874,6 @@ function OptionalMemberExpression(node) {
 }
 function OptionalCallExpression(node) {
     this.print(node.callee);
-    this.print(node.typeParameters);
     if (node.optional) {
         this.token("?.");
     }
@@ -44636,7 +44887,6 @@ function OptionalCallExpression(node) {
 function CallExpression(node) {
     this.print(node.callee);
     this.print(node.typeArguments);
-    this.print(node.typeParameters);
     this.tokenChar(40);
     var exit = this.enterDelimited();
     this.printList(node.arguments, this.shouldPrintTrailingComma(")"));
@@ -45779,14 +46029,6 @@ function BigIntLiteral(node) {
     }
     this.word(node.value + "n");
 }
-function DecimalLiteral(node) {
-    var raw = this.getPossibleRaw(node);
-    if (!this.format.minified && raw !== void 0) {
-        this.word(raw);
-        return;
-    }
-    this.word(node.value + "m");
-}
 var validTopicTokenSet = /* @__PURE__ */ new Set([
     "^^",
     "@@",
@@ -46542,7 +46784,9 @@ function spaceSeparator() {
 function JSXOpeningElement(node) {
     this.tokenChar(60);
     this.print(node.name);
-    this.print(node.typeParameters);
+    {
+        this.print(node.typeArguments);
+    }
     if (node.attributes.length > 0) {
         this.space();
         this.printJoin(node.attributes, void 0, void 0, spaceSeparator);
@@ -46820,8 +47064,9 @@ function TSTypeQuery(node) {
     this.word("typeof");
     this.space();
     this.print(node.exprName);
-    if (node.typeParameters) {
-        this.print(node.typeParameters);
+    var typeArguments = node.typeArguments;
+    if (typeArguments) {
+        this.print(typeArguments);
     }
 }
 function TSTypeLiteral(node) {
@@ -46959,7 +47204,7 @@ function TSLiteralType(node) {
 }
 function TSClassImplements(node) {
     this.print(node.expression);
-    this.print(node.typeParameters);
+    this.print(node.typeArguments);
 }
 function TSInterfaceDeclaration(node) {
     var declare = node.declare, id = node.id, typeParameters = node.typeParameters, extendz = node.extends, body = node.body;
@@ -47020,11 +47265,12 @@ function TSTypeAssertion(node) {
 }
 function TSInstantiationExpression(node) {
     this.print(node.expression);
-    this.print(node.typeParameters);
+    {
+        this.print(node.typeArguments);
+    }
 }
 function TSEnumDeclaration(node) {
-    var _this = this;
-    var declare = node.declare, isConst = node.const, id = node.id, members = node.members;
+    var declare = node.declare, isConst = node.const, id = node.id;
     if (declare) {
         this.word("declare");
         this.space();
@@ -47037,9 +47283,15 @@ function TSEnumDeclaration(node) {
     this.space();
     this.print(id);
     this.space();
+    {
+        this.print(node.body);
+    }
+}
+function TSEnumBody(node) {
+    var _this = this;
     printBraced(this, node, function() {
         var _this_shouldPrintTrailingComma;
-        return _this.printList(members, (_this_shouldPrintTrailingComma = _this.shouldPrintTrailingComma("}")) !== null && _this_shouldPrintTrailingComma !== void 0 ? _this_shouldPrintTrailingComma : true, true, true);
+        return _this.printList(node.members, (_this_shouldPrintTrailingComma = _this.shouldPrintTrailingComma("}")) !== null && _this_shouldPrintTrailingComma !== void 0 ? _this_shouldPrintTrailingComma : false, true, true);
     });
 }
 function TSEnumMember(node) {
@@ -47079,17 +47331,22 @@ function TSModuleBlock(node) {
     });
 }
 function TSImportType(node) {
-    var argument = node.argument, qualifier = node.qualifier, typeParameters = node.typeParameters;
+    var argument = node.argument, qualifier = node.qualifier, options = node.options;
     this.word("import");
     this.tokenChar(40);
     this.print(argument);
+    if (options) {
+        this.tokenChar(44);
+        this.print(options);
+    }
     this.tokenChar(41);
     if (qualifier) {
         this.tokenChar(46);
         this.print(qualifier);
     }
-    if (typeParameters) {
-        this.print(typeParameters);
+    var typeArguments = node.typeArguments;
+    if (typeArguments) {
+        this.print(typeArguments);
     }
 }
 function TSImportEqualsDeclaration(node) {
@@ -47252,7 +47509,6 @@ var generatorFunctions = /* @__PURE__ */ Object.freeze({
     ConditionalExpression: ConditionalExpression,
     ContinueStatement: ContinueStatement,
     DebuggerStatement: DebuggerStatement,
-    DecimalLiteral: DecimalLiteral,
     DeclareClass: DeclareClass,
     DeclareExportAllDeclaration: DeclareExportAllDeclaration,
     DeclareExportDeclaration: DeclareExportDeclaration,
@@ -47389,10 +47645,10 @@ var generatorFunctions = /* @__PURE__ */ Object.freeze({
     TSConstructorType: TSConstructorType,
     TSDeclareFunction: TSDeclareFunction,
     TSDeclareMethod: TSDeclareMethod,
+    TSEnumBody: TSEnumBody,
     TSEnumDeclaration: TSEnumDeclaration,
     TSEnumMember: TSEnumMember,
     TSExportAssignment: TSExportAssignment,
-    TSExpressionWithTypeArguments: TSClassImplements,
     TSExternalModuleReference: TSExternalModuleReference,
     TSFunctionType: TSFunctionType,
     TSImportEqualsDeclaration: TSImportEqualsDeclaration,
@@ -47490,7 +47746,7 @@ var generatorFunctions = /* @__PURE__ */ Object.freeze({
     tsPrintPropertyOrMethodName: tsPrintPropertyOrMethodName,
     tsPrintSignatureDeclarationBase: tsPrintSignatureDeclarationBase
 });
-var isExpression2 = lib_exports.isExpression, isFunction3 = lib_exports.isFunction, isStatement3 = lib_exports.isStatement, isClassBody2 = lib_exports.isClassBody, isTSInterfaceBody2 = lib_exports.isTSInterfaceBody, isTSEnumDeclaration2 = lib_exports.isTSEnumDeclaration;
+var isExpression2 = lib_exports.isExpression, isFunction3 = lib_exports.isFunction, isStatement3 = lib_exports.isStatement, isClassBody2 = lib_exports.isClassBody, isTSInterfaceBody2 = lib_exports.isTSInterfaceBody, isTSEnumMember2 = lib_exports.isTSEnumMember;
 var SCIENTIFIC_NOTATION = /e/i;
 var ZERO_DECIMAL_INTEGER = /\.0+$/;
 var HAS_NEWLINE = /[\n\r\u2028\u2029]/;
@@ -48376,7 +48632,7 @@ var Printer = /*#__PURE__*/ function() {
                         }
                         if (len === 1) {
                             var singleLine = comment.loc ? comment.loc.start.line === comment.loc.end.line : !HAS_NEWLINE.test(comment.value);
-                            var shouldSkipNewline = singleLine && !isStatement3(node) && !isClassBody2(parent) && !isTSInterfaceBody2(parent) && !isTSEnumDeclaration2(parent);
+                            var shouldSkipNewline = singleLine && !isStatement3(node) && !isClassBody2(parent) && !isTSInterfaceBody2(parent) && !isTSEnumMember2(node);
                             if (type === 0) {
                                 this._printComment(comment, shouldSkipNewline && node.type !== "ObjectExpression" || singleLine && isFunction3(parent, {
                                     body: node
@@ -48897,7 +49153,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.14"));
+                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"));
             }
             var visitors2 = visitor[nodeType];
             if ((typeof visitors2 === "undefined" ? "undefined" : _type_of(visitors2)) === "object") {