typescript 4.7.0-dev.20220504 → 4.7.1-rc

package/lib/tsc.js

@@ -22,7 +22,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
             ar[i] = from[i];
         }
     }
-    return to.concat(ar || from);
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.7";
-    ts.version = ts.versionMajorMinor + ".0-dev.20220504";
+    ts.version = "".concat(ts.versionMajorMinor, ".1-rc");
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -94,7 +94,7 @@ var ts;
         var constructor = (_a = NativeCollections[nativeFactory]()) !== null && _a !== void 0 ? _a : ts.ShimCollections === null || ts.ShimCollections === void 0 ? void 0 : ts.ShimCollections[shimFactory](ts.getIterator);
         if (constructor)
             return constructor;
-        throw new Error("TypeScript requires an environment that provides a compatible native " + name + " implementation.");
+        throw new Error("TypeScript requires an environment that provides a compatible native ".concat(name, " implementation."));
     }
 })(ts || (ts = {}));
 var ts;
@@ -1436,7 +1436,7 @@ var ts;
     function cast(value, test) {
         if (value !== undefined && test(value))
             return value;
-        return ts.Debug.fail("Invalid cast. The supplied value " + value + " did not pass the test '" + ts.Debug.getFunctionName(test) + "'.");
+        return ts.Debug.fail("Invalid cast. The supplied value ".concat(value, " did not pass the test '").concat(ts.Debug.getFunctionName(test), "'."));
     }
     ts.cast = cast;
     function noop(_) { }
@@ -1486,7 +1486,7 @@ var ts;
     function memoizeOne(callback) {
         var map = new ts.Map();
         return function (arg) {
-            var key = typeof arg + ":" + arg;
+            var key = "".concat(typeof arg, ":").concat(arg);
             var value = map.get(key);
             if (value === undefined && !map.has(key)) {
                 value = callback(arg);
@@ -1821,7 +1821,7 @@ var ts;
     ts.createGetCanonicalFileName = createGetCanonicalFileName;
     function patternText(_a) {
         var prefix = _a.prefix, suffix = _a.suffix;
-        return prefix + "*" + suffix;
+        return "".concat(prefix, "*").concat(suffix);
     }
     ts.patternText = patternText;
     function matchedText(pattern, candidate) {
@@ -2092,7 +2092,7 @@ var ts;
         }
         function fail(message, stackCrawlMark) {
             debugger;
-            var e = new Error(message ? "Debug Failure. " + message : "Debug Failure.");
+            var e = new Error(message ? "Debug Failure. ".concat(message) : "Debug Failure.");
             if (Error.captureStackTrace) {
                 Error.captureStackTrace(e, stackCrawlMark || fail);
             }
@@ -2100,12 +2100,12 @@ var ts;
         }
         Debug.fail = fail;
         function failBadSyntaxKind(node, message, stackCrawlMark) {
-            return fail((message || "Unexpected node.") + "\r\nNode " + formatSyntaxKind(node.kind) + " was unexpected.", stackCrawlMark || failBadSyntaxKind);
+            return fail("".concat(message || "Unexpected node.", "\r\nNode ").concat(formatSyntaxKind(node.kind), " was unexpected."), stackCrawlMark || failBadSyntaxKind);
         }
         Debug.failBadSyntaxKind = failBadSyntaxKind;
         function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
             if (!expression) {
-                message = message ? "False expression: " + message : "False expression.";
+                message = message ? "False expression: ".concat(message) : "False expression.";
                 if (verboseDebugInfo) {
                     message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
                 }
@@ -2115,26 +2115,26 @@ var ts;
         Debug.assert = assert;
         function assertEqual(a, b, msg, msg2, stackCrawlMark) {
             if (a !== b) {
-                var message = msg ? msg2 ? msg + " " + msg2 : msg : "";
-                fail("Expected " + a + " === " + b + ". " + message, stackCrawlMark || assertEqual);
+                var message = msg ? msg2 ? "".concat(msg, " ").concat(msg2) : msg : "";
+                fail("Expected ".concat(a, " === ").concat(b, ". ").concat(message), stackCrawlMark || assertEqual);
             }
         }
         Debug.assertEqual = assertEqual;
         function assertLessThan(a, b, msg, stackCrawlMark) {
             if (a >= b) {
-                fail("Expected " + a + " < " + b + ". " + (msg || ""), stackCrawlMark || assertLessThan);
+                fail("Expected ".concat(a, " < ").concat(b, ". ").concat(msg || ""), stackCrawlMark || assertLessThan);
             }
         }
         Debug.assertLessThan = assertLessThan;
         function assertLessThanOrEqual(a, b, stackCrawlMark) {
             if (a > b) {
-                fail("Expected " + a + " <= " + b, stackCrawlMark || assertLessThanOrEqual);
+                fail("Expected ".concat(a, " <= ").concat(b), stackCrawlMark || assertLessThanOrEqual);
             }
         }
         Debug.assertLessThanOrEqual = assertLessThanOrEqual;
         function assertGreaterThanOrEqual(a, b, stackCrawlMark) {
             if (a < b) {
-                fail("Expected " + a + " >= " + b, stackCrawlMark || assertGreaterThanOrEqual);
+                fail("Expected ".concat(a, " >= ").concat(b), stackCrawlMark || assertGreaterThanOrEqual);
             }
         }
         Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
@@ -2164,42 +2164,42 @@ var ts;
         function assertNever(member, message, stackCrawlMark) {
             if (message === void 0) { message = "Illegal value:"; }
             var detail = typeof member === "object" && ts.hasProperty(member, "kind") && ts.hasProperty(member, "pos") ? "SyntaxKind: " + formatSyntaxKind(member.kind) : JSON.stringify(member);
-            return fail(message + " " + detail, stackCrawlMark || assertNever);
+            return fail("".concat(message, " ").concat(detail), stackCrawlMark || assertNever);
         }
         Debug.assertNever = assertNever;
         function assertEachNode(nodes, test, message, stackCrawlMark) {
             if (shouldAssertFunction(1, "assertEachNode")) {
-                assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '" + getFunctionName(test) + "'."; }, stackCrawlMark || assertEachNode);
+                assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '".concat(getFunctionName(test), "'."); }, stackCrawlMark || assertEachNode);
             }
         }
         Debug.assertEachNode = assertEachNode;
         function assertNode(node, test, message, stackCrawlMark) {
             if (shouldAssertFunction(1, "assertNode")) {
-                assert(node !== undefined && (test === undefined || test(node)), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node === null || node === void 0 ? void 0 : node.kind) + " did not pass test '" + getFunctionName(test) + "'."; }, stackCrawlMark || assertNode);
+                assert(node !== undefined && (test === undefined || test(node)), message || "Unexpected node.", function () { return "Node ".concat(formatSyntaxKind(node === null || node === void 0 ? void 0 : node.kind), " did not pass test '").concat(getFunctionName(test), "'."); }, stackCrawlMark || assertNode);
             }
         }
         Debug.assertNode = assertNode;
         function assertNotNode(node, test, message, stackCrawlMark) {
             if (shouldAssertFunction(1, "assertNotNode")) {
-                assert(node === undefined || test === undefined || !test(node), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " should not have passed test '" + getFunctionName(test) + "'."; }, stackCrawlMark || assertNotNode);
+                assert(node === undefined || test === undefined || !test(node), message || "Unexpected node.", function () { return "Node ".concat(formatSyntaxKind(node.kind), " should not have passed test '").concat(getFunctionName(test), "'."); }, stackCrawlMark || assertNotNode);
             }
         }
         Debug.assertNotNode = assertNotNode;
         function assertOptionalNode(node, test, message, stackCrawlMark) {
             if (shouldAssertFunction(1, "assertOptionalNode")) {
-                assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node === null || node === void 0 ? void 0 : node.kind) + " did not pass test '" + getFunctionName(test) + "'."; }, stackCrawlMark || assertOptionalNode);
+                assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node ".concat(formatSyntaxKind(node === null || node === void 0 ? void 0 : node.kind), " did not pass test '").concat(getFunctionName(test), "'."); }, stackCrawlMark || assertOptionalNode);
             }
         }
         Debug.assertOptionalNode = assertOptionalNode;
         function assertOptionalToken(node, kind, message, stackCrawlMark) {
             if (shouldAssertFunction(1, "assertOptionalToken")) {
-                assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node === null || node === void 0 ? void 0 : node.kind) + " was not a '" + formatSyntaxKind(kind) + "' token."; }, stackCrawlMark || assertOptionalToken);
+                assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node ".concat(formatSyntaxKind(node === null || node === void 0 ? void 0 : node.kind), " was not a '").concat(formatSyntaxKind(kind), "' token."); }, stackCrawlMark || assertOptionalToken);
             }
         }
         Debug.assertOptionalToken = assertOptionalToken;
         function assertMissingNode(node, message, stackCrawlMark) {
             if (shouldAssertFunction(1, "assertMissingNode")) {
-                assert(node === undefined, message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " was unexpected'."; }, stackCrawlMark || assertMissingNode);
+                assert(node === undefined, message || "Unexpected node.", function () { return "Node ".concat(formatSyntaxKind(node.kind), " was unexpected'."); }, stackCrawlMark || assertMissingNode);
             }
         }
         Debug.assertMissingNode = assertMissingNode;
@@ -2220,7 +2220,7 @@ var ts;
         }
         Debug.getFunctionName = getFunctionName;
         function formatSymbol(symbol) {
-            return "{ name: " + ts.unescapeLeadingUnderscores(symbol.escapedName) + "; flags: " + formatSymbolFlags(symbol.flags) + "; declarations: " + ts.map(symbol.declarations, function (node) { return formatSyntaxKind(node.kind); }) + " }";
+            return "{ name: ".concat(ts.unescapeLeadingUnderscores(symbol.escapedName), "; flags: ").concat(formatSymbolFlags(symbol.flags), "; declarations: ").concat(ts.map(symbol.declarations, function (node) { return formatSyntaxKind(node.kind); }), " }");
         }
         Debug.formatSymbol = formatSymbol;
         function formatEnum(value, enumObject, isFlags) {
@@ -2238,7 +2238,7 @@ var ts;
                         break;
                     }
                     if (enumValue !== 0 && enumValue & value) {
-                        result = "" + result + (result ? "|" : "") + enumName;
+                        result = "".concat(result).concat(result ? "|" : "").concat(enumName);
                         remainingFlags &= ~enumValue;
                     }
                 }
@@ -2347,7 +2347,7 @@ var ts;
                                                                     this.flags & 1 ? "FlowUnreachable" :
                                                                         "UnknownFlow";
                             var remainingFlags = this.flags & ~(2048 - 1);
-                            return "" + flowHeader + (remainingFlags ? " (" + formatFlowFlags(remainingFlags) + ")" : "");
+                            return "".concat(flowHeader).concat(remainingFlags ? " (".concat(formatFlowFlags(remainingFlags), ")") : "");
                         }
                     },
                     __debugFlowFlags: { get: function () { return formatEnum(this.flags, ts.FlowFlags, true); } },
@@ -2377,7 +2377,7 @@ var ts;
                     __tsDebuggerDisplay: {
                         value: function (defaultValue) {
                             defaultValue = String(defaultValue).replace(/(?:,[\s\w\d_]+:[^,]+)+\]$/, "]");
-                            return "NodeArray " + defaultValue;
+                            return "NodeArray ".concat(defaultValue);
                         }
                     }
                 });
@@ -2423,7 +2423,7 @@ var ts;
                         var symbolHeader = this.flags & 33554432 ? "TransientSymbol" :
                             "Symbol";
                         var remainingSymbolFlags = this.flags & ~33554432;
-                        return symbolHeader + " '" + ts.symbolName(this) + "'" + (remainingSymbolFlags ? " (" + formatSymbolFlags(remainingSymbolFlags) + ")" : "");
+                        return "".concat(symbolHeader, " '").concat(ts.symbolName(this), "'").concat(remainingSymbolFlags ? " (".concat(formatSymbolFlags(remainingSymbolFlags), ")") : "");
                     }
                 },
                 __debugFlags: { get: function () { return formatSymbolFlags(this.flags); } }
@@ -2432,11 +2432,11 @@ var ts;
                 __tsDebuggerDisplay: {
                     value: function () {
                         var typeHeader = this.flags & 98304 ? "NullableType" :
-                            this.flags & 384 ? "LiteralType " + JSON.stringify(this.value) :
-                                this.flags & 2048 ? "LiteralType " + (this.value.negative ? "-" : "") + this.value.base10Value + "n" :
+                            this.flags & 384 ? "LiteralType ".concat(JSON.stringify(this.value)) :
+                                this.flags & 2048 ? "LiteralType ".concat(this.value.negative ? "-" : "").concat(this.value.base10Value, "n") :
                                     this.flags & 8192 ? "UniqueESSymbolType" :
                                         this.flags & 32 ? "EnumType" :
-                                            this.flags & 67359327 ? "IntrinsicType " + this.intrinsicName :
+                                            this.flags & 67359327 ? "IntrinsicType ".concat(this.intrinsicName) :
                                                 this.flags & 1048576 ? "UnionType" :
                                                     this.flags & 2097152 ? "IntersectionType" :
                                                         this.flags & 4194304 ? "IndexType" :
@@ -2455,7 +2455,7 @@ var ts;
                                                                                                             "ObjectType" :
                                                                                 "Type";
                         var remainingObjectFlags = this.flags & 524288 ? this.objectFlags & ~1343 : 0;
-                        return "" + typeHeader + (this.symbol ? " '" + ts.symbolName(this.symbol) + "'" : "") + (remainingObjectFlags ? " (" + formatObjectFlags(remainingObjectFlags) + ")" : "");
+                        return "".concat(typeHeader).concat(this.symbol ? " '".concat(ts.symbolName(this.symbol), "'") : "").concat(remainingObjectFlags ? " (".concat(formatObjectFlags(remainingObjectFlags), ")") : "");
                     }
                 },
                 __debugFlags: { get: function () { return formatTypeFlags(this.flags); } },
@@ -2489,11 +2489,11 @@ var ts;
                         __tsDebuggerDisplay: {
                             value: function () {
                                 var nodeHeader = ts.isGeneratedIdentifier(this) ? "GeneratedIdentifier" :
-                                    ts.isIdentifier(this) ? "Identifier '" + ts.idText(this) + "'" :
-                                        ts.isPrivateIdentifier(this) ? "PrivateIdentifier '" + ts.idText(this) + "'" :
-                                            ts.isStringLiteral(this) ? "StringLiteral " + JSON.stringify(this.text.length < 10 ? this.text : this.text.slice(10) + "...") :
-                                                ts.isNumericLiteral(this) ? "NumericLiteral " + this.text :
-                                                    ts.isBigIntLiteral(this) ? "BigIntLiteral " + this.text + "n" :
+                                    ts.isIdentifier(this) ? "Identifier '".concat(ts.idText(this), "'") :
+                                        ts.isPrivateIdentifier(this) ? "PrivateIdentifier '".concat(ts.idText(this), "'") :
+                                            ts.isStringLiteral(this) ? "StringLiteral ".concat(JSON.stringify(this.text.length < 10 ? this.text : this.text.slice(10) + "...")) :
+                                                ts.isNumericLiteral(this) ? "NumericLiteral ".concat(this.text) :
+                                                    ts.isBigIntLiteral(this) ? "BigIntLiteral ".concat(this.text, "n") :
                                                         ts.isTypeParameterDeclaration(this) ? "TypeParameterDeclaration" :
                                                             ts.isParameter(this) ? "ParameterDeclaration" :
                                                                 ts.isConstructorDeclaration(this) ? "ConstructorDeclaration" :
@@ -2525,7 +2525,7 @@ var ts;
                                                                                                                                                                         ts.isNamedTupleMember(this) ? "NamedTupleMember" :
                                                                                                                                                                             ts.isImportTypeNode(this) ? "ImportTypeNode" :
                                                                                                                                                                                 formatSyntaxKind(this.kind);
-                                return "" + nodeHeader + (this.flags ? " (" + formatNodeFlags(this.flags) + ")" : "");
+                                return "".concat(nodeHeader).concat(this.flags ? " (".concat(formatNodeFlags(this.flags), ")") : "");
                             }
                         },
                         __debugKind: { get: function () { return formatSyntaxKind(this.kind); } },
@@ -2569,10 +2569,10 @@ var ts;
         Debug.enableDebugInfo = enableDebugInfo;
         function formatDeprecationMessage(name, error, errorAfter, since, message) {
             var deprecationMessage = error ? "DeprecationError: " : "DeprecationWarning: ";
-            deprecationMessage += "'" + name + "' ";
-            deprecationMessage += since ? "has been deprecated since v" + since : "is deprecated";
-            deprecationMessage += error ? " and can no longer be used." : errorAfter ? " and will no longer be usable after v" + errorAfter + "." : ".";
-            deprecationMessage += message ? " " + ts.formatStringFromArgs(message, [name], 0) : "";
+            deprecationMessage += "'".concat(name, "' ");
+            deprecationMessage += since ? "has been deprecated since v".concat(since) : "is deprecated";
+            deprecationMessage += error ? " and can no longer be used." : errorAfter ? " and will no longer be usable after v".concat(errorAfter, ".") : ".";
+            deprecationMessage += message ? " ".concat(ts.formatStringFromArgs(message, [name], 0)) : "";
             return deprecationMessage;
         }
         function createErrorDeprecation(name, errorAfter, since, message) {
@@ -2669,11 +2669,11 @@ var ts;
             }
         };
         Version.prototype.toString = function () {
-            var result = this.major + "." + this.minor + "." + this.patch;
+            var result = "".concat(this.major, ".").concat(this.minor, ".").concat(this.patch);
             if (ts.some(this.prerelease))
-                result += "-" + this.prerelease.join(".");
+                result += "-".concat(this.prerelease.join("."));
             if (ts.some(this.build))
-                result += "+" + this.build.join(".");
+                result += "+".concat(this.build.join("."));
             return result;
         };
         Version.zero = new Version(0, 0, 0);
@@ -2895,7 +2895,7 @@ var ts;
         return ts.map(comparators, formatComparator).join(" ");
     }
     function formatComparator(comparator) {
-        return "" + comparator.operator + comparator.operand;
+        return "".concat(comparator.operator).concat(comparator.operand);
     }
 })(ts || (ts = {}));
 var ts;
@@ -3124,7 +3124,7 @@ var ts;
                     fs = require("fs");
                 }
                 catch (e) {
-                    throw new Error("tracing requires having fs\n(original error: " + (e.message || e) + ")");
+                    throw new Error("tracing requires having fs\n(original error: ".concat(e.message || e, ")"));
                 }
             }
             mode = tracingMode;
@@ -3135,11 +3135,11 @@ var ts;
             if (!fs.existsSync(traceDir)) {
                 fs.mkdirSync(traceDir, { recursive: true });
             }
-            var countPart = mode === "build" ? "." + process.pid + "-" + ++traceCount
-                : mode === "server" ? "." + process.pid
+            var countPart = mode === "build" ? ".".concat(process.pid, "-").concat(++traceCount)
+                : mode === "server" ? ".".concat(process.pid)
                     : "";
