@putout/babel 2.9.0 → 2.10.2

package/bundle/index.js

@@ -507,9 +507,9 @@ var require_picocolors = __commonJS({
         module2.exports.createColors = createColors2;
     }
 });
-// node_modules/@babel/code-frame/node_modules/js-tokens/index.js
+// node_modules/js-tokens/index.js
 var require_js_tokens = __commonJS({
-    "node_modules/@babel/code-frame/node_modules/js-tokens/index.js": function(exports2, module2) {
+    "node_modules/js-tokens/index.js": function(exports2, module2) {
         var Identifier2;
         var JSXIdentifier2;
         var JSXPunctuator;
@@ -1377,6 +1377,9 @@ var require_jsesc = __commonJS({
         var isNumber2 = function(value1) {
             return typeof value1 == "number" || toString.call(value1) == "[object Number]";
         };
+        var isBigInt = function(value1) {
+            return (typeof value1 === "undefined" ? "undefined" : _type_of(value1)) == "bigint";
+        };
         var isFunction5 = function(value1) {
             return typeof value1 == "function";
         };
@@ -1494,26 +1497,33 @@ var require_jsesc = __commonJS({
                         return "[" + result.join(", ") + "]";
                     }
                     return "[" + newLine + result.join("," + newLine) + newLine + (compact ? "" : oldIndent) + "]";
-                } else if (isNumber2(argument)) {
+                } else if (isNumber2(argument) || isBigInt(argument)) {
                     if (json) {
-                        return JSON.stringify(argument);
+                        return JSON.stringify(Number(argument));
                     }
+                    var result2;
                     if (useDecNumbers) {
-                        return String(argument);
-                    }
-                    if (useHexNumbers) {
+                        result2 = String(argument);
+                    } else if (useHexNumbers) {
                         var hexadecimal2 = argument.toString(16);
                         if (!lowercaseHex) {
                             hexadecimal2 = hexadecimal2.toUpperCase();
                         }
-                        return "0x" + hexadecimal2;
+                        result2 = "0x" + hexadecimal2;
+                    } else if (useBinNumbers) {
+                        result2 = "0b" + argument.toString(2);
+                    } else if (useOctNumbers) {
+                        result2 = "0o" + argument.toString(8);
                     }
-                    if (useBinNumbers) {
-                        return "0b" + argument.toString(2);
+                    if (isBigInt(argument)) {
+                        return result2 + "n";
                     }
-                    if (useOctNumbers) {
-                        return "0o" + argument.toString(8);
+                    return result2;
+                } else if (isBigInt(argument)) {
+                    if (json) {
+                        return JSON.stringify(Number(argument));
                     }
+                    return argument + "n";
                 } else if (!isObject(argument)) {
                     if (json) {
                         return JSON.stringify(argument) || "null";
@@ -1802,49 +1812,114 @@ var require_common = __commonJS({
                 createDebug.namespaces = namespaces;
                 createDebug.names = [];
                 createDebug.skips = [];
-                var i;
-                var split = (typeof namespaces === "string" ? namespaces : "").split(/[\s,]+/);
-                var len = split.length;
-                for(i = 0; i < len; i++){
-                    if (!split[i]) {
-                        continue;
+                var split = (typeof namespaces === "string" ? namespaces : "").trim().replace(" ", ",").split(",").filter(Boolean);
+                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                try {
+                    for(var _iterator = split[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                        var ns = _step.value;
+                        if (ns[0] === "-") {
+                            createDebug.skips.push(ns.slice(1));
+                        } else {
+                            createDebug.names.push(ns);
+                        }
+                    }
+                } catch (err) {
+                    _didIteratorError = true;
+                    _iteratorError = err;
+                } finally{
+                    try {
+                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+                            _iterator.return();
+                        }
+                    } finally{
+                        if (_didIteratorError) {
+                            throw _iteratorError;
+                        }
                     }
-                    namespaces = split[i].replace(/\*/g, ".*?");
-                    if (namespaces[0] === "-") {
-                        createDebug.skips.push(new RegExp("^" + namespaces.slice(1) + "$"));
+                }
+            }
+            function matchesTemplate(search, template1) {
+                var searchIndex = 0;
+                var templateIndex = 0;
+                var starIndex = -1;
+                var matchIndex = 0;
+                while(searchIndex < search.length){
+                    if (templateIndex < template1.length && (template1[templateIndex] === search[searchIndex] || template1[templateIndex] === "*")) {
+                        if (template1[templateIndex] === "*") {
+                            starIndex = templateIndex;
+                            matchIndex = searchIndex;
+                            templateIndex++;
+                        } else {
+                            searchIndex++;
+                            templateIndex++;
+                        }
+                    } else if (starIndex !== -1) {
+                        templateIndex = starIndex + 1;
+                        matchIndex++;
+                        searchIndex = matchIndex;
                     } else {
-                        createDebug.names.push(new RegExp("^" + namespaces + "$"));
+                        return false;
                     }
                 }
+                while(templateIndex < template1.length && template1[templateIndex] === "*"){
+                    templateIndex++;
+                }
+                return templateIndex === template1.length;
             }
             function disable() {
-                var namespaces = _to_consumable_array(createDebug.names.map(toNamespace)).concat(_to_consumable_array(createDebug.skips.map(toNamespace).map(function(namespace) {
+                var namespaces = _to_consumable_array(createDebug.names).concat(_to_consumable_array(createDebug.skips.map(function(namespace) {
                     return "-" + namespace;
                 }))).join(",");
                 createDebug.enable("");
                 return namespaces;
             }
             function enabled(name) {
-                if (name[name.length - 1] === "*") {
-                    return true;
-                }
-                var i;
-                var len;
-                for(i = 0, len = createDebug.skips.length; i < len; i++){
-                    if (createDebug.skips[i].test(name)) {
-                        return false;
+                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                try {
+                    for(var _iterator = createDebug.skips[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                        var skip2 = _step.value;
+                        if (matchesTemplate(name, skip2)) {
+                            return false;
+                        }
+                    }
+                } catch (err) {
+                    _didIteratorError = true;
+                    _iteratorError = err;
+                } finally{
+                    try {
+                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+                            _iterator.return();
+                        }
+                    } finally{
+                        if (_didIteratorError) {
+                            throw _iteratorError;
+                        }
                     }
                 }
-                for(i = 0, len = createDebug.names.length; i < len; i++){
-                    if (createDebug.names[i].test(name)) {
-                        return true;
+                var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+                try {
+                    for(var _iterator1 = createDebug.names[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                        var ns = _step1.value;
+                        if (matchesTemplate(name, ns)) {
+                            return true;
+                        }
+                    }
+                } catch (err) {
+                    _didIteratorError1 = true;
+                    _iteratorError1 = err;
+                } finally{
+                    try {
+                        if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                            _iterator1.return();
+                        }
+                    } finally{
+                        if (_didIteratorError1) {
+                            throw _iteratorError1;
+                        }
                     }
                 }
                 return false;
             }
-            function toNamespace(regexp) {
-                return regexp.toString().substring(2, regexp.toString().length - 2).replace(/\.\*\?$/, "*");
-            }
             function coerce(val) {
                 if (_instanceof(val, Error)) {
                     return val.stack || val.message;
@@ -2029,12 +2104,12 @@ var require_browser = __commonJS({
 var require_has_flag = __commonJS({
     "node_modules/has-flag/index.js": function(exports2, module2) {
         "use strict";
-        module2.exports = function(flag) {
-            var argv = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : process.argv;
+        module2.exports = function(flag, argv) {
+            argv = argv || process.argv;
             var prefix2 = flag.startsWith("-") ? "" : flag.length === 1 ? "-" : "--";
-            var position = argv.indexOf(prefix2 + flag);
-            var terminatorPosition = argv.indexOf("--");
-            return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
+            var pos = argv.indexOf(prefix2 + flag);
+            var terminatorPos = argv.indexOf("--");
+            return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
         };
     }
 });
@@ -2043,23 +2118,16 @@ var require_supports_color = __commonJS({
     "node_modules/supports-color/index.js": function(exports2, module2) {
         "use strict";
         var os = require("os");
-        var tty = require("tty");
         var hasFlag = require_has_flag();
         var env = process.env;
         var forceColor;
-        if (hasFlag("no-color") || hasFlag("no-colors") || hasFlag("color=false") || hasFlag("color=never")) {
-            forceColor = 0;
+        if (hasFlag("no-color") || hasFlag("no-colors") || hasFlag("color=false")) {
+            forceColor = false;
         } else if (hasFlag("color") || hasFlag("colors") || hasFlag("color=true") || hasFlag("color=always")) {
-            forceColor = 1;
+            forceColor = true;
         }
         if ("FORCE_COLOR" in env) {
-            if (env.FORCE_COLOR === "true") {
-                forceColor = 1;
-            } else if (env.FORCE_COLOR === "false") {
-                forceColor = 0;
-            } else {
-                forceColor = env.FORCE_COLOR.length === 0 ? 1 : Math.min(parseInt(env.FORCE_COLOR, 10), 3);
-            }
+            forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
         }
         function translateLevel(level) {
             if (level === 0) {
@@ -2072,8 +2140,8 @@ var require_supports_color = __commonJS({
                 has16m: level >= 3
             };
         }
-        function supportsColor(haveStream, streamIsTTY) {
-            if (forceColor === 0) {
+        function supportsColor(stream) {
+            if (forceColor === false) {
                 return 0;
             }
             if (hasFlag("color=16m") || hasFlag("color=full") || hasFlag("color=truecolor")) {
@@ -2082,16 +2150,13 @@ var require_supports_color = __commonJS({
             if (hasFlag("color=256")) {
                 return 2;
             }
-            if (haveStream && !streamIsTTY && forceColor === void 0) {
+            if (stream && !stream.isTTY && forceColor !== true) {
                 return 0;
             }
-            var min = forceColor || 0;
-            if (env.TERM === "dumb") {
-                return min;
-            }
+            var min = forceColor ? 1 : 0;
             if (process.platform === "win32") {
                 var osRelease = os.release().split(".");
-                if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
+                if (Number(process.versions.node.split(".")[0]) >= 8 && Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
                     return Number(osRelease[2]) >= 14931 ? 3 : 2;
                 }
                 return 1;
@@ -2101,9 +2166,7 @@ var require_supports_color = __commonJS({
                     "TRAVIS",
                     "CIRCLECI",
                     "APPVEYOR",
-                    "GITLAB_CI",
-                    "GITHUB_ACTIONS",
-                    "BUILDKITE"
+                    "GITLAB_CI"
                 ].some(function(sign) {
                     return sign in env;
                 }) || env.CI_NAME === "codeship") {
@@ -2135,16 +2198,19 @@ var require_supports_color = __commonJS({
             if ("COLORTERM" in env) {
                 return 1;
             }
+            if (env.TERM === "dumb") {
+                return min;
+            }
             return min;
         }
         function getSupportLevel(stream) {
-            var level = supportsColor(stream, stream && stream.isTTY);
+            var level = supportsColor(stream);
             return translateLevel(level);
         }
         module2.exports = {
             supportsColor: getSupportLevel,
-            stdout: translateLevel(supportsColor(true, tty.isatty(1))),
-            stderr: translateLevel(supportsColor(true, tty.isatty(2)))
+            stdout: getSupportLevel(process.stdout),
+            stderr: getSupportLevel(process.stderr)
         };
     }
 });
@@ -2504,6 +2570,7 @@ var require_globals = __commonJS({
                 CSSKeywordValue: false,
                 CSSLayerBlockRule: false,
                 CSSLayerStatementRule: false,
+                CSSMarginRule: false,
                 CSSMathClamp: false,
                 CSSMathInvert: false,
                 CSSMathMax: false,
@@ -2515,6 +2582,7 @@ var require_globals = __commonJS({
                 CSSMatrixComponent: false,
                 CSSMediaRule: false,
                 CSSNamespaceRule: false,
+                CSSNestedDeclarations: false,
                 CSSNumericArray: false,
                 CSSNumericValue: false,
                 CSSPageDescriptors: false,
@@ -2815,7 +2883,6 @@ var require_globals = __commonJS({
                 IntersectionObserver: false,
                 IntersectionObserverEntry: false,
                 isSecureContext: false,
-                Iterator: false,
                 Keyboard: false,
                 KeyboardEvent: false,
                 KeyboardLayoutMap: false,
@@ -3469,12 +3536,15 @@ var require_globals = __commonJS({
                 XRDepthInformation: false,
                 XRDOMOverlayState: false,
                 XRFrame: false,
+                XRHand: false,
                 XRHitTestResult: false,
                 XRHitTestSource: false,
                 XRInputSource: false,
                 XRInputSourceArray: false,
                 XRInputSourceEvent: false,
                 XRInputSourcesChangeEvent: false,
+                XRJointPose: false,
+                XRJointSpace: false,
                 XRLayer: false,
                 XRLightEstimate: false,
                 XRLightProbe: false,
@@ -3529,6 +3599,7 @@ var require_globals = __commonJS({
                 Intl: false,
                 isFinite: false,
                 isNaN: false,
+                Iterator: false,
                 JSON: false,
                 Map: false,
                 Math: false,
@@ -4240,6 +4311,7 @@ var require_globals = __commonJS({
                 Intl: false,
                 isFinite: false,
                 isNaN: false,
+                Iterator: false,
                 JSON: false,
                 Map: false,
                 Math: false,
@@ -4539,6 +4611,7 @@ var require_globals = __commonJS({
                 clearImmediate: false,
                 clearInterval: false,
                 clearTimeout: false,
+                CloseEvent: false,
                 CompressionStream: false,
                 console: false,
                 CountQueuingStrategy: false,
@@ -4556,7 +4629,6 @@ var require_globals = __commonJS({
                 FormData: false,
                 global: false,
                 Headers: false,
-                Iterator: false,
                 MessageChannel: false,
                 MessageEvent: false,
                 MessagePort: false,
@@ -4613,6 +4685,7 @@ var require_globals = __commonJS({
                 clearImmediate: false,
                 clearInterval: false,
                 clearTimeout: false,
+                CloseEvent: false,
                 CompressionStream: false,
                 console: false,
                 CountQueuingStrategy: false,
@@ -4629,7 +4702,6 @@ var require_globals = __commonJS({
                 FormData: false,
                 global: false,
                 Headers: false,
-                Iterator: false,
                 MessageChannel: false,
                 MessageEvent: false,
                 MessagePort: false,
@@ -4906,6 +4978,7 @@ var require_globals = __commonJS({
                 ByteLengthQueuingStrategy: false,
                 clearInterval: false,
                 clearTimeout: false,
+                CloseEvent: false,
                 CompressionStream: false,
                 console: false,
                 CountQueuingStrategy: false,
@@ -4921,7 +4994,6 @@ var require_globals = __commonJS({
                 File: false,
                 FormData: false,
                 Headers: false,
-                Iterator: false,
                 MessageChannel: false,
                 MessageEvent: false,
                 MessagePort: false,
@@ -5112,6 +5184,10 @@ var require_globals = __commonJS({
                 GPUUncapturedErrorEvent: false,
                 GPUValidationError: false,
                 Headers: false,
+                HID: false,
+                HIDConnectionEvent: false,
+                HIDDevice: false,
+                HIDInputReportEvent: false,
                 IDBCursor: false,
                 IDBCursorWithValue: false,
                 IDBDatabase: false,
@@ -5133,7 +5209,6 @@ var require_globals = __commonJS({
                 importScripts: false,
                 indexedDB: false,
                 isSecureContext: false,
-                Iterator: false,
                 location: false,
                 Lock: false,
                 LockManager: false,
@@ -5193,6 +5268,7 @@ var require_globals = __commonJS({
                 Request: false,
                 requestAnimationFrame: false,
                 Response: false,
+                RTCDataChannel: false,
                 RTCEncodedAudioFrame: false,
                 RTCEncodedVideoFrame: false,
                 scheduler: false,
@@ -5508,9 +5584,6 @@ __export(lib_exports, {
     DebuggerStatement: function() {
         return debuggerStatement;
     },
-    DecimalLiteral: function() {
-        return decimalLiteral;
-    },
     DeclareClass: function() {
         return declareClass;
     },
@@ -5862,9 +5935,6 @@ __export(lib_exports, {
     NewExpression: function() {
         return newExpression;
     },
-    Noop: function() {
-        return noop;
-    },
     NullLiteral: function() {
         return nullLiteral;
     },
@@ -6069,6 +6139,9 @@ __export(lib_exports, {
     TSCallSignatureDeclaration: function() {
         return tsCallSignatureDeclaration;
     },
+    TSClassImplements: function() {
+        return tsClassImplements;
+    },
     TSConditionalType: function() {
         return tsConditionalType;
     },
@@ -6096,9 +6169,6 @@ __export(lib_exports, {
     TSExportAssignment: function() {
         return tsExportAssignment;
     },
-    TSExpressionWithTypeArguments: function() {
-        return tsExpressionWithTypeArguments;
-    },
     TSExternalModuleReference: function() {
         return tsExternalModuleReference;
     },
@@ -6129,6 +6199,9 @@ __export(lib_exports, {
     TSInterfaceDeclaration: function() {
         return tsInterfaceDeclaration;
     },
+    TSInterfaceHeritage: function() {
+        return tsInterfaceHeritage;
+    },
     TSIntersectionType: function() {
         return tsIntersectionType;
     },
@@ -6507,9 +6580,6 @@ __export(lib_exports, {
     assertDebuggerStatement: function() {
         return assertDebuggerStatement;
     },
-    assertDecimalLiteral: function() {
-        return assertDecimalLiteral;
-    },
     assertDeclaration: function() {
         return assertDeclaration;
     },
@@ -6834,9 +6904,6 @@ __export(lib_exports, {
     assertNode: function() {
         return assertNode;
     },
-    assertNoop: function() {
-        return assertNoop;
-    },
     assertNullLiteral: function() {
         return assertNullLiteral;
     },
@@ -7023,6 +7090,9 @@ __export(lib_exports, {
     assertTSCallSignatureDeclaration: function() {
         return assertTSCallSignatureDeclaration;
     },
+    assertTSClassImplements: function() {
+        return assertTSClassImplements;
+    },
     assertTSConditionalType: function() {
         return assertTSConditionalType;
     },
@@ -7050,9 +7120,6 @@ __export(lib_exports, {
     assertTSExportAssignment: function() {
         return assertTSExportAssignment;
     },
-    assertTSExpressionWithTypeArguments: function() {
-        return assertTSExpressionWithTypeArguments;
-    },
     assertTSExternalModuleReference: function() {
         return assertTSExternalModuleReference;
     },
@@ -7083,6 +7150,9 @@ __export(lib_exports, {
     assertTSInterfaceDeclaration: function() {
         return assertTSInterfaceDeclaration;
     },
+    assertTSInterfaceHeritage: function() {
+        return assertTSInterfaceHeritage;
+    },
     assertTSIntersectionType: function() {
         return assertTSIntersectionType;
     },
@@ -7416,9 +7486,6 @@ __export(lib_exports, {
     debuggerStatement: function() {
         return debuggerStatement;
     },
-    decimalLiteral: function() {
-        return decimalLiteral;
-    },
     declareClass: function() {
         return declareClass;
     },
@@ -7752,9 +7819,6 @@ __export(lib_exports, {
     isDebuggerStatement: function() {
         return isDebuggerStatement;
     },
-    isDecimalLiteral: function() {
-        return isDecimalLiteral;
-    },
     isDeclaration: function() {
         return isDeclaration;
     },
@@ -8085,9 +8149,6 @@ __export(lib_exports, {
     isNodesEquivalent: function() {
         return isNodesEquivalent;
     },
-    isNoop: function() {
-        return isNoop;
-    },
     isNullLiteral: function() {
         return isNullLiteral;
     },
@@ -8286,6 +8347,9 @@ __export(lib_exports, {
     isTSCallSignatureDeclaration: function() {
         return isTSCallSignatureDeclaration;
     },
+    isTSClassImplements: function() {
+        return isTSClassImplements;
+    },
     isTSConditionalType: function() {
         return isTSConditionalType;
     },
@@ -8313,9 +8377,6 @@ __export(lib_exports, {
     isTSExportAssignment: function() {
         return isTSExportAssignment;
     },
-    isTSExpressionWithTypeArguments: function() {
-        return isTSExpressionWithTypeArguments;
-    },
     isTSExternalModuleReference: function() {
         return isTSExternalModuleReference;
     },
@@ -8346,6 +8407,9 @@ __export(lib_exports, {
     isTSInterfaceDeclaration: function() {
         return isTSInterfaceDeclaration;
     },
+    isTSInterfaceHeritage: function() {
+        return isTSInterfaceHeritage;
+    },
     isTSIntersectionType: function() {
         return isTSIntersectionType;
     },
@@ -8583,51 +8647,6 @@ __export(lib_exports, {
     isYieldExpression: function() {
         return isYieldExpression;
     },
-    jSXAttribute: function() {
-        return jsxAttribute;
-    },
-    jSXClosingElement: function() {
-        return jsxClosingElement;
-    },
-    jSXClosingFragment: function() {
-        return jsxClosingFragment;
-    },
-    jSXElement: function() {
-        return jsxElement;
-    },
-    jSXEmptyExpression: function() {
-        return jsxEmptyExpression;
-    },
-    jSXExpressionContainer: function() {
-        return jsxExpressionContainer;
-    },
-    jSXFragment: function() {
-        return jsxFragment;
-    },
-    jSXIdentifier: function() {
-        return jsxIdentifier;
-    },
-    jSXMemberExpression: function() {
-        return jsxMemberExpression;
-    },
-    jSXNamespacedName: function() {
-        return jsxNamespacedName;
-    },
-    jSXOpeningElement: function() {
-        return jsxOpeningElement;
-    },
-    jSXOpeningFragment: function() {
-        return jsxOpeningFragment;
-    },
-    jSXSpreadAttribute: function() {
-        return jsxSpreadAttribute;
-    },
-    jSXSpreadChild: function() {
-        return jsxSpreadChild;
-    },
-    jSXText: function() {
-        return jsxText;
-    },
     jsxAttribute: function() {
         return jsxAttribute;
     },
@@ -8697,9 +8716,6 @@ __export(lib_exports, {
     newExpression: function() {
         return newExpression;
     },
-    noop: function() {
-        return noop;
-    },
     nullLiteral: function() {
         return nullLiteral;
     },
@@ -8859,201 +8875,6 @@ __export(lib_exports, {
     symbolTypeAnnotation: function() {
         return symbolTypeAnnotation;
     },
-    tSAnyKeyword: function() {
-        return tsAnyKeyword;
-    },
-    tSArrayType: function() {
-        return tsArrayType;
-    },
-    tSAsExpression: function() {
-        return tsAsExpression;
-    },
-    tSBigIntKeyword: function() {
-        return tsBigIntKeyword;
-    },
-    tSBooleanKeyword: function() {
-        return tsBooleanKeyword;
-    },
-    tSCallSignatureDeclaration: function() {
-        return tsCallSignatureDeclaration;
-    },
-    tSConditionalType: function() {
-        return tsConditionalType;
-    },
-    tSConstructSignatureDeclaration: function() {
-        return tsConstructSignatureDeclaration;
-    },
-    tSConstructorType: function() {
-        return tsConstructorType;
-    },
-    tSDeclareFunction: function() {
-        return tsDeclareFunction;
-    },
-    tSDeclareMethod: function() {
-        return tsDeclareMethod;
-    },
-    tSEnumDeclaration: function() {
-        return tsEnumDeclaration;
-    },
-    tSEnumMember: function() {
-        return tsEnumMember;
-    },
-    tSExportAssignment: function() {
-        return tsExportAssignment;
-    },
-    tSExpressionWithTypeArguments: function() {
-        return tsExpressionWithTypeArguments;
-    },
-    tSExternalModuleReference: function() {
-        return tsExternalModuleReference;
-    },
-    tSFunctionType: function() {
-        return tsFunctionType;
-    },
-    tSImportEqualsDeclaration: function() {
-        return tsImportEqualsDeclaration;
-    },
-    tSImportType: function() {
-        return tsImportType;
-    },
-    tSIndexSignature: function() {
-        return tsIndexSignature;
-    },
-    tSIndexedAccessType: function() {
-        return tsIndexedAccessType;
-    },
-    tSInferType: function() {
-        return tsInferType;
-    },
-    tSInstantiationExpression: function() {
-        return tsInstantiationExpression;
-    },
-    tSInterfaceBody: function() {
-        return tsInterfaceBody;
-    },
-    tSInterfaceDeclaration: function() {
-        return tsInterfaceDeclaration;
-    },
-    tSIntersectionType: function() {
-        return tsIntersectionType;
-    },
-    tSIntrinsicKeyword: function() {
-        return tsIntrinsicKeyword;
-    },
-    tSLiteralType: function() {
-        return tsLiteralType;
-    },
-    tSMappedType: function() {
-        return tsMappedType;
-    },
-    tSMethodSignature: function() {
-        return tsMethodSignature;
-    },
-    tSModuleBlock: function() {
-        return tsModuleBlock;
-    },
-    tSModuleDeclaration: function() {
-        return tsModuleDeclaration;
-    },
-    tSNamedTupleMember: function() {
-        return tsNamedTupleMember;
-    },
-    tSNamespaceExportDeclaration: function() {
-        return tsNamespaceExportDeclaration;
-    },
-    tSNeverKeyword: function() {
-        return tsNeverKeyword;
-    },
-    tSNonNullExpression: function() {
-        return tsNonNullExpression;
-    },
-    tSNullKeyword: function() {
-        return tsNullKeyword;
-    },
-    tSNumberKeyword: function() {
-        return tsNumberKeyword;
-    },
-    tSObjectKeyword: function() {
-        return tsObjectKeyword;
-    },
-    tSOptionalType: function() {
-        return tsOptionalType;
-    },
-    tSParameterProperty: function() {
-        return tsParameterProperty;
-    },
-    tSParenthesizedType: function() {
-        return tsParenthesizedType;
-    },
-    tSPropertySignature: function() {
-        return tsPropertySignature;
-    },
-    tSQualifiedName: function() {
-        return tsQualifiedName;
-    },
-    tSRestType: function() {
-        return tsRestType;
-    },
-    tSSatisfiesExpression: function() {
-        return tsSatisfiesExpression;
-    },
-    tSStringKeyword: function() {
-        return tsStringKeyword;
-    },
-    tSSymbolKeyword: function() {
-        return tsSymbolKeyword;
-    },
-    tSThisType: function() {
-        return tsThisType;
-    },
-    tSTupleType: function() {
-        return tsTupleType;
-    },
-    tSTypeAliasDeclaration: function() {
-        return tsTypeAliasDeclaration;
-    },
-    tSTypeAnnotation: function() {
-        return tsTypeAnnotation;
-    },
-    tSTypeAssertion: function() {
-        return tsTypeAssertion;
-    },
-    tSTypeLiteral: function() {
-        return tsTypeLiteral;
-    },
-    tSTypeOperator: function() {
-        return tsTypeOperator;
-    },
-    tSTypeParameter: function() {
-        return tsTypeParameter;
-    },
-    tSTypeParameterDeclaration: function() {
-        return tsTypeParameterDeclaration;
-    },
-    tSTypeParameterInstantiation: function() {
-        return tsTypeParameterInstantiation;
-    },
-    tSTypePredicate: function() {
-        return tsTypePredicate;
-    },
-    tSTypeQuery: function() {
-        return tsTypeQuery;
-    },
-    tSTypeReference: function() {
-        return tsTypeReference;
-    },
-    tSUndefinedKeyword: function() {
-        return tsUndefinedKeyword;
-    },
-    tSUnionType: function() {
-        return tsUnionType;
-    },
-    tSUnknownKeyword: function() {
-        return tsUnknownKeyword;
-    },
-    tSVoidKeyword: function() {
-        return tsVoidKeyword;
-    },
     taggedTemplateExpression: function() {
         return taggedTemplateExpression;
     },
@@ -9123,6 +8944,9 @@ __export(lib_exports, {
     tsCallSignatureDeclaration: function() {
         return tsCallSignatureDeclaration;
     },
+    tsClassImplements: function() {
+        return tsClassImplements;
+    },
     tsConditionalType: function() {
         return tsConditionalType;
     },
@@ -9147,9 +8971,6 @@ __export(lib_exports, {
     tsExportAssignment: function() {
         return tsExportAssignment;
     },
-    tsExpressionWithTypeArguments: function() {
-        return tsExpressionWithTypeArguments;
-    },
     tsExternalModuleReference: function() {
         return tsExternalModuleReference;
     },
@@ -9180,6 +9001,9 @@ __export(lib_exports, {
     tsInterfaceDeclaration: function() {
         return tsInterfaceDeclaration;
     },
+    tsInterfaceHeritage: function() {
+        return tsInterfaceHeritage;
+    },
     tsIntersectionType: function() {
         return tsIntersectionType;
     },
@@ -11606,11 +11430,6 @@ function isJSXClosingFragment(node, opts) {
     if (node.type !== "JSXClosingFragment") return false;
     return opts == null || shallowEqual(node, opts);
 }
-function isNoop(node, opts) {
-    if (!node) return false;
-    if (node.type !== "Noop") return false;
-    return opts == null || shallowEqual(node, opts);
-}
 function isPlaceholder(node, opts) {
     if (!node) return false;
     if (node.type !== "Placeholder") return false;
@@ -11661,11 +11480,6 @@ function isTupleExpression(node, opts) {
     if (node.type !== "TupleExpression") return false;
     return opts == null || shallowEqual(node, opts);
 }
-function isDecimalLiteral(node, opts) {
-    if (!node) return false;
-    if (node.type !== "DecimalLiteral") return false;
-    return opts == null || shallowEqual(node, opts);
-}
 function isModuleExpression(node, opts) {
     if (!node) return false;
     if (node.type !== "ModuleExpression") return false;
@@ -11906,9 +11720,14 @@ function isTSLiteralType(node, opts) {
     if (node.type !== "TSLiteralType") return false;
     return opts == null || shallowEqual(node, opts);
 }
-function isTSExpressionWithTypeArguments(node, opts) {
+function isTSClassImplements(node, opts) {
     if (!node) return false;
-    if (node.type !== "TSExpressionWithTypeArguments") return false;
+    if (node.type !== "TSClassImplements") return false;
+    return opts == null || shallowEqual(node, opts);
+}
+function isTSInterfaceHeritage(node, opts) {
+    if (!node) return false;
+    if (node.type !== "TSInterfaceHeritage") return false;
     return opts == null || shallowEqual(node, opts);
 }
 function isTSInterfaceDeclaration(node, opts) {
@@ -12152,7 +11971,6 @@ function isExpression(node, opts) {
         case "ClassExpression":
         case "ImportExpression":
         case "MetaProperty":
-        case "Super":
         case "TaggedTemplateExpression":
         case "TemplateLiteral":
         case "YieldExpression":
@@ -12168,7 +11986,6 @@ function isExpression(node, opts) {
         case "DoExpression":
         case "RecordExpression":
         case "TupleExpression":
-        case "DecimalLiteral":
         case "ModuleExpression":
         case "TopicReference":
         case "PipelineTopicExpression":
@@ -12487,7 +12304,6 @@ function isPureish(node, opts) {
         case "RegExpLiteral":
         case "ArrowFunctionExpression":
         case "BigIntLiteral":
-        case "DecimalLiteral":
             break;
         case "Placeholder":
             if (node.expectedNode === "StringLiteral") break;
@@ -12612,7 +12428,6 @@ function isLiteral(node, opts) {
         case "RegExpLiteral":
         case "TemplateLiteral":
         case "BigIntLiteral":
-        case "DecimalLiteral":
             break;
         case "Placeholder":
             if (node.expectedNode === "StringLiteral") break;
@@ -12985,7 +12800,6 @@ function isJSX(node, opts) {
 function isMiscellaneous(node, opts) {
     if (!node) return false;
     switch(node.type){
-        case "Noop":
         case "Placeholder":
         case "V8IntrinsicIdentifier":
             break;
@@ -13040,7 +12854,8 @@ function isTypeScript(node, opts) {
         case "TSIndexedAccessType":
         case "TSMappedType":
         case "TSLiteralType":
-        case "TSExpressionWithTypeArguments":
+        case "TSClassImplements":
+        case "TSInterfaceHeritage":
         case "TSInterfaceDeclaration":
         case "TSInterfaceBody":
         case "TSTypeAliasDeclaration":
@@ -13118,7 +12933,8 @@ function isTSType(node, opts) {
         case "TSIndexedAccessType":
         case "TSMappedType":
         case "TSLiteralType":
-        case "TSExpressionWithTypeArguments":
+        case "TSClassImplements":
+        case "TSInterfaceHeritage":
         case "TSImportType":
             break;
         default:
@@ -15177,6 +14993,7 @@ defineType$4("ClassBody", {
         body: validateArrayOfType("ClassMethod", "ClassPrivateMethod", "ClassProperty", "ClassPrivateProperty", "ClassAccessorProperty", "TSDeclareMethod", "TSIndexSignature", "StaticBlock")
     }
 });
+var _obj;
 defineType$4("ClassExpression", {
     builder: [
         "id",
@@ -15189,7 +15006,7 @@ defineType$4("ClassExpression", {
         "id",
         "typeParameters",
         "superClass",
-        "superTypeParameters",
+        "superTypeArguments",
         "mixins",
         "implements",
         "body"
@@ -15199,7 +15016,7 @@ defineType$4("ClassExpression", {
         "Class",
         "Expression"
     ],
-    fields: {
+    fields: (_obj = {
         id: {
             validate: assertNodeType("Identifier"),
             optional: true
@@ -15214,25 +15031,22 @@ defineType$4("ClassExpression", {
         superClass: {
             optional: true,
             validate: assertNodeType("Expression")
-        },
-        superTypeParameters: {
-            validate: assertNodeType("TypeParameterInstantiation", "TSTypeParameterInstantiation"),
-            optional: true
-        },
-        implements: {
-            validate: arrayOfType("TSClassImplements", "ClassImplements"),
-            optional: true
-        },
-        decorators: {
-            validate: arrayOfType("Decorator"),
-            optional: true
-        },
-        mixins: {
-            validate: assertNodeType("InterfaceExtends"),
-            optional: true
         }
-    }
+    }, _define_property(_obj, "superTypeArguments", {
+        validate: assertNodeType("TypeParameterInstantiation", "TSTypeParameterInstantiation"),
+        optional: true
+    }), _define_property(_obj, "implements", {
+        validate: arrayOfType("TSClassImplements", "ClassImplements"),
+        optional: true
+    }), _define_property(_obj, "decorators", {
+        validate: arrayOfType("Decorator"),
+        optional: true
+    }), _define_property(_obj, "mixins", {
+        validate: assertNodeType("InterfaceExtends"),
+        optional: true
+    }), _obj)
 });
+var _obj1;
 defineType$4("ClassDeclaration", {
     inherits: "ClassExpression",
     aliases: [
@@ -15241,7 +15055,7 @@ defineType$4("ClassDeclaration", {
         "Statement",
         "Declaration"
     ],
-    fields: {
+    fields: (_obj1 = {
         id: {
             validate: assertNodeType("Identifier"),
             optional: true
@@ -15256,32 +15070,26 @@ defineType$4("ClassDeclaration", {
         superClass: {
             optional: true,
             validate: assertNodeType("Expression")
-        },
-        superTypeParameters: {
-            validate: assertNodeType("TypeParameterInstantiation", "TSTypeParameterInstantiation"),
-            optional: true
-        },
-        implements: {
-            validate: arrayOfType("TSClassImplements", "ClassImplements"),
-            optional: true
-        },
-        decorators: {
-            validate: arrayOfType("Decorator"),
-            optional: true
-        },
-        mixins: {
-            validate: assertNodeType("InterfaceExtends"),
-            optional: true
-        },
-        declare: {
-            validate: assertValueType("boolean"),
-            optional: true
-        },
-        abstract: {
-            validate: assertValueType("boolean"),
-            optional: true
         }
-    },
+    }, _define_property(_obj1, "superTypeArguments", {
+        validate: assertNodeType("TypeParameterInstantiation", "TSTypeParameterInstantiation"),
+        optional: true
+    }), _define_property(_obj1, "implements", {
+        validate: arrayOfType("TSClassImplements", "ClassImplements"),
+        optional: true
+    }), _define_property(_obj1, "decorators", {
+        validate: arrayOfType("Decorator"),
+        optional: true
+    }), _define_property(_obj1, "mixins", {
+        validate: assertNodeType("InterfaceExtends"),
+        optional: true
+    }), _define_property(_obj1, "declare", {
+        validate: assertValueType("boolean"),
+        optional: true
+    }), _define_property(_obj1, "abstract", {
+        validate: assertValueType("boolean"),
+        optional: true
+    }), _obj1),
     validate: function() {
         var identifier4 = assertNodeType("Identifier");
         return function(parent, key, node) {
@@ -17683,12 +17491,11 @@ defineType("TSTypeReference", {
     ],
     visitor: [
         "typeName",
-        "typeParameters"
+        "typeArguments"
     ],
-    fields: {
-        typeName: validateType("TSEntityName"),
-        typeParameters: validateOptionalType("TSTypeParameterInstantiation")
-    }
+    fields: _define_property({
+        typeName: validateType("TSEntityName")
+    }, "typeArguments", validateOptionalType("TSTypeParameterInstantiation"))
 });
 defineType("TSTypePredicate", {
     aliases: [
@@ -18075,15 +17882,15 @@ defineType("TSModuleDeclaration", {
         "id",
         "body"
     ],
-    fields: {
+    fields: Object.assign({
         kind: {
             validate: assertOneOf("global", "module", "namespace")
         },
-        declare: validateOptional(bool),
-        global: validateOptional(bool),
-        id: validateType("Identifier", "StringLiteral"),
-        body: validateType("TSModuleBlock", "TSModuleDeclaration")
-    }
+        declare: validateOptional(bool)
+    }, false, {
+        id: validateType("TSEntityName", "StringLiteral"),
+        body: validateType("TSModuleBlock")
+    })
 });
 defineType("TSModuleBlock", {
     aliases: [
@@ -18287,8 +18094,7 @@ var _validate = /* @__PURE__ */ Object.freeze({
 });
 var validate = _validate.validateInternal;
 var NODE_FIELDS = utils.NODE_FIELDS;
-function arrayExpression() {
-    var elements = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [];
+function arrayExpression(elements) {
     var node = {
         type: "ArrayExpression",
         elements: elements
@@ -18619,19 +18425,17 @@ function logicalExpression(operator, left, right) {
     return node;
 }
 function memberExpression(object, property) {
-    var computed = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false, optional = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : null;
+    var computed = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
     var node = {
         type: "MemberExpression",
         object: object,
         property: property,
-        computed: computed,
-        optional: optional
+        computed: computed
     };
     var defs = NODE_FIELDS.MemberExpression;
     validate(defs.object, node, "object", object, 1);
     validate(defs.property, node, "property", property, 1);
     validate(defs.computed, node, "computed", computed);
-    validate(defs.optional, node, "optional", optional);
     return node;
 }
 function newExpression(callee, _arguments) {
@@ -18670,8 +18474,8 @@ function objectExpression(properties) {
     validate(defs.properties, node, "properties", properties, 1);
     return node;
 }
-function objectMethod() {
-    var kind = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "method", key = arguments.length > 1 ? arguments[1] : void 0, params = arguments.length > 2 ? arguments[2] : void 0, body = arguments.length > 3 ? arguments[3] : void 0, computed = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : false, generator = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : false, async = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : false;
+function objectMethod(kind, key, params, body) {
+    var computed = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : false, generator = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : false, async = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : false;
     var node = {
         type: "ObjectMethod",
         kind: kind,
@@ -18693,21 +18497,19 @@ function objectMethod() {
     return node;
 }
 function objectProperty(key, value1) {
-    var computed = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false, shorthand = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false, decorators = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : null;
+    var computed = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false, shorthand = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false;
     var node = {
         type: "ObjectProperty",
         key: key,
         value: value1,
         computed: computed,
-        shorthand: shorthand,
-        decorators: decorators
+        shorthand: shorthand
     };
     var defs = NODE_FIELDS.ObjectProperty;
     validate(defs.key, node, "key", key, 1);
     validate(defs.value, node, "value", value1, 1);
     validate(defs.computed, node, "computed", computed);
     validate(defs.shorthand, node, "shorthand", shorthand);
-    validate(defs.decorators, node, "decorators", decorators, 1);
     return node;
 }
 function restElement(argument) {
@@ -20019,19 +19821,17 @@ function jsxClosingElement(name) {
     return node;
 }
 function jsxElement(openingElement) {
-    var closingElement = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null, children = arguments.length > 2 ? arguments[2] : void 0, selfClosing = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : null;
+    var closingElement = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null, children = arguments.length > 2 ? arguments[2] : void 0;
     var node = {
         type: "JSXElement",
         openingElement: openingElement,
         closingElement: closingElement,
-        children: children,
-        selfClosing: selfClosing
+        children: children
     };
     var defs = NODE_FIELDS.JSXElement;
     validate(defs.openingElement, node, "openingElement", openingElement, 1);
     validate(defs.closingElement, node, "closingElement", closingElement, 1);
     validate(defs.children, node, "children", children, 1);
-    validate(defs.selfClosing, node, "selfClosing", selfClosing);
     return node;
 }
 function jsxEmptyExpression() {
@@ -20143,11 +19943,6 @@ function jsxClosingFragment() {
         type: "JSXClosingFragment"
     };
 }
-function noop() {
-    return {
-        type: "Noop"
-    };
-}
 function placeholder(expectedNode, name) {
     var node = {
         type: "Placeholder",
@@ -20244,15 +20039,6 @@ function tupleExpression() {
     validate(defs.elements, node, "elements", elements, 1);
     return node;
 }
-function decimalLiteral(value1) {
-    var node = {
-        type: "DecimalLiteral",
-        value: value1
-    };
-    var defs = NODE_FIELDS.DecimalLiteral;
-    validate(defs.value, node, "value", value1);
-    return node;
-}
 function moduleExpression(body) {
     var node = {
         type: "ModuleExpression",
@@ -20345,31 +20131,31 @@ function tsQualifiedName(left, right) {
     return node;
 }
 function tsCallSignatureDeclaration() {
-    var typeParameters = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : null, parameters = arguments.length > 1 ? arguments[1] : void 0, typeAnnotation2 = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : null;
+    var typeParameters = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : null, params = arguments.length > 1 ? arguments[1] : void 0, returnType = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : null;
     var node = {
         type: "TSCallSignatureDeclaration",
         typeParameters: typeParameters,
-        parameters: parameters,
-        typeAnnotation: typeAnnotation2
+        params: params,
+        returnType: returnType
     };
     var defs = NODE_FIELDS.TSCallSignatureDeclaration;
     validate(defs.typeParameters, node, "typeParameters", typeParameters, 1);
-    validate(defs.parameters, node, "parameters", parameters, 1);
-    validate(defs.typeAnnotation, node, "typeAnnotation", typeAnnotation2, 1);
+    validate(defs.params, node, "params", params, 1);
+    validate(defs.returnType, node, "returnType", returnType, 1);
     return node;
 }
 function tsConstructSignatureDeclaration() {
-    var typeParameters = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : null, parameters = arguments.length > 1 ? arguments[1] : void 0, typeAnnotation2 = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : null;
+    var typeParameters = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : null, params = arguments.length > 1 ? arguments[1] : void 0, returnType = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : null;
     var node = {
         type: "TSConstructSignatureDeclaration",
         typeParameters: typeParameters,
-        parameters: parameters,
-        typeAnnotation: typeAnnotation2
+        params: params,
+        returnType: returnType
     };
     var defs = NODE_FIELDS.TSConstructSignatureDeclaration;
     validate(defs.typeParameters, node, "typeParameters", typeParameters, 1);
-    validate(defs.parameters, node, "parameters", parameters, 1);
-    validate(defs.typeAnnotation, node, "typeAnnotation", typeAnnotation2, 1);
+    validate(defs.params, node, "params", params, 1);
+    validate(defs.returnType, node, "returnType", returnType, 1);
     return node;
 }
 function tsPropertySignature(key) {
@@ -20386,20 +20172,20 @@ function tsPropertySignature(key) {
     return node;
 }
 function tsMethodSignature(key) {
-    var typeParameters = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null, parameters = arguments.length > 2 ? arguments[2] : void 0, typeAnnotation2 = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : null;
+    var typeParameters = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null, params = arguments.length > 2 ? arguments[2] : void 0, returnType = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : null;
     var node = {
         type: "TSMethodSignature",
         key: key,
         typeParameters: typeParameters,
-        parameters: parameters,
-        typeAnnotation: typeAnnotation2,
+        params: params,
+        returnType: returnType,
         kind: null
     };
     var defs = NODE_FIELDS.TSMethodSignature;
     validate(defs.key, node, "key", key, 1);
     validate(defs.typeParameters, node, "typeParameters", typeParameters, 1);
-    validate(defs.parameters, node, "parameters", parameters, 1);
-    validate(defs.typeAnnotation, node, "typeAnnotation", typeAnnotation2, 1);
+    validate(defs.params, node, "params", params, 1);
+    validate(defs.returnType, node, "returnType", returnType, 1);
     return node;
 }
 function tsIndexSignature(parameters) {
@@ -20485,43 +20271,43 @@ function tsThisType() {
     };
 }
 function tsFunctionType() {
-    var typeParameters = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : null, parameters = arguments.length > 1 ? arguments[1] : void 0, typeAnnotation2 = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : null;
+    var typeParameters = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : null, params = arguments.length > 1 ? arguments[1] : void 0, returnType = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : null;
     var node = {
         type: "TSFunctionType",
         typeParameters: typeParameters,
-        parameters: parameters,
-        typeAnnotation: typeAnnotation2
+        params: params,
+        returnType: returnType
     };
     var defs = NODE_FIELDS.TSFunctionType;
     validate(defs.typeParameters, node, "typeParameters", typeParameters, 1);
-    validate(defs.parameters, node, "parameters", parameters, 1);
-    validate(defs.typeAnnotation, node, "typeAnnotation", typeAnnotation2, 1);
+    validate(defs.params, node, "params", params, 1);
+    validate(defs.returnType, node, "returnType", returnType, 1);
     return node;
 }
 function tsConstructorType() {
-    var typeParameters = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : null, parameters = arguments.length > 1 ? arguments[1] : void 0, typeAnnotation2 = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : null;
+    var typeParameters = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : null, params = arguments.length > 1 ? arguments[1] : void 0, returnType = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : null;
     var node = {
         type: "TSConstructorType",
         typeParameters: typeParameters,
-        parameters: parameters,
-        typeAnnotation: typeAnnotation2
+        params: params,
+        returnType: returnType
     };
     var defs = NODE_FIELDS.TSConstructorType;
     validate(defs.typeParameters, node, "typeParameters", typeParameters, 1);
-    validate(defs.parameters, node, "parameters", parameters, 1);
-    validate(defs.typeAnnotation, node, "typeAnnotation", typeAnnotation2, 1);
+    validate(defs.params, node, "params", params, 1);
+    validate(defs.returnType, node, "returnType", returnType, 1);
     return node;
 }
 function tsTypeReference(typeName) {
-    var typeParameters = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
+    var typeArguments = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
     var node = {
         type: "TSTypeReference",
         typeName: typeName,
-        typeParameters: typeParameters
+        typeArguments: typeArguments
     };
     var defs = NODE_FIELDS.TSTypeReference;
     validate(defs.typeName, node, "typeName", typeName, 1);
-    validate(defs.typeParameters, node, "typeParameters", typeParameters, 1);
+    validate(defs.typeArguments, node, "typeArguments", typeArguments, 1);
     return node;
 }
 function tsTypePredicate(parameterName) {
@@ -20681,18 +20467,20 @@ function tsIndexedAccessType(objectType, indexType) {
     validate(defs.indexType, node, "indexType", indexType, 1);
     return node;
 }
-function tsMappedType(typeParameter2) {
-    var typeAnnotation2 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null, nameType = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : null;
+function tsMappedType(key, constraint) {
+    var nameType = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : null, typeAnnotation2 = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : null;
     var node = {
         type: "TSMappedType",
-        typeParameter: typeParameter2,
-        typeAnnotation: typeAnnotation2,
-        nameType: nameType
+        key: key,
+        constraint: constraint,
+        nameType: nameType,
+        typeAnnotation: typeAnnotation2
     };
     var defs = NODE_FIELDS.TSMappedType;
-    validate(defs.typeParameter, node, "typeParameter", typeParameter2, 1);
-    validate(defs.typeAnnotation, node, "typeAnnotation", typeAnnotation2, 1);
+    validate(defs.key, node, "key", key, 1);
+    validate(defs.constraint, node, "constraint", constraint, 1);
     validate(defs.nameType, node, "nameType", nameType, 1);
+    validate(defs.typeAnnotation, node, "typeAnnotation", typeAnnotation2, 1);
     return node;
 }
 function tsLiteralType(literal) {
@@ -20704,14 +20492,26 @@ function tsLiteralType(literal) {
     validate(defs.literal, node, "literal", literal, 1);
     return node;
 }
-function tsExpressionWithTypeArguments(expression2) {
+function tsClassImplements(expression2) {
     var typeParameters = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
     var node = {
-        type: "TSExpressionWithTypeArguments",
+        type: "TSClassImplements",
         expression: expression2,
         typeParameters: typeParameters
     };
-    var defs = NODE_FIELDS.TSExpressionWithTypeArguments;
+    var defs = NODE_FIELDS.TSClassImplements;
+    validate(defs.expression, node, "expression", expression2, 1);
+    validate(defs.typeParameters, node, "typeParameters", typeParameters, 1);
+    return node;
+}
+function tsInterfaceHeritage(expression2) {
+    var typeParameters = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
+    var node = {
+        type: "TSInterfaceHeritage",
+        expression: expression2,
+        typeParameters: typeParameters
+    };
+    var defs = NODE_FIELDS.TSInterfaceHeritage;
     validate(defs.expression, node, "expression", expression2, 1);
     validate(defs.typeParameters, node, "typeParameters", typeParameters, 1);
     return node;
@@ -20944,7 +20744,7 @@ function tsTypeParameter() {
     var defs = NODE_FIELDS.TSTypeParameter;
     validate(defs.constraint, node, "constraint", constraint, 1);
     validate(defs.default, node, "default", _default, 1);
-    validate(defs.name, node, "name", name);
+    validate(defs.name, node, "name", name, 1);
     return node;
 }
 function NumberLiteral(value1) {
@@ -21527,9 +21327,6 @@ function assertJSXOpeningFragment(node, opts) {
 function assertJSXClosingFragment(node, opts) {
     assert("JSXClosingFragment", node, opts);
 }
-function assertNoop(node, opts) {
-    assert("Noop", node, opts);
-}
 function assertPlaceholder(node, opts) {
     assert("Placeholder", node, opts);
 }
@@ -21560,9 +21357,6 @@ function assertRecordExpression(node, opts) {
 function assertTupleExpression(node, opts) {
     assert("TupleExpression", node, opts);
 }
-function assertDecimalLiteral(node, opts) {
-    assert("DecimalLiteral", node, opts);
-}
 function assertModuleExpression(node, opts) {
     assert("ModuleExpression", node, opts);
 }
@@ -21707,8 +21501,11 @@ function assertTSMappedType(node, opts) {
 function assertTSLiteralType(node, opts) {
     assert("TSLiteralType", node, opts);
 }
-function assertTSExpressionWithTypeArguments(node, opts) {
-    assert("TSExpressionWithTypeArguments", node, opts);
+function assertTSClassImplements(node, opts) {
+    assert("TSClassImplements", node, opts);
+}
+function assertTSInterfaceHeritage(node, opts) {
+    assert("TSInterfaceHeritage", node, opts);
 }
 function assertTSInterfaceDeclaration(node, opts) {
     assert("TSInterfaceDeclaration", node, opts);
@@ -22095,18 +21892,19 @@ function removeTypeDuplicates(nodesIn) {
             }
             continue;
         }
-        if (isTSTypeReference(node) && node.typeParameters) {
+        var typeArgumentsKey = "typeArguments";
+        if (isTSTypeReference(node) && node[typeArgumentsKey]) {
+            var typeArguments = node[typeArgumentsKey];
             var name = getQualifiedName(node.typeName);
             if (generics.has(name)) {
                 var existing = generics.get(name);
-                if (existing.typeParameters) {
-                    if (node.typeParameters) {
-                        var _existing_typeParameters_params;
-                        (_existing_typeParameters_params = existing.typeParameters.params).push.apply(_existing_typeParameters_params, _to_consumable_array(node.typeParameters.params));
-                        existing.typeParameters.params = removeTypeDuplicates(existing.typeParameters.params);
-                    }
+                var existingTypeArguments = existing[typeArgumentsKey];
+                if (existingTypeArguments) {
+                    var _existingTypeArguments_params;
+                    (_existingTypeArguments_params = existingTypeArguments.params).push.apply(_existingTypeArguments_params, _to_consumable_array(typeArguments.params));
+                    existingTypeArguments.params = removeTypeDuplicates(existingTypeArguments.params);
                 } else {
-                    existing = node.typeParameters;
+                    existing = typeArguments;
                 }
             } else {
                 generics.set(name, node);
@@ -24035,9 +23833,13 @@ var estree = function(superClass) {
                 key: "pushClassMethod",
                 value: function pushClassMethod(classBody2, method, isGenerator, isAsync, isConstructor, allowsDirectSuper) {
                     this.parseMethod(method, isGenerator, isAsync, isConstructor, allowsDirectSuper, "ClassMethod", true);
-                    if (method.typeParameters) {
-                        method.value.typeParameters = method.typeParameters;
+                    var typeParameters = method.typeParameters;
+                    if (typeParameters) {
                         delete method.typeParameters;
+                        var fn = method.value;
+                        fn.typeParameters = typeParameters;
+                        fn.start = typeParameters.start;
+                        fn.loc.start = typeParameters.loc.start;
                     }
                     classBody2.body.push(method);
                 }
@@ -24798,6 +24600,9 @@ var tt = {
     name: createToken("name", {
         startsExpr: startsExpr
     }),
+    placeholder: createToken("%%", {
+        startsExpr: true
+    }),
     string: createToken("string", {
         startsExpr: startsExpr
     }),
@@ -24824,22 +24629,19 @@ var tt = {
     jsxTagStart: createToken("jsxTagStart", {
         startsExpr: true
     }),
-    jsxTagEnd: createToken("jsxTagEnd"),
-    placeholder: createToken("%%", {
-        startsExpr: true
-    })
+    jsxTagEnd: createToken("jsxTagEnd")
 };
 function tokenIsIdentifier(token) {
-    return token >= 93 && token <= 132;
+    return token >= 93 && token <= 133;
 }
 function tokenKeywordOrIdentifierIsKeyword(token) {
     return token <= 92;
 }
 function tokenIsKeywordOrIdentifier(token) {
-    return token >= 58 && token <= 132;
+    return token >= 58 && token <= 133;
 }
 function tokenIsLiteralPropertyName(token) {
-    return token >= 58 && token <= 136;
+    return token >= 58 && token <= 137;
 }
 function tokenComesBeforeExpression(token) {
     return tokenBeforeExprs[token];
@@ -26257,6 +26059,18 @@ var BaseParser = /*#__PURE__*/ function() {
         __publicField(this, "ambiguousScriptDifferentAst", false);
     }
     _create_class(BaseParser, [
+        {
+            key: "sourceToOffsetPos",
+            value: function sourceToOffsetPos(sourcePos) {
+                return sourcePos + this.startIndex;
+            }
+        },
+        {
+            key: "offsetToSourcePos",
+            value: function offsetToSourcePos(offsetPos) {
+                return offsetPos - this.startIndex;
+            }
+        },
         {
             key: "hasPlugin",
             value: function hasPlugin(pluginConfig) {
@@ -26402,7 +26216,7 @@ var CommentsParser = /*#__PURE__*/ function(BaseParser) {
                     }
                 } else {
                     var node = commentWS.containingNode, commentStart = commentWS.start;
-                    if (this.input.charCodeAt(commentStart - 1) === 44) {
+                    if (this.input.charCodeAt(this.offsetToSourcePos(commentStart) - 1) === 44) {
                         switch(node.type){
                             case "ObjectExpression":
                             case "ObjectPattern":
@@ -26573,7 +26387,7 @@ var State = /*#__PURE__*/ function() {
         __publicField(this, "commentsLen", 0);
         __publicField(this, "commentStack", []);
         __publicField(this, "pos", 0);
-        __publicField(this, "type", 139);
+        __publicField(this, "type", 140);
         __publicField(this, "value", null);
         __publicField(this, "start", 0);
         __publicField(this, "end", 0);
@@ -26731,8 +26545,7 @@ var State = /*#__PURE__*/ function() {
         {
             key: "curPosition",
             value: function curPosition() {
-                var index2 = this.pos + this.startIndex;
-                return new Position(this.curLine, index2 - this.lineStart, index2);
+                return new Position(this.curLine, this.pos - this.lineStart, this.pos + this.startIndex);
             }
         },
         {
@@ -27079,10 +26892,11 @@ var VALID_REGEX_FLAGS = /* @__PURE__ */ new Set([
 var Token = function Token(state) {
     "use strict";
     _class_call_check(this, Token);
+    var startIndex = state.startIndex || 0;
     this.type = state.type;
     this.value = state.value;
-    this.start = state.start;
-    this.end = state.end;
+    this.start = startIndex + state.start;
+    this.end = startIndex + state.end;
     this.loc = new SourceLocation(state.startLoc, state.endLoc);
 };
 var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
@@ -27281,7 +27095,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                 this.state.start = this.state.pos;
                 if (!this.isLookahead) this.state.startLoc = this.state.curPosition();
                 if (this.state.pos >= this.length) {
-                    this.finishToken(139);
+                    this.finishToken(140);
                     return;
                 }
                 this.getTokenFromCode(this.codePointAtPos(this.state.pos));
@@ -27307,8 +27121,8 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                 var comment = {
                     type: "CommentBlock",
                     value: this.input.slice(start + 2, end),
-                    start: start,
-                    end: end + commentEnd.length,
+                    start: this.sourceToOffsetPos(start),
+                    end: this.sourceToOffsetPos(end + commentEnd.length),
                     loc: new SourceLocation(startLoc, this.state.curPosition())
                 };
                 if (this.options.tokens) this.pushToken(comment);
@@ -27333,8 +27147,8 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                 var comment = {
                     type: "CommentLine",
                     value: value1,
-                    start: start,
-                    end: end,
+                    start: this.sourceToOffsetPos(start),
+                    end: this.sourceToOffsetPos(end),
                     loc: new SourceLocation(startLoc, this.state.curPosition())
                 };
                 if (this.options.tokens) this.pushToken(comment);
@@ -27422,8 +27236,8 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                 if (comments.length > 0) {
                     var end = this.state.pos;
                     var commentWhitespace = {
-                        start: spaceStart,
-                        end: end,
+                        start: this.sourceToOffsetPos(spaceStart),
+                        end: this.sourceToOffsetPos(end),
                         comments: comments,
                         leadingNode: null,
                         trailingNode: null,
@@ -27474,10 +27288,10 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                     }
                 } else if (isIdentifierStart2(next)) {
                     ++this.state.pos;
-                    this.finishToken(138, this.readWord1(next));
+                    this.finishToken(139, this.readWord1(next));
                 } else if (next === 92) {
                     ++this.state.pos;
-                    this.finishToken(138, this.readWord1());
+                    this.finishToken(139, this.readWord1());
                 } else {
                     this.finishOp(27, 1);
                 }
@@ -27908,7 +27722,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                     mods += char;
                 }
                 this.state.pos = pos;
-                this.finishToken(137, {
+                this.finishToken(138, {
                     pattern: content,
                     flags: mods
                 });
@@ -27926,6 +27740,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
         {
             key: "readRadixNumber",
             value: function readRadixNumber(radix) {
+                var start = this.state.pos;
                 var startLoc = this.state.curPosition();
                 var isBigInt = false;
                 this.state.pos += 2;
@@ -27946,11 +27761,11 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                     throw this.raise(Errors.NumberIdentifier, this.state.curPosition());
                 }
                 if (isBigInt) {
-                    var str = this.input.slice(startLoc.index, this.state.pos).replace(/[_n]/g, "");
-                    this.finishToken(135, str);
+                    var str = this.input.slice(start, this.state.pos).replace(/[_n]/g, "");
+                    this.finishToken(136, str);
                     return;
                 }
-                this.finishToken(134, val);
+                this.finishToken(135, val);
             }
         },
         {
@@ -28006,11 +27821,11 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                 }
                 var str = this.input.slice(start, this.state.pos).replace(/[_mn]/g, "");
                 if (isBigInt) {
-                    this.finishToken(135, str);
+                    this.finishToken(136, str);
                     return;
                 }
                 var val = isOctal ? parseInt(str, 8) : parseFloat(str);
-                this.finishToken(134, val);
+                this.finishToken(135, val);
             }
         },
         {
@@ -28028,7 +27843,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                 this.state.pos = pos + 1;
                 this.state.lineStart = lineStart;
                 this.state.curLine = curLine;
-                this.finishToken(133, str);
+                this.finishToken(134, str);
             }
         },
         {
@@ -28050,7 +27865,7 @@ var Tokenizer = /*#__PURE__*/ function(CommentsParser) {
                 this.state.lineStart = lineStart;
                 this.state.curLine = curLine;
                 if (firstInvalidLoc) {
-                    this.state.firstInvalidTemplateEscapePos = new Position(firstInvalidLoc.curLine, firstInvalidLoc.pos - firstInvalidLoc.lineStart, firstInvalidLoc.pos);
+                    this.state.firstInvalidTemplateEscapePos = new Position(firstInvalidLoc.curLine, firstInvalidLoc.pos - firstInvalidLoc.lineStart, this.sourceToOffsetPos(firstInvalidLoc.pos));
                 }
                 if (this.input.codePointAt(pos) === 96) {
                     this.finishToken(24, firstInvalidLoc ? null : opening + str + "`");
@@ -28638,13 +28453,13 @@ var UtilParser = /*#__PURE__*/ function(Tokenizer) {
         {
             key: "canInsertSemicolon",
             value: function canInsertSemicolon() {
-                return this.match(139) || this.match(8) || this.hasPrecedingLineBreak();
+                return this.match(140) || this.match(8) || this.hasPrecedingLineBreak();
             }
         },
         {
             key: "hasPrecedingLineBreak",
             value: function hasPrecedingLineBreak() {
-                return hasNewLine(this.input, this.state.lastTokEndLoc.index, this.state.start);
+                return hasNewLine(this.input, this.offsetToSourcePos(this.state.lastTokEndLoc.index), this.state.start);
             }
         },
         {
@@ -29137,7 +28952,7 @@ var flow = function(superClass) {
             {
                 key: "finishToken",
                 value: function finishToken(type, val) {
-                    if (type !== 133 && type !== 13 && type !== 28) {
+                    if (type !== 134 && type !== 13 && type !== 28) {
                         if (this.flowPragma === void 0) {
                             this.flowPragma = null;
                         }
@@ -29298,7 +29113,7 @@ var flow = function(superClass) {
                 value: function flowParseDeclareModule(node) {
                     var _this = this;
                     this.scope.enter(0);
-                    if (this.match(133)) {
+                    if (this.match(134)) {
                         node.id = _get(_get_prototype_of(FlowParserMixin.prototype), "parseExprAtom", this).call(this);
                     } else {
                         node.id = this.parseIdentifier();
@@ -29571,7 +29386,7 @@ var flow = function(superClass) {
                     var node = this.startNode();
                     node.params = [];
                     this.state.inType = true;
-                    if (this.match(47) || this.match(142)) {
+                    if (this.match(47) || this.match(143)) {
                         this.next();
                     } else {
                         this.unexpected();
@@ -29657,7 +29472,7 @@ var flow = function(superClass) {
             {
                 key: "flowParseObjectPropertyKey",
                 value: function flowParseObjectPropertyKey() {
-                    return this.match(134) || this.match(133) ? _get(_get_prototype_of(FlowParserMixin.prototype), "parseExprAtom", this).call(this) : this.parseIdentifier(true);
+                    return this.match(135) || this.match(134) ? _get(_get_prototype_of(FlowParserMixin.prototype), "parseExprAtom", this).call(this) : this.parseIdentifier(true);
                 }
             },
             {
@@ -30149,7 +29964,7 @@ var flow = function(superClass) {
                                 node21.typeParameters = null;
                                 return this.finishNode(node21, "FunctionTypeAnnotation");
                             }
-                        case 133:
+                        case 134:
                             return this.parseLiteral(this.state.value, "StringLiteralTypeAnnotation");
                         case 85:
                         case 86:
@@ -30159,19 +29974,19 @@ var flow = function(superClass) {
                         case 53:
                             if (this.state.value === "-") {
                                 this.next();
-                                if (this.match(134)) {
+                                if (this.match(135)) {
                                     return this.parseLiteralAtNode(-this.state.value, "NumberLiteralTypeAnnotation", node);
                                 }
-                                if (this.match(135)) {
+                                if (this.match(136)) {
                                     return this.parseLiteralAtNode(-this.state.value, "BigIntLiteralTypeAnnotation", node);
                                 }
                                 throw this.raise(FlowErrors.UnexpectedSubtractionOperand, this.state.startLoc);
                             }
                             this.unexpected();
                             return;
-                        case 134:
-                            return this.parseLiteral(this.state.value, "NumberLiteralTypeAnnotation");
                         case 135:
+                            return this.parseLiteral(this.state.value, "NumberLiteralTypeAnnotation");
+                        case 136:
                             return this.parseLiteral(this.state.value, "BigIntLiteralTypeAnnotation");
                         case 88:
                             this.next();
@@ -30577,7 +30392,7 @@ var flow = function(superClass) {
                 key: "forwardNoArrowParamsConversionAt",
                 value: function forwardNoArrowParamsConversionAt(node, parse2) {
                     var result;
-                    if (this.state.noArrowParamsConversionAt.includes(node.start)) {
+                    if (this.state.noArrowParamsConversionAt.includes(this.offsetToSourcePos(node.start))) {
                         this.state.noArrowParamsConversionAt.push(this.state.start);
                         result = parse2();
                         this.state.noArrowParamsConversionAt.pop();
@@ -30880,7 +30695,9 @@ var flow = function(superClass) {
                 value: function parseClassSuper(node) {
                     _get(_get_prototype_of(FlowParserMixin.prototype), "parseClassSuper", this).call(this, node);
                     if (node.superClass && this.match(47)) {
-                        node.superTypeParameters = this.flowParseTypeParameterInstantiation();
+                        {
+                            node.superTypeArguments = this.flowParseTypeParameterInstantiation();
+                        }
                     }
                     if (this.isContextual(113)) {
                         this.next();
@@ -31127,7 +30944,7 @@ var flow = function(superClass) {
                     var _this = this;
                     var state = null;
                     var jsx2;
-                    if (this.hasPlugin("jsx") && (this.match(142) || this.match(47))) {
+                    if (this.hasPlugin("jsx") && (this.match(143) || this.match(47))) {
                         state = this.state.clone();
                         jsx2 = this.tryParse(function() {
                             return _get(_get_prototype_of(FlowParserMixin.prototype), "parseMaybeAssign", _this).call(_this, refExpressionErrors, afterLeftParse);
@@ -31214,7 +31031,7 @@ var flow = function(superClass) {
             {
                 key: "setArrowFunctionParameters",
                 value: function setArrowFunctionParameters(node, params) {
-                    if (this.state.noArrowParamsConversionAt.includes(node.start)) {
+                    if (this.state.noArrowParamsConversionAt.includes(this.offsetToSourcePos(node.start))) {
                         node.params = params;
                     } else {
                         _get(_get_prototype_of(FlowParserMixin.prototype), "setArrowFunctionParameters", this).call(this, node, params);
@@ -31225,7 +31042,7 @@ var flow = function(superClass) {
                 key: "checkParams",
                 value: function checkParams(node, allowDuplicates, isArrowFunction) {
                     var strictModeChanged = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : true;
-                    if (isArrowFunction && this.state.noArrowParamsConversionAt.includes(node.start)) {
+                    if (isArrowFunction && this.state.noArrowParamsConversionAt.includes(this.offsetToSourcePos(node.start))) {
                         return;
                     }
                     for(var i = 0; i < node.params.length; i++){
@@ -31239,7 +31056,7 @@ var flow = function(superClass) {
             {
                 key: "parseParenAndDistinguishExpression",
                 value: function parseParenAndDistinguishExpression(canBeArrow) {
-                    return _get(_get_prototype_of(FlowParserMixin.prototype), "parseParenAndDistinguishExpression", this).call(this, canBeArrow && !this.state.noArrowAt.includes(this.state.start));
+                    return _get(_get_prototype_of(FlowParserMixin.prototype), "parseParenAndDistinguishExpression", this).call(this, canBeArrow && !this.state.noArrowAt.includes(this.sourceToOffsetPos(this.state.start)));
                 }
             },
             {
@@ -31459,7 +31276,7 @@ var flow = function(superClass) {
                         return _this.match(12) || _this.match(8);
                     };
                     switch(this.state.type){
-                        case 134:
+                        case 135:
                             {
                                 var literal = this.parseNumericLiteral(this.state.value);
                                 if (endOfInit()) {
@@ -31474,7 +31291,7 @@ var flow = function(superClass) {
                                     loc: startLoc
                                 };
                             }
-                        case 133:
+                        case 134:
                             {
                                 var literal1 = this.parseStringLiteral(this.state.value);
                                 if (endOfInit()) {
@@ -32177,14 +31994,14 @@ var jsx = function(superClass) {
                                 if (this.state.pos === this.state.start) {
                                     if (ch === 60 && this.state.canStartJSXElement) {
                                         ++this.state.pos;
-                                        this.finishToken(142);
+                                        this.finishToken(143);
                                     } else {
                                         _get(_get_prototype_of(JSXParserMixin.prototype), "getTokenFromCode", this).call(this, ch);
                                     }
                                     return;
                                 }
                                 out += this.input.slice(chunkStart, this.state.pos);
-                                this.finishToken(141, out);
+                                this.finishToken(142, out);
                                 return;
                             case 38:
                                 out += this.input.slice(chunkStart, this.state.pos);
@@ -32252,7 +32069,7 @@ var jsx = function(superClass) {
                         }
                     }
                     out += this.input.slice(chunkStart, this.state.pos++);
-                    this.finishToken(133, out);
+                    this.finishToken(134, out);
                 }
             },
             {
@@ -32298,14 +32115,14 @@ var jsx = function(superClass) {
                     do {
                         ch = this.input.charCodeAt(++this.state.pos);
                     }while (isIdentifierChar2(ch) || ch === 45);
-                    this.finishToken(140, this.input.slice(start, this.state.pos));
+                    this.finishToken(141, this.input.slice(start, this.state.pos));
                 }
             },
             {
                 key: "jsxParseIdentifier",
                 value: function jsxParseIdentifier() {
                     var node = this.startNode();
-                    if (this.match(140)) {
+                    if (this.match(141)) {
                         node.name = this.state.value;
                     } else if (tokenIsKeyword(this.state.type)) {
                         node.name = tokenLabelName(this.state.type);
@@ -32359,8 +32176,8 @@ var jsx = function(superClass) {
                                 this.raise(JsxErrors.AttributeIsEmpty, node);
                             }
                             return node;
-                        case 142:
-                        case 133:
+                        case 143:
+                        case 134:
                             return this.parseExprAtom();
                         default:
                             throw this.raise(JsxErrors.UnsupportedJsxValue, this.state.startLoc);
@@ -32429,7 +32246,7 @@ var jsx = function(superClass) {
                 key: "jsxParseOpeningElementAt",
                 value: function jsxParseOpeningElementAt(startLoc) {
                     var node = this.startNodeAt(startLoc);
-                    if (this.eat(143)) {
+                    if (this.eat(144)) {
                         return this.finishNode(node, "JSXOpeningFragment");
                     }
                     node.name = this.jsxParseElementName();
@@ -32440,12 +32257,12 @@ var jsx = function(superClass) {
                 key: "jsxParseOpeningElementAfterName",
                 value: function jsxParseOpeningElementAfterName(node) {
                     var attributes = [];
-                    while(!this.match(56) && !this.match(143)){
+                    while(!this.match(56) && !this.match(144)){
                         attributes.push(this.jsxParseAttribute());
                     }
                     node.attributes = attributes;
                     node.selfClosing = this.eat(56);
-                    this.expect(143);
+                    this.expect(144);
                     return this.finishNode(node, "JSXOpeningElement");
                 }
             },
@@ -32453,11 +32270,11 @@ var jsx = function(superClass) {
                 key: "jsxParseClosingElementAt",
                 value: function jsxParseClosingElementAt(startLoc) {
                     var node = this.startNodeAt(startLoc);
-                    if (this.eat(143)) {
+                    if (this.eat(144)) {
                         return this.finishNode(node, "JSXClosingFragment");
                     }
                     node.name = this.jsxParseElementName();
-                    this.expect(143);
+                    this.expect(144);
                     return this.finishNode(node, "JSXClosingElement");
                 }
             },
@@ -32471,7 +32288,7 @@ var jsx = function(superClass) {
                     if (!openingElement.selfClosing) {
                         contents: for(;;){
                             switch(this.state.type){
-                                case 142:
+                                case 143:
                                     startLoc = this.state.startLoc;
                                     this.next();
                                     if (this.eat(56)) {
@@ -32480,7 +32297,7 @@ var jsx = function(superClass) {
                                     }
                                     children.push(this.jsxParseElementAt(startLoc));
                                     break;
-                                case 141:
+                                case 142:
                                     children.push(this.parseLiteral(this.state.value, "JSXText"));
                                     break;
                                 case 5:
@@ -32545,10 +32362,10 @@ var jsx = function(superClass) {
             {
                 key: "parseExprAtom",
                 value: function parseExprAtom(refExpressionErrors) {
-                    if (this.match(142)) {
+                    if (this.match(143)) {
                         return this.jsxParseElement();
                     } else if (this.match(47) && this.input.charCodeAt(this.state.pos) !== 33) {
-                        this.replaceToken(142);
+                        this.replaceToken(143);
                         return this.jsxParseElement();
                     } else {
                         return _get(_get_prototype_of(JSXParserMixin.prototype), "parseExprAtom", this).call(this, refExpressionErrors);
@@ -32577,7 +32394,7 @@ var jsx = function(superClass) {
                         }
                         if (code2 === 62) {
                             ++this.state.pos;
-                            this.finishToken(143);
+                            this.finishToken(144);
                             return;
                         }
                         if ((code2 === 34 || code2 === 39) && context === types.j_oTag) {
@@ -32587,7 +32404,7 @@ var jsx = function(superClass) {
                     }
                     if (code2 === 60 && this.state.canStartJSXElement && this.input.charCodeAt(this.state.pos + 1) !== 33) {
                         ++this.state.pos;
-                        this.finishToken(142);
+                        this.finishToken(143);
                         return;
                     }
                     _get(_get_prototype_of(JSXParserMixin.prototype), "getTokenFromCode", this).call(this, code2);
@@ -32597,12 +32414,12 @@ var jsx = function(superClass) {
                 key: "updateContext",
                 value: function updateContext(prevType) {
                     var _this_state = this.state, context = _this_state.context, type = _this_state.type;
-                    if (type === 56 && prevType === 142) {
+                    if (type === 56 && prevType === 143) {
                         context.splice(-2, 2, types.j_cTag);
                         this.state.canStartJSXElement = false;
-                    } else if (type === 142) {
-                        context.push(types.j_oTag);
                     } else if (type === 143) {
+                        context.push(types.j_oTag);
+                    } else if (type === 144) {
                         var out = context[context.length - 1];
                         if (out === types.j_oTag && prevType === 56 || out === types.j_cTag) {
                             context.pop();
@@ -33055,7 +32872,7 @@ var LValParser = /*#__PURE__*/ function(NodeUtils) {
                     return this.parseBindingRestProperty(this.startNode());
                 }
                 var prop = this.startNode();
-                if (type === 138) {
+                if (type === 139) {
                     this.expectPlugin("destructuringPrivate", startLoc);
                     this.classScope.usePrivateName(this.state.value, startLoc);
                     prop.key = this.parsePrivateName();
@@ -33488,7 +33305,7 @@ var typescript = function(superClass) {
             {
                 key: "tsTokenCanFollowModifier",
                 value: function tsTokenCanFollowModifier() {
-                    return this.match(0) || this.match(5) || this.match(55) || this.match(21) || this.match(138) || this.isLiteralPropertyName();
+                    return this.match(0) || this.match(5) || this.match(55) || this.match(21) || this.match(139) || this.isLiteralPropertyName();
                 }
             },
             {
@@ -33690,7 +33507,7 @@ var typescript = function(superClass) {
                     var node = this.startNode();
                     this.expect(83);
                     this.expect(10);
-                    if (!this.match(133)) {
+                    if (!this.match(134)) {
                         this.raise(TSErrors.UnsupportedImportTypeArgument, this.state.startLoc);
                     }
                     node.argument = _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseExprAtom", this).call(this);
@@ -33730,7 +33547,9 @@ var typescript = function(superClass) {
                     var node = this.startNode();
                     node.typeName = this.tsParseEntityName();
                     if (!this.hasPrecedingLineBreak() && this.match(47)) {
-                        node.typeParameters = this.tsParseTypeArguments();
+                        {
+                            node.typeArguments = this.tsParseTypeArguments();
+                        }
                     }
                     return this.finishNode(node, "TSTypeReference");
                 }
@@ -33793,7 +33612,7 @@ var typescript = function(superClass) {
                 key: "tsParseTypeParameters",
                 value: function tsParseTypeParameters(parseModifiers) {
                     var node = this.startNode();
-                    if (this.match(47) || this.match(142)) {
+                    if (this.match(47) || this.match(143)) {
                         this.next();
                     } else {
                         this.unexpected();
@@ -34193,9 +34012,9 @@ var typescript = function(superClass) {
                 value: function tsParseLiteralTypeNode() {
                     var node = this.startNode();
                     switch(this.state.type){
-                        case 134:
                         case 135:
-                        case 133:
+                        case 136:
+                        case 134:
                         case 85:
                         case 86:
                             node.literal = _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseExprAtom", this).call(this);
@@ -34236,9 +34055,9 @@ var typescript = function(superClass) {
                 key: "tsParseNonArrayType",
                 value: function tsParseNonArrayType() {
                     switch(this.state.type){
-                        case 133:
                         case 134:
                         case 135:
+                        case 136:
                         case 85:
                         case 86:
                             return this.tsParseLiteralTypeNode();
@@ -34246,7 +34065,7 @@ var typescript = function(superClass) {
                             if (this.state.value === "-") {
                                 var node = this.startNode();
                                 var nextToken = this.lookahead();
-                                if (nextToken.type !== 134 && nextToken.type !== 135) {
+                                if (nextToken.type !== 135 && nextToken.type !== 136) {
                                     this.unexpected();
                                 }
                                 node.literal = this.parseMaybeUnary();
@@ -34786,7 +34605,7 @@ var typescript = function(superClass) {
                 key: "tsParseEnumMember",
                 value: function tsParseEnumMember() {
                     var node = this.startNode();
-                    node.id = this.match(133) ? _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseStringLiteral", this).call(this, this.state.value) : this.parseIdentifier(true);
+                    node.id = this.match(134) ? _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseStringLiteral", this).call(this, this.state.value) : this.parseIdentifier(true);
                     if (this.eat(29)) {
                         node.initializer = _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseMaybeAssignAllowIn", this).call(this);
                     }
@@ -34823,15 +34642,11 @@ var typescript = function(superClass) {
                 key: "tsParseModuleOrNamespaceDeclaration",
                 value: function tsParseModuleOrNamespaceDeclaration(node) {
                     var nested = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
-                    node.id = this.parseIdentifier();
-                    if (!nested) {
+                    node.id = this.tsParseEntityName();
+                    if (node.id.type === "Identifier") {
                         this.checkIdentifier(node.id, 1024);
                     }
-                    if (this.eat(16)) {
-                        var inner = this.startNode();
-                        this.tsParseModuleOrNamespaceDeclaration(inner, true);
-                        node.body = inner;
-                    } else {
+                    {
                         this.scope.enter(256);
                         this.prodParam.enter(0);
                         node.body = this.tsParseModuleBlock();
@@ -34846,9 +34661,8 @@ var typescript = function(superClass) {
                 value: function tsParseAmbientExternalModuleDeclaration(node) {
                     if (this.isContextual(112)) {
                         node.kind = "global";
-                        node.global = true;
                         node.id = this.parseIdentifier();
-                    } else if (this.match(133)) {
+                    } else if (this.match(134)) {
                         node.kind = "module";
                         node.id = _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseStringLiteral", this).call(this, this.state.value);
                     } else {
@@ -34900,7 +34714,7 @@ var typescript = function(superClass) {
                     var node = this.startNode();
                     this.expectContextual(119);
                     this.expect(10);
-                    if (!this.match(133)) {
+                    if (!this.match(134)) {
                         this.unexpected();
                     }
                     node.expression = _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseExprAtom", this).call(this);
@@ -35017,7 +34831,6 @@ var typescript = function(superClass) {
                                 this.prodParam.enter(0);
                                 var mod = node;
                                 mod.kind = "global";
-                                mod.global = true;
                                 mod.id = expr;
                                 mod.body = this.tsParseModuleBlock();
                                 this.scope.exit();
@@ -35041,7 +34854,7 @@ var typescript = function(superClass) {
                             break;
                         case "module":
                             if (this.tsCheckLineTerminator(next)) {
-                                if (this.match(133)) {
+                                if (this.match(134)) {
                                     return this.tsParseAmbientExternalModuleDeclaration(node);
                                 } else if (tokenIsIdentifier(this.state.type)) {
                                     node.kind = "module";
@@ -35436,7 +35249,7 @@ var typescript = function(superClass) {
             {
                 key: "parseImport",
                 value: function parseImport(node) {
-                    if (this.match(133)) {
+                    if (this.match(134)) {
                         node.importKind = "value";
                         return _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseImport", this).call(this, node);
                     }
@@ -35795,7 +35608,7 @@ var typescript = function(superClass) {
                     if (node.abstract && this.match(29)) {
                         var key = node.key;
                         this.raise(TSErrors.AbstractPropertyHasInitializer, this.state.startLoc, {
-                            propertyName: key.type === "Identifier" && !node.computed ? key.name : "[".concat(this.input.slice(key.start, key.end), "]")
+                            propertyName: key.type === "Identifier" && !node.computed ? key.name : "[".concat(this.input.slice(this.offsetToSourcePos(key.start), this.offsetToSourcePos(key.end)), "]")
                         });
                     }
                     return _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseClassProperty", this).call(this, node);
@@ -35866,7 +35679,9 @@ var typescript = function(superClass) {
                 value: function parseClassSuper(node) {
                     _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseClassSuper", this).call(this, node);
                     if (node.superClass && (this.match(47) || this.match(51))) {
-                        node.superTypeParameters = this.tsParseTypeArgumentsInExpression();
+                        {
+                            node.superTypeArguments = this.tsParseTypeArgumentsInExpression();
+                        }
                     }
                     if (this.eatContextual(113)) {
                         node.implements = this.tsParseHeritageClause("implements");
@@ -35919,7 +35734,7 @@ var typescript = function(superClass) {
                     var state;
                     var jsx2;
                     var typeCast;
-                    if (this.hasPlugin("jsx") && (this.match(142) || this.match(47))) {
+                    if (this.hasPlugin("jsx") && (this.match(143) || this.match(47))) {
                         state = this.state.clone();
                         jsx2 = this.tryParse(function() {
                             return _get(_get_prototype_of(TypeScriptParserMixin.prototype), "parseMaybeAssign", _this).call(_this, refExpressionErrors, afterLeftParse);
@@ -36359,7 +36174,7 @@ var typescript = function(superClass) {
                         if (hasBody) {
                             var key = method.key;
                             this.raise(TSErrors.AbstractMethodHasImplementation, method, {
-                                methodName: key.type === "Identifier" && !method.computed ? key.name : "[".concat(this.input.slice(key.start, key.end), "]")
+                                methodName: key.type === "Identifier" && !method.computed ? key.name : "[".concat(this.input.slice(this.offsetToSourcePos(key.start), this.offsetToSourcePos(key.end)), "]")
                             });
                         }
                     }
@@ -36558,13 +36373,13 @@ var placeholders = function(superClass) {
             {
                 key: "parsePlaceholder",
                 value: function parsePlaceholder(expectedNode) {
-                    if (this.match(144)) {
+                    if (this.match(133)) {
                         var node = this.startNode();
                         this.next();
                         this.assertNoSpace();
                         node.name = _get(_get_prototype_of(PlaceholdersParserMixin.prototype), "parseIdentifier", this).call(this, true);
                         this.assertNoSpace();
-                        this.expect(144);
+                        this.expect(133);
                         return this.finishPlaceholder(node, expectedNode);
                     }
                 }
@@ -36584,7 +36399,7 @@ var placeholders = function(superClass) {
                 key: "getTokenFromCode",
                 value: function getTokenFromCode(code2) {
                     if (code2 === 37 && this.input.charCodeAt(this.state.pos + 1) === 37) {
-                        this.finishOp(144, 2);
+                        this.finishOp(133, 2);
                     } else {
                         _get(_get_prototype_of(PlaceholdersParserMixin.prototype), "getTokenFromCode", this).call(this, code2);
                     }
@@ -36639,7 +36454,7 @@ var placeholders = function(superClass) {
                         return true;
                     }
                     var nextToken = this.lookahead();
-                    if (nextToken.type === 144) {
+                    if (nextToken.type === 133) {
                         return true;
                     }
                     return false;
@@ -36692,7 +36507,7 @@ var placeholders = function(superClass) {
                     var oldStrict = this.state.strict;
                     var placeholder2 = this.parsePlaceholder("Identifier");
                     if (placeholder2) {
-                        if (this.match(81) || this.match(144) || this.match(5)) {
+                        if (this.match(81) || this.match(133) || this.match(5)) {
                             node.id = placeholder2;
                         } else if (optionalId || !isStatement5) {
                             node.id = null;
@@ -36736,7 +36551,7 @@ var placeholders = function(superClass) {
                     if (this.match(65)) {
                         var next = this.nextTokenStart();
                         if (this.isUnparsedContextual(next, "from")) {
-                            if (this.input.startsWith(tokenLabelName(144), this.nextTokenStartSince(next + 4))) {
+                            if (this.input.startsWith(tokenLabelName(133), this.nextTokenStartSince(next + 4))) {
                                 return true;
                             }
                         }
@@ -36800,7 +36615,7 @@ var placeholders = function(superClass) {
             {
                 key: "assertNoSpace",
                 value: function assertNoSpace() {
-                    if (this.state.start > this.state.lastTokEndLoc.index) {
+                    if (this.state.start > this.offsetToSourcePos(this.state.lastTokEndLoc.index)) {
                         this.raise(PlaceholderErrors.UnexpectedSpace, this.state.lastTokEndLoc);
                     }
                 }
@@ -37071,7 +36886,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
         {
             key: "shouldExitDescending",
             value: function shouldExitDescending(expr, potentialArrowAt) {
-                return expr.type === "ArrowFunctionExpression" && expr.start === potentialArrowAt;
+                return expr.type === "ArrowFunctionExpression" && this.offsetToSourcePos(expr.start) === potentialArrowAt;
             }
         },
         {
@@ -37080,7 +36895,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 this.enterInitialScopes();
                 this.nextToken();
                 var expr = this.parseExpression();
-                if (!this.match(139)) {
+                if (!this.match(140)) {
                     this.unexpected();
                 }
                 this.finalizeRemainingComments();
@@ -37238,7 +37053,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
         {
             key: "parseMaybeUnaryOrPrivate",
             value: function parseMaybeUnaryOrPrivate(refExpressionErrors) {
-                return this.match(138) ? this.parsePrivateName() : this.parseMaybeUnary(refExpressionErrors);
+                return this.match(139) ? this.parsePrivateName() : this.parseMaybeUnary(refExpressionErrors);
             }
         },
         {
@@ -37511,7 +37326,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                 if (computed) {
                     node.property = this.parseExpression();
                     this.expect(3);
-                } else if (this.match(138)) {
+                } else if (this.match(139)) {
                     if (base.type === "Super") {
                         this.raise(Errors.SuperPrivateField, startLoc);
                     }
@@ -37600,7 +37415,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
         {
             key: "atPossibleAsyncArrow",
             value: function atPossibleAsyncArrow(base) {
-                return base.type === "Identifier" && base.name === "async" && this.state.lastTokEndLoc.index === base.end && !this.canInsertSemicolon() && base.end - base.start === 5 && base.start === this.state.potentialArrowAt;
+                return base.type === "Identifier" && base.name === "async" && this.state.lastTokEndLoc.index === base.end && !this.canInsertSemicolon() && base.end - base.start === 5 && this.offsetToSourcePos(base.start) === this.state.potentialArrowAt;
             }
         },
         {
@@ -37731,11 +37546,11 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                             this.readRegexp();
                             return this.parseRegExpLiteral(this.state.value);
                         }
-                    case 134:
-                        return this.parseNumericLiteral(this.state.value);
                     case 135:
+                        return this.parseNumericLiteral(this.state.value);
+                    case 136:
                         return this.parseBigIntLiteral(this.state.value);
-                    case 133:
+                    case 134:
                         return this.parseStringLiteral(this.state.value);
                     case 84:
                         return this.parseNullLiteral();
@@ -37789,7 +37604,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                                 throw this.raise(Errors.UnsupportedBind, callee);
                             }
                         }
-                    case 138:
+                    case 139:
                         {
                             this.raise(Errors.PrivateInExpectedIn, this.state.startLoc, {
                                 identifierName: this.state.value
@@ -38044,7 +37859,6 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                     this.sawUnambiguousESM = true;
                 } else if (this.isContextual(105) || this.isContextual(97)) {
                     var isSource = this.isContextual(105);
-                    if (!isSource) this.unexpected();
                     this.expectPlugin(isSource ? "sourcePhaseImports" : "deferredImportEvaluation");
                     if (!this.options.createImportExpressions) {
                         throw this.raise(Errors.DynamicImportPhaseRequiresImportExpressions, this.state.startLoc, {
@@ -38062,7 +37876,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
             key: "parseLiteralAtNode",
             value: function parseLiteralAtNode(value1, type, node) {
                 this.addExtra(node, "rawValue", value1);
-                this.addExtra(node, "raw", this.input.slice(node.start, this.state.end));
+                this.addExtra(node, "raw", this.input.slice(this.offsetToSourcePos(node.start), this.state.end));
                 node.value = value1;
                 this.next();
                 return this.finishNode(node, type);
@@ -38103,7 +37917,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
             key: "parseRegExpLiteral",
             value: function parseRegExpLiteral(value1) {
                 var node = this.startNode();
-                this.addExtra(node, "raw", this.input.slice(node.start, this.state.end));
+                this.addExtra(node, "raw", this.input.slice(this.offsetToSourcePos(node.start), this.state.end));
                 node.pattern = value1.pattern;
                 node.flags = value1.flags;
                 this.next();
@@ -38533,16 +38347,16 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                         key = this.parseIdentifier(true);
                     } else {
                         switch(type){
-                            case 134:
+                            case 135:
                                 key = this.parseNumericLiteral(value1);
                                 break;
-                            case 133:
+                            case 134:
                                 key = this.parseStringLiteral(value1);
                                 break;
-                            case 135:
+                            case 136:
                                 key = this.parseBigIntLiteral(value1);
                                 break;
-                            case 138:
+                            case 139:
                                 {
                                     var privateKeyLoc = this.state.startLoc;
                                     if (refExpressionErrors != null) {
@@ -38560,7 +38374,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                         }
                     }
                     prop.key = key;
-                    if (type !== 138) {
+                    if (type !== 139) {
                         prop.computed = false;
                     }
                 }
@@ -38888,7 +38702,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
             value: function isAmbiguousAwait() {
                 if (this.hasPrecedingLineBreak()) return true;
                 var type = this.state.type;
-                return type === 53 || type === 10 || type === 0 || tokenIsTemplate(type) || type === 102 && !this.state.containsEsc || type === 137 || type === 56 || this.hasPlugin("v8intrinsic") && type === 54;
+                return type === 53 || type === 10 || type === 0 || tokenIsTemplate(type) || type === 102 && !this.state.containsEsc || type === 138 || type === 56 || this.hasPlugin("v8intrinsic") && type === 54;
             }
         },
         {
@@ -38903,7 +38717,7 @@ var ExpressionParser = /*#__PURE__*/ function(LValParser) {
                     delegating = this.eat(55);
                     switch(this.state.type){
                         case 13:
-                        case 139:
+                        case 140:
                         case 8:
                         case 11:
                         case 3:
@@ -39144,7 +38958,7 @@ var switchLabel = {
 };
 var loneSurrogate = RegExp("[\uD800-\uDFFF]", "u");
 var keywordRelationalOperator = RegExp("in(?:stanceof)?", "y");
-function babel7CompatTokens(tokens, input) {
+function babel7CompatTokens(tokens, input, startIndex) {
     for(var i = 0; i < tokens.length; i++){
         var token = tokens[i];
         var type = token.type;
@@ -39168,7 +38982,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 file2.program = this.parseProgram(program3);
                 file2.comments = this.comments;
                 if (this.options.tokens) {
-                    file2.tokens = babel7CompatTokens(this.tokens, this.input);
+                    file2.tokens = babel7CompatTokens(this.tokens, this.input, this.startIndex);
                 }
                 return this.finishNode(file2, "File");
             }
@@ -39176,7 +38990,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
         {
             key: "parseProgram",
             value: function parseProgram(program3) {
-                var end = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 139, sourceType = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : this.options.sourceType;
+                var end = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 140, sourceType = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : this.options.sourceType;
                 program3.sourceType = sourceType;
                 program3.interpreter = this.parseInterpreterDirective();
                 this.parseBlockBody(program3, true, true, end);
@@ -39208,7 +39022,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     this.addExtra(program3, "topLevelAwait", this.state.hasTopLevelAwait);
                 }
                 var finishedProgram;
-                if (end === 139) {
+                if (end === 140) {
                     finishedProgram = this.finishNode(program3, "Program");
                 } else {
                     finishedProgram = this.finishNodeAt(program3, "Program", createPositionWithColumnOffset(this.state.startLoc, -1));
@@ -39225,7 +39039,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 delete directive2.expression;
                 var directiveLiteral2 = directive2.value;
                 var expressionValue = directiveLiteral2.value;
-                var raw = this.input.slice(directiveLiteral2.start, directiveLiteral2.end);
+                var raw = this.input.slice(this.offsetToSourcePos(directiveLiteral2.start), this.offsetToSourcePos(directiveLiteral2.end));
                 var val = directiveLiteral2.value = raw.slice(1, -1);
                 this.addExtra(directiveLiteral2, "raw", raw);
                 this.addExtra(directiveLiteral2, "rawValue", val);
@@ -39594,7 +39408,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                         while(this.eat(16)){
                             var node2 = this.startNodeAt(startLoc);
                             node2.object = expr;
-                            if (this.match(138)) {
+                            if (this.match(139)) {
                                 this.classScope.usePrivateName(this.state.value, this.state.startLoc);
                                 node2.property = this.parsePrivateName();
                             } else {
@@ -39978,7 +39792,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 for(var i = this.state.labels.length - 1; i >= 0; i--){
                     var label1 = this.state.labels[i];
                     if (label1.statementStart === node.start) {
-                        label1.statementStart = this.state.start;
+                        label1.statementStart = this.sourceToOffsetPos(this.state.start);
                         label1.kind = kind;
                     } else {
                         break;
@@ -39987,7 +39801,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 this.state.labels.push({
                     name: maybeName,
                     kind: kind,
-                    statementStart: this.state.start
+                    statementStart: this.sourceToOffsetPos(this.state.start)
                 });
                 node.body = flags & 8 ? this.parseStatementOrSloppyAnnexBFunctionDeclaration(true) : this.parseStatement();
                 this.state.labels.pop();
@@ -40364,7 +40178,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 this.parsePropertyNamePrefixOperator(member);
                 if (this.eat(55)) {
                     method.kind = "method";
-                    var isPrivateName3 = this.match(138);
+                    var isPrivateName3 = this.match(139);
                     this.parseClassElementName(method);
                     if (isPrivateName3) {
                         this.pushClassPrivateMethod(classBody2, privateMethod, true, false);
@@ -40415,7 +40229,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                         this.unexpected(maybeQuestionTokenStartLoc);
                     }
                     method.kind = "method";
-                    var isPrivate3 = this.match(138);
+                    var isPrivate3 = this.match(139);
                     this.parseClassElementName(method);
                     this.parsePostMemberNameModifiers(publicMember);
                     if (isPrivate3) {
@@ -40429,7 +40243,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 } else if ((maybeContextualKw === "get" || maybeContextualKw === "set") && !(this.match(55) && this.isLineTerminator())) {
                     this.resetPreviousNodeTrailingComments(key);
                     method.kind = maybeContextualKw;
-                    var isPrivate31 = this.match(138);
+                    var isPrivate31 = this.match(139);
                     this.parseClassElementName(publicMethod);
                     if (isPrivate31) {
                         this.pushClassPrivateMethod(classBody2, privateMethod, false, false);
@@ -40443,7 +40257,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                 } else if (maybeContextualKw === "accessor" && !this.isLineTerminator()) {
                     this.expectPlugin("decoratorAutoAccessors");
                     this.resetPreviousNodeTrailingComments(key);
-                    var isPrivate32 = this.match(138);
+                    var isPrivate32 = this.match(139);
                     this.parseClassElementName(publicProp);
                     this.pushClassAccessorProperty(classBody2, accessorProp, isPrivate32);
                 } else if (this.isLineTerminator()) {
@@ -40461,10 +40275,10 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
             key: "parseClassElementName",
             value: function parseClassElementName(member) {
                 var _this_state = this.state, type = _this_state.type, value1 = _this_state.value;
-                if ((type === 132 || type === 133) && member.static && value1 === "prototype") {
+                if ((type === 132 || type === 134) && member.static && value1 === "prototype") {
                     this.raise(Errors.StaticPrototype, this.state.startLoc);
                 }
-                if (type === 138) {
+                if (type === 139) {
                     if (value1 === "constructor") {
                         this.raise(Errors.ConstructorClassPrivateField, this.state.startLoc);
                     }
@@ -41025,7 +40839,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                         if (this.eat(8)) break;
                     }
                     var isMaybeTypeOnly = this.isContextual(130);
-                    var isString = this.match(133);
+                    var isString = this.match(134);
                     var node = this.startNode();
                     node.local = this.parseModuleExportName();
                     nodes2.push(this.parseExportSpecifier(node, isString, isInTypeExport, isMaybeTypeOnly));
@@ -41049,7 +40863,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
         {
             key: "parseModuleExportName",
             value: function parseModuleExportName() {
-                if (this.match(133)) {
+                if (this.match(134)) {
                     var result = this.parseStringLiteral(this.state.value);
                     var surrogate = loneSurrogate.exec(result.value);
                     if (surrogate) {
@@ -41179,7 +40993,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
         {
             key: "parseImport",
             value: function parseImport(node) {
-                if (this.match(133)) {
+                if (this.match(134)) {
                     return this.parseImportSourceAndAttributes(node);
                 }
                 return this.parseImportSpecifiersAndAfter(node, this.parseMaybeImportPhase(node, false));
@@ -41213,7 +41027,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
         {
             key: "parseImportSource",
             value: function parseImportSource() {
-                if (!this.match(133)) this.unexpected();
+                if (!this.match(134)) this.unexpected();
                 return this.parseExprAtom();
             }
         },
@@ -41252,13 +41066,13 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                         });
                     }
                     attrNames.add(keyName);
-                    if (this.match(133)) {
+                    if (this.match(134)) {
                         node.key = this.parseStringLiteral(keyName);
                     } else {
                         node.key = this.parseIdentifier(true);
                     }
                     this.expect(14);
-                    if (!this.match(133)) {
+                    if (!this.match(134)) {
                         throw this.raise(Errors.ModuleAttributeInvalidValue, this.state.startLoc);
                     }
                     node.value = this.parseStringLiteral(this.state.value);
@@ -41286,7 +41100,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                     }
                     attributes.add(node.key.name);
                     this.expect(14);
-                    if (!this.match(133)) {
+                    if (!this.match(134)) {
                         throw this.raise(Errors.ModuleAttributeInvalidValue, this.state.startLoc);
                     }
                     node.value = this.parseStringLiteral(this.state.value);
@@ -41368,7 +41182,7 @@ var StatementParser = /*#__PURE__*/ function(ExpressionParser) {
                         if (this.eat(8)) break;
                     }
                     var specifier = this.startNode();
-                    var importedIsString = this.match(133);
+                    var importedIsString = this.match(134);
                     var isMaybeTypeOnly = this.isContextual(130);
                     specifier.imported = this.parseModuleExportName();
                     var importSpecifier2 = this.parseImportSpecifier(specifier, importedIsString, node.importKind === "type" || node.importKind === "typeof", isMaybeTypeOnly, void 0);
@@ -41420,6 +41234,7 @@ var Parser = /*#__PURE__*/ function(StatementParser) {
         _this.initializeScopes();
         _this.plugins = pluginsMap;
         _this.filename = options.sourceFilename;
+        _this.startIndex = options.startIndex;
         return _this;
     }
     _create_class(Parser, [
@@ -41610,7 +41425,7 @@ var compose = function(f, g) {
         return f(g(v));
     };
 };
-function builDefs(colors) {
+function buildDefs(colors) {
     return {
         keyword: colors.cyan,
         capitalized: colors.yellow,
@@ -41627,8 +41442,8 @@ function builDefs(colors) {
         reset: colors.reset
     };
 }
-var defsOn = builDefs((0, import_picocolors.createColors)(true));
-var defsOff = builDefs((0, import_picocolors.createColors)(false));
+var defsOn = buildDefs((0, import_picocolors.createColors)(true));
+var defsOff = buildDefs((0, import_picocolors.createColors)(false));
 function getDefs(enabled) {
     return enabled ? defsOn : defsOff;
 }
@@ -44463,7 +44278,8 @@ var TokenMap = /*#__PURE__*/ function() {
                 try {
                     for(var _iterator = children[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
                         var child = _step.value;
-                        if (!child) continue;
+                        if (child == null) continue;
+                        if (child.start == null || child.end == null) continue;
                         var childTok = this._findTokensOfNode(child, low, last2);
                         var high = childTok.first;
                         for(var k = low; k < high; k++)indexes.push(k);
@@ -44756,9 +44572,7 @@ function NewExpression(node, parent) {
     }
     this.tokenChar(40);
     var exit = this.enterDelimited();
-    this.printList(node.arguments, {
-        printTrailingSeparator: this.shouldPrintTrailingComma(")")
-    });
+    this.printList(node.arguments, this.shouldPrintTrailingComma(")"));
     exit();
     this.rightParens(node);
 }
@@ -44825,9 +44639,7 @@ function CallExpression(node) {
     this.print(node.typeParameters);
     this.tokenChar(40);
     var exit = this.enterDelimited();
-    this.printList(node.arguments, {
-        printTrailingSeparator: this.shouldPrintTrailingComma(")")
-    });
+    this.printList(node.arguments, this.shouldPrintTrailingComma(")"));
     exit();
     this.rightParens(node);
 }
@@ -45114,11 +44926,8 @@ function SwitchStatement(node) {
     this.tokenChar(41);
     this.space();
     this.tokenChar(123);
-    this.printSequence(node.cases, {
-        indent: true,
-        addNewlines: function addNewlines(leading, cas) {
-            if (!leading && node.cases[node.cases.length - 1] === cas) return -1;
-        }
+    this.printSequence(node.cases, true, void 0, function addNewlines(leading, cas) {
+        if (!leading && node.cases[node.cases.length - 1] === cas) return -1;
     });
     this.rightBrace(node);
 }
@@ -45134,9 +44943,7 @@ function SwitchCase(node) {
     }
     if (node.consequent.length) {
         this.newline();
-        this.printSequence(node.consequent, {
-            indent: true
-        });
+        this.printSequence(node.consequent, true);
     }
 }
 function DebuggerStatement() {
@@ -45182,13 +44989,10 @@ function VariableDeclaration(node, parent) {
             }
         }
     }
-    this.printList(node.declarations, {
-        separator: hasInits ? function(occurrenceCount) {
-            this.token(",", false, occurrenceCount);
-            this.newline();
-        } : void 0,
-        indent: node.declarations.length > 1 ? true : false
-    });
+    this.printList(node.declarations, void 0, void 0, node.declarations.length > 1, hasInits ? function(occurrenceCount) {
+        this.token(",", false, occurrenceCount);
+        this.newline();
+    } : void 0);
     if (isFor2(parent)) {
         if (isForStatement2(parent)) {
             if (parent.init === node) return;
@@ -45234,7 +45038,7 @@ function ClassDeclaration(node, parent) {
         this.word("extends");
         this.space();
         this.print(node.superClass);
-        this.print(node.superTypeParameters);
+        this.print(node.superTypeArguments);
     }
     if (node.implements) {
         this.space();
@@ -45254,12 +45058,7 @@ function ClassBody(node) {
         var separator = classBodyEmptySemicolonsPrinter(this, node);
         separator === null || separator === void 0 ? void 0 : separator(-1);
         var exit = this.enterDelimited();
-        this.printJoin(node.body, {
-            statement: true,
-            indent: true,
-            separator: separator,
-            printTrailingSeparator: true
-        });
+        this.printJoin(node.body, true, true, separator, true);
         exit();
         if (!this.endsWith(10)) this.newline();
         this.rightBrace(node);
@@ -45399,9 +45198,7 @@ function StaticBlock(node) {
         this.tokenChar(125);
     } else {
         this.newline();
-        this.printSequence(node.body, {
-            indent: true
-        });
+        this.printSequence(node.body, true);
         this.rightBrace(node);
     }
 }
@@ -45632,9 +45429,7 @@ function _printAttributes(node, hasPreviousBrace) {
     var occurrenceCount = hasPreviousBrace ? 1 : 0;
     this.token("{", null, occurrenceCount);
     this.space();
-    this.printList(attributes || assertions, {
-        printTrailingSeparator: this.shouldPrintTrailingComma("}")
-    });
+    this.printList(attributes || assertions, this.shouldPrintTrailingComma("}"));
     this.space();
     this.token("}", null, occurrenceCount);
 }
@@ -45698,9 +45493,7 @@ function ExportNamedDeclaration(node) {
             this.tokenChar(123);
             if (specifiers.length) {
                 this.space();
-                this.printList(specifiers, {
-                    printTrailingSeparator: this.shouldPrintTrailingComma("}")
-                });
+                this.printList(specifiers, this.shouldPrintTrailingComma("}"));
                 this.space();
             }
             this.tokenChar(125);
@@ -45770,9 +45563,7 @@ function ImportDeclaration(node) {
         hasBrace = true;
         this.tokenChar(123);
         this.space();
-        this.printList(specifiers, {
-            printTrailingSeparator: this.shouldPrintTrailingComma("}")
-        });
+        this.printList(specifiers, this.shouldPrintTrailingComma("}"));
         this.space();
         this.tokenChar(125);
     } else if (isTypeKind && !hasSpecifiers) {
@@ -45856,11 +45647,7 @@ function ObjectExpression(node) {
     if (props.length) {
         var exit = this.enterDelimited();
         this.space();
-        this.printList(props, {
-            indent: true,
-            statement: true,
-            printTrailingSeparator: this.shouldPrintTrailingComma("}")
-        });
+        this.printList(props, this.shouldPrintTrailingComma("}"), true, true);
         this.space();
         exit();
     }
@@ -45924,11 +45711,7 @@ function RecordExpression(node) {
     this.token(startToken);
     if (props.length) {
         this.space();
-        this.printList(props, {
-            indent: true,
-            statement: true,
-            printTrailingSeparator: this.shouldPrintTrailingComma(endToken)
-        });
+        this.printList(props, this.shouldPrintTrailingComma(endToken), true, true);
         this.space();
     }
     this.token(endToken);
@@ -46369,9 +46152,7 @@ function InterfaceTypeAnnotation(node) {
     this.print(node.body);
 }
 function IntersectionTypeAnnotation(node) {
-    this.printJoin(node.types, {
-        separator: andSeparator
-    });
+    this.printJoin(node.types, void 0, void 0, andSeparator);
 }
 function MixedTypeAnnotation() {
     this.word("mixed");
@@ -46425,7 +46206,7 @@ function TypeAnnotation(node, parent) {
 }
 function TypeParameterInstantiation(node) {
     this.tokenChar(60);
-    this.printList(node.params, {});
+    this.printList(node.params);
     this.tokenChar(62);
 }
 function TypeParameter(node) {
@@ -46472,17 +46253,12 @@ function ObjectTypeAnnotation(node) {
     if (props.length) {
         this.newline();
         this.space();
-        this.printJoin(props, {
-            addNewlines: function addNewlines(leading) {
-                if (leading && !props[0]) return 1;
-            },
-            indent: true,
-            statement: true,
-            iterator: function() {
-                if (props.length !== 1 || node.inexact) {
-                    _this.tokenChar(44);
-                    _this.space();
-                }
+        this.printJoin(props, true, true, void 0, void 0, function addNewlines(leading) {
+            if (leading && !props[0]) return 1;
+        }, function() {
+            if (props.length !== 1 || node.inexact) {
+                _this.tokenChar(44);
+                _this.space();
             }
         });
         this.space();
@@ -46583,9 +46359,7 @@ function orSeparator(occurrenceCount) {
     this.space();
 }
 function UnionTypeAnnotation(node) {
-    this.printJoin(node.types, {
-        separator: orSeparator
-    });
+    this.printJoin(node.types, void 0, void 0, orSeparator);
 }
 function TypeCastExpression(node) {
     this.tokenChar(40);
@@ -46632,9 +46406,7 @@ function Program(node) {
     if (directivesLen) {
         var _node_directives__trailingComments;
         var newline = node.body.length ? 2 : 1;
-        this.printSequence(node.directives, {
-            trailingCommentsLineOffset: newline
-        });
+        this.printSequence(node.directives, void 0, newline);
         if (!((_node_directives__trailingComments = node.directives[directivesLen - 1].trailingComments) === null || _node_directives__trailingComments === void 0 ? void 0 : _node_directives__trailingComments.length)) {
             this.newline(newline);
         }
@@ -46649,17 +46421,12 @@ function BlockStatement(node) {
     if (directivesLen) {
         var _node_directives__trailingComments;
         var newline = node.body.length ? 2 : 1;
-        this.printSequence(node.directives, {
-            indent: true,
-            trailingCommentsLineOffset: newline
-        });
+        this.printSequence(node.directives, true, newline);
         if (!((_node_directives__trailingComments = node.directives[directivesLen - 1].trailingComments) === null || _node_directives__trailingComments === void 0 ? void 0 : _node_directives__trailingComments.length)) {
             this.newline(newline);
         }
     }
-    this.printSequence(node.body, {
-        indent: true
-    });
+    this.printSequence(node.body, true);
     exit();
     this.rightBrace(node);
 }
@@ -46778,9 +46545,7 @@ function JSXOpeningElement(node) {
     this.print(node.typeParameters);
     if (node.attributes.length > 0) {
         this.space();
-        this.printJoin(node.attributes, {
-            separator: spaceSeparator
-        });
+        this.printJoin(node.attributes, void 0, void 0, spaceSeparator);
     }
     if (node.selfClosing) {
         this.space();
@@ -46847,9 +46612,7 @@ function TSTypeParameterInstantiation(node, parent) {
         }));
         printTrailingSeparator || (printTrailingSeparator = this.shouldPrintTrailingComma(">"));
     }
-    this.printList(node.params, {
-        printTrailingSeparator: printTrailingSeparator
-    });
+    this.printList(node.params, printTrailingSeparator);
     this.tokenChar(62);
 }
 function TSTypeParameter(node) {
@@ -47036,8 +46799,9 @@ function tsPrintFunctionOrConstructorType(node) {
     this.print(returnType);
 }
 function TSTypeReference(node) {
-    this.print(node.typeName, !!node.typeParameters);
-    this.print(node.typeParameters);
+    var typeArguments = node.typeArguments;
+    this.print(node.typeName, !!typeArguments);
+    this.print(typeArguments);
 }
 function TSTypePredicate(node) {
     if (node.asserts) {
@@ -47063,10 +46827,7 @@ function TSTypeQuery(node) {
 function TSTypeLiteral(node) {
     var _this = this;
     printBraced(this, node, function() {
-        return _this.printJoin(node.members, {
-            indent: true,
-            statement: true
-        });
+        return _this.printJoin(node.members, true, true);
     });
 }
 function TSArrayType(node) {
@@ -47076,9 +46837,7 @@ function TSArrayType(node) {
 }
 function TSTupleType(node) {
     this.tokenChar(91);
-    this.printList(node.elementTypes, {
-        printTrailingSeparator: this.shouldPrintTrailingComma("]")
-    });
+    this.printList(node.elementTypes, this.shouldPrintTrailingComma("]"));
     this.tokenChar(93);
 }
 function TSOptionalType(node) {
@@ -47109,12 +46868,10 @@ function tsPrintUnionOrIntersectionType(printer, node, sep) {
         hasLeadingToken = 1;
         printer.token(sep);
     }
-    printer.printJoin(node.types, {
-        separator: function separator(i) {
-            this.space();
-            this.token(sep, null, i + hasLeadingToken);
-            this.space();
-        }
+    printer.printJoin(node.types, void 0, void 0, function(i) {
+        this.space();
+        this.token(sep, null, i + hasLeadingToken);
+        this.space();
     });
 }
 function TSConditionalType(node) {
@@ -47226,10 +46983,7 @@ function TSInterfaceDeclaration(node) {
 function TSInterfaceBody(node) {
     var _this = this;
     printBraced(this, node, function() {
-        return _this.printJoin(node.body, {
-            indent: true,
-            statement: true
-        });
+        return _this.printJoin(node.body, true, true);
     });
 }
 function TSTypeAliasDeclaration(node) {
@@ -47285,11 +47039,7 @@ function TSEnumDeclaration(node) {
     this.space();
     printBraced(this, node, function() {
         var _this_shouldPrintTrailingComma;
-        return _this.printList(members, {
-            indent: true,
-            statement: true,
-            printTrailingSeparator: (_this_shouldPrintTrailingComma = _this.shouldPrintTrailingComma("}")) !== null && _this_shouldPrintTrailingComma !== void 0 ? _this_shouldPrintTrailingComma : true
-        });
+        return _this.printList(members, (_this_shouldPrintTrailingComma = _this.shouldPrintTrailingComma("}")) !== null && _this_shouldPrintTrailingComma !== void 0 ? _this_shouldPrintTrailingComma : true, true, true);
     });
 }
 function TSEnumMember(node) {
@@ -47308,30 +47058,24 @@ function TSModuleDeclaration(node) {
         this.word("declare");
         this.space();
     }
-    if (!node.global) {
-        this.word(kind !== null && kind !== void 0 ? kind : id.type === "Identifier" ? "namespace" : "module");
+    {
+        if (kind !== "global") {
+            this.word(kind);
+            this.space();
+        }
+        this.print(node.id);
+        if (!node.body) {
+            this.semicolon();
+            return;
+        }
         this.space();
+        this.print(node.body);
     }
-    this.print(id);
-    if (!node.body) {
-        this.semicolon();
-        return;
-    }
-    var body = node.body;
-    while(body.type === "TSModuleDeclaration"){
-        this.tokenChar(46);
-        this.print(body.id);
-        body = body.body;
-    }
-    this.space();
-    this.print(body);
 }
 function TSModuleBlock(node) {
     var _this = this;
     printBraced(this, node, function() {
-        return _this.printSequence(node.body, {
-            indent: true
-        });
+        return _this.printSequence(node.body, true);
     });
 }
 function TSImportType(node) {
@@ -47779,6 +47523,8 @@ var Printer = /*#__PURE__*/ function() {
         __publicField(this, "_indentInnerComments", true);
         __publicField(this, "tokenMap", null);
         __publicField(this, "_boundGetRawIdentifier", this._getRawIdentifier.bind(this));
+        __publicField(this, "_printSemicolonBeforeNextNode", -1);
+        __publicField(this, "_printSemicolonBeforeNextToken", -1);
         this.format = format;
         this._tokens = tokens;
         this._originalCode = originalCode;
@@ -47860,6 +47606,7 @@ var Printer = /*#__PURE__*/ function() {
                     var node = this._currentNode;
                     if (node.start != null && node.end != null) {
                         if (!this.tokenMap.endMatches(node, ";")) {
+                            this._printSemicolonBeforeNextNode = this._buf.getCurrentLine();
                             return;
                         }
                         var indexes = this.tokenMap.getIndexes(this._currentNode);
@@ -47909,10 +47656,11 @@ var Printer = /*#__PURE__*/ function() {
                 var noLineTerminatorAfter = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
                 this.tokenContext = 0;
                 this._maybePrintInnerComments(str);
+                this._maybeAddAuxComment();
+                if (this.tokenMap) this._catchUpToCurrentToken(str);
                 if (this._endsWithWord || this._endsWithDiv && str.charCodeAt(0) === 47) {
                     this._space();
                 }
-                this._maybeAddAuxComment();
                 this._append(str, false);
                 this._endsWithWord = true;
                 this._noLineTerminator = noLineTerminatorAfter;
@@ -47938,13 +47686,14 @@ var Printer = /*#__PURE__*/ function() {
                 var maybeNewline = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false, occurrenceCount = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : 0;
                 this.tokenContext = 0;
                 this._maybePrintInnerComments(str, occurrenceCount);
+                this._maybeAddAuxComment();
+                if (this.tokenMap) this._catchUpToCurrentToken(str, occurrenceCount);
                 var lastChar = this.getLastChar();
                 var strFirst = str.charCodeAt(0);
                 if (lastChar === 33 && (str === "--" || strFirst === 61) || strFirst === 43 && lastChar === 43 || strFirst === 45 && lastChar === 45 || strFirst === 46 && this._endsWithInteger) {
                     this._space();
                 }
-                this._maybeAddAuxComment();
-                this._append(str, maybeNewline, occurrenceCount);
+                this._append(str, maybeNewline);
                 this._noLineTerminator = false;
             }
         },
@@ -47952,12 +47701,14 @@ var Printer = /*#__PURE__*/ function() {
             key: "tokenChar",
             value: function tokenChar(char) {
                 this.tokenContext = 0;
-                this._maybePrintInnerComments(String.fromCharCode(char));
+                var str = String.fromCharCode(char);
+                this._maybePrintInnerComments(str);
+                this._maybeAddAuxComment();
+                if (this.tokenMap) this._catchUpToCurrentToken(str);
                 var lastChar = this.getLastChar();
                 if (char === 43 && lastChar === 43 || char === 45 && lastChar === 45 || char === 46 && this._endsWithInteger) {
                     this._space();
                 }
-                this._maybeAddAuxComment();
                 this._appendChar(char);
                 this._noLineTerminator = false;
             }
@@ -48054,14 +47805,25 @@ var Printer = /*#__PURE__*/ function() {
                 this._queue(10);
             }
         },
+        {
+            key: "_catchUpToCurrentToken",
+            value: function _catchUpToCurrentToken(str) {
+                var occurrenceCount = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0;
+                var token = this.tokenMap.findMatching(this._currentNode, str, occurrenceCount);
+                if (token) this._catchUpTo(token.loc.start);
+                if (this._printSemicolonBeforeNextToken !== -1 && this._printSemicolonBeforeNextToken === this._buf.getCurrentLine()) {
+                    this._buf.appendChar(59);
+                    this._endsWithWord = false;
+                    this._endsWithInteger = false;
+                    this._endsWithDiv = false;
+                }
+                this._printSemicolonBeforeNextToken = -1;
+                this._printSemicolonBeforeNextNode = -1;
+            }
+        },
         {
             key: "_append",
             value: function _append(str, maybeNewline) {
-                var occurrenceCount = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : 0;
-                if (this.tokenMap) {
-                    var token = this.tokenMap.findMatching(this._currentNode, str, occurrenceCount);
-                    if (token) this._catchUpTo(token.loc.start);
-                }
                 this._maybeIndent(str.charCodeAt(0));
                 this._buf.append(str, maybeNewline);
                 this._endsWithWord = false;
@@ -48072,10 +47834,6 @@ var Printer = /*#__PURE__*/ function() {
         {
             key: "_appendChar",
             value: function _appendChar(char) {
-                if (this.tokenMap) {
-                    var token = this.tokenMap.findMatching(this._currentNode, String.fromCharCode(char));
-                    if (token) this._catchUpTo(token.loc.start);
-                }
                 this._maybeIndent(char);
                 this._buf.appendChar(char);
                 this._endsWithWord = false;
@@ -48181,6 +47939,9 @@ var Printer = /*#__PURE__*/ function() {
                 }
                 var parent = this._currentNode;
                 this._currentNode = node;
+                if (this.tokenMap) {
+                    this._printSemicolonBeforeNextToken = this._printSemicolonBeforeNextNode;
+                }
                 var oldInAux = this._insideAux;
                 this._insideAux = node.loc == null;
                 this._maybeAddAuxComment(this._insideAux && !oldInAux);
@@ -48306,10 +48067,8 @@ var Printer = /*#__PURE__*/ function() {
         },
         {
             key: "printJoin",
-            value: function printJoin(nodes2) {
-                var opts = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+            value: function printJoin(nodes2, statement2, indent, separator, printTrailingSeparator, addNewlines, iterator, trailingCommentsLineOffset) {
                 if (!(nodes2 === null || nodes2 === void 0 ? void 0 : nodes2.length)) return;
-                var indent = opts.indent;
                 if (indent == null && this.format.retainLines) {
                     var _nodes2__loc;
                     var startLine = (_nodes2__loc = nodes2[0].loc) === null || _nodes2__loc === void 0 ? void 0 : _nodes2__loc.start.line;
@@ -48319,23 +48078,22 @@ var Printer = /*#__PURE__*/ function() {
                 }
                 if (indent) this.indent();
                 var newlineOpts = {
-                    addNewlines: opts.addNewlines,
+                    addNewlines: addNewlines,
                     nextNodeStartLine: 0
                 };
-                var separator = opts.separator ? opts.separator.bind(this) : null;
+                var boundSeparator = separator === null || separator === void 0 ? void 0 : separator.bind(this);
                 var len = nodes2.length;
                 for(var i = 0; i < len; i++){
-                    var _opts_iterator;
                     var node = nodes2[i];
                     if (!node) continue;
-                    if (opts.statement) this._printNewline(i === 0, newlineOpts);
-                    this.print(node, void 0, opts.trailingCommentsLineOffset || 0);
-                    (_opts_iterator = opts.iterator) === null || _opts_iterator === void 0 ? void 0 : _opts_iterator.call(opts, node, i);
-                    if (separator != null) {
-                        if (i < len - 1) separator(i, false);
-                        else if (opts.printTrailingSeparator) separator(i, true);
-                    }
-                    if (opts.statement) {
+                    if (statement2) this._printNewline(i === 0, newlineOpts);
+                    this.print(node, void 0, trailingCommentsLineOffset || 0);
+                    iterator === null || iterator === void 0 ? void 0 : iterator(node, i);
+                    if (boundSeparator != null) {
+                        if (i < len - 1) boundSeparator(i, false);
+                        else if (printTrailingSeparator) boundSeparator(i, true);
+                    }
+                    if (statement2) {
                         var _node_trailingComments;
                         if (!((_node_trailingComments = node.trailingComments) === null || _node_trailingComments === void 0 ? void 0 : _node_trailingComments.length)) {
                             this._lastCommentLine = 0;
@@ -48428,22 +48186,14 @@ var Printer = /*#__PURE__*/ function() {
         },
         {
             key: "printSequence",
-            value: function printSequence(nodes2) {
-                var opts = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-                opts.statement = true;
-                var _opts_indent;
-                (_opts_indent = opts.indent) !== null && _opts_indent !== void 0 ? _opts_indent : opts.indent = false;
-                this.printJoin(nodes2, opts);
+            value: function printSequence(nodes2, indent, trailingCommentsLineOffset, addNewlines) {
+                this.printJoin(nodes2, true, indent !== null && indent !== void 0 ? indent : false, void 0, void 0, addNewlines, void 0, trailingCommentsLineOffset);
             }
         },
         {
             key: "printList",
-            value: function printList(items) {
-                var opts = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-                if (opts.separator == null) {
-                    opts.separator = commaSeparator;
-                }
-                this.printJoin(items, opts);
+            value: function printList(items, printTrailingSeparator, statement2, indent, separator, iterator) {
+                this.printJoin(items, statement2, indent, separator !== null && separator !== void 0 ? separator : commaSeparator, printTrailingSeparator, void 0, iterator);
             }
         },
         {
@@ -48546,8 +48296,18 @@ var Printer = /*#__PURE__*/ function() {
                     val = "/*".concat(comment.value, "*/");
                 }
                 if (this._endsWithDiv) this._space();
-                this.source("start", comment.loc);
-                this._append(val, isBlockComment);
+                if (this.tokenMap) {
+                    var _this = this, _printSemicolonBeforeNextToken = _this._printSemicolonBeforeNextToken, _printSemicolonBeforeNextNode = _this._printSemicolonBeforeNextNode;
+                    this._printSemicolonBeforeNextToken = -1;
+                    this._printSemicolonBeforeNextNode = -1;
+                    this.source("start", comment.loc);
+                    this._append(val, isBlockComment);
+                    this._printSemicolonBeforeNextNode = _printSemicolonBeforeNextNode;
+                    this._printSemicolonBeforeNextToken = _printSemicolonBeforeNextToken;
+                } else {
+                    this.source("start", comment.loc);
+                    this._append(val, isBlockComment);
+                }
                 if (!isBlockComment && !noLineTerminator) {
                     this.newline(1, true);
                 }
@@ -49137,7 +48897,7 @@ function verify$1(visitor) {
             }
             if (shouldIgnoreKey(nodeType)) continue;
             if (!TYPES2.includes(nodeType)) {
-                throw new Error("You gave us a visitor for the node type ".concat(nodeType, " but it's not a valid type in @babel/traverse ", "8.0.0-alpha.13"));
+                throw new Error("You gave us a visitor for the node type ".concat(nodeType, " but it's not a valid type in @babel/traverse ", "8.0.0-alpha.14"));
             }
             var visitors2 = visitor[nodeType];
             if ((typeof visitors2 === "undefined" ? "undefined" : _type_of(visitors2)) === "object") {
@@ -50539,8 +50299,14 @@ var _Scope = /*#__PURE__*/ function() {
                 this.globals = /* @__PURE__ */ Object.create(null);
                 this.uids = /* @__PURE__ */ Object.create(null);
                 this.data = /* @__PURE__ */ Object.create(null);
-                var programParent = this.getProgramParent();
-                if (programParent.crawling) return;
+                var scope2 = this;
+                do {
+                    if (scope2.crawling) return;
+                    if (scope2.path.isProgram()) {
+                        break;
+                    }
+                }while (scope2 = scope2.parent);
+                var programParent = scope2;
                 var state = {
                     references: [],
                     constantViolations: [],