@putout/babel 2.1.0 → 2.2.0

package/bundle/index.js

@@ -452,7 +452,7 @@ var __publicField = function(obj, key, value1) {
 };
 // node_modules/to-fast-properties/index.js
 var require_to_fast_properties = __commonJS({
-    "node_modules/to-fast-properties/index.js": function(exports, module2) {
+    "node_modules/to-fast-properties/index.js": function(exports2, module2) {
         "use strict";
         var fastProto = null;
         function FastObject(o) {
@@ -475,7 +475,7 @@ var require_to_fast_properties = __commonJS({
 });
 // node_modules/@babel/highlight/node_modules/js-tokens/index.js
 var require_js_tokens = __commonJS({
-    "node_modules/@babel/highlight/node_modules/js-tokens/index.js": function(exports, module2) {
+    "node_modules/@babel/highlight/node_modules/js-tokens/index.js": function(exports2, module2) {
         var Identifier2;
         var JSXIdentifier2;
         var JSXPunctuator;
@@ -1294,7 +1294,7 @@ var require_js_tokens = __commonJS({
 });
 // node_modules/jsesc/jsesc.js
 var require_jsesc = __commonJS({
-    "node_modules/jsesc/jsesc.js": function(exports, module2) {
+    "node_modules/jsesc/jsesc.js": function(exports2, module2) {
         "use strict";
         var object = {};
         var hasOwnProperty = object.hasOwnProperty;
@@ -1515,7 +1515,7 @@ var require_jsesc = __commonJS({
                 if (lone) {
                     return fourHexEscape(hexadecimal(lone.charCodeAt(0), lowercaseHex));
                 }
-                if (char == "\x00" && !json && !regexDigit.test(string.charAt(index3 + 1))) {
+                if (char == "\0" && !json && !regexDigit.test(string.charAt(index3 + 1))) {
                     return "\\0";
                 }
                 if (quoteChar) {
@@ -1553,7 +1553,7 @@ var require_jsesc = __commonJS({
 });
 // node_modules/ms/index.js
 var require_ms = __commonJS({
-    "node_modules/ms/index.js": function(exports, module2) {
+    "node_modules/ms/index.js": function(exports2, module2) {
         var s = 1e3;
         var m = s * 60;
         var h = m * 60;
@@ -1664,7 +1664,7 @@ var require_ms = __commonJS({
 });
 // node_modules/debug/src/common.js
 var require_common = __commonJS({
-    "node_modules/debug/src/common.js": function(exports, module2) {
+    "node_modules/debug/src/common.js": function(exports2, module2) {
         function setup2(env3) {
             createDebug.debug = createDebug;
             createDebug.default = createDebug;
@@ -1828,13 +1828,13 @@ var require_common = __commonJS({
 });
 // node_modules/debug/src/browser.js
 var require_browser = __commonJS({
-    "node_modules/debug/src/browser.js": function(exports, module2) {
-        exports.formatArgs = formatArgs;
-        exports.save = save;
-        exports.load = load;
-        exports.useColors = useColors;
-        exports.storage = localstorage();
-        exports.destroy = /* @__PURE__ */ function() {
+    "node_modules/debug/src/browser.js": function(exports2, module2) {
+        exports2.formatArgs = formatArgs;
+        exports2.save = save;
+        exports2.load = load;
+        exports2.useColors = useColors;
+        exports2.storage = localstorage();
+        exports2.destroy = /* @__PURE__ */ function() {
             var warned = false;
             return function() {
                 if (!warned) {
@@ -1843,7 +1843,7 @@ var require_browser = __commonJS({
                 }
             };
         }();
-        exports.colors = [
+        exports2.colors = [
             "#0000CC",
             "#0000FF",
             "#0033CC",
@@ -1954,20 +1954,20 @@ var require_browser = __commonJS({
             });
             args.splice(lastC, 0, c);
         }
-        exports.log = console.debug || console.log || function() {};
+        exports2.log = console.debug || console.log || function() {};
         function save(namespaces) {
             try {
                 if (namespaces) {
-                    exports.storage.setItem("debug", namespaces);
+                    exports2.storage.setItem("debug", namespaces);
                 } else {
-                    exports.storage.removeItem("debug");
+                    exports2.storage.removeItem("debug");
                 }
             } catch (error) {}
         }
         function load() {
             var r;
             try {
-                r = exports.storage.getItem("debug");
+                r = exports2.storage.getItem("debug");
             } catch (error) {}
             if (!r && typeof process !== "undefined" && "env" in process) {
                 r = process.env.DEBUG;
@@ -1979,7 +1979,7 @@ var require_browser = __commonJS({
                 return localStorage;
             } catch (error) {}
         }
-        module2.exports = require_common()(exports);
+        module2.exports = require_common()(exports2);
         var formatters = module2.exports.formatters;
         formatters.j = function(v) {
             try {
@@ -1992,7 +1992,7 @@ var require_browser = __commonJS({
 });
 // node_modules/has-flag/index.js
 var require_has_flag = __commonJS({
-    "node_modules/has-flag/index.js": function(exports, module2) {
+    "node_modules/has-flag/index.js": function(exports2, module2) {
         "use strict";
         module2.exports = function(flag) {
             var argv = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : process.argv;
@@ -2005,7 +2005,7 @@ var require_has_flag = __commonJS({
 });
 // node_modules/supports-color/index.js
 var require_supports_color = __commonJS({
-    "node_modules/supports-color/index.js": function(exports, module2) {
+    "node_modules/supports-color/index.js": function(exports2, module2) {
         "use strict";
         var os3 = require("os");
         var tty3 = require("tty");
@@ -2115,17 +2115,17 @@ var require_supports_color = __commonJS({
 });
 // node_modules/debug/src/node.js
 var require_node = __commonJS({
-    "node_modules/debug/src/node.js": function(exports, module2) {
+    "node_modules/debug/src/node.js": function(exports2, module2) {
         var tty3 = require("tty");
         var util = require("util");
-        exports.init = init;
-        exports.log = log;
-        exports.formatArgs = formatArgs;
-        exports.save = save;
-        exports.load = load;
-        exports.useColors = useColors;
-        exports.destroy = util.deprecate(function() {}, "Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`.");
-        exports.colors = [
+        exports2.init = init;
+        exports2.log = log;
+        exports2.formatArgs = formatArgs;
+        exports2.save = save;
+        exports2.load = load;
+        exports2.useColors = useColors;
+        exports2.destroy = util.deprecate(function() {}, "Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`.");
+        exports2.colors = [
             6,
             2,
             3,
@@ -2136,7 +2136,7 @@ var require_node = __commonJS({
         try {
             var supportsColor3 = require_supports_color();
             if (supportsColor3 && (supportsColor3.stderr || supportsColor3).level >= 2) {
-                exports.colors = [
+                exports2.colors = [
                     20,
                     21,
                     26,
@@ -2216,7 +2216,7 @@ var require_node = __commonJS({
                 ];
             }
         } catch (error) {}
-        exports.inspectOpts = Object.keys(process.env).filter(function(key) {
+        exports2.inspectOpts = Object.keys(process.env).filter(function(key) {
             return /^debug_/i.test(key);
         }).reduce(function(obj, key) {
             var prop = key.substring(6).toLowerCase().replace(/_([a-z])/g, function(_, k) {
@@ -2236,7 +2236,7 @@ var require_node = __commonJS({
             return obj;
         }, {});
         function useColors() {
-            return "colors" in exports.inspectOpts ? Boolean(exports.inspectOpts.colors) : tty3.isatty(process.stderr.fd);
+            return "colors" in exports2.inspectOpts ? Boolean(exports2.inspectOpts.colors) : tty3.isatty(process.stderr.fd);
         }
         function formatArgs(args) {
             var _this = this, name = _this.namespace, useColors2 = _this.useColors;
@@ -2251,7 +2251,7 @@ var require_node = __commonJS({
             }
         }
         function getDate() {
-            if (exports.inspectOpts.hideDate) {
+            if (exports2.inspectOpts.hideDate) {
                 return "";
             }
             return /* @__PURE__ */ new Date().toISOString() + " ";
@@ -2275,12 +2275,12 @@ var require_node = __commonJS({
         }
         function init(debug2) {
             debug2.inspectOpts = {};
-            var keys = Object.keys(exports.inspectOpts);
+            var keys = Object.keys(exports2.inspectOpts);
             for(var i = 0; i < keys.length; i++){
-                debug2.inspectOpts[keys[i]] = exports.inspectOpts[keys[i]];
+                debug2.inspectOpts[keys[i]] = exports2.inspectOpts[keys[i]];
             }
         }
-        module2.exports = require_common()(exports);
+        module2.exports = require_common()(exports2);
         var formatters = module2.exports.formatters;
         formatters.o = function(v) {
             this.inspectOpts.colors = this.useColors;
@@ -2296,7 +2296,7 @@ var require_node = __commonJS({
 });
 // node_modules/debug/src/index.js
 var require_src = __commonJS({
-    "node_modules/debug/src/index.js": function(exports, module2) {
+    "node_modules/debug/src/index.js": function(exports2, module2) {
         if (typeof process === "undefined" || process.type === "renderer" || process.browser === true || process.__nwjs) {
             module2.exports = require_browser();
         } else {
@@ -2306,7 +2306,7 @@ var require_src = __commonJS({
 });
 // node_modules/globals/globals.json
 var require_globals = __commonJS({
-    "node_modules/globals/globals.json": function(exports, module2) {
+    "node_modules/globals/globals.json": function(exports2, module2) {
         module2.exports = {
             builtin: {
                 AggregateError: false,
@@ -4309,7 +4309,7 @@ var require_globals = __commonJS({
 });
 // node_modules/globals/index.js
 var require_globals2 = __commonJS({
-    "node_modules/globals/index.js": function(exports, module2) {
+    "node_modules/globals/index.js": function(exports2, module2) {
         "use strict";
         module2.exports = require_globals();
     }
@@ -13539,9 +13539,6 @@ defineType$4("Program", {
         "interpreter"
     ],
     fields: {
-        sourceFile: {
-            validate: assertValueType("string")
-        },
         sourceType: {
             validate: assertOneOf("script", "module"),
             default: "script"
@@ -17554,8 +17551,7 @@ function program(body) {
         body: body,
         directives: directives,
         sourceType: sourceType,
-        interpreter: interpreter,
-        sourceFile: null
+        interpreter: interpreter
     });
 }
 function objectExpression(properties) {
@@ -21835,10 +21831,10 @@ var PipelineOperatorErrors = {
     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$1 = [
+var _excluded = [
     "toMessage"
 ];
-var _excluded2$1 = [
+var _excluded2 = [
     "message"
 ];
 function defineHidden(obj, key, value1) {
@@ -21849,9 +21845,8 @@ function defineHidden(obj, key, value1) {
     });
 }
 function toParseErrorConstructor(_ref) {
-    var toMessage = _ref.toMessage, properties = _objectWithoutPropertiesLoose(_ref, _excluded$1);
-    return function constructor(param) {
-        var loc = param.loc, details = param.details;
+    var toMessage = _ref.toMessage, properties = _objectWithoutPropertiesLoose(_ref, _excluded);
+    return function constructor(loc, details) {
         var error = new SyntaxError();
         Object.assign(error, properties, {
             loc: loc,
@@ -21866,10 +21861,7 @@ function toParseErrorConstructor(_ref) {
             var overrides = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
             var _overrides_loc;
             var _$_ref = (_overrides_loc = overrides.loc) !== null && _overrides_loc !== void 0 ? _overrides_loc : loc, line = _$_ref.line, column = _$_ref.column, index3 = _$_ref.index;
-            return constructor({
-                loc: new Position(line, column, index3),
-                details: Object.assign({}, details, overrides.details)
-            });
+            return constructor(new Position(line, column, index3), Object.assign({}, details, overrides.details));
         });
         defineHidden(error, "details", details);
         Object.defineProperty(error, "message", {
@@ -21907,7 +21899,7 @@ function ParseErrorEnum(argument, syntaxPlugin) {
                 }
             } : typeof _$template === "function" ? {
                 message: _$template
-            } : _$template, message = _ref2.message, rest = _objectWithoutPropertiesLoose(_ref2, _excluded2$1);
+            } : _$template, message = _ref2.message, rest = _objectWithoutPropertiesLoose(_ref2, _excluded2);
             var toMessage = typeof message === "string" ? function() {
                 return message;
             } : message;
@@ -22258,13 +22250,9 @@ var estree = function(superClass) {
                 key: "toAssignableObjectExpressionProp",
                 value: function toAssignableObjectExpressionProp(prop, isLast, isLHS) {
                     if (prop.kind === "get" || prop.kind === "set") {
-                        this.raise(Errors.PatternHasAccessor, {
-                            at: prop.key
-                        });
+                        this.raise(Errors.PatternHasAccessor, prop.key);
                     } else if (prop.method) {
-                        this.raise(Errors.PatternHasMethod, {
-                            at: prop.key
-                        });
+                        this.raise(Errors.PatternHasMethod, prop.key);
                     } else {
                         _get(_get_prototype_of(ESTreeParserMixin.prototype), "toAssignableObjectExpressionProp", this).call(this, prop, isLast, isLHS);
                     }
@@ -23975,9 +23963,9 @@ function canBeReservedWord(word) {
 var Scope = function Scope(flags) {
     "use strict";
     _class_call_check(this, Scope);
-    __publicField(this, "var", /* @__PURE__ */ new Set());
-    __publicField(this, "lexical", /* @__PURE__ */ new Set());
-    __publicField(this, "functions", /* @__PURE__ */ new Set());
+    __publicField(this, "flags", 0);
+    __publicField(this, "names", /* @__PURE__ */ new Map());
+    __publicField(this, "firstLexicalName", "");
     this.flags = flags;
 };
 var ScopeHandler = /*#__PURE__*/ function() {
@@ -24086,11 +24074,16 @@ var ScopeHandler = /*#__PURE__*/ function() {
                 var scope2 = this.currentScope();
                 if (bindingType & 8 || bindingType & 16) {
                     this.checkRedeclarationInScope(scope2, name, bindingType, loc);
+                    var type = scope2.names.get(name) || 0;
                     if (bindingType & 16) {
-                        scope2.functions.add(name);
+                        type = type | 4;
                     } else {
-                        scope2.lexical.add(name);
+                        if (!scope2.firstLexicalName) {
+                            scope2.firstLexicalName = name;
+                        }
+                        type = type | 2;
                     }
+                    scope2.names.set(name, type);
                     if (bindingType & 8) {
                         this.maybeExportDefined(scope2, name);
                     }
@@ -24098,7 +24091,7 @@ var ScopeHandler = /*#__PURE__*/ function() {
                     for(var i = this.scopeStack.length - 1; i >= 0; --i){
                         scope2 = this.scopeStack[i];
                         this.checkRedeclarationInScope(scope2, name, bindingType, loc);
-                        scope2.var.add(name);
+                        scope2.names.set(name, (scope2.names.get(name) || 0) | 1);
                         this.maybeExportDefined(scope2, name);
                         if (scope2.flags & 387) break;
                     }
@@ -24120,8 +24113,7 @@ var ScopeHandler = /*#__PURE__*/ function() {
             key: "checkRedeclarationInScope",
             value: function checkRedeclarationInScope(scope2, name, bindingType, loc) {
                 if (this.isRedeclaredInScope(scope2, name, bindingType)) {
-                    this.parser.raise(Errors.VarRedeclaration, {
-                        at: loc,
+                    this.parser.raise(Errors.VarRedeclaration, loc, {
                         identifierName: name
                     });
                 }
@@ -24132,12 +24124,13 @@ var ScopeHandler = /*#__PURE__*/ function() {
             value: function isRedeclaredInScope(scope2, name, bindingType) {
                 if (!(bindingType & 1)) return false;
                 if (bindingType & 8) {
-                    return scope2.lexical.has(name) || scope2.functions.has(name) || scope2.var.has(name);
+                    return scope2.names.has(name);
                 }
+                var type = scope2.names.get(name);
                 if (bindingType & 16) {
-                    return scope2.lexical.has(name) || !this.treatFunctionsAsVarInScope(scope2) && scope2.var.has(name);
+                    return (type & 2) > 0 || !this.treatFunctionsAsVarInScope(scope2) && (type & 1) > 0;
                 }
-                return scope2.lexical.has(name) && !(scope2.flags & 8 && scope2.lexical.values().next().value === name) || !this.treatFunctionsAsVarInScope(scope2) && scope2.functions.has(name);
+                return (type & 2) > 0 && !(scope2.flags & 8 && scope2.firstLexicalName === name) || !this.treatFunctionsAsVarInScope(scope2) && (type & 4) > 0;
             }
         },
         {
@@ -24145,7 +24138,7 @@ var ScopeHandler = /*#__PURE__*/ function() {
             value: function checkLocalExport(id) {
                 var name = id.name;
                 var topLevelScope = this.scopeStack[0];
-                if (!topLevelScope.lexical.has(name) && !topLevelScope.var.has(name) && !topLevelScope.functions.has(name)) {
+                if (!topLevelScope.names.has(name)) {
                     this.undefinedExports.set(name, id.loc.start);
                 }
             }
@@ -24228,8 +24221,9 @@ var FlowScopeHandler = /*#__PURE__*/ function(ScopeHandler) {
             key: "isRedeclaredInScope",
             value: function isRedeclaredInScope(scope2, name, bindingType) {
                 if (_get(_get_prototype_of(FlowScopeHandler.prototype), "isRedeclaredInScope", this).call(this, scope2, name, bindingType)) return true;
-                if (bindingType & 2048) {
-                    return !scope2.declareFunctions.has(name) && (scope2.lexical.has(name) || scope2.functions.has(name));
+                if (bindingType & 2048 && !scope2.declareFunctions.has(name)) {
+                    var type = scope2.names.get(name);
+                    return (type & 4) > 0 || (type & 2) > 0;
                 }
                 return false;
             }
@@ -24349,7 +24343,10 @@ var CommentsParser = /*#__PURE__*/ function(BaseParser) {
             key: "addComment",
             value: function addComment(comment) {
                 if (this.filename) comment.loc.filename = this.filename;
-                this.state.comments.push(comment);
+                var commentsLen = this.state.commentsLen;
+                if (this.comments.length != commentsLen) this.comments.length = commentsLen;
+                this.comments.push(comment);
+                this.state.commentsLen++;
             }
         },
         {
@@ -24540,7 +24537,7 @@ var State = /*#__PURE__*/ function() {
     "use strict";
     function _State() {
         _class_call_check(this, _State);
-        __publicField(this, "strict");
+        __publicField(this, "flags", 1024);
         __publicField(this, "curLine");
         __publicField(this, "lineStart");
         __publicField(this, "startLoc");
@@ -24549,21 +24546,12 @@ var State = /*#__PURE__*/ function() {
         __publicField(this, "potentialArrowAt", -1);
         __publicField(this, "noArrowAt", []);
         __publicField(this, "noArrowParamsConversionAt", []);
-        __publicField(this, "maybeInArrowParameters", false);
-        __publicField(this, "inType", false);
-        __publicField(this, "noAnonFunctionType", false);
-        __publicField(this, "hasFlowComment", false);
-        __publicField(this, "isAmbientContext", false);
-        __publicField(this, "inAbstractClass", false);
-        __publicField(this, "inDisallowConditionalTypesContext", false);
         __publicField(this, "topicContext", {
             maxNumOfResolvableTopics: 0,
             maxTopicIndex: null
         });
-        __publicField(this, "soloAwait", false);
-        __publicField(this, "inFSharpPipelineDirectBody", false);
         __publicField(this, "labels", []);
-        __publicField(this, "comments", []);
+        __publicField(this, "commentsLen", 0);
         __publicField(this, "commentStack", []);
         __publicField(this, "pos", 0);
         __publicField(this, "type", 139);
@@ -24572,17 +24560,27 @@ var State = /*#__PURE__*/ function() {
         __publicField(this, "end", 0);
         __publicField(this, "lastTokEndLoc", null);
         __publicField(this, "lastTokStartLoc", null);
-        __publicField(this, "lastTokStart", 0);
         __publicField(this, "context", [
             types.brace
         ]);
-        __publicField(this, "canStartJSXElement", true);
-        __publicField(this, "containsEsc", false);
         __publicField(this, "firstInvalidTemplateEscapePos", null);
         __publicField(this, "strictErrors", /* @__PURE__ */ new Map());
         __publicField(this, "tokensLength", 0);
     }
     _create_class(_State, [
+        {
+            key: "strict",
+            get: function get() {
+                return (this.flags & 1) > 0;
+            },
+            set: function set(value1) {
+                if (value1) {
+                    this.flags |= 1;
+                } else {
+                    this.flags &= ~1;
+                }
+            }
+        },
         {
             key: "init",
             value: function init(param) {
@@ -24593,6 +24591,149 @@ var State = /*#__PURE__*/ function() {
                 this.startLoc = this.endLoc = new Position(startLine, startColumn, 0);
             }
         },
+        {
+            key: "maybeInArrowParameters",
+            get: function get() {
+                return (this.flags & 2) > 0;
+            },
+            set: function set(value1) {
+                if (value1) {
+                    this.flags |= 2;
+                } else {
+                    this.flags &= ~2;
+                }
+            }
+        },
+        {
+            key: "inType",
+            get: function get() {
+                return (this.flags & 4) > 0;
+            },
+            set: function set(value1) {
+                if (value1) {
+                    this.flags |= 4;
+                } else {
+                    this.flags &= ~4;
+                }
+            }
+        },
+        {
+            key: "noAnonFunctionType",
+            get: function get() {
+                return (this.flags & 8) > 0;
+            },
+            set: function set(value1) {
+                if (value1) {
+                    this.flags |= 8;
+                } else {
+                    this.flags &= ~8;
+                }
+            }
+        },
+        {
+            key: "hasFlowComment",
+            get: function get() {
+                return (this.flags & 16) > 0;
+            },
+            set: function set(value1) {
+                if (value1) {
+                    this.flags |= 16;
+                } else {
+                    this.flags &= ~16;
+                }
+            }
+        },
+        {
+            key: "isAmbientContext",
+            get: function get() {
+                return (this.flags & 32) > 0;
+            },
+            set: function set(value1) {
+                if (value1) {
+                    this.flags |= 32;
+                } else {
+                    this.flags &= ~32;
+                }
+            }
+        },
+        {
+            key: "inAbstractClass",
+            get: function get() {
+                return (this.flags & 64) > 0;
+            },
+            set: function set(value1) {
+                if (value1) {
+                    this.flags |= 64;
+                } else {
+                    this.flags &= ~64;
+                }
+            }
+        },
+        {
+            key: "inDisallowConditionalTypesContext",
+            get: function get() {
+                return (this.flags & 128) > 0;
+            },
+            set: function set(value1) {
+                if (value1) {
+                    this.flags |= 128;
+                } else {
+                    this.flags &= ~128;
+                }
+            }
+        },
+        {
+            key: "soloAwait",
+            get: function get() {
+                return (this.flags & 256) > 0;
+            },
+            set: function set(value1) {
+                if (value1) {
+                    this.flags |= 256;
+                } else {
+                    this.flags &= ~256;
+                }
+            }
+        },
+        {
+            key: "inFSharpPipelineDirectBody",
+            get: function get() {
+                return (this.flags & 512) > 0;
+            },
+            set: function set(value1) {
+                if (value1) {
+                    this.flags |= 512;
+                } else {
+                    this.flags &= ~512;
+                }
+            }
+        },
+        {
+            key: "canStartJSXElement",
+            get: function get() {
+                return (this.flags & 1024) > 0;
+            },
+            set: function set(value1) {
+                if (value1) {
+                    this.flags |= 1024;
+                } else {
+                    this.flags &= ~1024;
+                }
+            }
+        },
+        {
+            key: "containsEsc",
+            get: function get() {
+                return (this.flags & 2048) > 0;
+            },
+            set: function set(value1) {
+                if (value1) {
+                    this.flags |= 2048;
+                } else {
+                    this.flags &= ~2048;
+                }
+            }
+        },
         {
             key: "curPosition",
             value: function curPosition() {
@@ -24601,17 +24742,32 @@ var State = /*#__PURE__*/ function() {
         },
         {
             key: "clone",
-            value: function clone(skipArrays) {
+            value: function clone() {
                 var state = new _State();
-                var keys = Object.keys(this);
-                for(var i = 0, length = keys.length; i < length; i++){
-                    var key = keys[i];
-                    var val = this[key];
-                    if (!skipArrays && Array.isArray(val)) {
-                        val = val.slice();
-                    }
-                    state[key] = val;
-                }
+                state.flags = this.flags;
+                state.curLine = this.curLine;
+                state.lineStart = this.lineStart;
+                state.startLoc = this.startLoc;
+                state.endLoc = this.endLoc;
+                state.errors = this.errors.slice();
+                state.potentialArrowAt = this.potentialArrowAt;
+                state.noArrowAt = this.noArrowAt.slice();
+                state.noArrowParamsConversionAt = this.noArrowParamsConversionAt.slice();
+                state.topicContext = this.topicContext;
+                state.labels = this.labels.slice();
+                state.commentsLen = this.commentsLen;
+                state.commentStack = this.commentStack.slice();
+                state.pos = this.pos;
+                state.type = this.type;
+                state.value = this.value;
+                state.start = this.start;
+                state.end = this.end;
+                state.lastTokEndLoc = this.lastTokEndLoc;
+                state.lastTokStartLoc = this.lastTokStartLoc;
+                state.context = this.context.slice();
+                state.firstInvalidTemplateEscapePos = this.firstInvalidTemplateEscapePos;
+                state.strictErrors = this.strictErrors;
+                state.tokensLength = this.tokensLength;
                 return state;
             }
         }
@@ -24911,12 +25067,6 @@ function readCodePoint2(input, pos, lineStart, curLine, throwOnInvalid, errors)
         pos: pos
     };
 }
-var _excluded = [
-    "at"
-];
-var _excluded2 = [
-    "at"
-];
 function buildPosition(pos, lineStart, curLine) {
     return new Position(curLine, pos - lineStart, pos);
 }
@@ -24952,8 +25102,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
         __publicField(_assert_this_initialized(_this), "errorHandlers_readInt", {
             invalidDigit: function(pos, lineStart, curLine, radix) {
                 if (!_this.options.errorRecovery) return false;
-                _this.raise(Errors.InvalidDigit, {
-                    at: buildPosition(pos, lineStart, curLine),
+                _this.raise(Errors.InvalidDigit, buildPosition(pos, lineStart, curLine), {
                     radix: radix
                 });
                 return true;
@@ -24967,28 +25116,23 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
         }));
         __publicField(_assert_this_initialized(_this), "errorHandlers_readStringContents_string", Object.assign({}, _this.errorHandlers_readCodePoint, {
             strictNumericEscape: function(pos, lineStart, curLine) {
-                _this.recordStrictModeErrors(Errors.StrictNumericEscape, {
-                    at: buildPosition(pos, lineStart, curLine)
-                });
+                _this.recordStrictModeErrors(Errors.StrictNumericEscape, buildPosition(pos, lineStart, curLine));
             },
             unterminated: function(pos, lineStart, curLine) {
-                throw _this.raise(Errors.UnterminatedString, {
-                    at: buildPosition(pos - 1, lineStart, curLine)
-                });
+                throw _this.raise(Errors.UnterminatedString, buildPosition(pos - 1, lineStart, curLine));
             }
         }));
         __publicField(_assert_this_initialized(_this), "errorHandlers_readStringContents_template", Object.assign({}, _this.errorHandlers_readCodePoint, {
             strictNumericEscape: _this.errorBuilder(Errors.StrictNumericEscape),
             unterminated: function(pos, lineStart, curLine) {
-                throw _this.raise(Errors.UnterminatedTemplate, {
-                    at: buildPosition(pos, lineStart, curLine)
-                });
+                throw _this.raise(Errors.UnterminatedTemplate, buildPosition(pos, lineStart, curLine));
             }
         }));
         _this.state = new State();
         _this.state.init(options);
         _this.input = input;
         _this.length = input.length;
+        _this.comments = [];
         _this.isLookahead = false;
         return _this;
     }
@@ -25008,7 +25152,6 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                 if (this.options.tokens) {
                     this.pushToken(new Token(this.state));
                 }
-                this.state.lastTokStart = this.state.start;
                 this.state.lastTokEndLoc = this.state.endLoc;
                 this.state.lastTokStartLoc = this.state.startLoc;
                 this.nextToken();
@@ -25124,9 +25267,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                 if (strict) {
                     this.state.strictErrors.forEach(function(param) {
                         var _$_param = _sliced_to_array(param, 2), toParseError = _$_param[0], at = _$_param[1];
-                        return _this.raise(toParseError, {
-                            at: at
-                        });
+                        return _this.raise(toParseError, at);
                     });
                     this.state.strictErrors.clear();
                 }
@@ -25159,9 +25300,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                 var start = this.state.pos;
                 var end = this.input.indexOf(commentEnd, start + 2);
                 if (end === -1) {
-                    throw this.raise(Errors.UnterminatedComment, {
-                        at: this.state.curPosition()
-                    });
+                    throw this.raise(Errors.UnterminatedComment, this.state.curPosition());
                 }
                 this.state.pos = end + commentEnd.length;
                 lineBreakG.lastIndex = start + 2;
@@ -25328,16 +25467,12 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                 var nextPos = this.state.pos + 1;
                 var next = this.codePointAtPos(nextPos);
                 if (next >= 48 && next <= 57) {
-                    throw this.raise(Errors.UnexpectedDigitAfterHash, {
-                        at: this.state.curPosition()
-                    });
+                    throw this.raise(Errors.UnexpectedDigitAfterHash, this.state.curPosition());
                 }
                 if (next === 123 || next === 91 && this.hasPlugin("recordAndTuple")) {
                     this.expectPlugin("recordAndTuple");
                     if (this.getPluginOption("recordAndTuple", "syntaxType") === "bar") {
-                        throw this.raise(next === 123 ? Errors.RecordExpressionHashIncorrectStartSyntaxType : Errors.TupleExpressionHashIncorrectStartSyntaxType, {
-                            at: this.state.curPosition()
-                        });
+                        throw this.raise(next === 123 ? Errors.RecordExpressionHashIncorrectStartSyntaxType : Errors.TupleExpressionHashIncorrectStartSyntaxType, this.state.curPosition());
                     }
                     this.state.pos += 2;
                     if (next === 123) {
@@ -25437,9 +25572,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                     }
                     if (this.hasPlugin("recordAndTuple") && next === 125) {
                         if (this.getPluginOption("recordAndTuple", "syntaxType") !== "bar") {
-                            throw this.raise(Errors.RecordExpressionBarIncorrectEndSyntaxType, {
-                                at: this.state.curPosition()
-                            });
+                            throw this.raise(Errors.RecordExpressionBarIncorrectEndSyntaxType, this.state.curPosition());
                         }
                         this.state.pos += 2;
                         this.finishToken(9);
@@ -25447,9 +25580,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                     }
                     if (this.hasPlugin("recordAndTuple") && next === 93) {
                         if (this.getPluginOption("recordAndTuple", "syntaxType") !== "bar") {
-                            throw this.raise(Errors.TupleExpressionBarIncorrectEndSyntaxType, {
-                                at: this.state.curPosition()
-                            });
+                            throw this.raise(Errors.TupleExpressionBarIncorrectEndSyntaxType, this.state.curPosition());
                         }
                         this.state.pos += 2;
                         this.finishToken(4);
@@ -25621,9 +25752,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                     case 91:
                         if (this.hasPlugin("recordAndTuple") && this.input.charCodeAt(this.state.pos + 1) === 124) {
                             if (this.getPluginOption("recordAndTuple", "syntaxType") !== "bar") {
-                                throw this.raise(Errors.TupleExpressionBarIncorrectStartSyntaxType, {
-                                    at: this.state.curPosition()
-                                });
+                                throw this.raise(Errors.TupleExpressionBarIncorrectStartSyntaxType, this.state.curPosition());
                             }
                             this.state.pos += 2;
                             this.finishToken(2);
@@ -25639,9 +25768,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                     case 123:
                         if (this.hasPlugin("recordAndTuple") && this.input.charCodeAt(this.state.pos + 1) === 124) {
                             if (this.getPluginOption("recordAndTuple", "syntaxType") !== "bar") {
-                                throw this.raise(Errors.RecordExpressionBarIncorrectStartSyntaxType, {
-                                    at: this.state.curPosition()
-                                });
+                                throw this.raise(Errors.RecordExpressionBarIncorrectStartSyntaxType, this.state.curPosition());
                             }
                             this.state.pos += 2;
                             this.finishToken(6);
@@ -25745,8 +25872,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                             return;
                         }
                 }
-                throw this.raise(Errors.InvalidOrUnexpectedToken, {
-                    at: this.state.curPosition(),
+                throw this.raise(Errors.InvalidOrUnexpectedToken, this.state.curPosition(), {
                     unexpected: String.fromCodePoint(code2)
                 });
             }
@@ -25768,15 +25894,11 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                 var pos = this.state.pos;
                 for(;; ++pos){
                     if (pos >= this.length) {
-                        throw this.raise(Errors.UnterminatedRegExp, {
-                            at: createPositionWithColumnOffset(startLoc, 1)
-                        });
+                        throw this.raise(Errors.UnterminatedRegExp, createPositionWithColumnOffset(startLoc, 1));
                     }
                     var ch = this.input.charCodeAt(pos);
                     if (isNewLine(ch)) {
-                        throw this.raise(Errors.UnterminatedRegExp, {
-                            at: createPositionWithColumnOffset(startLoc, 1)
-                        });
+                        throw this.raise(Errors.UnterminatedRegExp, createPositionWithColumnOffset(startLoc, 1));
                     }
                     if (escaped) {
                         escaped = false;
@@ -25803,26 +25925,18 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                     if (VALID_REGEX_FLAGS.has(cp)) {
                         if (cp === 118) {
                             if (mods.includes("u")) {
-                                this.raise(Errors.IncompatibleRegExpUVFlags, {
-                                    at: nextPos()
-                                });
+                                this.raise(Errors.IncompatibleRegExpUVFlags, nextPos());
                             }
                         } else if (cp === 117) {
                             if (mods.includes("v")) {
-                                this.raise(Errors.IncompatibleRegExpUVFlags, {
-                                    at: nextPos()
-                                });
+                                this.raise(Errors.IncompatibleRegExpUVFlags, nextPos());
                             }
                         }
                         if (mods.includes(char)) {
-                            this.raise(Errors.DuplicateRegExpFlags, {
-                                at: nextPos()
-                            });
+                            this.raise(Errors.DuplicateRegExpFlags, nextPos());
                         }
                     } else if (isIdentifierChar2(cp) || cp === 92) {
-                        this.raise(Errors.MalformedRegExpFlags, {
-                            at: nextPos()
-                        });
+                        this.raise(Errors.MalformedRegExpFlags, nextPos());
                     } else {
                         break;
                     }
@@ -25853,8 +25967,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                 this.state.pos += 2;
                 var val = this.readInt(radix);
                 if (val == null) {
-                    this.raise(Errors.InvalidDigit, {
-                        at: createPositionWithColumnOffset(startLoc, 2),
+                    this.raise(Errors.InvalidDigit, createPositionWithColumnOffset(startLoc, 2), {
                         radix: radix
                     });
                 }
@@ -25863,14 +25976,10 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                     ++this.state.pos;
                     isBigInt = true;
                 } else if (next === 109) {
-                    throw this.raise(Errors.InvalidDecimal, {
-                        at: startLoc
-                    });
+                    throw this.raise(Errors.InvalidDecimal, startLoc);
                 }
                 if (isIdentifierStart2(this.codePointAtPos(this.state.pos))) {
-                    throw this.raise(Errors.NumberIdentifier, {
-                        at: this.state.curPosition()
-                    });
+                    throw this.raise(Errors.NumberIdentifier, this.state.curPosition());
                 }
                 if (isBigInt) {
                     var str = this.input.slice(startLoc.index, this.state.pos).replace(/[_n]/g, "");
@@ -25891,22 +26000,16 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                 var hasExponent = false;
                 var isOctal = false;
                 if (!startsWithDot && this.readInt(10) === null) {
-                    this.raise(Errors.InvalidNumber, {
-                        at: this.state.curPosition()
-                    });
+                    this.raise(Errors.InvalidNumber, this.state.curPosition());
                 }
                 var hasLeadingZero = this.state.pos - start >= 2 && this.input.charCodeAt(start) === 48;
                 if (hasLeadingZero) {
                     var integer = this.input.slice(start, this.state.pos);
-                    this.recordStrictModeErrors(Errors.StrictOctalLiteral, {
-                        at: startLoc
-                    });
+                    this.recordStrictModeErrors(Errors.StrictOctalLiteral, startLoc);
                     if (!this.state.strict) {
                         var underscorePos = integer.indexOf("_");
                         if (underscorePos > 0) {
-                            this.raise(Errors.ZeroDigitNumericSeparator, {
-                                at: createPositionWithColumnOffset(startLoc, underscorePos)
-                            });
+                            this.raise(Errors.ZeroDigitNumericSeparator, createPositionWithColumnOffset(startLoc, underscorePos));
                         }
                     }
                     isOctal = hasLeadingZero && !/[89]/.test(integer);
@@ -25924,9 +26027,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                         ++this.state.pos;
                     }
                     if (this.readInt(10) === null) {
-                        this.raise(Errors.InvalidOrMissingExponent, {
-                            at: startLoc
-                        });
+                        this.raise(Errors.InvalidOrMissingExponent, startLoc);
                     }
                     isFloat = true;
                     hasExponent = true;
@@ -25934,9 +26035,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                 }
                 if (next === 110) {
                     if (isFloat || hasLeadingZero) {
-                        this.raise(Errors.InvalidBigIntLiteral, {
-                            at: startLoc
-                        });
+                        this.raise(Errors.InvalidBigIntLiteral, startLoc);
                     }
                     ++this.state.pos;
                     isBigInt = true;
@@ -25944,17 +26043,13 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                 if (next === 109) {
                     this.expectPlugin("decimal", this.state.curPosition());
                     if (hasExponent || hasLeadingZero) {
-                        this.raise(Errors.InvalidDecimal, {
-                            at: startLoc
-                        });
+                        this.raise(Errors.InvalidDecimal, startLoc);
                     }
                     ++this.state.pos;
                     isDecimal = true;
                 }
                 if (isIdentifierStart2(this.codePointAtPos(this.state.pos))) {
-                    throw this.raise(Errors.NumberIdentifier, {
-                        at: this.state.curPosition()
-                    });
+                    throw this.raise(Errors.NumberIdentifier, this.state.curPosition());
                 }
                 var str = this.input.slice(start, this.state.pos).replace(/[_mn]/g, "");
                 if (isBigInt) {
@@ -26018,13 +26113,10 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
         },
         {
             key: "recordStrictModeErrors",
-            value: function recordStrictModeErrors(toParseError, param) {
-                var at = param.at;
+            value: function recordStrictModeErrors(toParseError, at) {
                 var index3 = at.index;
                 if (this.state.strict && !this.state.strictErrors.has(index3)) {
-                    this.raise(toParseError, {
-                        at: at
-                    });
+                    this.raise(toParseError, at);
                 } else {
                     this.state.strictErrors.set(index3, [
                         toParseError,
@@ -26053,9 +26145,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                         var escStart = this.state.curPosition();
                         var identifierCheck = this.state.pos === start ? isIdentifierStart2 : isIdentifierChar2;
                         if (this.input.charCodeAt(++this.state.pos) !== 117) {
-                            this.raise(Errors.MissingUnicodeEscape, {
-                                at: this.state.curPosition()
-                            });
+                            this.raise(Errors.MissingUnicodeEscape, this.state.curPosition());
                             chunkStart = this.state.pos - 1;
                             continue;
                         }
@@ -26063,9 +26153,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                         var esc = this.readCodePoint(true);
                         if (esc !== null) {
                             if (!identifierCheck(esc)) {
-                                this.raise(Errors.EscapedCharNotAnIdentifier, {
-                                    at: escStart
-                                });
+                                this.raise(Errors.EscapedCharNotAnIdentifier, escStart);
                             }
                             word += String.fromCodePoint(esc);
                         }
@@ -26094,8 +26182,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
             value: function checkKeywordEscapes() {
                 var type = this.state.type;
                 if (tokenIsKeyword(type) && this.state.containsEsc) {
-                    this.raise(Errors.InvalidEscapedReservedWord, {
-                        at: this.state.startLoc,
+                    this.raise(Errors.InvalidEscapedReservedWord, this.state.startLoc, {
                         reservedWord: tokenLabelName(type)
                     });
                 }
@@ -26103,13 +26190,10 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
         },
         {
             key: "raise",
-            value: function raise(toParseError, raiseProperties) {
-                var at = raiseProperties.at, details = _objectWithoutPropertiesLoose(raiseProperties, _excluded);
+            value: function raise(toParseError, at) {
+                var details = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
                 var loc = _instanceof(at, Position) ? at : at.loc.start;
-                var error = toParseError({
-                    loc: loc,
-                    details: details
-                });
+                var error = toParseError(loc, details);
                 if (!this.options.errorRecovery) throw error;
                 if (!this.isLookahead) this.state.errors.push(error);
                 return error;
@@ -26117,22 +26201,19 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
         },
         {
             key: "raiseOverwrite",
-            value: function raiseOverwrite(toParseError, raiseProperties) {
-                var at = raiseProperties.at, details = _objectWithoutPropertiesLoose(raiseProperties, _excluded2);
+            value: function raiseOverwrite(toParseError, at) {
+                var details = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
                 var loc = _instanceof(at, Position) ? at : at.loc.start;
                 var pos = loc.index;
                 var errors = this.state.errors;
                 for(var i = errors.length - 1; i >= 0; i--){
                     var error = errors[i];
                     if (error.loc.index === pos) {
-                        return errors[i] = toParseError({
-                            loc: loc,
-                            details: details
-                        });
+                        return errors[i] = toParseError(loc, details);
                     }
                     if (error.loc.index < pos) break;
                 }
-                return this.raise(toParseError, raiseProperties);
+                return this.raise(toParseError, at, details);
             }
         },
         {
@@ -26142,9 +26223,8 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
         {
             key: "unexpected",
             value: function unexpected(loc, type) {
-                throw this.raise(Errors.UnexpectedToken, {
-                    expected: type ? tokenLabelName(type) : null,
-                    at: loc != null ? loc : this.state.startLoc
+                throw this.raise(Errors.UnexpectedToken, loc != null ? loc : this.state.startLoc, {
+                    expected: type ? tokenLabelName(type) : null
                 });
             }
         },
@@ -26154,8 +26234,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                 if (this.hasPlugin(pluginName)) {
                     return true;
                 }
-                throw this.raise(Errors.MissingPlugin, {
-                    at: loc != null ? loc : this.state.startLoc,
+                throw this.raise(Errors.MissingPlugin, loc != null ? loc : this.state.startLoc, {
                     missingPlugin: [
                         pluginName
                     ]
@@ -26169,8 +26248,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                 if (!pluginNames.some(function(name) {
                     return _this.hasPlugin(name);
                 })) {
-                    throw this.raise(Errors.MissingOneOfPlugins, {
-                        at: this.state.startLoc,
+                    throw this.raise(Errors.MissingOneOfPlugins, this.state.startLoc, {
                         missingPlugin: pluginNames
                     });
                 }
@@ -26181,9 +26259,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
             value: function errorBuilder(error) {
                 var _this = this;
                 return function(pos, lineStart, curLine) {
-                    _this.raise(error, {
-                        at: buildPosition(pos, lineStart, curLine)
-                    });
+                    _this.raise(error, buildPosition(pos, lineStart, curLine));
                 };
             }
         }
@@ -26233,8 +26309,7 @@ var ClassScopeHandler = /*#__PURE__*/ function() {
                                 current.undefinedPrivateNames.set(name, loc);
                             }
                         } else {
-                            this.parser.raise(Errors.InvalidPrivateFieldResolution, {
-                                at: loc,
+                            this.parser.raise(Errors.InvalidPrivateFieldResolution, loc, {
                                 identifierName: name
                             });
                         }
@@ -26274,8 +26349,7 @@ var ClassScopeHandler = /*#__PURE__*/ function() {
                     }
                 }
                 if (redefined) {
-                    this.parser.raise(Errors.PrivateNameRedeclaration, {
-                        at: loc,
+                    this.parser.raise(Errors.PrivateNameRedeclaration, loc, {
                         identifierName: name
                     });
                 }
@@ -26310,8 +26384,7 @@ var ClassScopeHandler = /*#__PURE__*/ function() {
                 if (classScope) {
                     classScope.undefinedPrivateNames.set(name, loc);
                 } else {
-                    this.parser.raise(Errors.InvalidPrivateFieldResolution, {
-                        at: loc,
+                    this.parser.raise(Errors.InvalidPrivateFieldResolution, loc, {
                         identifierName: name
                     });
                 }
@@ -26357,8 +26430,7 @@ var ArrowHeadParsingScope = /*#__PURE__*/ function(ExpressionScope) {
     _create_class(ArrowHeadParsingScope, [
         {
             key: "recordDeclarationError",
-            value: function recordDeclarationError(ParsingErrorClass, param) {
-                var at = param.at;
+            value: function recordDeclarationError(ParsingErrorClass, at) {
                 var index3 = at.index;
                 this.declarationErrors.set(index3, [
                     ParsingErrorClass,
@@ -26406,11 +26478,8 @@ var ExpressionScopeHandler = /*#__PURE__*/ function() {
         },
         {
             key: "recordParameterInitializerError",
-            value: function recordParameterInitializerError(toParseError, param) {
-                var node = param.at;
-                var origin = {
-                    at: node.loc.start
-                };
+            value: function recordParameterInitializerError(toParseError, node) {
+                var origin = node.loc.start;
                 var stack = this.stack;
                 var i = stack.length - 1;
                 var scope2 = stack[i];
@@ -26427,13 +26496,10 @@ var ExpressionScopeHandler = /*#__PURE__*/ function() {
         },
         {
             key: "recordArrowParameterBindingError",
-            value: function recordArrowParameterBindingError(error, param) {
-                var node = param.at;
+            value: function recordArrowParameterBindingError(error, node) {
                 var stack = this.stack;
                 var scope2 = stack[stack.length - 1];
-                var origin = {
-                    at: node.loc.start
-                };
+                var origin = node.loc.start;
                 if (scope2.isCertainlyParameterDeclaration()) {
                     this.parser.raise(error, origin);
                 } else if (scope2.canBeArrowParameterDeclaration()) {
@@ -26445,16 +26511,13 @@ var ExpressionScopeHandler = /*#__PURE__*/ function() {
         },
         {
             key: "recordAsyncArrowParametersError",
-            value: function recordAsyncArrowParametersError(param) {
-                var at = param.at;
+            value: function recordAsyncArrowParametersError(at) {
                 var stack = this.stack;
                 var i = stack.length - 1;
                 var scope2 = stack[i];
                 while(scope2.canBeArrowParameterDeclaration()){
                     if (scope2.type === 2) {
-                        scope2.recordDeclarationError(Errors.AwaitBindingIdentifier, {
-                            at: at
-                        });
+                        scope2.recordDeclarationError(Errors.AwaitBindingIdentifier, at);
                     }
                     scope2 = stack[--i];
                 }
@@ -26469,9 +26532,7 @@ var ExpressionScopeHandler = /*#__PURE__*/ function() {
                 if (!currentScope.canBeArrowParameterDeclaration()) return;
                 currentScope.iterateErrors(function(param) {
                     var _$_param = _sliced_to_array(param, 2), toParseError = _$_param[0], loc = _$_param[1];
-                    _this.parser.raise(toParseError, {
-                        at: loc
-                    });
+                    _this.parser.raise(toParseError, loc);
                     var i = stack.length - 2;
                     var scope2 = stack[i];
                     while(scope2.canBeArrowParameterDeclaration()){
@@ -26615,9 +26676,7 @@ var UtilParser = /*#__PURE__*/ function(Tokenizer) {
             value: function expectContextual(token, toParseError) {
                 if (!this.eatContextual(token)) {
                     if (toParseError != null) {
-                        throw this.raise(toParseError, {
-                            at: this.state.startLoc
-                        });
+                        throw this.raise(toParseError, this.state.startLoc);
                     }
                     this.unexpected(null, token);
                 }
@@ -26653,9 +26712,7 @@ var UtilParser = /*#__PURE__*/ function(Tokenizer) {
             value: function semicolon() {
                 var allowAsi = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true;
                 if (allowAsi ? this.isLineTerminator() : this.eat(13)) return;
-                this.raise(Errors.MissingSemicolon, {
-                    at: this.state.lastTokEndLoc
-                });
+                this.raise(Errors.MissingSemicolon, this.state.lastTokEndLoc);
             }
         },
         {
@@ -26731,19 +26788,13 @@ var UtilParser = /*#__PURE__*/ function(Tokenizer) {
                     return hasErrors;
                 }
                 if (shorthandAssignLoc != null) {
-                    this.raise(Errors.InvalidCoverInitializedName, {
-                        at: shorthandAssignLoc
-                    });
+                    this.raise(Errors.InvalidCoverInitializedName, shorthandAssignLoc);
                 }
                 if (doubleProtoLoc != null) {
-                    this.raise(Errors.DuplicateProto, {
-                        at: doubleProtoLoc
-                    });
+                    this.raise(Errors.DuplicateProto, doubleProtoLoc);
                 }
                 if (privateKeyLoc != null) {
-                    this.raise(Errors.UnexpectedPrivateField, {
-                        at: privateKeyLoc
-                    });
+                    this.raise(Errors.UnexpectedPrivateField, privateKeyLoc);
                 }
                 if (optionalParametersLoc != null) {
                     this.unexpected(optionalParametersLoc);
@@ -26789,8 +26840,8 @@ var UtilParser = /*#__PURE__*/ function(Tokenizer) {
         {
             key: "initializeScopes",
             value: function initializeScopes() {
-                var inModule = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : this.options.sourceType === "module";
                 var _this = this;
+                var inModule = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : this.options.sourceType === "module";
                 var oldLabels = this.state.labels;
                 this.state.labels = [];
                 var oldExportedIdentifiers = this.exportedIdentifiers;
@@ -26911,7 +26962,8 @@ var NodeUtils = /*#__PURE__*/ function(UtilParser) {
         {
             key: "startNode",
             value: function startNode() {
-                return new Node(this, this.state.start, this.state.startLoc);
+                var loc = this.state.startLoc;
+                return new Node(this, loc.index, loc);
             }
         },
         {
@@ -27184,10 +27236,8 @@ var flow = function(superClass) {
                     var moduloLoc = this.state.startLoc;
                     this.next();
                     this.expectContextual(110);
-                    if (this.state.lastTokStart > moduloLoc.index + 1) {
-                        this.raise(FlowErrors.UnexpectedSpaceBetweenModuloChecks, {
-                            at: moduloLoc
-                        });
+                    if (this.state.lastTokStartLoc.index > moduloLoc.index + 1) {
+                        this.raise(FlowErrors.UnexpectedSpaceBetweenModuloChecks, moduloLoc);
                     }
                     if (this.eat(10)) {
                         node.value = _get(_get_prototype_of(FlowParserMixin.prototype), "parseExpression", this).call(this);
@@ -27272,9 +27322,7 @@ var flow = function(superClass) {
                             return this.flowParseDeclareModuleExports(node);
                         } else {
                             if (insideModule) {
-                                this.raise(FlowErrors.NestedDeclareModule, {
-                                    at: this.state.lastTokStartLoc
-                                });
+                                this.raise(FlowErrors.NestedDeclareModule, this.state.lastTokStartLoc);
                             }
                             return this.flowParseDeclareModule(node);
                         }
@@ -27319,9 +27367,7 @@ var flow = function(superClass) {
                         if (this.match(83)) {
                             this.next();
                             if (!this.isContextual(130) && !this.match(87)) {
-                                this.raise(FlowErrors.InvalidNonTypeImportInDeclareModule, {
-                                    at: this.state.lastTokStartLoc
-                                });
+                                this.raise(FlowErrors.InvalidNonTypeImportInDeclareModule, this.state.lastTokStartLoc);
                             }
                             _get(_get_prototype_of(FlowParserMixin.prototype), "parseImport", this).call(this, bodyNode2);
                         } else {
@@ -27338,21 +27384,15 @@ var flow = function(superClass) {
                     body.forEach(function(bodyElement) {
                         if (isEsModuleType(bodyElement)) {
                             if (kind === "CommonJS") {
-                                _this.raise(FlowErrors.AmbiguousDeclareModuleKind, {
-                                    at: bodyElement
-                                });
+                                _this.raise(FlowErrors.AmbiguousDeclareModuleKind, bodyElement);
                             }
                             kind = "ES";
                         } else if (bodyElement.type === "DeclareModuleExports") {
                             if (hasModuleExport) {
-                                _this.raise(FlowErrors.DuplicateDeclareModuleExports, {
-                                    at: bodyElement
-                                });
+                                _this.raise(FlowErrors.DuplicateDeclareModuleExports, bodyElement);
                             }
                             if (kind === "ES") {
-                                _this.raise(FlowErrors.AmbiguousDeclareModuleKind, {
-                                    at: bodyElement
-                                });
+                                _this.raise(FlowErrors.AmbiguousDeclareModuleKind, bodyElement);
                             }
                             kind = "CommonJS";
                             hasModuleExport = true;
@@ -27378,8 +27418,7 @@ var flow = function(superClass) {
                     } else {
                         if (this.match(75) || this.isLet() || (this.isContextual(130) || this.isContextual(129)) && !insideModule) {
                             var label = this.state.value;
-                            throw this.raise(FlowErrors.UnsupportedDeclareExportKind, {
-                                at: this.state.startLoc,
+                            throw this.raise(FlowErrors.UnsupportedDeclareExportKind, this.state.startLoc, {
                                 unsupportedExportKind: label,
                                 suggestion: exportSuggestions[label]
                             });
@@ -27501,9 +27540,7 @@ var flow = function(superClass) {
                 key: "checkNotUnderscore",
                 value: function checkNotUnderscore(word) {
                     if (word === "_") {
-                        this.raise(FlowErrors.UnexpectedReservedUnderscore, {
-                            at: this.state.startLoc
-                        });
+                        this.raise(FlowErrors.UnexpectedReservedUnderscore, this.state.startLoc);
                     }
                 }
             },
@@ -27511,8 +27548,7 @@ var flow = function(superClass) {
                 key: "checkReservedType",
                 value: function checkReservedType(word, startLoc, declaration) {
                     if (!reservedTypes.has(word)) return;
-                    this.raise(declaration ? FlowErrors.AssignReservedType : FlowErrors.UnexpectedReservedType, {
-                        at: startLoc,
+                    this.raise(declaration ? FlowErrors.AssignReservedType : FlowErrors.UnexpectedReservedType, startLoc, {
                         reservedType: word
                     });
                 }
@@ -27578,9 +27614,7 @@ var flow = function(superClass) {
                         node.default = this.flowParseType();
                     } else {
                         if (requireDefault) {
-                            this.raise(FlowErrors.MissingTypeParamDefault, {
-                                at: nodeStartLoc
-                            });
+                            this.raise(FlowErrors.MissingTypeParamDefault, nodeStartLoc);
                         }
                     }
                     return this.finishNode(node, "TypeParameter");
@@ -27845,9 +27879,7 @@ var flow = function(superClass) {
                         }
                         this.flowObjectTypeSemicolon();
                         if (inexactStartLoc && !this.match(8) && !this.match(9)) {
-                            this.raise(FlowErrors.UnexpectedExplicitInexactInObject, {
-                                at: inexactStartLoc
-                            });
+                            this.raise(FlowErrors.UnexpectedExplicitInexactInObject, inexactStartLoc);
                         }
                     }
                     this.expect(endDelim);
@@ -27866,33 +27898,23 @@ var flow = function(superClass) {
                         var isInexactToken = this.match(12) || this.match(13) || this.match(8) || this.match(9);
                         if (isInexactToken) {
                             if (!allowSpread) {
-                                this.raise(FlowErrors.InexactInsideNonObject, {
-                                    at: this.state.lastTokStartLoc
-                                });
+                                this.raise(FlowErrors.InexactInsideNonObject, this.state.lastTokStartLoc);
                             } else if (!allowInexact) {
-                                this.raise(FlowErrors.InexactInsideExact, {
-                                    at: this.state.lastTokStartLoc
-                                });
+                                this.raise(FlowErrors.InexactInsideExact, this.state.lastTokStartLoc);
                             }
                             if (variance2) {
-                                this.raise(FlowErrors.InexactVariance, {
-                                    at: variance2
-                                });
+                                this.raise(FlowErrors.InexactVariance, variance2);
                             }
                             return null;
                         }
                         if (!allowSpread) {
-                            this.raise(FlowErrors.UnexpectedSpreadType, {
-                                at: this.state.lastTokStartLoc
-                            });
+                            this.raise(FlowErrors.UnexpectedSpreadType, this.state.lastTokStartLoc);
                         }
                         if (protoStartLoc != null) {
                             this.unexpected(protoStartLoc);
                         }
                         if (variance2) {
-                            this.raise(FlowErrors.SpreadVariance, {
-                                at: variance2
-                            });
+                            this.raise(FlowErrors.SpreadVariance, variance2);
                         }
                         node.argument = this.flowParseType();
                         return this.finishNode(node, "ObjectTypeSpreadProperty");
@@ -27915,9 +27937,7 @@ var flow = function(superClass) {
                                 this.flowCheckGetterSetterParams(node);
                             }
                             if (!allowSpread && node.key.name === "constructor" && node.value.this) {
-                                this.raise(FlowErrors.ThisParamBannedInConstructor, {
-                                    at: node.value.this
-                                });
+                                this.raise(FlowErrors.ThisParamBannedInConstructor, node.value.this);
                             }
                         } else {
                             if (kind !== "init") this.unexpected();
@@ -27939,19 +27959,13 @@ var flow = function(superClass) {
                     var paramCount = property.kind === "get" ? 0 : 1;
                     var length = property.value.params.length + (property.value.rest ? 1 : 0);
                     if (property.value.this) {
-                        this.raise(property.kind === "get" ? FlowErrors.GetterMayNotHaveThisParam : FlowErrors.SetterMayNotHaveThisParam, {
-                            at: property.value.this
-                        });
+                        this.raise(property.kind === "get" ? FlowErrors.GetterMayNotHaveThisParam : FlowErrors.SetterMayNotHaveThisParam, property.value.this);
                     }
                     if (length !== paramCount) {
-                        this.raise(property.kind === "get" ? Errors.BadGetterArity : Errors.BadSetterArity, {
-                            at: property
-                        });
+                        this.raise(property.kind === "get" ? Errors.BadGetterArity : Errors.BadSetterArity, property);
                     }
                     if (property.kind === "set" && property.value.rest) {
-                        this.raise(Errors.BadSetterRestParameter, {
-                            at: property
-                        });
+                        this.raise(Errors.BadSetterRestParameter, property);
                     }
                 }
             },
@@ -28024,17 +28038,13 @@ var flow = function(superClass) {
                     var isThis = this.state.type === 78;
                     if (lh.type === 14 || lh.type === 17) {
                         if (isThis && !first) {
-                            this.raise(FlowErrors.ThisParamMustBeFirst, {
-                                at: node
-                            });
+                            this.raise(FlowErrors.ThisParamMustBeFirst, node);
                         }
                         name = this.parseIdentifier(isThis);
                         if (this.eat(17)) {
                             optional = true;
                             if (isThis) {
-                                this.raise(FlowErrors.ThisParamMayNotBeOptional, {
-                                    at: node
-                                });
+                                this.raise(FlowErrors.ThisParamMayNotBeOptional, node);
                             }
                         }
                         typeAnnotation2 = this.flowParseTypeInitialiser();
@@ -28205,9 +28215,7 @@ var flow = function(superClass) {
                                 if (this.match(135)) {
                                     return this.parseLiteralAtNode(-this.state.value, "BigIntLiteralTypeAnnotation", node);
                                 }
-                                throw this.raise(FlowErrors.UnexpectedSubtractionOperand, {
-                                    at: this.state.startLoc
-                                });
+                                throw this.raise(FlowErrors.UnexpectedSubtractionOperand, this.state.startLoc);
                             }
                             this.unexpected();
                             return;
@@ -28403,8 +28411,8 @@ var flow = function(superClass) {
             {
                 key: "parseFunctionBody",
                 value: function parseFunctionBody(node, allowExpressionBody) {
-                    var isMethod3 = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
                     var _this = this;
+                    var isMethod3 = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
                     if (allowExpressionBody) {
                         this.forwardNoArrowParamsConversionAt(node, function() {
                             return _get(_get_prototype_of(FlowParserMixin.prototype), "parseFunctionBody", _this).call(_this, node, true, isMethod3);
@@ -28533,9 +28541,7 @@ var flow = function(superClass) {
                             ref1 = _sliced_to_array(this.getArrowLikeExpressions(consequent), 2), valid = ref1[0], invalid = ref1[1], ref1;
                         }
                         if (failed && valid.length > 1) {
-                            this.raise(FlowErrors.AmbiguousConditionalArrow, {
-                                at: state.startLoc
-                            });
+                            this.raise(FlowErrors.AmbiguousConditionalArrow, state.startLoc);
                         }
                         if (failed && valid.length === 1) {
                             this.state = state;
@@ -28737,13 +28743,9 @@ var flow = function(superClass) {
                     _get(_get_prototype_of(FlowParserMixin.prototype), "parseClassMember", this).call(this, classBody2, member, state);
                     if (member.declare) {
                         if (member.type !== "ClassProperty" && member.type !== "ClassPrivateProperty" && member.type !== "PropertyDefinition") {
-                            this.raise(FlowErrors.DeclareClassElement, {
-                                at: startLoc
-                            });
+                            this.raise(FlowErrors.DeclareClassElement, startLoc);
                         } else if (member.value) {
-                            this.raise(FlowErrors.DeclareClassFieldInitializer, {
-                                at: member.value
-                            });
+                            this.raise(FlowErrors.DeclareClassFieldInitializer, member.value);
                         }
                     }
                 }
@@ -28760,8 +28762,7 @@ var flow = function(superClass) {
                     var word = _get(_get_prototype_of(FlowParserMixin.prototype), "readWord1", this).call(this);
                     var fullWord = "@@" + word;
                     if (!this.isIterator(word) || !this.state.inType) {
-                        this.raise(Errors.InvalidIdentifier, {
-                            at: this.state.curPosition(),
+                        this.raise(Errors.InvalidIdentifier, this.state.curPosition(), {
                             identifierName: fullWord
                         });
                     }
@@ -28829,9 +28830,7 @@ var flow = function(superClass) {
                         var _expr_extra;
                         var expr = exprList[i];
                         if (expr && expr.type === "TypeCastExpression" && !((_expr_extra = expr.extra) === null || _expr_extra === void 0 ? void 0 : _expr_extra.parenthesized) && (exprList.length > 1 || !isParenthesizedExpr)) {
-                            this.raise(FlowErrors.TypeCastInPattern, {
-                                at: expr.typeAnnotation
-                            });
+                            this.raise(FlowErrors.TypeCastInPattern, expr.typeAnnotation);
                         }
                     }
                     return exprList;
@@ -28903,16 +28902,12 @@ var flow = function(superClass) {
                     if (method.params && isConstructor) {
                         var params = method.params;
                         if (params.length > 0 && this.isThisParam(params[0])) {
-                            this.raise(FlowErrors.ThisParamBannedInConstructor, {
-                                at: method
-                            });
+                            this.raise(FlowErrors.ThisParamBannedInConstructor, method);
                         }
                     } else if (method.type === "MethodDefinition" && isConstructor && method.value.params) {
                         var params1 = method.value.params;
                         if (params1.length > 0 && this.isThisParam(params1[0])) {
-                            this.raise(FlowErrors.ThisParamBannedInConstructor, {
-                                at: method
-                            });
+                            this.raise(FlowErrors.ThisParamBannedInConstructor, method);
                         }
                     }
                 }
@@ -28961,13 +28956,9 @@ var flow = function(superClass) {
                     if (params.length > 0) {
                         var param = params[0];
                         if (this.isThisParam(param) && method.kind === "get") {
-                            this.raise(FlowErrors.GetterMayNotHaveThisParam, {
-                                at: param
-                            });
+                            this.raise(FlowErrors.GetterMayNotHaveThisParam, param);
                         } else if (this.isThisParam(param)) {
-                            this.raise(FlowErrors.SetterMayNotHaveThisParam, {
-                                at: param
-                            });
+                            this.raise(FlowErrors.SetterMayNotHaveThisParam, param);
                         }
                     }
                 }
@@ -29002,28 +28993,20 @@ var flow = function(superClass) {
                 value: function parseAssignableListItemTypes(param) {
                     if (this.eat(17)) {
                         if (param.type !== "Identifier") {
-                            this.raise(FlowErrors.PatternIsOptional, {
-                                at: param
-                            });
+                            this.raise(FlowErrors.PatternIsOptional, param);
                         }
                         if (this.isThisParam(param)) {
-                            this.raise(FlowErrors.ThisParamMayNotBeOptional, {
-                                at: param
-                            });
+                            this.raise(FlowErrors.ThisParamMayNotBeOptional, param);
                         }
                         param.optional = true;
                     }
                     if (this.match(14)) {
                         param.typeAnnotation = this.flowParseTypeAnnotation();
                     } else if (this.isThisParam(param)) {
-                        this.raise(FlowErrors.ThisParamAnnotationRequired, {
-                            at: param
-                        });
+                        this.raise(FlowErrors.ThisParamAnnotationRequired, param);
                     }
                     if (this.match(29) && this.isThisParam(param)) {
-                        this.raise(FlowErrors.ThisParamNoDefault, {
-                            at: param
-                        });
+                        this.raise(FlowErrors.ThisParamNoDefault, param);
                     }
                     this.resetEndLocation(param);
                     return param;
@@ -29034,9 +29017,7 @@ var flow = function(superClass) {
                 value: function parseMaybeDefault(startLoc, left) {
                     var node = _get(_get_prototype_of(FlowParserMixin.prototype), "parseMaybeDefault", this).call(this, startLoc, left);
                     if (node.type === "AssignmentPattern" && node.typeAnnotation && node.right.start < node.typeAnnotation.start) {
-                        this.raise(FlowErrors.TypeBeforeInitializer, {
-                            at: node.typeAnnotation
-                        });
+                        this.raise(FlowErrors.TypeBeforeInitializer, node.typeAnnotation);
                     }
                     return node;
                 }
@@ -29046,9 +29027,7 @@ var flow = function(superClass) {
                 value: function checkImportReflection(node) {
                     _get(_get_prototype_of(FlowParserMixin.prototype), "checkImportReflection", this).call(this, node);
                     if (node.module && node.importKind !== "value") {
-                        this.raise(FlowErrors.ImportReflectionHasImportType, {
-                            at: node.specifiers[0].loc.start
-                        });
+                        this.raise(FlowErrors.ImportReflectionHasImportType, node.specifiers[0].loc.start);
                     }
                 }
             },
@@ -29116,8 +29095,7 @@ var flow = function(superClass) {
                             specifier.importKind = specifierTypeKind;
                         } else {
                             if (importedIsString) {
-                                throw this.raise(Errors.ImportBindingIsString, {
-                                    at: specifier,
+                                throw this.raise(Errors.ImportBindingIsString, specifier, {
                                     importName: firstIdent.value
                                 });
                             }
@@ -29133,9 +29111,7 @@ var flow = function(superClass) {
                     }
                     var specifierIsTypeImport = hasTypeImportKind(specifier);
                     if (isInTypeOnlyImport && specifierIsTypeImport) {
-                        this.raise(FlowErrors.ImportTypeShorthandOnlyInPureImport, {
-                            at: specifier
-                        });
+                        this.raise(FlowErrors.ImportTypeShorthandOnlyInPureImport, specifier);
                     }
                     if (isInTypeOnlyImport || specifierIsTypeImport) {
                         this.checkReservedType(specifier.local.name, specifier.local.loc.start, true);
@@ -29235,9 +29211,7 @@ var flow = function(superClass) {
                         if (arrow.node && this.maybeUnwrapTypeCastExpression(arrow.node).type === "ArrowFunctionExpression") {
                             if (!arrow.error && !arrow.aborted) {
                                 if (arrow.node.async) {
-                                    this.raise(FlowErrors.UnexpectedTypeParameterBeforeAsyncArrowFunction, {
-                                        at: typeParameters
-                                    });
+                                    this.raise(FlowErrors.UnexpectedTypeParameterBeforeAsyncArrowFunction, typeParameters);
                                 }
                                 return arrow.node;
                             }
@@ -29253,9 +29227,7 @@ var flow = function(superClass) {
                         }
                         if (jsx2 === null || jsx2 === void 0 ? void 0 : jsx2.thrown) throw jsx2.error;
                         if (arrow.thrown) throw arrow.error;
-                        throw this.raise(FlowErrors.UnexpectedTokenAfterTypeParameter, {
-                            at: typeParameters
-                        });
+                        throw this.raise(FlowErrors.UnexpectedTokenAfterTypeParameter, typeParameters);
                     }
                     return _get(_get_prototype_of(FlowParserMixin.prototype), "parseMaybeAssign", this).call(this, refExpressionErrors, afterLeftParse);
                 }
@@ -29308,9 +29280,7 @@ var flow = function(superClass) {
                     }
                     for(var i = 0; i < node.params.length; i++){
                         if (this.isThisParam(node.params[i]) && i > 0) {
-                            this.raise(FlowErrors.ThisParamMustBeFirst, {
-                                at: node.params[i]
-                            });
+                            this.raise(FlowErrors.ThisParamMustBeFirst, node.params[i]);
                         }
                     }
                     _get(_get_prototype_of(FlowParserMixin.prototype), "checkParams", this).call(this, node, allowDuplicates, isArrowFunction, strictModeChanged);
@@ -29445,9 +29415,7 @@ var flow = function(superClass) {
                 value: function parseTopLevel(file2, program3) {
                     var fileNode = _get(_get_prototype_of(FlowParserMixin.prototype), "parseTopLevel", this).call(this, file2, program3);
                     if (this.state.hasFlowComment) {
-                        this.raise(FlowErrors.UnterminatedFlowComment, {
-                            at: this.state.curPosition()
-                        });
+                        this.raise(FlowErrors.UnterminatedFlowComment, this.state.curPosition());
                     }
                     return fileNode;
                 }
@@ -29457,9 +29425,7 @@ var flow = function(superClass) {
                 value: function skipBlockComment() {
                     if (this.hasPlugin("flowComments") && this.skipFlowComment()) {
                         if (this.state.hasFlowComment) {
-                            throw this.raise(FlowErrors.NestedFlowComment, {
-                                at: this.state.startLoc
-                            });
+                            throw this.raise(FlowErrors.NestedFlowComment, this.state.startLoc);
                         }
                         this.hasFlowCommentCompletion();
                         var commentSkip = this.skipFlowComment();
@@ -29502,9 +29468,7 @@ var flow = function(superClass) {
                 value: function hasFlowCommentCompletion() {
                     var end = this.input.indexOf("*/", this.state.pos);
                     if (end === -1) {
-                        throw this.raise(Errors.UnterminatedComment, {
-                            at: this.state.curPosition()
-                        });
+                        throw this.raise(Errors.UnterminatedComment, this.state.curPosition());
                     }
                 }
             },
@@ -29512,8 +29476,7 @@ var flow = function(superClass) {
                 key: "flowEnumErrorBooleanMemberNotInitialized",
                 value: function flowEnumErrorBooleanMemberNotInitialized(loc, param) {
                     var enumName = param.enumName, memberName = param.memberName;
-                    this.raise(FlowErrors.EnumBooleanMemberNotInitialized, {
-                        at: loc,
+                    this.raise(FlowErrors.EnumBooleanMemberNotInitialized, loc, {
                         memberName: memberName,
                         enumName: enumName
                     });
@@ -29522,30 +29485,19 @@ var flow = function(superClass) {
             {
                 key: "flowEnumErrorInvalidMemberInitializer",
                 value: function flowEnumErrorInvalidMemberInitializer(loc, enumContext) {
-                    return this.raise(!enumContext.explicitType ? FlowErrors.EnumInvalidMemberInitializerUnknownType : enumContext.explicitType === "symbol" ? FlowErrors.EnumInvalidMemberInitializerSymbolType : FlowErrors.EnumInvalidMemberInitializerPrimaryType, Object.assign({
-                        at: loc
-                    }, enumContext));
+                    return this.raise(!enumContext.explicitType ? FlowErrors.EnumInvalidMemberInitializerUnknownType : enumContext.explicitType === "symbol" ? FlowErrors.EnumInvalidMemberInitializerSymbolType : FlowErrors.EnumInvalidMemberInitializerPrimaryType, loc, enumContext);
                 }
             },
             {
                 key: "flowEnumErrorNumberMemberNotInitialized",
-                value: function flowEnumErrorNumberMemberNotInitialized(loc, param) {
-                    var enumName = param.enumName, memberName = param.memberName;
-                    this.raise(FlowErrors.EnumNumberMemberNotInitialized, {
-                        at: loc,
-                        enumName: enumName,
-                        memberName: memberName
-                    });
+                value: function flowEnumErrorNumberMemberNotInitialized(loc, details) {
+                    this.raise(FlowErrors.EnumNumberMemberNotInitialized, loc, details);
                 }
             },
             {
                 key: "flowEnumErrorStringMemberInconsistentlyInitialized",
-                value: function flowEnumErrorStringMemberInconsistentlyInitialized(node, param) {
-                    var enumName = param.enumName;
-                    this.raise(FlowErrors.EnumStringMemberInconsistentlyInitialized, {
-                        at: node,
-                        enumName: enumName
-                    });
+                value: function flowEnumErrorStringMemberInconsistentlyInitialized(node, details) {
+                    this.raise(FlowErrors.EnumStringMemberInconsistentlyInitialized, node, details);
                 }
             },
             {
@@ -29662,16 +29614,14 @@ var flow = function(superClass) {
                             continue;
                         }
                         if (/^[a-z]/.test(memberName)) {
-                            this.raise(FlowErrors.EnumInvalidMemberName, {
-                                at: id,
+                            this.raise(FlowErrors.EnumInvalidMemberName, id, {
                                 memberName: memberName,
                                 suggestion: memberName[0].toUpperCase() + memberName.slice(1),
                                 enumName: enumName
                             });
                         }
                         if (seenNames.has(memberName)) {
-                            this.raise(FlowErrors.EnumDuplicateMemberName, {
-                                at: id,
+                            this.raise(FlowErrors.EnumDuplicateMemberName, id, {
                                 memberName: memberName,
                                 enumName: enumName
                             });
@@ -29798,16 +29748,14 @@ var flow = function(superClass) {
                     var enumName = param.enumName;
                     if (!this.eatContextual(102)) return null;
                     if (!tokenIsIdentifier(this.state.type)) {
-                        throw this.raise(FlowErrors.EnumInvalidExplicitTypeUnknownSupplied, {
-                            at: this.state.startLoc,
+                        throw this.raise(FlowErrors.EnumInvalidExplicitTypeUnknownSupplied, this.state.startLoc, {
                             enumName: enumName
                         });
                     }
                     var value1 = this.state.value;
                     this.next();
                     if (value1 !== "boolean" && value1 !== "number" && value1 !== "string" && value1 !== "symbol") {
-                        this.raise(FlowErrors.EnumInvalidExplicitType, {
-                            at: this.state.startLoc,
+                        this.raise(FlowErrors.EnumInvalidExplicitType, this.state.startLoc, {
                             enumName: enumName,
                             invalidEnumType: value1
                         });
@@ -29927,8 +29875,7 @@ var flow = function(superClass) {
                                     this.expect(8);
                                     return this.finishNode(node, "EnumNumberBody");
                                 } else {
-                                    this.raise(FlowErrors.EnumInconsistentMemberValues, {
-                                        at: nameLoc,
+                                    this.raise(FlowErrors.EnumInconsistentMemberValues, nameLoc, {
                                         enumName: enumName
                                     });
                                     return empty();
@@ -30272,9 +30219,7 @@ var jsx = function(superClass) {
                     var chunkStart = this.state.pos;
                     for(;;){
                         if (this.state.pos >= this.length) {
-                            throw this.raise(JsxErrors.UnterminatedJsxContent, {
-                                at: this.state.startLoc
-                            });
+                            throw this.raise(JsxErrors.UnterminatedJsxContent, this.state.startLoc);
                         }
                         var ch = this.input.charCodeAt(this.state.pos);
                         switch(ch){
@@ -30300,8 +30245,7 @@ var jsx = function(superClass) {
                             case 62:
                             case 125:
                                 {
-                                    this.raise(JsxErrors.UnexpectedToken, {
-                                        at: this.state.curPosition(),
+                                    this.raise(JsxErrors.UnexpectedToken, this.state.curPosition(), {
                                         unexpected: this.input[this.state.pos],
                                         HTMLEntity: ch === 125 ? "&rbrace;" : "&gt;"
                                     });
@@ -30342,9 +30286,7 @@ var jsx = function(superClass) {
                     var chunkStart = ++this.state.pos;
                     for(;;){
                         if (this.state.pos >= this.length) {
-                            throw this.raise(Errors.UnterminatedString, {
-                                at: this.state.startLoc
-                            });
+                            throw this.raise(Errors.UnterminatedString, this.state.startLoc);
                         }
                         var ch = this.input.charCodeAt(this.state.pos);
                         if (ch === quote) break;
@@ -30465,18 +30407,14 @@ var jsx = function(superClass) {
                             this.next();
                             node = this.jsxParseExpressionContainer(node, types.j_oTag);
                             if (node.expression.type === "JSXEmptyExpression") {
-                                this.raise(JsxErrors.AttributeIsEmpty, {
-                                    at: node
-                                });
+                                this.raise(JsxErrors.AttributeIsEmpty, node);
                             }
                             return node;
                         case 142:
                         case 133:
                             return this.parseExprAtom();
                         default:
-                            throw this.raise(JsxErrors.UnsupportedJsxValue, {
-                                at: this.state.startLoc
-                            });
+                            throw this.raise(JsxErrors.UnsupportedJsxValue, this.state.startLoc);
                     }
                 }
             },
@@ -30508,9 +30446,7 @@ var jsx = function(superClass) {
                         {
                             var _expression2_extra;
                             if (expression2.type === "SequenceExpression" && !((_expression2_extra = expression2.extra) === null || _expression2_extra === void 0 ? void 0 : _expression2_extra.parenthesized)) {
-                                this.raise(JsxErrors.UnexpectedSequenceExpression, {
-                                    at: expression2.expressions[1]
-                                });
+                                this.raise(JsxErrors.UnexpectedSequenceExpression, expression2.expressions[1]);
                             }
                         }
                         node.expression = expression2;
@@ -30615,18 +30551,14 @@ var jsx = function(superClass) {
                             }
                         }
                         if (isFragment(openingElement) && !isFragment(closingElement) && closingElement !== null) {
-                            this.raise(JsxErrors.MissingClosingTagFragment, {
-                                at: closingElement
-                            });
+                            this.raise(JsxErrors.MissingClosingTagFragment, closingElement);
                         } else if (!isFragment(openingElement) && isFragment(closingElement)) {
-                            this.raise(JsxErrors.MissingClosingTagElement, {
-                                at: closingElement,
+                            this.raise(JsxErrors.MissingClosingTagElement, closingElement, {
                                 openingTagName: getQualifiedJSXName(openingElement.name)
                             });
                         } else if (!isFragment(openingElement) && !isFragment(closingElement)) {
                             if (getQualifiedJSXName(closingElement.name) !== getQualifiedJSXName(openingElement.name)) {
-                                this.raise(JsxErrors.MissingClosingTagElement, {
-                                    at: closingElement,
+                                this.raise(JsxErrors.MissingClosingTagElement, closingElement, {
                                     openingTagName: getQualifiedJSXName(openingElement.name)
                                 });
                             }
@@ -30641,9 +30573,7 @@ var jsx = function(superClass) {
                     }
                     node.children = children;
                     if (this.match(47)) {
-                        throw this.raise(JsxErrors.UnwrappedAdjacentJSXElements, {
-                            at: this.state.startLoc
-                        });
+                        throw this.raise(JsxErrors.UnwrappedAdjacentJSXElements, this.state.startLoc);
                     }
                     return isFragment(openingElement) ? this.finishNode(node, "JSXFragment") : this.finishNode(node, "JSXElement");
                 }
@@ -30754,11 +30684,7 @@ var TypeScriptScope = /*#__PURE__*/ function(Scope) {
         _this = _super.call.apply(_super, [
             this
         ].concat(Array.prototype.slice.call(arguments)));
-        __publicField(_assert_this_initialized(_this), "types", /* @__PURE__ */ new Set());
-        __publicField(_assert_this_initialized(_this), "enums", /* @__PURE__ */ new Set());
-        __publicField(_assert_this_initialized(_this), "constEnums", /* @__PURE__ */ new Set());
-        __publicField(_assert_this_initialized(_this), "classes", /* @__PURE__ */ new Set());
-        __publicField(_assert_this_initialized(_this), "exportOnlyBindings", /* @__PURE__ */ new Set());
+        __publicField(_assert_this_initialized(_this), "tsNames", /* @__PURE__ */ new Map());
         return _this;
     }
     return TypeScriptScope;
@@ -30823,8 +30749,7 @@ var TypeScriptScopeHandler = /*#__PURE__*/ function(ScopeHandler) {
             value: function declareName(name, bindingType, loc) {
                 if (bindingType & 4096) {
                     if (this.hasImport(name, true)) {
-                        this.parser.raise(Errors.VarRedeclaration, {
-                            at: loc,
+                        this.parser.raise(Errors.VarRedeclaration, loc, {
                             identifierName: name
                         });
                     }
@@ -30832,9 +30757,10 @@ var TypeScriptScopeHandler = /*#__PURE__*/ function(ScopeHandler) {
                     return;
                 }
                 var scope2 = this.currentScope();
+                var type = scope2.tsNames.get(name) || 0;
                 if (bindingType & 1024) {
                     this.maybeExportDefined(scope2, name);
-                    scope2.exportOnlyBindings.add(name);
+                    scope2.tsNames.set(name, type | 16);
                     return;
                 }
                 _get(_get_prototype_of(TypeScriptScopeHandler.prototype), "declareName", this).call(this, name, bindingType, loc);
@@ -30843,34 +30769,40 @@ var TypeScriptScopeHandler = /*#__PURE__*/ function(ScopeHandler) {
                         this.checkRedeclarationInScope(scope2, name, bindingType, loc);
                         this.maybeExportDefined(scope2, name);
                     }
-                    scope2.types.add(name);
+                    type = type | 1;
+                }
+                if (bindingType & 256) {
+                    type = type | 2;
                 }
-                if (bindingType & 256) scope2.enums.add(name);
                 if (bindingType & 512) {
-                    scope2.constEnums.add(name);
+                    type = type | 4;
                 }
-                if (bindingType & 128) scope2.classes.add(name);
+                if (bindingType & 128) {
+                    type = type | 8;
+                }
+                if (type) scope2.tsNames.set(name, type);
             }
         },
         {
             key: "isRedeclaredInScope",
             value: function isRedeclaredInScope(scope2, name, bindingType) {
-                if (scope2.enums.has(name)) {
+                var type = scope2.tsNames.get(name);
+                if ((type & 2) > 0) {
                     if (bindingType & 256) {
                         var isConst = !!(bindingType & 512);
-                        var wasConst = scope2.constEnums.has(name);
+                        var wasConst = (type & 4) > 0;
                         return isConst !== wasConst;
                     }
                     return true;
                 }
-                if (bindingType & 128 && scope2.classes.has(name)) {
-                    if (scope2.lexical.has(name)) {
+                if (bindingType & 128 && (type & 8) > 0) {
+                    if (scope2.names.get(name) & 2) {
                         return !!(bindingType & 1);
                     } else {
                         return false;
                     }
                 }
-                if (bindingType & 2 && scope2.types.has(name)) {
+                if (bindingType & 2 && (type & 1) > 0) {
                     return true;
                 }
                 return _get(_get_prototype_of(TypeScriptScopeHandler.prototype), "isRedeclaredInScope", this).call(this, scope2, name, bindingType);
@@ -30884,7 +30816,10 @@ var TypeScriptScopeHandler = /*#__PURE__*/ function(ScopeHandler) {
                 var len = this.scopeStack.length;
                 for(var i = len - 1; i >= 0; i--){
                     var scope2 = this.scopeStack[i];
-                    if (scope2.types.has(name) || scope2.exportOnlyBindings.has(name)) return;
+                    var type = scope2.tsNames.get(name);
+                    if ((type & 1) > 0 || (type & 16) > 0) {
+                        return;
+                    }
                 }
                 _get(_get_prototype_of(TypeScriptScopeHandler.prototype), "checkLocalExport", this).call(this, id);
             }
@@ -30917,18 +30852,12 @@ var LValParser = /*#__PURE__*/ function(NodeUtils) {
                     parenthesized = unwrapParenthesizedExpression(node);
                     if (isLHS) {
                         if (parenthesized.type === "Identifier") {
-                            this.expressionScope.recordArrowParameterBindingError(Errors.InvalidParenthesizedAssignment, {
-                                at: node
-                            });
+                            this.expressionScope.recordArrowParameterBindingError(Errors.InvalidParenthesizedAssignment, node);
                         } else if (parenthesized.type !== "MemberExpression" && !this.isOptionalMemberExpression(parenthesized)) {
-                            this.raise(Errors.InvalidParenthesizedAssignment, {
-                                at: node
-                            });
+                            this.raise(Errors.InvalidParenthesizedAssignment, node);
                         }
                     } else {
-                        this.raise(Errors.InvalidParenthesizedAssignment, {
-                            at: node
-                        });
+                        this.raise(Errors.InvalidParenthesizedAssignment, node);
                     }
                 }
                 switch(node.type){
@@ -30946,9 +30875,7 @@ var LValParser = /*#__PURE__*/ function(NodeUtils) {
                             var isLast = i === last2;
                             this.toAssignableObjectExpressionProp(prop, isLast, isLHS);
                             if (isLast && prop.type === "RestElement" && ((_node_extra1 = node.extra) === null || _node_extra1 === void 0 ? void 0 : _node_extra1.trailingCommaLoc)) {
-                                this.raise(Errors.RestTrailingComma, {
-                                    at: node.extra.trailingCommaLoc
-                                });
+                                this.raise(Errors.RestTrailingComma, node.extra.trailingCommaLoc);
                             }
                         }
                         break;
@@ -30972,9 +30899,7 @@ var LValParser = /*#__PURE__*/ function(NodeUtils) {
                         break;
                     case "AssignmentExpression":
                         if (node.operator !== "=") {
-                            this.raise(Errors.MissingEqInAssignment, {
-                                at: node.left.loc.end
-                            });
+                            this.raise(Errors.MissingEqInAssignment, node.left.loc.end);
                         }
                         node.type = "AssignmentPattern";
                         delete node.operator;
@@ -30990,18 +30915,14 @@ var LValParser = /*#__PURE__*/ function(NodeUtils) {
             key: "toAssignableObjectExpressionProp",
             value: function toAssignableObjectExpressionProp(prop, isLast, isLHS) {
                 if (prop.type === "ObjectMethod") {
-                    this.raise(prop.kind === "get" || prop.kind === "set" ? Errors.PatternHasAccessor : Errors.PatternHasMethod, {
-                        at: prop.key
-                    });
+                    this.raise(prop.kind === "get" || prop.kind === "set" ? Errors.PatternHasAccessor : Errors.PatternHasMethod, prop.key);
                 } else if (prop.type === "SpreadElement") {
                     prop.type = "RestElement";
                     var arg = prop.argument;
                     this.checkToRestConversion(arg, false);
                     this.toAssignable(arg, isLHS);
                     if (!isLast) {
-                        this.raise(Errors.RestTrailingComma, {
-                            at: prop
-                        });
+                        this.raise(Errors.RestTrailingComma, prop);
                     }
                 } else {
                     this.toAssignable(prop, isLHS);
@@ -31025,13 +30946,9 @@ var LValParser = /*#__PURE__*/ function(NodeUtils) {
                     }
                     if (elt.type === "RestElement") {
                         if (i < end) {
-                            this.raise(Errors.RestTrailingComma, {
-                                at: elt
-                            });
+                            this.raise(Errors.RestTrailingComma, elt);
                         } else if (trailingCommaLoc) {
-                            this.raise(Errors.RestTrailingComma, {
-                                at: trailingCommaLoc
-                            });
+                            this.raise(Errors.RestTrailingComma, trailingCommaLoc);
                         }
                     }
                 }
@@ -31169,9 +31086,7 @@ var LValParser = /*#__PURE__*/ function(NodeUtils) {
                     } else {
                         var decorators = [];
                         if (this.match(26) && this.hasPlugin("decorators")) {
-                            this.raise(Errors.UnsupportedParameterDecorator, {
-                                at: this.state.startLoc
-                            });
+                            this.raise(Errors.UnsupportedParameterDecorator, this.state.startLoc);
                         }
                         while(this.match(26)){
                             decorators.push(this.parseDecorator());
@@ -31270,16 +31185,13 @@ var LValParser = /*#__PURE__*/ function(NodeUtils) {
                     if (isOptionalMemberExpression3) {
                         this.expectPlugin("optionalChainingAssign", expression2.loc.start);
                         if (ancestor.type !== "AssignmentExpression") {
-                            this.raise(Errors.InvalidLhsOptionalChaining, {
-                                at: expression2,
+                            this.raise(Errors.InvalidLhsOptionalChaining, expression2, {
                                 ancestor: ancestor
                             });
                         }
                     }
                     if (binding !== 64) {
-                        this.raise(Errors.InvalidPropertyBindingPattern, {
-                            at: expression2
-                        });
+                        this.raise(Errors.InvalidPropertyBindingPattern, expression2);
                     }
                     return;
                 }
@@ -31288,9 +31200,7 @@ var LValParser = /*#__PURE__*/ function(NodeUtils) {
                     var name = expression2.name;
                     if (checkClashes) {
                         if (checkClashes.has(name)) {
-                            this.raise(Errors.ParamDupe, {
-                                at: expression2
-                            });
+                            this.raise(Errors.ParamDupe, expression2);
                         } else {
                             checkClashes.add(name);
                         }
@@ -31301,8 +31211,7 @@ var LValParser = /*#__PURE__*/ function(NodeUtils) {
                 if (validity === true) return;
                 if (validity === false) {
                     var ParseErrorClass = binding === 64 ? Errors.InvalidLhs : Errors.InvalidLhsBinding;
-                    this.raise(ParseErrorClass, {
-                        at: expression2,
+                    this.raise(ParseErrorClass, expression2, {
                         ancestor: ancestor
                     });
                     return;
@@ -31350,21 +31259,17 @@ var LValParser = /*#__PURE__*/ function(NodeUtils) {
                 var strictModeChanged = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
                 if (this.state.strict && (strictModeChanged ? isStrictBindReservedWord(at.name, this.inModule) : isStrictBindOnlyReservedWord(at.name))) {
                     if (bindingType === 64) {
-                        this.raise(Errors.StrictEvalArguments, {
-                            at: at,
+                        this.raise(Errors.StrictEvalArguments, at, {
                             referenceName: at.name
                         });
                     } else {
-                        this.raise(Errors.StrictEvalArgumentsBinding, {
-                            at: at,
+                        this.raise(Errors.StrictEvalArgumentsBinding, at, {
                             bindingName: at.name
                         });
                     }
                 }
                 if (bindingType & 8192 && at.name === "let") {
-                    this.raise(Errors.LetInLexicalBinding, {
-                        at: at
-                    });
+                    this.raise(Errors.LetInLexicalBinding, at);
                 }
                 if (!(bindingType & 64)) {
                     this.declareNameFromIdentifier(at, bindingType);
@@ -31391,9 +31296,7 @@ var LValParser = /*#__PURE__*/ function(NodeUtils) {
                     case "ObjectExpression":
                         if (allowPattern) break;
                     default:
-                        this.raise(Errors.InvalidRestAssignmentPattern, {
-                            at: node
-                        });
+                        this.raise(Errors.InvalidRestAssignmentPattern, node);
                 }
             }
         },
@@ -31403,9 +31306,7 @@ var LValParser = /*#__PURE__*/ function(NodeUtils) {
                 if (!this.match(12)) {
                     return false;
                 }
-                this.raise(this.lookaheadCharCode() === close ? Errors.RestTrailingComma : Errors.ElementAfterRest, {
-                    at: this.state.startLoc
-                });
+                this.raise(this.lookaheadCharCode() === close ? Errors.RestTrailingComma : Errors.ElementAfterRest, this.state.startLoc);
                 return true;
             }
         }
@@ -31670,12 +31571,11 @@ var typescript = function(superClass) {
             {
                 key: "tsParseModifiers",
                 value: function tsParseModifiers(param, modified) {
-                    var allowedModifiers = param.allowedModifiers, disallowedModifiers = param.disallowedModifiers, stopOnStartOfClassStaticBlock = param.stopOnStartOfClassStaticBlock, _param_errorTemplate = param.errorTemplate, errorTemplate = _param_errorTemplate === void 0 ? TSErrors.InvalidModifierOnTypeMember : _param_errorTemplate;
                     var _this = this;
+                    var allowedModifiers = param.allowedModifiers, disallowedModifiers = param.disallowedModifiers, stopOnStartOfClassStaticBlock = param.stopOnStartOfClassStaticBlock, _param_errorTemplate = param.errorTemplate, errorTemplate = _param_errorTemplate === void 0 ? TSErrors.InvalidModifierOnTypeMember : _param_errorTemplate;
                     var enforceOrder = function(loc, modifier, before, after) {
                         if (modifier === before && modified[after]) {
-                            _this.raise(TSErrors.InvalidModifiersOrder, {
-                                at: loc,
+                            _this.raise(TSErrors.InvalidModifiersOrder, loc, {
                                 orderedModifiers: [
                                     before,
                                     after
@@ -31685,8 +31585,7 @@ var typescript = function(superClass) {
                     };
                     var incompatible = function(loc, modifier, mod1, mod2) {
                         if (modified[mod1] && modifier === mod2 || modified[mod2] && modifier === mod1) {
-                            _this.raise(TSErrors.IncompatibleModifiers, {
-                                at: loc,
+                            _this.raise(TSErrors.IncompatibleModifiers, loc, {
                                 modifiers: [
                                     mod1,
                                     mod2
@@ -31700,8 +31599,7 @@ var typescript = function(superClass) {
                         if (!modifier) break;
                         if (tsIsAccessModifier(modifier)) {
                             if (modified.accessibility) {
-                                this.raise(TSErrors.DuplicateAccessibilityModifier, {
-                                    at: startLoc,
+                                this.raise(TSErrors.DuplicateAccessibilityModifier, startLoc, {
                                     modifier: modifier
                                 });
                             } else {
@@ -31712,8 +31610,7 @@ var typescript = function(superClass) {
                             }
                         } else if (tsIsVarianceAnnotations(modifier)) {
                             if (modified[modifier]) {
-                                this.raise(TSErrors.DuplicateModifier, {
-                                    at: startLoc,
+                                this.raise(TSErrors.DuplicateModifier, startLoc, {
                                     modifier: modifier
                                 });
                             }
@@ -31721,8 +31618,7 @@ var typescript = function(superClass) {
                             enforceOrder(startLoc, modifier, "in", "out");
                         } else {
                             if (Object.hasOwnProperty.call(modified, modifier)) {
-                                this.raise(TSErrors.DuplicateModifier, {
-                                    at: startLoc,
+                                this.raise(TSErrors.DuplicateModifier, startLoc, {
                                     modifier: modifier
                                 });
                             } else {
@@ -31736,8 +31632,7 @@ var typescript = function(superClass) {
                             modified[modifier] = true;
                         }
                         if (disallowedModifiers === null || disallowedModifiers === void 0 ? void 0 : disallowedModifiers.includes(modifier)) {
-                            this.raise(errorTemplate, {
-                                at: startLoc,
+                            this.raise(errorTemplate, startLoc, {
                                 modifier: modifier
                             });
                         }
@@ -31792,7 +31687,7 @@ var typescript = function(superClass) {
                         }
                         result.push(element);
                         if (this.eat(12)) {
-                            trailingCommaPos = this.state.lastTokStart;
+                            trailingCommaPos = this.state.lastTokStartLoc.index;
                             continue;
                         }
                         if (this.tsIsListTerminator(kind)) {
@@ -31835,9 +31730,7 @@ var typescript = function(superClass) {
                     this.expect(83);
                     this.expect(10);
                     if (!this.match(133)) {
-                        this.raise(TSErrors.UnsupportedImportTypeArgument, {
-                            at: this.state.startLoc
-                        });
+                        this.raise(TSErrors.UnsupportedImportTypeArgument, this.state.startLoc);
                     }
                     node.argument = _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseExprAtom", this).call(this);
                     this.expect(11);
@@ -31943,9 +31836,7 @@ var typescript = function(superClass) {
                     };
                     node.params = this.tsParseBracketedList("TypeParametersOrArguments", this.tsParseTypeParameter.bind(this, parseModifiers), false, true, refTrailingCommaPos);
                     if (node.params.length === 0) {
-                        this.raise(TSErrors.EmptyTypeParameters, {
-                            at: node
-                        });
+                        this.raise(TSErrors.EmptyTypeParameters, node);
                     }
                     if (refTrailingCommaPos.value !== -1) {
                         this.addExtra(node, "trailingComma", refTrailingCommaPos.value);
@@ -31979,8 +31870,7 @@ var typescript = function(superClass) {
                             var pattern = _step.value;
                             var type = pattern.type;
                             if (type === "AssignmentPattern" || type === "TSParameterProperty") {
-                                this.raise(TSErrors.UnsupportedSignatureParameterKind, {
-                                    at: pattern,
+                                this.raise(TSErrors.UnsupportedSignatureParameterKind, pattern, {
                                     type: type
                                 });
                             }
@@ -32056,15 +31946,11 @@ var typescript = function(superClass) {
                     var nodeAny = node;
                     if (this.match(10) || this.match(47)) {
                         if (readonly) {
-                            this.raise(TSErrors.ReadonlyForMethodSignature, {
-                                at: node
-                            });
+                            this.raise(TSErrors.ReadonlyForMethodSignature, node);
                         }
                         var method = nodeAny;
                         if (method.kind && this.match(47)) {
-                            this.raise(TSErrors.AccesorCannotHaveTypeParameters, {
-                                at: this.state.curPosition()
-                            });
+                            this.raise(TSErrors.AccesorCannotHaveTypeParameters, this.state.curPosition());
                         }
                         this.tsFillSignature(14, method);
                         this.tsParseTypeMemberSemicolon();
@@ -32072,42 +31958,28 @@ var typescript = function(superClass) {
                         var returnTypeKey = "returnType";
                         if (method.kind === "get") {
                             if (method[paramsKey].length > 0) {
-                                this.raise(Errors.BadGetterArity, {
-                                    at: this.state.curPosition()
-                                });
+                                this.raise(Errors.BadGetterArity, this.state.curPosition());
                                 if (this.isThisParam(method[paramsKey][0])) {
-                                    this.raise(TSErrors.AccesorCannotDeclareThisParameter, {
-                                        at: this.state.curPosition()
-                                    });
+                                    this.raise(TSErrors.AccesorCannotDeclareThisParameter, this.state.curPosition());
                                 }
                             }
                         } else if (method.kind === "set") {
                             if (method[paramsKey].length !== 1) {
-                                this.raise(Errors.BadSetterArity, {
-                                    at: this.state.curPosition()
-                                });
+                                this.raise(Errors.BadSetterArity, this.state.curPosition());
                             } else {
                                 var firstParameter = method[paramsKey][0];
                                 if (this.isThisParam(firstParameter)) {
-                                    this.raise(TSErrors.AccesorCannotDeclareThisParameter, {
-                                        at: this.state.curPosition()
-                                    });
+                                    this.raise(TSErrors.AccesorCannotDeclareThisParameter, this.state.curPosition());
                                 }
                                 if (firstParameter.type === "Identifier" && firstParameter.optional) {
-                                    this.raise(TSErrors.SetAccesorCannotHaveOptionalParameter, {
-                                        at: this.state.curPosition()
-                                    });
+                                    this.raise(TSErrors.SetAccesorCannotHaveOptionalParameter, this.state.curPosition());
                                 }
                                 if (firstParameter.type === "RestElement") {
-                                    this.raise(TSErrors.SetAccesorCannotHaveRestParameter, {
-                                        at: this.state.curPosition()
-                                    });
+                                    this.raise(TSErrors.SetAccesorCannotHaveRestParameter, this.state.curPosition());
                                 }
                             }
                             if (method[returnTypeKey]) {
-                                this.raise(TSErrors.SetAccesorCannotHaveReturnType, {
-                                    at: method[returnTypeKey]
-                                });
+                                this.raise(TSErrors.SetAccesorCannotHaveReturnType, method[returnTypeKey]);
                             }
                         } else {
                             method.kind = "method";
@@ -32252,9 +32124,7 @@ var typescript = function(superClass) {
                     node.elementTypes.forEach(function(elementNode) {
                         var type = elementNode.type;
                         if (seenOptionalElement && type !== "TSRestType" && type !== "TSOptionalType" && !(type === "TSNamedTupleMember" && elementNode.optional)) {
-                            _this.raise(TSErrors.OptionalTypeBeforeRequired, {
-                                at: elementNode
-                            });
+                            _this.raise(TSErrors.OptionalTypeBeforeRequired, elementNode);
                         }
                         seenOptionalElement || (seenOptionalElement = type === "TSNamedTupleMember" && elementNode.optional || type === "TSOptionalType");
                     });
@@ -32308,16 +32178,12 @@ var typescript = function(superClass) {
                             labeledNode.elementType = type;
                             if (this.eat(17)) {
                                 labeledNode.optional = true;
-                                this.raise(TSErrors.TupleOptionalAfterType, {
-                                    at: this.state.lastTokStartLoc
-                                });
+                                this.raise(TSErrors.TupleOptionalAfterType, this.state.lastTokStartLoc);
                             }
                         } else {
                             labeledNode = this.startNodeAtNode(type);
                             labeledNode.optional = optional;
-                            this.raise(TSErrors.InvalidTupleMemberLabel, {
-                                at: type
-                            });
+                            this.raise(TSErrors.InvalidTupleMemberLabel, type);
                             labeledNode.label = type;
                             labeledNode.elementType = this.tsParseType();
                         }
@@ -32512,9 +32378,7 @@ var typescript = function(superClass) {
                         case "TSArrayType":
                             return;
                         default:
-                            this.raise(TSErrors.UnexpectedReadonly, {
-                                at: node
-                            });
+                            this.raise(TSErrors.UnexpectedReadonly, node);
                     }
                 }
             },
@@ -32733,8 +32597,7 @@ var typescript = function(superClass) {
                         return false;
                     }
                     if (containsEsc) {
-                        this.raise(Errors.InvalidEscapedReservedWord, {
-                            at: this.state.lastTokStartLoc,
+                        this.raise(Errors.InvalidEscapedReservedWord, this.state.lastTokStartLoc, {
                             reservedWord: "asserts"
                         });
                     }
@@ -32744,8 +32607,8 @@ var typescript = function(superClass) {
             {
                 key: "tsParseTypeAnnotation",
                 value: function tsParseTypeAnnotation() {
-                    var eatColon = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true, t = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : this.startNode();
                     var _this = this;
+                    var eatColon = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true, t = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : this.startNode();
                     this.tsInType(function() {
                         if (eatColon) _this.expect(14);
                         t.typeAnnotation = _this.tsParseType();
@@ -32803,9 +32666,7 @@ var typescript = function(superClass) {
                 value: function tsParseTypeAssertion() {
                     var _this = this;
                     if (this.getPluginOption("typescript", "disallowAmbiguousJSXLike")) {
-                        this.raise(TSErrors.ReservedTypeAssertion, {
-                            at: this.state.startLoc
-                        });
+                        this.raise(TSErrors.ReservedTypeAssertion, this.state.startLoc);
                     }
                     var node = this.startNode();
                     node.typeAnnotation = this.tsInType(function() {
@@ -32831,8 +32692,7 @@ var typescript = function(superClass) {
                         return _this.finishNode(node, "TSExpressionWithTypeArguments");
                     });
                     if (!delimitedList.length) {
-                        this.raise(TSErrors.EmptyHeritageClauseType, {
-                            at: originalStartLoc,
+                        this.raise(TSErrors.EmptyHeritageClauseType, originalStartLoc, {
                             token: token
                         });
                     }
@@ -32851,9 +32711,7 @@ var typescript = function(superClass) {
                         this.checkIdentifier(node.id, 130);
                     } else {
                         node.id = null;
-                        this.raise(TSErrors.MissingInterfaceName, {
-                            at: this.state.startLoc
-                        });
+                        this.raise(TSErrors.MissingInterfaceName, this.state.startLoc);
                     }
                     node.typeParameters = this.tsTryParseTypeParameters(this.tsParseInOutConstModifiers);
                     if (this.eat(81)) {
@@ -33054,9 +32912,7 @@ var typescript = function(superClass) {
                     this.expect(29);
                     var moduleReference = this.tsParseModuleReference();
                     if (node.importKind === "type" && moduleReference.type !== "TSExternalModuleReference") {
-                        this.raise(TSErrors.ImportAliasHasImportType, {
-                            at: moduleReference
-                        });
+                        this.raise(TSErrors.ImportAliasHasImportType, moduleReference);
                     }
                     node.moduleReference = moduleReference;
                     this.semicolon();
@@ -33291,9 +33147,7 @@ var typescript = function(superClass) {
                         });
                     });
                     if (node.params.length === 0) {
-                        this.raise(TSErrors.EmptyTypeArguments, {
-                            at: node
-                        });
+                        this.raise(TSErrors.EmptyTypeArguments, node);
                     } else if (!this.state.inType && this.curContext() === types.brace) {
                         this.reScan_lt_gt();
                     }
@@ -33332,9 +33186,7 @@ var typescript = function(superClass) {
                     var override = modified.override;
                     var readonly = modified.readonly;
                     if (!(flags & 4) && (accessibility || readonly || override)) {
-                        this.raise(TSErrors.UnexpectedParameterModifier, {
-                            at: startLoc
-                        });
+                        this.raise(TSErrors.UnexpectedParameterModifier, startLoc);
                     }
                     var left = this.parseMaybeDefault();
                     this.parseAssignableListItemTypes(left, flags);
@@ -33348,9 +33200,7 @@ var typescript = function(superClass) {
                         if (readonly) pp.readonly = readonly;
                         if (override) pp.override = override;
                         if (elt.type !== "Identifier" && elt.type !== "AssignmentPattern") {
-                            this.raise(TSErrors.UnsupportedParameterPropertyKind, {
-                                at: pp
-                            });
+                            this.raise(TSErrors.UnsupportedParameterPropertyKind, pp);
                         }
                         pp.parameter = elt;
                         return this.finishNode(pp, "TSParameterProperty");
@@ -33375,9 +33225,7 @@ var typescript = function(superClass) {
                         for(var _iterator = node.params[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
                             var param = _step.value;
                             if (param.type !== "Identifier" && param.optional && !this.state.isAmbientContext) {
-                                this.raise(TSErrors.PatternIsOptional, {
-                                    at: param
-                                });
+                                this.raise(TSErrors.PatternIsOptional, param);
                             }
                         }
                     } catch (err) {
@@ -33415,9 +33263,7 @@ var typescript = function(superClass) {
                         return this.finishNode(node, bodilessType);
                     }
                     if (bodilessType === "TSDeclareFunction" && this.state.isAmbientContext) {
-                        this.raise(TSErrors.DeclareFunctionHasImplementation, {
-                            at: node
-                        });
+                        this.raise(TSErrors.DeclareFunctionHasImplementation, node);
                         if (node.declare) {
                             return _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseFunctionBodyAndFinish", this).call(this, node, bodilessType, isMethod3);
                         }
@@ -33442,9 +33288,7 @@ var typescript = function(superClass) {
                     var _this = this;
                     items.forEach(function(node) {
                         if ((node === null || node === void 0 ? void 0 : node.type) === "TSTypeCastExpression") {
-                            _this.raise(TSErrors.UnexpectedTypeAnnotation, {
-                                at: node.typeAnnotation
-                            });
+                            _this.raise(TSErrors.UnexpectedTypeAnnotation, node.typeAnnotation);
                         }
                     });
                 }
@@ -33531,9 +33375,7 @@ var typescript = function(superClass) {
                         }
                         if (result) {
                             if (result.type === "TSInstantiationExpression" && (this.match(16) || this.match(18) && this.lookaheadCharCode() !== 40)) {
-                                this.raise(TSErrors.InvalidPropertyAccessAfterInstantiationExpression, {
-                                    at: this.state.startLoc
-                                });
+                                this.raise(TSErrors.InvalidPropertyAccessAfterInstantiationExpression, this.state.startLoc);
                             }
                             return result;
                         }
@@ -33565,8 +33407,7 @@ var typescript = function(superClass) {
                             _this.next();
                             if (_this.match(75)) {
                                 if (isSatisfies) {
-                                    _this.raise(Errors.UnexpectedKeyword, {
-                                        at: _this.state.startLoc,
+                                    _this.raise(Errors.UnexpectedKeyword, _this.state.startLoc, {
                                         keyword: "const"
                                     });
                                 }
@@ -33594,9 +33435,7 @@ var typescript = function(superClass) {
                 value: function checkImportReflection(node) {
                     _get(_get_prototype_of(TypeScriptParserMixin.prototype), "checkImportReflection", this).call(this, node);
                     if (node.module && node.importKind !== "value") {
-                        this.raise(TSErrors.ImportReflectionHasImportType, {
-                            at: node.specifiers[0].loc.start
-                        });
+                        this.raise(TSErrors.ImportReflectionHasImportType, node.specifiers[0].loc.start);
                     }
                 }
             },
@@ -33648,9 +33487,7 @@ var typescript = function(superClass) {
                         importNode = _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseImport", this).call(this, node);
                     }
                     if (importNode.importKind === "type" && importNode.specifiers.length > 1 && importNode.specifiers[0].type === "ImportDefaultSpecifier") {
-                        this.raise(TSErrors.TypeImportCannotSpecifyDefaultAndNamed, {
-                            at: importNode
-                        });
+                        this.raise(TSErrors.TypeImportCannotSpecifyDefaultAndNamed, importNode);
                     }
                     return importNode;
                 }
@@ -33719,13 +33556,9 @@ var typescript = function(superClass) {
                             var _step_value = _step.value, id = _step_value.id, init = _step_value.init;
                             if (!init) continue;
                             if (kind !== "const" || !!id.typeAnnotation) {
-                                this.raise(TSErrors.InitializerNotAllowedInAmbientContext, {
-                                    at: init
-                                });
+                                this.raise(TSErrors.InitializerNotAllowedInAmbientContext, init);
                             } else if (!isValidAmbientConstInitializer(init, this.hasPlugin("estree"))) {
-                                this.raise(TSErrors.ConstInitiailizerMustBeStringOrNumericLiteralOrLiteralEnumReference, {
-                                    at: init
-                                });
+                                this.raise(TSErrors.ConstInitiailizerMustBeStringOrNumericLiteralOrLiteralEnumReference, init);
                             }
                         }
                     } catch (err) {
@@ -33820,9 +33653,7 @@ var typescript = function(superClass) {
                             _this.next();
                             _this.next();
                             if (_this.tsHasSomeModifiers(member, modifiers)) {
-                                _this.raise(TSErrors.StaticBlockCannotHaveModifier, {
-                                    at: _this.state.curPosition()
-                                });
+                                _this.raise(TSErrors.StaticBlockCannotHaveModifier, _this.state.curPosition());
                             }
                             _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseClassStaticBlock", _this).call(_this, classBody2, member);
                         } else {
@@ -33843,38 +33674,27 @@ var typescript = function(superClass) {
                     if (idx) {
                         classBody2.body.push(idx);
                         if (member.abstract) {
-                            this.raise(TSErrors.IndexSignatureHasAbstract, {
-                                at: member
-                            });
+                            this.raise(TSErrors.IndexSignatureHasAbstract, member);
                         }
                         if (member.accessibility) {
-                            this.raise(TSErrors.IndexSignatureHasAccessibility, {
-                                at: member,
+                            this.raise(TSErrors.IndexSignatureHasAccessibility, member, {
                                 modifier: member.accessibility
                             });
                         }
                         if (member.declare) {
-                            this.raise(TSErrors.IndexSignatureHasDeclare, {
-                                at: member
-                            });
+                            this.raise(TSErrors.IndexSignatureHasDeclare, member);
                         }
                         if (member.override) {
-                            this.raise(TSErrors.IndexSignatureHasOverride, {
-                                at: member
-                            });
+                            this.raise(TSErrors.IndexSignatureHasOverride, member);
                         }
                         return;
                     }
                     if (!this.state.inAbstractClass && member.abstract) {
-                        this.raise(TSErrors.NonAbstractClassHasAbstractMethod, {
-                            at: member
-                        });
+                        this.raise(TSErrors.NonAbstractClassHasAbstractMethod, member);
                     }
                     if (member.override) {
                         if (!state.hadSuperClass) {
-                            this.raise(TSErrors.OverrideNotInSubClass, {
-                                at: member
-                            });
+                            this.raise(TSErrors.OverrideNotInSubClass, member);
                         }
                     }
                     _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseClassMemberWithIsStatic", this).call(this, classBody2, member, state, isStatic2);
@@ -33886,14 +33706,10 @@ var typescript = function(superClass) {
                     var optional = this.eat(17);
                     if (optional) methodOrProp.optional = true;
                     if (methodOrProp.readonly && this.match(10)) {
-                        this.raise(TSErrors.ClassMethodHasReadonly, {
-                            at: methodOrProp
-                        });
+                        this.raise(TSErrors.ClassMethodHasReadonly, methodOrProp);
                     }
                     if (methodOrProp.declare && this.match(10)) {
-                        this.raise(TSErrors.ClassMethodHasDeclare, {
-                            at: methodOrProp
-                        });
+                        this.raise(TSErrors.ClassMethodHasDeclare, methodOrProp);
                     }
                 }
             },
@@ -33960,9 +33776,7 @@ var typescript = function(superClass) {
                     var startLoc = this.state.startLoc;
                     var isDeclare = this.eatContextual(125);
                     if (isDeclare && (this.isContextual(125) || !this.shouldParseExportDeclaration())) {
-                        throw this.raise(TSErrors.ExpectedAmbientAfterExportDeclare, {
-                            at: this.state.startLoc
-                        });
+                        throw this.raise(TSErrors.ExpectedAmbientAfterExportDeclare, this.state.startLoc);
                     }
                     var isIdentifier6 = tokenIsIdentifier(this.state.type);
                     var declaration = isIdentifier6 && this.tsTryParseExportDeclaration() || _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseExportDeclaration", this).call(this, node);
@@ -34007,14 +33821,11 @@ var typescript = function(superClass) {
                 value: function parseClassProperty(node) {
                     this.parseClassPropertyAnnotation(node);
                     if (this.state.isAmbientContext && !(node.readonly && !node.typeAnnotation) && this.match(29)) {
-                        this.raise(TSErrors.DeclareClassFieldHasInitializer, {
-                            at: this.state.startLoc
-                        });
+                        this.raise(TSErrors.DeclareClassFieldHasInitializer, this.state.startLoc);
                     }
                     if (node.abstract && this.match(29)) {
                         var key = node.key;
-                        this.raise(TSErrors.AbstractPropertyHasInitializer, {
-                            at: this.state.startLoc,
+                        this.raise(TSErrors.AbstractPropertyHasInitializer, this.state.startLoc, {
                             propertyName: key.type === "Identifier" && !node.computed ? key.name : "[".concat(this.input.slice(key.start, key.end), "]")
                         });
                     }
@@ -34025,13 +33836,10 @@ var typescript = function(superClass) {
                 key: "parseClassPrivateProperty",
                 value: function parseClassPrivateProperty(node) {
                     if (node.abstract) {
-                        this.raise(TSErrors.PrivateElementHasAbstract, {
-                            at: node
-                        });
+                        this.raise(TSErrors.PrivateElementHasAbstract, node);
                     }
                     if (node.accessibility) {
-                        this.raise(TSErrors.PrivateElementHasAccessibility, {
-                            at: node,
+                        this.raise(TSErrors.PrivateElementHasAccessibility, node, {
                             modifier: node.accessibility
                         });
                     }
@@ -34044,9 +33852,7 @@ var typescript = function(superClass) {
                 value: function parseClassAccessorProperty(node) {
                     this.parseClassPropertyAnnotation(node);
                     if (node.optional) {
-                        this.raise(TSErrors.AccessorCannotBeOptional, {
-                            at: node
-                        });
+                        this.raise(TSErrors.AccessorCannotBeOptional, node);
                     }
                     return _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseClassAccessorProperty", this).call(this, node);
                 }
@@ -34056,14 +33862,11 @@ var typescript = function(superClass) {
                 value: function pushClassMethod(classBody2, method, isGenerator, isAsync, isConstructor, allowsDirectSuper) {
                     var typeParameters = this.tsTryParseTypeParameters(this.tsParseConstModifier);
                     if (typeParameters && isConstructor) {
-                        this.raise(TSErrors.ConstructorHasTypeParameters, {
-                            at: typeParameters
-                        });
+                        this.raise(TSErrors.ConstructorHasTypeParameters, typeParameters);
                     }
                     var _method_declare = method.declare, declare = _method_declare === void 0 ? false : _method_declare, kind = method.kind;
                     if (declare && (kind === "get" || kind === "set")) {
-                        this.raise(TSErrors.DeclareAccessor, {
-                            at: method,
+                        this.raise(TSErrors.DeclareAccessor, method, {
                             kind: kind
                         });
                     }
@@ -34178,8 +33981,7 @@ var typescript = function(superClass) {
                             if (_this.hasPlugin("jsx") && expr.typeParameters.params.length === 1 && !((_expr_typeParameters_extra = expr.typeParameters.extra) === null || _expr_typeParameters_extra === void 0 ? void 0 : _expr_typeParameters_extra.trailingComma)) {
                                 var parameter = expr.typeParameters.params[0];
                                 if (!parameter.constraint) {
-                                    _this.raise(TSErrors.SingleTypeParameterWithoutTrailingComma, {
-                                        at: createPositionWithColumnOffset(parameter.loc.end, 1),
+                                    _this.raise(TSErrors.SingleTypeParameterWithoutTrailingComma, createPositionWithColumnOffset(parameter.loc.end, 1), {
                                         typeParameterName: parameter.name.name
                                     });
                                 }
@@ -34219,9 +34021,7 @@ var typescript = function(superClass) {
                 value: function reportReservedArrowTypeParam(node) {
                     var _node_extra;
                     if (node.params.length === 1 && !node.params[0].constraint && !((_node_extra = node.extra) === null || _node_extra === void 0 ? void 0 : _node_extra.trailingComma) && this.getPluginOption("typescript", "disallowAmbiguousJSXLike")) {
-                        this.raise(TSErrors.ReservedArrowTypeParam, {
-                            at: node
-                        });
+                        this.raise(TSErrors.ReservedArrowTypeParam, node);
                     }
                 }
             },
@@ -34292,13 +34092,9 @@ var typescript = function(superClass) {
                         case "TSNonNullExpression":
                         case "TSTypeAssertion":
                             if (isLHS) {
-                                this.expressionScope.recordArrowParameterBindingError(TSErrors.UnexpectedTypeCastInParameter, {
-                                    at: node
-                                });
+                                this.expressionScope.recordArrowParameterBindingError(TSErrors.UnexpectedTypeCastInParameter, node);
                             } else {
-                                this.raise(TSErrors.UnexpectedTypeCastInParameter, {
-                                    at: node
-                                });
+                                this.raise(TSErrors.UnexpectedTypeCastInParameter, node);
                             }
                             this.toAssignable(node.expression, isLHS);
                             break;
@@ -34415,9 +34211,7 @@ var typescript = function(superClass) {
                 value: function parseMaybeDefault(startLoc, left) {
                     var node = _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseMaybeDefault", this).call(this, startLoc, left);
                     if (node.type === "AssignmentPattern" && node.typeAnnotation && node.right.start < node.typeAnnotation.start) {
-                        this.raise(TSErrors.TypeAnnotationAfterAssign, {
-                            at: node.typeAnnotation
-                        });
+                        this.raise(TSErrors.TypeAnnotationAfterAssign, node.typeAnnotation);
                     }
                     return node;
                 }
@@ -34575,9 +34369,7 @@ var typescript = function(superClass) {
                     } else if (this.isContextual(129)) {
                         if (!this.hasFollowingLineBreak()) {
                             node.abstract = true;
-                            this.raise(TSErrors.NonClassMethodPropertyHasAbstractModifer, {
-                                at: node
-                            });
+                            this.raise(TSErrors.NonClassMethodPropertyHasAbstractModifer, node);
                             return this.tsParseInterfaceDeclaration(node);
                         }
                     } else {
@@ -34593,8 +34385,7 @@ var typescript = function(superClass) {
                         var hasBody = this.hasPlugin("estree") ? !!method.value.body : !!method.body;
                         if (hasBody) {
                             var key = method.key;
-                            this.raise(TSErrors.AbstractMethodHasImplementation, {
-                                at: method,
+                            this.raise(TSErrors.AbstractMethodHasImplementation, method, {
                                 methodName: key.type === "Identifier" && !method.computed ? key.name : "[".concat(this.input.slice(key.start, key.end), "]")
                             });
                         }
@@ -34697,9 +34488,7 @@ var typescript = function(superClass) {
                         }
                     }
                     if (hasTypeSpecifier && isInTypeOnlyImportExport) {
-                        this.raise(isImport2 ? TSErrors.TypeModifierIsUsedInTypeImports : TSErrors.TypeModifierIsUsedInTypeExports, {
-                            at: loc
-                        });
+                        this.raise(isImport2 ? TSErrors.TypeModifierIsUsedInTypeImports : TSErrors.TypeModifierIsUsedInTypeExports, loc);
                     }
                     node[leftOfAsKey] = leftOfAs;
                     node[rightOfAsKey] = rightOfAs;
@@ -34934,9 +34723,7 @@ var placeholders = function(superClass) {
                             node.body = this.finishPlaceholder(placeholder2, "ClassBody");
                             return this.finishNode(node, type);
                         } else {
-                            throw this.raise(PlaceholderErrors.ClassNameIsRequired, {
-                                at: this.state.startLoc
-                            });
+                            throw this.raise(PlaceholderErrors.ClassNameIsRequired, this.state.startLoc);
                         }
                     } else {
                         this.parseClassId(node, isStatement5, optionalId);
@@ -35037,9 +34824,7 @@ var placeholders = function(superClass) {
                 key: "assertNoSpace",
                 value: function assertNoSpace() {
                     if (this.state.start > this.state.lastTokEndLoc.index) {
-                        this.raise(PlaceholderErrors.UnexpectedSpace, {
-                            at: this.state.lastTokEndLoc
-                        });
+                        this.raise(PlaceholderErrors.UnexpectedSpace, this.state.lastTokEndLoc);
                     }
                 }
             }
@@ -35316,9 +35101,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 var name = key.type === "Identifier" ? key.name : key.value;
                 if (name === "__proto__") {
                     if (isRecord) {
-                        this.raise(Errors.RecordNoProto, {
-                            at: key
-                        });
+                        this.raise(Errors.RecordNoProto, key);
                         return;
                     }
                     if (protoRef.used) {
@@ -35327,9 +35110,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                                 refExpressionErrors.doubleProtoLoc = key.loc.start;
                             }
                         } else {
-                            this.raise(Errors.DuplicateProto, {
-                                at: key
-                            });
+                            this.raise(Errors.DuplicateProto, key);
                         }
                     }
                     protoRef.used = true;
@@ -35352,7 +35133,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                     this.unexpected();
                 }
                 this.finalizeRemainingComments();
-                expr.comments = this.state.comments;
+                expr.comments = this.comments;
                 expr.errors = this.state.errors;
                 if (this.options.tokens) {
                     expr.tokens = this.tokens;
@@ -35529,8 +35310,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 if (this.isPrivateName(left)) {
                     var value1 = this.getPrivateNameSV(left);
                     if (minPrec >= tokenOperatorPrecedence(58) || !this.prodParam.hasIn || !this.match(58)) {
-                        this.raise(Errors.PrivateInExpectedIn, {
-                            at: left,
+                        this.raise(Errors.PrivateInExpectedIn, left, {
                             identifierName: value1
                         });
                     }
@@ -35563,18 +35343,14 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                             }
                         ])) {
                             if (this.state.type === 96 && this.prodParam.hasAwait) {
-                                throw this.raise(Errors.UnexpectedAwaitAfterPipelineBody, {
-                                    at: this.state.startLoc
-                                });
+                                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;
                         if (coalesce && (nextOp === 41 || nextOp === 42) || logical && nextOp === 40) {
-                            throw this.raise(Errors.MixingCoalesceWithLogical, {
-                                at: this.state.startLoc
-                            });
+                            throw this.raise(Errors.MixingCoalesceWithLogical, this.state.startLoc);
                         }
                         return this.parseExprOp(finishedNode, leftStartLoc, minPrec);
                     }
@@ -35597,9 +35373,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                             case "smart":
                                 return this.withTopicBindingContext(function() {
                                     if (_this.prodParam.hasYield && _this.isContextual(108)) {
-                                        throw _this.raise(Errors.PipeBodyIsTighter, {
-                                            at: _this.state.startLoc
-                                        });
+                                        throw _this.raise(Errors.PipeBodyIsTighter, _this.state.startLoc);
                                     }
                                     return _this.parseSmartPipelineBodyInStyle(_this.parseExprOpBaseRightExpr(op, prec), startLoc);
                                 });
@@ -35628,15 +35402,12 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 var body = this.parseMaybeAssign();
                 var requiredParentheses = UnparenthesizedPipeBodyDescriptions.has(body.type);
                 if (requiredParentheses && !((_body_extra = body.extra) === null || _body_extra === void 0 ? void 0 : _body_extra.parenthesized)) {
-                    this.raise(Errors.PipeUnparenthesizedBody, {
-                        at: startLoc,
+                    this.raise(Errors.PipeUnparenthesizedBody, startLoc, {
                         type: body.type
                     });
                 }
                 if (!this.topicReferenceWasUsedInCurrentContext()) {
-                    this.raise(Errors.PipeTopicUnused, {
-                        at: startLoc
-                    });
+                    this.raise(Errors.PipeTopicUnused, startLoc);
                 }
                 return body;
             }
@@ -35645,9 +35416,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
             key: "checkExponentialAfterUnary",
             value: function checkExponentialAfterUnary(node) {
                 if (this.match(57)) {
-                    this.raise(Errors.UnexpectedTokenUnaryExponentiation, {
-                        at: node.argument
-                    });
+                    this.raise(Errors.UnexpectedTokenUnaryExponentiation, node.argument);
                 }
             }
         },
@@ -35677,13 +35446,9 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                     if (this.state.strict && isDelete) {
                         var arg = node.argument;
                         if (arg.type === "Identifier") {
-                            this.raise(Errors.StrictDelete, {
-                                at: node
-                            });
+                            this.raise(Errors.StrictDelete, node);
                         } else if (this.hasPropertyAsPrivateName(arg)) {
-                            this.raise(Errors.DeletePrivateField, {
-                                at: node
-                            });
+                            this.raise(Errors.DeletePrivateField, node);
                         }
                     }
                     if (!update) {
@@ -35698,9 +35463,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                     var type = this.state.type;
                     var startsExpr2 = this.hasPlugin("v8intrinsic") ? tokenCanStartExpression(type) : tokenCanStartExpression(type) && !this.match(54);
                     if (startsExpr2 && !this.isAmbiguousAwait()) {
-                        this.raiseOverwrite(Errors.AwaitNotInAsyncContext, {
-                            at: startLoc
-                        });
+                        this.raiseOverwrite(Errors.AwaitNotInAsyncContext, startLoc);
                         return this.parseAwait(startLoc);
                     }
                 }
@@ -35772,9 +35535,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 var optional = false;
                 if (type === 18) {
                     if (noCalls) {
-                        this.raise(Errors.OptionalChainingNoNew, {
-                            at: this.state.startLoc
-                        });
+                        this.raise(Errors.OptionalChainingNoNew, this.state.startLoc);
                         if (this.lookaheadCharCode() === 40) {
                             state.stop = true;
                             return base;
@@ -35807,9 +35568,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                     this.expect(3);
                 } else if (this.match(138)) {
                     if (base.type === "Super") {
-                        this.raise(Errors.SuperPrivateField, {
-                            at: startLoc
-                        });
+                        this.raise(Errors.SuperPrivateField, startLoc);
                     }
                     this.classScope.usePrivateName(this.state.value, this.state.startLoc);
                     node.property = this.parsePrivateName();
@@ -35888,9 +35647,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 node.tag = base;
                 node.quasi = this.parseTemplate(true);
                 if (state.optionalChainMember) {
-                    this.raise(Errors.OptionalChainingNoTemplate, {
-                        at: startLoc
-                    });
+                    this.raise(Errors.OptionalChainingNoTemplate, startLoc);
                 }
                 return this.finishNode(node, "TaggedTemplateExpression");
             }
@@ -35919,8 +35676,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                         }
                     }
                     if (node.arguments.length === 0 || node.arguments.length > 2) {
-                        this.raise(Errors.ImportCallArity, {
-                            at: node,
+                        this.raise(Errors.ImportCallArity, node, {
                             maxArgumentCount: this.hasPlugin("importAttributes") || this.hasPlugin("importAssertions") || this.hasPlugin("moduleAttributes") ? 2 : 1
                         });
                     } else {
@@ -35929,9 +35685,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                             for(var _iterator = node.arguments[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
                                 var arg = _step.value;
                                 if (arg.type === "SpreadElement") {
-                                    this.raise(Errors.ImportCallSpreadArgument, {
-                                        at: arg
-                                    });
+                                    this.raise(Errors.ImportCallSpreadArgument, arg);
                                 }
                             }
                         } catch (err) {
@@ -35967,9 +35721,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                         this.expect(12);
                         if (this.match(close)) {
                             if (dynamicImport && !this.hasPlugin("importAttributes") && !this.hasPlugin("importAssertions") && !this.hasPlugin("moduleAttributes")) {
-                                this.raise(Errors.ImportCallArgumentTrailingComma, {
-                                    at: this.state.lastTokStartLoc
-                                });
+                                this.raise(Errors.ImportCallArgumentTrailingComma, this.state.lastTokStartLoc);
                             }
                             if (nodeForExtra) {
                                 this.addTrailingCommaExtraToNode(nodeForExtra);
@@ -36035,9 +35787,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                                 return this.finishNode(node, "Import");
                             }
                         } else {
-                            this.raise(Errors.UnsupportedImport, {
-                                at: this.state.lastTokStartLoc
-                            });
+                            this.raise(Errors.UnsupportedImport, this.state.lastTokStartLoc);
                             return this.finishNode(node, "Import");
                         }
                     case 78:
@@ -36111,15 +35861,12 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                             if (callee.type === "MemberExpression") {
                                 return this.finishNode(node, "BindExpression");
                             } else {
-                                throw this.raise(Errors.UnsupportedBind, {
-                                    at: callee
-                                });
+                                throw this.raise(Errors.UnsupportedBind, callee);
                             }
                         }
                     case 138:
                         {
-                            this.raise(Errors.PrivateInExpectedIn, {
-                                at: this.state.startLoc,
+                            this.raise(Errors.PrivateInExpectedIn, this.state.startLoc, {
                                 identifierName: this.state.value
                             });
                             return this.parsePrivateName();
@@ -36232,15 +35979,12 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 if (this.testTopicReferenceConfiguration(pipeProposal, startLoc, tokenType)) {
                     var nodeType = pipeProposal === "smart" ? "PipelinePrimaryTopicReference" : "TopicReference";
                     if (!this.topicReferenceIsAllowedInCurrentContext()) {
-                        this.raise(pipeProposal === "smart" ? Errors.PrimaryTopicNotAllowed : Errors.PipeTopicUnbound, {
-                            at: startLoc
-                        });
+                        this.raise(pipeProposal === "smart" ? Errors.PrimaryTopicNotAllowed : Errors.PipeTopicUnbound, startLoc);
                     }
                     this.registerTopicReference();
                     return this.finishNode(node, nodeType);
                 } else {
-                    throw this.raise(Errors.PipeTopicUnconfiguredToken, {
-                        at: startLoc,
+                    throw this.raise(Errors.PipeTopicUnconfiguredToken, startLoc, {
                         token: tokenLabelName(tokenType)
                     });
                 }
@@ -36262,9 +36006,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                     case "smart":
                         return tokenType === 27;
                     default:
-                        throw this.raise(Errors.PipeTopicRequiresHackPipes, {
-                            at: startLoc
-                        });
+                        throw this.raise(Errors.PipeTopicRequiresHackPipes, startLoc);
                 }
             }
         },
@@ -36277,9 +36019,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 ];
                 this.prodParam.exit();
                 if (this.hasPrecedingLineBreak()) {
-                    this.raise(Errors.LineTerminatorBeforeArrow, {
-                        at: this.state.curPosition()
-                    });
+                    this.raise(Errors.LineTerminatorBeforeArrow, this.state.curPosition());
                 }
                 this.expect(19);
                 return this.parseArrowExpression(node, params, true);
@@ -36313,18 +36053,12 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 var node = this.startNode();
                 this.next();
                 if (this.match(10) && !this.scope.allowDirectSuper && !this.options.allowSuperOutsideMethod) {
-                    this.raise(Errors.SuperNotAllowed, {
-                        at: node
-                    });
+                    this.raise(Errors.SuperNotAllowed, node);
                 } else if (!this.scope.allowSuper && !this.options.allowSuperOutsideMethod) {
-                    this.raise(Errors.UnexpectedSuper, {
-                        at: node
-                    });
+                    this.raise(Errors.UnexpectedSuper, node);
                 }
                 if (!this.match(10) && !this.match(0) && !this.match(16)) {
-                    this.raise(Errors.UnsupportedSuper, {
-                        at: node
-                    });
+                    this.raise(Errors.UnsupportedSuper, node);
                 }
                 return this.finishNode(node, "Super");
             }
@@ -36365,8 +36099,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 var containsEsc = this.state.containsEsc;
                 node.property = this.parseIdentifier(true);
                 if (node.property.name !== propertyName || containsEsc) {
-                    this.raise(Errors.UnsupportedMetaProperty, {
-                        at: node.property,
+                    this.raise(Errors.UnsupportedMetaProperty, node.property, {
                         target: meta.name,
                         onlyValidPropertyName: propertyName
                     });
@@ -36381,9 +36114,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 this.next();
                 if (this.isContextual(101)) {
                     if (!this.inModule) {
-                        this.raise(Errors.ImportMetaOutsideModule, {
-                            at: id
-                        });
+                        this.raise(Errors.ImportMetaOutsideModule, id);
                     }
                     this.sawUnambiguousESM = true;
                 } else if (this.isContextual(105) || this.isContextual(97)) {
@@ -36391,8 +36122,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                     if (!isSource) this.unexpected();
                     this.expectPlugin(isSource ? "sourcePhaseImports" : "deferredImportEvaluation");
                     if (!this.options.createImportExpressions) {
-                        throw this.raise(Errors.DynamicImportPhaseRequiresImportExpressions, {
-                            at: this.state.startLoc,
+                        throw this.raise(Errors.DynamicImportPhaseRequiresImportExpressions, this.state.startLoc, {
                             phase: this.state.value
                         });
                     }
@@ -36583,9 +36313,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                     this.next();
                     var metaProp = this.parseMetaProperty(node, meta, "target");
                     if (!this.scope.inNonArrowFunction && !this.scope.inClass && !this.options.allowNewTargetOutsideFunction) {
-                        this.raise(Errors.UnexpectedNewTarget, {
-                            at: metaProp
-                        });
+                        this.raise(Errors.UnexpectedNewTarget, metaProp);
                     }
                     return metaProp;
                 }
@@ -36613,9 +36341,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 var callee = this.parseNoCallExpr();
                 node.callee = callee;
                 if (isImport2 && (callee.type === "Import" || callee.type === "ImportExpression")) {
-                    this.raise(Errors.ImportCallNotNewExpression, {
-                        at: callee
-                    });
+                    this.raise(Errors.ImportCallNotNewExpression, callee);
                 }
             }
         },
@@ -36627,9 +36353,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 var elem = this.startNodeAt(createPositionWithColumnOffset(startLoc, 1));
                 if (value1 === null) {
                     if (!isTagged) {
-                        this.raise(Errors.InvalidEscapeSequenceTemplate, {
-                            at: createPositionWithColumnOffset(this.state.firstInvalidTemplateEscapePos, 1)
-                        });
+                        this.raise(Errors.InvalidEscapeSequenceTemplate, createPositionWithColumnOffset(this.state.firstInvalidTemplateEscapePos, 1));
                     }
                 }
                 var isTail = this.match(24);
@@ -36700,9 +36424,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                         this.checkProto(prop, isRecord, propHash, refExpressionErrors);
                     }
                     if (isRecord && !this.isObjectProperty(prop) && prop.type !== "SpreadElement") {
-                        this.raise(Errors.InvalidRecordProperty, {
-                            at: prop
-                        });
+                        this.raise(Errors.InvalidRecordProperty, prop);
                     }
                     if (prop.shorthand) {
                         this.addExtra(prop, "shorthand", true);
@@ -36723,7 +36445,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
         {
             key: "addTrailingCommaExtraToNode",
             value: function addTrailingCommaExtraToNode(node) {
-                this.addExtra(node, "trailingComma", this.state.lastTokStart);
+                this.addExtra(node, "trailingComma", this.state.lastTokStartLoc.index);
                 this.addExtra(node, "trailingCommaLoc", this.state.lastTokStartLoc, false);
             }
         },
@@ -36739,9 +36461,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 var decorators = [];
                 if (this.match(26)) {
                     if (this.hasPlugin("decorators")) {
-                        this.raise(Errors.UnsupportedPropertyDecorator, {
-                            at: this.state.startLoc
-                        });
+                        this.raise(Errors.UnsupportedPropertyDecorator, this.state.startLoc);
                     }
                     while(this.match(26)){
                         decorators.push(this.parseDecorator());
@@ -36781,8 +36501,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                         prop.kind = keyName;
                         if (this.match(55)) {
                             isGenerator = true;
-                            this.raise(Errors.AccessorIsGenerator, {
-                                at: this.state.curPosition(),
+                            this.raise(Errors.AccessorIsGenerator, this.state.curPosition(), {
                                 kind: keyName
                             });
                             this.next();
@@ -36812,14 +36531,10 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 var paramCount = this.getGetterSetterExpectedParamCount(method);
                 var params = this.getObjectOrClassMethodParams(method);
                 if (params.length !== paramCount) {
-                    this.raise(method.kind === "get" ? Errors.BadGetterArity : Errors.BadSetterArity, {
-                        at: method
-                    });
+                    this.raise(method.kind === "get" ? Errors.BadGetterArity : Errors.BadSetterArity, method);
                 }
                 if (method.kind === "set" && ((_params_ = params[params.length - 1]) === null || _params_ === void 0 ? void 0 : _params_.type) === "RestElement") {
-                    this.raise(Errors.BadSetterRestParameter, {
-                        at: method
-                    });
+                    this.raise(Errors.BadSetterRestParameter, method);
                 }
             }
         },
@@ -36858,9 +36573,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                                 refExpressionErrors.shorthandAssignLoc = shorthandAssignLoc;
                             }
                         } else {
-                            this.raise(Errors.InvalidCoverInitializedName, {
-                                at: shorthandAssignLoc
-                            });
+                            this.raise(Errors.InvalidCoverInitializedName, shorthandAssignLoc);
                         }
                         prop.value = this.parseMaybeDefault(startLoc, cloneIdentifier(prop.key));
                     } else {
@@ -36913,9 +36626,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                                             refExpressionErrors.privateKeyLoc = privateKeyLoc;
                                         }
                                     } else {
-                                        this.raise(Errors.UnexpectedPrivateField, {
-                                            at: privateKeyLoc
-                                        });
+                                        this.raise(Errors.UnexpectedPrivateField, privateKeyLoc);
                                     }
                                     key = this.parsePrivateName();
                                     break;
@@ -37011,8 +36722,8 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
         {
             key: "parseFunctionBody",
             value: function parseFunctionBody(node, allowExpression) {
-                var isMethod3 = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
                 var _this = this;
+                var isMethod3 = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
                 var isExpression3 = allowExpression && !this.match(5);
                 this.expressionScope.enter(newExpressionScope());
                 if (isExpression3) {
@@ -37026,9 +36737,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                     node.body = this.parseBlock(true, false, function(hasStrictModeDirective) {
                         var nonSimple = !_this.isSimpleParamList(node.params);
                         if (hasStrictModeDirective && nonSimple) {
-                            _this.raise(Errors.IllegalLanguageModeDirective, {
-                                at: (node.kind === "method" || node.kind === "constructor") && !!node.key ? node.key.loc.end : node
-                            });
+                            _this.raise(Errors.IllegalLanguageModeDirective, (node.kind === "method" || node.kind === "constructor") && !!node.key ? node.key.loc.end : node);
                         }
                         var strictModeChanged = !oldStrict && _this.state.strict;
                         _this.checkParams(node, !_this.state.strict && !allowExpression && !isMethod3 && !nonSimple, allowExpression, strictModeChanged);
@@ -37121,8 +36830,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 var elt;
                 if (this.match(12)) {
                     if (!allowEmpty) {
-                        this.raise(Errors.UnexpectedToken, {
-                            at: this.state.curPosition(),
+                        this.raise(Errors.UnexpectedToken, this.state.curPosition(), {
                             unexpected: ","
                         });
                     }
@@ -37133,9 +36841,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 } else if (this.match(17)) {
                     this.expectPlugin("partialApplication");
                     if (!allowPlaceholder) {
-                        this.raise(Errors.UnexpectedArgumentPlaceholder, {
-                            at: this.state.startLoc
-                        });
+                        this.raise(Errors.UnexpectedArgumentPlaceholder, this.state.startLoc);
                     }
                     var node = this.startNode();
                     this.next();
@@ -37194,47 +36900,35 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                     return;
                 }
                 if (checkKeywords && isKeyword2(word)) {
-                    this.raise(Errors.UnexpectedKeyword, {
-                        at: startLoc,
+                    this.raise(Errors.UnexpectedKeyword, startLoc, {
                         keyword: word
                     });
                     return;
                 }
                 var reservedTest = !this.state.strict ? isReservedWord2 : isBinding3 ? isStrictBindReservedWord : isStrictReservedWord2;
                 if (reservedTest(word, this.inModule)) {
-                    this.raise(Errors.UnexpectedReservedWord, {
-                        at: startLoc,
+                    this.raise(Errors.UnexpectedReservedWord, startLoc, {
                         reservedWord: word
                     });
                     return;
                 } else if (word === "yield") {
                     if (this.prodParam.hasYield) {
-                        this.raise(Errors.YieldBindingIdentifier, {
-                            at: startLoc
-                        });
+                        this.raise(Errors.YieldBindingIdentifier, startLoc);
                         return;
                     }
                 } else if (word === "await") {
                     if (this.prodParam.hasAwait) {
-                        this.raise(Errors.AwaitBindingIdentifier, {
-                            at: startLoc
-                        });
+                        this.raise(Errors.AwaitBindingIdentifier, startLoc);
                         return;
                     }
                     if (this.scope.inStaticBlock) {
-                        this.raise(Errors.AwaitBindingIdentifierInStaticBlock, {
-                            at: startLoc
-                        });
+                        this.raise(Errors.AwaitBindingIdentifierInStaticBlock, startLoc);
                         return;
                     }
-                    this.expressionScope.recordAsyncArrowParametersError({
-                        at: startLoc
-                    });
+                    this.expressionScope.recordAsyncArrowParametersError(startLoc);
                 } else if (word === "arguments") {
                     if (this.scope.inClassAndNotInNonArrowFunction) {
-                        this.raise(Errors.ArgumentsInClass, {
-                            at: startLoc
-                        });
+                        this.raise(Errors.ArgumentsInClass, startLoc);
                         return;
                     }
                 }
@@ -37254,13 +36948,9 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
             key: "parseAwait",
             value: function parseAwait(startLoc) {
                 var node = this.startNodeAt(startLoc);
-                this.expressionScope.recordParameterInitializerError(Errors.AwaitExpressionFormalParameter, {
-                    at: node
-                });
+                this.expressionScope.recordParameterInitializerError(Errors.AwaitExpressionFormalParameter, node);
                 if (this.eat(55)) {
-                    this.raise(Errors.ObsoleteAwaitStar, {
-                        at: node
-                    });
+                    this.raise(Errors.ObsoleteAwaitStar, node);
                 }
                 if (!this.scope.inFunction && !this.options.allowAwaitOutsideFunction) {
                     if (this.isAmbiguousAwait()) {
@@ -37287,9 +36977,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
             key: "parseYield",
             value: function parseYield() {
                 var node = this.startNode();
-                this.expressionScope.recordParameterInitializerError(Errors.YieldInParameter, {
-                    at: node
-                });
+                this.expressionScope.recordParameterInitializerError(Errors.YieldInParameter, node);
                 this.next();
                 var delegating = false;
                 var argument = null;
@@ -37343,9 +37031,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                     }
                 ])) {
                     if (left.type === "SequenceExpression") {
-                        this.raise(Errors.PipelineHeadSequenceExpression, {
-                            at: leftStartLoc
-                        });
+                        this.raise(Errors.PipelineHeadSequenceExpression, leftStartLoc);
                     }
                 }
             }
@@ -37382,14 +37068,10 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
             key: "checkSmartPipeTopicBodyEarlyErrors",
             value: function checkSmartPipeTopicBodyEarlyErrors(startLoc) {
                 if (this.match(19)) {
-                    throw this.raise(Errors.PipelineBodyNoArrow, {
-                        at: this.state.startLoc
-                    });
+                    throw this.raise(Errors.PipelineBodyNoArrow, this.state.startLoc);
                 }
                 if (!this.topicReferenceWasUsedInCurrentContext()) {
-                    this.raise(Errors.PipelineTopicUnused, {
-                        at: startLoc
-                    });
+                    this.raise(Errors.PipelineTopicUnused, startLoc);
                 }
             }
         },
@@ -37535,10 +37217,10 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
     return ExpressionParser;
 }(LValParser);
 var loopLabel = {
-    kind: "loop"
+    kind: 1
 };
 var switchLabel = {
-    kind: "switch"
+    kind: 2
 };
 var loneSurrogate = RegExp("[\uD800-\uDFFF]", "u");
 var keywordRelationalOperator = RegExp("in(?:stanceof)?", "y");
@@ -37565,7 +37247,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
             key: "parseTopLevel",
             value: function parseTopLevel(file2, program3) {
                 file2.program = this.parseProgram(program3);
-                file2.comments = this.state.comments;
+                file2.comments = this.comments;
                 if (this.options.tokens) {
                     file2.tokens = babel7CompatTokens(this.tokens, this.input);
                 }
@@ -37584,8 +37266,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     try {
                         for(var _iterator = Array.from(this.scope.undefinedExports)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
                             var _step_value = _sliced_to_array(_step.value, 2), localName = _step_value[0], at = _step_value[1];
-                            this.raise(Errors.ModuleExportUndefined, {
-                                at: at,
+                            this.raise(Errors.ModuleExportUndefined, at, {
                                 localName: localName
                             });
                         }
@@ -37784,9 +37465,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     case 68:
                         if (this.lookaheadCharCode() === 46) break;
                         if (!allowFunctionDeclaration) {
-                            this.raise(this.state.strict ? Errors.StrictFunction : this.options.annexB ? Errors.SloppyFunctionAnnexB : Errors.SloppyFunction, {
-                                at: this.state.startLoc
-                            });
+                            this.raise(this.state.strict ? Errors.StrictFunction : this.options.annexB ? Errors.SloppyFunctionAnnexB : Errors.SloppyFunction, this.state.startLoc);
                         }
                         return this.parseFunctionStatement(node, false, !allowDeclaration && allowFunctionDeclaration);
                     case 80:
@@ -37805,13 +37484,9 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     case 96:
                         if (!this.state.containsEsc && this.startsAwaitUsing()) {
                             if (!this.isAwaitAllowed()) {
-                                this.raise(Errors.AwaitUsingNotInAsyncContext, {
-                                    at: node
-                                });
+                                this.raise(Errors.AwaitUsingNotInAsyncContext, node);
                             } else if (!allowDeclaration) {
-                                this.raise(Errors.UnexpectedLexicalDeclaration, {
-                                    at: node
-                                });
+                                this.raise(Errors.UnexpectedLexicalDeclaration, node);
                             }
                             this.next();
                             return this.parseVarStatement(node, "await using");
@@ -37823,13 +37498,9 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                         }
                         this.expectPlugin("explicitResourceManagement");
                         if (!this.scope.inModule && this.scope.inTopLevel) {
-                            this.raise(Errors.UnexpectedUsingDeclaration, {
-                                at: this.state.startLoc
-                            });
+                            this.raise(Errors.UnexpectedUsingDeclaration, this.state.startLoc);
                         } else if (!allowDeclaration) {
-                            this.raise(Errors.UnexpectedLexicalDeclaration, {
-                                at: this.state.startLoc
-                            });
+                            this.raise(Errors.UnexpectedLexicalDeclaration, this.state.startLoc);
                         }
                         return this.parseVarStatement(node, "using");
                     case 100:
@@ -37849,9 +37520,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     case 75:
                         {
                             if (!allowDeclaration) {
-                                this.raise(Errors.UnexpectedLexicalDeclaration, {
-                                    at: this.state.startLoc
-                                });
+                                this.raise(Errors.UnexpectedLexicalDeclaration, this.state.startLoc);
                             }
                         }
                     case 74:
@@ -37877,9 +37546,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     case 82:
                         {
                             if (!this.options.allowImportExportEverywhere && !topLevel) {
-                                this.raise(Errors.UnexpectedImportExport, {
-                                    at: this.state.startLoc
-                                });
+                                this.raise(Errors.UnexpectedImportExport, this.state.startLoc);
                             }
                             this.next();
                             var result;
@@ -37901,9 +37568,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                         {
                             if (this.isAsyncFunction()) {
                                 if (!allowDeclaration) {
-                                    this.raise(Errors.AsyncFunctionInSingleStatementContext, {
-                                        at: this.state.startLoc
-                                    });
+                                    this.raise(Errors.AsyncFunctionInSingleStatementContext, this.state.startLoc);
                                 }
                                 this.next();
                                 return this.parseFunctionStatement(node, true, !allowDeclaration && allowFunctionDeclaration);
@@ -37923,9 +37588,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
             key: "assertModuleNodeAllowed",
             value: function assertModuleNodeAllowed(node) {
                 if (!this.options.allowImportExportEverywhere && !this.inModule) {
-                    this.raise(Errors.ImportOutsideModule, {
-                        at: node
-                    });
+                    this.raise(Errors.ImportOutsideModule, node);
                 }
             }
         },
@@ -37943,9 +37606,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     if (classNode.decorators && classNode.decorators.length > 0) {
                         var _classNode_decorators;
                         if (typeof this.getPluginOption("decorators", "decoratorsBeforeExport") !== "boolean") {
-                            this.raise(Errors.DecoratorsBeforeAfterExport, {
-                                at: classNode.decorators[0]
-                            });
+                            this.raise(Errors.DecoratorsBeforeAfterExport, classNode.decorators[0]);
                         }
                         (_classNode_decorators = classNode.decorators).unshift.apply(_classNode_decorators, _to_consumable_array(maybeDecorators));
                     } else {
@@ -37975,14 +37636,10 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                         this.unexpected();
                     }
                     if (!this.decoratorsEnabledBeforeExport()) {
-                        this.raise(Errors.DecoratorExportClass, {
-                            at: this.state.startLoc
-                        });
+                        this.raise(Errors.DecoratorExportClass, this.state.startLoc);
                     }
                 } else if (!this.canHaveLeadingDecorator()) {
-                    throw this.raise(Errors.UnexpectedLeadingDecorator, {
-                        at: this.state.startLoc
-                    });
+                    throw this.raise(Errors.UnexpectedLeadingDecorator, this.state.startLoc);
                 }
                 return decorators;
             }
@@ -38008,9 +37665,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                         var paramsStartLoc = this.state.startLoc;
                         node.expression = this.parseMaybeDecoratorArguments(expr);
                         if (this.getPluginOption("decorators", "allowCallParenthesized") === false && node.expression !== expr) {
-                            this.raise(Errors.DecoratorArgumentsOutsideParentheses, {
-                                at: paramsStartLoc
-                            });
+                            this.raise(Errors.DecoratorArgumentsOutsideParentheses, paramsStartLoc);
                         }
                     } else {
                         expr = this.parseIdentifier(false);
@@ -38068,14 +37723,15 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 for(i = 0; i < this.state.labels.length; ++i){
                     var lab = this.state.labels[i];
                     if (node.label == null || lab.name === node.label.name) {
-                        if (lab.kind != null && (isBreak || lab.kind === "loop")) break;
+                        if (lab.kind != null && (isBreak || lab.kind === 1)) {
+                            break;
+                        }
                         if (node.label && isBreak) break;
                     }
                 }
                 if (i === this.state.labels.length) {
                     var type = isBreak ? "BreakStatement" : "ContinueStatement";
-                    this.raise(Errors.IllegalBreakContinue, {
-                        at: node,
+                    this.raise(Errors.IllegalBreakContinue, node, {
                         type: type
                     });
                 }
@@ -38142,9 +37798,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                         if (startsWithAwaitUsing) {
                             kind = "await using";
                             if (!this.isAwaitAllowed()) {
-                                this.raise(Errors.AwaitUsingNotInAsyncContext, {
-                                    at: this.state.startLoc
-                                });
+                                this.raise(Errors.AwaitUsingNotInAsyncContext, this.state.startLoc);
                             }
                             this.next();
                         } else {
@@ -38155,9 +37809,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                         var init2 = this.finishNode(initNode, "VariableDeclaration");
                         var isForIn = this.match(58);
                         if (isForIn && starsWithUsingDeclaration) {
-                            this.raise(Errors.ForInUsing, {
-                                at: init2
-                            });
+                            this.raise(Errors.ForInUsing, init2);
                         }
                         if ((isForIn || this.isContextual(102)) && init2.declarations.length === 1) {
                             return this.parseForIn(node, init2, awaitAt);
@@ -38174,14 +37826,10 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 var isForOf = this.isContextual(102);
                 if (isForOf) {
                     if (startsWithLet) {
-                        this.raise(Errors.ForOfLet, {
-                            at: init
-                        });
+                        this.raise(Errors.ForOfLet, init);
                     }
                     if (awaitAt === null && startsWithAsync && init.type === "Identifier") {
-                        this.raise(Errors.ForOfAsync, {
-                            at: init
-                        });
+                        this.raise(Errors.ForOfAsync, init);
                     }
                 }
                 if (isForOf || this.match(58)) {
@@ -38224,9 +37872,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
             key: "parseReturnStatement",
             value: function parseReturnStatement(node) {
                 if (!this.prodParam.hasReturn && !this.options.allowReturnOutsideFunction) {
-                    this.raise(Errors.IllegalReturn, {
-                        at: this.state.startLoc
-                    });
+                    this.raise(Errors.IllegalReturn, this.state.startLoc);
                 }
                 this.next();
                 if (this.isLineTerminator()) {
@@ -38259,9 +37905,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                             cur.test = this.parseExpression();
                         } else {
                             if (sawDefault) {
-                                this.raise(Errors.MultipleDefaultsInSwitch, {
-                                    at: this.state.lastTokStartLoc
-                                });
+                                this.raise(Errors.MultipleDefaultsInSwitch, this.state.lastTokStartLoc);
                             }
                             sawDefault = true;
                             cur.test = null;
@@ -38287,9 +37931,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
             value: function parseThrowStatement(node) {
                 this.next();
                 if (this.hasPrecedingLineBreak()) {
-                    this.raise(Errors.NewlineAfterThrow, {
-                        at: this.state.lastTokEndLoc
-                    });
+                    this.raise(Errors.NewlineAfterThrow, this.state.lastTokEndLoc);
                 }
                 node.argument = this.parseExpression();
                 this.semicolon();
@@ -38336,9 +37978,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 }
                 node.finalizer = this.eat(67) ? this.parseBlock() : null;
                 if (!node.handler && !node.finalizer) {
-                    this.raise(Errors.NoCatchOrFinally, {
-                        at: node
-                    });
+                    this.raise(Errors.NoCatchOrFinally, node);
                 }
                 return this.finishNode(node, "TryStatement");
             }
@@ -38372,9 +38012,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
             value: function parseWithStatement(node) {
                 var _this = this;
                 if (this.state.strict) {
-                    this.raise(Errors.StrictWith, {
-                        at: this.state.startLoc
-                    });
+                    this.raise(Errors.StrictWith, this.state.startLoc);
                 }
                 this.next();
                 node.object = this.parseHeaderExpression();
@@ -38399,8 +38037,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     for(var _iterator = this.state.labels[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
                         var label = _step.value;
                         if (label.name === maybeName) {
-                            this.raise(Errors.LabelRedeclaration, {
-                                at: expr,
+                            this.raise(Errors.LabelRedeclaration, expr, {
                                 labelName: maybeName
                             });
                         }
@@ -38419,7 +38056,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                         }
                     }
                 }
-                var kind = tokenIsLoop(this.state.type) ? "loop" : this.match(71) ? "switch" : null;
+                var kind = tokenIsLoop(this.state.type) ? 1 : this.match(71) ? 2 : null;
                 for(var i = this.state.labels.length - 1; i >= 0; i--){
                     var label1 = this.state.labels[i];
                     if (label1.statementStart === node.start) {
@@ -38541,14 +38178,12 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     node.await = awaitAt !== null;
                 }
                 if (init.type === "VariableDeclaration" && init.declarations[0].init != null && (!isForIn || !this.options.annexB || this.state.strict || init.kind !== "var" || init.declarations[0].id.type !== "Identifier")) {
-                    this.raise(Errors.ForInOfLoopInitializer, {
-                        at: init,
+                    this.raise(Errors.ForInOfLoopInitializer, init, {
                         type: isForIn ? "ForInStatement" : "ForOfStatement"
                     });
                 }
                 if (init.type === "AssignmentPattern") {
-                    this.raise(Errors.InvalidLhs, {
-                        at: init,
+                    this.raise(Errors.InvalidLhs, init, {
                         ancestor: {
                             type: "ForStatement"
                         }
@@ -38577,13 +38212,11 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     decl.init = !this.eat(29) ? null : isFor3 ? this.parseMaybeAssignDisallowIn() : this.parseMaybeAssignAllowIn();
                     if (decl.init === null && !allowMissingInitializer) {
                         if (decl.id.type !== "Identifier" && !(isFor3 && (this.match(58) || this.isContextual(102)))) {
-                            this.raise(Errors.DeclarationMissingInitializer, {
-                                at: this.state.lastTokEndLoc,
+                            this.raise(Errors.DeclarationMissingInitializer, this.state.lastTokEndLoc, {
                                 kind: "destructuring"
                             });
                         } else if (kind === "const" && !(this.match(58) || this.isContextual(102))) {
-                            this.raise(Errors.DeclarationMissingInitializer, {
-                                at: this.state.lastTokEndLoc,
+                            this.raise(Errors.DeclarationMissingInitializer, this.state.lastTokEndLoc, {
                                 kind: "const"
                             });
                         }
@@ -38616,8 +38249,8 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
         {
             key: "parseFunction",
             value: function parseFunction(node) {
-                var flags = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0;
                 var _this = this;
+                var flags = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0;
                 var hangingDeclaration = flags & 2;
                 var isDeclaration3 = !!(flags & 1);
                 var requireId = isDeclaration3 && !(flags & 4);
@@ -38625,9 +38258,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 this.initFunction(node, isAsync);
                 if (this.match(55)) {
                     if (hangingDeclaration) {
-                        this.raise(Errors.GeneratorInSingleStatementContext, {
-                            at: this.state.startLoc
-                        });
+                        this.raise(Errors.GeneratorInSingleStatementContext, this.state.startLoc);
                     }
                     this.next();
                     node.generator = true;
@@ -38724,9 +38355,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     while(!_this.match(8)){
                         if (_this.eat(13)) {
                             if (decorators.length > 0) {
-                                throw _this.raise(Errors.DecoratorSemicolon, {
-                                    at: _this.state.lastTokEndLoc
-                                });
+                                throw _this.raise(Errors.DecoratorSemicolon, _this.state.lastTokEndLoc);
                             }
                             continue;
                         }
@@ -38742,18 +38371,14 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                         }
                         _this.parseClassMember(classBody2, member, state);
                         if (member.kind === "constructor" && member.decorators && member.decorators.length > 0) {
-                            _this.raise(Errors.DecoratorConstructor, {
-                                at: member
-                            });
+                            _this.raise(Errors.DecoratorConstructor, member);
                         }
                     }
                 });
                 this.state.strict = oldStrict;
                 this.next();
                 if (decorators.length) {
-                    throw this.raise(Errors.TrailingDecorator, {
-                        at: this.state.startLoc
-                    });
+                    throw this.raise(Errors.TrailingDecorator, this.state.startLoc);
                 }
                 this.classScope.exit();
                 return this.finishNode(classBody2, "ClassBody");
@@ -38820,9 +38445,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                         return;
                     }
                     if (this.isNonstaticConstructor(publicMethod)) {
-                        this.raise(Errors.ConstructorIsGenerator, {
-                            at: publicMethod.key
-                        });
+                        this.raise(Errors.ConstructorIsGenerator, publicMethod.key);
                     }
                     this.pushClassMethod(classBody2, publicMethod, true, false, false, false);
                     return;
@@ -38843,14 +38466,10 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     if (isConstructor) {
                         publicMethod.kind = "constructor";
                         if (state.hadConstructor && !this.hasPlugin("typescript")) {
-                            this.raise(Errors.DuplicateConstructor, {
-                                at: key
-                            });
+                            this.raise(Errors.DuplicateConstructor, key);
                         }
                         if (isConstructor && this.hasPlugin("typescript") && member.override) {
-                            this.raise(Errors.OverrideOnConstructor, {
-                                at: key
-                            });
+                            this.raise(Errors.OverrideOnConstructor, key);
                         }
                         state.hadConstructor = true;
                         allowsDirectSuper = state.hadSuperClass;
@@ -38876,9 +38495,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                         this.pushClassPrivateMethod(classBody2, privateMethod, isGenerator, true);
                     } else {
                         if (this.isNonstaticConstructor(publicMethod)) {
-                            this.raise(Errors.ConstructorIsAsync, {
-                                at: publicMethod.key
-                            });
+                            this.raise(Errors.ConstructorIsAsync, publicMethod.key);
                         }
                         this.pushClassMethod(classBody2, publicMethod, isGenerator, true, false, false);
                     }
@@ -38891,9 +38508,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                         this.pushClassPrivateMethod(classBody2, privateMethod, false, false);
                     } else {
                         if (this.isNonstaticConstructor(publicMethod)) {
-                            this.raise(Errors.ConstructorIsAccessor, {
-                                at: publicMethod.key
-                            });
+                            this.raise(Errors.ConstructorIsAccessor, publicMethod.key);
                         }
                         this.pushClassMethod(classBody2, publicMethod, false, false, false, false);
                     }
@@ -38920,15 +38535,11 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
             value: function parseClassElementName(member) {
                 var _this_state = this.state, type = _this_state.type, value1 = _this_state.value;
                 if ((type === 132 || type === 133) && member.static && value1 === "prototype") {
-                    this.raise(Errors.StaticPrototype, {
-                        at: this.state.startLoc
-                    });
+                    this.raise(Errors.StaticPrototype, this.state.startLoc);
                 }
                 if (type === 138) {
                     if (value1 === "constructor") {
-                        this.raise(Errors.ConstructorClassPrivateField, {
-                            at: this.state.startLoc
-                        });
+                        this.raise(Errors.ConstructorClassPrivateField, this.state.startLoc);
                     }
                     var key = this.parsePrivateName();
                     member.key = key;
@@ -38952,9 +38563,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 this.state.labels = oldLabels;
                 classBody2.body.push(this.finishNode(member, "StaticBlock"));
                 if ((_member_decorators = member.decorators) === null || _member_decorators === void 0 ? void 0 : _member_decorators.length) {
-                    this.raise(Errors.DecoratorStaticBlock, {
-                        at: member
-                    });
+                    this.raise(Errors.DecoratorStaticBlock, member);
                 }
             }
         },
@@ -38962,9 +38571,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
             key: "pushClassProperty",
             value: function pushClassProperty(classBody2, prop) {
                 if (!prop.computed && (prop.key.name === "constructor" || prop.key.value === "constructor")) {
-                    this.raise(Errors.ConstructorClassField, {
-                        at: prop.key
-                    });
+                    this.raise(Errors.ConstructorClassField, prop.key);
                 }
                 classBody2.body.push(this.parseClassProperty(prop));
             }
@@ -38983,9 +38590,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 if (!isPrivate2 && !prop.computed) {
                     var key = prop.key;
                     if (key.name === "constructor" || key.value === "constructor") {
-                        this.raise(Errors.ConstructorClassField, {
-                            at: key
-                        });
+                        this.raise(Errors.ConstructorClassField, key);
                     }
                 }
                 var node = this.parseClassAccessorProperty(prop);
@@ -39069,9 +38674,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     if (optionalId || !isStatement5) {
                         node.id = null;
                     } else {
-                        throw this.raise(Errors.MissingClassName, {
-                            at: this.state.startLoc
-                        });
+                        throw this.raise(Errors.MissingClassName, this.state.startLoc);
                     }
                 }
             }
@@ -39095,9 +38698,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 if (hasStar && !hasNamespace) {
                     if (hasDefault) this.unexpected();
                     if (decorators) {
-                        throw this.raise(Errors.UnsupportedDecoratorExport, {
-                            at: node
-                        });
+                        throw this.raise(Errors.UnsupportedDecoratorExport, node);
                     }
                     this.parseExportFrom(node, true);
                     return this.finishNode(node, "ExportAllDeclaration");
@@ -39113,9 +38714,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 if (isFromRequired || hasSpecifiers) {
                     hasDeclaration = false;
                     if (decorators) {
-                        throw this.raise(Errors.UnsupportedDecoratorExport, {
-                            at: node
-                        });
+                        throw this.raise(Errors.UnsupportedDecoratorExport, node);
                     }
                     this.parseExportFrom(node, isFromRequired);
                 } else {
@@ -39128,9 +38727,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     if (((_node2_declaration = node2.declaration) === null || _node2_declaration === void 0 ? void 0 : _node2_declaration.type) === "ClassDeclaration") {
                         this.maybeTakeDecorators(decorators, node2.declaration, node2);
                     } else if (decorators) {
-                        throw this.raise(Errors.UnsupportedDecoratorExport, {
-                            at: node
-                        });
+                        throw this.raise(Errors.UnsupportedDecoratorExport, node);
                     }
                     return this.finishNode(node2, "ExportNamedDeclaration");
                 }
@@ -39141,9 +38738,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     if (decl.type === "ClassDeclaration") {
                         this.maybeTakeDecorators(decorators, decl, node21);
                     } else if (decorators) {
-                        throw this.raise(Errors.UnsupportedDecoratorExport, {
-                            at: node
-                        });
+                        throw this.raise(Errors.UnsupportedDecoratorExport, node);
                     }
                     this.checkExport(node21, true, true);
                     return this.finishNode(node21, "ExportDefaultDeclaration");
@@ -39245,16 +38840,12 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 }
                 if (this.match(26)) {
                     if (this.hasPlugin("decorators") && this.getPluginOption("decorators", "decoratorsBeforeExport") === true) {
-                        this.raise(Errors.DecoratorBeforeExport, {
-                            at: this.state.startLoc
-                        });
+                        this.raise(Errors.DecoratorBeforeExport, this.state.startLoc);
                     }
                     return this.parseClass(this.maybeTakeDecorators(this.parseDecorators(false), this.startNode()), true, true);
                 }
                 if (this.match(75) || this.match(74) || this.isLet()) {
-                    throw this.raise(Errors.UnsupportedDefaultExport, {
-                        at: this.state.startLoc
-                    });
+                    throw this.raise(Errors.UnsupportedDefaultExport, this.state.startLoc);
                 }
                 var res = this.parseMaybeAssignAllowIn();
                 this.semicolon();
@@ -39329,9 +38920,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     ]);
                     if (this.hasPlugin("decorators")) {
                         if (this.getPluginOption("decorators", "decoratorsBeforeExport") === true) {
-                            this.raise(Errors.DecoratorBeforeExport, {
-                                at: this.state.startLoc
-                            });
+                            this.raise(Errors.DecoratorBeforeExport, this.state.startLoc);
                         }
                         return true;
                     }
@@ -39350,9 +38939,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                             var _declaration_extra;
                             var declaration = node.declaration;
                             if (declaration.type === "Identifier" && declaration.name === "from" && declaration.end - declaration.start === 4 && !((_declaration_extra = declaration.extra) === null || _declaration_extra === void 0 ? void 0 : _declaration_extra.parenthesized)) {
-                                this.raise(Errors.ExportDefaultFromAsIdentifier, {
-                                    at: declaration
-                                });
+                                this.raise(Errors.ExportDefaultFromAsIdentifier, declaration);
                             }
                         }
                     } else if ((_node_specifiers = node.specifiers) === null || _node_specifiers === void 0 ? void 0 : _node_specifiers.length) {
@@ -39366,8 +38953,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                                 if (!isFrom && specifier.local) {
                                     var local = specifier.local;
                                     if (local.type !== "Identifier") {
-                                        this.raise(Errors.ExportBindingIsString, {
-                                            at: specifier,
+                                        this.raise(Errors.ExportBindingIsString, specifier, {
                                             localName: local.value,
                                             exportName: exportName
                                         });
@@ -39485,12 +39071,9 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
             value: function checkDuplicateExports(node, exportName) {
                 if (this.exportedIdentifiers.has(exportName)) {
                     if (exportName === "default") {
-                        this.raise(Errors.DuplicateDefaultExport, {
-                            at: node
-                        });
+                        this.raise(Errors.DuplicateDefaultExport, node);
                     } else {
-                        this.raise(Errors.DuplicateExport, {
-                            at: node,
+                        this.raise(Errors.DuplicateExport, node, {
                             exportName: exportName
                         });
                     }
@@ -39540,8 +39123,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     var result = this.parseStringLiteral(this.state.value);
                     var surrogate = result.value.match(loneSurrogate);
                     if (surrogate) {
-                        this.raise(Errors.ModuleExportNameHasLoneSurrogate, {
-                            at: result,
+                        this.raise(Errors.ModuleExportNameHasLoneSurrogate, result, {
                             surrogateCharCode: surrogate[0].charCodeAt(0)
                         });
                     }
@@ -39569,27 +39151,19 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 var singleBindingType = specifiers.length === 1 ? specifiers[0].type : null;
                 if (node.phase === "source") {
                     if (singleBindingType !== "ImportDefaultSpecifier") {
-                        this.raise(Errors.SourcePhaseImportRequiresDefault, {
-                            at: specifiers[0].loc.start
-                        });
+                        this.raise(Errors.SourcePhaseImportRequiresDefault, specifiers[0].loc.start);
                     }
                 } else if (node.phase === "defer") {
                     if (singleBindingType !== "ImportNamespaceSpecifier") {
-                        this.raise(Errors.DeferImportRequiresNamespace, {
-                            at: specifiers[0].loc.start
-                        });
+                        this.raise(Errors.DeferImportRequiresNamespace, specifiers[0].loc.start);
                     }
                 } else if (node.module) {
                     var _node_assertions;
                     if (singleBindingType !== "ImportDefaultSpecifier") {
-                        this.raise(Errors.ImportReflectionNotBinding, {
-                            at: specifiers[0].loc.start
-                        });
+                        this.raise(Errors.ImportReflectionNotBinding, specifiers[0].loc.start);
                     }
                     if (((_node_assertions = node.assertions) === null || _node_assertions === void 0 ? void 0 : _node_assertions.length) > 0) {
-                        this.raise(Errors.ImportReflectionHasAssertion, {
-                            at: node.specifiers[0].loc.start
-                        });
+                        this.raise(Errors.ImportReflectionHasAssertion, specifiers[0].loc.start);
                     }
                 }
             }
@@ -39612,9 +39186,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                             }
                         });
                         if (nonDefaultNamedSpecifier !== void 0) {
-                            this.raise(Errors.ImportJSONBindingNotDefault, {
-                                at: nonDefaultNamedSpecifier.loc.start
-                            });
+                            this.raise(Errors.ImportJSONBindingNotDefault, nonDefaultNamedSpecifier.loc.start);
                         }
                     }
                 }
@@ -39751,8 +39323,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     var node = this.startNode();
                     var keyName = this.state.value;
                     if (attrNames.has(keyName)) {
-                        this.raise(Errors.ModuleAttributesWithDuplicateKeys, {
-                            at: this.state.startLoc,
+                        this.raise(Errors.ModuleAttributesWithDuplicateKeys, this.state.startLoc, {
                             key: keyName
                         });
                     }
@@ -39764,9 +39335,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     }
                     this.expect(14);
                     if (!this.match(133)) {
-                        throw this.raise(Errors.ModuleAttributeInvalidValue, {
-                            at: this.state.startLoc
-                        });
+                        throw this.raise(Errors.ModuleAttributeInvalidValue, this.state.startLoc);
                     }
                     node.value = this.parseStringLiteral(this.state.value);
                     attrs.push(this.finishNode(node, "ImportAttribute"));
@@ -39784,22 +39353,17 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     var node = this.startNode();
                     node.key = this.parseIdentifier(true);
                     if (node.key.name !== "type") {
-                        this.raise(Errors.ModuleAttributeDifferentFromType, {
-                            at: node.key
-                        });
+                        this.raise(Errors.ModuleAttributeDifferentFromType, node.key);
                     }
                     if (attributes.has(node.key.name)) {
-                        this.raise(Errors.ModuleAttributesWithDuplicateKeys, {
-                            at: node.key,
+                        this.raise(Errors.ModuleAttributesWithDuplicateKeys, node.key, {
                             key: node.key.name
                         });
                     }
                     attributes.add(node.key.name);
                     this.expect(14);
                     if (!this.match(133)) {
-                        throw this.raise(Errors.ModuleAttributeInvalidValue, {
-                            at: this.state.startLoc
-                        });
+                        throw this.raise(Errors.ModuleAttributeInvalidValue, this.state.startLoc);
                     }
                     node.value = this.parseStringLiteral(this.state.value);
                     attrs.push(this.finishNode(node, "ImportAttribute"));
@@ -39825,9 +39389,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 } else if (this.isContextual(94) && !this.hasPrecedingLineBreak()) {
                     if (this.hasPlugin("importAttributes")) {
                         if (this.getPluginOption("importAttributes", "deprecatedAssertSyntax") !== true) {
-                            this.raise(Errors.ImportAttributesUseAssert, {
-                                at: this.state.startLoc
-                            });
+                            this.raise(Errors.ImportAttributesUseAssert, this.state.startLoc);
                         }
                         this.addExtra(node, "deprecatedAssertSyntax", true);
                     } else {
@@ -39886,9 +39448,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                         first = false;
                     } else {
                         if (this.eat(14)) {
-                            throw this.raise(Errors.DestructureNamedImport, {
-                                at: this.state.startLoc
-                            });
+                            throw this.raise(Errors.DestructureNamedImport, this.state.startLoc);
                         }
                         this.expect(12);
                         if (this.eat(8)) break;
@@ -39910,8 +39470,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 } else {
                     var imported = specifier.imported;
                     if (importedIsString) {
-                        throw this.raise(Errors.ImportBindingIsString, {
-                            at: specifier,
+                        throw this.raise(Errors.ImportBindingIsString, specifier, {
                             importName: imported.value
                         });
                     }
@@ -39964,6 +39523,7 @@ var Parser = /*#__PURE__*/ function(StatementParser) {
                 file2.errors = null;
                 this.parseTopLevel(file2, program3);
                 file2.errors = this.state.errors;
+                file2.comments.length = this.state.commentsLen;
                 return file2;
             }
         }
@@ -51095,10 +50655,14 @@ var NodePath_ancestry = /* @__PURE__ */ Object.freeze({
 var createFlowUnionType2 = lib_exports.createFlowUnionType, createTSUnionType2 = lib_exports.createTSUnionType, createUnionTypeAnnotation = lib_exports.createUnionTypeAnnotation, isFlowType2 = lib_exports.isFlowType, isTSType2 = lib_exports.isTSType;
 function createUnionType(types2) {
     {
-        if (isFlowType2(types2[0])) {
+        if (types2.every(function(v) {
+            return isFlowType2(v);
+        })) {
             return createFlowUnionType2(types2);
         }
-        if (isTSType2(types2[0])) {
+        if (types2.every(function(v) {
+            return isTSType2(v);
+        })) {
             return createTSUnionType2(types2);
         }
     }
@@ -53529,23 +53093,25 @@ function _removeFromScope() {
     });
 }
 function _callRemovalHooks() {
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-    try {
-        for(var _iterator = hooks[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var fn = _step.value;
-            if (fn(this, this.parentPath)) return true;
-        }
-    } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
+    if (this.parentPath) {
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
         try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
+            for(var _iterator = hooks[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var fn = _step.value;
+                if (fn(this, this.parentPath)) return true;
             }
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
         } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                if (_didIteratorError) {
+                    throw _iteratorError;
+                }
             }
         }
     }