-            var tracePath = ts.combinePaths(traceDir, "trace" + countPart + ".json");
-            var typesPath = ts.combinePaths(traceDir, "types" + countPart + ".json");
+            var tracePath = ts.combinePaths(traceDir, "trace".concat(countPart, ".json"));
+            var typesPath = ts.combinePaths(traceDir, "types".concat(countPart, ".json"));
             legend.push({
                 configFilePath: configFilePath,
                 tracePath: tracePath,
@@ -3207,7 +3207,7 @@ var ts;
                 writeEvent("E", phase, name, args, undefined, endTime);
             }
             else if (sampleInterval - (time % sampleInterval) <= endTime - time) {
-                writeEvent("X", phase, name, args, "\"dur\":" + (endTime - time), time);
+                writeEvent("X", phase, name, args, "\"dur\":".concat(endTime - time), time);
             }
         }
         function writeEvent(eventType, phase, name, args, extras, time) {
@@ -3215,11 +3215,11 @@ var ts;
             if (mode === "server" && phase === "checkTypes")
                 return;
             ts.performance.mark("beginTracing");
-            fs.writeSync(traceFd, ",\n{\"pid\":1,\"tid\":1,\"ph\":\"" + eventType + "\",\"cat\":\"" + phase + "\",\"ts\":" + time + ",\"name\":\"" + name + "\"");
+            fs.writeSync(traceFd, ",\n{\"pid\":1,\"tid\":1,\"ph\":\"".concat(eventType, "\",\"cat\":\"").concat(phase, "\",\"ts\":").concat(time, ",\"name\":\"").concat(name, "\""));
             if (extras)
-                fs.writeSync(traceFd, "," + extras);
+                fs.writeSync(traceFd, ",".concat(extras));
             if (args)
-                fs.writeSync(traceFd, ",\"args\":" + JSON.stringify(args));
+                fs.writeSync(traceFd, ",\"args\":".concat(JSON.stringify(args)));
             fs.writeSync(traceFd, "}");
             ts.performance.mark("endTracing");
             ts.performance.measure("Tracing", "beginTracing", "endTracing");
@@ -3546,7 +3546,7 @@ var ts;
         pollingChunkSize = getCustomPollingBasedLevels("TSC_WATCH_POLLINGCHUNKSIZE", defaultChunkLevels) || pollingChunkSize;
         ts.unchangedPollThresholds = getCustomPollingBasedLevels("TSC_WATCH_UNCHANGEDPOLLTHRESHOLDS", defaultChunkLevels) || ts.unchangedPollThresholds;
         function getLevel(envVar, level) {
-            return system.getEnvironmentVariable(envVar + "_" + level.toUpperCase());
+            return system.getEnvironmentVariable("".concat(envVar, "_").concat(level.toUpperCase()));
         }
         function getCustomLevels(baseVariable) {
             var customLevels;
@@ -3970,7 +3970,7 @@ var ts;
         }
         function onTimerToUpdateChildWatches() {
             timerToUpdateChildWatches = undefined;
-            sysLog("sysLog:: onTimerToUpdateChildWatches:: " + cacheToUpdateChildWatches.size);
+            sysLog("sysLog:: onTimerToUpdateChildWatches:: ".concat(cacheToUpdateChildWatches.size));
             var start = ts.timestamp();
             var invokeMap = new ts.Map();
             while (!timerToUpdateChildWatches && cacheToUpdateChildWatches.size) {
@@ -3981,7 +3981,7 @@ var ts;
                 var hasChanges = updateChildWatches(dirName, dirPath, options);
                 invokeCallbacks(dirPath, invokeMap, hasChanges ? undefined : fileNames);
             }
-            sysLog("sysLog:: invokingWatchers:: Elapsed:: " + (ts.timestamp() - start) + "ms:: " + cacheToUpdateChildWatches.size);
+            sysLog("sysLog:: invokingWatchers:: Elapsed:: ".concat(ts.timestamp() - start, "ms:: ").concat(cacheToUpdateChildWatches.size));
             callbackCache.forEach(function (callbacks, rootDirName) {
                 var existing = invokeMap.get(rootDirName);
                 if (existing) {
@@ -3997,7 +3997,7 @@ var ts;
                 }
             });
             var elapsed = ts.timestamp() - start;
-            sysLog("sysLog:: Elapsed:: " + elapsed + "ms:: onTimerToUpdateChildWatches:: " + cacheToUpdateChildWatches.size + " " + timerToUpdateChildWatches);
+            sysLog("sysLog:: Elapsed:: ".concat(elapsed, "ms:: onTimerToUpdateChildWatches:: ").concat(cacheToUpdateChildWatches.size, " ").concat(timerToUpdateChildWatches));
         }
         function removeChildWatches(parentWatcher) {
             if (!parentWatcher)
@@ -4389,7 +4389,7 @@ var ts;
                 var externalFileCounter = 0;
                 var remappedPaths = new ts.Map();
                 var normalizedDir = ts.normalizeSlashes(__dirname);
-                var fileUrlRoot = "file://" + (ts.getRootLength(normalizedDir) === 1 ? "" : "/") + normalizedDir;
+                var fileUrlRoot = "file://".concat(ts.getRootLength(normalizedDir) === 1 ? "" : "/").concat(normalizedDir);
                 for (var _i = 0, _a = profile.nodes; _i < _a.length; _i++) {
                     var node = _a[_i];
                     if (node.callFrame.url) {
@@ -4398,7 +4398,7 @@ var ts;
                             node.callFrame.url = ts.getRelativePathToDirectoryOrUrl(fileUrlRoot, url, fileUrlRoot, ts.createGetCanonicalFileName(useCaseSensitiveFileNames), true);
                         }
                         else if (!nativePattern.test(url)) {
-                            node.callFrame.url = (remappedPaths.has(url) ? remappedPaths : remappedPaths.set(url, "external" + externalFileCounter + ".js")).get(url);
+                            node.callFrame.url = (remappedPaths.has(url) ? remappedPaths : remappedPaths.set(url, "external".concat(externalFileCounter, ".js"))).get(url);
                             externalFileCounter++;
                         }
                     }
@@ -4414,7 +4414,7 @@ var ts;
                         if (!err) {
                             try {
                                 if ((_b = statSync(profilePath)) === null || _b === void 0 ? void 0 : _b.isDirectory()) {
-                                    profilePath = _path.join(profilePath, (new Date()).toISOString().replace(/:/g, "-") + "+P" + process.pid + ".cpuprofile");
+                                    profilePath = _path.join(profilePath, "".concat((new Date()).toISOString().replace(/:/g, "-"), "+P").concat(process.pid, ".cpuprofile"));
                                 }
                             }
                             catch (_c) {
@@ -4499,7 +4499,7 @@ var ts;
                     }
                 };
                 function invokeCallbackAndUpdateWatcher(createWatcher) {
-                    sysLog("sysLog:: " + fileOrDirectory + ":: Changing watcher to " + (createWatcher === watchPresentFileSystemEntry ? "Present" : "Missing") + "FileSystemEntryWatcher");
+                    sysLog("sysLog:: ".concat(fileOrDirectory, ":: Changing watcher to ").concat(createWatcher === watchPresentFileSystemEntry ? "Present" : "Missing", "FileSystemEntryWatcher"));
                     callback("rename", "");
                     if (watcher) {
                         watcher.close();
@@ -4516,7 +4516,7 @@ var ts;
                         }
                     }
                     if (hitSystemWatcherLimit) {
-                        sysLog("sysLog:: " + fileOrDirectory + ":: Defaulting to fsWatchFile");
+                        sysLog("sysLog:: ".concat(fileOrDirectory, ":: Defaulting to fsWatchFile"));
                         return watchPresentFileSystemEntryWithFsWatchFile();
                     }
                     try {
@@ -4528,7 +4528,7 @@ var ts;
                     }
                     catch (e) {
                         hitSystemWatcherLimit || (hitSystemWatcherLimit = e.code === "ENOSPC");
-                        sysLog("sysLog:: " + fileOrDirectory + ":: Changing to fsWatchFile");
+                        sysLog("sysLog:: ".concat(fileOrDirectory, ":: Changing to fsWatchFile"));
                         return watchPresentFileSystemEntryWithFsWatchFile();
                     }
                 }
@@ -5593,6 +5593,8 @@ var ts;
         Construct_signatures_with_no_arguments_have_incompatible_return_types_0_and_1: diag(2205, ts.DiagnosticCategory.Error, "Construct_signatures_with_no_arguments_have_incompatible_return_types_0_and_1_2205", "Construct signatures with no arguments have incompatible return types '{0}' and '{1}'.", undefined, true),
         The_type_modifier_cannot_be_used_on_a_named_import_when_import_type_is_used_on_its_import_statement: diag(2206, ts.DiagnosticCategory.Error, "The_type_modifier_cannot_be_used_on_a_named_import_when_import_type_is_used_on_its_import_statement_2206", "The 'type' modifier cannot be used on a named import when 'import type' is used on its import statement."),
         The_type_modifier_cannot_be_used_on_a_named_export_when_export_type_is_used_on_its_export_statement: diag(2207, ts.DiagnosticCategory.Error, "The_type_modifier_cannot_be_used_on_a_named_export_when_export_type_is_used_on_its_export_statement_2207", "The 'type' modifier cannot be used on a named export when 'export type' is used on its export statement."),
+        The_project_root_is_ambiguous_but_is_required_to_resolve_export_map_entry_0_in_file_1_Supply_the_rootDir_compiler_option_to_disambiguate: diag(2209, ts.DiagnosticCategory.Error, "The_project_root_is_ambiguous_but_is_required_to_resolve_export_map_entry_0_in_file_1_Supply_the_roo_2209", "The project root is ambiguous, but is required to resolve export map entry '{0}' in file '{1}'. Supply the `rootDir` compiler option to disambiguate."),
+        The_project_root_is_ambiguous_but_is_required_to_resolve_import_map_entry_0_in_file_1_Supply_the_rootDir_compiler_option_to_disambiguate: diag(2210, ts.DiagnosticCategory.Error, "The_project_root_is_ambiguous_but_is_required_to_resolve_import_map_entry_0_in_file_1_Supply_the_roo_2210", "The project root is ambiguous, but is required to resolve import map entry '{0}' in file '{1}'. Supply the `rootDir` compiler option to disambiguate."),
         Duplicate_identifier_0: diag(2300, ts.DiagnosticCategory.Error, "Duplicate_identifier_0_2300", "Duplicate identifier '{0}'."),
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2301, ts.DiagnosticCategory.Error, "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
         Static_members_cannot_reference_class_type_parameters: diag(2302, ts.DiagnosticCategory.Error, "Static_members_cannot_reference_class_type_parameters_2302", "Static members cannot reference class type parameters."),
@@ -6182,6 +6184,7 @@ var ts;
         This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base_class_0: diag(4122, ts.DiagnosticCategory.Error, "This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base__4122", "This member cannot have a JSDoc comment with an '@override' tag because it is not declared in the base class '{0}'."),
         This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base_class_0_Did_you_mean_1: diag(4123, ts.DiagnosticCategory.Error, "This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base__4123", "This member cannot have a JSDoc comment with an 'override' tag because it is not declared in the base class '{0}'. Did you mean '{1}'?"),
         Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next: diag(4124, ts.DiagnosticCategory.Error, "Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_w_4124", "Compiler option '{0}' of value '{1}' is unstable. Use nightly TypeScript to silence this error. Try updating with 'npm install -D typescript@next'."),
+        Resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next: diag(4125, ts.DiagnosticCategory.Error, "Resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_wi_4125", "Resolution mode assertions are unstable. Use nightly TypeScript to silence this error. Try updating with 'npm install -D typescript@next'."),
         The_current_host_does_not_support_the_0_option: diag(5001, ts.DiagnosticCategory.Error, "The_current_host_does_not_support_the_0_option_5001", "The current host does not support the '{0}' option."),
         Cannot_find_the_common_subdirectory_path_for_the_input_files: diag(5009, ts.DiagnosticCategory.Error, "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", "Cannot find the common subdirectory path for the input files."),
         File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: diag(5010, ts.DiagnosticCategory.Error, "File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0_5010", "File specification cannot end in a recursive directory wildcard ('**'): '{0}'."),
@@ -7236,7 +7239,7 @@ var ts;
                 line = line < 0 ? 0 : line >= lineStarts.length ? lineStarts.length - 1 : line;
             }
             else {
-                ts.Debug.fail("Bad line number. Line: " + line + ", lineStarts.length: " + lineStarts.length + " , line map is correct? " + (debugText !== undefined ? ts.arraysEqual(lineStarts, computeLineStarts(debugText)) : "unknown"));
+                ts.Debug.fail("Bad line number. Line: ".concat(line, ", lineStarts.length: ").concat(lineStarts.length, " , line map is correct? ").concat(debugText !== undefined ? ts.arraysEqual(lineStarts, computeLineStarts(debugText)) : "unknown"));
             }
         }
         var res = lineStarts[line] + character;
@@ -9751,7 +9754,7 @@ var ts;
                 : "linkplain";
         var name = link.name ? ts.entityNameToString(link.name) : "";
         var space = link.name && link.text.startsWith("://") ? "" : " ";
-        return "{@" + kind + " " + name + space + link.text + "}";
+        return "{@".concat(kind, " ").concat(name).concat(space).concat(link.text, "}");
     }
     function getEffectiveTypeParameterDeclarations(node) {
         if (ts.isJSDocSignature(node)) {
@@ -10850,11 +10853,11 @@ var ts;
     }
     function packageIdToPackageName(_a) {
         var name = _a.name, subModuleName = _a.subModuleName;
-        return subModuleName ? name + "/" + subModuleName : name;
+        return subModuleName ? "".concat(name, "/").concat(subModuleName) : name;
     }
     ts.packageIdToPackageName = packageIdToPackageName;
     function packageIdToString(packageId) {
-        return packageIdToPackageName(packageId) + "@" + packageId.version;
+        return "".concat(packageIdToPackageName(packageId), "@").concat(packageId.version);
     }
     ts.packageIdToString = packageIdToString;
     function typeDirectiveIsEqualTo(oldResolution, newResolution) {
@@ -10931,7 +10934,7 @@ var ts;
     function nodePosToString(node) {
         var file = getSourceFileOfNode(node);
         var loc = ts.getLineAndCharacterOfPosition(file, node.pos);
-        return file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + ")";
+        return "".concat(file.fileName, "(").concat(loc.line + 1, ",").concat(loc.character + 1, ")");
     }
     ts.nodePosToString = nodePosToString;
     function getEndLinePosition(line, sourceFile) {
@@ -11032,7 +11035,7 @@ var ts;
     ts.isPinnedComment = isPinnedComment;
     function createCommentDirectivesMap(sourceFile, commentDirectives) {
         var directivesByLine = new ts.Map(commentDirectives.map(function (commentDirective) { return ([
-            "" + ts.getLineAndCharacterOfPosition(sourceFile, commentDirective.range.end).line,
+            "".concat(ts.getLineAndCharacterOfPosition(sourceFile, commentDirective.range.end).line),
             commentDirective,
         ]); }));
         var usedLines = new ts.Map();
@@ -11049,10 +11052,10 @@ var ts;
             });
         }
         function markUsed(line) {
-            if (!directivesByLine.has("" + line)) {
+            if (!directivesByLine.has("".concat(line))) {
                 return false;
             }
-            usedLines.set("" + line, true);
+            usedLines.set("".concat(line), true);
             return true;
         }
     }
@@ -11251,7 +11254,7 @@ var ts;
                 }
                 return node.text;
         }
-        return ts.Debug.fail("Literal kind '" + node.kind + "' not accounted for.");
+        return ts.Debug.fail("Literal kind '".concat(node.kind, "' not accounted for."));
     }
     ts.getLiteralText = getLiteralText;
     function canUseOriginalText(node, flags) {
@@ -13615,11 +13618,11 @@ var ts;
     }
     ts.getEscapedTextOfIdentifierOrLiteral = getEscapedTextOfIdentifierOrLiteral;
     function getPropertyNameForUniqueESSymbol(symbol) {
-        return "__@" + ts.getSymbolId(symbol) + "@" + symbol.escapedName;
+        return "__@".concat(ts.getSymbolId(symbol), "@").concat(symbol.escapedName);
     }
     ts.getPropertyNameForUniqueESSymbol = getPropertyNameForUniqueESSymbol;
     function getSymbolNameForPrivateIdentifier(containingClassSymbol, description) {
-        return "__#" + ts.getSymbolId(containingClassSymbol) + "@" + description;
+        return "__#".concat(ts.getSymbolId(containingClassSymbol), "@").concat(description);
     }
     ts.getSymbolNameForPrivateIdentifier = getSymbolNameForPrivateIdentifier;
     function isKnownSymbol(symbol) {
@@ -14050,6 +14053,10 @@ var ts;
         return indentStrings[1].length;
     }
     ts.getIndentSize = getIndentSize;
+    function isNightly() {
+        return ts.stringContains(ts.version, "-dev") || ts.stringContains(ts.version, "-insiders");
+    }
+    ts.isNightly = isNightly;
     function createTextWriter(newLine) {
         var output;
         var indent;
@@ -14276,6 +14283,13 @@ var ts;
                     ".d.ts";
     }
     ts.getDeclarationEmitExtensionForPath = getDeclarationEmitExtensionForPath;
+    function getPossibleOriginalInputExtensionForExtension(path) {
+        return ts.fileExtensionIsOneOf(path, [".d.mts", ".mjs", ".mts"]) ? [".mts", ".mjs"] :
+            ts.fileExtensionIsOneOf(path, [".d.cts", ".cjs", ".cts"]) ? [".cts", ".cjs"] :
+                ts.fileExtensionIsOneOf(path, [".json.d.ts"]) ? [".json"] :
+                    [".tsx", ".ts", ".jsx", ".js"];
+    }
+    ts.getPossibleOriginalInputExtensionForExtension = getPossibleOriginalInputExtensionForExtension;
     function outFile(options) {
         return options.outFile || options.out;
     }
@@ -15995,7 +16009,7 @@ var ts;
     }
     ts.getJSXImplicitImportBase = getJSXImplicitImportBase;
     function getJSXRuntimeImport(base, options) {
-        return base ? base + "/" + (options.jsx === 5 ? "jsx-dev-runtime" : "jsx-runtime") : undefined;
+        return base ? "".concat(base, "/").concat(options.jsx === 5 ? "jsx-dev-runtime" : "jsx-runtime") : undefined;
     }
     ts.getJSXRuntimeImport = getJSXRuntimeImport;
     function hasZeroOrOneAsteriskCharacter(str) {
@@ -16093,15 +16107,15 @@ var ts;
     }
     var wildcardCharCodes = [42, 63];
     ts.commonPackageFolders = ["node_modules", "bower_components", "jspm_packages"];
