unplugin-env 0.1.3 → 0.1.5

package/dist/{chunk-MNU7HARO.js → chunk-2KZLPXSE.js}

@@ -107,9 +107,9 @@ var require_path = __commonJS({
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.convertPosixPathToPattern = exports.convertWindowsPathToPattern = exports.convertPathToPattern = exports.escapePosixPath = exports.escapeWindowsPath = exports.escape = exports.removeLeadingDotSegment = exports.makeAbsolute = exports.unixify = void 0;
-    var os = __require("os");
+    var os2 = __require("os");
     var path2 = __require("path");
-    var IS_WINDOWS_PLATFORM = os.platform() === "win32";
+    var IS_WINDOWS_PLATFORM = os2.platform() === "win32";
     var LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2;
     var POSIX_UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\()|\\(?![!()*+?@[\]{|}]))/g;
     var WINDOWS_UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()[\]{}]|^!|[!+@](?=\())/g;
@@ -3444,8 +3444,8 @@ var require_utils3 = __commonJS({
     exports.array = array;
     var errno = require_errno();
     exports.errno = errno;
-    var fs3 = require_fs();
-    exports.fs = fs3;
+    var fs4 = require_fs();
+    exports.fs = fs4;
     var path2 = require_path();
     exports.path = path2;
     var pattern = require_pattern();
@@ -3629,12 +3629,12 @@ var require_fs2 = __commonJS({
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.createFileSystemAdapter = exports.FILE_SYSTEM_ADAPTER = void 0;
-    var fs3 = __require("fs");
+    var fs4 = __require("fs");
     exports.FILE_SYSTEM_ADAPTER = {
-      lstat: fs3.lstat,
-      stat: fs3.stat,
-      lstatSync: fs3.lstatSync,
-      statSync: fs3.statSync
+      lstat: fs4.lstat,
+      stat: fs4.stat,
+      lstatSync: fs4.lstatSync,
+      statSync: fs4.statSync
     };
     function createFileSystemAdapter(fsMethods) {
       if (fsMethods === void 0) {
@@ -3651,12 +3651,12 @@ var require_settings = __commonJS({
   "node_modules/.pnpm/@nodelib+fs.stat@2.0.5/node_modules/@nodelib/fs.stat/out/settings.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    var fs3 = require_fs2();
+    var fs4 = require_fs2();
     var Settings = class {
       constructor(_options = {}) {
         this._options = _options;
         this.followSymbolicLink = this._getValue(this._options.followSymbolicLink, true);
-        this.fs = fs3.createFileSystemAdapter(this._options.fs);
+        this.fs = fs4.createFileSystemAdapter(this._options.fs);
         this.markSymbolicLink = this._getValue(this._options.markSymbolicLink, false);
         this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true);
       }
@@ -3816,8 +3816,8 @@ var require_utils4 = __commonJS({
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.fs = void 0;
-    var fs3 = require_fs3();
-    exports.fs = fs3;
+    var fs4 = require_fs3();
+    exports.fs = fs4;
   }
 });
 
@@ -4012,14 +4012,14 @@ var require_fs4 = __commonJS({
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.createFileSystemAdapter = exports.FILE_SYSTEM_ADAPTER = void 0;
-    var fs3 = __require("fs");
+    var fs4 = __require("fs");
     exports.FILE_SYSTEM_ADAPTER = {
-      lstat: fs3.lstat,
-      stat: fs3.stat,
-      lstatSync: fs3.lstatSync,
-      statSync: fs3.statSync,
-      readdir: fs3.readdir,
-      readdirSync: fs3.readdirSync
+      lstat: fs4.lstat,
+      stat: fs4.stat,
+      lstatSync: fs4.lstatSync,
+      statSync: fs4.statSync,
+      readdir: fs4.readdir,
+      readdirSync: fs4.readdirSync
     };
     function createFileSystemAdapter(fsMethods) {
       if (fsMethods === void 0) {
@@ -4038,12 +4038,12 @@ var require_settings2 = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     var path2 = __require("path");
     var fsStat = require_out();
-    var fs3 = require_fs4();
+    var fs4 = require_fs4();
     var Settings = class {
       constructor(_options = {}) {
         this._options = _options;
         this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, false);
-        this.fs = fs3.createFileSystemAdapter(this._options.fs);
+        this.fs = fs4.createFileSystemAdapter(this._options.fs);
         this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path2.sep);
         this.stats = this._getValue(this._options.stats, false);
         this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true);
@@ -4124,19 +4124,19 @@ var require_reusify = __commonJS({
   }
 });
 
-// node_modules/.pnpm/fastq@1.15.0/node_modules/fastq/queue.js
+// node_modules/.pnpm/fastq@1.17.1/node_modules/fastq/queue.js
 var require_queue = __commonJS({
-  "node_modules/.pnpm/fastq@1.15.0/node_modules/fastq/queue.js"(exports, module2) {
+  "node_modules/.pnpm/fastq@1.17.1/node_modules/fastq/queue.js"(exports, module2) {
     "use strict";
     var reusify = require_reusify();
-    function fastqueue(context, worker, concurrency) {
+    function fastqueue(context, worker, _concurrency) {
       if (typeof context === "function") {
-        concurrency = worker;
+        _concurrency = worker;
         worker = context;
         context = null;
       }
-      if (concurrency < 1) {
-        throw new Error("fastqueue concurrency must be greater than 1");
+      if (!(_concurrency >= 1)) {
+        throw new Error("fastqueue concurrency must be equal to or greater than 1");
       }
       var cache = reusify(Task);
       var queueHead = null;
@@ -4149,7 +4149,21 @@ var require_queue = __commonJS({
         saturated: noop,
         pause,
         paused: false,
-        concurrency,
+        get concurrency() {
+          return _concurrency;
+        },
+        set concurrency(value) {
+          if (!(value >= 1)) {
+            throw new Error("fastqueue concurrency must be equal to or greater than 1");
+          }
+          _concurrency = value;
+          if (self.paused)
+            return;
+          for (; queueHead && _running < _concurrency; ) {
+            _running++;
+            release();
+          }
+        },
         running,
         resume,
         idle,
@@ -4190,7 +4204,12 @@ var require_queue = __commonJS({
         if (!self.paused)
           return;
         self.paused = false;
-        for (var i = 0; i < self.concurrency; i++) {
+        if (queueHead === null) {
+          _running++;
+          release();
+          return;
+        }
+        for (; queueHead && _running < _concurrency; ) {
           _running++;
           release();
         }
@@ -4205,7 +4224,7 @@ var require_queue = __commonJS({
         current.value = value;
         current.callback = done || noop;
         current.errorHandler = errorHandler;
-        if (_running === self.concurrency || self.paused) {
+        if (_running >= _concurrency || self.paused) {
           if (queueTail) {
             queueTail.next = current;
             queueTail = current;
@@ -4225,7 +4244,8 @@ var require_queue = __commonJS({
         current.release = release;
         current.value = value;
         current.callback = done || noop;
-        if (_running === self.concurrency || self.paused) {
+        current.errorHandler = errorHandler;
+        if (_running >= _concurrency || self.paused) {
           if (queueHead) {
             current.next = queueHead;
             queueHead = current;
@@ -4244,7 +4264,7 @@ var require_queue = __commonJS({
           cache.release(holder);
         }
         var next = queueHead;
-        if (next) {
+        if (next && _running <= _concurrency) {
           if (!self.paused) {
             if (queueTail === queueHead) {
               queueTail = null;
@@ -4300,9 +4320,9 @@ var require_queue = __commonJS({
         self.release(self);
       };
     }
-    function queueAsPromised(context, worker, concurrency) {
+    function queueAsPromised(context, worker, _concurrency) {
       if (typeof context === "function") {
-        concurrency = worker;
+        _concurrency = worker;
         worker = context;
         context = null;
       }
@@ -4311,7 +4331,7 @@ var require_queue = __commonJS({
           cb(null, res);
         }, cb);
       }
-      var queue = fastqueue(context, asyncWrapper, concurrency);
+      var queue = fastqueue(context, asyncWrapper, _concurrency);
       var pushCb = queue.push;
       var unshiftCb = queue.unshift;
       queue.push = push;
@@ -5359,16 +5379,16 @@ var require_settings4 = __commonJS({
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.DEFAULT_FILE_SYSTEM_ADAPTER = void 0;
-    var fs3 = __require("fs");
-    var os = __require("os");
-    var CPU_COUNT = Math.max(os.cpus().length, 1);
+    var fs4 = __require("fs");
+    var os2 = __require("os");
+    var CPU_COUNT = Math.max(os2.cpus().length, 1);
     exports.DEFAULT_FILE_SYSTEM_ADAPTER = {
-      lstat: fs3.lstat,
-      lstatSync: fs3.lstatSync,
-      stat: fs3.stat,
-      statSync: fs3.statSync,
-      readdir: fs3.readdir,
-      readdirSync: fs3.readdirSync
+      lstat: fs4.lstat,
+      lstatSync: fs4.lstatSync,
+      stat: fs4.stat,
+      statSync: fs4.statSync,
+      readdir: fs4.readdir,
+      readdirSync: fs4.readdirSync
     };
     var Settings = class {
       constructor(_options = {}) {
@@ -5514,9 +5534,9 @@ var require_out4 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/base64.js
+// node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/base64.js
 var require_base64 = __commonJS({
-  "node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/base64.js"(exports) {
+  "node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/base64.js"(exports) {
     "use strict";
     var intToCharMap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("");
     exports.encode = function(number) {
@@ -5556,9 +5576,9 @@ var require_base64 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/base64-vlq.js
+// node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/base64-vlq.js
 var require_base64_vlq = __commonJS({
-  "node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/base64-vlq.js"(exports) {
+  "node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/base64-vlq.js"(exports) {
     "use strict";
     var base64 = require_base64();
     var VLQ_BASE_SHIFT = 5;
@@ -5611,9 +5631,9 @@ var require_base64_vlq = __commonJS({
   }
 });
 
-// node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/util.js
+// node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/util.js
 var require_util = __commonJS({
-  "node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/util.js"(exports) {
+  "node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/util.js"(exports) {
     "use strict";
     function getArg(aArgs, aName, aDefaultValue) {
       if (aName in aArgs) {
@@ -5992,9 +6012,9 @@ var require_util = __commonJS({
   }
 });
 
-// node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/array-set.js
+// node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/array-set.js
 var require_array_set = __commonJS({
-  "node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/array-set.js"(exports) {
+  "node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/array-set.js"(exports) {
     "use strict";
     var util = require_util();
     var has = Object.prototype.hasOwnProperty;
@@ -6063,9 +6083,9 @@ var require_array_set = __commonJS({
   }
 });
 
-// node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/mapping-list.js
+// node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/mapping-list.js
 var require_mapping_list = __commonJS({
-  "node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/mapping-list.js"(exports) {
+  "node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/mapping-list.js"(exports) {
     "use strict";
     var util = require_util();
     function generatedPositionAfter(mappingA, mappingB) {
@@ -6103,9 +6123,9 @@ var require_mapping_list = __commonJS({
   }
 });
 
-// node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/source-map-generator.js
+// node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/source-map-generator.js
 var require_source_map_generator = __commonJS({
-  "node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/source-map-generator.js"(exports) {
+  "node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/source-map-generator.js"(exports) {
     "use strict";
     var base64VLQ = require_base64_vlq();
     var util = require_util();
@@ -6118,18 +6138,19 @@ var require_source_map_generator = __commonJS({
       this._file = util.getArg(aArgs, "file", null);
       this._sourceRoot = util.getArg(aArgs, "sourceRoot", null);
       this._skipValidation = util.getArg(aArgs, "skipValidation", false);
+      this._ignoreInvalidMapping = util.getArg(aArgs, "ignoreInvalidMapping", false);
       this._sources = new ArraySet();
       this._names = new ArraySet();
       this._mappings = new MappingList();
       this._sourcesContents = null;
     }
     SourceMapGenerator2.prototype._version = 3;
-    SourceMapGenerator2.fromSourceMap = function SourceMapGenerator_fromSourceMap(aSourceMapConsumer) {
+    SourceMapGenerator2.fromSourceMap = function SourceMapGenerator_fromSourceMap(aSourceMapConsumer, generatorOps) {
       var sourceRoot = aSourceMapConsumer.sourceRoot;
-      var generator = new SourceMapGenerator2({
+      var generator = new SourceMapGenerator2(Object.assign(generatorOps || {}, {
         file: aSourceMapConsumer.file,
         sourceRoot
-      });
+      }));
       aSourceMapConsumer.eachMapping(function(mapping) {
         var newMapping = {
           generated: {
@@ -6173,7 +6194,9 @@ var require_source_map_generator = __commonJS({
       var source = util.getArg(aArgs, "source", null);
       var name = util.getArg(aArgs, "name", null);
       if (!this._skipValidation) {
-        this._validateMapping(generated, original, source, name);
+        if (this._validateMapping(generated, original, source, name) === false) {
+          return;
+        }
       }
       if (source != null) {
         source = String(source);
@@ -6276,21 +6299,35 @@ var require_source_map_generator = __commonJS({
     };
     SourceMapGenerator2.prototype._validateMapping = function SourceMapGenerator_validateMapping(aGenerated, aOriginal, aSource, aName) {
       if (aOriginal && typeof aOriginal.line !== "number" && typeof aOriginal.column !== "number") {
-        throw new Error(
-          "original.line and original.column are not numbers -- you probably meant to omit the original mapping entirely and only map the generated position. If so, pass null for the original mapping instead of an object with empty or null values."
-        );
+        var message = "original.line and original.column are not numbers -- you probably meant to omit the original mapping entirely and only map the generated position. If so, pass null for the original mapping instead of an object with empty or null values.";
+        if (this._ignoreInvalidMapping) {
+          if (typeof console !== "undefined" && console.warn) {
+            console.warn(message);
+          }
+          return false;
+        } else {
+          throw new Error(message);
+        }
       }
       if (aGenerated && "line" in aGenerated && "column" in aGenerated && aGenerated.line > 0 && aGenerated.column >= 0 && !aOriginal && !aSource && !aName) {
         return;
       } else if (aGenerated && "line" in aGenerated && "column" in aGenerated && aOriginal && "line" in aOriginal && "column" in aOriginal && aGenerated.line > 0 && aGenerated.column >= 0 && aOriginal.line > 0 && aOriginal.column >= 0 && aSource) {
         return;
       } else {
-        throw new Error("Invalid mapping: " + JSON.stringify({
+        var message = "Invalid mapping: " + JSON.stringify({
           generated: aGenerated,
           source: aSource,
           original: aOriginal,
           name: aName
-        }));
+        });
+        if (this._ignoreInvalidMapping) {
+          if (typeof console !== "undefined" && console.warn) {
+            console.warn(message);
+          }
+          return false;
+        } else {
+          throw new Error(message);
+        }
       }
     };
     SourceMapGenerator2.prototype._serializeMappings = function SourceMapGenerator_serializeMappings() {
@@ -6380,9 +6417,9 @@ var require_source_map_generator = __commonJS({
   }
 });
 
-// node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/binary-search.js
+// node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/binary-search.js
 var require_binary_search = __commonJS({
-  "node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/binary-search.js"(exports) {
+  "node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/binary-search.js"(exports) {
     "use strict";
     exports.GREATEST_LOWER_BOUND = 1;
     exports.LEAST_UPPER_BOUND = 2;
@@ -6437,9 +6474,9 @@ var require_binary_search = __commonJS({
   }
 });
 
-// node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/quick-sort.js
+// node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/quick-sort.js
 var require_quick_sort = __commonJS({
-  "node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/quick-sort.js"(exports) {
+  "node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/quick-sort.js"(exports) {
     "use strict";
     function SortTemplate(comparator) {
       function swap(ary, x, y) {
@@ -6487,9 +6524,9 @@ var require_quick_sort = __commonJS({
   }
 });
 
-// node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/source-map-consumer.js
+// node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/source-map-consumer.js
 var require_source_map_consumer = __commonJS({
-  "node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/source-map-consumer.js"(exports) {
+  "node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/source-map-consumer.js"(exports) {
     "use strict";
     var util = require_util();
     var binarySearch = require_binary_search();
@@ -7062,7 +7099,7 @@ var require_source_map_consumer = __commonJS({
       for (var i = 0; i < this._sections.length; i++) {
         var section = this._sections[i];
         var content = section.consumer.sourceContentFor(aSource, true);
-        if (content) {
+        if (content || content === "") {
           return content;
         }
       }
@@ -7131,9 +7168,9 @@ var require_source_map_consumer = __commonJS({
   }
 });
 
-// node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/source-node.js
+// node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/source-node.js
 var require_source_node = __commonJS({
-  "node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/lib/source-node.js"(exports) {
+  "node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/lib/source-node.js"(exports) {
     "use strict";
     var SourceMapGenerator2 = require_source_map_generator().SourceMapGenerator;
     var util = require_util();
@@ -7398,9 +7435,9 @@ var require_source_node = __commonJS({
   }
 });
 
-// node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/source-map.js
+// node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/source-map.js
 var require_source_map = __commonJS({
-  "node_modules/.pnpm/source-map-js@1.0.2/node_modules/source-map-js/source-map.js"(exports) {
+  "node_modules/.pnpm/source-map-js@1.2.0/node_modules/source-map-js/source-map.js"(exports) {
     "use strict";
     exports.SourceMapGenerator = require_source_map_generator().SourceMapGenerator;
     exports.SourceMapConsumer = require_source_map_consumer().SourceMapConsumer;
@@ -7408,9 +7445,9 @@ var require_source_map = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@babel+parser@7.23.3/node_modules/@babel/parser/lib/index.js
+// node_modules/.pnpm/@babel+parser@7.24.4/node_modules/@babel/parser/lib/index.js
 var require_lib = __commonJS({
-  "node_modules/.pnpm/@babel+parser@7.23.3/node_modules/@babel/parser/lib/index.js"(exports) {
+  "node_modules/.pnpm/@babel+parser@7.24.4/node_modules/@babel/parser/lib/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", {
       value: true
@@ -7751,8 +7788,8 @@ var require_lib = __commonJS({
       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 = ["toMessage"];
-    var _excluded2$1 = ["message"];
+    var _excluded = ["toMessage"];
+    var _excluded2 = ["message"];
     function defineHidden(obj, key, value) {
       Object.defineProperty(obj, key, {
         enumerable: false,
@@ -7763,11 +7800,8 @@ var require_lib = __commonJS({
     function toParseErrorConstructor(_ref) {
       let {
         toMessage
-      } = _ref, properties = _objectWithoutPropertiesLoose(_ref, _excluded$1);
-      return function constructor({
-        loc,
-        details
-      }) {
+      } = _ref, properties = _objectWithoutPropertiesLoose(_ref, _excluded);
+      return function constructor(loc, details) {
         const error = new SyntaxError();
         Object.assign(error, properties, {
           loc,
@@ -7785,10 +7819,7 @@ var require_lib = __commonJS({
             column,
             index
           } = (_overrides$loc = overrides.loc) != null ? _overrides$loc : loc;
-          return constructor({
-            loc: new Position(line, column, index),
-            details: Object.assign({}, details, overrides.details)
-          });
+          return constructor(new Position(line, column, index), Object.assign({}, details, overrides.details));
         });
         defineHidden(error, "details", details);
         Object.defineProperty(error, "message", {
@@ -7821,7 +7852,7 @@ var require_lib = __commonJS({
           message: template
         } : template, {
           message
-        } = _ref2, rest = _objectWithoutPropertiesLoose(_ref2, _excluded2$1);
+        } = _ref2, rest = _objectWithoutPropertiesLoose(_ref2, _excluded2);
         const toMessage = typeof message === "string" ? () => message : message;
         ParseErrorConstructors[reasonCode] = toParseErrorConstructor(Object.assign({
           code: "BABEL_PARSER_SYNTAX_ERROR",
@@ -8067,13 +8098,9 @@ var require_lib = __commonJS({
       }
       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 {
           super.toAssignableObjectExpressionProp(prop, isLast, isLHS);
         }
@@ -8821,9 +8848,9 @@ var require_lib = __commonJS({
     }
     var Scope = class {
       constructor(flags) {
-        this.var = /* @__PURE__ */ new Set();
-        this.lexical = /* @__PURE__ */ new Set();
-        this.functions = /* @__PURE__ */ new Set();
+        this.flags = 0;
+        this.names = /* @__PURE__ */ new Map();
+        this.firstLexicalName = "";
         this.flags = flags;
       }
     };
@@ -8891,11 +8918,16 @@ var require_lib = __commonJS({
         let scope = this.currentScope();
         if (bindingType & 8 || bindingType & 16) {
           this.checkRedeclarationInScope(scope, name, bindingType, loc);
+          let type = scope.names.get(name) || 0;
           if (bindingType & 16) {
-            scope.functions.add(name);
+            type = type | 4;
           } else {
-            scope.lexical.add(name);
+            if (!scope.firstLexicalName) {
+              scope.firstLexicalName = name;
+            }
+            type = type | 2;
           }
+          scope.names.set(name, type);
           if (bindingType & 8) {
             this.maybeExportDefined(scope, name);
           }
@@ -8903,7 +8935,7 @@ var require_lib = __commonJS({
           for (let i = this.scopeStack.length - 1; i >= 0; --i) {
             scope = this.scopeStack[i];
             this.checkRedeclarationInScope(scope, name, bindingType, loc);
-            scope.var.add(name);
+            scope.names.set(name, (scope.names.get(name) || 0) | 1);
             this.maybeExportDefined(scope, name);
             if (scope.flags & 387)
               break;
@@ -8920,8 +8952,7 @@ var require_lib = __commonJS({
       }
       checkRedeclarationInScope(scope, name, bindingType, loc) {
         if (this.isRedeclaredInScope(scope, name, bindingType)) {
-          this.parser.raise(Errors.VarRedeclaration, {
-            at: loc,
+          this.parser.raise(Errors.VarRedeclaration, loc, {
             identifierName: name
           });
         }
@@ -8930,19 +8961,20 @@ var require_lib = __commonJS({
         if (!(bindingType & 1))
           return false;
         if (bindingType & 8) {
-          return scope.lexical.has(name) || scope.functions.has(name) || scope.var.has(name);
+          return scope.names.has(name);
         }
+        const type = scope.names.get(name);
         if (bindingType & 16) {
-          return scope.lexical.has(name) || !this.treatFunctionsAsVarInScope(scope) && scope.var.has(name);
+          return (type & 2) > 0 || !this.treatFunctionsAsVarInScope(scope) && (type & 1) > 0;
         }
-        return scope.lexical.has(name) && !(scope.flags & 8 && scope.lexical.values().next().value === name) || !this.treatFunctionsAsVarInScope(scope) && scope.functions.has(name);
+        return (type & 2) > 0 && !(scope.flags & 8 && scope.firstLexicalName === name) || !this.treatFunctionsAsVarInScope(scope) && (type & 4) > 0;
       }
       checkLocalExport(id) {
         const {
           name
         } = id;
         const 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);
         }
       }
@@ -8993,8 +9025,9 @@ var require_lib = __commonJS({
       isRedeclaredInScope(scope, name, bindingType) {
         if (super.isRedeclaredInScope(scope, name, bindingType))
           return true;
-        if (bindingType & 2048) {
-          return !scope.declareFunctions.has(name) && (scope.lexical.has(name) || scope.functions.has(name));
+        if (bindingType & 2048 && !scope.declareFunctions.has(name)) {
+          const type = scope.names.get(name);
+          return (type & 4) > 0 || (type & 2) > 0;
         }
         return false;
       }
@@ -9068,7 +9101,13 @@ var require_lib = __commonJS({
       addComment(comment) {
         if (this.filename)
           comment.loc.filename = this.filename;
-        this.state.comments.push(comment);
+        const {
+          commentsLen
+        } = this.state;
+        if (this.comments.length != commentsLen)
+          this.comments.length = commentsLen;
+        this.comments.push(comment);
+        this.state.commentsLen++;
       }
       processComment(node) {
         const {
@@ -9260,7 +9299,7 @@ var require_lib = __commonJS({
     }
     var State = class _State {
       constructor() {
-        this.strict = void 0;
+        this.flags = 1024;
         this.curLine = void 0;
         this.lineStart = void 0;
         this.startLoc = void 0;
@@ -9269,21 +9308,12 @@ var require_lib = __commonJS({
         this.potentialArrowAt = -1;
         this.noArrowAt = [];
         this.noArrowParamsConversionAt = [];
-        this.maybeInArrowParameters = false;
-        this.inType = false;
-        this.noAnonFunctionType = false;
-        this.hasFlowComment = false;
-        this.isAmbientContext = false;
-        this.inAbstractClass = false;
-        this.inDisallowConditionalTypesContext = false;
         this.topicContext = {
           maxNumOfResolvableTopics: 0,
           maxTopicIndex: null
         };
-        this.soloAwait = false;
-        this.inFSharpPipelineDirectBody = false;
         this.labels = [];
-        this.comments = [];
+        this.commentsLen = 0;
         this.commentStack = [];
         this.pos = 0;
         this.type = 139;
@@ -9292,14 +9322,21 @@ var require_lib = __commonJS({
         this.end = 0;
         this.lastTokEndLoc = null;
         this.lastTokStartLoc = null;
-        this.lastTokStart = 0;
         this.context = [types.brace];
-        this.canStartJSXElement = true;
-        this.containsEsc = false;
         this.firstInvalidTemplateEscapePos = null;
         this.strictErrors = /* @__PURE__ */ new Map();
         this.tokensLength = 0;
       }
+      get strict() {
+        return (this.flags & 1) > 0;
+      }
+      set strict(value) {
+        if (value) {
+          this.flags |= 1;
+        } else {
+          this.flags &= ~1;
+        }
+      }
       init({
         strictMode,
         sourceType,
@@ -9311,20 +9348,145 @@ var require_lib = __commonJS({
         this.lineStart = -startColumn;
         this.startLoc = this.endLoc = new Position(startLine, startColumn, 0);
       }
+      get maybeInArrowParameters() {
+        return (this.flags & 2) > 0;
+      }
+      set maybeInArrowParameters(value) {
+        if (value) {
+          this.flags |= 2;
+        } else {
+          this.flags &= ~2;
+        }
+      }
+      get inType() {
+        return (this.flags & 4) > 0;
+      }
+      set inType(value) {
+        if (value) {
+          this.flags |= 4;
+        } else {
+          this.flags &= ~4;
+        }
+      }
+      get noAnonFunctionType() {
+        return (this.flags & 8) > 0;
+      }
+      set noAnonFunctionType(value) {
+        if (value) {
+          this.flags |= 8;
+        } else {
+          this.flags &= ~8;
+        }
+      }
+      get hasFlowComment() {
+        return (this.flags & 16) > 0;
+      }
+      set hasFlowComment(value) {
+        if (value) {
+          this.flags |= 16;
+        } else {
+          this.flags &= ~16;
+        }
+      }
+      get isAmbientContext() {
+        return (this.flags & 32) > 0;
+      }
+      set isAmbientContext(value) {
+        if (value) {
+          this.flags |= 32;
+        } else {
+          this.flags &= ~32;
+        }
+      }
+      get inAbstractClass() {
+        return (this.flags & 64) > 0;
+      }
+      set inAbstractClass(value) {
+        if (value) {
+          this.flags |= 64;
+        } else {
+          this.flags &= ~64;
+        }
+      }
+      get inDisallowConditionalTypesContext() {
+        return (this.flags & 128) > 0;
+      }
+      set inDisallowConditionalTypesContext(value) {
+        if (value) {
+          this.flags |= 128;
+        } else {
+          this.flags &= ~128;
+        }
+      }
+      get soloAwait() {
+        return (this.flags & 256) > 0;
+      }
+      set soloAwait(value) {
+        if (value) {
+          this.flags |= 256;
+        } else {
+          this.flags &= ~256;
+        }
+      }
+      get inFSharpPipelineDirectBody() {
+        return (this.flags & 512) > 0;
+      }
+      set inFSharpPipelineDirectBody(value) {
+        if (value) {
+          this.flags |= 512;
+        } else {
+          this.flags &= ~512;
+        }
+      }
+      get canStartJSXElement() {
+        return (this.flags & 1024) > 0;
+      }
+      set canStartJSXElement(value) {
+        if (value) {
+          this.flags |= 1024;
+        } else {
+          this.flags &= ~1024;
+        }
+      }
+      get containsEsc() {
+        return (this.flags & 2048) > 0;
+      }
+      set containsEsc(value) {
+        if (value) {
+          this.flags |= 2048;
+        } else {
+          this.flags &= ~2048;
+        }
+      }
       curPosition() {
         return new Position(this.curLine, this.pos - this.lineStart, this.pos);
       }
-      clone(skipArrays) {
+      clone() {
         const state = new _State();
-        const keys = Object.keys(this);
-        for (let i = 0, length = keys.length; i < length; i++) {
-          const key = keys[i];
-          let 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;
       }
     };
@@ -9613,8 +9775,6 @@ var require_lib = __commonJS({
         pos
       };
     }
-    var _excluded = ["at"];
-    var _excluded2 = ["at"];
     function buildPosition(pos, lineStart, curLine) {
       return new Position(curLine, pos - lineStart, pos);
     }
@@ -9637,8 +9797,7 @@ var require_lib = __commonJS({
           invalidDigit: (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
             });
             return true;
@@ -9652,28 +9811,23 @@ var require_lib = __commonJS({
         });
         this.errorHandlers_readStringContents_string = Object.assign({}, this.errorHandlers_readCodePoint, {
           strictNumericEscape: (pos, lineStart, curLine) => {
-            this.recordStrictModeErrors(Errors.StrictNumericEscape, {
-              at: buildPosition(pos, lineStart, curLine)
-            });
+            this.recordStrictModeErrors(Errors.StrictNumericEscape, buildPosition(pos, lineStart, curLine));
           },
           unterminated: (pos, lineStart, curLine) => {
-            throw this.raise(Errors.UnterminatedString, {
-              at: buildPosition(pos - 1, lineStart, curLine)
-            });
+            throw this.raise(Errors.UnterminatedString, buildPosition(pos - 1, lineStart, curLine));
           }
         });
         this.errorHandlers_readStringContents_template = Object.assign({}, this.errorHandlers_readCodePoint, {
           strictNumericEscape: this.errorBuilder(Errors.StrictNumericEscape),
           unterminated: (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;
       }
       pushToken(token) {
@@ -9686,7 +9840,6 @@ var require_lib = __commonJS({
         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();
@@ -9761,9 +9914,7 @@ var require_lib = __commonJS({
       setStrict(strict) {
         this.state.strict = strict;
         if (strict) {
-          this.state.strictErrors.forEach(([toParseError, at]) => this.raise(toParseError, {
-            at
-          }));
+          this.state.strictErrors.forEach(([toParseError, at]) => this.raise(toParseError, at));
           this.state.strictErrors.clear();
         }
       }
@@ -9788,9 +9939,7 @@ var require_lib = __commonJS({
         const start = this.state.pos;
         const 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;
@@ -9950,16 +10099,12 @@ var require_lib = __commonJS({
         const nextPos = this.state.pos + 1;
         const 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) {
@@ -10046,9 +10191,7 @@ var require_lib = __commonJS({
           }
           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);
@@ -10056,9 +10199,7 @@ var require_lib = __commonJS({
           }
           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);
@@ -10204,9 +10345,7 @@ var require_lib = __commonJS({
           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);
@@ -10222,9 +10361,7 @@ var require_lib = __commonJS({
           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);
@@ -10327,8 +10464,7 @@ var require_lib = __commonJS({
               return;
             }
         }
-        throw this.raise(Errors.InvalidOrUnexpectedToken, {
-          at: this.state.curPosition(),
+        throw this.raise(Errors.InvalidOrUnexpectedToken, this.state.curPosition(), {
           unexpected: String.fromCodePoint(code2)
         });
       }
@@ -10346,15 +10482,11 @@ var require_lib = __commonJS({
         } = this.state;
         for (; ; ++pos) {
           if (pos >= this.length) {
-            throw this.raise(Errors.UnterminatedRegExp, {
-              at: createPositionWithColumnOffset(startLoc, 1)
-            });
+            throw this.raise(Errors.UnterminatedRegExp, createPositionWithColumnOffset(startLoc, 1));
           }
           const 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;
@@ -10379,26 +10511,18 @@ var require_lib = __commonJS({
           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 (isIdentifierChar(cp) || cp === 92) {
-            this.raise(Errors.MalformedRegExpFlags, {
-              at: nextPos()
-            });
+            this.raise(Errors.MalformedRegExpFlags, nextPos());
           } else {
             break;
           }
@@ -10425,8 +10549,7 @@ var require_lib = __commonJS({
         this.state.pos += 2;
         const val = this.readInt(radix);
         if (val == null) {
-          this.raise(Errors.InvalidDigit, {
-            at: createPositionWithColumnOffset(startLoc, 2),
+          this.raise(Errors.InvalidDigit, createPositionWithColumnOffset(startLoc, 2), {
             radix
           });
         }
@@ -10435,14 +10558,10 @@ var require_lib = __commonJS({
           ++this.state.pos;
           isBigInt = true;
         } else if (next === 109) {
-          throw this.raise(Errors.InvalidDecimal, {
-            at: startLoc
-          });
+          throw this.raise(Errors.InvalidDecimal, startLoc);
         }
         if (isIdentifierStart(this.codePointAtPos(this.state.pos))) {
-          throw this.raise(Errors.NumberIdentifier, {
-            at: this.state.curPosition()
-          });
+          throw this.raise(Errors.NumberIdentifier, this.state.curPosition());
         }
         if (isBigInt) {
           const str = this.input.slice(startLoc.index, this.state.pos).replace(/[_n]/g, "");
@@ -10460,22 +10579,16 @@ var require_lib = __commonJS({
         let hasExponent = false;
         let isOctal = false;
         if (!startsWithDot && this.readInt(10) === null) {
-          this.raise(Errors.InvalidNumber, {
-            at: this.state.curPosition()
-          });
+          this.raise(Errors.InvalidNumber, this.state.curPosition());
         }
         const hasLeadingZero = this.state.pos - start >= 2 && this.input.charCodeAt(start) === 48;
         if (hasLeadingZero) {
           const integer = this.input.slice(start, this.state.pos);
-          this.recordStrictModeErrors(Errors.StrictOctalLiteral, {
-            at: startLoc
-          });
+          this.recordStrictModeErrors(Errors.StrictOctalLiteral, startLoc);
           if (!this.state.strict) {
             const 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);
@@ -10493,9 +10606,7 @@ var require_lib = __commonJS({
             ++this.state.pos;
           }
           if (this.readInt(10) === null) {
-            this.raise(Errors.InvalidOrMissingExponent, {
-              at: startLoc
-            });
+            this.raise(Errors.InvalidOrMissingExponent, startLoc);
           }
           isFloat = true;
           hasExponent = true;
@@ -10503,9 +10614,7 @@ var require_lib = __commonJS({
         }
         if (next === 110) {
           if (isFloat || hasLeadingZero) {
-            this.raise(Errors.InvalidBigIntLiteral, {
-              at: startLoc
-            });
+            this.raise(Errors.InvalidBigIntLiteral, startLoc);
           }
           ++this.state.pos;
           isBigInt = true;
@@ -10513,17 +10622,13 @@ var require_lib = __commonJS({
         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 (isIdentifierStart(this.codePointAtPos(this.state.pos))) {
-          throw this.raise(Errors.NumberIdentifier, {
-            at: this.state.curPosition()
-          });
+          throw this.raise(Errors.NumberIdentifier, this.state.curPosition());
         }
         const str = this.input.slice(start, this.state.pos).replace(/[_mn]/g, "");
         if (isBigInt) {
@@ -10586,14 +10691,10 @@ var require_lib = __commonJS({
           this.finishToken(25, firstInvalidLoc ? null : opening + str + "${");
         }
       }
-      recordStrictModeErrors(toParseError, {
-        at
-      }) {
+      recordStrictModeErrors(toParseError, at) {
         const index = at.index;
         if (this.state.strict && !this.state.strictErrors.has(index)) {
-          this.raise(toParseError, {
-            at
-          });
+          this.raise(toParseError, at);
         } else {
           this.state.strictErrors.set(index, [toParseError, at]);
         }
@@ -10616,9 +10717,7 @@ var require_lib = __commonJS({
             const escStart = this.state.curPosition();
             const identifierCheck = this.state.pos === start ? isIdentifierStart : isIdentifierChar;
             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;
             }
@@ -10626,9 +10725,7 @@ var require_lib = __commonJS({
             const 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);
             }
@@ -10653,77 +10750,59 @@ var require_lib = __commonJS({
           type
         } = this.state;
         if (tokenIsKeyword(type) && this.state.containsEsc) {
-          this.raise(Errors.InvalidEscapedReservedWord, {
-            at: this.state.startLoc,
+          this.raise(Errors.InvalidEscapedReservedWord, this.state.startLoc, {
             reservedWord: tokenLabelName(type)
           });
         }
       }
-      raise(toParseError, raiseProperties) {
-        const {
-          at
-        } = raiseProperties, details = _objectWithoutPropertiesLoose(raiseProperties, _excluded);
+      raise(toParseError, at, details = {}) {
         const loc = at instanceof Position ? at : at.loc.start;
-        const error = toParseError({
-          loc,
-          details
-        });
+        const error = toParseError(loc, details);
         if (!this.options.errorRecovery)
           throw error;
         if (!this.isLookahead)
           this.state.errors.push(error);
         return error;
       }
-      raiseOverwrite(toParseError, raiseProperties) {
-        const {
-          at
-        } = raiseProperties, details = _objectWithoutPropertiesLoose(raiseProperties, _excluded2);
+      raiseOverwrite(toParseError, at, details = {}) {
         const loc = at instanceof Position ? at : at.loc.start;
         const pos = loc.index;
         const errors = this.state.errors;
         for (let i = errors.length - 1; i >= 0; i--) {
           const error = errors[i];
           if (error.loc.index === pos) {
-            return errors[i] = toParseError({
-              loc,
-              details
-            });
+            return errors[i] = toParseError(loc, details);
           }
           if (error.loc.index < pos)
             break;
         }
-        return this.raise(toParseError, raiseProperties);
+        return this.raise(toParseError, at, details);
       }
       updateContext(prevType) {
       }
       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
         });
       }
       expectPlugin(pluginName, loc) {
         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]
         });
       }
       expectOnePlugin(pluginNames) {
         if (!pluginNames.some((name) => this.hasPlugin(name))) {
-          throw this.raise(Errors.MissingOneOfPlugins, {
-            at: this.state.startLoc,
+          throw this.raise(Errors.MissingOneOfPlugins, this.state.startLoc, {
             missingPlugin: pluginNames
           });
         }
       }
       errorBuilder(error) {
         return (pos, lineStart, curLine) => {
-          this.raise(error, {
-            at: buildPosition(pos, lineStart, curLine)
-          });
+          this.raise(error, buildPosition(pos, lineStart, curLine));
         };
       }
     };
@@ -10756,8 +10835,7 @@ var require_lib = __commonJS({
               current.undefinedPrivateNames.set(name, loc);
             }
           } else {
-            this.parser.raise(Errors.InvalidPrivateFieldResolution, {
-              at: loc,
+            this.parser.raise(Errors.InvalidPrivateFieldResolution, loc, {
               identifierName: name
             });
           }
@@ -10785,8 +10863,7 @@ var require_lib = __commonJS({
           }
         }
         if (redefined) {
-          this.parser.raise(Errors.PrivateNameRedeclaration, {
-            at: loc,
+          this.parser.raise(Errors.PrivateNameRedeclaration, loc, {
             identifierName: name
           });
         }
@@ -10802,8 +10879,7 @@ var require_lib = __commonJS({
         if (classScope) {
           classScope.undefinedPrivateNames.set(name, loc);
         } else {
-          this.parser.raise(Errors.InvalidPrivateFieldResolution, {
-            at: loc,
+          this.parser.raise(Errors.InvalidPrivateFieldResolution, loc, {
             identifierName: name
           });
         }
@@ -10825,9 +10901,7 @@ var require_lib = __commonJS({
         super(type);
         this.declarationErrors = /* @__PURE__ */ new Map();
       }
-      recordDeclarationError(ParsingErrorClass, {
-        at
-      }) {
+      recordDeclarationError(ParsingErrorClass, at) {
         const index = at.index;
         this.declarationErrors.set(index, [ParsingErrorClass, at]);
       }
@@ -10850,12 +10924,8 @@ var require_lib = __commonJS({
       exit() {
         this.stack.pop();
       }
-      recordParameterInitializerError(toParseError, {
-        at: node
-      }) {
-        const origin = {
-          at: node.loc.start
-        };
+      recordParameterInitializerError(toParseError, node) {
+        const origin = node.loc.start;
         const {
           stack
         } = this;
@@ -10871,16 +10941,12 @@ var require_lib = __commonJS({
         }
         this.parser.raise(toParseError, origin);
       }
-      recordArrowParameterBindingError(error, {
-        at: node
-      }) {
+      recordArrowParameterBindingError(error, node) {
         const {
           stack
         } = this;
         const scope = stack[stack.length - 1];
-        const origin = {
-          at: node.loc.start
-        };
+        const origin = node.loc.start;
         if (scope.isCertainlyParameterDeclaration()) {
           this.parser.raise(error, origin);
         } else if (scope.canBeArrowParameterDeclaration()) {
@@ -10889,9 +10955,7 @@ var require_lib = __commonJS({
           return;
         }
       }
-      recordAsyncArrowParametersError({
-        at
-      }) {
+      recordAsyncArrowParametersError(at) {
         const {
           stack
         } = this;
@@ -10899,9 +10963,7 @@ var require_lib = __commonJS({
         let scope = stack[i];
         while (scope.canBeArrowParameterDeclaration()) {
           if (scope.type === 2) {
-            scope.recordDeclarationError(Errors.AwaitBindingIdentifier, {
-              at
-            });
+            scope.recordDeclarationError(Errors.AwaitBindingIdentifier, at);
           }
           scope = stack[--i];
         }
@@ -10914,9 +10976,7 @@ var require_lib = __commonJS({
         if (!currentScope.canBeArrowParameterDeclaration())
           return;
         currentScope.iterateErrors(([toParseError, loc]) => {
-          this.parser.raise(toParseError, {
-            at: loc
-          });
+          this.parser.raise(toParseError, loc);
           let i = stack.length - 2;
           let scope = stack[i];
           while (scope.canBeArrowParameterDeclaration()) {
@@ -11006,9 +11066,7 @@ var require_lib = __commonJS({
       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);
         }
@@ -11029,9 +11087,7 @@ var require_lib = __commonJS({
       semicolon(allowAsi = true) {
         if (allowAsi ? this.isLineTerminator() : this.eat(13))
           return;
-        this.raise(Errors.MissingSemicolon, {
-          at: this.state.lastTokEndLoc
-        });
+        this.raise(Errors.MissingSemicolon, this.state.lastTokEndLoc);
       }
       expect(type, loc) {
         this.eat(type) || this.unexpected(loc, type);
@@ -11102,19 +11158,13 @@ var require_lib = __commonJS({
           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);
@@ -11269,7 +11319,8 @@ var require_lib = __commonJS({
     }
     var NodeUtils = class extends UtilParser {
       startNode() {
-        return new Node(this, this.state.start, this.state.startLoc);
+        const loc = this.state.startLoc;
+        return new Node(this, loc.index, loc);
       }
       startNodeAt(loc) {
         return new Node(this, loc.index, loc);
@@ -11471,10 +11522,8 @@ var require_lib = __commonJS({
         const 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 = super.parseExpression();
@@ -11543,9 +11592,7 @@ var require_lib = __commonJS({
             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);
           }
@@ -11583,9 +11630,7 @@ var require_lib = __commonJS({
           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);
             }
             super.parseImport(bodyNode2);
           } else {
@@ -11602,21 +11647,15 @@ var require_lib = __commonJS({
         body.forEach((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;
@@ -11639,8 +11678,7 @@ var require_lib = __commonJS({
         } else {
           if (this.match(75) || this.isLet() || (this.isContextual(130) || this.isContextual(129)) && !insideModule) {
             const 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]
             });
@@ -11738,16 +11776,13 @@ var require_lib = __commonJS({
       }
       checkNotUnderscore(word) {
         if (word === "_") {
-          this.raise(FlowErrors.UnexpectedReservedUnderscore, {
-            at: this.state.startLoc
-          });
+          this.raise(FlowErrors.UnexpectedReservedUnderscore, this.state.startLoc);
         }
       }
       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
         });
       }
@@ -11800,9 +11835,7 @@ var require_lib = __commonJS({
           node.default = this.flowParseType();
         } else {
           if (requireDefault) {
-            this.raise(FlowErrors.MissingTypeParamDefault, {
-              at: nodeStartLoc
-            });
+            this.raise(FlowErrors.MissingTypeParamDefault, nodeStartLoc);
           }
         }
         return this.finishNode(node, "TypeParameter");
@@ -12042,9 +12075,7 @@ var require_lib = __commonJS({
           }
           this.flowObjectTypeSemicolon();
           if (inexactStartLoc && !this.match(8) && !this.match(9)) {
-            this.raise(FlowErrors.UnexpectedExplicitInexactInObject, {
-              at: inexactStartLoc
-            });
+            this.raise(FlowErrors.UnexpectedExplicitInexactInObject, inexactStartLoc);
           }
         }
         this.expect(endDelim);
@@ -12060,33 +12091,23 @@ var require_lib = __commonJS({
           const 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 (variance) {
-              this.raise(FlowErrors.InexactVariance, {
-                at: variance
-              });
+              this.raise(FlowErrors.InexactVariance, variance);
             }
             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 (variance) {
-            this.raise(FlowErrors.SpreadVariance, {
-              at: variance
-            });
+            this.raise(FlowErrors.SpreadVariance, variance);
           }
           node.argument = this.flowParseType();
           return this.finishNode(node, "ObjectTypeSpreadProperty");
@@ -12109,9 +12130,7 @@ var require_lib = __commonJS({
               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")
@@ -12131,19 +12150,13 @@ var require_lib = __commonJS({
         const paramCount = property.kind === "get" ? 0 : 1;
         const 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);
         }
       }
       flowObjectTypeSemicolon() {
@@ -12200,17 +12213,13 @@ var require_lib = __commonJS({
         const 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);
             }
           }
           typeAnnotation = this.flowParseTypeInitialiser();
@@ -12366,9 +12375,7 @@ var require_lib = __commonJS({
               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;
@@ -12633,9 +12640,7 @@ var require_lib = __commonJS({
             [valid, invalid] = this.getArrowLikeExpressions(consequent);
           }
           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;
@@ -12797,13 +12802,9 @@ var require_lib = __commonJS({
         super.parseClassMember(classBody, 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);
           }
         }
       }
@@ -12814,8 +12815,7 @@ var require_lib = __commonJS({
         const word = super.readWord1();
         const 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
           });
         }
@@ -12867,9 +12867,7 @@ var require_lib = __commonJS({
           var _expr$extra;
           const expr = exprList[i];
           if (expr && expr.type === "TypeCastExpression" && !((_expr$extra = expr.extra) != null && _expr$extra.parenthesized) && (exprList.length > 1 || !isParenthesizedExpr)) {
-            this.raise(FlowErrors.TypeCastInPattern, {
-              at: expr.typeAnnotation
-            });
+            this.raise(FlowErrors.TypeCastInPattern, expr.typeAnnotation);
           }
         }
         return exprList;
@@ -12917,16 +12915,12 @@ var require_lib = __commonJS({
         if (method.params && isConstructor) {
           const 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) {
           const params = method.value.params;
           if (params.length > 0 && this.isThisParam(params[0])) {
-            this.raise(FlowErrors.ThisParamBannedInConstructor, {
-              at: method
-            });
+            this.raise(FlowErrors.ThisParamBannedInConstructor, method);
           }
         }
       }
@@ -12966,13 +12960,9 @@ var require_lib = __commonJS({
         if (params.length > 0) {
           const 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);
           }
         }
       }
@@ -12999,28 +12989,20 @@ var require_lib = __commonJS({
       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;
@@ -13028,18 +13010,14 @@ var require_lib = __commonJS({
       parseMaybeDefault(startLoc, left) {
         const node = super.parseMaybeDefault(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;
       }
       checkImportReflection(node) {
         super.checkImportReflection(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);
         }
       }
       parseImportSpecifierLocal(node, specifier, type) {
@@ -13098,8 +13076,7 @@ var require_lib = __commonJS({
             specifier.importKind = specifierTypeKind;
           } else {
             if (importedIsString) {
-              throw this.raise(Errors.ImportBindingIsString, {
-                at: specifier,
+              throw this.raise(Errors.ImportBindingIsString, specifier, {
                 importName: firstIdent.value
               });
             }
@@ -13115,9 +13092,7 @@ var require_lib = __commonJS({
         }
         const 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);
@@ -13203,9 +13178,7 @@ var require_lib = __commonJS({
           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;
             }
@@ -13223,9 +13196,7 @@ var require_lib = __commonJS({
             throw jsx2.error;
           if (arrow.thrown)
             throw arrow.error;
-          throw this.raise(FlowErrors.UnexpectedTokenAfterTypeParameter, {
-            at: typeParameters
-          });
+          throw this.raise(FlowErrors.UnexpectedTokenAfterTypeParameter, typeParameters);
         }
         return super.parseMaybeAssign(refExpressionErrors, afterLeftParse);
       }
@@ -13267,9 +13238,7 @@ var require_lib = __commonJS({
         }
         for (let 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]);
           }
         }
         super.checkParams(node, allowDuplicates, isArrowFunction, strictModeChanged);
@@ -13375,18 +13344,14 @@ var require_lib = __commonJS({
       parseTopLevel(file, program) {
         const fileNode = super.parseTopLevel(file, program);
         if (this.state.hasFlowComment) {
-          this.raise(FlowErrors.UnterminatedFlowComment, {
-            at: this.state.curPosition()
-          });
+          this.raise(FlowErrors.UnterminatedFlowComment, this.state.curPosition());
         }
         return fileNode;
       }
       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();
           const commentSkip = this.skipFlowComment();
@@ -13422,43 +13387,26 @@ var require_lib = __commonJS({
       hasFlowCommentCompletion() {
         const 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());
         }
       }
       flowEnumErrorBooleanMemberNotInitialized(loc, {
         enumName,
         memberName
       }) {
-        this.raise(FlowErrors.EnumBooleanMemberNotInitialized, {
-          at: loc,
+        this.raise(FlowErrors.EnumBooleanMemberNotInitialized, loc, {
           memberName,
           enumName
         });
       }
       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);
       }
-      flowEnumErrorNumberMemberNotInitialized(loc, {
-        enumName,
-        memberName
-      }) {
-        this.raise(FlowErrors.EnumNumberMemberNotInitialized, {
-          at: loc,
-          enumName,
-          memberName
-        });
+      flowEnumErrorNumberMemberNotInitialized(loc, details) {
+        this.raise(FlowErrors.EnumNumberMemberNotInitialized, loc, details);
       }
-      flowEnumErrorStringMemberInconsistentlyInitialized(node, {
-        enumName
-      }) {
-        this.raise(FlowErrors.EnumStringMemberInconsistentlyInitialized, {
-          at: node,
-          enumName
-        });
+      flowEnumErrorStringMemberInconsistentlyInitialized(node, details) {
+        this.raise(FlowErrors.EnumStringMemberInconsistentlyInitialized, node, details);
       }
       flowEnumMemberInit() {
         const startLoc = this.state.startLoc;
@@ -13564,16 +13512,14 @@ var require_lib = __commonJS({
             continue;
           }
           if (/^[a-z]/.test(memberName)) {
-            this.raise(FlowErrors.EnumInvalidMemberName, {
-              at: id,
+            this.raise(FlowErrors.EnumInvalidMemberName, id, {
               memberName,
               suggestion: memberName[0].toUpperCase() + memberName.slice(1),
               enumName
             });
           }
           if (seenNames.has(memberName)) {
-            this.raise(FlowErrors.EnumDuplicateMemberName, {
-              at: id,
+            this.raise(FlowErrors.EnumDuplicateMemberName, id, {
               memberName,
               enumName
             });
@@ -13658,8 +13604,7 @@ var require_lib = __commonJS({
         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
           });
         }
@@ -13668,8 +13613,7 @@ var require_lib = __commonJS({
         } = this.state;
         this.next();
         if (value !== "boolean" && value !== "number" && value !== "string" && value !== "symbol") {
-          this.raise(FlowErrors.EnumInvalidExplicitType, {
-            at: this.state.startLoc,
+          this.raise(FlowErrors.EnumInvalidExplicitType, this.state.startLoc, {
             enumName,
             invalidEnumType: value
           });
@@ -13753,8 +13697,7 @@ var require_lib = __commonJS({
               this.expect(8);
               return this.finishNode(node, "EnumNumberBody");
             } else {
-              this.raise(FlowErrors.EnumInconsistentMemberValues, {
-                at: nameLoc,
+              this.raise(FlowErrors.EnumInconsistentMemberValues, nameLoc, {
                 enumName
               });
               return empty();
@@ -14072,9 +14015,7 @@ var require_lib = __commonJS({
         let 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);
           }
           const ch = this.input.charCodeAt(this.state.pos);
           switch (ch) {
@@ -14129,9 +14070,7 @@ var require_lib = __commonJS({
         let 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);
           }
           const ch = this.input.charCodeAt(this.state.pos);
           if (ch === quote)
@@ -14236,18 +14175,14 @@ var require_lib = __commonJS({
             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);
         }
       }
       jsxParseEmptyExpression() {
@@ -14354,18 +14289,14 @@ var require_lib = __commonJS({
               }
             }
           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)
               });
             }
@@ -14380,9 +14311,7 @@ var require_lib = __commonJS({
         }
         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");
       }
@@ -14469,11 +14398,7 @@ var require_lib = __commonJS({
     var TypeScriptScope = class extends Scope {
       constructor(...args) {
         super(...args);
-        this.types = /* @__PURE__ */ new Set();
-        this.enums = /* @__PURE__ */ new Set();
-        this.constEnums = /* @__PURE__ */ new Set();
-        this.classes = /* @__PURE__ */ new Set();
-        this.exportOnlyBindings = /* @__PURE__ */ new Set();
+        this.tsNames = /* @__PURE__ */ new Map();
       }
     };
     var TypeScriptScopeHandler = class extends ScopeHandler {
@@ -14514,8 +14439,7 @@ var require_lib = __commonJS({
       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
             });
           }
@@ -14523,9 +14447,10 @@ var require_lib = __commonJS({
           return;
         }
         const scope = this.currentScope();
+        let type = scope.tsNames.get(name) || 0;
         if (bindingType & 1024) {
           this.maybeExportDefined(scope, name);
-          scope.exportOnlyBindings.add(name);
+          scope.tsNames.set(name, type | 16);
           return;
         }
         super.declareName(name, bindingType, loc);
@@ -14534,33 +14459,38 @@ var require_lib = __commonJS({
             this.checkRedeclarationInScope(scope, name, bindingType, loc);
             this.maybeExportDefined(scope, name);
           }
-          scope.types.add(name);
+          type = type | 1;
+        }
+        if (bindingType & 256) {
+          type = type | 2;
         }
-        if (bindingType & 256)
-          scope.enums.add(name);
         if (bindingType & 512) {
-          scope.constEnums.add(name);
+          type = type | 4;
+        }
+        if (bindingType & 128) {
+          type = type | 8;
         }
-        if (bindingType & 128)
-          scope.classes.add(name);
+        if (type)
+          scope.tsNames.set(name, type);
       }
       isRedeclaredInScope(scope, name, bindingType) {
-        if (scope.enums.has(name)) {
+        const type = scope.tsNames.get(name);
+        if ((type & 2) > 0) {
           if (bindingType & 256) {
             const isConst = !!(bindingType & 512);
-            const wasConst = scope.constEnums.has(name);
+            const wasConst = (type & 4) > 0;
             return isConst !== wasConst;
           }
           return true;
         }
-        if (bindingType & 128 && scope.classes.has(name)) {
-          if (scope.lexical.has(name)) {
+        if (bindingType & 128 && (type & 8) > 0) {
+          if (scope.names.get(name) & 2) {
             return !!(bindingType & 1);
           } else {
             return false;
           }
         }
-        if (bindingType & 2 && scope.types.has(name)) {
+        if (bindingType & 2 && (type & 1) > 0) {
           return true;
         }
         return super.isRedeclaredInScope(scope, name, bindingType);
@@ -14574,13 +14504,15 @@ var require_lib = __commonJS({
         const len = this.scopeStack.length;
         for (let i = len - 1; i >= 0; i--) {
           const scope = this.scopeStack[i];
-          if (scope.types.has(name) || scope.exportOnlyBindings.has(name))
+          const type = scope.tsNames.get(name);
+          if ((type & 1) > 0 || (type & 16) > 0) {
             return;
+          }
         }
         super.checkLocalExport(id);
       }
     };
-    var getOwn$1 = (object, key) => Object.hasOwnProperty.call(object, key) && object[key];
+    var getOwn$1 = (object, key) => hasOwnProperty.call(object, key) && object[key];
     var unwrapParenthesizedExpression = (node) => {
       return node.type === "ParenthesizedExpression" ? unwrapParenthesizedExpression(node.expression) : node;
     };
@@ -14592,18 +14524,12 @@ var require_lib = __commonJS({
           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) {
@@ -14621,9 +14547,7 @@ var require_lib = __commonJS({
               const isLast = i === last;
               this.toAssignableObjectExpressionProp(prop, isLast, isLHS);
               if (isLast && prop.type === "RestElement" && (_node$extra2 = node.extra) != null && _node$extra2.trailingCommaLoc) {
-                this.raise(Errors.RestTrailingComma, {
-                  at: node.extra.trailingCommaLoc
-                });
+                this.raise(Errors.RestTrailingComma, node.extra.trailingCommaLoc);
               }
             }
             break;
@@ -14647,9 +14571,7 @@ var require_lib = __commonJS({
             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;
@@ -14662,18 +14584,14 @@ var require_lib = __commonJS({
       }
       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";
           const 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);
@@ -14695,13 +14613,9 @@ var require_lib = __commonJS({
           }
           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);
             }
           }
         }
@@ -14796,9 +14710,7 @@ var require_lib = __commonJS({
           } else {
             const 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());
@@ -14884,16 +14796,13 @@ var require_lib = __commonJS({
           if (isOptionalMemberExpression) {
             this.expectPlugin("optionalChainingAssign", expression.loc.start);
             if (ancestor.type !== "AssignmentExpression") {
-              this.raise(Errors.InvalidLhsOptionalChaining, {
-                at: expression,
+              this.raise(Errors.InvalidLhsOptionalChaining, expression, {
                 ancestor
               });
             }
           }
           if (binding !== 64) {
-            this.raise(Errors.InvalidPropertyBindingPattern, {
-              at: expression
-            });
+            this.raise(Errors.InvalidPropertyBindingPattern, expression);
           }
           return;
         }
@@ -14904,9 +14813,7 @@ var require_lib = __commonJS({
           } = expression;
           if (checkClashes) {
             if (checkClashes.has(name)) {
-              this.raise(Errors.ParamDupe, {
-                at: expression
-              });
+              this.raise(Errors.ParamDupe, expression);
             } else {
               checkClashes.add(name);
             }
@@ -14918,8 +14825,7 @@ var require_lib = __commonJS({
           return;
         if (validity === false) {
           const ParseErrorClass = binding === 64 ? Errors.InvalidLhs : Errors.InvalidLhsBinding;
-          this.raise(ParseErrorClass, {
-            at: expression,
+          this.raise(ParseErrorClass, expression, {
             ancestor
           });
           return;
@@ -14943,21 +14849,17 @@ var require_lib = __commonJS({
       checkIdentifier(at, bindingType, strictModeChanged = false) {
         if (this.state.strict && (strictModeChanged ? isStrictBindReservedWord(at.name, this.inModule) : isStrictBindOnlyReservedWord(at.name))) {
           if (bindingType === 64) {
-            this.raise(Errors.StrictEvalArguments, {
-              at,
+            this.raise(Errors.StrictEvalArguments, at, {
               referenceName: at.name
             });
           } else {
-            this.raise(Errors.StrictEvalArgumentsBinding, {
-              at,
+            this.raise(Errors.StrictEvalArgumentsBinding, at, {
               bindingName: at.name
             });
           }
         }
         if (bindingType & 8192 && at.name === "let") {
-          this.raise(Errors.LetInLexicalBinding, {
-            at
-          });
+          this.raise(Errors.LetInLexicalBinding, at);
         }
         if (!(bindingType & 64)) {
           this.declareNameFromIdentifier(at, bindingType);
@@ -14979,22 +14881,18 @@ var require_lib = __commonJS({
             if (allowPattern)
               break;
           default:
-            this.raise(Errors.InvalidRestAssignmentPattern, {
-              at: node
-            });
+            this.raise(Errors.InvalidRestAssignmentPattern, node);
         }
       }
       checkCommaAfterRest(close) {
         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;
       }
     };
-    var getOwn = (object, key) => Object.hasOwnProperty.call(object, key) && object[key];
+    var getOwn = (object, key) => hasOwnProperty.call(object, key) && object[key];
     function nonNull(x) {
       if (x == null) {
         throw new Error(`Unexpected ${x} value.`);
@@ -15186,16 +15084,14 @@ var require_lib = __commonJS({
       }, modified) {
         const enforceOrder = (loc, modifier, before, after) => {
           if (modifier === before && modified[after]) {
-            this.raise(TSErrors.InvalidModifiersOrder, {
-              at: loc,
+            this.raise(TSErrors.InvalidModifiersOrder, loc, {
               orderedModifiers: [before, after]
             });
           }
         };
         const incompatible = (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]
             });
           }
@@ -15209,8 +15105,7 @@ var require_lib = __commonJS({
             break;
           if (tsIsAccessModifier(modifier)) {
             if (modified.accessibility) {
-              this.raise(TSErrors.DuplicateAccessibilityModifier, {
-                at: startLoc,
+              this.raise(TSErrors.DuplicateAccessibilityModifier, startLoc, {
                 modifier
               });
             } else {
@@ -15221,17 +15116,15 @@ var require_lib = __commonJS({
             }
           } else if (tsIsVarianceAnnotations(modifier)) {
             if (modified[modifier]) {
-              this.raise(TSErrors.DuplicateModifier, {
-                at: startLoc,
+              this.raise(TSErrors.DuplicateModifier, startLoc, {
                 modifier
               });
             }
             modified[modifier] = true;
             enforceOrder(startLoc, modifier, "in", "out");
           } else {
-            if (Object.hasOwnProperty.call(modified, modifier)) {
-              this.raise(TSErrors.DuplicateModifier, {
-                at: startLoc,
+            if (hasOwnProperty.call(modified, modifier)) {
+              this.raise(TSErrors.DuplicateModifier, startLoc, {
                 modifier
               });
             } else {
@@ -15245,8 +15138,7 @@ var require_lib = __commonJS({
             modified[modifier] = true;
           }
           if (disallowedModifiers != null && disallowedModifiers.includes(modifier)) {
-            this.raise(errorTemplate, {
-              at: startLoc,
+            this.raise(errorTemplate, startLoc, {
               modifier
             });
           }
@@ -15289,7 +15181,7 @@ var require_lib = __commonJS({
           }
           result.push(element);
           if (this.eat(12)) {
-            trailingCommaPos = this.state.lastTokStart;
+            trailingCommaPos = this.state.lastTokStartLoc.index;
             continue;
           }
           if (this.tsIsListTerminator(kind)) {
@@ -15326,11 +15218,19 @@ var require_lib = __commonJS({
         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 = super.parseExprAtom();
+        if (this.hasPlugin("importAttributes") || this.hasPlugin("importAssertions")) {
+          node.options = null;
+        }
+        if (this.eat(12)) {
+          this.expectImportAttributesPlugin();
+          if (!this.match(11)) {
+            node.options = super.parseMaybeAssignAllowIn();
+            this.eat(12);
+          }
+        }
         this.expect(11);
         if (this.eat(16)) {
           node.qualifier = this.tsParseEntityName();
@@ -15409,9 +15309,7 @@ var require_lib = __commonJS({
         };
         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);
@@ -15438,8 +15336,7 @@ var require_lib = __commonJS({
             type
           } = pattern;
           if (type === "AssignmentPattern" || type === "TSParameterProperty") {
-            this.raise(TSErrors.UnsupportedSignatureParameterKind, {
-              at: pattern,
+            this.raise(TSErrors.UnsupportedSignatureParameterKind, pattern, {
               type
             });
           }
@@ -15486,15 +15383,11 @@ var require_lib = __commonJS({
         const nodeAny = node;
         if (this.match(10) || this.match(47)) {
           if (readonly) {
-            this.raise(TSErrors.ReadonlyForMethodSignature, {
-              at: node
-            });
+            this.raise(TSErrors.ReadonlyForMethodSignature, node);
           }
           const 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();
@@ -15502,42 +15395,28 @@ var require_lib = __commonJS({
           const returnTypeKey = "typeAnnotation";
           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 {
               const 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";
@@ -15654,9 +15533,7 @@ var require_lib = __commonJS({
             type
           } = elementNode;
           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");
         });
@@ -15709,16 +15586,12 @@ var require_lib = __commonJS({
             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();
           }
@@ -15872,9 +15745,7 @@ var require_lib = __commonJS({
           case "TSArrayType":
             return;
           default:
-            this.raise(TSErrors.UnexpectedReadonly, {
-              at: node
-            });
+            this.raise(TSErrors.UnexpectedReadonly, node);
         }
       }
       tsParseInferType() {
@@ -16042,8 +15913,7 @@ var require_lib = __commonJS({
           return false;
         }
         if (containsEsc) {
-          this.raise(Errors.InvalidEscapedReservedWord, {
-            at: this.state.lastTokStartLoc,
+          this.raise(Errors.InvalidEscapedReservedWord, this.state.lastTokStartLoc, {
             reservedWord: "asserts"
           });
         }
@@ -16088,9 +15958,7 @@ var require_lib = __commonJS({
       }
       tsParseTypeAssertion() {
         if (this.getPluginOption("typescript", "disallowAmbiguousJSXLike")) {
-          this.raise(TSErrors.ReservedTypeAssertion, {
-            at: this.state.startLoc
-          });
+          this.raise(TSErrors.ReservedTypeAssertion, this.state.startLoc);
         }
         const node = this.startNode();
         node.typeAnnotation = this.tsInType(() => {
@@ -16112,8 +15980,7 @@ var require_lib = __commonJS({
           return this.finishNode(node, "TSExpressionWithTypeArguments");
         });
         if (!delimitedList.length) {
-          this.raise(TSErrors.EmptyHeritageClauseType, {
-            at: originalStartLoc,
+          this.raise(TSErrors.EmptyHeritageClauseType, originalStartLoc, {
             token
           });
         }
@@ -16130,9 +15997,7 @@ var require_lib = __commonJS({
           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)) {
@@ -16286,9 +16151,7 @@ var require_lib = __commonJS({
         this.expect(29);
         const 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();
@@ -16479,9 +16342,7 @@ var require_lib = __commonJS({
           return this.tsParseDelimitedList("TypeParametersOrArguments", this.tsParseType.bind(this));
         }));
         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();
         }
@@ -16506,9 +16367,7 @@ var require_lib = __commonJS({
         const override = modified.override;
         const readonly = modified.readonly;
         if (!(flags & 4) && (accessibility || readonly || override)) {
-          this.raise(TSErrors.UnexpectedParameterModifier, {
-            at: startLoc
-          });
+          this.raise(TSErrors.UnexpectedParameterModifier, startLoc);
         }
         const left = this.parseMaybeDefault();
         this.parseAssignableListItemTypes(left, flags);
@@ -16525,9 +16384,7 @@ var require_lib = __commonJS({
           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");
@@ -16543,9 +16400,7 @@ var require_lib = __commonJS({
       tsDisallowOptionalPattern(node) {
         for (const param of node.params) {
           if (param.type !== "Identifier" && param.optional && !this.state.isAmbientContext) {
-            this.raise(TSErrors.PatternIsOptional, {
-              at: param
-            });
+            this.raise(TSErrors.PatternIsOptional, param);
           }
         }
       }
@@ -16562,9 +16417,7 @@ var require_lib = __commonJS({
           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 super.parseFunctionBodyAndFinish(node, bodilessType, isMethod);
           }
@@ -16582,9 +16435,7 @@ var require_lib = __commonJS({
       tsCheckForInvalidTypeCasts(items) {
         items.forEach((node) => {
           if ((node == null ? void 0 : node.type) === "TSTypeCastExpression") {
-            this.raise(TSErrors.UnexpectedTypeAnnotation, {
-              at: node.typeAnnotation
-            });
+            this.raise(TSErrors.UnexpectedTypeAnnotation, node.typeAnnotation);
           }
         });
       }
@@ -16662,9 +16513,7 @@ var require_lib = __commonJS({
           }
           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;
           }
@@ -16691,8 +16540,7 @@ var require_lib = __commonJS({
             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"
                 });
               }
@@ -16714,9 +16562,7 @@ var require_lib = __commonJS({
       checkImportReflection(node) {
         super.checkImportReflection(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);
         }
       }
       checkDuplicateExports() {
@@ -16758,9 +16604,7 @@ var require_lib = __commonJS({
           importNode = super.parseImport(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;
       }
@@ -16821,13 +16665,9 @@ var require_lib = __commonJS({
           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);
           }
         }
         return declaration;
@@ -16877,9 +16717,7 @@ var require_lib = __commonJS({
             this.next();
             this.next();
             if (this.tsHasSomeModifiers(member, modifiers)) {
-              this.raise(TSErrors.StaticBlockCannotHaveModifier, {
-                at: this.state.curPosition()
-              });
+              this.raise(TSErrors.StaticBlockCannotHaveModifier, this.state.curPosition());
             }
             super.parseClassStaticBlock(classBody, member);
           } else {
@@ -16897,38 +16735,27 @@ var require_lib = __commonJS({
         if (idx) {
           classBody.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);
           }
         }
         super.parseClassMemberWithIsStatic(classBody, member, state, isStatic);
@@ -16938,14 +16765,10 @@ var require_lib = __commonJS({
         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);
         }
       }
       parseExpressionStatement(node, expr, decorators) {
@@ -16993,9 +16816,7 @@ var require_lib = __commonJS({
         const startLoc = this.state.startLoc;
         const 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);
         }
         const isIdentifier = tokenIsIdentifier(this.state.type);
         const declaration = isIdentifier && this.tsTryParseExportDeclaration() || super.parseExportDeclaration(node);
@@ -17034,16 +16855,13 @@ var require_lib = __commonJS({
       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)) {
           const {
             key
           } = node;
-          this.raise(TSErrors.AbstractPropertyHasInitializer, {
-            at: this.state.startLoc,
+          this.raise(TSErrors.AbstractPropertyHasInitializer, this.state.startLoc, {
             propertyName: key.type === "Identifier" && !node.computed ? key.name : `[${this.input.slice(key.start, key.end)}]`
           });
         }
@@ -17051,13 +16869,10 @@ var require_lib = __commonJS({
       }
       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
           });
         }
@@ -17067,26 +16882,21 @@ var require_lib = __commonJS({
       parseClassAccessorProperty(node) {
         this.parseClassPropertyAnnotation(node);
         if (node.optional) {
-          this.raise(TSErrors.AccessorCannotBeOptional, {
-            at: node
-          });
+          this.raise(TSErrors.AccessorCannotBeOptional, node);
         }
         return super.parseClassAccessorProperty(node);
       }
       pushClassMethod(classBody, method, isGenerator, isAsync, isConstructor, allowsDirectSuper) {
         const typeParameters = this.tsTryParseTypeParameters(this.tsParseConstModifier);
         if (typeParameters && isConstructor) {
-          this.raise(TSErrors.ConstructorHasTypeParameters, {
-            at: typeParameters
-          });
+          this.raise(TSErrors.ConstructorHasTypeParameters, typeParameters);
         }
         const {
           declare = false,
           kind
         } = method;
         if (declare && (kind === "get" || kind === "set")) {
-          this.raise(TSErrors.DeclareAccessor, {
-            at: method,
+          this.raise(TSErrors.DeclareAccessor, method, {
             kind
           });
         }
@@ -17212,9 +17022,7 @@ var require_lib = __commonJS({
       reportReservedArrowTypeParam(node) {
         var _node$extra;
         if (node.params.length === 1 && !node.params[0].constraint && !((_node$extra = node.extra) != null && _node$extra.trailingComma) && this.getPluginOption("typescript", "disallowAmbiguousJSXLike")) {
-          this.raise(TSErrors.ReservedArrowTypeParam, {
-            at: node
-          });
+          this.raise(TSErrors.ReservedArrowTypeParam, node);
         }
       }
       parseMaybeUnary(refExpressionErrors, sawUnary) {
@@ -17273,13 +17081,9 @@ var require_lib = __commonJS({
           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;
@@ -17360,9 +17164,7 @@ var require_lib = __commonJS({
       parseMaybeDefault(startLoc, left) {
         const node = super.parseMaybeDefault(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;
       }
@@ -17477,9 +17279,7 @@ var require_lib = __commonJS({
         } 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 {
@@ -17494,8 +17294,7 @@ var require_lib = __commonJS({
             const {
               key
             } = method;
-            this.raise(TSErrors.AbstractMethodHasImplementation, {
-              at: method,
+            this.raise(TSErrors.AbstractMethodHasImplementation, method, {
               methodName: key.type === "Identifier" && !method.computed ? key.name : `[${this.input.slice(key.start, key.end)}]`
             });
           }
@@ -17577,9 +17376,7 @@ var require_lib = __commonJS({
           }
         }
         if (hasTypeSpecifier && isInTypeOnlyImportExport) {
-          this.raise(isImport ? TSErrors.TypeModifierIsUsedInTypeImports : TSErrors.TypeModifierIsUsedInTypeExports, {
-            at: loc
-          });
+          this.raise(isImport ? TSErrors.TypeModifierIsUsedInTypeImports : TSErrors.TypeModifierIsUsedInTypeExports, loc);
         }
         node[leftOfAsKey] = leftOfAs;
         node[rightOfAsKey] = rightOfAs;
@@ -17769,9 +17566,7 @@ var require_lib = __commonJS({
             node.body = this.finishPlaceholder(placeholder, "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, isStatement, optionalId);
@@ -17852,9 +17647,7 @@ var require_lib = __commonJS({
       }
       assertNoSpace() {
         if (this.state.start > this.state.lastTokEndLoc.index) {
-          this.raise(PlaceholderErrors.UnexpectedSpace, {
-            at: this.state.lastTokEndLoc
-          });
+          this.raise(PlaceholderErrors.UnexpectedSpace, this.state.lastTokEndLoc);
         }
       }
     };
@@ -18043,9 +17836,7 @@ var require_lib = __commonJS({
         const 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) {
@@ -18054,9 +17845,7 @@ var require_lib = __commonJS({
                 refExpressionErrors.doubleProtoLoc = key.loc.start;
               }
             } else {
-              this.raise(Errors.DuplicateProto, {
-                at: key
-              });
+              this.raise(Errors.DuplicateProto, key);
             }
           }
           protoRef.used = true;
@@ -18073,7 +17862,7 @@ var require_lib = __commonJS({
           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;
@@ -18206,8 +17995,7 @@ var require_lib = __commonJS({
         if (this.isPrivateName(left)) {
           const value = 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: value
             });
           }
@@ -18237,18 +18025,14 @@ var require_lib = __commonJS({
               proposal: "minimal"
             }])) {
               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);
             const finishedNode = this.finishNode(node, logical || coalesce ? "LogicalExpression" : "BinaryExpression");
             const 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);
           }
@@ -18267,9 +18051,7 @@ var require_lib = __commonJS({
               case "smart":
                 return this.withTopicBindingContext(() => {
                   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);
                 });
@@ -18294,23 +18076,18 @@ var require_lib = __commonJS({
         const body = this.parseMaybeAssign();
         const requiredParentheses = UnparenthesizedPipeBodyDescriptions.has(body.type);
         if (requiredParentheses && !((_body$extra = body.extra) != null && _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;
       }
       checkExponentialAfterUnary(node) {
         if (this.match(57)) {
-          this.raise(Errors.UnexpectedTokenUnaryExponentiation, {
-            at: node.argument
-          });
+          this.raise(Errors.UnexpectedTokenUnaryExponentiation, node.argument);
         }
       }
       parseMaybeUnary(refExpressionErrors, sawUnary) {
@@ -18338,13 +18115,9 @@ var require_lib = __commonJS({
           if (this.state.strict && isDelete) {
             const 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) {
@@ -18361,9 +18134,7 @@ var require_lib = __commonJS({
           } = this.state;
           const 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);
           }
         }
@@ -18426,9 +18197,7 @@ var require_lib = __commonJS({
         let 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;
@@ -18458,9 +18227,7 @@ var require_lib = __commonJS({
           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();
@@ -18530,9 +18297,7 @@ var require_lib = __commonJS({
         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");
       }
@@ -18554,16 +18319,13 @@ var require_lib = __commonJS({
             }
           }
           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 {
             for (const arg of node.arguments) {
               if (arg.type === "SpreadElement") {
-                this.raise(Errors.ImportCallSpreadArgument, {
-                  at: arg
-                });
+                this.raise(Errors.ImportCallSpreadArgument, arg);
               }
             }
           }
@@ -18582,9 +18344,7 @@ var require_lib = __commonJS({
             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);
@@ -18640,9 +18400,7 @@ var require_lib = __commonJS({
                 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:
@@ -18708,14 +18466,11 @@ var require_lib = __commonJS({
             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();
@@ -18810,15 +18565,12 @@ var require_lib = __commonJS({
         if (this.testTopicReferenceConfiguration(pipeProposal, startLoc, tokenType)) {
           const 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)
           });
         }
@@ -18833,9 +18585,7 @@ var require_lib = __commonJS({
           case "smart":
             return tokenType === 27;
           default:
-            throw this.raise(Errors.PipeTopicRequiresHackPipes, {
-              at: startLoc
-            });
+            throw this.raise(Errors.PipeTopicRequiresHackPipes, startLoc);
         }
       }
       parseAsyncArrowUnaryFunction(node) {
@@ -18843,9 +18593,7 @@ var require_lib = __commonJS({
         const params = [this.parseIdentifier()];
         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);
@@ -18873,18 +18621,12 @@ var require_lib = __commonJS({
         const 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");
       }
@@ -18916,8 +18658,7 @@ var require_lib = __commonJS({
         const 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
           });
@@ -18929,9 +18670,7 @@ var require_lib = __commonJS({
         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)) {
@@ -18940,8 +18679,7 @@ var require_lib = __commonJS({
             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
             });
           }
@@ -19089,9 +18827,7 @@ var require_lib = __commonJS({
           this.next();
           const 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;
         }
@@ -19113,9 +18849,7 @@ var require_lib = __commonJS({
         const callee = this.parseNoCallExpr();
         node.callee = callee;
         if (isImport && (callee.type === "Import" || callee.type === "ImportExpression")) {
-          this.raise(Errors.ImportCallNotNewExpression, {
-            at: callee
-          });
+          this.raise(Errors.ImportCallNotNewExpression, callee);
         }
       }
       parseTemplateElement(isTagged) {
@@ -19129,9 +18863,7 @@ var require_lib = __commonJS({
         const elem = this.startNodeAt(createPositionWithColumnOffset(startLoc, 1));
         if (value === null) {
           if (!isTagged) {
-            this.raise(Errors.InvalidEscapeSequenceTemplate, {
-              at: createPositionWithColumnOffset(this.state.firstInvalidTemplateEscapePos, 1)
-            });
+            this.raise(Errors.InvalidEscapeSequenceTemplate, createPositionWithColumnOffset(this.state.firstInvalidTemplateEscapePos, 1));
           }
         }
         const isTail = this.match(24);
@@ -19191,9 +18923,7 @@ var require_lib = __commonJS({
             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);
@@ -19211,7 +18941,7 @@ var require_lib = __commonJS({
         return this.finishNode(node, type);
       }
       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);
       }
       maybeAsyncOrAccessorProp(prop) {
@@ -19221,9 +18951,7 @@ var require_lib = __commonJS({
         let 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());
@@ -19264,8 +18992,7 @@ var require_lib = __commonJS({
             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();
@@ -19286,14 +19013,10 @@ var require_lib = __commonJS({
         const paramCount = this.getGetterSetterExpectedParamCount(method);
         const 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 ? void 0 : _params.type) === "RestElement") {
-          this.raise(Errors.BadSetterRestParameter, {
-            at: method
-          });
+          this.raise(Errors.BadSetterRestParameter, method);
         }
       }
       parseObjectMethod(prop, isGenerator, isAsync, isPattern, isAccessor) {
@@ -19327,9 +19050,7 @@ var require_lib = __commonJS({
                 refExpressionErrors.shorthandAssignLoc = shorthandAssignLoc;
               }
             } else {
-              this.raise(Errors.InvalidCoverInitializedName, {
-                at: shorthandAssignLoc
-              });
+              this.raise(Errors.InvalidCoverInitializedName, shorthandAssignLoc);
             }
             prop.value = this.parseMaybeDefault(startLoc, cloneIdentifier(prop.key));
           } else {
@@ -19379,9 +19100,7 @@ var require_lib = __commonJS({
                     refExpressionErrors.privateKeyLoc = privateKeyLoc;
                   }
                 } else {
-                  this.raise(Errors.UnexpectedPrivateField, {
-                    at: privateKeyLoc
-                  });
+                  this.raise(Errors.UnexpectedPrivateField, privateKeyLoc);
                 }
                 key = this.parsePrivateName();
                 break;
@@ -19467,9 +19186,7 @@ var require_lib = __commonJS({
           node.body = this.parseBlock(true, false, (hasStrictModeDirective) => {
             const 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);
             }
             const strictModeChanged = !oldStrict && this.state.strict;
             this.checkParams(node, !this.state.strict && !allowExpression && !isMethod && !nonSimple, allowExpression, strictModeChanged);
@@ -19530,8 +19247,7 @@ var require_lib = __commonJS({
         let elt;
         if (this.match(12)) {
           if (!allowEmpty) {
-            this.raise(Errors.UnexpectedToken, {
-              at: this.state.curPosition(),
+            this.raise(Errors.UnexpectedToken, this.state.curPosition(), {
               unexpected: ","
             });
           }
@@ -19542,9 +19258,7 @@ var require_lib = __commonJS({
         } 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);
           }
           const node = this.startNode();
           this.next();
@@ -19594,47 +19308,35 @@ var require_lib = __commonJS({
           return;
         }
         if (checkKeywords && isKeyword(word)) {
-          this.raise(Errors.UnexpectedKeyword, {
-            at: startLoc,
+          this.raise(Errors.UnexpectedKeyword, startLoc, {
             keyword: word
           });
           return;
         }
         const reservedTest = !this.state.strict ? isReservedWord : isBinding ? isStrictBindReservedWord : isStrictReservedWord;
         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;
           }
         }
@@ -19649,13 +19351,9 @@ var require_lib = __commonJS({
       }
       parseAwait(startLoc) {
         const 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()) {
@@ -19679,9 +19377,7 @@ var require_lib = __commonJS({
       }
       parseYield() {
         const node = this.startNode();
-        this.expressionScope.recordParameterInitializerError(Errors.YieldInParameter, {
-          at: node
-        });
+        this.expressionScope.recordParameterInitializerError(Errors.YieldInParameter, node);
         this.next();
         let delegating = false;
         let argument = null;
@@ -19727,9 +19423,7 @@ var require_lib = __commonJS({
           proposal: "smart"
         }])) {
           if (left.type === "SequenceExpression") {
-            this.raise(Errors.PipelineHeadSequenceExpression, {
-              at: leftStartLoc
-            });
+            this.raise(Errors.PipelineHeadSequenceExpression, leftStartLoc);
           }
         }
       }
@@ -19757,14 +19451,10 @@ var require_lib = __commonJS({
       }
       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);
         }
       }
       withTopicBindingContext(callback) {
@@ -19872,10 +19562,10 @@ var require_lib = __commonJS({
       }
     };
     var loopLabel = {
-      kind: "loop"
+      kind: 1
     };
     var switchLabel = {
-      kind: "switch"
+      kind: 2
     };
     var loneSurrogate = /[\uD800-\uDFFF]/u;
     var keywordRelationalOperator = /in(?:stanceof)?/y;
@@ -19989,7 +19679,7 @@ var require_lib = __commonJS({
     var StatementParser = class extends ExpressionParser {
       parseTopLevel(file, program) {
         file.program = this.parseProgram(program);
-        file.comments = this.state.comments;
+        file.comments = this.comments;
         if (this.options.tokens) {
           file.tokens = babel7CompatTokens(this.tokens, this.input);
         }
@@ -20001,8 +19691,7 @@ var require_lib = __commonJS({
         this.parseBlockBody(program, true, true, end);
         if (this.inModule && !this.options.allowUndeclaredExports && this.scope.undefinedExports.size > 0) {
           for (const [localName, at] of Array.from(this.scope.undefinedExports)) {
-            this.raise(Errors.ModuleExportUndefined, {
-              at,
+            this.raise(Errors.ModuleExportUndefined, at, {
               localName
             });
           }
@@ -20145,9 +19834,7 @@ var require_lib = __commonJS({
             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:
@@ -20167,13 +19854,9 @@ var require_lib = __commonJS({
           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");
@@ -20185,13 +19868,9 @@ var require_lib = __commonJS({
             }
             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: {
@@ -20210,9 +19889,7 @@ var require_lib = __commonJS({
           }
           case 75: {
             if (!allowDeclaration) {
-              this.raise(Errors.UnexpectedLexicalDeclaration, {
-                at: this.state.startLoc
-              });
+              this.raise(Errors.UnexpectedLexicalDeclaration, this.state.startLoc);
             }
           }
           case 74: {
@@ -20235,9 +19912,7 @@ var require_lib = __commonJS({
           }
           case 82: {
             if (!this.options.allowImportExportEverywhere && !topLevel) {
-              this.raise(Errors.UnexpectedImportExport, {
-                at: this.state.startLoc
-              });
+              this.raise(Errors.UnexpectedImportExport, this.state.startLoc);
             }
             this.next();
             let result;
@@ -20258,9 +19933,7 @@ var require_lib = __commonJS({
           default: {
             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);
@@ -20277,9 +19950,7 @@ var require_lib = __commonJS({
       }
       assertModuleNodeAllowed(node) {
         if (!this.options.allowImportExportEverywhere && !this.inModule) {
-          this.raise(Errors.ImportOutsideModule, {
-            at: node
-          });
+          this.raise(Errors.ImportOutsideModule, node);
         }
       }
       decoratorsEnabledBeforeExport() {
@@ -20291,9 +19962,7 @@ var require_lib = __commonJS({
         if (maybeDecorators) {
           if (classNode.decorators && classNode.decorators.length > 0) {
             if (typeof this.getPluginOption("decorators", "decoratorsBeforeExport") !== "boolean") {
-              this.raise(Errors.DecoratorsBeforeAfterExport, {
-                at: classNode.decorators[0]
-              });
+              this.raise(Errors.DecoratorsBeforeAfterExport, classNode.decorators[0]);
             }
             classNode.decorators.unshift(...maybeDecorators);
           } else {
@@ -20318,14 +19987,10 @@ var require_lib = __commonJS({
             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;
       }
@@ -20345,9 +20010,7 @@ var require_lib = __commonJS({
             const 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);
@@ -20396,16 +20059,16 @@ var require_lib = __commonJS({
         for (i = 0; i < this.state.labels.length; ++i) {
           const lab = this.state.labels[i];
           if (node.label == null || lab.name === node.label.name) {
-            if (lab.kind != null && (isBreak || lab.kind === "loop"))
+            if (lab.kind != null && (isBreak || lab.kind === 1)) {
               break;
+            }
             if (node.label && isBreak)
               break;
           }
         }
         if (i === this.state.labels.length) {
           const type = isBreak ? "BreakStatement" : "ContinueStatement";
-          this.raise(Errors.IllegalBreakContinue, {
-            at: node,
+          this.raise(Errors.IllegalBreakContinue, node, {
             type
           });
         }
@@ -20457,9 +20120,7 @@ var require_lib = __commonJS({
             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 {
@@ -20470,9 +20131,7 @@ var require_lib = __commonJS({
             const init2 = this.finishNode(initNode, "VariableDeclaration");
             const 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);
@@ -20489,14 +20148,10 @@ var require_lib = __commonJS({
         const 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)) {
@@ -20530,9 +20185,7 @@ var require_lib = __commonJS({
       }
       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()) {
@@ -20563,9 +20216,7 @@ var require_lib = __commonJS({
               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;
@@ -20589,9 +20240,7 @@ var require_lib = __commonJS({
       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();
@@ -20629,9 +20278,7 @@ var require_lib = __commonJS({
         }
         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");
       }
@@ -20651,9 +20298,7 @@ var require_lib = __commonJS({
       }
       parseWithStatement(node) {
         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();
@@ -20667,13 +20312,12 @@ var require_lib = __commonJS({
       parseLabeledStatement(node, maybeName, expr, flags) {
         for (const label of this.state.labels) {
           if (label.name === maybeName) {
-            this.raise(Errors.LabelRedeclaration, {
-              at: expr,
+            this.raise(Errors.LabelRedeclaration, expr, {
               labelName: maybeName
             });
           }
         }
-        const kind = tokenIsLoop(this.state.type) ? "loop" : this.match(71) ? "switch" : null;
+        const kind = tokenIsLoop(this.state.type) ? 1 : this.match(71) ? 2 : null;
         for (let i = this.state.labels.length - 1; i >= 0; i--) {
           const label = this.state.labels[i];
           if (label.statementStart === node.start) {
@@ -20770,14 +20414,12 @@ var require_lib = __commonJS({
           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"
             }
@@ -20800,14 +20442,12 @@ var require_lib = __commonJS({
           decl.init = !this.eat(29) ? null : isFor ? this.parseMaybeAssignDisallowIn() : this.parseMaybeAssignAllowIn();
           if (decl.init === null && !allowMissingInitializer) {
             if (decl.id.type !== "Identifier" && !(isFor && (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,
-                kind: "const"
+            } else if ((kind === "const" || kind === "using" || kind === "await using") && !(this.match(58) || this.isContextual(102))) {
+              this.raise(Errors.DeclarationMissingInitializer, this.state.lastTokEndLoc, {
+                kind
               });
             }
           }
@@ -20838,9 +20478,7 @@ var require_lib = __commonJS({
         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;
@@ -20913,9 +20551,7 @@ var require_lib = __commonJS({
           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;
             }
@@ -20931,18 +20567,14 @@ var require_lib = __commonJS({
             }
             this.parseClassMember(classBody, 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(classBody, "ClassBody");
@@ -21000,9 +20632,7 @@ var require_lib = __commonJS({
             return;
           }
           if (this.isNonstaticConstructor(publicMethod)) {
-            this.raise(Errors.ConstructorIsGenerator, {
-              at: publicMethod.key
-            });
+            this.raise(Errors.ConstructorIsGenerator, publicMethod.key);
           }
           this.pushClassMethod(classBody, publicMethod, true, false, false, false);
           return;
@@ -21023,14 +20653,10 @@ var require_lib = __commonJS({
           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;
@@ -21056,9 +20682,7 @@ var require_lib = __commonJS({
             this.pushClassPrivateMethod(classBody, privateMethod, isGenerator, true);
           } else {
             if (this.isNonstaticConstructor(publicMethod)) {
-              this.raise(Errors.ConstructorIsAsync, {
-                at: publicMethod.key
-              });
+              this.raise(Errors.ConstructorIsAsync, publicMethod.key);
             }
             this.pushClassMethod(classBody, publicMethod, isGenerator, true, false, false);
           }
@@ -21071,9 +20695,7 @@ var require_lib = __commonJS({
             this.pushClassPrivateMethod(classBody, privateMethod, false, false);
           } else {
             if (this.isNonstaticConstructor(publicMethod)) {
-              this.raise(Errors.ConstructorIsAccessor, {
-                at: publicMethod.key
-              });
+              this.raise(Errors.ConstructorIsAccessor, publicMethod.key);
             }
             this.pushClassMethod(classBody, publicMethod, false, false, false, false);
           }
@@ -21100,15 +20722,11 @@ var require_lib = __commonJS({
           value
         } = this.state;
         if ((type === 132 || type === 133) && member.static && value === "prototype") {
-          this.raise(Errors.StaticPrototype, {
-            at: this.state.startLoc
-          });
+          this.raise(Errors.StaticPrototype, this.state.startLoc);
         }
         if (type === 138) {
           if (value === "constructor") {
-            this.raise(Errors.ConstructorClassPrivateField, {
-              at: this.state.startLoc
-            });
+            this.raise(Errors.ConstructorClassPrivateField, this.state.startLoc);
           }
           const key = this.parsePrivateName();
           member.key = key;
@@ -21129,16 +20747,12 @@ var require_lib = __commonJS({
         this.state.labels = oldLabels;
         classBody.body.push(this.finishNode(member, "StaticBlock"));
         if ((_member$decorators = member.decorators) != null && _member$decorators.length) {
-          this.raise(Errors.DecoratorStaticBlock, {
-            at: member
-          });
+          this.raise(Errors.DecoratorStaticBlock, member);
         }
       }
       pushClassProperty(classBody, 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);
         }
         classBody.body.push(this.parseClassProperty(prop));
       }
@@ -21151,9 +20765,7 @@ var require_lib = __commonJS({
         if (!isPrivate && !prop.computed) {
           const key = prop.key;
           if (key.name === "constructor" || key.value === "constructor") {
-            this.raise(Errors.ConstructorClassField, {
-              at: key
-            });
+            this.raise(Errors.ConstructorClassField, key);
           }
         }
         const node = this.parseClassAccessorProperty(prop);
@@ -21210,9 +20822,7 @@ var require_lib = __commonJS({
           if (optionalId || !isStatement) {
             node.id = null;
           } else {
-            throw this.raise(Errors.MissingClassName, {
-              at: this.state.startLoc
-            });
+            throw this.raise(Errors.MissingClassName, this.state.startLoc);
           }
         }
       }
@@ -21231,9 +20841,7 @@ var require_lib = __commonJS({
           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");
@@ -21249,9 +20857,7 @@ var require_lib = __commonJS({
         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 {
@@ -21264,9 +20870,7 @@ var require_lib = __commonJS({
           if (((_node2$declaration = node2.declaration) == null ? 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");
         }
@@ -21277,9 +20881,7 @@ var require_lib = __commonJS({
           if (decl.type === "ClassDeclaration") {
             this.maybeTakeDecorators(decorators, decl, node2);
           } else if (decorators) {
-            throw this.raise(Errors.UnsupportedDecoratorExport, {
-              at: node
-            });
+            throw this.raise(Errors.UnsupportedDecoratorExport, node);
           }
           this.checkExport(node2, true, true);
           return this.finishNode(node2, "ExportDefaultDeclaration");
@@ -21360,16 +20962,12 @@ var require_lib = __commonJS({
         }
         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);
         }
         const res = this.parseMaybeAssignAllowIn();
         this.semicolon();
@@ -21432,9 +21030,7 @@ var require_lib = __commonJS({
           this.expectOnePlugin(["decorators", "decorators-legacy"]);
           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;
           }
@@ -21450,9 +21046,7 @@ var require_lib = __commonJS({
               var _declaration$extra;
               const declaration = node.declaration;
               if (declaration.type === "Identifier" && declaration.name === "from" && declaration.end - declaration.start === 4 && !((_declaration$extra = declaration.extra) != null && _declaration$extra.parenthesized)) {
-                this.raise(Errors.ExportDefaultFromAsIdentifier, {
-                  at: declaration
-                });
+                this.raise(Errors.ExportDefaultFromAsIdentifier, declaration);
               }
             }
           } else if ((_node$specifiers = node.specifiers) != null && _node$specifiers.length) {
@@ -21467,8 +21061,7 @@ var require_lib = __commonJS({
                   local
                 } = specifier;
                 if (local.type !== "Identifier") {
-                  this.raise(Errors.ExportBindingIsString, {
-                    at: specifier,
+                  this.raise(Errors.ExportBindingIsString, specifier, {
                     localName: local.value,
                     exportName
                   });
@@ -21516,12 +21109,9 @@ var require_lib = __commonJS({
       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
             });
           }
@@ -21563,8 +21153,7 @@ var require_lib = __commonJS({
           const result = this.parseStringLiteral(this.state.value);
           const surrogate = result.value.match(loneSurrogate);
           if (surrogate) {
-            this.raise(Errors.ModuleExportNameHasLoneSurrogate, {
-              at: result,
+            this.raise(Errors.ModuleExportNameHasLoneSurrogate, result, {
               surrogateCharCode: surrogate[0].charCodeAt(0)
             });
           }
@@ -21590,27 +21179,19 @@ var require_lib = __commonJS({
         const 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 ? void 0 : _node$assertions.length) > 0) {
-            this.raise(Errors.ImportReflectionHasAssertion, {
-              at: node.specifiers[0].loc.start
-            });
+            this.raise(Errors.ImportReflectionHasAssertion, specifiers[0].loc.start);
           }
         }
       }
@@ -21632,9 +21213,7 @@ var require_lib = __commonJS({
               }
             });
             if (nonDefaultNamedSpecifier !== void 0) {
-              this.raise(Errors.ImportJSONBindingNotDefault, {
-                at: nonDefaultNamedSpecifier.loc.start
-              });
+              this.raise(Errors.ImportJSONBindingNotDefault, nonDefaultNamedSpecifier.loc.start);
             }
           }
         }
@@ -21744,8 +21323,7 @@ var require_lib = __commonJS({
           const node = this.startNode();
           const 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
             });
           }
@@ -21757,9 +21335,7 @@ var require_lib = __commonJS({
           }
           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"));
@@ -21774,22 +21350,17 @@ var require_lib = __commonJS({
           const 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"));
@@ -21816,9 +21387,7 @@ var require_lib = __commonJS({
         } 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 {
@@ -21870,9 +21439,7 @@ var require_lib = __commonJS({
             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))
@@ -21894,8 +21461,7 @@ var require_lib = __commonJS({
             imported
           } = specifier;
           if (importedIsString) {
-            throw this.raise(Errors.ImportBindingIsString, {
-              at: specifier,
+            throw this.raise(Errors.ImportBindingIsString, specifier, {
               importName: imported.value
             });
           }
@@ -21930,6 +21496,7 @@ var require_lib = __commonJS({
         file.errors = null;
         this.parseTopLevel(file, program);
         file.errors = this.state.errors;
+        file.comments.length = this.state.commentsLen;
         return file;
       }
     };
@@ -22019,7 +21586,8 @@ var require_lib = __commonJS({
 });
 
 // src/index.ts
-import { promises as fs2 } from "node:fs";
+import { promises as fs3 } from "node:fs";
+import process5 from "node:process";
 import { createUnplugin } from "unplugin";
 
 // src/core/generate.ts
@@ -22028,7 +21596,7 @@ import path, { resolve } from "node:path";
 import { promises as fs } from "node:fs";
 import process2 from "node:process";
 
-// node_modules/.pnpm/magicast@0.3.2/node_modules/magicast/dist/index.mjs
+// node_modules/.pnpm/magicast@0.3.3/node_modules/magicast/dist/index.mjs
 import { promises } from "node:fs";
 var import_source_map_js = __toESM(require_source_map(), 1);
 var babelParser = __toESM(require_lib(), 1);
@@ -30149,8 +29717,13 @@ function createImportsProxy(root, mod) {
       item.from = value.from;
       return true;
     }
-    const specifier = value.imported === "default" ? b$3.importDefaultSpecifier(b$3.identifier(local)) : value.imported === "*" ? b$3.importNamespaceSpecifier(b$3.identifier(local)) : b$3.importSpecifier(b$3.identifier(value.imported), b$3.identifier(local));
-    const declaration = (_a = imports.find((i) => i.from === value.from)) == null ? void 0 : _a.$declaration;
+    const specifier = value.imported === "default" ? b$3.importDefaultSpecifier(b$3.identifier(local)) : value.imported === "*" ? b$3.importNamespaceSpecifier(b$3.identifier(local)) : b$3.importSpecifier(
+      b$3.identifier(value.imported),
+      b$3.identifier(local)
+    );
+    const declaration = (_a = imports.find(
+      (i) => i.from === value.from
+    )) == null ? void 0 : _a.$declaration;
     if (declaration) {
       declaration.specifiers.push(specifier);
     } else {
@@ -30338,6 +29911,21 @@ function proxifyFunctionCall(node, mod) {
     {}
   );
 }
+function proxifyArrowFunctionExpression(node, mod) {
+  if (node.type !== "ArrowFunctionExpression") {
+    throw new MagicastError("Not an arrow function expression");
+  }
+  const parametersProxy = proxifyArrayElements(node, node.params, mod);
+  return createProxy(
+    node,
+    {
+      $type: "arrow-function-expression",
+      $params: parametersProxy,
+      $body: proxify(node.body, mod)
+    },
+    {}
+  );
+}
 var b$2 = builders$1;
 function proxifyObject(node, mod) {
   if (!("properties" in node)) {
@@ -30499,6 +30087,10 @@ function proxify(node, mod) {
       proxy = proxifyFunctionCall(node, mod);
       break;
     }
+    case "ArrowFunctionExpression": {
+      proxy = proxifyArrowFunctionExpression(node, mod);
+      break;
+    }
     case "NewExpression": {
       proxy = proxifyNewExpression(node, mod);
       break;
@@ -30751,7 +30343,7 @@ async function loadFile(filename, options = {}) {
 import { deepMerge } from "@antfu/utils";
 async function generateScript(options, mode) {
   const { dir, fileName, globalName, serve, build } = options.env;
-  const folder = await findFolder(process2.cwd(), dir || "");
+  const folder = await findFolder(process2.cwd(), dir);
   const files = await (0, import_fast_glob.default)("*.+(js|ts)", {
     absolute: true,
     cwd: folder
@@ -30760,13 +30352,17 @@ async function generateScript(options, mode) {
   let target = {};
   const source = [];
   let code = "";
-  const name = fileName || "";
+  const name = fileName;
   for (const file of files) {
-    const mod = await loadFile(file);
-    if (testReg == null ? void 0 : testReg.test(file))
-      target = mod.exports.default;
-    else
-      source.push(mod.exports.default);
+    try {
+      const mod = await loadFile(file);
+      if (testReg == null ? void 0 : testReg.test(file))
+        target = mod.exports.default;
+      else
+        source.push(mod.exports.default);
+    } catch (error) {
+      console.error(`Error loading file ${file}:`, error);
+    }
   }
   const returnedTarget = deepMerge({}, source, target);
   const versionInfo = await generateVersion(options, mode);
@@ -30781,7 +30377,7 @@ async function generateScript(options, mode) {
       fileName: name,
       source: formatCode
     },
-    watchFolder: path.resolve(folder)
+    watchFiles: files
   };
 }
 async function generateVersion(options, mode) {
@@ -30794,20 +30390,20 @@ async function generateVersion(options, mode) {
   return `console.info("Version: ${packageJson.version} -  ${mode === "serve" ? "runtime" : "built"} on ${options.date}")`;
 }
 async function findFolder(directoryPath, dir) {
-  const ignore = ["dist", "node_modules", "playground", "example", "test", "jest", "tests", "locales", "public", ".git", ".github", ".vscode"];
-  let files = await fs.readdir(directoryPath);
-  files = files.filter((item) => !ignore.includes(item));
-  for (let i = 0; i < files.length; i++) {
-    const file = files[i];
-    const filePath = path.join(directoryPath, file);
-    const stat = await fs.stat(filePath);
+  const ignore = /* @__PURE__ */ new Set(["dist", "node_modules", "playground", "example", "test", "jest", "tests", "locales", "public", ".git", ".github", ".vscode"]);
+  const files = await fs.readdir(directoryPath);
+  const filePaths = files.filter((item) => !ignore.has(item));
+  let nestedFolder = "";
+  for (const file of filePaths) {
+    const fullFilePath = path.join(directoryPath, file);
+    const stat = await fs.stat(fullFilePath);
     if (stat.isDirectory()) {
       if (file.toLowerCase() === dir) {
-        return filePath;
+        return fullFilePath;
       } else {
-        const nested = await findFolder(filePath, dir);
-        if (nested)
-          return nested;
+        nestedFolder = await findFolder(fullFilePath, dir);
+        if (nestedFolder)
+          return nestedFolder;
       }
     }
   }
@@ -30816,7 +30412,7 @@ async function findFolder(directoryPath, dir) {
 
 // src/core/options.ts
 import { deepMerge as deepMerge2 } from "@antfu/utils";
-async function resolveOptions(options) {
+function resolveOptions(options) {
   const defaults2 = {
     env: {
       dir: "config",
@@ -30824,6 +30420,10 @@ async function resolveOptions(options) {
       globalName: "manifest",
       serve: /dev|development/i,
       build: /prod|production/i
+    },
+    compress: {
+      outDir: "dist",
+      ignoreBase: true
     }
   };
   const mergeOptions = deepMerge2(defaults2, options);
@@ -30833,6 +30433,536 @@ async function resolveOptions(options) {
   };
 }
 
+// src/core/compress.ts
+import fs2 from "node:fs";
+import process4 from "node:process";
+import archiver from "archiver";
+
+// node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/vendor/ansi-styles/index.js
+var ANSI_BACKGROUND_OFFSET = 10;
+var wrapAnsi16 = (offset = 0) => (code) => `\x1B[${code + offset}m`;
+var wrapAnsi256 = (offset = 0) => (code) => `\x1B[${38 + offset};5;${code}m`;
+var wrapAnsi16m = (offset = 0) => (red, green, blue) => `\x1B[${38 + offset};2;${red};${green};${blue}m`;
+var styles = {
+  modifier: {
+    reset: [0, 0],
+    // 21 isn't widely supported and 22 does the same thing
+    bold: [1, 22],
+    dim: [2, 22],
+    italic: [3, 23],
+    underline: [4, 24],
+    overline: [53, 55],
+    inverse: [7, 27],
+    hidden: [8, 28],
+    strikethrough: [9, 29]
+  },
+  color: {
+    black: [30, 39],
+    red: [31, 39],
+    green: [32, 39],
+    yellow: [33, 39],
+    blue: [34, 39],
+    magenta: [35, 39],
+    cyan: [36, 39],
+    white: [37, 39],
+    // Bright color
+    blackBright: [90, 39],
+    gray: [90, 39],
+    // Alias of `blackBright`
+    grey: [90, 39],
+    // Alias of `blackBright`
+    redBright: [91, 39],
+    greenBright: [92, 39],
+    yellowBright: [93, 39],
+    blueBright: [94, 39],
+    magentaBright: [95, 39],
+    cyanBright: [96, 39],
+    whiteBright: [97, 39]
+  },
+  bgColor: {
+    bgBlack: [40, 49],
+    bgRed: [41, 49],
+    bgGreen: [42, 49],
+    bgYellow: [43, 49],
+    bgBlue: [44, 49],
+    bgMagenta: [45, 49],
+    bgCyan: [46, 49],
+    bgWhite: [47, 49],
+    // Bright color
+    bgBlackBright: [100, 49],
+    bgGray: [100, 49],
+    // Alias of `bgBlackBright`
+    bgGrey: [100, 49],
+    // Alias of `bgBlackBright`
+    bgRedBright: [101, 49],
+    bgGreenBright: [102, 49],
+    bgYellowBright: [103, 49],
+    bgBlueBright: [104, 49],
+    bgMagentaBright: [105, 49],
+    bgCyanBright: [106, 49],
+    bgWhiteBright: [107, 49]
+  }
+};
+var modifierNames = Object.keys(styles.modifier);
+var foregroundColorNames = Object.keys(styles.color);
+var backgroundColorNames = Object.keys(styles.bgColor);
+var colorNames = [...foregroundColorNames, ...backgroundColorNames];
+function assembleStyles() {
+  const codes = /* @__PURE__ */ new Map();
+  for (const [groupName, group] of Object.entries(styles)) {
+    for (const [styleName, style] of Object.entries(group)) {
+      styles[styleName] = {
+        open: `\x1B[${style[0]}m`,
+        close: `\x1B[${style[1]}m`
+      };
+      group[styleName] = styles[styleName];
+      codes.set(style[0], style[1]);
+    }
+    Object.defineProperty(styles, groupName, {
+      value: group,
+      enumerable: false
+    });
+  }
+  Object.defineProperty(styles, "codes", {
+    value: codes,
+    enumerable: false
+  });
+  styles.color.close = "\x1B[39m";
+  styles.bgColor.close = "\x1B[49m";
+  styles.color.ansi = wrapAnsi16();
+  styles.color.ansi256 = wrapAnsi256();
+  styles.color.ansi16m = wrapAnsi16m();
+  styles.bgColor.ansi = wrapAnsi16(ANSI_BACKGROUND_OFFSET);
+  styles.bgColor.ansi256 = wrapAnsi256(ANSI_BACKGROUND_OFFSET);
+  styles.bgColor.ansi16m = wrapAnsi16m(ANSI_BACKGROUND_OFFSET);
+  Object.defineProperties(styles, {
+    rgbToAnsi256: {
+      value(red, green, blue) {
+        if (red === green && green === blue) {
+          if (red < 8) {
+            return 16;
+          }
+          if (red > 248) {
+            return 231;
+          }
+          return Math.round((red - 8) / 247 * 24) + 232;
+        }
+        return 16 + 36 * Math.round(red / 255 * 5) + 6 * Math.round(green / 255 * 5) + Math.round(blue / 255 * 5);
+      },
+      enumerable: false
+    },
+    hexToRgb: {
+      value(hex) {
+        const matches = /[a-f\d]{6}|[a-f\d]{3}/i.exec(hex.toString(16));
+        if (!matches) {
+          return [0, 0, 0];
+        }
+        let [colorString] = matches;
+        if (colorString.length === 3) {
+          colorString = [...colorString].map((character) => character + character).join("");
+        }
+        const integer = Number.parseInt(colorString, 16);
+        return [
+          /* eslint-disable no-bitwise */
+          integer >> 16 & 255,
+          integer >> 8 & 255,
+          integer & 255
+          /* eslint-enable no-bitwise */
+        ];
+      },
+      enumerable: false
+    },
+    hexToAnsi256: {
+      value: (hex) => styles.rgbToAnsi256(...styles.hexToRgb(hex)),
+      enumerable: false
+    },
+    ansi256ToAnsi: {
+      value(code) {
+        if (code < 8) {
+          return 30 + code;
+        }
+        if (code < 16) {
+          return 90 + (code - 8);
+        }
+        let red;
+        let green;
+        let blue;
+        if (code >= 232) {
+          red = ((code - 232) * 10 + 8) / 255;
+          green = red;
+          blue = red;
+        } else {
+          code -= 16;
+          const remainder = code % 36;
+          red = Math.floor(code / 36) / 5;
+          green = Math.floor(remainder / 6) / 5;
+          blue = remainder % 6 / 5;
+        }
+        const value = Math.max(red, green, blue) * 2;
+        if (value === 0) {
+          return 30;
+        }
+        let result = 30 + (Math.round(blue) << 2 | Math.round(green) << 1 | Math.round(red));
+        if (value === 2) {
+          result += 60;
+        }
+        return result;
+      },
+      enumerable: false
+    },
+    rgbToAnsi: {
+      value: (red, green, blue) => styles.ansi256ToAnsi(styles.rgbToAnsi256(red, green, blue)),
+      enumerable: false
+    },
+    hexToAnsi: {
+      value: (hex) => styles.ansi256ToAnsi(styles.hexToAnsi256(hex)),
+      enumerable: false
+    }
+  });
+  return styles;
+}
+var ansiStyles = assembleStyles();
+var ansi_styles_default = ansiStyles;
+
+// node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/vendor/supports-color/index.js
+import process3 from "node:process";
+import os from "node:os";
+import tty from "node:tty";
+function hasFlag(flag, argv = globalThis.Deno ? globalThis.Deno.args : process3.argv) {
+  const prefix = flag.startsWith("-") ? "" : flag.length === 1 ? "-" : "--";
+  const position = argv.indexOf(prefix + flag);
+  const terminatorPosition = argv.indexOf("--");
+  return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
+}
+var { env } = process3;
+var flagForceColor;
+if (hasFlag("no-color") || hasFlag("no-colors") || hasFlag("color=false") || hasFlag("color=never")) {
+  flagForceColor = 0;
+} else if (hasFlag("color") || hasFlag("colors") || hasFlag("color=true") || hasFlag("color=always")) {
+  flagForceColor = 1;
+}
+function envForceColor() {
+  if ("FORCE_COLOR" in env) {
+    if (env.FORCE_COLOR === "true") {
+      return 1;
+    }
+    if (env.FORCE_COLOR === "false") {
+      return 0;
+    }
+    return env.FORCE_COLOR.length === 0 ? 1 : Math.min(Number.parseInt(env.FORCE_COLOR, 10), 3);
+  }
+}
+function translateLevel(level) {
+  if (level === 0) {
+    return false;
+  }
+  return {
+    level,
+    hasBasic: true,
+    has256: level >= 2,
+    has16m: level >= 3
+  };
+}
+function _supportsColor(haveStream, { streamIsTTY, sniffFlags = true } = {}) {
+  const noFlagForceColor = envForceColor();
+  if (noFlagForceColor !== void 0) {
+    flagForceColor = noFlagForceColor;
+  }
+  const forceColor = sniffFlags ? flagForceColor : noFlagForceColor;
+  if (forceColor === 0) {
+    return 0;
+  }
+  if (sniffFlags) {
+    if (hasFlag("color=16m") || hasFlag("color=full") || hasFlag("color=truecolor")) {
+      return 3;
+    }
+    if (hasFlag("color=256")) {
+      return 2;
+    }
+  }
+  if ("TF_BUILD" in env && "AGENT_NAME" in env) {
+    return 1;
+  }
+  if (haveStream && !streamIsTTY && forceColor === void 0) {
+    return 0;
+  }
+  const min = forceColor || 0;
+  if (env.TERM === "dumb") {
+    return min;
+  }
+  if (process3.platform === "win32") {
+    const osRelease = os.release().split(".");
+    if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
+      return Number(osRelease[2]) >= 14931 ? 3 : 2;
+    }
+    return 1;
+  }
+  if ("CI" in env) {
+    if ("GITHUB_ACTIONS" in env || "GITEA_ACTIONS" in env) {
+      return 3;
+    }
+    if (["TRAVIS", "CIRCLECI", "APPVEYOR", "GITLAB_CI", "BUILDKITE", "DRONE"].some((sign) => sign in env) || env.CI_NAME === "codeship") {
+      return 1;
+    }
+    return min;
+  }
+  if ("TEAMCITY_VERSION" in env) {
+    return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
+  }
+  if (env.COLORTERM === "truecolor") {
+    return 3;
+  }
+  if (env.TERM === "xterm-kitty") {
+    return 3;
+  }
+  if ("TERM_PROGRAM" in env) {
+    const version = Number.parseInt((env.TERM_PROGRAM_VERSION || "").split(".")[0], 10);
+    switch (env.TERM_PROGRAM) {
+      case "iTerm.app": {
+        return version >= 3 ? 3 : 2;
+      }
+      case "Apple_Terminal": {
+        return 2;
+      }
+    }
+  }
+  if (/-256(color)?$/i.test(env.TERM)) {
+    return 2;
+  }
+  if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
+    return 1;
+  }
+  if ("COLORTERM" in env) {
+    return 1;
+  }
+  return min;
+}
+function createSupportsColor(stream, options = {}) {
+  const level = _supportsColor(stream, {
+    streamIsTTY: stream && stream.isTTY,
+    ...options
+  });
+  return translateLevel(level);
+}
+var supportsColor = {
+  stdout: createSupportsColor({ isTTY: tty.isatty(1) }),
+  stderr: createSupportsColor({ isTTY: tty.isatty(2) })
+};
+var supports_color_default = supportsColor;
+
+// node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/utilities.js
+function stringReplaceAll(string, substring, replacer) {
+  let index = string.indexOf(substring);
+  if (index === -1) {
+    return string;
+  }
+  const substringLength = substring.length;
+  let endIndex = 0;
+  let returnValue = "";
+  do {
+    returnValue += string.slice(endIndex, index) + substring + replacer;
+    endIndex = index + substringLength;
+    index = string.indexOf(substring, endIndex);
+  } while (index !== -1);
+  returnValue += string.slice(endIndex);
+  return returnValue;
+}
+function stringEncaseCRLFWithFirstIndex(string, prefix, postfix, index) {
+  let endIndex = 0;
+  let returnValue = "";
+  do {
+    const gotCR = string[index - 1] === "\r";
+    returnValue += string.slice(endIndex, gotCR ? index - 1 : index) + prefix + (gotCR ? "\r\n" : "\n") + postfix;
+    endIndex = index + 1;
+    index = string.indexOf("\n", endIndex);
+  } while (index !== -1);
+  returnValue += string.slice(endIndex);
+  return returnValue;
+}
+
+// node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/index.js
+var { stdout: stdoutColor, stderr: stderrColor } = supports_color_default;
+var GENERATOR = Symbol("GENERATOR");
+var STYLER = Symbol("STYLER");
+var IS_EMPTY = Symbol("IS_EMPTY");
+var levelMapping = [
+  "ansi",
+  "ansi",
+  "ansi256",
+  "ansi16m"
+];
+var styles2 = /* @__PURE__ */ Object.create(null);
+var applyOptions = (object, options = {}) => {
+  if (options.level && !(Number.isInteger(options.level) && options.level >= 0 && options.level <= 3)) {
+    throw new Error("The `level` option should be an integer from 0 to 3");
+  }
+  const colorLevel = stdoutColor ? stdoutColor.level : 0;
+  object.level = options.level === void 0 ? colorLevel : options.level;
+};
+var chalkFactory = (options) => {
+  const chalk2 = (...strings) => strings.join(" ");
+  applyOptions(chalk2, options);
+  Object.setPrototypeOf(chalk2, createChalk.prototype);
+  return chalk2;
+};
+function createChalk(options) {
+  return chalkFactory(options);
+}
+Object.setPrototypeOf(createChalk.prototype, Function.prototype);
+for (const [styleName, style] of Object.entries(ansi_styles_default)) {
+  styles2[styleName] = {
+    get() {
+      const builder = createBuilder(this, createStyler(style.open, style.close, this[STYLER]), this[IS_EMPTY]);
+      Object.defineProperty(this, styleName, { value: builder });
+      return builder;
+    }
+  };
+}
+styles2.visible = {
+  get() {
+    const builder = createBuilder(this, this[STYLER], true);
+    Object.defineProperty(this, "visible", { value: builder });
+    return builder;
+  }
+};
+var getModelAnsi = (model, level, type, ...arguments_) => {
+  if (model === "rgb") {
+    if (level === "ansi16m") {
+      return ansi_styles_default[type].ansi16m(...arguments_);
+    }
+    if (level === "ansi256") {
+      return ansi_styles_default[type].ansi256(ansi_styles_default.rgbToAnsi256(...arguments_));
+    }
+    return ansi_styles_default[type].ansi(ansi_styles_default.rgbToAnsi(...arguments_));
+  }
+  if (model === "hex") {
+    return getModelAnsi("rgb", level, type, ...ansi_styles_default.hexToRgb(...arguments_));
+  }
+  return ansi_styles_default[type][model](...arguments_);
+};
+var usedModels = ["rgb", "hex", "ansi256"];
+for (const model of usedModels) {
+  styles2[model] = {
+    get() {
+      const { level } = this;
+      return function(...arguments_) {
+        const styler = createStyler(getModelAnsi(model, levelMapping[level], "color", ...arguments_), ansi_styles_default.color.close, this[STYLER]);
+        return createBuilder(this, styler, this[IS_EMPTY]);
+      };
+    }
+  };
+  const bgModel = "bg" + model[0].toUpperCase() + model.slice(1);
+  styles2[bgModel] = {
+    get() {
+      const { level } = this;
+      return function(...arguments_) {
+        const styler = createStyler(getModelAnsi(model, levelMapping[level], "bgColor", ...arguments_), ansi_styles_default.bgColor.close, this[STYLER]);
+        return createBuilder(this, styler, this[IS_EMPTY]);
+      };
+    }
+  };
+}
+var proto = Object.defineProperties(() => {
+}, {
+  ...styles2,
+  level: {
+    enumerable: true,
+    get() {
+      return this[GENERATOR].level;
+    },
+    set(level) {
+      this[GENERATOR].level = level;
+    }
+  }
+});
+var createStyler = (open, close, parent) => {
+  let openAll;
+  let closeAll;
+  if (parent === void 0) {
+    openAll = open;
+    closeAll = close;
+  } else {
+    openAll = parent.openAll + open;
+    closeAll = close + parent.closeAll;
+  }
+  return {
+    open,
+    close,
+    openAll,
+    closeAll,
+    parent
+  };
+};
+var createBuilder = (self, _styler, _isEmpty) => {
+  const builder = (...arguments_) => applyStyle(builder, arguments_.length === 1 ? "" + arguments_[0] : arguments_.join(" "));
+  Object.setPrototypeOf(builder, proto);
+  builder[GENERATOR] = self;
+  builder[STYLER] = _styler;
+  builder[IS_EMPTY] = _isEmpty;
+  return builder;
+};
+var applyStyle = (self, string) => {
+  if (self.level <= 0 || !string) {
+    return self[IS_EMPTY] ? "" : string;
+  }
+  let styler = self[STYLER];
+  if (styler === void 0) {
+    return string;
+  }
+  const { openAll, closeAll } = styler;
+  if (string.includes("\x1B")) {
+    while (styler !== void 0) {
+      string = stringReplaceAll(string, styler.close, styler.open);
+      styler = styler.parent;
+    }
+  }
+  const lfIndex = string.indexOf("\n");
+  if (lfIndex !== -1) {
+    string = stringEncaseCRLFWithFirstIndex(string, closeAll, openAll, lfIndex);
+  }
+  return openAll + string + closeAll;
+};
+Object.defineProperties(createChalk.prototype, styles2);
+var chalk = createChalk();
+var chalkStderr = createChalk({ level: stderrColor ? stderrColor.level : 0 });
+var source_default = chalk;
+
+// src/core/log.ts
+var log = console.log;
+var Log = class {
+  static log(key, msg) {
+    log(source_default.bold(`${key}: ${msg}`));
+  }
+  static error(key, msg) {
+    log(source_default.bold.red(`${key}: ${msg}`));
+  }
+  static success(key, msg) {
+    log(source_default.bold.green(`${key}: ${msg}`));
+  }
+};
+
+// src/core/compress.ts
+async function createCompress(options) {
+  const { outDir, ignoreBase } = options;
+  const zipFilePath = `${outDir}.zip`;
+  Log.log("Compressing the directory", outDir);
+  try {
+    const output = fs2.createWriteStream(zipFilePath);
+    const archive = archiver("zip", {
+      zlib: { level: 9 }
+      // 设置压缩级别为最高
+    });
+    archive.pipe(output);
+    archive.directory(outDir, ignoreBase ? outDir : false);
+    await archive.finalize();
+    Log.success("Successfully compressed the directory", outDir);
+    process4.exit(0);
+  } catch (error) {
+    Log.error("Error compressing the directory", error);
+    throw error;
+  }
+}
+
 // src/index.ts
 var virtualEnvId = "virtual:env";
 var resolvedVirtualEnvId = `\0${virtualEnvId}`;
@@ -30848,8 +30978,10 @@ var unpluginFactory = (options = {}) => {
     },
     async load(id) {
       if (id.startsWith(resolvedVirtualEnvId)) {
-        const config = await resolved;
-        const { code } = await generateScript(config, "serve");
+        const { code, watchFiles } = await generateScript(resolved, "serve");
+        watchFiles.forEach((file) => {
+          this.addWatchFile(file);
+        });
         return code;
       }
     }
@@ -30862,20 +30994,25 @@ var unpluginFactory = (options = {}) => {
         return resolvedVirtualEnvId;
     },
     async load(id) {
-      const config = await resolved;
-      const { emit, script } = await generateScript(config, "build");
+      const { emit, script } = await generateScript(resolved, "build");
       if (id.startsWith(resolvedVirtualEnvId)) {
         this.emitFile(emit);
         return "";
       }
       if (id.endsWith(".html")) {
-        let code = await fs2.readFile(id, "utf8");
+        let code = await fs3.readFile(id, "utf8");
         code = code.replace(/<\/head>/gm, script);
         return {
           code
         };
       }
       return null;
+    },
+    buildEnd: () => {
+      process5.on("beforeExit", async () => {
+        const { compress } = resolved;
+        await createCompress(compress);
+      });
     }
   }];
 };