-    var implicitExcludePathRegexPattern = "(?!(" + ts.commonPackageFolders.join("|") + ")(/|$))";
+    var implicitExcludePathRegexPattern = "(?!(".concat(ts.commonPackageFolders.join("|"), ")(/|$))");
     var filesMatcher = {
         singleAsteriskRegexFragment: "([^./]|(\\.(?!min\\.js$))?)*",
-        doubleAsteriskRegexFragment: "(/" + implicitExcludePathRegexPattern + "[^/.][^/]*)*?",
+        doubleAsteriskRegexFragment: "(/".concat(implicitExcludePathRegexPattern, "[^/.][^/]*)*?"),
         replaceWildcardCharacter: function (match) { return replaceWildcardCharacter(match, filesMatcher.singleAsteriskRegexFragment); }
     };
     var directoriesMatcher = {
         singleAsteriskRegexFragment: "[^/]*",
-        doubleAsteriskRegexFragment: "(/" + implicitExcludePathRegexPattern + "[^/.][^/]*)*?",
+        doubleAsteriskRegexFragment: "(/".concat(implicitExcludePathRegexPattern, "[^/.][^/]*)*?"),
         replaceWildcardCharacter: function (match) { return replaceWildcardCharacter(match, directoriesMatcher.singleAsteriskRegexFragment); }
     };
     var excludeMatcher = {
@@ -16119,9 +16133,9 @@ var ts;
         if (!patterns || !patterns.length) {
             return undefined;
         }
-        var pattern = patterns.map(function (pattern) { return "(" + pattern + ")"; }).join("|");
+        var pattern = patterns.map(function (pattern) { return "(".concat(pattern, ")"); }).join("|");
         var terminator = usage === "exclude" ? "($|/)" : "$";
-        return "^(" + pattern + ")" + terminator;
+        return "^(".concat(pattern, ")").concat(terminator);
     }
     ts.getRegularExpressionForWildcard = getRegularExpressionForWildcard;
     function getRegularExpressionsForWildcards(specs, basePath, usage) {
@@ -16139,7 +16153,7 @@ var ts;
     ts.isImplicitGlob = isImplicitGlob;
     function getPatternFromSpec(spec, basePath, usage) {
         var pattern = spec && getSubPatternFromSpec(spec, basePath, usage, wildcardMatchers[usage]);
-        return pattern && "^(" + pattern + ")" + (usage === "exclude" ? "($|/)" : "$");
+        return pattern && "^(".concat(pattern, ")").concat(usage === "exclude" ? "($|/)" : "$");
     }
     ts.getPatternFromSpec = getPatternFromSpec;
     function getSubPatternFromSpec(spec, basePath, usage, _a) {
@@ -16205,7 +16219,7 @@ var ts;
         currentDirectory = ts.normalizePath(currentDirectory);
         var absolutePath = ts.combinePaths(currentDirectory, path);
         return {
-            includeFilePatterns: ts.map(getRegularExpressionsForWildcards(includes, absolutePath, "files"), function (pattern) { return "^" + pattern + "$"; }),
+            includeFilePatterns: ts.map(getRegularExpressionsForWildcards(includes, absolutePath, "files"), function (pattern) { return "^".concat(pattern, "$"); }),
             includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
             includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
             excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
@@ -16451,7 +16465,7 @@ var ts;
     ts.resolutionExtensionIsTSOrJson = resolutionExtensionIsTSOrJson;
     function extensionFromPath(path) {
         var ext = tryGetExtensionFromPath(path);
-        return ext !== undefined ? ext : ts.Debug.fail("File " + path + " has unknown extension.");
+        return ext !== undefined ? ext : ts.Debug.fail("File ".concat(path, " has unknown extension."));
     }
     ts.extensionFromPath = extensionFromPath;
     function isAnySupportedFileExtension(path) {
@@ -21062,7 +21076,7 @@ var ts;
             return node;
         }
         function cloneSourceFileWithChanges(source, statements, isDeclarationFile, referencedFiles, typeReferences, hasNoDefaultLib, libReferences) {
-            var node = baseFactory.createBaseSourceFileNode(305);
+            var node = (source.redirectInfo ? Object.create(source.redirectInfo.redirectTarget) : baseFactory.createBaseSourceFileNode(305));
             for (var p in source) {
                 if (p === "emitNode" || ts.hasProperty(node, p) || !ts.hasProperty(source, p))
                     continue;
@@ -21690,7 +21704,7 @@ var ts;
             case 328: return "augments";
             case 329: return "implements";
             default:
-                return ts.Debug.fail("Unsupported kind: " + ts.Debug.formatSyntaxKind(kind));
+                return ts.Debug.fail("Unsupported kind: ".concat(ts.Debug.formatSyntaxKind(kind)));
         }
     }
     var rawTextScanner;
@@ -22017,7 +22031,7 @@ var ts;
             };
             var definedTextGetter_1 = function (path) {
                 var result = textGetter_1(path);
-                return result !== undefined ? result : "/* Input file " + path + " was missing */\r\n";
+                return result !== undefined ? result : "/* Input file ".concat(path, " was missing */\r\n");
             };
             var buildInfo_1;
             var getAndCacheBuildInfo_1 = function (getText) {
@@ -25174,7 +25188,7 @@ var ts;
         function parseIsolatedEntityName(content, languageVersion) {
             initializeState("", content, languageVersion, undefined, 1);
             nextToken();
-            var entityName = parseEntityName(true, false);
+            var entityName = parseEntityName(true);
             var isInvalid = token() === 1 && !parseDiagnostics.length;
             clearState();
             return isInvalid ? entityName : undefined;
@@ -25746,7 +25760,7 @@ var ts;
             for (var _i = 0, viableKeywordSuggestions_1 = viableKeywordSuggestions; _i < viableKeywordSuggestions_1.length; _i++) {
                 var keyword = viableKeywordSuggestions_1[_i];
                 if (expressionText.length > keyword.length + 2 && ts.startsWith(expressionText, keyword)) {
-                    return keyword + " " + expressionText.slice(keyword.length);
+                    return "".concat(keyword, " ").concat(expressionText.slice(keyword.length));
                 }
             }
             return undefined;
@@ -26455,6 +26469,7 @@ var ts;
                     var startPos = scanner.getStartPos();
                     var result = parseListElement(kind, parseElement);
                     if (!result) {
+                        parsingContext = saveParsingContext;
                         return undefined;
                     }
                     list.push(result);
@@ -26504,7 +26519,7 @@ var ts;
             }
             return createMissingList();
         }
-        function parseEntityName(allowReservedWords, allowPrivateIdentifiers, diagnosticMessage) {
+        function parseEntityName(allowReservedWords, diagnosticMessage) {
             var pos = getNodePos();
             var entity = allowReservedWords ? parseIdentifierName(diagnosticMessage) : parseIdentifier(diagnosticMessage);
             var dotPos = getNodePos();
@@ -26514,7 +26529,7 @@ var ts;
                     break;
                 }
                 dotPos = getNodePos();
-                entity = finishNode(factory.createQualifiedName(entity, parseRightSideOfDot(allowReservedWords, allowPrivateIdentifiers)), pos);
+                entity = finishNode(factory.createQualifiedName(entity, parseRightSideOfDot(allowReservedWords, false)), pos);
             }
             return entity;
         }
@@ -26617,7 +26632,7 @@ var ts;
             return finishNode(node, pos);
         }
         function parseEntityNameOfTypeReference() {
-            return parseEntityName(true, false, ts.Diagnostics.Type_expected);
+            return parseEntityName(true, ts.Diagnostics.Type_expected);
         }
         function parseTypeArgumentsOfTypeReference() {
             if (!scanner.hasPrecedingLineBreak() && reScanLessThanToken() === 29) {
@@ -26731,7 +26746,7 @@ var ts;
         function parseTypeQuery() {
             var pos = getNodePos();
             parseExpected(112);
-            var entityName = parseEntityName(true, true);
+            var entityName = parseEntityName(true);
             var typeArguments = !scanner.hasPrecedingLineBreak() ? tryParseTypeArguments() : undefined;
             return finishNode(factory.createTypeQueryNode(entityName, typeArguments), pos);
         }
@@ -27566,10 +27581,10 @@ var ts;
                 setDecoratorContext(false);
             }
             var pos = getNodePos();
-            var expr = parseAssignmentExpressionOrHigher(false);
+            var expr = parseAssignmentExpressionOrHigher();
             var operatorToken;
             while ((operatorToken = parseOptionalToken(27))) {
-                expr = makeBinaryExpression(expr, operatorToken, parseAssignmentExpressionOrHigher(false), pos);
+                expr = makeBinaryExpression(expr, operatorToken, parseAssignmentExpressionOrHigher(), pos);
             }
             if (saveDecoratorContext) {
                 setDecoratorContext(true);
@@ -27577,23 +27592,23 @@ var ts;
             return expr;
         }
         function parseInitializer() {
-            return parseOptional(63) ? parseAssignmentExpressionOrHigher(false) : undefined;
+            return parseOptional(63) ? parseAssignmentExpressionOrHigher() : undefined;
         }
-        function parseAssignmentExpressionOrHigher(disallowReturnTypeInArrowFunction) {
+        function parseAssignmentExpressionOrHigher() {
             if (isYieldExpression()) {
                 return parseYieldExpression();
             }
-            var arrowExpression = tryParseParenthesizedArrowFunctionExpression(disallowReturnTypeInArrowFunction) || tryParseAsyncSimpleArrowFunctionExpression(disallowReturnTypeInArrowFunction);
+            var arrowExpression = tryParseParenthesizedArrowFunctionExpression() || tryParseAsyncSimpleArrowFunctionExpression();
             if (arrowExpression) {
                 return arrowExpression;
             }
             var pos = getNodePos();
             var expr = parseBinaryExpressionOrHigher(0);
             if (expr.kind === 79 && token() === 38) {
-                return parseSimpleArrowFunctionExpression(pos, expr, disallowReturnTypeInArrowFunction, undefined);
+                return parseSimpleArrowFunctionExpression(pos, expr, undefined);
             }
             if (ts.isLeftHandSideExpression(expr) && ts.isAssignmentOperator(reScanGreaterToken())) {
-                return makeBinaryExpression(expr, parseTokenNode(), parseAssignmentExpressionOrHigher(disallowReturnTypeInArrowFunction), pos);
+                return makeBinaryExpression(expr, parseTokenNode(), parseAssignmentExpressionOrHigher(), pos);
             }
             return parseConditionalExpressionRest(expr, pos);
         }
@@ -27615,30 +27630,30 @@ var ts;
             nextToken();
             if (!scanner.hasPrecedingLineBreak() &&
                 (token() === 41 || isStartOfExpression())) {
-                return finishNode(factory.createYieldExpression(parseOptionalToken(41), parseAssignmentExpressionOrHigher(false)), pos);
+                return finishNode(factory.createYieldExpression(parseOptionalToken(41), parseAssignmentExpressionOrHigher()), pos);
             }
             else {
                 return finishNode(factory.createYieldExpression(undefined, undefined), pos);
             }
         }
-        function parseSimpleArrowFunctionExpression(pos, identifier, disallowReturnTypeInArrowFunction, asyncModifier) {
+        function parseSimpleArrowFunctionExpression(pos, identifier, asyncModifier) {
             ts.Debug.assert(token() === 38, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
             var parameter = factory.createParameterDeclaration(undefined, undefined, undefined, identifier, undefined, undefined, undefined);
             finishNode(parameter, identifier.pos);
             var parameters = createNodeArray([parameter], parameter.pos, parameter.end);
             var equalsGreaterThanToken = parseExpectedToken(38);
-            var body = parseArrowFunctionExpressionBody(!!asyncModifier, disallowReturnTypeInArrowFunction);
+            var body = parseArrowFunctionExpressionBody(!!asyncModifier);
             var node = factory.createArrowFunction(asyncModifier, undefined, parameters, undefined, equalsGreaterThanToken, body);
             return addJSDocComment(finishNode(node, pos));
         }
-        function tryParseParenthesizedArrowFunctionExpression(disallowReturnTypeInArrowFunction) {
+        function tryParseParenthesizedArrowFunctionExpression() {
             var triState = isParenthesizedArrowFunctionExpression();
             if (triState === 0) {
                 return undefined;
             }
             return triState === 1 ?
-                parseParenthesizedArrowFunctionExpression(true, false) :
-                tryParse(function () { return parsePossibleParenthesizedArrowFunctionExpression(disallowReturnTypeInArrowFunction); });
+                parseParenthesizedArrowFunctionExpression(true) :
+                tryParse(parsePossibleParenthesizedArrowFunctionExpression);
         }
         function isParenthesizedArrowFunctionExpression() {
             if (token() === 20 || token() === 29 || token() === 131) {
@@ -27680,6 +27695,9 @@ var ts;
                     return 1;
                 }
                 if (ts.isModifierKind(second) && second !== 131 && lookAhead(nextTokenIsIdentifier)) {
+                    if (lookAhead(function () { return nextToken() === 127; })) {
+                        return 0;
+                    }
                     return 1;
                 }
                 if (!isIdentifier() && second !== 108) {
@@ -27732,24 +27750,24 @@ var ts;
                 return 2;
             }
         }
-        function parsePossibleParenthesizedArrowFunctionExpression(disallowReturnTypeInArrowFunction) {
+        function parsePossibleParenthesizedArrowFunctionExpression() {
             var tokenPos = scanner.getTokenPos();
             if (notParenthesizedArrow === null || notParenthesizedArrow === void 0 ? void 0 : notParenthesizedArrow.has(tokenPos)) {
                 return undefined;
             }
-            var result = parseParenthesizedArrowFunctionExpression(false, disallowReturnTypeInArrowFunction);
+            var result = parseParenthesizedArrowFunctionExpression(false);
             if (!result) {
                 (notParenthesizedArrow || (notParenthesizedArrow = new ts.Set())).add(tokenPos);
             }
             return result;
         }
-        function tryParseAsyncSimpleArrowFunctionExpression(disallowReturnTypeInArrowFunction) {
+        function tryParseAsyncSimpleArrowFunctionExpression() {
             if (token() === 131) {
                 if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1) {
                     var pos = getNodePos();
                     var asyncModifier = parseModifiersForArrowFunction();
                     var expr = parseBinaryExpressionOrHigher(0);
-                    return parseSimpleArrowFunctionExpression(pos, expr, disallowReturnTypeInArrowFunction, asyncModifier);
+                    return parseSimpleArrowFunctionExpression(pos, expr, asyncModifier);
                 }
             }
             return undefined;
@@ -27767,7 +27785,7 @@ var ts;
             }
             return 0;
         }
-        function parseParenthesizedArrowFunctionExpression(allowAmbiguity, disallowReturnTypeInArrowFunction) {
+        function parseParenthesizedArrowFunctionExpression(allowAmbiguity) {
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             var modifiers = parseModifiersForArrowFunction();
@@ -27795,9 +27813,6 @@ var ts;
                     return undefined;
                 }
             }
-            if (disallowReturnTypeInArrowFunction && token() === 58) {
-                return undefined;
-            }
             var type = parseReturnType(58, false);
             if (type && !allowAmbiguity && typeHasArrowFunctionBlockingParseError(type)) {
                 return undefined;
@@ -27813,12 +27828,12 @@ var ts;
             var lastToken = token();
             var equalsGreaterThanToken = parseExpectedToken(38);
             var body = (lastToken === 38 || lastToken === 18)
-                ? parseArrowFunctionExpressionBody(ts.some(modifiers, ts.isAsyncModifier), disallowReturnTypeInArrowFunction)
+                ? parseArrowFunctionExpressionBody(ts.some(modifiers, ts.isAsyncModifier))
                 : parseIdentifier();
             var node = factory.createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body);
             return withJSDoc(finishNode(node, pos), hasJSDoc);
         }
-        function parseArrowFunctionExpressionBody(isAsync, disallowReturnTypeInArrowFunction) {
+        function parseArrowFunctionExpressionBody(isAsync) {
             if (token() === 18) {
                 return parseFunctionBlock(isAsync ? 2 : 0);
             }
@@ -27832,8 +27847,8 @@ var ts;
             var savedTopLevel = topLevel;
             topLevel = false;
             var node = isAsync
-                ? doInAwaitContext(function () { return parseAssignmentExpressionOrHigher(disallowReturnTypeInArrowFunction); })
-                : doOutsideOfAwaitContext(function () { return parseAssignmentExpressionOrHigher(disallowReturnTypeInArrowFunction); });
+                ? doInAwaitContext(parseAssignmentExpressionOrHigher)
+                : doOutsideOfAwaitContext(parseAssignmentExpressionOrHigher);
             topLevel = savedTopLevel;
             return node;
         }
@@ -27843,8 +27858,8 @@ var ts;
                 return leftOperand;
             }
             var colonToken;
-            return finishNode(factory.createConditionalExpression(leftOperand, questionToken, doOutsideOfContext(disallowInAndDecoratorContext, function () { return parseAssignmentExpressionOrHigher(true); }), colonToken = parseExpectedToken(58), ts.nodeIsPresent(colonToken)
-                ? parseAssignmentExpressionOrHigher(true)
+            return finishNode(factory.createConditionalExpression(leftOperand, questionToken, doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher), colonToken = parseExpectedToken(58), ts.nodeIsPresent(colonToken)
+                ? parseAssignmentExpressionOrHigher()
                 : createMissingNode(79, false, ts.Diagnostics._0_expected, ts.tokenToString(58))), pos);
         }
         function parseBinaryExpressionOrHigher(precedence) {
@@ -28495,13 +28510,13 @@ var ts;
         function parseSpreadElement() {
             var pos = getNodePos();
             parseExpected(25);
-            var expression = parseAssignmentExpressionOrHigher(false);
+            var expression = parseAssignmentExpressionOrHigher();
             return finishNode(factory.createSpreadElement(expression), pos);
         }
         function parseArgumentOrArrayLiteralElement() {
             return token() === 25 ? parseSpreadElement() :
                 token() === 27 ? finishNode(factory.createOmittedExpression(), getNodePos()) :
-                    parseAssignmentExpressionOrHigher(false);
+                    parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
@@ -28519,7 +28534,7 @@ var ts;
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             if (parseOptionalToken(25)) {
-                var expression = parseAssignmentExpressionOrHigher(false);
+                var expression = parseAssignmentExpressionOrHigher();
                 return withJSDoc(finishNode(factory.createSpreadAssignment(expression), pos), hasJSDoc);
             }
             var decorators = parseDecorators();
@@ -28542,13 +28557,13 @@ var ts;
             var isShorthandPropertyAssignment = tokenIsIdentifier && (token() !== 58);
             if (isShorthandPropertyAssignment) {
                 var equalsToken = parseOptionalToken(63);
-                var objectAssignmentInitializer = equalsToken ? allowInAnd(function () { return parseAssignmentExpressionOrHigher(false); }) : undefined;
+                var objectAssignmentInitializer = equalsToken ? allowInAnd(parseAssignmentExpressionOrHigher) : undefined;
                 node = factory.createShorthandPropertyAssignment(name, objectAssignmentInitializer);
                 node.equalsToken = equalsToken;
             }
             else {
                 parseExpected(58);
-                var initializer = allowInAnd(function () { return parseAssignmentExpressionOrHigher(false); });
+                var initializer = allowInAnd(parseAssignmentExpressionOrHigher);
                 node = factory.createPropertyAssignment(name, initializer);
             }
             node.decorators = decorators;
@@ -28708,7 +28723,7 @@ var ts;
             }
             var node;
             if (awaitToken ? parseExpected(160) : parseOptional(160)) {
-                var expression = allowInAnd(function () { return parseAssignmentExpressionOrHigher(false); });
+                var expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(21);
                 node = factory.createForOfStatement(awaitToken, initializer, expression, parseStatement());
             }
@@ -29746,7 +29761,7 @@ var ts;
             var pos = getNodePos();
             var name = ts.tokenIsIdentifierOrKeyword(token()) ? parseIdentifierName() : parseLiteralLikeNode(10);
             parseExpected(58);
-            var value = parseAssignmentExpressionOrHigher(false);
+            var value = parseAssignmentExpressionOrHigher();
             return finishNode(factory.createAssertEntry(name, value), pos);
         }
         function parseAssertClause(skipAssertKeyword) {
@@ -29796,7 +29811,7 @@ var ts;
         function parseModuleReference() {
             return isExternalModuleReference()
                 ? parseExternalModuleReference()
-                : parseEntityName(false, false);
+                : parseEntityName(false);
         }
         function parseExternalModuleReference() {
             var pos = getNodePos();
@@ -29940,7 +29955,7 @@ var ts;
             else {
                 parseExpected(88);
             }
-            var expression = parseAssignmentExpressionOrHigher(false);
+            var expression = parseAssignmentExpressionOrHigher();
             parseSemicolon();
             setAwaitContext(savedAwaitContext);
             var node = factory.createExportAssignment(decorators, modifiers, isExportEquals, expression);
@@ -29978,7 +29993,7 @@ var ts;
                 var pos = getNodePos();
                 var hasBrace = parseOptional(18);
                 var p2 = getNodePos();
-                var entityName = parseEntityName(false, false);
+                var entityName = parseEntityName(false);
                 while (token() === 80) {
                     reScanHashToken();
                     nextTokenJSDoc();
@@ -30380,7 +30395,7 @@ var ts;
                     skipWhitespace();
                     var p2 = getNodePos();
                     var name = ts.tokenIsIdentifierOrKeyword(token())
-                        ? parseEntityName(true, false)
+                        ? parseEntityName(true)
                         : undefined;
                     if (name) {
                         while (token() === 80) {
@@ -31287,7 +31302,7 @@ var ts;
         if (namedArgRegExCache.has(name)) {
             return namedArgRegExCache.get(name);
         }
-        var result = new RegExp("(\\s" + name + "\\s*=\\s*)(?:(?:'([^']*)')|(?:\"([^\"]*)\"))", "im");
+        var result = new RegExp("(\\s".concat(name, "\\s*=\\s*)(?:(?:'([^']*)')|(?:\"([^\"]*)\"))"), "im");
         namedArgRegExCache.set(name, result);
         return result;
     }
@@ -31468,6 +31483,7 @@ var ts;
         ["es2021.intl", "lib.es2021.intl.d.ts"],
         ["es2022.array", "lib.es2022.array.d.ts"],
         ["es2022.error", "lib.es2022.error.d.ts"],
+        ["es2022.intl", "lib.es2022.intl.d.ts"],
         ["es2022.object", "lib.es2022.object.d.ts"],
         ["es2022.string", "lib.es2022.string.d.ts"],
         ["esnext.array", "lib.es2022.array.d.ts"],
@@ -32724,8 +32740,8 @@ var ts;
     }
     ts.createCompilerDiagnosticForInvalidCustomType = createCompilerDiagnosticForInvalidCustomType;
     function createDiagnosticForInvalidCustomType(opt, createDiagnostic) {
-        var namesOfType = ts.arrayFrom(opt.type.keys()).map(function (key) { return "'" + key + "'"; }).join(", ");
-        return createDiagnostic(ts.Diagnostics.Argument_for_0_option_must_be_Colon_1, "--" + opt.name, namesOfType);
+        var namesOfType = ts.arrayFrom(opt.type.keys()).map(function (key) { return "'".concat(key, "'"); }).join(", ");
+        return createDiagnostic(ts.Diagnostics.Argument_for_0_option_must_be_Colon_1, "--".concat(opt.name), namesOfType);
     }
     function parseCustomTypeOption(opt, value, errors) {
         return convertJsonOptionOfCustomType(opt, ts.trimString(value || ""), errors);
@@ -33442,10 +33458,10 @@ var ts;
                 var newValue = compilerOptionsMap.get(cmd.name);
                 var defaultValue = getDefaultValueForOption(cmd);
                 if (newValue !== defaultValue) {
-                    result.push("" + tab + cmd.name + ": " + newValue);
+                    result.push("".concat(tab).concat(cmd.name, ": ").concat(newValue));
                 }
                 else if (ts.hasProperty(ts.defaultInitCompilerOptions, cmd.name)) {
-                    result.push("" + tab + cmd.name + ": " + defaultValue);
+                    result.push("".concat(tab).concat(cmd.name, ": ").concat(defaultValue));
                 }
             });
             return result.join(newLine) + newLine;
@@ -33483,19 +33499,19 @@ var ts;
                 if (entries.length !== 0) {
                     entries.push({ value: "" });
                 }
-                entries.push({ value: "/* " + category + " */" });
+                entries.push({ value: "/* ".concat(category, " */") });
                 for (var _i = 0, options_1 = options; _i < options_1.length; _i++) {
                     var option = options_1[_i];
                     var optionName = void 0;
                     if (compilerOptionsMap.has(option.name)) {
-                        optionName = "\"" + option.name + "\": " + JSON.stringify(compilerOptionsMap.get(option.name)) + ((seenKnownKeys += 1) === compilerOptionsMap.size ? "" : ",");
+                        optionName = "\"".concat(option.name, "\": ").concat(JSON.stringify(compilerOptionsMap.get(option.name))).concat((seenKnownKeys += 1) === compilerOptionsMap.size ? "" : ",");
                     }
                     else {
-                        optionName = "// \"" + option.name + "\": " + JSON.stringify(getDefaultValueForOption(option)) + ",";
+                        optionName = "// \"".concat(option.name, "\": ").concat(JSON.stringify(getDefaultValueForOption(option)), ",");
                     }
                     entries.push({
                         value: optionName,
-                        description: "/* " + (option.description && ts.getLocaleSpecificMessage(option.description) || option.name) + " */"
+                        description: "/* ".concat(option.description && ts.getLocaleSpecificMessage(option.description) || option.name, " */")
                     });
                     marginLength = Math.max(optionName.length, marginLength);
                 }
@@ -33503,24 +33519,24 @@ var ts;
             var tab = makePadding(2);
             var result = [];
             result.push("{");
-            result.push(tab + "\"compilerOptions\": {");
-            result.push("" + tab + tab + "/* " + ts.getLocaleSpecificMessage(ts.Diagnostics.Visit_https_Colon_Slash_Slashaka_ms_Slashtsconfig_to_read_more_about_this_file) + " */");
+            result.push("".concat(tab, "\"compilerOptions\": {"));
+            result.push("".concat(tab).concat(tab, "/* ").concat(ts.getLocaleSpecificMessage(ts.Diagnostics.Visit_https_Colon_Slash_Slashaka_ms_Slashtsconfig_to_read_more_about_this_file), " */"));
             result.push("");
             for (var _a = 0, entries_2 = entries; _a < entries_2.length; _a++) {
                 var entry = entries_2[_a];
                 var value = entry.value, _b = entry.description, description = _b === void 0 ? "" : _b;
-                result.push(value && "" + tab + tab + value + (description && (makePadding(marginLength - value.length + 2) + description)));
+                result.push(value && "".concat(tab).concat(tab).concat(value).concat(description && (makePadding(marginLength - value.length + 2) + description)));
             }
             if (fileNames.length) {
-                result.push(tab + "},");
-                result.push(tab + "\"files\": [");
+                result.push("".concat(tab, "},"));
+                result.push("".concat(tab, "\"files\": ["));
                 for (var i = 0; i < fileNames.length; i++) {
-                    result.push("" + tab + tab + JSON.stringify(fileNames[i]) + (i === fileNames.length - 1 ? "" : ","));
+                    result.push("".concat(tab).concat(tab).concat(JSON.stringify(fileNames[i])).concat(i === fileNames.length - 1 ? "" : ","));
                 }
-                result.push(tab + "]");
+                result.push("".concat(tab, "]"));
             }
             else {
-                result.push(tab + "}");
+                result.push("".concat(tab, "}"));
             }
             result.push("}");
             return result.join(newLine) + newLine;
@@ -33873,7 +33889,7 @@ var ts;
         if (ts.isRootedDiskPath(extendedConfig) || ts.startsWith(extendedConfig, "./") || ts.startsWith(extendedConfig, "../")) {
             var extendedConfigPath = ts.getNormalizedAbsolutePath(extendedConfig, basePath);
             if (!host.fileExists(extendedConfigPath) && !ts.endsWith(extendedConfigPath, ".json")) {
-                extendedConfigPath = extendedConfigPath + ".json";
+                extendedConfigPath = "".concat(extendedConfigPath, ".json");
                 if (!host.fileExists(extendedConfigPath)) {
                     errors.push(createDiagnostic(ts.Diagnostics.File_0_not_found, extendedConfig));
                     return undefined;
@@ -34069,7 +34085,7 @@ var ts;
                 if (ts.fileExtensionIs(file, ".json")) {
                     if (!jsonOnlyIncludeRegexes) {
                         var includes = validatedIncludeSpecs.filter(function (s) { return ts.endsWith(s, ".json"); });
-                        var includeFilePatterns = ts.map(ts.getRegularExpressionsForWildcards(includes, basePath, "files"), function (pattern) { return "^" + pattern + "$"; });
+                        var includeFilePatterns = ts.map(ts.getRegularExpressionsForWildcards(includes, basePath, "files"), function (pattern) { return "^".concat(pattern, "$"); });
                         jsonOnlyIncludeRegexes = includeFilePatterns ? includeFilePatterns.map(function (pattern) { return ts.getRegexFromPattern(pattern, host.useCaseSensitiveFileNames); }) : ts.emptyArray;
                     }
                     var includeIndex = ts.findIndex(jsonOnlyIncludeRegexes, function (re) { return re.test(file); });
@@ -34297,7 +34313,7 @@ var ts;
                 return true;
             case "string":
                 var defaultValue = option.defaultValueDescription;
-                return option.isFilePath ? "./" + (defaultValue && typeof defaultValue === "string" ? defaultValue : "") : "";
+                return option.isFilePath ? "./".concat(defaultValue && typeof defaultValue === "string" ? defaultValue : "") : "";
             case "list":
                 return [];
             case "object":
@@ -34359,7 +34375,7 @@ var ts;
         ts.Debug.assert(ts.extensionIsTS(resolved.extension));
         return { fileName: resolved.path, packageId: resolved.packageId };
     }
-    function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations, resultFromCache) {
+    function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations, diagnostics, resultFromCache) {
         var _a;
         if (resultFromCache) {
             (_a = resultFromCache.failedLookupLocations).push.apply(_a, failedLookupLocations);
@@ -34367,7 +34383,8 @@ var ts;
         }
         return {
             resolvedModule: resolved && { resolvedFileName: resolved.path, originalPath: resolved.originalPath === true ? undefined : resolved.originalPath, extension: resolved.extension, isExternalLibraryImport: isExternalLibraryImport, packageId: resolved.packageId },
-            failedLookupLocations: failedLookupLocations
+            failedLookupLocations: failedLookupLocations,
+            resolutionDiagnostics: diagnostics
         };
     }
     function readPackageJsonField(jsonContent, fieldName, typeOfTag, state) {
@@ -34443,7 +34460,7 @@ var ts;
         var bestVersionKey = result.version, bestVersionPaths = result.paths;
         if (typeof bestVersionPaths !== "object") {
             if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_1_got_2, "typesVersions['" + bestVersionKey + "']", "object", typeof bestVersionPaths);
+                trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_1_got_2, "typesVersions['".concat(bestVersionKey, "']"), "object", typeof bestVersionPaths);
             }
             return;
         }
@@ -34548,7 +34565,18 @@ var ts;
             features |= NodeResolutionFeatures.EsmMode;
         }
         var conditions = features & NodeResolutionFeatures.Exports ? features & NodeResolutionFeatures.EsmMode ? ["node", "import", "types"] : ["node", "require", "types"] : [];
-        var moduleResolutionState = { compilerOptions: options, host: host, traceEnabled: traceEnabled, failedLookupLocations: failedLookupLocations, packageJsonInfoCache: cache, features: features, conditions: conditions };
+        var diagnostics = [];
+        var moduleResolutionState = {
+            compilerOptions: options,
+            host: host,
+            traceEnabled: traceEnabled,
+            failedLookupLocations: failedLookupLocations,
+            packageJsonInfoCache: cache,
+            features: features,
+            conditions: conditions,
+            requestContainingDirectory: containingDirectory,
+            reportDiagnostic: function (diag) { return void diagnostics.push(diag); },
+        };
         var resolved = primaryLookup();
         var primary = true;
         if (!resolved) {
@@ -34567,7 +34595,7 @@ var ts;
                 isExternalLibraryImport: pathContainsNodeModules(fileName),
             };
         }
-        result = { resolvedTypeReferenceDirective: resolvedTypeReferenceDirective, failedLookupLocations: failedLookupLocations };
+        result = { resolvedTypeReferenceDirective: resolvedTypeReferenceDirective, failedLookupLocations: failedLookupLocations, resolutionDiagnostics: diagnostics };
         perFolderCache === null || perFolderCache === void 0 ? void 0 : perFolderCache.set(typeReferenceDirectiveName, resolutionMode, result);
         if (traceEnabled)
             traceResult(result);
@@ -34644,6 +34672,8 @@ var ts;
             packageJsonInfoCache: cache === null || cache === void 0 ? void 0 : cache.getPackageJsonInfoCache(),
             conditions: ts.emptyArray,
             features: NodeResolutionFeatures.None,
+            requestContainingDirectory: containingDirectory,
+            reportDiagnostic: ts.noop
         };
         return ts.forEachAncestorDirectory(containingDirectory, function (ancestorDirectory) {
             if (ts.getBaseFileName(ancestorDirectory) !== "node_modules") {
@@ -34817,7 +34847,7 @@ var ts;
         };
         return cache;
         function getUnderlyingCacheKey(specifier, mode) {
-            var result = mode === undefined ? specifier : mode + "|" + specifier;
+            var result = mode === undefined ? specifier : "".concat(mode, "|").concat(specifier);
             memoizedReverseKeys.set(result, [specifier, mode]);
             return result;
         }
@@ -34850,7 +34880,7 @@ var ts;
         }
         function getOrCreateCacheForModuleName(nonRelativeModuleName, mode, redirectedReference) {
             ts.Debug.assert(!ts.isExternalModuleNameRelative(nonRelativeModuleName));
-            return getOrCreateCache(moduleNameToDirectoryMap, redirectedReference, mode === undefined ? nonRelativeModuleName : mode + "|" + nonRelativeModuleName, createPerModuleNameCache);
+            return getOrCreateCache(moduleNameToDirectoryMap, redirectedReference, mode === undefined ? nonRelativeModuleName : "".concat(mode, "|").concat(nonRelativeModuleName), createPerModuleNameCache);
         }
         function createPerModuleNameCache() {
             var directoryPathMap = new ts.Map();
@@ -34978,10 +35008,10 @@ var ts;
                     result = classicNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
                     break;
                 default:
-                    return ts.Debug.fail("Unexpected moduleResolution: " + moduleResolution);
+                    return ts.Debug.fail("Unexpected moduleResolution: ".concat(moduleResolution));
             }
             if (result && result.resolvedModule)
-                ts.perfLogger.logInfoEvent("Module \"" + moduleName + "\" resolved to \"" + result.resolvedModule.resolvedFileName + "\"");
+                ts.perfLogger.logInfoEvent("Module \"".concat(moduleName, "\" resolved to \"").concat(result.resolvedModule.resolvedFileName, "\""));
             ts.perfLogger.logStopResolveModule((result && result.resolvedModule) ? "" + result.resolvedModule.resolvedFileName : "null");
             if (perFolderCache) {
                 perFolderCache.set(moduleName, resolutionMode, result);
@@ -35111,7 +35141,7 @@ var ts;
     function resolveJSModule(moduleName, initialDir, host) {
         var _a = tryResolveJSModuleWorker(moduleName, initialDir, host), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
         if (!resolvedModule) {
-            throw new Error("Could not resolve JS module '" + moduleName + "' starting at '" + initialDir + "'. Looked in: " + failedLookupLocations.join(", "));
+            throw new Error("Could not resolve JS module '".concat(moduleName, "' starting at '").concat(initialDir, "'. Looked in: ").concat(failedLookupLocations.join(", ")));
         }
         return resolvedModule.resolvedFileName;
     }
@@ -35172,6 +35202,7 @@ var ts;
         if (compilerOptions.noDtsResolution) {
             conditions.pop();
         }
+        var diagnostics = [];
         var state = {
             compilerOptions: compilerOptions,
             host: host,
@@ -35180,9 +35211,11 @@ var ts;
             packageJsonInfoCache: cache,
             features: features,
             conditions: conditions,
+            requestContainingDirectory: containingDirectory,
+            reportDiagnostic: function (diag) { return void diagnostics.push(diag); },
         };
         var result = ts.forEach(extensions, function (ext) { return tryResolve(ext); });
-        return createResolvedModuleWithFailedLookupLocations((_a = result === null || result === void 0 ? void 0 : result.value) === null || _a === void 0 ? void 0 : _a.resolved, (_b = result === null || result === void 0 ? void 0 : result.value) === null || _b === void 0 ? void 0 : _b.isExternalLibraryImport, failedLookupLocations, state.resultFromCache);
+        return createResolvedModuleWithFailedLookupLocations((_a = result === null || result === void 0 ? void 0 : result.value) === null || _a === void 0 ? void 0 : _a.resolved, (_b = result === null || result === void 0 ? void 0 : result.value) === null || _b === void 0 ? void 0 : _b.isExternalLibraryImport, failedLookupLocations, diagnostics, state.resultFromCache);
         function tryResolve(extensions) {
             var loader = function (extensions, candidate, onlyRecordFailures, state) { return nodeLoadModuleByRelativeName(extensions, candidate, onlyRecordFailures, state, true); };
             var resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loader, state);
@@ -35235,7 +35268,7 @@ var ts;
         if (traceEnabled) {
             trace(host, ts.Diagnostics.Resolving_real_path_for_0_result_1, path, real);
         }
-        ts.Debug.assert(host.fileExists(real), path + " linked to nonexistent file " + real);
+        ts.Debug.assert(host.fileExists(real), "".concat(path, " linked to nonexistent file ").concat(real));
         return real;
     }
     function nodeLoadModuleByRelativeName(extensions, candidate, onlyRecordFailures, state, considerPackageJson) {
@@ -35324,9 +35357,9 @@ var ts;
         }
     }
     function loadJSOrExactTSFileName(extensions, candidate, onlyRecordFailures, state) {
-        if ((extensions === Extensions.TypeScript || extensions === Extensions.DtsOnly) && ts.isDeclarationFileName(candidate)) {
+        if ((extensions === Extensions.TypeScript || extensions === Extensions.DtsOnly) && ts.fileExtensionIsOneOf(candidate, ts.supportedTSExtensionsFlat)) {
             var result = tryFile(candidate, onlyRecordFailures, state);
-            return result !== undefined ? { path: candidate, ext: ts.forEach(ts.supportedDeclarationExtensions, function (e) { return ts.fileExtensionIs(candidate, e) ? e : undefined; }) } : undefined;
+            return result !== undefined ? { path: candidate, ext: ts.tryExtractTSExtension(candidate) } : undefined;
         }
         return loadModuleFromFileNoImplicitExtensions(extensions, candidate, onlyRecordFailures, state);
     }
@@ -35443,6 +35476,8 @@ var ts;
             packageJsonInfoCache: cache === null || cache === void 0 ? void 0 : cache.getPackageJsonInfoCache(),
             conditions: ["node", "require", "types"],
             features: features,
+            requestContainingDirectory: packageJsonInfo.packageDirectory,
+            reportDiagnostic: ts.noop
         };
         var requireResolution = loadNodeModuleFromDirectoryWorker(extensions, packageJsonInfo.packageDirectory, false, requireState, packageJsonInfo.packageJsonContent, packageJsonInfo.versionPaths);
         entrypoints = ts.append(entrypoints, requireResolution === null || requireResolution === void 0 ? void 0 : requireResolution.path);
@@ -35522,6 +35557,8 @@ var ts;
             packageJsonInfoCache: packageJsonInfoCache,
             features: 0,
             conditions: [],
+            requestContainingDirectory: undefined,
+            reportDiagnostic: ts.noop
         };
         var parts = ts.getPathComponents(fileName);
         parts.pop();
@@ -35690,7 +35727,7 @@ var ts;
             return undefined;
         }
         var trailingParts = parts.slice(nameParts.length);
-        return loadModuleFromExports(scope, extensions, !ts.length(trailingParts) ? "." : "." + ts.directorySeparator + trailingParts.join(ts.directorySeparator), state, cache, redirectedReference);
+        return loadModuleFromExports(scope, extensions, !ts.length(trailingParts) ? "." : ".".concat(ts.directorySeparator).concat(trailingParts.join(ts.directorySeparator)), state, cache, redirectedReference);
     }
     function loadModuleFromExports(scope, extensions, subpath, state, cache, redirectedReference) {
         if (!scope.packageJsonContent.exports) {
@@ -35796,7 +35833,6 @@ var ts;
     function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports) {
         return loadModuleFromTargetImportOrExport;
         function loadModuleFromTargetImportOrExport(target, subpath, pattern) {
-            var _a, _b;
             if (typeof target === "string") {
                 if (!pattern && subpath.length > 0 && !ts.endsWith(target, "/")) {
                     if (state.traceEnabled) {
@@ -35831,13 +35867,16 @@ var ts;
                     }
                     return toSearchResult(undefined);
                 }
-                var finalPath = ts.getNormalizedAbsolutePath(pattern ? resolvedTarget.replace(/\*/g, subpath) : resolvedTarget + subpath, (_b = (_a = state.host).getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(_a));
+                var finalPath = toAbsolutePath(pattern ? resolvedTarget.replace(/\*/g, subpath) : resolvedTarget + subpath);
+                var inputLink = tryLoadInputFileForPath(finalPath, subpath, ts.combinePaths(scope.packageDirectory, "package.json"), isImports);
+                if (inputLink)
+                    return inputLink;
                 return toSearchResult(withPackageId(scope, loadJSOrExactTSFileName(extensions, finalPath, false, state)));
             }
             else if (typeof target === "object" && target !== null) {
                 if (!Array.isArray(target)) {
-                    for (var _i = 0, _c = ts.getOwnKeys(target); _i < _c.length; _i++) {
-                        var key = _c[_i];
+                    for (var _i = 0, _a = ts.getOwnKeys(target); _i < _a.length; _i++) {
+                        var key = _a[_i];
                         if (key === "default" || state.conditions.indexOf(key) >= 0 || isApplicableVersionedTypesKey(state.conditions, key)) {
                             var subTarget = target[key];
                             var result = loadModuleFromTargetImportOrExport(subTarget, subpath, pattern);
@@ -35855,8 +35894,8 @@ var ts;
                         }
                         return toSearchResult(undefined);
                     }
-                    for (var _d = 0, target_2 = target; _d < target_2.length; _d++) {
-                        var elem = target_2[_d];
+                    for (var _b = 0, target_2 = target; _b < target_2.length; _b++) {
+                        var elem = target_2[_b];
                         var result = loadModuleFromTargetImportOrExport(elem, subpath, pattern);
                         if (result) {
                             return result;
@@ -35874,6 +35913,94 @@ var ts;
                 trace(state.host, ts.Diagnostics.package_json_scope_0_has_invalid_type_for_target_of_specifier_1, scope.packageDirectory, moduleName);
             }
             return toSearchResult(undefined);
+            function toAbsolutePath(path) {
+                var _a, _b;
+                if (path === undefined)
+                    return path;
+                return ts.hostGetCanonicalFileName({ useCaseSensitiveFileNames: useCaseSensitiveFileNames })(ts.getNormalizedAbsolutePath(path, (_b = (_a = state.host).getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(_a)));
+            }
+            function combineDirectoryPath(root, dir) {
+                return ts.ensureTrailingDirectorySeparator(ts.combinePaths(root, dir));
+            }
+            function useCaseSensitiveFileNames() {
+                return !state.host.useCaseSensitiveFileNames ? true :
+                    typeof state.host.useCaseSensitiveFileNames === "boolean" ? state.host.useCaseSensitiveFileNames :
+                        state.host.useCaseSensitiveFileNames();
+            }
+            function tryLoadInputFileForPath(finalPath, entry, packagePath, isImports) {
+                var _a, _b, _c, _d;
+                if ((extensions === Extensions.TypeScript || extensions === Extensions.JavaScript || extensions === Extensions.Json)
+                    && (state.compilerOptions.declarationDir || state.compilerOptions.outDir)
+                    && finalPath.indexOf("/node_modules/") === -1
+                    && (state.compilerOptions.configFile ? ts.startsWith(toAbsolutePath(state.compilerOptions.configFile.fileName), scope.packageDirectory) : true)) {
+                    var getCanonicalFileName = ts.hostGetCanonicalFileName({ useCaseSensitiveFileNames: useCaseSensitiveFileNames });
+                    var commonSourceDirGuesses = [];
+                    if (state.compilerOptions.rootDir || (state.compilerOptions.composite && state.compilerOptions.configFilePath)) {
+                        var commonDir = toAbsolutePath(ts.getCommonSourceDirectory(state.compilerOptions, function () { return []; }, ((_b = (_a = state.host).getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(_a)) || "", getCanonicalFileName));
+                        commonSourceDirGuesses.push(commonDir);
+                    }
+                    else if (state.requestContainingDirectory) {
+                        var requestingFile_1 = toAbsolutePath(ts.combinePaths(state.requestContainingDirectory, "index.ts"));
+                        var commonDir = toAbsolutePath(ts.getCommonSourceDirectory(state.compilerOptions, function () { return [requestingFile_1, toAbsolutePath(packagePath)]; }, ((_d = (_c = state.host).getCurrentDirectory) === null || _d === void 0 ? void 0 : _d.call(_c)) || "", getCanonicalFileName));
+                        commonSourceDirGuesses.push(commonDir);
+                        var fragment = ts.ensureTrailingDirectorySeparator(commonDir);
+                        while (fragment && fragment.length > 1) {
+                            var parts = ts.getPathComponents(fragment);
+                            parts.pop();
+                            var commonDir_1 = ts.getPathFromPathComponents(parts);
+                            commonSourceDirGuesses.unshift(commonDir_1);
+                            fragment = ts.ensureTrailingDirectorySeparator(commonDir_1);
+                        }
+                    }
+                    if (commonSourceDirGuesses.length > 1) {
+                        state.reportDiagnostic(ts.createCompilerDiagnostic(isImports
+                            ? ts.Diagnostics.The_project_root_is_ambiguous_but_is_required_to_resolve_import_map_entry_0_in_file_1_Supply_the_rootDir_compiler_option_to_disambiguate
+                            : ts.Diagnostics.The_project_root_is_ambiguous_but_is_required_to_resolve_export_map_entry_0_in_file_1_Supply_the_rootDir_compiler_option_to_disambiguate, entry === "" ? "." : entry, packagePath));
+                    }
+                    for (var _i = 0, commonSourceDirGuesses_1 = commonSourceDirGuesses; _i < commonSourceDirGuesses_1.length; _i++) {
+                        var commonSourceDirGuess = commonSourceDirGuesses_1[_i];
+                        var candidateDirectories = getOutputDirectoriesForBaseDirectory(commonSourceDirGuess);
+                        for (var _e = 0, candidateDirectories_1 = candidateDirectories; _e < candidateDirectories_1.length; _e++) {
+                            var candidateDir = candidateDirectories_1[_e];
+                            if (ts.startsWith(finalPath, candidateDir)) {
+                                var pathFragment = finalPath.slice(candidateDir.length + 1);
+                                var possibleInputBase = ts.combinePaths(commonSourceDirGuess, pathFragment);
+                                var jsAndDtsExtensions = [".mjs", ".cjs", ".js", ".json", ".d.mts", ".d.cts", ".d.ts"];
+                                for (var _f = 0, jsAndDtsExtensions_1 = jsAndDtsExtensions; _f < jsAndDtsExtensions_1.length; _f++) {
+                                    var ext = jsAndDtsExtensions_1[_f];
+                                    if (ts.fileExtensionIs(possibleInputBase, ext)) {
+                                        var inputExts = ts.getPossibleOriginalInputExtensionForExtension(possibleInputBase);
+                                        for (var _g = 0, inputExts_1 = inputExts; _g < inputExts_1.length; _g++) {
+                                            var possibleExt = inputExts_1[_g];
+                                            var possibleInputWithInputExtension = ts.changeAnyExtension(possibleInputBase, possibleExt, ext, !useCaseSensitiveFileNames());
+                                            if ((extensions === Extensions.TypeScript && ts.hasJSFileExtension(possibleInputWithInputExtension)) ||
+                                                (extensions === Extensions.JavaScript && ts.hasTSFileExtension(possibleInputWithInputExtension))) {
+                                                continue;
+                                            }
+                                            if (state.host.fileExists(possibleInputWithInputExtension)) {
+                                                return toSearchResult(withPackageId(scope, loadJSOrExactTSFileName(extensions, possibleInputWithInputExtension, false, state)));
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                return undefined;
+                function getOutputDirectoriesForBaseDirectory(commonSourceDirGuess) {
+                    var _a, _b;
+                    var currentDir = state.compilerOptions.configFile ? ((_b = (_a = state.host).getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(_a)) || "" : commonSourceDirGuess;
+                    var candidateDirectories = [];
+                    if (state.compilerOptions.declarationDir) {
+                        candidateDirectories.push(toAbsolutePath(combineDirectoryPath(currentDir, state.compilerOptions.declarationDir)));
+                    }
+                    if (state.compilerOptions.outDir && state.compilerOptions.outDir !== state.compilerOptions.declarationDir) {
+                        candidateDirectories.push(toAbsolutePath(combineDirectoryPath(currentDir, state.compilerOptions.outDir)));
+                    }
+                    return candidateDirectories;
+                }
+            }
         }
     }
     function isApplicableVersionedTypesKey(conditions, key) {
@@ -36008,7 +36135,7 @@ var ts;
         return mangled;
     }
     function getTypesPackageName(packageName) {
-        return "@types/" + mangleScopedPackageName(packageName);
+        return "@types/".concat(mangleScopedPackageName(packageName));
     }
     ts.getTypesPackageName = getTypesPackageName;
     function mangleScopedPackageName(packageName) {
@@ -36048,10 +36175,11 @@ var ts;
     function classicNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference) {
         var traceEnabled = isTraceEnabled(compilerOptions, host);
         var failedLookupLocations = [];
-        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, failedLookupLocations: failedLookupLocations, packageJsonInfoCache: cache, features: NodeResolutionFeatures.None, conditions: [] };
         var containingDirectory = ts.getDirectoryPath(containingFile);
+        var diagnostics = [];
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, failedLookupLocations: failedLookupLocations, packageJsonInfoCache: cache, features: NodeResolutionFeatures.None, conditions: [], requestContainingDirectory: containingDirectory, reportDiagnostic: function (diag) { return void diagnostics.push(diag); } };
         var resolved = tryResolve(Extensions.TypeScript) || tryResolve(Extensions.JavaScript);
-        return createResolvedModuleWithFailedLookupLocations(resolved && resolved.value, false, failedLookupLocations, state.resultFromCache);
+        return createResolvedModuleWithFailedLookupLocations(resolved && resolved.value, false, failedLookupLocations, diagnostics, state.resultFromCache);
         function tryResolve(extensions) {
             var resolvedUsingSettings = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loadModuleFromFileNoPackageId, state);
             if (resolvedUsingSettings) {
@@ -36087,9 +36215,10 @@ var ts;
             trace(host, ts.Diagnostics.Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using_cache_location_2, projectName, moduleName, globalCache);
         }
         var failedLookupLocations = [];
-        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, failedLookupLocations: failedLookupLocations, packageJsonInfoCache: packageJsonInfoCache, features: NodeResolutionFeatures.None, conditions: [] };
+        var diagnostics = [];
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, failedLookupLocations: failedLookupLocations, packageJsonInfoCache: packageJsonInfoCache, features: NodeResolutionFeatures.None, conditions: [], requestContainingDirectory: undefined, reportDiagnostic: function (diag) { return void diagnostics.push(diag); } };
         var resolved = loadModuleFromImmediateNodeModulesDirectory(Extensions.DtsOnly, moduleName, globalCache, state, false, undefined, undefined);
-        return createResolvedModuleWithFailedLookupLocations(resolved, true, failedLookupLocations, state.resultFromCache);
+        return createResolvedModuleWithFailedLookupLocations(resolved, true, failedLookupLocations, diagnostics, state.resultFromCache);
     }
     ts.loadModuleFromGlobalCache = loadModuleFromGlobalCache;
     function toSearchResult(value) {
@@ -36334,7 +36463,7 @@ var ts;
             if (name) {
                 if (ts.isAmbientModule(node)) {
                     var moduleName = ts.getTextOfIdentifierOrLiteral(name);
-                    return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + moduleName + "\"");
+                    return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\"".concat(moduleName, "\""));
                 }
                 if (name.kind === 162) {
                     var nameExpression = name.expression;
@@ -36383,7 +36512,7 @@ var ts;
                 case 317:
                     return (ts.isJSDocConstructSignature(node) ? "__new" : "__call");
                 case 164:
-                    ts.Debug.assert(node.parent.kind === 317, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
+                    ts.Debug.assert(node.parent.kind === 317, "Impossible parameter parent kind", function () { return "parent is: ".concat(ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind, ", expected JSDocFunctionType"); });
                     var functionType = node.parent;
                     var index = functionType.parameters.indexOf(node);
                     return "arg" + index;
@@ -36449,7 +36578,7 @@ var ts;
                         }
                         var relatedInformation_1 = [];
                         if (ts.isTypeAliasDeclaration(node) && ts.nodeIsMissing(node.type) && ts.hasSyntacticModifier(node, 1) && symbol.flags & (2097152 | 788968 | 1920)) {
-                            relatedInformation_1.push(createDiagnosticForNode(node, ts.Diagnostics.Did_you_mean_0, "export type { " + ts.unescapeLeadingUnderscores(node.name.escapedText) + " }"));
+                            relatedInformation_1.push(createDiagnosticForNode(node, ts.Diagnostics.Did_you_mean_0, "export type { ".concat(ts.unescapeLeadingUnderscores(node.name.escapedText), " }")));
                         }
                         var declarationName_1 = ts.getNameOfDeclaration(node) || node;
                         ts.forEach(symbol.declarations, function (declaration, index) {
@@ -38273,7 +38402,7 @@ var ts;
             }
         }
         function bindSourceFileAsExternalModule() {
-            bindAnonymousDeclaration(file, 512, "\"" + ts.removeFileExtension(file.fileName) + "\"");
+            bindAnonymousDeclaration(file, 512, "\"".concat(ts.removeFileExtension(file.fileName), "\""));
         }
         function bindExportAssignment(node) {
             if (!container.symbol || !container.symbol.exports) {
@@ -40012,7 +40141,7 @@ var ts;
                 if (sourceSymbolFile && targetSymbolFile && amalgamatedDuplicates && !isEitherEnum && sourceSymbolFile !== targetSymbolFile) {
                     var firstFile_1 = ts.comparePaths(sourceSymbolFile.path, targetSymbolFile.path) === -1 ? sourceSymbolFile : targetSymbolFile;
                     var secondFile_1 = firstFile_1 === sourceSymbolFile ? targetSymbolFile : sourceSymbolFile;
-                    var filesDuplicates = ts.getOrUpdate(amalgamatedDuplicates, firstFile_1.path + "|" + secondFile_1.path, function () {
+                    var filesDuplicates = ts.getOrUpdate(amalgamatedDuplicates, "".concat(firstFile_1.path, "|").concat(secondFile_1.path), function () {
                         return ({ firstFile: firstFile_1, secondFile: secondFile_1, conflictingSymbols: new ts.Map() });
                     });
                     var conflictingSymbolInfo = ts.getOrUpdate(filesDuplicates.conflictingSymbols, symbolName_1, function () {
@@ -42314,7 +42443,7 @@ var ts;
             var links = getSymbolLinks(symbol);
             var cache = (links.accessibleChainCache || (links.accessibleChainCache = new ts.Map()));
             var firstRelevantLocation = forEachSymbolTableInScope(enclosingDeclaration, function (_, __, ___, node) { return node; });
-            var key = (useOnlyExternalAliasing ? 0 : 1) + "|" + (firstRelevantLocation && getNodeId(firstRelevantLocation)) + "|" + meaning;
+            var key = "".concat(useOnlyExternalAliasing ? 0 : 1, "|").concat(firstRelevantLocation && getNodeId(firstRelevantLocation), "|").concat(meaning);
             if (cache.has(key)) {
                 return cache.get(key);
             }
@@ -43118,7 +43247,7 @@ var ts;
                         context.symbolDepth = new ts.Map();
                     }
                     var links = context.enclosingDeclaration && getNodeLinks(context.enclosingDeclaration);
-                    var key = getTypeId(type) + "|" + context.flags;
+                    var key = "".concat(getTypeId(type), "|").concat(context.flags);
                     if (links) {
                         links.serializedTypes || (links.serializedTypes = new ts.Map());
                     }
@@ -43379,7 +43508,7 @@ var ts;
                             }
                         }
                         if (checkTruncationLength(context) && (i + 2 < properties.length - 1)) {
-                            typeElements.push(ts.factory.createPropertySignature(undefined, "... " + (properties.length - i) + " more ...", undefined, undefined));
+                            typeElements.push(ts.factory.createPropertySignature(undefined, "... ".concat(properties.length - i, " more ..."), undefined, undefined));
                             addPropertyToElementList(properties[properties.length - 1], context, typeElements);
                             break;
                         }
@@ -43487,7 +43616,7 @@ var ts;
                         else if (types.length > 2) {
                             return [
                                 typeToTypeNodeHelper(types[0], context),
-                                ts.factory.createTypeReferenceNode("... " + (types.length - 2) + " more ...", undefined),
+                                ts.factory.createTypeReferenceNode("... ".concat(types.length - 2, " more ..."), undefined),
                                 typeToTypeNodeHelper(types[types.length - 1], context)
                             ];
                         }
@@ -43500,7 +43629,7 @@ var ts;
                         var type = types_2[_i];
                         i++;
                         if (checkTruncationLength(context) && (i + 2 < types.length - 1)) {
-                            result_5.push(ts.factory.createTypeReferenceNode("... " + (types.length - i) + " more ...", undefined));
+                            result_5.push(ts.factory.createTypeReferenceNode("... ".concat(types.length - i, " more ..."), undefined));
                             var typeNode_1 = typeToTypeNodeHelper(types[types.length - 1], context);
                             if (typeNode_1) {
                                 result_5.push(typeNode_1);
@@ -43857,7 +43986,7 @@ var ts;
                 }
                 return specifier;
                 function getSpecifierCacheKey(path, mode) {
-                    return mode === undefined ? path : mode + "|" + path;
+                    return mode === undefined ? path : "".concat(mode, "|").concat(path);
                 }
             }
             function symbolToEntityNameNode(symbol) {
@@ -44021,7 +44150,7 @@ var ts;
                     var text = rawtext;
                     while (((_b = context.typeParameterNamesByText) === null || _b === void 0 ? void 0 : _b.has(text)) || typeParameterShadowsNameInScope(text, context, type)) {
                         i++;
-                        text = rawtext + "_" + i;
+                        text = "".concat(rawtext, "_").concat(i);
                     }
                     if (text !== rawtext) {
                         result = ts.factory.createIdentifier(text, result.typeArguments);
@@ -44313,7 +44442,7 @@ var ts;
                     function getNameForJSDocFunctionParameter(p, index) {
                         return p.name && ts.isIdentifier(p.name) && p.name.escapedText === "this" ? "this"
                             : getEffectiveDotDotDotForParameter(p) ? "args"
-                                : "arg" + index;
+                                : "arg".concat(index);
                     }
                     function rewriteModuleSpecifier(parent, lit) {
                         if (bundled) {
@@ -45126,7 +45255,7 @@ var ts;
                             }
                             return results_1;
                         }
-                        return ts.Debug.fail("Unhandled class member kind! " + (p.__debugFlags || p.flags));
+                        return ts.Debug.fail("Unhandled class member kind! ".concat(p.__debugFlags || p.flags));
                     };
                 }
                 function serializePropertySymbolForInterface(p, baseType) {
@@ -45196,7 +45325,7 @@ var ts;
                     if (ref) {
                         return ref;
                     }
-                    var tempName = getUnusedName(rootName + "_base");
+                    var tempName = getUnusedName("".concat(rootName, "_base"));
                     var statement = ts.factory.createVariableStatement(undefined, ts.factory.createVariableDeclarationList([
                         ts.factory.createVariableDeclaration(tempName, undefined, typeToTypeNodeHelper(staticType, context))
                     ], 2));
@@ -45241,7 +45370,7 @@ var ts;
                     var original = input;
                     while ((_a = context.usedSymbolNames) === null || _a === void 0 ? void 0 : _a.has(input)) {
                         i++;
-                        input = original + "_" + i;
+                        input = "".concat(original, "_").concat(i);
                     }
                     (_b = context.usedSymbolNames) === null || _b === void 0 ? void 0 : _b.add(input);
                     if (id) {
@@ -45347,15 +45476,15 @@ var ts;
                 if (nameType.flags & 384) {
                     var name = "" + nameType.value;
                     if (!ts.isIdentifierText(name, ts.getEmitScriptTarget(compilerOptions)) && !ts.isNumericLiteralName(name)) {
-                        return "\"" + ts.escapeString(name, 34) + "\"";
+                        return "\"".concat(ts.escapeString(name, 34), "\"");
                     }
                     if (ts.isNumericLiteralName(name) && ts.startsWith(name, "-")) {
-                        return "[" + name + "]";
+                        return "[".concat(name, "]");
                     }
                     return name;
                 }
                 if (nameType.flags & 8192) {
-                    return "[" + getNameOfSymbolAsWritten(nameType.symbol, context) + "]";
+                    return "[".concat(getNameOfSymbolAsWritten(nameType.symbol, context), "]");
                 }
             }
         }
@@ -47772,7 +47901,7 @@ var ts;
                     !leftName ? rightName :
                         !rightName ? leftName :
                             undefined;
-                var paramSymbol = createSymbol(1 | (isOptional && !isRestParam ? 16777216 : 0), paramName || "arg" + i);
+                var paramSymbol = createSymbol(1 | (isOptional && !isRestParam ? 16777216 : 0), paramName || "arg".concat(i));
                 paramSymbol.type = isRestParam ? createArrayType(unionParamType) : unionParamType;
                 params[i] = paramSymbol;
             }
@@ -47931,7 +48060,8 @@ var ts;
                 if (symbol === globalThisSymbol) {
                     var varsOnly_1 = new ts.Map();
                     members.forEach(function (p) {
-                        if (!(p.flags & 418)) {
+                        var _a;
+                        if (!(p.flags & 418) && !(p.flags & 512 && ((_a = p.declarations) === null || _a === void 0 ? void 0 : _a.length) && ts.every(p.declarations, ts.isAmbientModule))) {
                             varsOnly_1.set(p.escapedName, p);
                         }
                     });
@@ -49497,7 +49627,7 @@ var ts;
             return result;
         }
         function getAliasId(aliasSymbol, aliasTypeArguments) {
-            return aliasSymbol ? "@" + getSymbolId(aliasSymbol) + (aliasTypeArguments ? ":" + getTypeListId(aliasTypeArguments) : "") : "";
+            return aliasSymbol ? "@".concat(getSymbolId(aliasSymbol)) + (aliasTypeArguments ? ":".concat(getTypeListId(aliasTypeArguments)) : "") : "";
         }
         function getPropagatingFlagsOfTypes(types, excludeKinds) {
             var result = 0;
@@ -49660,7 +49790,7 @@ var ts;
             return undefined;
         }
         function getSymbolPath(symbol) {
-            return symbol.parent ? getSymbolPath(symbol.parent) + "." + symbol.escapedName : symbol.escapedName;
+            return symbol.parent ? "".concat(getSymbolPath(symbol.parent), ".").concat(symbol.escapedName) : symbol.escapedName;
         }
         function getUnresolvedSymbolForEntityName(name) {
             var identifier = name.kind === 161 ? name.right :
@@ -49671,7 +49801,7 @@ var ts;
                 var parentSymbol = name.kind === 161 ? getUnresolvedSymbolForEntityName(name.left) :
                     name.kind === 206 ? getUnresolvedSymbolForEntityName(name.expression) :
                         undefined;
-                var path = parentSymbol ? getSymbolPath(parentSymbol) + "." + text : text;
+                var path = parentSymbol ? "".concat(getSymbolPath(parentSymbol), ".").concat(text) : text;
                 var result = unresolvedSymbols.get(path);
                 if (!result) {
                     unresolvedSymbols.set(path, result = createSymbol(524288, text, 1048576));
@@ -49737,7 +49867,7 @@ var ts;
             if (substitute.flags & 3 || substitute === baseType) {
                 return baseType;
             }
-            var id = getTypeId(baseType) + ">" + getTypeId(substitute);
+            var id = "".concat(getTypeId(baseType), ">").concat(getTypeId(substitute));
             var cached = substitutionTypes.get(id);
             if (cached) {
                 return cached;
@@ -50596,9 +50726,9 @@ var ts;
                 return types[0];
             }
             var typeKey = !origin ? getTypeListId(types) :
-                origin.flags & 1048576 ? "|" + getTypeListId(origin.types) :
-                    origin.flags & 2097152 ? "&" + getTypeListId(origin.types) :
-                        "#" + origin.type.id + "|" + getTypeListId(types);
+                origin.flags & 1048576 ? "|".concat(getTypeListId(origin.types)) :
+                    origin.flags & 2097152 ? "&".concat(getTypeListId(origin.types)) :
+                        "#".concat(origin.type.id, "|").concat(getTypeListId(types));
             var id = typeKey + getAliasId(aliasSymbol, aliasTypeArguments);
             var type = unionTypes.get(id);
             if (!type) {
@@ -51056,7 +51186,7 @@ var ts;
             if (ts.every(newTexts, function (t) { return t === ""; }) && ts.every(newTypes, function (t) { return !!(t.flags & 4); })) {
                 return stringType;
             }
-            var id = getTypeListId(newTypes) + "|" + ts.map(newTexts, function (t) { return t.length; }).join(",") + "|" + newTexts.join("");
+            var id = "".concat(getTypeListId(newTypes), "|").concat(ts.map(newTexts, function (t) { return t.length; }).join(","), "|").concat(newTexts.join(""));
             var type = templateLiteralTypes.get(id);
             if (!type) {
                 templateLiteralTypes.set(id, type = createTemplateLiteralType(newTexts, newTypes));
@@ -51127,7 +51257,7 @@ var ts;
             return str;
         }
         function getStringMappingTypeForGenericType(symbol, type) {
-            var id = getSymbolId(symbol) + "," + getTypeId(type);
+            var id = "".concat(getSymbolId(symbol), ",").concat(getTypeId(type));
             var result = stringMappingTypes.get(id);
             if (!result) {
                 stringMappingTypes.set(id, result = createStringMappingType(symbol, type));
@@ -52065,7 +52195,7 @@ var ts;
         function createUniqueESSymbolType(symbol) {
             var type = createType(8192);
             type.symbol = symbol;
-            type.escapedName = "__@" + type.symbol.escapedName + "@" + getSymbolId(type.symbol);
+            type.escapedName = "__@".concat(type.symbol.escapedName, "@").concat(getSymbolId(type.symbol));
             return type;
         }
         function getESSymbolLikeTypeForNode(node) {
@@ -53594,20 +53724,20 @@ var ts;
                     switch (msg.code) {
                         case ts.Diagnostics.Types_of_property_0_are_incompatible.code: {
                             if (path.indexOf("new ") === 0) {
-                                path = "(" + path + ")";
+                                path = "(".concat(path, ")");
                             }
                             var str = "" + args[0];
                             if (path.length === 0) {
-                                path = "" + str;
+                                path = "".concat(str);
                             }
                             else if (ts.isIdentifierText(str, ts.getEmitScriptTarget(compilerOptions))) {
-                                path = path + "." + str;
+                                path = "".concat(path, ".").concat(str);
                             }
                             else if (str[0] === "[" && str[str.length - 1] === "]") {
-                                path = "" + path + str;
+                                path = "".concat(path).concat(str);
                             }
                             else {
-                                path = path + "[" + str + "]";
+                                path = "".concat(path, "[").concat(str, "]");
                             }
                             break;
                         }
@@ -53634,7 +53764,7 @@ var ts;
                                     msg.code === ts.Diagnostics.Construct_signatures_with_no_arguments_have_incompatible_return_types_0_and_1.code)
                                     ? ""
                                     : "...";
-                                path = "" + prefix + path + "(" + params + ")";
+                                path = "".concat(prefix).concat(path, "(").concat(params, ")");
                             }
                             break;
                         }
@@ -53647,7 +53777,7 @@ var ts;
                             break;
                         }
                         default:
-                            return ts.Debug.fail("Unhandled Diagnostic: " + msg.code);
+                            return ts.Debug.fail("Unhandled Diagnostic: ".concat(msg.code));
                     }
                 }
                 if (path) {
@@ -55540,7 +55670,7 @@ var ts;
             var constraintMarker = "";
             var sourceId = getTypeReferenceId(source, 0);
             var targetId = getTypeReferenceId(target, 0);
-            return "" + constraintMarker + sourceId + "," + targetId + postFix;
+            return "".concat(constraintMarker).concat(sourceId, ",").concat(targetId).concat(postFix);
             function getTypeReferenceId(type, depth) {
                 if (depth === void 0) { depth = 0; }
                 var result = "" + type.target.id;
@@ -55576,7 +55706,7 @@ var ts;
             var postFix = intersectionState ? ":" + intersectionState : "";
             return isTypeReferenceWithGenericArguments(source) && isTypeReferenceWithGenericArguments(target) ?
                 getGenericTypeReferenceRelationKey(source, target, postFix, ignoreConstraints) :
-                source.id + "," + target.id + postFix;
+                "".concat(source.id, ",").concat(target.id).concat(postFix);
         }
         function forEachProperty(prop, callback) {
             if (ts.getCheckFlags(prop) & 6) {
@@ -57423,10 +57553,10 @@ var ts;
                 case 79:
                     if (!ts.isThisInTypeQuery(node)) {
                         var symbol = getResolvedSymbol(node);
-                        return symbol !== unknownSymbol ? (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType) + "|" + getSymbolId(symbol) : undefined;
+                        return symbol !== unknownSymbol ? "".concat(flowContainer ? getNodeId(flowContainer) : "-1", "|").concat(getTypeId(declaredType), "|").concat(getTypeId(initialType), "|").concat(getSymbolId(symbol)) : undefined;
                     }
                 case 108:
-                    return "0|" + (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType);
+                    return "0|".concat(flowContainer ? getNodeId(flowContainer) : "-1", "|").concat(getTypeId(declaredType), "|").concat(getTypeId(initialType));
                 case 230:
                 case 212:
                     return getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
@@ -60787,7 +60917,7 @@ var ts;
                     !leftName ? rightName :
                         !rightName ? leftName :
                             undefined;
-                var paramSymbol = createSymbol(1 | (isOptional && !isRestParam ? 16777216 : 0), paramName || "arg" + i);
+                var paramSymbol = createSymbol(1 | (isOptional && !isRestParam ? 16777216 : 0), paramName || "arg".concat(i));
                 paramSymbol.type = isRestParam ? createArrayType(unionParamType) : unionParamType;
                 params[i] = paramSymbol;
             }
@@ -69437,7 +69567,7 @@ var ts;
         function getPropertyNameForKnownSymbolName(symbolName) {
             var ctorType = getGlobalESSymbolConstructorSymbol(false);
             var uniqueType = ctorType && getTypeOfPropertyOfType(getTypeOfSymbol(ctorType), ts.escapeLeadingUnderscores(symbolName));
-            return uniqueType && isTypeUsableAsPropertyName(uniqueType) ? getPropertyNameFromType(uniqueType) : "__@" + symbolName;
+            return uniqueType && isTypeUsableAsPropertyName(uniqueType) ? getPropertyNameFromType(uniqueType) : "__@".concat(symbolName);
         }
         function getIterationTypesOfIterableSlow(type, resolver, errorNode) {
             var _a;
@@ -71086,6 +71216,9 @@ var ts;
                 var validForTypeAssertions = ts.isExclusivelyTypeOnlyImportOrExport(declaration);
                 var override = ts.getResolutionModeOverrideForClause(declaration.assertClause, validForTypeAssertions ? grammarErrorOnNode : undefined);
                 if (validForTypeAssertions && override) {
+                    if (!ts.isNightly()) {
+                        grammarErrorOnNode(declaration.assertClause, ts.Diagnostics.Resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next);
+                    }
                     if (ts.getEmitModuleResolutionKind(compilerOptions) !== ts.ModuleResolutionKind.Node16 && ts.getEmitModuleResolutionKind(compilerOptions) !== ts.ModuleResolutionKind.NodeNext) {
                         return grammarErrorOnNode(declaration.assertClause, ts.Diagnostics.Resolution_modes_are_only_supported_when_moduleResolution_is_node16_or_nodenext);
                     }
@@ -72292,7 +72425,7 @@ var ts;
             }
             if (ts.isDeclaration(node)) {
                 var symbol = getSymbolOfNode(node);
-                return getTypeOfSymbol(symbol);
+                return symbol ? getTypeOfSymbol(symbol) : errorType;
             }
             if (isDeclarationNameOrImportPropertyName(node)) {
                 var symbol = getSymbolAtLocation(node);
@@ -75840,7 +75973,7 @@ var ts;
                 value >= 52 && value < 62 ? 48 + value - 52 :
                     value === 62 ? 43 :
                         value === 63 ? 47 :
-                            ts.Debug.fail(value + ": not a base64 value");
+                            ts.Debug.fail("".concat(value, ": not a base64 value"));
     }
     function base64FormatDecode(ch) {
         return ch >= 65 && ch <= 90 ? ch - 65 :
@@ -75913,7 +76046,7 @@ var ts;
                 var mappings = ts.arrayFrom(decoder, processMapping);
                 if (decoder.error !== undefined) {
                     if (host.log) {
-                        host.log("Encountered error while decoding sourcemap: " + decoder.error);
+                        host.log("Encountered error while decoding sourcemap: ".concat(decoder.error));
                     }
                     decodedMappings = ts.emptyArray;
                 }
@@ -78362,7 +78495,7 @@ var ts;
                 var substitute = typeof constantValue === "string" ? factory.createStringLiteral(constantValue) : factory.createNumericLiteral(constantValue);
                 if (!compilerOptions.removeComments) {
                     var originalNode = ts.getOriginalNode(node, ts.isAccessExpression);
-                    ts.addSyntheticTrailingComment(substitute, 3, " " + safeMultiLineComment(ts.getTextOfNode(originalNode)) + " ");
+                    ts.addSyntheticTrailingComment(substitute, 3, " ".concat(safeMultiLineComment(ts.getTextOfNode(originalNode)), " "));
                 }
                 return substitute;
             }
@@ -79613,8 +79746,8 @@ var ts;
         }
         function createHoistedVariableForClass(name, node) {
             var className = getPrivateIdentifierEnvironment().className;
-            var prefix = className ? "_" + className : "";
-            var identifier = factory.createUniqueName(prefix + "_" + name, 16);
+            var prefix = className ? "_".concat(className) : "";
+            var identifier = factory.createUniqueName("".concat(prefix, "_").concat(name), 16);
             if (resolver.getNodeCheckFlags(node) & 524288) {
                 addBlockScopedVariable(identifier);
             }
@@ -81272,7 +81405,7 @@ var ts;
                 specifierSourceImports = new ts.Map();
                 currentFileState.utilizedImplicitRuntimeImports.set(importSource, specifierSourceImports);
             }
-            var generatedName = factory.createUniqueName("_" + name, 16 | 32 | 64);
+            var generatedName = factory.createUniqueName("_".concat(name), 16 | 32 | 64);
             var specifier = factory.createImportSpecifier(false, factory.createIdentifier(name), generatedName);
             generatedName.generatedImportReference = specifier;
             specifierSourceImports.set(name, specifier);
@@ -82213,11 +82346,11 @@ var ts;
                     }
                     else {
                         if (node.kind === 246) {
-                            labelMarker = "break-" + label.escapedText;
+                            labelMarker = "break-".concat(label.escapedText);
                             setLabeledJump(convertedLoopState, true, ts.idText(label), labelMarker);
                         }
                         else {
-                            labelMarker = "continue-" + label.escapedText;
+                            labelMarker = "continue-".concat(label.escapedText);
                             setLabeledJump(convertedLoopState, false, ts.idText(label), labelMarker);
                         }
                     }
@@ -87872,7 +88005,7 @@ var ts;
             return getTypeAliasDeclarationVisibilityError;
         }
         else {
-            return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.SyntaxKind[node.kind]);
+            return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: ".concat(ts.SyntaxKind[node.kind]));
         }
         function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
             if (node.kind === 254 || node.kind === 203) {
@@ -88069,7 +88202,7 @@ var ts;
                             ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_private_name_1;
                 default:
-                    return ts.Debug.fail("Unknown parent for parameter: " + ts.SyntaxKind[node.parent.kind]);
+                    return ts.Debug.fail("Unknown parent for parameter: ".concat(ts.SyntaxKind[node.parent.kind]));
             }
         }
         function getTypeParameterConstraintVisibilityError() {
@@ -88735,29 +88868,39 @@ var ts;
         }
         function transformImportDeclaration(decl) {
             if (!decl.importClause) {
-                return factory.updateImportDeclaration(decl, undefined, decl.modifiers, decl.importClause, rewriteModuleSpecifier(decl, decl.moduleSpecifier), ts.getResolutionModeOverrideForClause(decl.assertClause) ? decl.assertClause : undefined);
+                return factory.updateImportDeclaration(decl, undefined, decl.modifiers, decl.importClause, rewriteModuleSpecifier(decl, decl.moduleSpecifier), getResolutionModeOverrideForClauseInNightly(decl.assertClause));
             }
             var visibleDefaultBinding = decl.importClause && decl.importClause.name && resolver.isDeclarationVisible(decl.importClause) ? decl.importClause.name : undefined;
             if (!decl.importClause.namedBindings) {
-                return visibleDefaultBinding && factory.updateImportDeclaration(decl, undefined, decl.modifiers, factory.updateImportClause(decl.importClause, decl.importClause.isTypeOnly, visibleDefaultBinding, undefined), rewriteModuleSpecifier(decl, decl.moduleSpecifier), ts.getResolutionModeOverrideForClause(decl.assertClause) ? decl.assertClause : undefined);
+                return visibleDefaultBinding && factory.updateImportDeclaration(decl, undefined, decl.modifiers, factory.updateImportClause(decl.importClause, decl.importClause.isTypeOnly, visibleDefaultBinding, undefined), rewriteModuleSpecifier(decl, decl.moduleSpecifier), getResolutionModeOverrideForClauseInNightly(decl.assertClause));
             }
             if (decl.importClause.namedBindings.kind === 268) {
                 var namedBindings = resolver.isDeclarationVisible(decl.importClause.namedBindings) ? decl.importClause.namedBindings : undefined;
-                return visibleDefaultBinding || namedBindings ? factory.updateImportDeclaration(decl, undefined, decl.modifiers, factory.updateImportClause(decl.importClause, decl.importClause.isTypeOnly, visibleDefaultBinding, namedBindings), rewriteModuleSpecifier(decl, decl.moduleSpecifier), ts.getResolutionModeOverrideForClause(decl.assertClause) ? decl.assertClause : undefined) : undefined;
+                return visibleDefaultBinding || namedBindings ? factory.updateImportDeclaration(decl, undefined, decl.modifiers, factory.updateImportClause(decl.importClause, decl.importClause.isTypeOnly, visibleDefaultBinding, namedBindings), rewriteModuleSpecifier(decl, decl.moduleSpecifier), getResolutionModeOverrideForClauseInNightly(decl.assertClause)) : undefined;
             }
             var bindingList = ts.mapDefined(decl.importClause.namedBindings.elements, function (b) { return resolver.isDeclarationVisible(b) ? b : undefined; });
             if ((bindingList && bindingList.length) || visibleDefaultBinding) {
-                return factory.updateImportDeclaration(decl, undefined, decl.modifiers, factory.updateImportClause(decl.importClause, decl.importClause.isTypeOnly, visibleDefaultBinding, bindingList && bindingList.length ? factory.updateNamedImports(decl.importClause.namedBindings, bindingList) : undefined), rewriteModuleSpecifier(decl, decl.moduleSpecifier), ts.getResolutionModeOverrideForClause(decl.assertClause) ? decl.assertClause : undefined);
+                return factory.updateImportDeclaration(decl, undefined, decl.modifiers, factory.updateImportClause(decl.importClause, decl.importClause.isTypeOnly, visibleDefaultBinding, bindingList && bindingList.length ? factory.updateNamedImports(decl.importClause.namedBindings, bindingList) : undefined), rewriteModuleSpecifier(decl, decl.moduleSpecifier), getResolutionModeOverrideForClauseInNightly(decl.assertClause));
             }
             if (resolver.isImportRequiredByAugmentation(decl)) {
-                return factory.updateImportDeclaration(decl, undefined, decl.modifiers, undefined, rewriteModuleSpecifier(decl, decl.moduleSpecifier), ts.getResolutionModeOverrideForClause(decl.assertClause) ? decl.assertClause : undefined);
+                return factory.updateImportDeclaration(decl, undefined, decl.modifiers, undefined, rewriteModuleSpecifier(decl, decl.moduleSpecifier), getResolutionModeOverrideForClauseInNightly(decl.assertClause));
             }
         }
+        function getResolutionModeOverrideForClauseInNightly(assertClause) {
+            var mode = ts.getResolutionModeOverrideForClause(assertClause);
+            if (mode !== undefined) {
+                if (!ts.isNightly()) {
+                    context.addDiagnostic(ts.createDiagnosticForNode(assertClause, ts.Diagnostics.Resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next));
+                }
+                return assertClause;
+            }
+            return undefined;
+        }
         function transformAndReplaceLatePaintedStatements(statements) {
             while (ts.length(lateMarkedStatements)) {
                 var i = lateMarkedStatements.shift();
                 if (!ts.isLateVisibilityPaintedStatement(i)) {
-                    return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: " + (ts.SyntaxKind ? ts.SyntaxKind[i.kind] : i.kind));
+                    return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: ".concat(ts.SyntaxKind ? ts.SyntaxKind[i.kind] : i.kind));
                 }
                 var priorNeedsDeclare = needsDeclare;
                 needsDeclare = i.parent && ts.isSourceFile(i.parent) && !(ts.isExternalModule(i.parent) && isBundledEmit);
@@ -88922,7 +89065,7 @@ var ts;
                             return cleanup(input);
                         return cleanup(factory.updateImportTypeNode(input, factory.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)), input.assertions, input.qualifier, ts.visitNodes(input.typeArguments, visitDeclarationSubtree, ts.isTypeNode), input.isTypeOf));
                     }
-                    default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: " + ts.SyntaxKind[input.kind]);
+                    default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: ".concat(ts.SyntaxKind[input.kind]));
                 }
             }
             if (ts.isTupleTypeNode(input) && (ts.getLineAndCharacterOfPosition(currentSourceFile, input.pos).line === ts.getLineAndCharacterOfPosition(currentSourceFile, input.end).line)) {
@@ -89172,7 +89315,7 @@ var ts;
                     var extendsClause_1 = ts.getEffectiveBaseTypeNode(input);
                     if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 104) {
                         var oldId = input.name ? ts.unescapeLeadingUnderscores(input.name.escapedText) : "default";
-                        var newId_1 = factory.createUniqueName(oldId + "_base", 16);
+                        var newId_1 = factory.createUniqueName("".concat(oldId, "_base"), 16);
                         getSymbolAccessibilityDiagnostic = function () { return ({
                             diagnosticMessage: ts.Diagnostics.extends_clause_of_exported_class_0_has_or_is_using_private_name_1,
                             errorNode: extendsClause_1,
@@ -89209,7 +89352,7 @@ var ts;
                     }))));
                 }
             }
-            return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: " + ts.SyntaxKind[input.kind]);
+            return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: ".concat(ts.SyntaxKind[input.kind]));
             function cleanup(node) {
                 if (isEnclosingDeclaration(input)) {
                     enclosingDeclaration = previousEnclosingDeclaration;
@@ -89978,13 +90121,13 @@ var ts;
         if (ts.fileExtensionIs(inputFileName, ".json"))
             return;
         if (js && configFile.options.sourceMap) {
-            addOutput(js + ".map");
+            addOutput("".concat(js, ".map"));
         }
         if (ts.getEmitDeclarations(configFile.options)) {
             var dts = getOutputDeclarationFileName(inputFileName, configFile, ignoreCase, getCommonSourceDirectory);
             addOutput(dts);
             if (configFile.options.declarationMap) {
-                addOutput(dts + ".map");
+                addOutput("".concat(dts, ".map"));
             }
         }
     }
@@ -90044,7 +90187,7 @@ var ts;
     function getFirstProjectOutput(configFile, ignoreCase) {
         if (ts.outFile(configFile.options)) {
             var jsFilePath = getOutputPathsForBundle(configFile.options, false).jsFilePath;
-            return ts.Debug.checkDefined(jsFilePath, "project " + configFile.options.configFilePath + " expected to have at least one output");
+            return ts.Debug.checkDefined(jsFilePath, "project ".concat(configFile.options.configFilePath, " expected to have at least one output"));
         }
         var getCommonSourceDirectory = ts.memoize(function () { return getCommonSourceDirectoryOfConfig(configFile, ignoreCase); });
         for (var _a = 0, _b = configFile.fileNames; _a < _b.length; _a++) {
@@ -90063,7 +90206,7 @@ var ts;
         var buildInfoPath = getTsBuildInfoEmitOutputFilePath(configFile.options);
         if (buildInfoPath)
             return buildInfoPath;
-        return ts.Debug.fail("project " + configFile.options.configFilePath + " expected to have at least one output");
+        return ts.Debug.fail("project ".concat(configFile.options.configFilePath, " expected to have at least one output"));
     }
     ts.getFirstProjectOutput = getFirstProjectOutput;
     function emitFiles(resolver, host, targetSourceFile, _a, emitOnlyDtsFiles, onlyBuildInfo, forceDtsEmit) {
@@ -90275,7 +90418,7 @@ var ts;
                     if (!writer.isAtStartOfLine())
                         writer.rawWrite(newLine);
                     sourceMapUrlPos = writer.getTextPos();
-                    writer.writeComment("//# " + "sourceMappingURL" + "=" + sourceMappingURL);
+                    writer.writeComment("//# ".concat("sourceMappingURL", "=").concat(sourceMappingURL));
                 }
                 if (sourceMapFilePath) {
                     var sourceMap = sourceMapGenerator.toString();
@@ -90315,7 +90458,7 @@ var ts;
             if (mapOptions.inlineSourceMap) {
                 var sourceMapText = sourceMapGenerator.toString();
                 var base64SourceMapText = ts.base64encode(ts.sys, sourceMapText);
-                return "data:application/json;base64," + base64SourceMapText;
+                return "data:application/json;base64,".concat(base64SourceMapText);
             }
             var sourceMapFile = ts.getBaseFileName(ts.normalizeSlashes(ts.Debug.checkDefined(sourceMapFilePath)));
             if (mapOptions.mapRoot) {
@@ -90479,7 +90622,7 @@ var ts;
                             return;
                         break;
                     default:
-                        ts.Debug.fail("Unexpected path: " + name);
+                        ts.Debug.fail("Unexpected path: ".concat(name));
                 }
                 outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark });
             },
@@ -91292,7 +91435,7 @@ var ts;
                 return writeTokenNode(node, writeKeyword);
             if (ts.isTokenKind(node.kind))
                 return writeTokenNode(node, writePunctuation);
-            ts.Debug.fail("Unhandled SyntaxKind: " + ts.Debug.formatSyntaxKind(node.kind) + ".");
+            ts.Debug.fail("Unhandled SyntaxKind: ".concat(ts.Debug.formatSyntaxKind(node.kind), "."));
         }
         function emitMappedTypeParameter(node) {
             emit(node.name);
@@ -91432,14 +91575,14 @@ var ts;
             }
         }
         function emitPlaceholder(hint, node, snippet) {
-            nonEscapingWrite("${" + snippet.order + ":");
+            nonEscapingWrite("${".concat(snippet.order, ":"));
             pipelineEmitWithHintWorker(hint, node, false);
             nonEscapingWrite("}");
         }
         function emitTabStop(hint, node, snippet) {
-            ts.Debug.assert(node.kind === 236, "A tab stop cannot be attached to a node of kind " + ts.Debug.formatSyntaxKind(node.kind) + ".");
+            ts.Debug.assert(node.kind === 236, "A tab stop cannot be attached to a node of kind ".concat(ts.Debug.formatSyntaxKind(node.kind), "."));
             ts.Debug.assert(hint !== 5, "A tab stop cannot be attached to an embedded statement.");
-            nonEscapingWrite("$" + snippet.order);
+            nonEscapingWrite("$".concat(snippet.order));
         }
         function emitIdentifier(node) {
             var writeText = node.symbol ? writeSymbol : write;
@@ -93116,17 +93259,17 @@ var ts;
                 writeLine();
             }
             if (currentSourceFile && currentSourceFile.moduleName) {
-                writeComment("/// <amd-module name=\"" + currentSourceFile.moduleName + "\" />");
+                writeComment("/// <amd-module name=\"".concat(currentSourceFile.moduleName, "\" />"));
                 writeLine();
             }
             if (currentSourceFile && currentSourceFile.amdDependencies) {
                 for (var _a = 0, _b = currentSourceFile.amdDependencies; _a < _b.length; _a++) {
                     var dep = _b[_a];
                     if (dep.name) {
-                        writeComment("/// <amd-dependency name=\"" + dep.name + "\" path=\"" + dep.path + "\" />");
+                        writeComment("/// <amd-dependency name=\"".concat(dep.name, "\" path=\"").concat(dep.path, "\" />"));
                     }
                     else {
-                        writeComment("/// <amd-dependency path=\"" + dep.path + "\" />");
+                        writeComment("/// <amd-dependency path=\"".concat(dep.path, "\" />"));
                     }
                     writeLine();
                 }
@@ -93134,7 +93277,7 @@ var ts;
             for (var _c = 0, files_2 = files; _c < files_2.length; _c++) {
                 var directive = files_2[_c];
                 var pos = writer.getTextPos();
-                writeComment("/// <reference path=\"" + directive.fileName + "\" />");
+                writeComment("/// <reference path=\"".concat(directive.fileName, "\" />"));
                 if (bundleFileInfo)
                     bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "reference", data: directive.fileName });
                 writeLine();
@@ -93143,9 +93286,9 @@ var ts;
                 var directive = types_24[_d];
                 var pos = writer.getTextPos();
                 var resolutionMode = directive.resolutionMode && directive.resolutionMode !== (currentSourceFile === null || currentSourceFile === void 0 ? void 0 : currentSourceFile.impliedNodeFormat)
-                    ? "resolution-mode=\"" + (directive.resolutionMode === ts.ModuleKind.ESNext ? "import" : "require") + "\""
+                    ? "resolution-mode=\"".concat(directive.resolutionMode === ts.ModuleKind.ESNext ? "import" : "require", "\"")
                     : "";
-                writeComment("/// <reference types=\"" + directive.fileName + "\" " + resolutionMode + "/>");
+                writeComment("/// <reference types=\"".concat(directive.fileName, "\" ").concat(resolutionMode, "/>"));
                 if (bundleFileInfo)
                     bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: !directive.resolutionMode ? "type" : directive.resolutionMode === ts.ModuleKind.ESNext ? "type-import" : "type-require", data: directive.fileName });
                 writeLine();
@@ -93153,7 +93296,7 @@ var ts;
             for (var _e = 0, libs_1 = libs; _e < libs_1.length; _e++) {
                 var directive = libs_1[_e];
                 var pos = writer.getTextPos();
-                writeComment("/// <reference lib=\"" + directive.fileName + "\" />");
+                writeComment("/// <reference lib=\"".concat(directive.fileName, "\" />"));
                 if (bundleFileInfo)
                     bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "lib", data: directive.fileName });
                 writeLine();
@@ -93855,9 +93998,9 @@ var ts;
                 var textSourceNode = node.textSourceNode;
                 if (ts.isIdentifier(textSourceNode) || ts.isNumericLiteral(textSourceNode)) {
                     var text = ts.isNumericLiteral(textSourceNode) ? textSourceNode.text : getTextOfNode(textSourceNode);
-                    return jsxAttributeEscape ? "\"" + ts.escapeJsxAttributeString(text) + "\"" :
-                        neverAsciiEscape || (ts.getEmitFlags(node) & 16777216) ? "\"" + ts.escapeString(text) + "\"" :
-                            "\"" + ts.escapeNonAsciiString(text) + "\"";
+                    return jsxAttributeEscape ? "\"".concat(ts.escapeJsxAttributeString(text), "\"") :
+                        neverAsciiEscape || (ts.getEmitFlags(node) & 16777216) ? "\"".concat(ts.escapeString(text), "\"") :
+                            "\"".concat(ts.escapeNonAsciiString(text), "\"");
                 }
                 else {
                     return getLiteralTextOfNode(textSourceNode, neverAsciiEscape, jsxAttributeEscape);
@@ -94260,8 +94403,8 @@ var ts;
         }
         function formatSynthesizedComment(comment) {
             return comment.kind === 3
-                ? "/*" + comment.text + "*/"
-                : "//" + comment.text;
+                ? "/*".concat(comment.text, "*/")
+                : "//".concat(comment.text);
         }
         function emitBodyWithDetachedComments(node, detachedRange, emitCallback) {
             enterComment();
@@ -94895,18 +95038,18 @@ var ts;
         var watchedDirPath = _a.watchedDirPath, fileOrDirectory = _a.fileOrDirectory, fileOrDirectoryPath = _a.fileOrDirectoryPath, configFileName = _a.configFileName, options = _a.options, program = _a.program, extraFileExtensions = _a.extraFileExtensions, currentDirectory = _a.currentDirectory, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, writeLog = _a.writeLog, toPath = _a.toPath;
         var newPath = ts.removeIgnoredPath(fileOrDirectoryPath);
         if (!newPath) {
-            writeLog("Project: " + configFileName + " Detected ignored path: " + fileOrDirectory);
+            writeLog("Project: ".concat(configFileName, " Detected ignored path: ").concat(fileOrDirectory));
             return true;
         }
         fileOrDirectoryPath = newPath;
         if (fileOrDirectoryPath === watchedDirPath)
             return false;
         if (ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, options, extraFileExtensions)) {
-            writeLog("Project: " + configFileName + " Detected file add/remove of non supported extension: " + fileOrDirectory);
+            writeLog("Project: ".concat(configFileName, " Detected file add/remove of non supported extension: ").concat(fileOrDirectory));
             return true;
         }
         if (ts.isExcludedFile(fileOrDirectory, options.configFile.configFileSpecs, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), currentDirectory), useCaseSensitiveFileNames, currentDirectory)) {
-            writeLog("Project: " + configFileName + " Detected excluded file: " + fileOrDirectory);
+            writeLog("Project: ".concat(configFileName, " Detected excluded file: ").concat(fileOrDirectory));
             return true;
         }
         if (!program)
@@ -94925,7 +95068,7 @@ var ts;
         var builderProgram = !realProgram && !ts.isArray(program) ? program : undefined;
         if (hasSourceFile((filePathWithoutExtension + ".ts")) ||
             hasSourceFile((filePathWithoutExtension + ".tsx"))) {
-            writeLog("Project: " + configFileName + " Detected output file: " + fileOrDirectory);
+            writeLog("Project: ".concat(configFileName, " Detected output file: ").concat(fileOrDirectory));
             return true;
         }
         return false;
@@ -94993,36 +95136,36 @@ var ts;
                 host.useCaseSensitiveFileNames();
         }
         function createExcludeWatcherWithLogging(file, flags, options, detailInfo1, detailInfo2) {
-            log("ExcludeWatcher:: Added:: " + getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
+            log("ExcludeWatcher:: Added:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo)));
             return {
-                close: function () { return log("ExcludeWatcher:: Close:: " + getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo)); }
+                close: function () { return log("ExcludeWatcher:: Close:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo))); }
             };
         }
         function createFileWatcherWithLogging(file, cb, flags, options, detailInfo1, detailInfo2) {
-            log("FileWatcher:: Added:: " + getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
+            log("FileWatcher:: Added:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo)));
             var watcher = triggerInvokingFactory.watchFile(file, cb, flags, options, detailInfo1, detailInfo2);
             return {
                 close: function () {
-                    log("FileWatcher:: Close:: " + getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
+                    log("FileWatcher:: Close:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo)));
                     watcher.close();
                 }
             };
         }
         function createDirectoryWatcherWithLogging(file, cb, flags, options, detailInfo1, detailInfo2) {
-            var watchInfo = "DirectoryWatcher:: Added:: " + getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo);
+            var watchInfo = "DirectoryWatcher:: Added:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
             log(watchInfo);
             var start = ts.timestamp();
             var watcher = triggerInvokingFactory.watchDirectory(file, cb, flags, options, detailInfo1, detailInfo2);
             var elapsed = ts.timestamp() - start;
-            log("Elapsed:: " + elapsed + "ms " + watchInfo);
+            log("Elapsed:: ".concat(elapsed, "ms ").concat(watchInfo));
             return {
                 close: function () {
-                    var watchInfo = "DirectoryWatcher:: Close:: " + getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo);
+                    var watchInfo = "DirectoryWatcher:: Close:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
                     log(watchInfo);
                     var start = ts.timestamp();
                     watcher.close();
                     var elapsed = ts.timestamp() - start;
-                    log("Elapsed:: " + elapsed + "ms " + watchInfo);
+                    log("Elapsed:: ".concat(elapsed, "ms ").concat(watchInfo));
                 }
             };
         }
@@ -95032,16 +95175,16 @@ var ts;
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
                 }
-                var triggerredInfo = (key === "watchFile" ? "FileWatcher" : "DirectoryWatcher") + ":: Triggered with " + args[0] + " " + (args[1] !== undefined ? args[1] : "") + ":: " + getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo);
+                var triggerredInfo = "".concat(key === "watchFile" ? "FileWatcher" : "DirectoryWatcher", ":: Triggered with ").concat(args[0], " ").concat(args[1] !== undefined ? args[1] : "", ":: ").concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
                 log(triggerredInfo);
                 var start = ts.timestamp();
                 cb.call.apply(cb, __spreadArray([undefined], args, false));
                 var elapsed = ts.timestamp() - start;
-                log("Elapsed:: " + elapsed + "ms " + triggerredInfo);
+                log("Elapsed:: ".concat(elapsed, "ms ").concat(triggerredInfo));
             }, flags, options, detailInfo1, detailInfo2); };
         }
         function getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo) {
-            return "WatchInfo: " + file + " " + flags + " " + JSON.stringify(options) + " " + (getDetailWatchInfo ? getDetailWatchInfo(detailInfo1, detailInfo2) : detailInfo2 === undefined ? detailInfo1 : detailInfo1 + " " + detailInfo2);
+            return "WatchInfo: ".concat(file, " ").concat(flags, " ").concat(JSON.stringify(options), " ").concat(getDetailWatchInfo ? getDetailWatchInfo(detailInfo1, detailInfo2) : detailInfo2 === undefined ? detailInfo1 : "".concat(detailInfo1, " ").concat(detailInfo2));
         }
     }
     ts.getWatchFactory = getWatchFactory;
@@ -95335,12 +95478,12 @@ var ts;
     }
     ts.formatDiagnostics = formatDiagnostics;
     function formatDiagnostic(diagnostic, host) {
-        var errorMessage = ts.diagnosticCategoryName(diagnostic) + " TS" + diagnostic.code + ": " + flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine()) + host.getNewLine();
+        var errorMessage = "".concat(ts.diagnosticCategoryName(diagnostic), " TS").concat(diagnostic.code, ": ").concat(flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())).concat(host.getNewLine());
         if (diagnostic.file) {
             var _a = ts.getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start), line = _a.line, character = _a.character;
             var fileName = diagnostic.file.fileName;
             var relativeFileName = ts.convertToRelativePath(fileName, host.getCurrentDirectory(), function (fileName) { return host.getCanonicalFileName(fileName); });
-            return relativeFileName + "(" + (line + 1) + "," + (character + 1) + "): " + errorMessage;
+            return "".concat(relativeFileName, "(").concat(line + 1, ",").concat(character + 1, "): ") + errorMessage;
         }
         return errorMessage;
     }
@@ -95418,9 +95561,9 @@ var ts;
         var output = "";
         output += color(relativeFileName, ForegroundColorEscapeSequences.Cyan);
         output += ":";
-        output += color("" + (firstLine + 1), ForegroundColorEscapeSequences.Yellow);
+        output += color("".concat(firstLine + 1), ForegroundColorEscapeSequences.Yellow);
         output += ":";
-        output += color("" + (firstLineChar + 1), ForegroundColorEscapeSequences.Yellow);
+        output += color("".concat(firstLineChar + 1), ForegroundColorEscapeSequences.Yellow);
         return output;
     }
     ts.formatLocation = formatLocation;
@@ -95434,7 +95577,7 @@ var ts;
                 output += " - ";
             }
             output += formatColorAndReset(ts.diagnosticCategoryName(diagnostic), getCategoryFormat(diagnostic.category));
-            output += formatColorAndReset(" TS" + diagnostic.code + ": ", ForegroundColorEscapeSequences.Grey);
+            output += formatColorAndReset(" TS".concat(diagnostic.code, ": "), ForegroundColorEscapeSequences.Grey);
             output += flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine());
             if (diagnostic.file) {
                 output += host.getNewLine();
@@ -95495,7 +95638,7 @@ var ts;
             var result = void 0;
             var mode = getModeForFileReference(name, containingFileMode);
             var strName = ts.isString(name) ? name : name.fileName.toLowerCase();
-            var cacheKey = mode !== undefined ? mode + "|" + strName : strName;
+            var cacheKey = mode !== undefined ? "".concat(mode, "|").concat(strName) : strName;
             if (cache.has(cacheKey)) {
                 result = cache.get(cacheKey);
             }
@@ -95590,7 +95733,7 @@ var ts;
             var result = void 0;
             var mode = getModeForResolutionAtIndex(containingFile, i);
             i++;
-            var cacheKey = mode !== undefined ? mode + "|" + name : name;
+            var cacheKey = mode !== undefined ? "".concat(mode, "|").concat(name) : name;
             if (cache.has(cacheKey)) {
                 result = cache.get(cacheKey);
             }
@@ -95784,7 +95927,6 @@ var ts;
         ts.Diagnostics.A_rest_parameter_cannot_have_an_initializer.code,
         ts.Diagnostics.A_rest_parameter_must_be_last_in_a_parameter_list.code,
         ts.Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma.code,
-        ts.Diagnostics.A_return_statement_can_only_be_used_within_a_function_body.code,
         ts.Diagnostics.A_return_statement_cannot_be_used_inside_a_class_static_block.code,
         ts.Diagnostics.A_set_accessor_cannot_have_rest_parameter.code,
         ts.Diagnostics.A_set_accessor_must_have_exactly_one_parameter.code,
@@ -96123,6 +96265,34 @@ var ts;
         ts.performance.measure("Program", "beforeProgram", "afterProgram");
         ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
         return program;
+        function addResolutionDiagnostics(list) {
+            if (!list)
+                return;
+            for (var _i = 0, list_3 = list; _i < list_3.length; _i++) {
+                var elem = list_3[_i];
+                programDiagnostics.add(elem);
+            }
+        }
+        function pullDiagnosticsFromCache(names, containingFile) {
+            var _a;
+            if (!moduleResolutionCache)
+                return;
+            var containingFileName = ts.getNormalizedAbsolutePath(containingFile.originalFileName, currentDirectory);
+            var containingFileMode = !ts.isString(containingFile) ? containingFile.impliedNodeFormat : undefined;
+            var containingDir = ts.getDirectoryPath(containingFileName);
+            var redirectedReference = getRedirectReferenceForResolution(containingFile);
+            var i = 0;
+            for (var _i = 0, names_4 = names; _i < names_4.length; _i++) {
+                var n = names_4[_i];
+                var mode = typeof n === "string" ? getModeForResolutionAtIndex(containingFile, i) : getModeForFileReference(n, containingFileMode);
+                var name = typeof n === "string" ? n : n.fileName;
+                i++;
+                if (ts.isExternalModuleNameRelative(name))
+                    continue;
+                var diags = (_a = moduleResolutionCache.getOrCreateCacheForModuleName(name, mode, redirectedReference).get(containingDir)) === null || _a === void 0 ? void 0 : _a.resolutionDiagnostics;
+                addResolutionDiagnostics(diags);
+            }
+        }
         function resolveModuleNamesWorker(moduleNames, containingFile, reusedNames) {
             if (!moduleNames.length)
                 return ts.emptyArray;
@@ -96134,6 +96304,7 @@ var ts;
             ts.performance.mark("afterResolveModule");
             ts.performance.measure("ResolveModule", "beforeResolveModule", "afterResolveModule");
             ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
+            pullDiagnosticsFromCache(moduleNames, containingFile);
             return result;
         }
         function resolveTypeReferenceDirectiveNamesWorker(typeDirectiveNames, containingFile) {
@@ -97478,7 +97649,7 @@ var ts;
                 path += (i === 2 ? "/" : "-") + components[i];
                 i++;
             }
-            var resolveFrom = ts.combinePaths(currentDirectory, "__lib_node_modules_lookup_" + libFileName + "__.ts");
+            var resolveFrom = ts.combinePaths(currentDirectory, "__lib_node_modules_lookup_".concat(libFileName, "__.ts"));
             var localOverrideModuleResult = ts.resolveModuleName("@typescript/lib-" + path, resolveFrom, { moduleResolution: ts.ModuleResolutionKind.NodeJs }, host, moduleResolutionCache);
             if (localOverrideModuleResult === null || localOverrideModuleResult === void 0 ? void 0 : localOverrideModuleResult.resolvedModule) {
                 return localOverrideModuleResult.resolvedModule.resolvedFileName;
@@ -98232,10 +98403,10 @@ var ts;
         }
         function directoryExistsIfProjectReferenceDeclDir(dir) {
             var dirPath = host.toPath(dir);
-            var dirPathWithTrailingDirectorySeparator = "" + dirPath + ts.directorySeparator;
+            var dirPathWithTrailingDirectorySeparator = "".concat(dirPath).concat(ts.directorySeparator);
             return ts.forEachKey(setOfDeclarationDirectories, function (declDirPath) { return dirPath === declDirPath ||
                 ts.startsWith(declDirPath, dirPathWithTrailingDirectorySeparator) ||
-                ts.startsWith(dirPath, declDirPath + "/"); });
+                ts.startsWith(dirPath, "".concat(declDirPath, "/")); });
         }
         function handleDirectoryCouldBeSymlink(directory) {
             var _a;
@@ -98283,7 +98454,7 @@ var ts;
                 var result = fileOrDirectoryExistsUsingSource(fileOrDirectoryPath.replace(directoryPath, symlinkedDirectory.realPath));
                 if (isFile && result) {
                     var absolutePath = ts.getNormalizedAbsolutePath(fileOrDirectory, host.compilerHost.getCurrentDirectory());
-                    symlinkCache.setSymlinkedFile(fileOrDirectoryPath, "" + symlinkedDirectory.real + absolutePath.replace(new RegExp(directoryPath, "i"), ""));
+                    symlinkCache.setSymlinkedFile(fileOrDirectoryPath, "".concat(symlinkedDirectory.real).concat(absolutePath.replace(new RegExp(directoryPath, "i"), "")));
                 }
                 return result;
             }) || false;
@@ -98661,7 +98832,7 @@ var ts;
                 var emitOutput_1 = getFileEmitOutput(programOfThisState, sourceFile, true, cancellationToken, undefined, true);
                 var firstDts_1 = ts.firstOrUndefined(emitOutput_1.outputFiles);
                 if (firstDts_1) {
-                    ts.Debug.assert(ts.isDeclarationFileName(firstDts_1.name), "File extension for signature expected to be dts", function () { return "Found: " + ts.getAnyExtensionFromPath(firstDts_1.name) + " for " + firstDts_1.name + ":: All output files: " + JSON.stringify(emitOutput_1.outputFiles.map(function (f) { return f.name; })); });
+                    ts.Debug.assert(ts.isDeclarationFileName(firstDts_1.name), "File extension for signature expected to be dts", function () { return "Found: ".concat(ts.getAnyExtensionFromPath(firstDts_1.name), " for ").concat(firstDts_1.name, ":: All output files: ").concat(JSON.stringify(emitOutput_1.outputFiles.map(function (f) { return f.name; }))); });
                     latestSignature = (computeHash || ts.generateDjb2Hash)(firstDts_1.text);
                     if (exportedModulesMapCache && latestSignature !== prevSignature) {
                         updateExportedModules(sourceFile, emitOutput_1.exportedModulesFromDeclarationEmit, exportedModulesMapCache);
@@ -99053,7 +99224,7 @@ var ts;
             ts.BuilderState.updateShapeSignature(state, ts.Debug.checkDefined(state.program), affectedFile, ts.Debug.checkDefined(state.currentAffectedFilesSignatures), cancellationToken, computeHash, state.currentAffectedFilesExportedModulesMap);
             return;
         }
-        ts.Debug.assert(state.hasCalledUpdateShapeSignature.has(affectedFile.resolvedPath) || ((_a = state.currentAffectedFilesSignatures) === null || _a === void 0 ? void 0 : _a.has(affectedFile.resolvedPath)), "Signature not updated for affected file: " + affectedFile.fileName);
+        ts.Debug.assert(state.hasCalledUpdateShapeSignature.has(affectedFile.resolvedPath) || ((_a = state.currentAffectedFilesSignatures) === null || _a === void 0 ? void 0 : _a.has(affectedFile.resolvedPath)), "Signature not updated for affected file: ".concat(affectedFile.fileName));
         if (state.compilerOptions.assumeChangesOnlyAffectDirectDependencies)
             return;
         handleDtsMayChangeOfReferencingExportOfAffectedFile(state, affectedFile, cancellationToken, computeHash, host);
@@ -99936,8 +100107,8 @@ var ts;
                 !!redirectedReference;
             var seenNamesInFile = ts.createModeAwareCache();
             var i = 0;
-            for (var _i = 0, names_4 = names; _i < names_4.length; _i++) {
-                var entry = names_4[_i];
+            for (var _i = 0, names_5 = names; _i < names_5.length; _i++) {
+                var entry = names_5[_i];
                 var name = ts.isString(entry) ? entry : entry.fileName.toLowerCase();
                 var mode = !ts.isString(entry) ? ts.getModeForFileReference(entry, containingSourceFileMode) :
                     containingSourceFile ? ts.getModeForResolutionAtIndex(containingSourceFile, i) : undefined;
@@ -100071,7 +100242,7 @@ var ts;
                 failedLookupLocation = ts.isRootedDiskPath(failedLookupLocation) ? ts.normalizePath(failedLookupLocation) : ts.getNormalizedAbsolutePath(failedLookupLocation, getCurrentDirectory());
                 var failedLookupPathSplit = failedLookupLocationPath.split(ts.directorySeparator);
                 var failedLookupSplit = failedLookupLocation.split(ts.directorySeparator);
-                ts.Debug.assert(failedLookupSplit.length === failedLookupPathSplit.length, "FailedLookup: " + failedLookupLocation + " failedLookupLocationPath: " + failedLookupLocationPath);
+                ts.Debug.assert(failedLookupSplit.length === failedLookupPathSplit.length, "FailedLookup: ".concat(failedLookupLocation, " failedLookupLocationPath: ").concat(failedLookupLocationPath));
                 if (failedLookupPathSplit.length > rootSplitLength + 1) {
                     return {
                         dir: failedLookupSplit.slice(0, rootSplitLength + 1).join(ts.directorySeparator),
@@ -100463,14 +100634,14 @@ var ts;
             if (options === void 0) { options = {}; }
             var info = getInfo(importingSourceFile.path, host);
             var modulePaths = getAllModulePaths(importingSourceFile.path, nodeModulesFileName, host, preferences, options);
-            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, true, options.overrideImportMode); });
+            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, preferences, true, options.overrideImportMode); });
         }
         moduleSpecifiers_1.getNodeModulesPackageName = getNodeModulesPackageName;
         function getModuleSpecifierWorker(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, preferences, userPreferences, options) {
             if (options === void 0) { options = {}; }
             var info = getInfo(importingSourceFileName, host);
             var modulePaths = getAllModulePaths(importingSourceFileName, toFileName, host, userPreferences, options);
-            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, undefined, options.overrideImportMode); }) ||
+            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, userPreferences, undefined, options.overrideImportMode); }) ||
                 getLocalModuleSpecifier(toFileName, info, compilerOptions, host, preferences);
         }
         function tryGetModuleSpecifiersFromCache(moduleSymbol, importingSourceFile, host, userPreferences, options) {
@@ -100536,7 +100707,7 @@ var ts;
             var relativeSpecifiers;
             for (var _i = 0, modulePaths_1 = modulePaths; _i < modulePaths_1.length; _i++) {
                 var modulePath = modulePaths_1[_i];
-                var specifier = tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, undefined, options.overrideImportMode);
+                var specifier = tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, userPreferences, undefined, options.overrideImportMode);
                 nodeModulesSpecifiers = ts.append(nodeModulesSpecifiers, specifier);
                 if (specifier && modulePath.isRedirect) {
                     return nodeModulesSpecifiers;
@@ -100867,7 +101038,7 @@ var ts;
                 ? removeExtensionAndIndexPostFix(relativePath, ending, compilerOptions)
                 : ts.removeFileExtension(relativePath);
         }
-        function tryGetModuleNameAsNodeModule(_a, _b, importingSourceFile, host, options, packageNameOnly, overrideMode) {
+        function tryGetModuleNameAsNodeModule(_a, _b, importingSourceFile, host, options, userPreferences, packageNameOnly, overrideMode) {
             var path = _a.path, isRedirect = _a.isRedirect;
             var getCanonicalFileName = _b.getCanonicalFileName, sourceDirectory = _b.sourceDirectory;
             if (!host.fileExists || !host.readFile) {
@@ -100880,8 +101051,9 @@ var ts;
             var moduleSpecifier = path;
             var isPackageRootPath = false;
             if (!packageNameOnly) {
+                var preferences = getPreferences(host, userPreferences, options, importingSourceFile);
                 var packageRootIndex = parts.packageRootIndex;
-                var moduleFileNameForExtensionless = void 0;
+                var moduleFileName = void 0;
                 while (true) {
                     var _c = tryDirectoryWithPackageJson(packageRootIndex), moduleFileToTry = _c.moduleFileToTry, packageRootPath = _c.packageRootPath, blockedByExports = _c.blockedByExports, verbatimFromExports = _c.verbatimFromExports;
                     if (ts.getEmitModuleResolutionKind(options) !== ts.ModuleResolutionKind.Classic) {
@@ -100897,11 +101069,11 @@ var ts;
                         isPackageRootPath = true;
                         break;
                     }
-                    if (!moduleFileNameForExtensionless)
-                        moduleFileNameForExtensionless = moduleFileToTry;
+                    if (!moduleFileName)
+                        moduleFileName = moduleFileToTry;
                     packageRootIndex = path.indexOf(ts.directorySeparator, packageRootIndex + 1);
                     if (packageRootIndex === -1) {
-                        moduleSpecifier = getExtensionlessFileName(moduleFileNameForExtensionless);
+                        moduleSpecifier = removeExtensionAndIndexPostFix(moduleFileName, preferences.ending, options, host);
                         break;
                     }
                 }
@@ -100950,7 +101122,7 @@ var ts;
                             moduleFileToTry = ts.combinePaths(packageRootPath, fromPaths);
                         }
                     }
-                    var mainFileRelative = packageJsonContent.typings || packageJsonContent.types || packageJsonContent.main;
+                    var mainFileRelative = packageJsonContent.typings || packageJsonContent.types || packageJsonContent.main || "index.js";
                     if (ts.isString(mainFileRelative)) {
                         var mainExportFile = ts.toPath(mainFileRelative, packageRootPath, getCanonicalFileName);
                         if (ts.removeFileExtension(mainExportFile) === ts.removeFileExtension(getCanonicalFileName(moduleFileToTry))) {
@@ -100958,14 +101130,13 @@ var ts;
                         }
                     }
                 }
-                return { moduleFileToTry: moduleFileToTry };
-            }
-            function getExtensionlessFileName(path) {
-                var fullModulePathWithoutExtension = ts.removeFileExtension(path);
-                if (getCanonicalFileName(fullModulePathWithoutExtension.substring(parts.fileNameIndex)) === "/index" && !tryGetAnyFileFromPath(host, fullModulePathWithoutExtension.substring(0, parts.fileNameIndex))) {
-                    return fullModulePathWithoutExtension.substring(0, parts.fileNameIndex);
+                else {
+                    var fileName = getCanonicalFileName(moduleFileToTry.substring(parts.packageRootIndex + 1));
+                    if (fileName === "index.d.ts" || fileName === "index.js" || fileName === "index.ts" || fileName === "index.tsx") {
+                        return { moduleFileToTry: moduleFileToTry, packageRootPath: packageRootPath };
+                    }
                 }
-                return fullModulePathWithoutExtension;
+                return { moduleFileToTry: moduleFileToTry };
             }
         }
         function tryGetAnyFileFromPath(host, path) {
@@ -100986,15 +101157,21 @@ var ts;
                 return relativePath !== undefined && isPathRelativeToParent(relativePath) ? undefined : relativePath;
             });
         }
-        function removeExtensionAndIndexPostFix(fileName, ending, options) {
+        function removeExtensionAndIndexPostFix(fileName, ending, options, host) {
             if (ts.fileExtensionIsOneOf(fileName, [".json", ".mjs", ".cjs"]))
                 return fileName;
             var noExtension = ts.removeFileExtension(fileName);
+            if (fileName === noExtension)
+                return fileName;
             if (ts.fileExtensionIsOneOf(fileName, [".d.mts", ".mts", ".d.cts", ".cts"]))
                 return noExtension + getJSExtensionForFile(fileName, options);
             switch (ending) {
                 case 0:
-                    return ts.removeSuffix(noExtension, "/index");
+                    var withoutIndex = ts.removeSuffix(noExtension, "/index");
+                    if (host && withoutIndex !== noExtension && tryGetAnyFileFromPath(host, withoutIndex)) {
+                        return noExtension;
+                    }
+                    return withoutIndex;
                 case 1:
                     return noExtension;
                 case 2:
@@ -101005,7 +101182,7 @@ var ts;
         }
         function getJSExtensionForFile(fileName, options) {
             var _a;
-            return (_a = tryGetJSExtensionForFile(fileName, options)) !== null && _a !== void 0 ? _a : ts.Debug.fail("Extension " + ts.extensionFromPath(fileName) + " is unsupported:: FileName:: " + fileName);
+            return (_a = tryGetJSExtensionForFile(fileName, options)) !== null && _a !== void 0 ? _a : ts.Debug.fail("Extension ".concat(ts.extensionFromPath(fileName), " is unsupported:: FileName:: ").concat(fileName));
         }
         function tryGetJSExtensionForFile(fileName, options) {
             var ext = ts.tryGetExtensionFromPath(fileName);
@@ -101095,8 +101272,8 @@ var ts;
         return pretty ?
             function (diagnostic, newLine, options) {
                 clearScreenIfNotWatchingForFileChanges(system, diagnostic, options);
-                var output = "[" + ts.formatColorAndReset(getLocaleTimeString(system), ts.ForegroundColorEscapeSequences.Grey) + "] ";
-                output += "" + ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine) + (newLine + newLine);
+                var output = "[".concat(ts.formatColorAndReset(getLocaleTimeString(system), ts.ForegroundColorEscapeSequences.Grey), "] ");
+                output += "".concat(ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine)).concat(newLine + newLine);
                 system.write(output);
             } :
             function (diagnostic, newLine, options) {
@@ -101104,8 +101281,8 @@ var ts;
                 if (!clearScreenIfNotWatchingForFileChanges(system, diagnostic, options)) {
                     output += newLine;
                 }
-                output += getLocaleTimeString(system) + " - ";
-                output += "" + ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine) + getPlainDiagnosticFollowingNewLines(diagnostic, newLine);
+                output += "".concat(getLocaleTimeString(system), " - ");
+                output += "".concat(ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine)).concat(getPlainDiagnosticFollowingNewLines(diagnostic, newLine));
                 system.write(output);
             };
     }
@@ -101127,7 +101304,7 @@ var ts;
             .map(function (errorDiagnostic) {
             if (errorDiagnostic.file === undefined)
                 return;
-            return "" + errorDiagnostic.file.fileName;
+            return "".concat(errorDiagnostic.file.fileName);
         });
         return filesInError.map(function (fileName) {
             var diagnosticForFileName = ts.find(diagnostics, function (diagnostic) {
@@ -101160,7 +101337,7 @@ var ts;
         if (errorCount === 0)
             return "";
         var nonNilFiles = filesInError.filter(function (fileInError) { return fileInError !== undefined; });
-        var distinctFileNamesWithLines = nonNilFiles.map(function (fileInError) { return fileInError.fileName + ":" + fileInError.line; })
+        var distinctFileNamesWithLines = nonNilFiles.map(function (fileInError) { return "".concat(fileInError.fileName, ":").concat(fileInError.line); })
             .filter(function (value, index, self) { return self.indexOf(value) === index; });
         var firstFileReference = nonNilFiles[0] && prettyPathForFileError(nonNilFiles[0], host.getCurrentDirectory());
         var d = errorCount === 1 ?
@@ -101173,7 +101350,7 @@ var ts;
                     ts.Diagnostics.Found_0_errors_in_the_same_file_starting_at_Colon_1 :
                     ts.Diagnostics.Found_0_errors_in_1_files, errorCount, distinctFileNamesWithLines.length === 1 ? firstFileReference : distinctFileNamesWithLines.length);
         var suffix = distinctFileNamesWithLines.length > 1 ? createTabularErrorsDisplay(nonNilFiles, host) : "";
-        return "" + newLine + ts.flattenDiagnosticMessageText(d.messageText, newLine) + newLine + newLine + suffix;
+        return "".concat(newLine).concat(ts.flattenDiagnosticMessageText(d.messageText, newLine)).concat(newLine).concat(newLine).concat(suffix);
     }
     ts.getErrorSummaryText = getErrorSummaryText;
     function createTabularErrorsDisplay(filesInError, host) {
@@ -101196,7 +101373,7 @@ var ts;
                 " ".repeat(leftPaddingGoal - errorCountDigitsLength)
                 : "";
             var fileRef = prettyPathForFileError(file, host.getCurrentDirectory());
-            tabularData += "" + leftPadding + errorCount + "  " + fileRef + "\n";
+            tabularData += "".concat(leftPadding).concat(errorCount, "  ").concat(fileRef, "\n");
         });
         return tabularData;
     }
@@ -101223,9 +101400,9 @@ var ts;
         var relativeFileName = function (fileName) { return ts.convertToRelativePath(fileName, program.getCurrentDirectory(), getCanonicalFileName); };
         for (var _i = 0, _c = program.getSourceFiles(); _i < _c.length; _i++) {
             var file = _c[_i];
-            write("" + toFileName(file, relativeFileName));
-            (_a = reasons.get(file.path)) === null || _a === void 0 ? void 0 : _a.forEach(function (reason) { return write("  " + fileIncludeReasonToDiagnostics(program, reason, relativeFileName).messageText); });
-            (_b = explainIfFileIsRedirect(file, relativeFileName)) === null || _b === void 0 ? void 0 : _b.forEach(function (d) { return write("  " + d.messageText); });
+            write("".concat(toFileName(file, relativeFileName)));
+            (_a = reasons.get(file.path)) === null || _a === void 0 ? void 0 : _a.forEach(function (reason) { return write("  ".concat(fileIncludeReasonToDiagnostics(program, reason, relativeFileName).messageText)); });
+            (_b = explainIfFileIsRedirect(file, relativeFileName)) === null || _b === void 0 ? void 0 : _b.forEach(function (d) { return write("  ".concat(d.messageText)); });
         }
     }
     ts.explainFiles = explainFiles;
@@ -101263,7 +101440,7 @@ var ts;
             if (isJsonFile && !ts.endsWith(includeSpec, ".json"))
                 return false;
             var pattern = ts.getPatternFromSpec(includeSpec, basePath, "files");
-            return !!pattern && ts.getRegexFromPattern("(" + pattern + ")$", useCaseSensitiveFileNames).test(fileName);
+            return !!pattern && ts.getRegexFromPattern("(".concat(pattern, ")$"), useCaseSensitiveFileNames).test(fileName);
         });
     }
     ts.getMatchedIncludeSpec = getMatchedIncludeSpec;
@@ -101272,7 +101449,7 @@ var ts;
         var options = program.getCompilerOptions();
         if (ts.isReferencedFile(reason)) {
             var referenceLocation = ts.getReferencedFileLocation(function (path) { return program.getSourceFileByPath(path); }, reason);
-            var referenceText = ts.isReferenceFileLocation(referenceLocation) ? referenceLocation.file.text.substring(referenceLocation.pos, referenceLocation.end) : "\"" + referenceLocation.text + "\"";
+            var referenceText = ts.isReferenceFileLocation(referenceLocation) ? referenceLocation.file.text.substring(referenceLocation.pos, referenceLocation.end) : "\"".concat(referenceLocation.text, "\"");
             var message = void 0;
             ts.Debug.assert(ts.isReferenceFileLocation(referenceLocation) || reason.kind === ts.FileIncludeKind.Import, "Only synthetic references are imports");
             switch (reason.kind) {
@@ -101383,7 +101560,7 @@ var ts;
             var currentDir_1 = program.getCurrentDirectory();
             ts.forEach(emittedFiles, function (file) {
                 var filepath = ts.getNormalizedAbsolutePath(file, currentDir_1);
-                write("TSFILE: " + filepath);
+                write("TSFILE: ".concat(filepath));
             });
             listFiles(program, write);
         }
@@ -101693,7 +101870,7 @@ var ts;
         }
         var _b = ts.createWatchFactory(host, compilerOptions), watchFile = _b.watchFile, watchDirectory = _b.watchDirectory, writeLog = _b.writeLog;
         var getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
-        writeLog("Current directory: " + currentDirectory + " CaseSensitiveFileNames: " + useCaseSensitiveFileNames);
+        writeLog("Current directory: ".concat(currentDirectory, " CaseSensitiveFileNames: ").concat(useCaseSensitiveFileNames));
         var configFileWatcher;
         if (configFileName) {
             configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
@@ -101840,10 +102017,10 @@ var ts;
         }
         function createNewProgram(hasInvalidatedResolution) {
             writeLog("CreatingProgramWith::");
-            writeLog("  roots: " + JSON.stringify(rootFileNames));
-            writeLog("  options: " + JSON.stringify(compilerOptions));
+            writeLog("  roots: ".concat(JSON.stringify(rootFileNames)));
+            writeLog("  options: ".concat(JSON.stringify(compilerOptions)));
             if (projectReferences)
-                writeLog("  projectReferences: " + JSON.stringify(projectReferences));
+                writeLog("  projectReferences: ".concat(JSON.stringify(projectReferences)));
             var needsUpdateInTypeRootWatch = hasChangedCompilerOptions || !getCurrentProgram();
             hasChangedCompilerOptions = false;
             hasChangedConfigFileParsingErrors = false;
@@ -101985,7 +102162,7 @@ var ts;
                 return resolutionCache.invalidateResolutionsOfFailedLookupLocations();
             }
             var pending = clearInvalidateResolutionsOfFailedLookupLocations();
-            writeLog("Scheduling invalidateFailedLookup" + (pending ? ", Cancelled earlier one" : ""));
+            writeLog("Scheduling invalidateFailedLookup".concat(pending ? ", Cancelled earlier one" : ""));
             timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250);
         }
         function invalidateResolutionsOfFailedLookup() {
@@ -102041,7 +102218,7 @@ var ts;
             synchronizeProgram();
         }
         function reloadConfigFile() {
-            writeLog("Reloading config file: " + configFileName);
+            writeLog("Reloading config file: ".concat(configFileName));
             reloadLevel = ts.ConfigFileProgramReloadLevel.None;
             if (cachedDirectoryStructureHost) {
                 cachedDirectoryStructureHost.clearCache();
@@ -102079,7 +102256,7 @@ var ts;
                     return config.parsedCommandLine;
                 }
             }
-            writeLog("Loading config file: " + configFileName);
+            writeLog("Loading config file: ".concat(configFileName));
             var parsedCommandLine = host.getParsedCommandLine ?
                 host.getParsedCommandLine(configFileName) :
                 getParsedCommandLineFromConfigFileHost(configFileName);
@@ -102329,8 +102506,8 @@ var ts;
     ts.getBuildOrderFromAnyBuildOrder = getBuildOrderFromAnyBuildOrder;
     function createBuilderStatusReporter(system, pretty) {
         return function (diagnostic) {
-            var output = pretty ? "[" + ts.formatColorAndReset(ts.getLocaleTimeString(system), ts.ForegroundColorEscapeSequences.Grey) + "] " : ts.getLocaleTimeString(system) + " - ";
-            output += "" + ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine) + (system.newLine + system.newLine);
+            var output = pretty ? "[".concat(ts.formatColorAndReset(ts.getLocaleTimeString(system), ts.ForegroundColorEscapeSequences.Grey), "] ") : "".concat(ts.getLocaleTimeString(system), " - ");
+            output += "".concat(ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine)).concat(system.newLine + system.newLine);
             system.write(output);
         };
     }
@@ -103073,7 +103250,7 @@ var ts;
     function listEmittedFile(_a, proj, file) {
         var write = _a.write;
         if (write && proj.options.listEmittedFiles) {
-            write("TSFILE: " + file);
+            write("TSFILE: ".concat(file));
         }
     }
     function getOldProgram(_a, proj, parsed) {
@@ -103102,7 +103279,7 @@ var ts;
     function buildErrors(state, resolvedPath, program, config, diagnostics, buildResult, errorType) {
         var canEmitBuildInfo = !(buildResult & BuildResultFlags.SyntaxErrors) && program && !ts.outFile(program.getCompilerOptions());
         reportAndStoreErrors(state, resolvedPath, diagnostics);
-        state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
+        state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.Unbuildable, reason: "".concat(errorType, " errors") });
         if (canEmitBuildInfo)
             return { buildResult: buildResult, step: BuildStep.EmitBuildInfo };
         afterProgramDone(state, program, config);
@@ -103128,7 +103305,7 @@ var ts;
             if (!host.fileExists(inputFile)) {
                 return {
                     type: ts.UpToDateStatusType.Unbuildable,
-                    reason: inputFile + " does not exist"
+                    reason: "".concat(inputFile, " does not exist")
                 };
             }
             if (!force) {
@@ -103453,7 +103630,7 @@ var ts;
             }
         }
         if (filesToDelete) {
-            reportStatus(state, ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * " + f; }).join(""));
+            reportStatus(state, ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * ".concat(f); }).join(""));
         }
         return ts.ExitStatus.Success;
     }
@@ -103803,7 +103980,7 @@ var ts;
             };
         }
         function bold(str) {
-            return "\u001B[1m" + str + "\u001B[22m";
+            return "\u001B[1m".concat(str, "\u001B[22m");
         }
         var isWindows = sys.getEnvironmentVariable("OS") && ts.stringContains(sys.getEnvironmentVariable("OS").toLowerCase(), "windows");
         var isWindowsTerminal = sys.getEnvironmentVariable("WT_SESSION");
@@ -103812,19 +103989,19 @@ var ts;
             if (isWindows && !isWindowsTerminal && !isVSCode) {
                 return brightWhite(str);
             }
-            return "\u001B[94m" + str + "\u001B[39m";
+            return "\u001B[94m".concat(str, "\u001B[39m");
         }
         var supportsRicherColors = sys.getEnvironmentVariable("COLORTERM") === "truecolor" || sys.getEnvironmentVariable("TERM") === "xterm-256color";
         function blueBackground(str) {
             if (supportsRicherColors) {
-                return "\u001B[48;5;68m" + str + "\u001B[39;49m";
+                return "\u001B[48;5;68m".concat(str, "\u001B[39;49m");
             }
             else {
-                return "\u001B[44m" + str + "\u001B[39;49m";
+                return "\u001B[44m".concat(str, "\u001B[39;49m");
             }
         }
         function brightWhite(str) {
-            return "\u001B[97m" + str + "\u001B[39m";
+            return "\u001B[97m".concat(str, "\u001B[39m");
         }
         return {
             bold: bold,
@@ -103834,7 +104011,7 @@ var ts;
         };
     }
     function getDisplayNameTextOfOption(option) {
-        return "--" + option.name + (option.shortName ? ", -" + option.shortName : "");
+        return "--".concat(option.name).concat(option.shortName ? ", -".concat(option.shortName) : "");
     }
     function generateOptionOutput(sys, option, rightAlignOfLeft, leftAlignOfRight) {
         var _a, _b;
@@ -103871,13 +104048,13 @@ var ts;
             text.push(sys.newLine);
             if (showAdditionalInfoOutput(valueCandidates, option)) {
                 if (valueCandidates) {
-                    text.push(valueCandidates.valueType + " " + valueCandidates.possibleValues);
+                    text.push("".concat(valueCandidates.valueType, " ").concat(valueCandidates.possibleValues));
                 }
                 if (defaultValueDescription) {
                     if (valueCandidates)
                         text.push(sys.newLine);
                     var diagType = ts.getDiagnosticText(ts.Diagnostics.default_Colon);
-                    text.push(diagType + " " + defaultValueDescription);
+                    text.push("".concat(diagType, " ").concat(defaultValueDescription));
                 }
                 text.push(sys.newLine);
             }
@@ -103926,7 +104103,7 @@ var ts;
                 }
                 var curRight = remainRight.substr(0, rightCharacterNumber);
                 remainRight = remainRight.slice(rightCharacterNumber);
-                res.push("" + curLeft + curRight);
+                res.push("".concat(curLeft).concat(curRight));
                 isFirstLine = false;
             }
             return res;
@@ -104027,7 +104204,7 @@ var ts;
             categoryMap.set(curCategory, optionsOfCurCategory);
         }
         categoryMap.forEach(function (value, key) {
-            res.push("### " + key + sys.newLine + sys.newLine);
+            res.push("### ".concat(key).concat(sys.newLine).concat(sys.newLine));
             res = __spreadArray(__spreadArray([], res, true), generateGroupOptionOutput(sys, value), true);
         });
         if (afterOptionsDescription) {
@@ -104037,7 +104214,7 @@ var ts;
     }
     function printEasyHelp(sys, simpleOptions) {
         var colors = createColors(sys);
-        var output = __spreadArray([], getHeader(sys, ts.getDiagnosticText(ts.Diagnostics.tsc_Colon_The_TypeScript_Compiler) + " - " + ts.getDiagnosticText(ts.Diagnostics.Version_0, ts.version)), true);
+        var output = __spreadArray([], getHeader(sys, "".concat(ts.getDiagnosticText(ts.Diagnostics.tsc_Colon_The_TypeScript_Compiler), " - ").concat(ts.getDiagnosticText(ts.Diagnostics.Version_0, ts.version))), true);
         output.push(colors.bold(ts.getDiagnosticText(ts.Diagnostics.COMMON_COMMANDS)) + sys.newLine + sys.newLine);
         example("tsc", ts.Diagnostics.Compiles_the_current_project_tsconfig_json_in_the_working_directory);
         example("tsc app.ts util.ts", ts.Diagnostics.Ignoring_tsconfig_json_compiles_the_specified_files_with_default_compiler_options);
@@ -104063,7 +104240,7 @@ var ts;
         }
     }
     function printAllHelp(sys, compilerOptions, buildOptions, watchOptions) {
-        var output = __spreadArray([], getHeader(sys, ts.getDiagnosticText(ts.Diagnostics.tsc_Colon_The_TypeScript_Compiler) + " - " + ts.getDiagnosticText(ts.Diagnostics.Version_0, ts.version)), true);
+        var output = __spreadArray([], getHeader(sys, "".concat(ts.getDiagnosticText(ts.Diagnostics.tsc_Colon_The_TypeScript_Compiler), " - ").concat(ts.getDiagnosticText(ts.Diagnostics.Version_0, ts.version))), true);
         output = __spreadArray(__spreadArray([], output, true), generateSectionOptionsOutput(sys, ts.getDiagnosticText(ts.Diagnostics.ALL_COMPILER_OPTIONS), compilerOptions, true, undefined, ts.formatMessage(undefined, ts.Diagnostics.You_can_learn_about_all_of_the_compiler_options_at_0, "https://aka.ms/tsc")), true);
         output = __spreadArray(__spreadArray([], output, true), generateSectionOptionsOutput(sys, ts.getDiagnosticText(ts.Diagnostics.WATCH_OPTIONS), watchOptions, false, ts.getDiagnosticText(ts.Diagnostics.Including_watch_w_will_start_watching_the_current_project_for_the_file_changes_Once_set_you_can_config_watch_mode_with_Colon)), true);
         output = __spreadArray(__spreadArray([], output, true), generateSectionOptionsOutput(sys, ts.getDiagnosticText(ts.Diagnostics.BUILD_OPTIONS), buildOptions, false, ts.formatMessage(undefined, ts.Diagnostics.Using_build_b_will_make_tsc_behave_more_like_a_build_orchestrator_than_a_compiler_This_is_used_to_trigger_building_composite_projects_which_you_can_learn_more_about_at_0, "https://aka.ms/tsc-composite-builds")), true);
@@ -104073,7 +104250,7 @@ var ts;
         }
     }
     function printBuildHelp(sys, buildOptions) {
-        var output = __spreadArray([], getHeader(sys, ts.getDiagnosticText(ts.Diagnostics.tsc_Colon_The_TypeScript_Compiler) + " - " + ts.getDiagnosticText(ts.Diagnostics.Version_0, ts.version)), true);
+        var output = __spreadArray([], getHeader(sys, "".concat(ts.getDiagnosticText(ts.Diagnostics.tsc_Colon_The_TypeScript_Compiler), " - ").concat(ts.getDiagnosticText(ts.Diagnostics.Version_0, ts.version))), true);
         output = __spreadArray(__spreadArray([], output, true), generateSectionOptionsOutput(sys, ts.getDiagnosticText(ts.Diagnostics.BUILD_OPTIONS), buildOptions, false, ts.formatMessage(undefined, ts.Diagnostics.Using_build_b_will_make_tsc_behave_more_like_a_build_orchestrator_than_a_compiler_This_is_used_to_trigger_building_composite_projects_which_you_can_learn_more_about_at_0, "https://aka.ms/tsc-composite-builds")), true);
         for (var _i = 0, output_3 = output; _i < output_3.length; _i++) {
             var line = output_3[_i];
@@ -104454,7 +104631,7 @@ var ts;
                 reportCountStatistic("Subtype cache size", caches.subtype);
                 reportCountStatistic("Strict subtype cache size", caches.strictSubtype);
                 if (isPerformanceEnabled) {
-                    ts.performance.forEachMeasure(function (name, duration) { return reportTimeStatistic(name + " time", duration); });
+                    ts.performance.forEachMeasure(function (name, duration) { return reportTimeStatistic("".concat(name, " time"), duration); });
                 }
             }
             else if (isPerformanceEnabled) {
@@ -104525,7 +104702,7 @@ var ts;
 // This file actually uses arguments passed on commandline and executes it
 ts.Debug.loggingHost = {
     log: function (_level, s) {
-        ts.sys.write("" + (s || "") + ts.sys.newLine);
+        ts.sys.write("".concat(s || "").concat(ts.sys.newLine));
     }
 };
 if (ts.Debug.isDebugging) {