typescript 4.8.1-rc → 4.9.0-dev.20220813

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 || Array.prototype.slice.call(from));
+    return to.concat(ar || from);
 };
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
@@ -68,8 +68,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var ts;
 (function (ts) {
-    ts.versionMajorMinor = "4.8";
-    ts.version = "4.8.1-rc";
+    ts.versionMajorMinor = "4.9";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220813";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -78,24 +78,25 @@ var ts;
                     undefined;
         function tryGetNativeMap() {
             var gMap = globals === null || globals === void 0 ? void 0 : globals.Map;
-            return typeof gMap !== "undefined" && "entries" in gMap.prototype && new gMap([[0, 0]]).size === 1 ? gMap : undefined;
+            var constructor = typeof gMap !== "undefined" && "entries" in gMap.prototype && new gMap([[0, 0]]).size === 1 ? gMap : undefined;
+            if (!constructor) {
+                throw new Error("No compatible Map implementation found.");
+            }
+            return constructor;
         }
         NativeCollections.tryGetNativeMap = tryGetNativeMap;
         function tryGetNativeSet() {
             var gSet = globals === null || globals === void 0 ? void 0 : globals.Set;
-            return typeof gSet !== "undefined" && "entries" in gSet.prototype && new gSet([0]).size === 1 ? gSet : undefined;
+            var constructor = typeof gSet !== "undefined" && "entries" in gSet.prototype && new gSet([0]).size === 1 ? gSet : undefined;
+            if (!constructor) {
+                throw new Error("No compatible Set implementation found.");
+            }
+            return constructor;
         }
         NativeCollections.tryGetNativeSet = tryGetNativeSet;
     })(NativeCollections || (NativeCollections = {}));
-    ts.Map = getCollectionImplementation("Map", "tryGetNativeMap", "createMapShim");
-    ts.Set = getCollectionImplementation("Set", "tryGetNativeSet", "createSetShim");
-    function getCollectionImplementation(name, nativeFactory, shimFactory) {
-        var _a;
-        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 ".concat(name, " implementation."));
-    }
+    ts.Map = NativeCollections.tryGetNativeMap();
+    ts.Set = NativeCollections.tryGetNativeSet();
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -759,15 +760,18 @@ var ts;
     function insertSorted(array, insert, compare, allowDuplicates) {
         if (array.length === 0) {
             array.push(insert);
-            return;
+            return true;
         }
         var insertIndex = binarySearch(array, insert, identity, compare);
         if (insertIndex < 0) {
             array.splice(~insertIndex, 0, insert);
+            return true;
         }
-        else if (allowDuplicates) {
+        if (allowDuplicates) {
             array.splice(insertIndex, 0, insert);
+            return true;
         }
+        return false;
     }
     ts.insertSorted = insertSorted;
     function sortAndDeduplicate(array, comparer, equalityComparer) {
@@ -1479,7 +1483,7 @@ var ts;
     function cast(value, test) {
         if (value !== undefined && test(value))
             return value;
-        return ts.Debug.fail("Invalid cast. The supplied value ".concat(value, " did not pass the test '").concat(ts.Debug.getFunctionName(test), "'."));
+        return ts.Debug.fail("Invalid cast. The supplied value " + value + " did not pass the test '" + ts.Debug.getFunctionName(test) + "'.");
     }
     ts.cast = cast;
     function noop(_) { }
@@ -1533,7 +1537,7 @@ var ts;
     function memoizeOne(callback) {
         var map = new ts.Map();
         return function (arg) {
-            var key = "".concat(typeof arg, ":").concat(arg);
+            var key = typeof arg + ":" + arg;
             var value = map.get(key);
             if (value === undefined && !map.has(key)) {
                 value = callback(arg);
@@ -1868,7 +1872,7 @@ var ts;
     ts.createGetCanonicalFileName = createGetCanonicalFileName;
     function patternText(_a) {
         var prefix = _a.prefix, suffix = _a.suffix;
-        return "".concat(prefix, "*").concat(suffix);
+        return prefix + "*" + suffix;
     }
     ts.patternText = patternText;
     function matchedText(pattern, candidate) {
@@ -2140,7 +2144,7 @@ var ts;
         }
         function fail(message, stackCrawlMark) {
             debugger;
-            var e = new Error(message ? "Debug Failure. ".concat(message) : "Debug Failure.");
+            var e = new Error(message ? "Debug Failure. " + message : "Debug Failure.");
             if (Error.captureStackTrace) {
                 Error.captureStackTrace(e, stackCrawlMark || fail);
             }
@@ -2148,12 +2152,12 @@ var ts;
         }
         Debug.fail = fail;
         function failBadSyntaxKind(node, message, stackCrawlMark) {
-            return fail("".concat(message || "Unexpected node.", "\r\nNode ").concat(formatSyntaxKind(node.kind), " was unexpected."), stackCrawlMark || failBadSyntaxKind);
+            return fail((message || "Unexpected node.") + "\r\nNode " + formatSyntaxKind(node.kind) + " was unexpected.", stackCrawlMark || failBadSyntaxKind);
         }
         Debug.failBadSyntaxKind = failBadSyntaxKind;
         function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
             if (!expression) {
-                message = message ? "False expression: ".concat(message) : "False expression.";
+                message = message ? "False expression: " + message : "False expression.";
                 if (verboseDebugInfo) {
                     message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
                 }
@@ -2163,26 +2167,26 @@ var ts;
         Debug.assert = assert;
         function assertEqual(a, b, msg, msg2, stackCrawlMark) {
             if (a !== b) {
-                var message = msg ? msg2 ? "".concat(msg, " ").concat(msg2) : msg : "";
-                fail("Expected ".concat(a, " === ").concat(b, ". ").concat(message), stackCrawlMark || assertEqual);
+                var message = msg ? msg2 ? msg + " " + msg2 : msg : "";
+                fail("Expected " + a + " === " + b + ". " + message, stackCrawlMark || assertEqual);
             }
         }
         Debug.assertEqual = assertEqual;
         function assertLessThan(a, b, msg, stackCrawlMark) {
             if (a >= b) {
-                fail("Expected ".concat(a, " < ").concat(b, ". ").concat(msg || ""), stackCrawlMark || assertLessThan);
+                fail("Expected " + a + " < " + b + ". " + (msg || ""), stackCrawlMark || assertLessThan);
             }
         }
         Debug.assertLessThan = assertLessThan;
         function assertLessThanOrEqual(a, b, stackCrawlMark) {
             if (a > b) {
-                fail("Expected ".concat(a, " <= ").concat(b), stackCrawlMark || assertLessThanOrEqual);
+                fail("Expected " + a + " <= " + b, stackCrawlMark || assertLessThanOrEqual);
             }
         }
         Debug.assertLessThanOrEqual = assertLessThanOrEqual;
         function assertGreaterThanOrEqual(a, b, stackCrawlMark) {
             if (a < b) {
-                fail("Expected ".concat(a, " >= ").concat(b), stackCrawlMark || assertGreaterThanOrEqual);
+                fail("Expected " + a + " >= " + b, stackCrawlMark || assertGreaterThanOrEqual);
             }
         }
         Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
@@ -2212,42 +2216,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("".concat(message, " ").concat(detail), stackCrawlMark || assertNever);
+            return fail(message + " " + 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 '".concat(getFunctionName(test), "'."); }, stackCrawlMark || assertEachNode);
+                assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '" + 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 ".concat(formatSyntaxKind(node === null || node === void 0 ? void 0 : node.kind), " did not pass test '").concat(getFunctionName(test), "'."); }, stackCrawlMark || 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);
             }
         }
         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 ".concat(formatSyntaxKind(node.kind), " should not have passed test '").concat(getFunctionName(test), "'."); }, stackCrawlMark || 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);
             }
         }
         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 ".concat(formatSyntaxKind(node === null || node === void 0 ? void 0 : node.kind), " did not pass test '").concat(getFunctionName(test), "'."); }, stackCrawlMark || 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);
             }
         }
         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 ".concat(formatSyntaxKind(node === null || node === void 0 ? void 0 : node.kind), " was not a '").concat(formatSyntaxKind(kind), "' token."); }, stackCrawlMark || 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);
             }
         }
         Debug.assertOptionalToken = assertOptionalToken;
         function assertMissingNode(node, message, stackCrawlMark) {
             if (shouldAssertFunction(1, "assertMissingNode")) {
-                assert(node === undefined, message || "Unexpected node.", function () { return "Node ".concat(formatSyntaxKind(node.kind), " was unexpected'."); }, stackCrawlMark || assertMissingNode);
+                assert(node === undefined, message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " was unexpected'."; }, stackCrawlMark || assertMissingNode);
             }
         }
         Debug.assertMissingNode = assertMissingNode;
@@ -2268,7 +2272,7 @@ var ts;
         }
         Debug.getFunctionName = getFunctionName;
         function formatSymbol(symbol) {
-            return "{ name: ".concat(ts.unescapeLeadingUnderscores(symbol.escapedName), "; flags: ").concat(formatSymbolFlags(symbol.flags), "; declarations: ").concat(ts.map(symbol.declarations, function (node) { return formatSyntaxKind(node.kind); }), " }");
+            return "{ name: " + ts.unescapeLeadingUnderscores(symbol.escapedName) + "; flags: " + formatSymbolFlags(symbol.flags) + "; declarations: " + ts.map(symbol.declarations, function (node) { return formatSyntaxKind(node.kind); }) + " }";
         }
         Debug.formatSymbol = formatSymbol;
         function formatEnum(value, enumObject, isFlags) {
@@ -2418,7 +2422,7 @@ var ts;
                                                                     this.flags & 1 ? "FlowUnreachable" :
                                                                         "UnknownFlow";
                             var remainingFlags = this.flags & ~(2048 - 1);
-                            return "".concat(flowHeader).concat(remainingFlags ? " (".concat(formatFlowFlags(remainingFlags), ")") : "");
+                            return "" + flowHeader + (remainingFlags ? " (" + formatFlowFlags(remainingFlags) + ")" : "");
                         }
                     },
                     __debugFlowFlags: { get: function () { return formatEnum(this.flags, ts.FlowFlags, true); } },
@@ -2448,7 +2452,7 @@ var ts;
                     __tsDebuggerDisplay: {
                         value: function (defaultValue) {
                             defaultValue = String(defaultValue).replace(/(?:,[\s\w\d_]+:[^,]+)+\]$/, "]");
-                            return "NodeArray ".concat(defaultValue);
+                            return "NodeArray " + defaultValue;
                         }
                     }
                 });
@@ -2494,7 +2498,7 @@ var ts;
                         var symbolHeader = this.flags & 33554432 ? "TransientSymbol" :
                             "Symbol";
                         var remainingSymbolFlags = this.flags & ~33554432;
-                        return "".concat(symbolHeader, " '").concat(ts.symbolName(this), "'").concat(remainingSymbolFlags ? " (".concat(formatSymbolFlags(remainingSymbolFlags), ")") : "");
+                        return symbolHeader + " '" + ts.symbolName(this) + "'" + (remainingSymbolFlags ? " (" + formatSymbolFlags(remainingSymbolFlags) + ")" : "");
                     }
                 },
                 __debugFlags: { get: function () { return formatSymbolFlags(this.flags); } }
@@ -2503,11 +2507,11 @@ var ts;
                 __tsDebuggerDisplay: {
                     value: function () {
                         var typeHeader = this.flags & 98304 ? "NullableType" :
-                            this.flags & 384 ? "LiteralType ".concat(JSON.stringify(this.value)) :
-                                this.flags & 2048 ? "LiteralType ".concat(this.value.negative ? "-" : "").concat(this.value.base10Value, "n") :
+                            this.flags & 384 ? "LiteralType " + JSON.stringify(this.value) :
+                                this.flags & 2048 ? "LiteralType " + (this.value.negative ? "-" : "") + this.value.base10Value + "n" :
                                     this.flags & 8192 ? "UniqueESSymbolType" :
                                         this.flags & 32 ? "EnumType" :
-                                            this.flags & 67359327 ? "IntrinsicType ".concat(this.intrinsicName) :
+                                            this.flags & 67359327 ? "IntrinsicType " + this.intrinsicName :
                                                 this.flags & 1048576 ? "UnionType" :
                                                     this.flags & 2097152 ? "IntersectionType" :
                                                         this.flags & 4194304 ? "IndexType" :
@@ -2526,7 +2530,7 @@ var ts;
                                                                                                             "ObjectType" :
                                                                                 "Type";
                         var remainingObjectFlags = this.flags & 524288 ? this.objectFlags & ~1343 : 0;
-                        return "".concat(typeHeader).concat(this.symbol ? " '".concat(ts.symbolName(this.symbol), "'") : "").concat(remainingObjectFlags ? " (".concat(formatObjectFlags(remainingObjectFlags), ")") : "");
+                        return "" + typeHeader + (this.symbol ? " '" + ts.symbolName(this.symbol) + "'" : "") + (remainingObjectFlags ? " (" + formatObjectFlags(remainingObjectFlags) + ")" : "");
                     }
                 },
                 __debugFlags: { get: function () { return formatTypeFlags(this.flags); } },
@@ -2560,11 +2564,11 @@ var ts;
                         __tsDebuggerDisplay: {
                             value: function () {
                                 var nodeHeader = ts.isGeneratedIdentifier(this) ? "GeneratedIdentifier" :
-                                    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.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.isTypeParameterDeclaration(this) ? "TypeParameterDeclaration" :
                                                             ts.isParameter(this) ? "ParameterDeclaration" :
                                                                 ts.isConstructorDeclaration(this) ? "ConstructorDeclaration" :
@@ -2596,7 +2600,7 @@ var ts;
                                                                                                                                                                         ts.isNamedTupleMember(this) ? "NamedTupleMember" :
                                                                                                                                                                             ts.isImportTypeNode(this) ? "ImportTypeNode" :
                                                                                                                                                                                 formatSyntaxKind(this.kind);
-                                return "".concat(nodeHeader).concat(this.flags ? " (".concat(formatNodeFlags(this.flags), ")") : "");
+                                return "" + nodeHeader + (this.flags ? " (" + formatNodeFlags(this.flags) + ")" : "");
                             }
                         },
                         __debugKind: { get: function () { return formatSyntaxKind(this.kind); } },
@@ -2640,10 +2644,10 @@ var ts;
         Debug.enableDebugInfo = enableDebugInfo;
         function formatDeprecationMessage(name, error, errorAfter, since, message) {
             var deprecationMessage = error ? "DeprecationError: " : "DeprecationWarning: ";
-            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)) : "";
+            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) : "";
             return deprecationMessage;
         }
         function createErrorDeprecation(name, errorAfter, since, message) {
@@ -2711,11 +2715,11 @@ var ts;
                 type(this);
                 switch (this.kind) {
                     case 3: return ((_a = this.debugInfo) === null || _a === void 0 ? void 0 : _a.call(this)) || "(function mapper)";
-                    case 0: return "".concat(this.source.__debugTypeToString(), " -> ").concat(this.target.__debugTypeToString());
-                    case 1: return ts.zipWith(this.sources, this.targets || ts.map(this.sources, function () { return "any"; }), function (s, t) { return "".concat(s.__debugTypeToString(), " -> ").concat(typeof t === "string" ? t : t.__debugTypeToString()); }).join(", ");
-                    case 2: return ts.zipWith(this.sources, this.targets, function (s, t) { return "".concat(s.__debugTypeToString(), " -> ").concat(t().__debugTypeToString()); }).join(", ");
+                    case 0: return this.source.__debugTypeToString() + " -> " + this.target.__debugTypeToString();
+                    case 1: return ts.zipWith(this.sources, this.targets || ts.map(this.sources, function () { return "any"; }), function (s, t) { return s.__debugTypeToString() + " -> " + (typeof t === "string" ? t : t.__debugTypeToString()); }).join(", ");
+                    case 2: return ts.zipWith(this.sources, this.targets, function (s, t) { return s.__debugTypeToString() + " -> " + t().__debugTypeToString(); }).join(", ");
                     case 5:
-                    case 4: return "m1: ".concat(this.mapper1.__debugToString().split("\n").join("\n    "), "\nm2: ").concat(this.mapper2.__debugToString().split("\n").join("\n    "));
+                    case 4: return "m1: " + this.mapper1.__debugToString().split("\n").join("\n    ") + "\nm2: " + this.mapper2.__debugToString().split("\n").join("\n    ");
                     default: return assertNever(this);
                 }
             };
@@ -2784,11 +2788,11 @@ var ts;
             }
         };
         Version.prototype.toString = function () {
-            var result = "".concat(this.major, ".").concat(this.minor, ".").concat(this.patch);
+            var result = this.major + "." + this.minor + "." + this.patch;
             if (ts.some(this.prerelease))
-                result += "-".concat(this.prerelease.join("."));
+                result += "-" + this.prerelease.join(".");
             if (ts.some(this.build))
-                result += "+".concat(this.build.join("."));
+                result += "+" + this.build.join(".");
             return result;
         };
         Version.zero = new Version(0, 0, 0);
@@ -3010,7 +3014,7 @@ var ts;
         return ts.map(comparators, formatComparator).join(" ");
     }
     function formatComparator(comparator) {
-        return "".concat(comparator.operator).concat(comparator.operand);
+        return "" + comparator.operator + comparator.operand;
     }
 })(ts || (ts = {}));
 var ts;
@@ -3021,6 +3025,8 @@ var ts;
             typeof performance.mark === "function" &&
             typeof performance.measure === "function" &&
             typeof performance.now === "function" &&
+            typeof performance.clearMarks === "function" &&
+            typeof performance.clearMeasures === "function" &&
             typeof PerformanceObserver === "function";
     }
     function tryGetWebPerformanceHooks() {
@@ -3058,7 +3064,9 @@ var ts;
                                 if (end === "__performance.measure-fix__") {
                                     nodePerformance_1.clearMarks("__performance.measure-fix__");
                                 }
-                            }
+                            },
+                            clearMarks: function (name) { return nodePerformance_1.clearMarks(name); },
+                            clearMeasures: function (name) { return nodePerformance_1.clearMeasures(name); },
                         };
                     }
                     return {
@@ -3153,6 +3161,30 @@ var ts;
             durations.forEach(function (duration, measureName) { return cb(measureName, duration); });
         }
         performance.forEachMeasure = forEachMeasure;
+        function forEachMark(cb) {
+            marks.forEach(function (_time, markName) { return cb(markName); });
+        }
+        performance.forEachMark = forEachMark;
+        function clearMeasures(name) {
+            if (name !== undefined)
+                durations.delete(name);
+            else
+                durations.clear();
+            performanceImpl === null || performanceImpl === void 0 ? void 0 : performanceImpl.clearMeasures(name);
+        }
+        performance.clearMeasures = clearMeasures;
+        function clearMarks(name) {
+            if (name !== undefined) {
+                counts.delete(name);
+                marks.delete(name);
+            }
+            else {
+                counts.clear();
+                marks.clear();
+            }
+            performanceImpl === null || performanceImpl === void 0 ? void 0 : performanceImpl.clearMarks(name);
+        }
+        performance.clearMarks = clearMarks;
         function isEnabled() {
             return enabled;
         }
@@ -3239,7 +3271,7 @@ var ts;
                     fs = require("fs");
                 }
                 catch (e) {
-                    throw new Error("tracing requires having fs\n(original error: ".concat(e.message || e, ")"));
+                    throw new Error("tracing requires having fs\n(original error: " + (e.message || e) + ")");
                 }
             }
             mode = tracingMode;
@@ -3250,11 +3282,11 @@ var ts;
             if (!fs.existsSync(traceDir)) {
                 fs.mkdirSync(traceDir, { recursive: true });
             }
-            var countPart = mode === "build" ? ".".concat(process.pid, "-").concat(++traceCount)
-                : mode === "server" ? ".".concat(process.pid)
+            var countPart = mode === "build" ? "." + process.pid + "-" + ++traceCount
+                : mode === "server" ? "." + process.pid
                     : "";
-            var tracePath = ts.combinePaths(traceDir, "trace".concat(countPart, ".json"));
-            var typesPath = ts.combinePaths(traceDir, "types".concat(countPart, ".json"));
+            var tracePath = ts.combinePaths(traceDir, "trace" + countPart + ".json");
+            var typesPath = ts.combinePaths(traceDir, "types" + countPart + ".json");
             legend.push({
                 configFilePath: configFilePath,
                 tracePath: tracePath,
@@ -3323,7 +3355,7 @@ var ts;
                 writeEvent("E", phase, name, args, undefined, endTime);
             }
             else if (sampleInterval - (time % sampleInterval) <= endTime - time) {
-                writeEvent("X", phase, name, __assign(__assign({}, args), { results: results }), "\"dur\":".concat(endTime - time), time);
+                writeEvent("X", phase, name, __assign(__assign({}, args), { results: results }), "\"dur\":" + (endTime - time), time);
             }
         }
         function writeEvent(eventType, phase, name, args, extras, time) {
@@ -3331,11 +3363,11 @@ var ts;
             if (mode === "server" && phase === "checkTypes")
                 return;
             ts.performance.mark("beginTracing");
-            fs.writeSync(traceFd, ",\n{\"pid\":1,\"tid\":1,\"ph\":\"".concat(eventType, "\",\"cat\":\"").concat(phase, "\",\"ts\":").concat(time, ",\"name\":\"").concat(name, "\""));
+            fs.writeSync(traceFd, ",\n{\"pid\":1,\"tid\":1,\"ph\":\"" + eventType + "\",\"cat\":\"" + phase + "\",\"ts\":" + time + ",\"name\":\"" + name + "\"");
             if (extras)
-                fs.writeSync(traceFd, ",".concat(extras));
+                fs.writeSync(traceFd, "," + extras);
             if (args)
-                fs.writeSync(traceFd, ",\"args\":".concat(JSON.stringify(args)));
+                fs.writeSync(traceFd, ",\"args\":" + JSON.stringify(args));
             fs.writeSync(traceFd, "}");
             ts.performance.mark("endTracing");
             ts.performance.measure("Tracing", "beginTracing", "endTracing");
@@ -3662,7 +3694,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("".concat(envVar, "_").concat(level.toUpperCase()));
+            return system.getEnvironmentVariable(envVar + "_" + level.toUpperCase());
         }
         function getCustomLevels(baseVariable) {
             var customLevels;
@@ -4086,7 +4118,7 @@ var ts;
         }
         function onTimerToUpdateChildWatches() {
             timerToUpdateChildWatches = undefined;
-            sysLog("sysLog:: onTimerToUpdateChildWatches:: ".concat(cacheToUpdateChildWatches.size));
+            sysLog("sysLog:: onTimerToUpdateChildWatches:: " + cacheToUpdateChildWatches.size);
             var start = ts.timestamp();
             var invokeMap = new ts.Map();
             while (!timerToUpdateChildWatches && cacheToUpdateChildWatches.size) {
@@ -4097,7 +4129,7 @@ var ts;
                 var hasChanges = updateChildWatches(dirName, dirPath, options);
                 invokeCallbacks(dirPath, invokeMap, hasChanges ? undefined : fileNames);
             }
-            sysLog("sysLog:: invokingWatchers:: Elapsed:: ".concat(ts.timestamp() - start, "ms:: ").concat(cacheToUpdateChildWatches.size));
+            sysLog("sysLog:: invokingWatchers:: Elapsed:: " + (ts.timestamp() - start) + "ms:: " + cacheToUpdateChildWatches.size);
             callbackCache.forEach(function (callbacks, rootDirName) {
                 var existing = invokeMap.get(rootDirName);
                 if (existing) {
@@ -4113,7 +4145,7 @@ var ts;
                 }
             });
             var elapsed = ts.timestamp() - start;
-            sysLog("sysLog:: Elapsed:: ".concat(elapsed, "ms:: onTimerToUpdateChildWatches:: ").concat(cacheToUpdateChildWatches.size, " ").concat(timerToUpdateChildWatches));
+            sysLog("sysLog:: Elapsed:: " + elapsed + "ms:: onTimerToUpdateChildWatches:: " + cacheToUpdateChildWatches.size + " " + timerToUpdateChildWatches);
         }
         function removeChildWatches(parentWatcher) {
             if (!parentWatcher)
@@ -4329,14 +4361,14 @@ var ts;
             };
             function updateWatcher(createWatcher) {
                 if (watcher) {
-                    sysLog("sysLog:: ".concat(fileOrDirectory, ":: Changing watcher to ").concat(createWatcher === watchPresentFileSystemEntry ? "Present" : "Missing", "FileSystemEntryWatcher"));
+                    sysLog("sysLog:: " + fileOrDirectory + ":: Changing watcher to " + (createWatcher === watchPresentFileSystemEntry ? "Present" : "Missing") + "FileSystemEntryWatcher");
                     watcher.close();
                     watcher = createWatcher();
                 }
             }
             function watchPresentFileSystemEntry() {
                 if (hitSystemWatcherLimit) {
-                    sysLog("sysLog:: ".concat(fileOrDirectory, ":: Defaulting to watchFile"));
+                    sysLog("sysLog:: " + fileOrDirectory + ":: Defaulting to watchFile");
                     return watchPresentFileSystemEntryWithFsWatchFile();
                 }
                 try {
@@ -4351,7 +4383,7 @@ var ts;
                 }
                 catch (e) {
                     hitSystemWatcherLimit || (hitSystemWatcherLimit = e.code === "ENOSPC");
-                    sysLog("sysLog:: ".concat(fileOrDirectory, ":: Changing to watchFile"));
+                    sysLog("sysLog:: " + fileOrDirectory + ":: Changing to watchFile");
                     return watchPresentFileSystemEntryWithFsWatchFile();
                 }
             }
@@ -4595,7 +4627,7 @@ var ts;
                 var externalFileCounter = 0;
                 var remappedPaths = new ts.Map();
                 var normalizedDir = ts.normalizeSlashes(__dirname);
-                var fileUrlRoot = "file://".concat(ts.getRootLength(normalizedDir) === 1 ? "" : "/").concat(normalizedDir);
+                var fileUrlRoot = "file://" + (ts.getRootLength(normalizedDir) === 1 ? "" : "/") + normalizedDir;
                 for (var _i = 0, _a = profile.nodes; _i < _a.length; _i++) {
                     var node = _a[_i];
                     if (node.callFrame.url) {
@@ -4604,7 +4636,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".concat(externalFileCounter, ".js"))).get(url);
+                            node.callFrame.url = (remappedPaths.has(url) ? remappedPaths : remappedPaths.set(url, "external" + externalFileCounter + ".js")).get(url);
                             externalFileCounter++;
                         }
                     }
@@ -4620,7 +4652,7 @@ var ts;
                         if (!err) {
                             try {
                                 if ((_b = statSync(profilePath)) === null || _b === void 0 ? void 0 : _b.isDirectory()) {
-                                    profilePath = _path.join(profilePath, "".concat((new Date()).toISOString().replace(/:/g, "-"), "+P").concat(process.pid, ".cpuprofile"));
+                                    profilePath = _path.join(profilePath, (new Date()).toISOString().replace(/:/g, "-") + "+P" + process.pid + ".cpuprofile");
                                 }
                             }
                             catch (_c) {
@@ -5078,12 +5110,9 @@ var ts;
     }
     ts.getPathFromPathComponents = getPathFromPathComponents;
     function normalizeSlashes(path) {
-        var index = path.indexOf("\\");
-        if (index === -1) {
-            return path;
-        }
-        backslashRegExp.lastIndex = index;
-        return path.replace(backslashRegExp, ts.directorySeparator);
+        return path.indexOf("\\") !== -1
+            ? path.replace(backslashRegExp, ts.directorySeparator)
+            : path;
     }
     ts.normalizeSlashes = normalizeSlashes;
     function reducePathComponents(components) {
@@ -6704,6 +6733,7 @@ var ts;
         Reusing_resolution_of_type_reference_directive_0_from_1_found_in_cache_from_location_2_it_was_not_resolved: diag(6398, ts.DiagnosticCategory.Message, "Reusing_resolution_of_type_reference_directive_0_from_1_found_in_cache_from_location_2_it_was_not_re_6398", "Reusing resolution of type reference directive '{0}' from '{1}' found in cache from location '{2}', it was not resolved."),
         Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitted: diag(6399, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitte_6399", "Project '{0}' is out of date because buildinfo file '{1}' indicates that some of the changes were not emitted"),
         Project_0_is_up_to_date_but_needs_to_update_timestamps_of_output_files_that_are_older_than_input_files: diag(6400, ts.DiagnosticCategory.Message, "Project_0_is_up_to_date_but_needs_to_update_timestamps_of_output_files_that_are_older_than_input_fil_6400", "Project '{0}' is up to date but needs to update timestamps of output files that are older than input files"),
+        Project_0_is_out_of_date_because_there_was_error_reading_file_1: diag(6401, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_there_was_error_reading_file_1_6401", "Project '{0}' is out of date because there was error reading file '{1}'"),
         The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1: diag(6500, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1_6500", "The expected type comes from property '{0}' which is declared here on type '{1}'"),
         The_expected_type_comes_from_this_index_signature: diag(6501, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_this_index_signature_6501", "The expected type comes from this index signature."),
         The_expected_type_comes_from_the_return_type_of_this_signature: diag(6502, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_the_return_type_of_this_signature_6502", "The expected type comes from the return type of this signature."),
@@ -7416,7 +7446,7 @@ var ts;
                 line = line < 0 ? 0 : line >= lineStarts.length ? lineStarts.length - 1 : line;
             }
             else {
-                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"));
+                ts.Debug.fail("Bad line number. Line: " + line + ", lineStarts.length: " + lineStarts.length + " , line map is correct? " + (debugText !== undefined ? ts.arraysEqual(lineStarts, computeLineStarts(debugText)) : "unknown"));
             }
         }
         var res = lineStarts[line] + character;
@@ -9943,7 +9973,7 @@ var ts;
                 : "linkplain";
         var name = link.name ? ts.entityNameToString(link.name) : "";
         var space = link.name && link.text.startsWith("://") ? "" : " ";
-        return "{@".concat(kind, " ").concat(name).concat(space).concat(link.text, "}");
+        return "{@" + kind + " " + name + space + link.text + "}";
     }
     function getEffectiveTypeParameterDeclarations(node) {
         if (ts.isJSDocSignature(node)) {
@@ -11070,11 +11100,11 @@ var ts;
     }
     function packageIdToPackageName(_a) {
         var name = _a.name, subModuleName = _a.subModuleName;
-        return subModuleName ? "".concat(name, "/").concat(subModuleName) : name;
+        return subModuleName ? name + "/" + subModuleName : name;
     }
     ts.packageIdToPackageName = packageIdToPackageName;
     function packageIdToString(packageId) {
-        return "".concat(packageIdToPackageName(packageId), "@").concat(packageId.version);
+        return packageIdToPackageName(packageId) + "@" + packageId.version;
     }
     ts.packageIdToString = packageIdToString;
     function typeDirectiveIsEqualTo(oldResolution, newResolution) {
@@ -11151,7 +11181,7 @@ var ts;
     function nodePosToString(node) {
         var file = getSourceFileOfNode(node);
         var loc = ts.getLineAndCharacterOfPosition(file, node.pos);
-        return "".concat(file.fileName, "(").concat(loc.line + 1, ",").concat(loc.character + 1, ")");
+        return file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + ")";
     }
     ts.nodePosToString = nodePosToString;
     function getEndLinePosition(line, sourceFile) {
@@ -11252,7 +11282,7 @@ var ts;
     ts.isPinnedComment = isPinnedComment;
     function createCommentDirectivesMap(sourceFile, commentDirectives) {
         var directivesByLine = new ts.Map(commentDirectives.map(function (commentDirective) { return ([
-            "".concat(ts.getLineAndCharacterOfPosition(sourceFile, commentDirective.range.end).line),
+            "" + ts.getLineAndCharacterOfPosition(sourceFile, commentDirective.range.end).line,
             commentDirective,
         ]); }));
         var usedLines = new ts.Map();
@@ -11269,10 +11299,10 @@ var ts;
             });
         }
         function markUsed(line) {
-            if (!directivesByLine.has("".concat(line))) {
+            if (!directivesByLine.has("" + line)) {
                 return false;
             }
-            usedLines.set("".concat(line), true);
+            usedLines.set("" + line, true);
             return true;
         }
     }
@@ -11472,7 +11502,7 @@ var ts;
                 }
                 return node.text;
         }
-        return ts.Debug.fail("Literal kind '".concat(node.kind, "' not accounted for."));
+        return ts.Debug.fail("Literal kind '" + node.kind + "' not accounted for.");
     }
     ts.getLiteralText = getLiteralText;
     function canUseOriginalText(node, flags) {
@@ -13831,11 +13861,11 @@ var ts;
     }
     ts.getEscapedTextOfIdentifierOrLiteral = getEscapedTextOfIdentifierOrLiteral;
     function getPropertyNameForUniqueESSymbol(symbol) {
-        return "__@".concat(ts.getSymbolId(symbol), "@").concat(symbol.escapedName);
+        return "__@" + ts.getSymbolId(symbol) + "@" + symbol.escapedName;
     }
     ts.getPropertyNameForUniqueESSymbol = getPropertyNameForUniqueESSymbol;
     function getSymbolNameForPrivateIdentifier(containingClassSymbol, description) {
-        return "__#".concat(ts.getSymbolId(containingClassSymbol), "@").concat(description);
+        return "__#" + ts.getSymbolId(containingClassSymbol) + "@" + description;
     }
     ts.getSymbolNameForPrivateIdentifier = getSymbolNameForPrivateIdentifier;
     function isKnownSymbol(symbol) {
@@ -15279,20 +15309,16 @@ var ts;
         return getStringFromExpandedCharCodes(expandedCharCodes);
     }
     ts.base64decode = base64decode;
+    function readJsonOrUndefined(path, hostOrText) {
+        var jsonText = ts.isString(hostOrText) ? hostOrText : hostOrText.readFile(path);
+        if (!jsonText)
+            return undefined;
+        var result = ts.parseConfigFileTextToJson(path, jsonText);
+        return !result.error ? result.config : undefined;
+    }
+    ts.readJsonOrUndefined = readJsonOrUndefined;
     function readJson(path, host) {
-        try {
-            var jsonText = host.readFile(path);
-            if (!jsonText)
-                return {};
-            var result = ts.parseConfigFileTextToJson(path, jsonText);
-            if (result.error) {
-                return {};
-            }
-            return result.config;
-        }
-        catch (e) {
-            return {};
-        }
+        return readJsonOrUndefined(path, host) || {};
     }
     ts.readJson = readJson;
     function directoryProbablyExists(directoryName, host) {
@@ -16232,7 +16258,7 @@ var ts;
     }
     ts.getJSXImplicitImportBase = getJSXImplicitImportBase;
     function getJSXRuntimeImport(base, options) {
-        return base ? "".concat(base, "/").concat(options.jsx === 5 ? "jsx-dev-runtime" : "jsx-runtime") : undefined;
+        return base ? base + "/" + (options.jsx === 5 ? "jsx-dev-runtime" : "jsx-runtime") : undefined;
     }
     ts.getJSXRuntimeImport = getJSXRuntimeImport;
     function hasZeroOrOneAsteriskCharacter(str) {
@@ -16330,15 +16356,15 @@ var ts;
     }
     var wildcardCharCodes = [42, 63];
     ts.commonPackageFolders = ["node_modules", "bower_components", "jspm_packages"];
-    var implicitExcludePathRegexPattern = "(?!(".concat(ts.commonPackageFolders.join("|"), ")(/|$))");
+    var implicitExcludePathRegexPattern = "(?!(" + ts.commonPackageFolders.join("|") + ")(/|$))";
     var filesMatcher = {
         singleAsteriskRegexFragment: "([^./]|(\\.(?!min\\.js$))?)*",
-        doubleAsteriskRegexFragment: "(/".concat(implicitExcludePathRegexPattern, "[^/.][^/]*)*?"),
+        doubleAsteriskRegexFragment: "(/" + implicitExcludePathRegexPattern + "[^/.][^/]*)*?",
         replaceWildcardCharacter: function (match) { return replaceWildcardCharacter(match, filesMatcher.singleAsteriskRegexFragment); }
     };
     var directoriesMatcher = {
         singleAsteriskRegexFragment: "[^/]*",
-        doubleAsteriskRegexFragment: "(/".concat(implicitExcludePathRegexPattern, "[^/.][^/]*)*?"),
+        doubleAsteriskRegexFragment: "(/" + implicitExcludePathRegexPattern + "[^/.][^/]*)*?",
         replaceWildcardCharacter: function (match) { return replaceWildcardCharacter(match, directoriesMatcher.singleAsteriskRegexFragment); }
     };
     var excludeMatcher = {
@@ -16356,9 +16382,9 @@ var ts;
         if (!patterns || !patterns.length) {
             return undefined;
         }
-        var pattern = patterns.map(function (pattern) { return "(".concat(pattern, ")"); }).join("|");
+        var pattern = patterns.map(function (pattern) { return "(" + pattern + ")"; }).join("|");
         var terminator = usage === "exclude" ? "($|/)" : "$";
-        return "^(".concat(pattern, ")").concat(terminator);
+        return "^(" + pattern + ")" + terminator;
     }
     ts.getRegularExpressionForWildcard = getRegularExpressionForWildcard;
     function getRegularExpressionsForWildcards(specs, basePath, usage) {
@@ -16376,7 +16402,7 @@ var ts;
     ts.isImplicitGlob = isImplicitGlob;
     function getPatternFromSpec(spec, basePath, usage) {
         var pattern = spec && getSubPatternFromSpec(spec, basePath, usage, wildcardMatchers[usage]);
-        return pattern && "^(".concat(pattern, ")").concat(usage === "exclude" ? "($|/)" : "$");
+        return pattern && "^(" + pattern + ")" + (usage === "exclude" ? "($|/)" : "$");
     }
     ts.getPatternFromSpec = getPatternFromSpec;
     function getSubPatternFromSpec(spec, basePath, usage, _a) {
@@ -16442,7 +16468,7 @@ var ts;
         currentDirectory = ts.normalizePath(currentDirectory);
         var absolutePath = ts.combinePaths(currentDirectory, path);
         return {
-            includeFilePatterns: ts.map(getRegularExpressionsForWildcards(includes, absolutePath, "files"), function (pattern) { return "^".concat(pattern, "$"); }),
+            includeFilePatterns: ts.map(getRegularExpressionsForWildcards(includes, absolutePath, "files"), function (pattern) { return "^" + pattern + "$"; }),
             includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
             includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
             excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
@@ -16688,7 +16714,7 @@ var ts;
     ts.resolutionExtensionIsTSOrJson = resolutionExtensionIsTSOrJson;
     function extensionFromPath(path) {
         var ext = tryGetExtensionFromPath(path);
-        return ext !== undefined ? ext : ts.Debug.fail("File ".concat(path, " has unknown extension."));
+        return ext !== undefined ? ext : ts.Debug.fail("File " + path + " has unknown extension.");
     }
     ts.extensionFromPath = extensionFromPath;
     function isAnySupportedFileExtension(path) {
@@ -22021,7 +22047,7 @@ var ts;
             case 328: return "augments";
             case 329: return "implements";
             default:
-                return ts.Debug.fail("Unsupported kind: ".concat(ts.Debug.formatSyntaxKind(kind)));
+                return ts.Debug.fail("Unsupported kind: " + ts.Debug.formatSyntaxKind(kind));
         }
     }
     var rawTextScanner;
@@ -22348,13 +22374,14 @@ var ts;
             };
             var definedTextGetter_1 = function (path) {
                 var result = textGetter_1(path);
-                return result !== undefined ? result : "/* Input file ".concat(path, " was missing */\r\n");
+                return result !== undefined ? result : "/* Input file " + path + " was missing */\r\n";
             };
             var buildInfo_1;
             var getAndCacheBuildInfo_1 = function (getText) {
+                var _a;
                 if (buildInfo_1 === undefined) {
                     var result = getText();
-                    buildInfo_1 = result !== undefined ? ts.getBuildInfo(result) : false;
+                    buildInfo_1 = result !== undefined ? (_a = ts.getBuildInfo(node.buildInfoPath, result)) !== null && _a !== void 0 ? _a : false : false;
                 }
                 return buildInfo_1 || undefined;
             };
@@ -26204,7 +26231,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 "".concat(keyword, " ").concat(expressionText.slice(keyword.length));
+                    return keyword + " " + expressionText.slice(keyword.length);
                 }
             }
             return undefined;
@@ -31812,7 +31839,7 @@ var ts;
         if (namedArgRegExCache.has(name)) {
             return namedArgRegExCache.get(name);
         }
-        var result = new RegExp("(\\s".concat(name, "\\s*=\\s*)(?:(?:'([^']*)')|(?:\"([^\"]*)\"))"), "im");
+        var result = new RegExp("(\\s" + name + "\\s*=\\s*)(?:(?:'([^']*)')|(?:\"([^\"]*)\"))", "im");
         namedArgRegExCache.set(name, result);
         return result;
     }
@@ -33331,8 +33358,8 @@ var ts;
     }
     ts.createCompilerDiagnosticForInvalidCustomType = createCompilerDiagnosticForInvalidCustomType;
     function createDiagnosticForInvalidCustomType(opt, createDiagnostic) {
-        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);
+        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);
     }
     function parseCustomTypeOption(opt, value, errors) {
         return convertJsonOptionOfCustomType(opt, ts.trimString(value || ""), errors);
@@ -34050,10 +34077,10 @@ var ts;
                 var newValue = compilerOptionsMap.get(cmd.name);
                 var defaultValue = getDefaultValueForOption(cmd);
                 if (newValue !== defaultValue) {
-                    result.push("".concat(tab).concat(cmd.name, ": ").concat(newValue));
+                    result.push("" + tab + cmd.name + ": " + newValue);
                 }
                 else if (ts.hasProperty(ts.defaultInitCompilerOptions, cmd.name)) {
-                    result.push("".concat(tab).concat(cmd.name, ": ").concat(defaultValue));
+                    result.push("" + tab + cmd.name + ": " + defaultValue);
                 }
             });
             return result.join(newLine) + newLine;
@@ -34091,19 +34118,19 @@ var ts;
                 if (entries.length !== 0) {
                     entries.push({ value: "" });
                 }
-                entries.push({ value: "/* ".concat(category, " */") });
+                entries.push({ value: "/* " + 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 = "\"".concat(option.name, "\": ").concat(JSON.stringify(compilerOptionsMap.get(option.name))).concat((seenKnownKeys += 1) === compilerOptionsMap.size ? "" : ",");
+                        optionName = "\"" + option.name + "\": " + JSON.stringify(compilerOptionsMap.get(option.name)) + ((seenKnownKeys += 1) === compilerOptionsMap.size ? "" : ",");
                     }
                     else {
-                        optionName = "// \"".concat(option.name, "\": ").concat(JSON.stringify(getDefaultValueForOption(option)), ",");
+                        optionName = "// \"" + option.name + "\": " + JSON.stringify(getDefaultValueForOption(option)) + ",";
                     }
                     entries.push({
                         value: optionName,
-                        description: "/* ".concat(option.description && ts.getLocaleSpecificMessage(option.description) || option.name, " */")
+                        description: "/* " + (option.description && ts.getLocaleSpecificMessage(option.description) || option.name) + " */"
                     });
                     marginLength = Math.max(optionName.length, marginLength);
                 }
@@ -34111,24 +34138,24 @@ var ts;
             var tab = makePadding(2);
             var result = [];
             result.push("{");
-            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(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("");
             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 && "".concat(tab).concat(tab).concat(value).concat(description && (makePadding(marginLength - value.length + 2) + description)));
+                result.push(value && "" + tab + tab + value + (description && (makePadding(marginLength - value.length + 2) + description)));
             }
             if (fileNames.length) {
-                result.push("".concat(tab, "},"));
-                result.push("".concat(tab, "\"files\": ["));
+                result.push(tab + "},");
+                result.push(tab + "\"files\": [");
                 for (var i = 0; i < fileNames.length; i++) {
-                    result.push("".concat(tab).concat(tab).concat(JSON.stringify(fileNames[i])).concat(i === fileNames.length - 1 ? "" : ","));
+                    result.push("" + tab + tab + JSON.stringify(fileNames[i]) + (i === fileNames.length - 1 ? "" : ","));
                 }
-                result.push("".concat(tab, "]"));
+                result.push(tab + "]");
             }
             else {
-                result.push("".concat(tab, "}"));
+                result.push(tab + "}");
             }
             result.push("}");
             return result.join(newLine) + newLine;
@@ -34485,7 +34512,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 = "".concat(extendedConfigPath, ".json");
+                extendedConfigPath = extendedConfigPath + ".json";
                 if (!host.fileExists(extendedConfigPath)) {
                     errors.push(createDiagnostic(ts.Diagnostics.File_0_not_found, extendedConfig));
                     return undefined;
@@ -34681,7 +34708,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 "^".concat(pattern, "$"); });
+                        var includeFilePatterns = ts.map(ts.getRegularExpressionsForWildcards(includes, basePath, "files"), function (pattern) { return "^" + 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); });
@@ -34909,7 +34936,7 @@ var ts;
                 return true;
             case "string":
                 var defaultValue = option.defaultValueDescription;
-                return option.isFilePath ? "./".concat(defaultValue && typeof defaultValue === "string" ? defaultValue : "") : "";
+                return option.isFilePath ? "./" + (defaultValue && typeof defaultValue === "string" ? defaultValue : "") : "";
             case "list":
                 return [];
             case "object":
@@ -35058,7 +35085,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['".concat(bestVersionKey, "']"), "object", typeof bestVersionPaths);
+                trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_1_got_2, "typesVersions['" + bestVersionKey + "']", "object", typeof bestVersionPaths);
             }
             return;
         }
@@ -35440,7 +35467,7 @@ var ts;
         };
         return cache;
         function getUnderlyingCacheKey(specifier, mode) {
-            var result = mode === undefined ? specifier : "".concat(mode, "|").concat(specifier);
+            var result = mode === undefined ? specifier : mode + "|" + specifier;
             memoizedReverseKeys.set(result, [specifier, mode]);
             return result;
         }
@@ -35476,7 +35503,7 @@ var ts;
         }
         function getOrCreateCacheForModuleName(nonRelativeModuleName, mode, redirectedReference) {
             ts.Debug.assert(!ts.isExternalModuleNameRelative(nonRelativeModuleName));
-            return getOrCreateCache(moduleNameToDirectoryMap, redirectedReference, mode === undefined ? nonRelativeModuleName : "".concat(mode, "|").concat(nonRelativeModuleName), createPerModuleNameCache);
+            return getOrCreateCache(moduleNameToDirectoryMap, redirectedReference, mode === undefined ? nonRelativeModuleName : mode + "|" + nonRelativeModuleName, createPerModuleNameCache);
         }
         function createPerModuleNameCache() {
             var directoryPathMap = new ts.Map();
@@ -35607,10 +35634,10 @@ var ts;
                     result = classicNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
                     break;
                 default:
-                    return ts.Debug.fail("Unexpected moduleResolution: ".concat(moduleResolution));
+                    return ts.Debug.fail("Unexpected moduleResolution: " + moduleResolution);
             }
             if (result && result.resolvedModule)
-                ts.perfLogger.logInfoEvent("Module \"".concat(moduleName, "\" resolved to \"").concat(result.resolvedModule.resolvedFileName, "\""));
+                ts.perfLogger.logInfoEvent("Module \"" + moduleName + "\" resolved to \"" + result.resolvedModule.resolvedFileName + "\"");
             ts.perfLogger.logStopResolveModule((result && result.resolvedModule) ? "" + result.resolvedModule.resolvedFileName : "null");
             if (perFolderCache) {
                 perFolderCache.set(moduleName, resolutionMode, result);
@@ -35740,7 +35767,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 '".concat(moduleName, "' starting at '").concat(initialDir, "'. Looked in: ").concat(failedLookupLocations.join(", ")));
+            throw new Error("Could not resolve JS module '" + moduleName + "' starting at '" + initialDir + "'. Looked in: " + failedLookupLocations.join(", "));
         }
         return resolvedModule.resolvedFileName;
     }
@@ -35873,7 +35900,7 @@ var ts;
         if (traceEnabled) {
             trace(host, ts.Diagnostics.Resolving_real_path_for_0_result_1, path, real);
         }
-        ts.Debug.assert(host.fileExists(real), "".concat(path, " linked to nonexistent file ").concat(real));
+        ts.Debug.assert(host.fileExists(real), path + " linked to nonexistent file " + real);
         return real;
     }
     function nodeLoadModuleByRelativeName(extensions, candidate, onlyRecordFailures, state, considerPackageJson) {
@@ -36330,7 +36357,7 @@ var ts;
             return undefined;
         }
         var trailingParts = parts.slice(nameParts.length);
-        return loadModuleFromExports(scope, extensions, !ts.length(trailingParts) ? "." : ".".concat(ts.directorySeparator).concat(trailingParts.join(ts.directorySeparator)), state, cache, redirectedReference);
+        return loadModuleFromExports(scope, extensions, !ts.length(trailingParts) ? "." : "." + ts.directorySeparator + trailingParts.join(ts.directorySeparator), state, cache, redirectedReference);
     }
     function loadModuleFromExports(scope, extensions, subpath, state, cache, redirectedReference) {
         if (!scope.packageJsonContent.exports) {
@@ -36757,7 +36784,7 @@ var ts;
         return mangled;
     }
     function getTypesPackageName(packageName) {
-        return "@types/".concat(mangleScopedPackageName(packageName));
+        return "@types/" + mangleScopedPackageName(packageName);
     }
     ts.getTypesPackageName = getTypesPackageName;
     function mangleScopedPackageName(packageName) {
@@ -37109,7 +37136,7 @@ var ts;
             if (name) {
                 if (ts.isAmbientModule(node)) {
                     var moduleName = ts.getTextOfIdentifierOrLiteral(name);
-                    return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\"".concat(moduleName, "\""));
+                    return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + moduleName + "\"");
                 }
                 if (name.kind === 162) {
                     var nameExpression = name.expression;
@@ -37158,7 +37185,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: ".concat(ts.Debug.formatSyntaxKind(node.parent.kind), ", expected JSDocFunctionType"); });
+                    ts.Debug.assert(node.parent.kind === 317, "Impossible parameter parent kind", function () { return "parent is: " + ts.Debug.formatSyntaxKind(node.parent.kind) + ", expected JSDocFunctionType"; });
                     var functionType = node.parent;
                     var index = functionType.parameters.indexOf(node);
                     return "arg" + index;
@@ -37224,7 +37251,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 { ".concat(ts.unescapeLeadingUnderscores(node.name.escapedText), " }")));
+                            relatedInformation_1.push(createDiagnosticForNode(node, ts.Diagnostics.Did_you_mean_0, "export type { " + ts.unescapeLeadingUnderscores(node.name.escapedText) + " }"));
                         }
                         var declarationName_1 = ts.getNameOfDeclaration(node) || node;
                         ts.forEach(symbol.declarations, function (declaration, index) {
@@ -37498,6 +37525,9 @@ var ts;
                 case 203:
                     bindBindingElementFlow(node);
                     break;
+                case 164:
+                    bindParameterFlow(node);
+                    break;
                 case 205:
                 case 204:
                 case 296:
@@ -38192,15 +38222,32 @@ var ts;
             }
         }
         function bindBindingElementFlow(node) {
-            if (ts.isBindingPattern(node.name)) {
-                bind(node.dotDotDotToken);
-                bind(node.propertyName);
-                bind(node.initializer);
-                bind(node.name);
+            bind(node.dotDotDotToken);
+            bind(node.propertyName);
+            bindInitializer(node.initializer);
+            bind(node.name);
+        }
+        function bindParameterFlow(node) {
+            bindEach(node.modifiers);
+            bind(node.dotDotDotToken);
+            bind(node.questionToken);
+            bind(node.type);
+            bindInitializer(node.initializer);
+            bind(node.name);
+        }
+        function bindInitializer(node) {
+            if (!node) {
+                return;
             }
-            else {
-                bindEachChild(node);
+            var entryFlow = currentFlow;
+            bind(node);
+            if (entryFlow === unreachableFlow || entryFlow === currentFlow) {
+                return;
             }
+            var exitFlow = createBranchLabel();
+            addAntecedent(exitFlow, entryFlow);
+            addAntecedent(exitFlow, currentFlow);
+            currentFlow = finishFlowLabel(exitFlow);
         }
         function bindJSDocTypeAlias(node) {
             bind(node.tagName);
@@ -39028,7 +39075,7 @@ var ts;
             }
         }
         function bindSourceFileAsExternalModule() {
-            bindAnonymousDeclaration(file, 512, "\"".concat(ts.removeFileExtension(file.fileName), "\""));
+            bindAnonymousDeclaration(file, 512, "\"" + ts.removeFileExtension(file.fileName) + "\"");
         }
         function bindExportAssignment(node) {
             if (!container.symbol || !container.symbol.exports) {
@@ -40780,7 +40827,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, "".concat(firstFile_1.path, "|").concat(secondFile_1.path), function () {
+                    var filesDuplicates = ts.getOrUpdate(amalgamatedDuplicates, firstFile_1.path + "|" + secondFile_1.path, function () {
                         return ({ firstFile: firstFile_1, secondFile: secondFile_1, conflictingSymbols: new ts.Map() });
                     });
                     var conflictingSymbolInfo = ts.getOrUpdate(filesDuplicates.conflictingSymbols, symbolName_1, function () {
@@ -40846,7 +40893,7 @@ var ts;
             if (unidirectional === void 0) { unidirectional = false; }
             source.forEach(function (sourceSymbol, id) {
                 var targetSymbol = target.get(id);
-                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol, unidirectional) : sourceSymbol);
+                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol, unidirectional) : getMergedSymbol(sourceSymbol));
             });
         }
         function mergeModuleAugmentation(moduleName) {
@@ -43130,7 +43177,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 = "".concat(useOnlyExternalAliasing ? 0 : 1, "|").concat(firstRelevantLocation && getNodeId(firstRelevantLocation), "|").concat(meaning);
+            var key = (useOnlyExternalAliasing ? 0 : 1) + "|" + (firstRelevantLocation && getNodeId(firstRelevantLocation)) + "|" + meaning;
             if (cache.has(key)) {
                 return cache.get(key);
             }
@@ -43963,7 +44010,7 @@ var ts;
                         context.symbolDepth = new ts.Map();
                     }
                     var links = context.enclosingDeclaration && getNodeLinks(context.enclosingDeclaration);
-                    var key = "".concat(getTypeId(type), "|").concat(context.flags);
+                    var key = getTypeId(type) + "|" + context.flags;
                     if (links) {
                         links.serializedTypes || (links.serializedTypes = new ts.Map());
                     }
@@ -44224,7 +44271,7 @@ var ts;
                             }
                         }
                         if (checkTruncationLength(context) && (i + 2 < properties.length - 1)) {
-                            typeElements.push(ts.factory.createPropertySignature(undefined, "... ".concat(properties.length - i, " more ..."), undefined, undefined));
+                            typeElements.push(ts.factory.createPropertySignature(undefined, "... " + (properties.length - i) + " more ...", undefined, undefined));
                             addPropertyToElementList(properties[properties.length - 1], context, typeElements);
                             break;
                         }
@@ -44332,7 +44379,7 @@ var ts;
                         else if (types.length > 2) {
                             return [
                                 typeToTypeNodeHelper(types[0], context),
-                                ts.factory.createTypeReferenceNode("... ".concat(types.length - 2, " more ..."), undefined),
+                                ts.factory.createTypeReferenceNode("... " + (types.length - 2) + " more ...", undefined),
                                 typeToTypeNodeHelper(types[types.length - 1], context)
                             ];
                         }
@@ -44345,7 +44392,7 @@ var ts;
                         var type = types_2[_i];
                         i++;
                         if (checkTruncationLength(context) && (i + 2 < types.length - 1)) {
-                            result_5.push(ts.factory.createTypeReferenceNode("... ".concat(types.length - i, " more ..."), undefined));
+                            result_5.push(ts.factory.createTypeReferenceNode("... " + (types.length - i) + " more ...", undefined));
                             var typeNode_1 = typeToTypeNodeHelper(types[types.length - 1], context);
                             if (typeNode_1) {
                                 result_5.push(typeNode_1);
@@ -44707,7 +44754,7 @@ var ts;
                 }
                 return specifier;
                 function getSpecifierCacheKey(path, mode) {
-                    return mode === undefined ? path : "".concat(mode, "|").concat(path);
+                    return mode === undefined ? path : mode + "|" + path;
                 }
             }
             function symbolToEntityNameNode(symbol) {
@@ -44874,7 +44921,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 = "".concat(rawtext, "_").concat(i);
+                        text = rawtext + "_" + i;
                     }
                     if (text !== rawtext) {
                         result = ts.factory.createIdentifier(text, result.typeArguments);
@@ -45166,7 +45213,7 @@ var ts;
                     function getNameForJSDocFunctionParameter(p, index) {
                         return p.name && ts.isIdentifier(p.name) && p.name.escapedText === "this" ? "this"
                             : getEffectiveDotDotDotForParameter(p) ? "args"
-                                : "arg".concat(index);
+                                : "arg" + index;
                     }
                     function rewriteModuleSpecifier(parent, lit) {
                         if (bundled) {
@@ -45978,7 +46025,7 @@ var ts;
                             }
                             return results_1;
                         }
-                        return ts.Debug.fail("Unhandled class member kind! ".concat(p.__debugFlags || p.flags));
+                        return ts.Debug.fail("Unhandled class member kind! " + (p.__debugFlags || p.flags));
                     };
                 }
                 function serializePropertySymbolForInterface(p, baseType) {
@@ -46048,7 +46095,7 @@ var ts;
                     if (ref) {
                         return ref;
                     }
-                    var tempName = getUnusedName("".concat(rootName, "_base"));
+                    var tempName = getUnusedName(rootName + "_base");
                     var statement = ts.factory.createVariableStatement(undefined, ts.factory.createVariableDeclarationList([
                         ts.factory.createVariableDeclaration(tempName, undefined, typeToTypeNodeHelper(staticType, context))
                     ], 2));
@@ -46093,7 +46140,7 @@ var ts;
                     var original = input;
                     while ((_a = context.usedSymbolNames) === null || _a === void 0 ? void 0 : _a.has(input)) {
                         i++;
-                        input = "".concat(original, "_").concat(i);
+                        input = original + "_" + i;
                     }
                     (_b = context.usedSymbolNames) === null || _b === void 0 ? void 0 : _b.add(input);
                     if (id) {
@@ -46199,15 +46246,15 @@ var ts;
                 if (nameType.flags & 384) {
                     var name = "" + nameType.value;
                     if (!ts.isIdentifierText(name, ts.getEmitScriptTarget(compilerOptions)) && !ts.isNumericLiteralName(name)) {
-                        return "\"".concat(ts.escapeString(name, 34), "\"");
+                        return "\"" + ts.escapeString(name, 34) + "\"";
                     }
                     if (ts.isNumericLiteralName(name) && ts.startsWith(name, "-")) {
-                        return "[".concat(name, "]");
+                        return "[" + name + "]";
                     }
                     return name;
                 }
                 if (nameType.flags & 8192) {
-                    return "[".concat(getNameOfSymbolAsWritten(nameType.symbol, context), "]");
+                    return "[" + getNameOfSymbolAsWritten(nameType.symbol, context) + "]";
                 }
             }
         }
@@ -46698,11 +46745,9 @@ var ts;
                         return getReturnTypeOfSignature(getterSignature);
                     }
                 }
-                if (ts.isInJSFile(declaration)) {
-                    var type_1 = getParameterTypeOfTypeTag(func, declaration);
-                    if (type_1)
-                        return type_1;
-                }
+                var parameterTypeOfTypeTag = getParameterTypeOfTypeTag(func, declaration);
+                if (parameterTypeOfTypeTag)
+                    return parameterTypeOfTypeTag;
                 var type = declaration.symbol.escapedName === "this" ? getContextualThisParameterType(func) : getContextuallyTypedParameterType(declaration);
                 if (type) {
                     return addOptionality(type, false, isOptional);
@@ -47207,8 +47252,8 @@ var ts;
                 if (typeNode === undefined) {
                     return useUnknownInCatchVariables ? unknownType : anyType;
                 }
-                var type_2 = getTypeOfNode(typeNode);
-                return isTypeAny(type_2) || type_2 === unknownType ? type_2 : errorType;
+                var type_1 = getTypeOfNode(typeNode);
+                return isTypeAny(type_1) || type_1 === unknownType ? type_1 : errorType;
             }
             if (ts.isSourceFile(declaration) && ts.isJsonSourceFile(declaration)) {
                 if (!declaration.statements.length) {
@@ -47405,11 +47450,11 @@ var ts;
                         return errorType;
                     }
                     var exportEquals = getMergedSymbol(symbol.exports.get("export="));
-                    var type_3 = getWidenedTypeForAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
+                    var type_2 = getWidenedTypeForAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
                     if (!popTypeResolution()) {
                         return reportCircularityError(symbol);
                     }
-                    return type_3;
+                    return type_2;
                 }
             }
             var type = createObjectType(16, symbol);
@@ -48635,7 +48680,7 @@ var ts;
                     !leftName ? rightName :
                         !rightName ? leftName :
                             undefined;
-                var paramSymbol = createSymbol(1 | (isOptional && !isRestParam ? 16777216 : 0), paramName || "arg".concat(i));
+                var paramSymbol = createSymbol(1 | (isOptional && !isRestParam ? 16777216 : 0), paramName || "arg" + i);
                 paramSymbol.type = isRestParam ? createArrayType(unionParamType) : unionParamType;
                 params[i] = paramSymbol;
             }
@@ -49335,10 +49380,10 @@ var ts;
                     var baseTypes = [];
                     var different = false;
                     for (var _i = 0, types_7 = types; _i < types_7.length; _i++) {
-                        var type_4 = types_7[_i];
-                        var baseType = getBaseConstraint(type_4);
+                        var type_3 = types_7[_i];
+                        var baseType = getBaseConstraint(type_3);
                         if (baseType) {
-                            if (baseType !== type_4) {
+                            if (baseType !== type_3) {
                                 different = true;
                             }
                             baseTypes.push(baseType);
@@ -50019,7 +50064,10 @@ var ts;
                         continue;
                     }
                 }
-                result.push(getSignatureFromDeclaration(decl));
+                result.push((!ts.isFunctionExpressionOrArrowFunction(decl) &&
+                    !ts.isObjectLiteralMethod(decl) &&
+                    getSignatureOfTypeTag(decl)) ||
+                    getSignatureFromDeclaration(decl));
             }
             return result;
         }
@@ -50050,7 +50098,7 @@ var ts;
                 else {
                     var type = signature.declaration && ts.getEffectiveReturnTypeNode(signature.declaration);
                     var jsdocPredicate = void 0;
-                    if (!type && ts.isInJSFile(signature.declaration)) {
+                    if (!type) {
                         var jsdocSignature = getSignatureOfTypeTag(signature.declaration);
                         if (jsdocSignature && signature !== jsdocSignature) {
                             jsdocPredicate = getTypePredicateOfSignature(jsdocSignature);
@@ -50375,7 +50423,7 @@ var ts;
             return result;
         }
         function getAliasId(aliasSymbol, aliasTypeArguments) {
-            return aliasSymbol ? "@".concat(getSymbolId(aliasSymbol)) + (aliasTypeArguments ? ":".concat(getTypeListId(aliasTypeArguments)) : "") : "";
+            return aliasSymbol ? "@" + getSymbolId(aliasSymbol) + (aliasTypeArguments ? ":" + getTypeListId(aliasTypeArguments) : "") : "";
         }
         function getPropagatingFlagsOfTypes(types, excludeKinds) {
             var result = 0;
@@ -50538,7 +50586,7 @@ var ts;
             return undefined;
         }
         function getSymbolPath(symbol) {
-            return symbol.parent ? "".concat(getSymbolPath(symbol.parent), ".").concat(symbol.escapedName) : symbol.escapedName;
+            return symbol.parent ? getSymbolPath(symbol.parent) + "." + symbol.escapedName : symbol.escapedName;
         }
         function getUnresolvedSymbolForEntityName(name) {
             var identifier = name.kind === 161 ? name.right :
@@ -50549,7 +50597,7 @@ var ts;
                 var parentSymbol = name.kind === 161 ? getUnresolvedSymbolForEntityName(name.left) :
                     name.kind === 206 ? getUnresolvedSymbolForEntityName(name.expression) :
                         undefined;
-                var path = parentSymbol ? "".concat(getSymbolPath(parentSymbol), ".").concat(text) : text;
+                var path = parentSymbol ? getSymbolPath(parentSymbol) + "." + text : text;
                 var result = unresolvedSymbols.get(path);
                 if (!result) {
                     unresolvedSymbols.set(path, result = createSymbol(524288, text, 1048576));
@@ -50615,7 +50663,7 @@ var ts;
             if (substitute.flags & 3 || substitute === baseType) {
                 return baseType;
             }
-            var id = "".concat(getTypeId(baseType), ">").concat(getTypeId(substitute));
+            var id = getTypeId(baseType) + ">" + getTypeId(substitute);
             var cached = substitutionTypes.get(id);
             if (cached) {
                 return cached;
@@ -51474,9 +51522,9 @@ var ts;
                 return types[0];
             }
             var typeKey = !origin ? getTypeListId(types) :
-                origin.flags & 1048576 ? "|".concat(getTypeListId(origin.types)) :
-                    origin.flags & 2097152 ? "&".concat(getTypeListId(origin.types)) :
-                        "#".concat(origin.type.id, "|").concat(getTypeListId(types));
+                origin.flags & 1048576 ? "|" + getTypeListId(origin.types) :
+                    origin.flags & 2097152 ? "&" + getTypeListId(origin.types) :
+                        "#" + origin.type.id + "|" + getTypeListId(types);
             var id = typeKey + getAliasId(aliasSymbol, aliasTypeArguments);
             var type = unionTypes.get(id);
             if (!type) {
@@ -51949,7 +51997,7 @@ var ts;
             if (ts.every(newTexts, function (t) { return t === ""; }) && ts.every(newTypes, function (t) { return !!(t.flags & 4); })) {
                 return stringType;
             }
-            var id = "".concat(getTypeListId(newTypes), "|").concat(ts.map(newTexts, function (t) { return t.length; }).join(","), "|").concat(newTexts.join(""));
+            var id = getTypeListId(newTypes) + "|" + ts.map(newTexts, function (t) { return t.length; }).join(",") + "|" + newTexts.join("");
             var type = templateLiteralTypes.get(id);
             if (!type) {
                 templateLiteralTypes.set(id, type = createTemplateLiteralType(newTexts, newTypes));
@@ -52031,7 +52079,7 @@ var ts;
             return [texts, types];
         }
         function getStringMappingTypeForGenericType(symbol, type) {
-            var id = "".concat(getSymbolId(symbol), ",").concat(getTypeId(type));
+            var id = getSymbolId(symbol) + "," + getTypeId(type);
             var result = stringMappingTypes.get(id);
             if (!result) {
                 stringMappingTypes.set(id, result = createStringMappingType(symbol, type));
@@ -52980,7 +53028,7 @@ var ts;
         function createUniqueESSymbolType(symbol) {
             var type = createType(8192);
             type.symbol = symbol;
-            type.escapedName = "__@".concat(type.symbol.escapedName, "@").concat(getSymbolId(type.symbol));
+            type.escapedName = "__@" + type.symbol.escapedName + "@" + getSymbolId(type.symbol);
             return type;
         }
         function getESSymbolLikeTypeForNode(node) {
@@ -53643,14 +53691,13 @@ var ts;
             return false;
         }
         function isContextSensitiveFunctionLikeDeclaration(node) {
-            return (!ts.isFunctionDeclaration(node) || ts.isInJSFile(node) && !!getTypeForDeclarationFromJSDocComment(node)) &&
-                (ts.hasContextSensitiveParameters(node) || hasContextSensitiveReturnExpression(node));
+            return ts.hasContextSensitiveParameters(node) || hasContextSensitiveReturnExpression(node);
         }
         function hasContextSensitiveReturnExpression(node) {
             return !node.typeParameters && !ts.getEffectiveReturnTypeNode(node) && !!node.body && node.body.kind !== 235 && isContextSensitive(node.body);
         }
         function isContextSensitiveFunctionOrObjectLiteralMethod(func) {
-            return (ts.isInJSFile(func) && ts.isFunctionDeclaration(func) || ts.isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) &&
+            return (ts.isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) &&
                 isContextSensitiveFunctionLikeDeclaration(func);
         }
         function getTypeWithoutSignatures(type) {
@@ -54552,20 +54599,20 @@ var ts;
                     switch (msg.code) {
                         case ts.Diagnostics.Types_of_property_0_are_incompatible.code: {
                             if (path.indexOf("new ") === 0) {
-                                path = "(".concat(path, ")");
+                                path = "(" + path + ")";
                             }
                             var str = "" + args[0];
                             if (path.length === 0) {
-                                path = "".concat(str);
+                                path = "" + str;
                             }
                             else if (ts.isIdentifierText(str, ts.getEmitScriptTarget(compilerOptions))) {
-                                path = "".concat(path, ".").concat(str);
+                                path = path + "." + str;
                             }
                             else if (str[0] === "[" && str[str.length - 1] === "]") {
-                                path = "".concat(path).concat(str);
+                                path = "" + path + str;
                             }
                             else {
-                                path = "".concat(path, "[").concat(str, "]");
+                                path = path + "[" + str + "]";
                             }
                             break;
                         }
@@ -54592,7 +54639,7 @@ var ts;
                                     msg.code === ts.Diagnostics.Construct_signatures_with_no_arguments_have_incompatible_return_types_0_and_1.code)
                                     ? ""
                                     : "...";
-                                path = "".concat(prefix).concat(path, "(").concat(params, ")");
+                                path = "" + prefix + path + "(" + params + ")";
                             }
                             break;
                         }
@@ -54605,7 +54652,7 @@ var ts;
                             break;
                         }
                         default:
-                            return ts.Debug.fail("Unhandled Diagnostic: ".concat(msg.code));
+                            return ts.Debug.fail("Unhandled Diagnostic: " + msg.code);
                     }
                 }
                 if (path) {
@@ -56500,7 +56547,7 @@ var ts;
             var constraintMarker = "";
             var sourceId = getTypeReferenceId(source, 0);
             var targetId = getTypeReferenceId(target, 0);
-            return "".concat(constraintMarker).concat(sourceId, ",").concat(targetId).concat(postFix);
+            return "" + constraintMarker + sourceId + "," + targetId + postFix;
             function getTypeReferenceId(type, depth) {
                 if (depth === void 0) { depth = 0; }
                 var result = "" + type.target.id;
@@ -56536,7 +56583,7 @@ var ts;
             var postFix = intersectionState ? ":" + intersectionState : "";
             return isTypeReferenceWithGenericArguments(source) && isTypeReferenceWithGenericArguments(target) ?
                 getGenericTypeReferenceRelationKey(source, target, postFix, ignoreConstraints) :
-                "".concat(source.id, ",").concat(target.id).concat(postFix);
+                source.id + "," + target.id + postFix;
         }
         function forEachProperty(prop, callback) {
             if (ts.getCheckFlags(prop) & 6) {
@@ -56855,7 +56902,7 @@ var ts;
         }
         function getBaseTypeOfLiteralTypeUnion(type) {
             var _a;
-            var key = "B".concat(getTypeId(type));
+            var key = "B" + getTypeId(type);
             return (_a = getCachedType(key)) !== null && _a !== void 0 ? _a : setCachedType(key, mapType(type, getBaseTypeOfLiteralType));
         }
         function getWidenedLiteralType(type) {
@@ -57578,7 +57625,7 @@ var ts;
         }
         function parseBigIntLiteralType(text) {
             var negative = text.startsWith("-");
-            var base10Value = ts.parsePseudoBigInt("".concat(negative ? text.slice(1) : text, "n"));
+            var base10Value = ts.parsePseudoBigInt((negative ? text.slice(1) : text) + "n");
             return getBigIntLiteralType({ negative: negative, base10Value: base10Value });
         }
         function isValidBigIntString(s, roundTripOnly) {
@@ -58449,10 +58496,10 @@ var ts;
                 case 79:
                     if (!ts.isThisInTypeQuery(node)) {
                         var symbol = getResolvedSymbol(node);
-                        return symbol !== unknownSymbol ? "".concat(flowContainer ? getNodeId(flowContainer) : "-1", "|").concat(getTypeId(declaredType), "|").concat(getTypeId(initialType), "|").concat(getSymbolId(symbol)) : undefined;
+                        return symbol !== unknownSymbol ? (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType) + "|" + getSymbolId(symbol) : undefined;
                     }
                 case 108:
-                    return "0|".concat(flowContainer ? getNodeId(flowContainer) : "-1", "|").concat(getTypeId(declaredType), "|").concat(getTypeId(initialType));
+                    return "0|" + (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType);
                 case 230:
                 case 212:
                     return getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
@@ -58473,7 +58520,7 @@ var ts;
                 case 213:
                 case 214:
                 case 169:
-                    return "".concat(getNodeId(node), "#").concat(getTypeId(declaredType));
+                    return getNodeId(node) + "#" + getTypeId(declaredType);
             }
             return undefined;
         }
@@ -58726,7 +58773,7 @@ var ts;
             if (assignedType.flags & 131072) {
                 return assignedType;
             }
-            var key = "A".concat(getTypeId(declaredType), ",").concat(getTypeId(assignedType));
+            var key = "A" + getTypeId(declaredType) + "," + getTypeId(assignedType);
             return (_a = getCachedType(key)) !== null && _a !== void 0 ? _a : setCachedType(key, getAssignmentReducedTypeWorker(declaredType, assignedType));
         }
         function getAssignmentReducedTypeWorker(declaredType, assignedType) {
@@ -60214,7 +60261,7 @@ var ts;
             }
             function getNarrowedType(type, candidate, assumeTrue, checkDerived) {
                 var _a;
-                var key = type.flags & 1048576 ? "N".concat(getTypeId(type), ",").concat(getTypeId(candidate), ",").concat((assumeTrue ? 1 : 0) | (checkDerived ? 2 : 0)) : undefined;
+                var key = type.flags & 1048576 ? "N" + getTypeId(type) + "," + getTypeId(candidate) + "," + ((assumeTrue ? 1 : 0) | (checkDerived ? 2 : 0)) : undefined;
                 return (_a = getCachedType(key)) !== null && _a !== void 0 ? _a : setCachedType(key, getNarrowedTypeWorker(type, candidate, assumeTrue, checkDerived));
             }
             function getNarrowedTypeWorker(type, candidate, assumeTrue, checkDerived) {
@@ -61414,8 +61461,11 @@ var ts;
                 case 1:
                 case 6:
                 case 3:
-                    var valueDeclaration = (_a = binaryExpression.left.symbol) === null || _a === void 0 ? void 0 : _a.valueDeclaration;
                 case 2:
+                    var valueDeclaration = void 0;
+                    if (kind !== 2) {
+                        valueDeclaration = (_a = binaryExpression.left.symbol) === null || _a === void 0 ? void 0 : _a.valueDeclaration;
+                    }
                     valueDeclaration || (valueDeclaration = (_b = binaryExpression.symbol) === null || _b === void 0 ? void 0 : _b.valueDeclaration);
                     var annotated = valueDeclaration && ts.getEffectiveTypeAnnotationNode(valueDeclaration);
                     return annotated ? getTypeFromTypeNode(annotated) : undefined;
@@ -61464,25 +61514,7 @@ var ts;
         }
         function getTypeOfPropertyOfContextualType(type, name, nameType) {
             return mapType(type, function (t) {
-                if (t.flags & 2097152) {
-                    var intersection = t;
-                    var newTypes = ts.mapDefined(intersection.types, getTypeOfConcretePropertyOfContextualType);
-                    if (newTypes.length > 0) {
-                        return getIntersectionType(newTypes);
-                    }
-                    newTypes = ts.mapDefined(intersection.types, getTypeOfApplicableIndexInfoOfContextualType);
-                    if (newTypes.length > 0) {
-                        return getIntersectionType(newTypes);
-                    }
-                    return undefined;
-                }
-                var concretePropertyType = getTypeOfConcretePropertyOfContextualType(t);
-                if (concretePropertyType) {
-                    return concretePropertyType;
-                }
-                return getTypeOfApplicableIndexInfoOfContextualType(t);
-            }, true);
-            function getTypeOfConcretePropertyOfContextualType(t) {
+                var _a;
                 if (isGenericMappedType(t) && !t.declaration.nameType) {
                     var constraint = getConstraintTypeFromMappedType(t);
                     var constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
@@ -61490,9 +61522,8 @@ var ts;
                     if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
                         return substituteIndexedMappedType(t, propertyNameType);
                     }
-                    return undefined;
                 }
-                if (t.flags & 3670016) {
+                else if (t.flags & 3670016) {
                     var prop = getPropertyOfType(t, name);
                     if (prop) {
                         return isCircularMappedProperty(prop) ? undefined : getTypeOfSymbol(prop);
@@ -61503,16 +61534,10 @@ var ts;
                             return restType;
                         }
                     }
+                    return (_a = findApplicableIndexInfo(getIndexInfosOfStructuredType(t), nameType || getStringLiteralType(ts.unescapeLeadingUnderscores(name)))) === null || _a === void 0 ? void 0 : _a.type;
                 }
                 return undefined;
-            }
-            function getTypeOfApplicableIndexInfoOfContextualType(t) {
-                var _a;
-                if (!(t.flags & 3670016)) {
-                    return undefined;
-                }
-                return (_a = findApplicableIndexInfo(getIndexInfosOfStructuredType(t), nameType || getStringLiteralType(ts.unescapeLeadingUnderscores(name)))) === null || _a === void 0 ? void 0 : _a.type;
-            }
+            }, true);
         }
         function getContextualTypeForObjectLiteralMethod(node, contextFlags) {
             ts.Debug.assert(ts.isObjectLiteralMethod(node));
@@ -61824,9 +61849,14 @@ var ts;
                 if (!isErrorType(intrinsicClassAttribs)) {
                     var typeParams = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(intrinsicClassAttribs.symbol);
                     var hostClassType = getReturnTypeOfSignature(sig);
-                    apparentAttributesType = intersectTypes(typeParams
-                        ? createTypeReference(intrinsicClassAttribs, fillMissingTypeArguments([hostClassType], typeParams, getMinTypeArgumentCount(typeParams), ts.isInJSFile(context)))
-                        : intrinsicClassAttribs, apparentAttributesType);
+                    var libraryManagedAttributeType = void 0;
+                    if (typeParams) {
+                        var inferredArgs = fillMissingTypeArguments([hostClassType], typeParams, getMinTypeArgumentCount(typeParams), ts.isInJSFile(context));
+                        libraryManagedAttributeType = instantiateType(intrinsicClassAttribs, createTypeMapper(typeParams, inferredArgs));
+                    }
+                    else
+                        libraryManagedAttributeType = intrinsicClassAttribs;
+                    apparentAttributesType = intersectTypes(libraryManagedAttributeType, apparentAttributesType);
                 }
                 var intrinsicAttribs = getJsxType(JsxNames.IntrinsicAttributes, context);
                 if (!isErrorType(intrinsicAttribs)) {
@@ -61878,7 +61908,7 @@ var ts;
                     !leftName ? rightName :
                         !rightName ? leftName :
                             undefined;
-                var paramSymbol = createSymbol(1 | (isOptional && !isRestParam ? 16777216 : 0), paramName || "arg".concat(i));
+                var paramSymbol = createSymbol(1 | (isOptional && !isRestParam ? 16777216 : 0), paramName || "arg" + i);
                 paramSymbol.type = isRestParam ? createArrayType(unionParamType) : unionParamType;
                 params[i] = paramSymbol;
             }
@@ -62272,15 +62302,26 @@ var ts;
                 }
                 propertiesArray.push(member);
             }
-            if (contextualTypeHasPattern && node.parent.kind !== 298) {
-                for (var _d = 0, _e = getPropertiesOfType(contextualType); _d < _e.length; _d++) {
-                    var prop = _e[_d];
-                    if (!propertiesTable.get(prop.escapedName) && !getPropertyOfType(spread, prop.escapedName)) {
-                        if (!(prop.flags & 16777216)) {
-                            error(prop.valueDeclaration || prop.bindingElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
+            if (contextualTypeHasPattern) {
+                var rootPatternParent_1 = ts.findAncestor(contextualType.pattern.parent, function (n) {
+                    return n.kind === 254 ||
+                        n.kind === 221 ||
+                        n.kind === 164;
+                });
+                var spreadOrOutsideRootObject = ts.findAncestor(node, function (n) {
+                    return n === rootPatternParent_1 ||
+                        n.kind === 298;
+                });
+                if (spreadOrOutsideRootObject.kind !== 298) {
+                    for (var _d = 0, _e = getPropertiesOfType(contextualType); _d < _e.length; _d++) {
+                        var prop = _e[_d];
+                        if (!propertiesTable.get(prop.escapedName) && !getPropertyOfType(spread, prop.escapedName)) {
+                            if (!(prop.flags & 16777216)) {
+                                error(prop.valueDeclaration || prop.bindingElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
+                            }
+                            propertiesTable.set(prop.escapedName, prop);
+                            propertiesArray.push(prop);
                         }
-                        propertiesTable.set(prop.escapedName, prop);
-                        propertiesArray.push(prop);
                     }
                 }
             }
@@ -65032,11 +65073,13 @@ var ts;
                 return false;
             }
             var func = ts.isFunctionDeclaration(node) || ts.isFunctionExpression(node) ? node :
-                ts.isVariableDeclaration(node) && node.initializer && ts.isFunctionExpression(node.initializer) ? node.initializer :
+                (ts.isVariableDeclaration(node) || ts.isPropertyAssignment(node)) && node.initializer && ts.isFunctionExpression(node.initializer) ? node.initializer :
                     undefined;
             if (func) {
                 if (ts.getJSDocClassTag(node))
                     return true;
+                if (ts.isPropertyAssignment(ts.walkUpParenthesizedExpressions(func.parent)))
+                    return false;
                 var symbol = getSymbolOfNode(func);
                 return !!((_a = symbol === null || symbol === void 0 ? void 0 : symbol.members) === null || _a === void 0 ? void 0 : _a.size);
             }
@@ -65268,8 +65311,8 @@ var ts;
             if (hasDefaultOnly && type && !isErrorType(type)) {
                 var synthType = type;
                 if (!synthType.defaultOnlyType) {
-                    var type_5 = createDefaultPropertyWrapperForModule(symbol, originalSymbol);
-                    synthType.defaultOnlyType = type_5;
+                    var type_4 = createDefaultPropertyWrapperForModule(symbol, originalSymbol);
+                    synthType.defaultOnlyType = type_4;
                 }
                 return synthType.defaultOnlyType;
             }
@@ -70660,7 +70703,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) : "__@".concat(symbolName);
+            return uniqueType && isTypeUsableAsPropertyName(uniqueType) ? getPropertyNameFromType(uniqueType) : "__@" + symbolName;
         }
         function getIterationTypesOfIterableSlow(type, resolver, errorNode, errorOutputContainer, noCache) {
             var _a;
@@ -72271,7 +72314,7 @@ var ts;
                         var importDeclaration = ts.findAncestor(node, ts.or(ts.isImportDeclaration, ts.isImportEqualsDeclaration));
                         var moduleSpecifier = (_e = (importDeclaration && ((_d = ts.tryGetModuleSpecifierFromDeclaration(importDeclaration)) === null || _d === void 0 ? void 0 : _d.text))) !== null && _e !== void 0 ? _e : "...";
                         var importedIdentifier = ts.unescapeLeadingUnderscores(ts.isIdentifier(errorNode) ? errorNode.escapedText : symbol.escapedName);
-                        error(errorNode, ts.Diagnostics._0_is_a_type_and_cannot_be_imported_in_JavaScript_files_Use_1_in_a_JSDoc_type_annotation, importedIdentifier, "import(\"".concat(moduleSpecifier, "\").").concat(importedIdentifier));
+                        error(errorNode, ts.Diagnostics._0_is_a_type_and_cannot_be_imported_in_JavaScript_files_Use_1_in_a_JSDoc_type_annotation, importedIdentifier, "import(\"" + moduleSpecifier + "\")." + importedIdentifier);
                     }
                     return;
                 }
@@ -73393,6 +73436,12 @@ var ts;
                             return resolveJSDocMemberName(name, false, getSymbolOfNode(container));
                         }
                     }
+                    if (result && isJSDoc_1) {
+                        var container = ts.getJSDocHost(name);
+                        if (container && ts.isEnumMember(container) && container === result.valueDeclaration) {
+                            return resolveEntityName(name, meaning, true, true, ts.getSourceFileOfNode(container)) || result;
+                        }
+                    }
                     return result;
                 }
                 else if (ts.isPrivateIdentifier(name)) {
@@ -77208,7 +77257,7 @@ var ts;
                 value >= 52 && value < 62 ? 48 + value - 52 :
                     value === 62 ? 43 :
                         value === 63 ? 47 :
-                            ts.Debug.fail("".concat(value, ": not a base64 value"));
+                            ts.Debug.fail(value + ": not a base64 value");
     }
     function base64FormatDecode(ch) {
         return ch >= 65 && ch <= 90 ? ch - 65 :
@@ -77281,7 +77330,7 @@ var ts;
                 var mappings = ts.arrayFrom(decoder, processMapping);
                 if (decoder.error !== undefined) {
                     if (host.log) {
-                        host.log("Encountered error while decoding sourcemap: ".concat(decoder.error));
+                        host.log("Encountered error while decoding sourcemap: " + decoder.error);
                     }
                     decodedMappings = ts.emptyArray;
                 }
@@ -79368,7 +79417,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, " ".concat(safeMultiLineComment(ts.getTextOfNode(originalNode)), " "));
+                    ts.addSyntheticTrailingComment(substitute, 3, " " + safeMultiLineComment(ts.getTextOfNode(originalNode)) + " ");
                 }
                 return substitute;
             }
@@ -80620,8 +80669,8 @@ var ts;
         }
         function createHoistedVariableForClass(name, node) {
             var className = getPrivateIdentifierEnvironment().className;
-            var prefix = className ? "_".concat(className) : "";
-            var identifier = factory.createUniqueName("".concat(prefix, "_").concat(name), 16);
+            var prefix = className ? "_" + className : "";
+            var identifier = factory.createUniqueName(prefix + "_" + name, 16);
             if (resolver.getNodeCheckFlags(node) & 524288) {
                 addBlockScopedVariable(identifier);
             }
@@ -82932,7 +82981,7 @@ var ts;
                 specifierSourceImports = new ts.Map();
                 currentFileState.utilizedImplicitRuntimeImports.set(importSource, specifierSourceImports);
             }
-            var generatedName = factory.createUniqueName("_".concat(name), 16 | 32 | 64);
+            var generatedName = factory.createUniqueName("_" + name, 16 | 32 | 64);
             var specifier = factory.createImportSpecifier(false, factory.createIdentifier(name), generatedName);
             generatedName.generatedImportReference = specifier;
             specifierSourceImports.set(name, specifier);
@@ -83880,11 +83929,11 @@ var ts;
                     }
                     else {
                         if (node.kind === 246) {
-                            labelMarker = "break-".concat(label.escapedText);
+                            labelMarker = "break-" + label.escapedText;
                             setLabeledJump(convertedLoopState, true, ts.idText(label), labelMarker);
                         }
                         else {
-                            labelMarker = "continue-".concat(label.escapedText);
+                            labelMarker = "continue-" + label.escapedText;
                             setLabeledJump(convertedLoopState, false, ts.idText(label), labelMarker);
                         }
                     }
@@ -88476,6 +88525,12 @@ var ts;
                         case 265:
                             ts.Debug.assert(importVariableName !== undefined);
                             statements.push(factory.createExpressionStatement(factory.createAssignment(importVariableName, parameterName)));
+                            if (ts.hasSyntacticModifier(entry, 1)) {
+                                statements.push(factory.createExpressionStatement(factory.createCallExpression(exportFunction, undefined, [
+                                    factory.createStringLiteral(ts.idText(importVariableName)),
+                                    parameterName,
+                                ])));
+                            }
                             break;
                         case 272:
                             ts.Debug.assert(importVariableName !== undefined);
@@ -89539,7 +89594,7 @@ var ts;
             return getTypeAliasDeclarationVisibilityError;
         }
         else {
-            return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: ".concat(ts.Debug.formatSyntaxKind(node.kind)));
+            return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.Debug.formatSyntaxKind(node.kind));
         }
         function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
             if (node.kind === 254 || node.kind === 203) {
@@ -89736,7 +89791,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: ".concat(ts.Debug.formatSyntaxKind(node.parent.kind)));
+                    return ts.Debug.fail("Unknown parent for parameter: " + ts.Debug.formatSyntaxKind(node.parent.kind));
             }
         }
         function getTypeParameterConstraintVisibilityError() {
@@ -90443,7 +90498,7 @@ var ts;
             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!: ".concat(ts.Debug.formatSyntaxKind(i.kind)));
+                    return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: " + ts.Debug.formatSyntaxKind(i.kind));
                 }
                 var priorNeedsDeclare = needsDeclare;
                 needsDeclare = i.parent && ts.isSourceFile(i.parent) && !(ts.isExternalModule(i.parent) && isBundledEmit);
@@ -90608,7 +90663,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: ".concat(ts.Debug.formatSyntaxKind(input.kind)));
+                    default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: " + ts.Debug.formatSyntaxKind(input.kind));
                 }
             }
             if (ts.isTupleTypeNode(input) && (ts.getLineAndCharacterOfPosition(currentSourceFile, input.pos).line === ts.getLineAndCharacterOfPosition(currentSourceFile, input.end).line)) {
@@ -90717,8 +90772,12 @@ var ts;
             }
             var previousNeedsDeclare = needsDeclare;
             switch (input.kind) {
-                case 259:
-                    return cleanup(factory.updateTypeAliasDeclaration(input, ensureModifiers(input), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode)));
+                case 259: {
+                    needsDeclare = false;
+                    var clean = cleanup(factory.updateTypeAliasDeclaration(input, ensureModifiers(input), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode)));
+                    needsDeclare = previousNeedsDeclare;
+                    return clean;
+                }
                 case 258: {
                     return cleanup(factory.updateInterfaceDeclaration(input, ensureModifiers(input), input.name, ensureTypeParams(input, input.typeParameters), transformHeritageClauses(input.heritageClauses), ts.visitNodes(input.members, visitDeclarationSubtree)));
                 }
@@ -90858,7 +90917,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("".concat(oldId, "_base"), 16);
+                        var newId_1 = factory.createUniqueName(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,
@@ -90895,7 +90954,7 @@ var ts;
                     }))));
                 }
             }
-            return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: ".concat(ts.Debug.formatSyntaxKind(input.kind)));
+            return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: " + ts.Debug.formatSyntaxKind(input.kind));
             function cleanup(node) {
                 if (isEnclosingDeclaration(input)) {
                     enclosingDeclaration = previousEnclosingDeclaration;
@@ -91665,13 +91724,13 @@ var ts;
         if (ts.fileExtensionIs(inputFileName, ".json"))
             return;
         if (js && configFile.options.sourceMap) {
-            addOutput("".concat(js, ".map"));
+            addOutput(js + ".map");
         }
         if (ts.getEmitDeclarations(configFile.options)) {
             var dts = getOutputDeclarationFileName(inputFileName, configFile, ignoreCase, getCommonSourceDirectory);
             addOutput(dts);
             if (configFile.options.declarationMap) {
-                addOutput("".concat(dts, ".map"));
+                addOutput(dts + ".map");
             }
         }
     }
@@ -91731,7 +91790,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 ".concat(configFile.options.configFilePath, " expected to have at least one output"));
+            return ts.Debug.checkDefined(jsFilePath, "project " + 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++) {
@@ -91750,7 +91809,7 @@ var ts;
         var buildInfoPath = getTsBuildInfoEmitOutputFilePath(configFile.options);
         if (buildInfoPath)
             return buildInfoPath;
-        return ts.Debug.fail("project ".concat(configFile.options.configFilePath, " expected to have at least one output"));
+        return ts.Debug.fail("project " + configFile.options.configFilePath + " expected to have at least one output");
     }
     ts.getFirstProjectOutput = getFirstProjectOutput;
     function emitFiles(resolver, host, targetSourceFile, _a, emitOnlyDtsFiles, onlyBuildInfo, forceDtsEmit) {
@@ -91958,7 +92017,7 @@ var ts;
                     if (!writer.isAtStartOfLine())
                         writer.rawWrite(newLine);
                     sourceMapUrlPos = writer.getTextPos();
-                    writer.writeComment("//# ".concat("sourceMappingURL", "=").concat(sourceMappingURL));
+                    writer.writeComment("//# " + "sourceMappingURL" + "=" + sourceMappingURL);
                 }
                 if (sourceMapFilePath) {
                     var sourceMap = sourceMapGenerator.toString();
@@ -92003,7 +92062,7 @@ var ts;
             if (mapOptions.inlineSourceMap) {
                 var sourceMapText = sourceMapGenerator.toString();
                 var base64SourceMapText = ts.base64encode(ts.sys, sourceMapText);
-                return "data:application/json;base64,".concat(base64SourceMapText);
+                return "data:application/json;base64," + base64SourceMapText;
             }
             var sourceMapFile = ts.getBaseFileName(ts.normalizeSlashes(ts.Debug.checkDefined(sourceMapFilePath)));
             if (mapOptions.mapRoot) {
@@ -92027,8 +92086,8 @@ var ts;
         return JSON.stringify(buildInfo);
     }
     ts.getBuildInfoText = getBuildInfoText;
-    function getBuildInfo(buildInfoText) {
-        return JSON.parse(buildInfoText);
+    function getBuildInfo(buildInfoFile, buildInfoText) {
+        return ts.readJsonOrUndefined(buildInfoFile, buildInfoText);
     }
     ts.getBuildInfo = getBuildInfo;
     ts.notImplementedResolver = {
@@ -92102,17 +92161,16 @@ var ts;
         var _a = getOutputPathsForBundle(config.options, false), buildInfoPath = _a.buildInfoPath, jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath;
         var buildInfo;
         if (host.getBuildInfo) {
-            var hostBuildInfo = host.getBuildInfo(buildInfoPath, config.options.configFilePath);
-            if (!hostBuildInfo)
-                return buildInfoPath;
-            buildInfo = hostBuildInfo;
+            buildInfo = host.getBuildInfo(buildInfoPath, config.options.configFilePath);
         }
         else {
             var buildInfoText = host.readFile(buildInfoPath);
             if (!buildInfoText)
                 return buildInfoPath;
-            buildInfo = getBuildInfo(buildInfoText);
+            buildInfo = getBuildInfo(buildInfoPath, buildInfoText);
         }
+        if (!buildInfo)
+            return buildInfoPath;
         if (!buildInfo.bundle || !buildInfo.bundle.js || (declarationFilePath && !buildInfo.bundle.dts))
             return buildInfoPath;
         var jsFileText = host.readFile(ts.Debug.checkDefined(jsFilePath));
@@ -92192,7 +92250,7 @@ var ts;
                             return;
                         break;
                     default:
-                        ts.Debug.fail("Unexpected path: ".concat(name));
+                        ts.Debug.fail("Unexpected path: " + name);
                 }
                 outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark });
             },
@@ -93006,7 +93064,7 @@ var ts;
                 return writeTokenNode(node, writeKeyword);
             if (ts.isTokenKind(node.kind))
                 return writeTokenNode(node, writePunctuation);
-            ts.Debug.fail("Unhandled SyntaxKind: ".concat(ts.Debug.formatSyntaxKind(node.kind), "."));
+            ts.Debug.fail("Unhandled SyntaxKind: " + ts.Debug.formatSyntaxKind(node.kind) + ".");
         }
         function emitMappedTypeParameter(node) {
             emit(node.name);
@@ -93146,14 +93204,14 @@ var ts;
             }
         }
         function emitPlaceholder(hint, node, snippet) {
-            nonEscapingWrite("${".concat(snippet.order, ":"));
+            nonEscapingWrite("${" + 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 ".concat(ts.Debug.formatSyntaxKind(node.kind), "."));
+            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(hint !== 5, "A tab stop cannot be attached to an embedded statement.");
-            nonEscapingWrite("$".concat(snippet.order));
+            nonEscapingWrite("$" + snippet.order);
         }
         function emitIdentifier(node) {
             var writeText = node.symbol ? writeSymbol : write;
@@ -94812,17 +94870,17 @@ var ts;
                 writeLine();
             }
             if (currentSourceFile && currentSourceFile.moduleName) {
-                writeComment("/// <amd-module name=\"".concat(currentSourceFile.moduleName, "\" />"));
+                writeComment("/// <amd-module name=\"" + 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=\"".concat(dep.name, "\" path=\"").concat(dep.path, "\" />"));
+                        writeComment("/// <amd-dependency name=\"" + dep.name + "\" path=\"" + dep.path + "\" />");
                     }
                     else {
-                        writeComment("/// <amd-dependency path=\"".concat(dep.path, "\" />"));
+                        writeComment("/// <amd-dependency path=\"" + dep.path + "\" />");
                     }
                     writeLine();
                 }
@@ -94830,7 +94888,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=\"".concat(directive.fileName, "\" />"));
+                writeComment("/// <reference path=\"" + directive.fileName + "\" />");
                 if (bundleFileInfo)
                     bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "reference", data: directive.fileName });
                 writeLine();
@@ -94839,9 +94897,9 @@ var ts;
                 var directive = types_23[_d];
                 var pos = writer.getTextPos();
                 var resolutionMode = directive.resolutionMode && directive.resolutionMode !== (currentSourceFile === null || currentSourceFile === void 0 ? void 0 : currentSourceFile.impliedNodeFormat)
-                    ? "resolution-mode=\"".concat(directive.resolutionMode === ts.ModuleKind.ESNext ? "import" : "require", "\"")
+                    ? "resolution-mode=\"" + (directive.resolutionMode === ts.ModuleKind.ESNext ? "import" : "require") + "\""
                     : "";
-                writeComment("/// <reference types=\"".concat(directive.fileName, "\" ").concat(resolutionMode, "/>"));
+                writeComment("/// <reference types=\"" + directive.fileName + "\" " + 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();
@@ -94849,7 +94907,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=\"".concat(directive.fileName, "\" />"));
+                writeComment("/// <reference lib=\"" + directive.fileName + "\" />");
                 if (bundleFileInfo)
                     bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "lib", data: directive.fileName });
                 writeLine();
@@ -95576,9 +95634,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 ? "\"".concat(ts.escapeJsxAttributeString(text), "\"") :
-                        neverAsciiEscape || (ts.getEmitFlags(node) & 16777216) ? "\"".concat(ts.escapeString(text), "\"") :
-                            "\"".concat(ts.escapeNonAsciiString(text), "\"");
+                    return jsxAttributeEscape ? "\"" + ts.escapeJsxAttributeString(text) + "\"" :
+                        neverAsciiEscape || (ts.getEmitFlags(node) & 16777216) ? "\"" + ts.escapeString(text) + "\"" :
+                            "\"" + ts.escapeNonAsciiString(text) + "\"";
                 }
                 else {
                     return getLiteralTextOfNode(textSourceNode, neverAsciiEscape, jsxAttributeEscape);
@@ -95981,8 +96039,8 @@ var ts;
         }
         function formatSynthesizedComment(comment) {
             return comment.kind === 3
-                ? "/*".concat(comment.text, "*/")
-                : "//".concat(comment.text);
+                ? "/*" + comment.text + "*/"
+                : "//" + comment.text;
         }
         function emitBodyWithDetachedComments(node, detachedRange, emitCallback) {
             enterComment();
@@ -96356,7 +96414,15 @@ var ts;
             return cachedReadDirectoryResult.get(ts.ensureTrailingDirectorySeparator(rootDirPath));
         }
         function getCachedFileSystemEntriesForBaseDir(path) {
-            return getCachedFileSystemEntries(ts.getDirectoryPath(path));
+            var entries = getCachedFileSystemEntries(ts.getDirectoryPath(path));
+            if (!entries) {
+                return entries;
+            }
+            if (!entries.sortedAndCanonicalizedFiles) {
+                entries.sortedAndCanonicalizedFiles = entries.files.map(getCanonicalFileName).sort();
+                entries.sortedAndCanonicalizedDirectories = entries.directories.map(getCanonicalFileName).sort();
+            }
+            return entries;
         }
         function getBaseNameOfFileName(fileName) {
             return ts.getBaseFileName(ts.normalizePath(fileName));
@@ -96391,21 +96457,9 @@ var ts;
                 return undefined;
             }
         }
-        function fileNameEqual(name1, name2) {
-            return getCanonicalFileName(name1) === getCanonicalFileName(name2);
-        }
         function hasEntry(entries, name) {
-            return ts.some(entries, function (file) { return fileNameEqual(file, name); });
-        }
-        function updateFileSystemEntry(entries, baseName, isValid) {
-            if (hasEntry(entries, baseName)) {
-                if (!isValid) {
-                    return ts.filterMutate(entries, function (entry) { return !fileNameEqual(entry, baseName); });
-                }
-            }
-            else if (isValid) {
-                return entries.push(baseName);
-            }
+            var index = ts.binarySearch(entries, name, ts.identity, ts.compareStringsCaseSensitive);
+            return index >= 0;
         }
         function writeFile(fileName, data, writeByteOrderMark) {
             var path = toPath(fileName);
@@ -96418,7 +96472,7 @@ var ts;
         function fileExists(fileName) {
             var path = toPath(fileName);
             var result = getCachedFileSystemEntriesForBaseDir(path);
-            return result && hasEntry(result.files, getBaseNameOfFileName(fileName)) ||
+            return result && hasEntry(result.sortedAndCanonicalizedFiles, getCanonicalFileName(getBaseNameOfFileName(fileName))) ||
                 host.fileExists(fileName);
         }
         function directoryExists(dirPath) {
@@ -96428,9 +96482,13 @@ var ts;
         function createDirectory(dirPath) {
             var path = toPath(dirPath);
             var result = getCachedFileSystemEntriesForBaseDir(path);
-            var baseFileName = getBaseNameOfFileName(dirPath);
             if (result) {
-                updateFileSystemEntry(result.directories, baseFileName, true);
+                var baseName = getBaseNameOfFileName(dirPath);
+                var canonicalizedBaseName = getCanonicalFileName(baseName);
+                var canonicalizedDirectories = result.sortedAndCanonicalizedDirectories;
+                if (ts.insertSorted(canonicalizedDirectories, canonicalizedBaseName, ts.compareStringsCaseSensitive)) {
+                    result.directories.push(baseName);
+                }
             }
             host.createDirectory(dirPath);
         }
@@ -96494,7 +96552,7 @@ var ts;
                 fileExists: host.fileExists(fileOrDirectoryPath),
                 directoryExists: host.directoryExists(fileOrDirectoryPath)
             };
-            if (fsQueryResult.directoryExists || hasEntry(parentResult.directories, baseName)) {
+            if (fsQueryResult.directoryExists || hasEntry(parentResult.sortedAndCanonicalizedDirectories, getCanonicalFileName(baseName))) {
                 clearCache();
             }
             else {
@@ -96512,7 +96570,21 @@ var ts;
             }
         }
         function updateFilesOfFileSystemEntry(parentResult, baseName, fileExists) {
-            updateFileSystemEntry(parentResult.files, baseName, fileExists);
+            var canonicalizedFiles = parentResult.sortedAndCanonicalizedFiles;
+            var canonicalizedBaseName = getCanonicalFileName(baseName);
+            if (fileExists) {
+                if (ts.insertSorted(canonicalizedFiles, canonicalizedBaseName, ts.compareStringsCaseSensitive)) {
+                    parentResult.files.push(baseName);
+                }
+            }
+            else {
+                var sortedIndex = ts.binarySearch(canonicalizedFiles, canonicalizedBaseName, ts.identity, ts.compareStringsCaseSensitive);
+                if (sortedIndex >= 0) {
+                    canonicalizedFiles.splice(sortedIndex, 1);
+                    var unsortedIndex = parentResult.files.findIndex(function (entry) { return getCanonicalFileName(entry) === canonicalizedBaseName; });
+                    parentResult.files.splice(unsortedIndex, 1);
+                }
+            }
         }
         function clearCache() {
             cachedReadDirectoryResult.clear();
@@ -96616,18 +96688,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: ".concat(configFileName, " Detected ignored path: ").concat(fileOrDirectory));
+            writeLog("Project: " + configFileName + " Detected ignored path: " + fileOrDirectory);
             return true;
         }
         fileOrDirectoryPath = newPath;
         if (fileOrDirectoryPath === watchedDirPath)
             return false;
         if (ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, options, extraFileExtensions)) {
-            writeLog("Project: ".concat(configFileName, " Detected file add/remove of non supported extension: ").concat(fileOrDirectory));
+            writeLog("Project: " + configFileName + " Detected file add/remove of non supported extension: " + fileOrDirectory);
             return true;
         }
         if (ts.isExcludedFile(fileOrDirectory, options.configFile.configFileSpecs, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), currentDirectory), useCaseSensitiveFileNames, currentDirectory)) {
-            writeLog("Project: ".concat(configFileName, " Detected excluded file: ").concat(fileOrDirectory));
+            writeLog("Project: " + configFileName + " Detected excluded file: " + fileOrDirectory);
             return true;
         }
         if (!program)
@@ -96646,7 +96718,7 @@ var ts;
         var builderProgram = !realProgram && !ts.isArray(program) ? program : undefined;
         if (hasSourceFile((filePathWithoutExtension + ".ts")) ||
             hasSourceFile((filePathWithoutExtension + ".tsx"))) {
-            writeLog("Project: ".concat(configFileName, " Detected output file: ").concat(fileOrDirectory));
+            writeLog("Project: " + configFileName + " Detected output file: " + fileOrDirectory);
             return true;
         }
         return false;
@@ -96714,36 +96786,36 @@ var ts;
                 host.useCaseSensitiveFileNames();
         }
         function createExcludeWatcherWithLogging(file, flags, options, detailInfo1, detailInfo2) {
-            log("ExcludeWatcher:: Added:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo)));
+            log("ExcludeWatcher:: Added:: " + getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
             return {
-                close: function () { return log("ExcludeWatcher:: Close:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo))); }
+                close: function () { return log("ExcludeWatcher:: Close:: " + getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo)); }
             };
         }
         function createFileWatcherWithLogging(file, cb, flags, options, detailInfo1, detailInfo2) {
-            log("FileWatcher:: Added:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo)));
+            log("FileWatcher:: Added:: " + getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
             var watcher = triggerInvokingFactory.watchFile(file, cb, flags, options, detailInfo1, detailInfo2);
             return {
                 close: function () {
-                    log("FileWatcher:: Close:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo)));
+                    log("FileWatcher:: Close:: " + getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
                     watcher.close();
                 }
             };
         }
         function createDirectoryWatcherWithLogging(file, cb, flags, options, detailInfo1, detailInfo2) {
-            var watchInfo = "DirectoryWatcher:: Added:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
+            var watchInfo = "DirectoryWatcher:: Added:: " + 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:: ".concat(elapsed, "ms ").concat(watchInfo));
+            log("Elapsed:: " + elapsed + "ms " + watchInfo);
             return {
                 close: function () {
-                    var watchInfo = "DirectoryWatcher:: Close:: ".concat(getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo));
+                    var watchInfo = "DirectoryWatcher:: Close:: " + getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo);
                     log(watchInfo);
                     var start = ts.timestamp();
                     watcher.close();
                     var elapsed = ts.timestamp() - start;
-                    log("Elapsed:: ".concat(elapsed, "ms ").concat(watchInfo));
+                    log("Elapsed:: " + elapsed + "ms " + watchInfo);
                 }
             };
         }
@@ -96753,16 +96825,16 @@ var ts;
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
                 }
-                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));
+                var triggerredInfo = (key === "watchFile" ? "FileWatcher" : "DirectoryWatcher") + ":: Triggered with " + args[0] + " " + (args[1] !== undefined ? args[1] : "") + ":: " + 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:: ".concat(elapsed, "ms ").concat(triggerredInfo));
+                log("Elapsed:: " + elapsed + "ms " + triggerredInfo);
             }, flags, options, detailInfo1, detailInfo2); };
         }
         function getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo) {
-            return "WatchInfo: ".concat(file, " ").concat(flags, " ").concat(JSON.stringify(options), " ").concat(getDetailWatchInfo ? getDetailWatchInfo(detailInfo1, detailInfo2) : detailInfo2 === undefined ? detailInfo1 : "".concat(detailInfo1, " ").concat(detailInfo2));
+            return "WatchInfo: " + file + " " + flags + " " + JSON.stringify(options) + " " + (getDetailWatchInfo ? getDetailWatchInfo(detailInfo1, detailInfo2) : detailInfo2 === undefined ? detailInfo1 : detailInfo1 + " " + detailInfo2);
         }
     }
     ts.getWatchFactory = getWatchFactory;
@@ -97029,12 +97101,12 @@ var ts;
     }
     ts.formatDiagnostics = formatDiagnostics;
     function formatDiagnostic(diagnostic, host) {
-        var errorMessage = "".concat(ts.diagnosticCategoryName(diagnostic), " TS").concat(diagnostic.code, ": ").concat(flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())).concat(host.getNewLine());
+        var errorMessage = ts.diagnosticCategoryName(diagnostic) + " TS" + diagnostic.code + ": " + flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine()) + 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 "".concat(relativeFileName, "(").concat(line + 1, ",").concat(character + 1, "): ") + errorMessage;
+            return relativeFileName + "(" + (line + 1) + "," + (character + 1) + "): " + errorMessage;
         }
         return errorMessage;
     }
@@ -97112,9 +97184,9 @@ var ts;
         var output = "";
         output += color(relativeFileName, ForegroundColorEscapeSequences.Cyan);
         output += ":";
-        output += color("".concat(firstLine + 1), ForegroundColorEscapeSequences.Yellow);
+        output += color("" + (firstLine + 1), ForegroundColorEscapeSequences.Yellow);
         output += ":";
-        output += color("".concat(firstLineChar + 1), ForegroundColorEscapeSequences.Yellow);
+        output += color("" + (firstLineChar + 1), ForegroundColorEscapeSequences.Yellow);
         return output;
     }
     ts.formatLocation = formatLocation;
@@ -97128,7 +97200,7 @@ var ts;
                 output += " - ";
             }
             output += formatColorAndReset(ts.diagnosticCategoryName(diagnostic), getCategoryFormat(diagnostic.category));
-            output += formatColorAndReset(" TS".concat(diagnostic.code, ": "), ForegroundColorEscapeSequences.Grey);
+            output += formatColorAndReset(" TS" + diagnostic.code + ": ", ForegroundColorEscapeSequences.Grey);
             output += flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine());
             if (diagnostic.file) {
                 output += host.getNewLine();
@@ -97189,7 +97261,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 ? "".concat(mode, "|").concat(strName) : strName;
+            var cacheKey = mode !== undefined ? mode + "|" + strName : strName;
             if (cache.has(cacheKey)) {
                 result = cache.get(cacheKey);
             }
@@ -97284,7 +97356,7 @@ var ts;
             var result = void 0;
             var mode = getModeForResolutionAtIndex(containingFile, i);
             i++;
-            var cacheKey = mode !== undefined ? "".concat(mode, "|").concat(name) : name;
+            var cacheKey = mode !== undefined ? mode + "|" + name : name;
             if (cache.has(cacheKey)) {
                 result = cache.get(cacheKey);
             }
@@ -99228,7 +99300,7 @@ var ts;
                 path += (i === 2 ? "/" : "-") + components[i];
                 i++;
             }
-            var resolveFrom = ts.combinePaths(currentDirectory, "__lib_node_modules_lookup_".concat(libFileName, "__.ts"));
+            var resolveFrom = ts.combinePaths(currentDirectory, "__lib_node_modules_lookup_" + 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;
@@ -99982,10 +100054,10 @@ var ts;
         }
         function directoryExistsIfProjectReferenceDeclDir(dir) {
             var dirPath = host.toPath(dir);
-            var dirPathWithTrailingDirectorySeparator = "".concat(dirPath).concat(ts.directorySeparator);
+            var dirPathWithTrailingDirectorySeparator = "" + dirPath + ts.directorySeparator;
             return ts.forEachKey(setOfDeclarationDirectories, function (declDirPath) { return dirPath === declDirPath ||
                 ts.startsWith(declDirPath, dirPathWithTrailingDirectorySeparator) ||
-                ts.startsWith(dirPath, "".concat(declDirPath, "/")); });
+                ts.startsWith(dirPath, declDirPath + "/"); });
         }
         function handleDirectoryCouldBeSymlink(directory) {
             var _a;
@@ -100033,7 +100105,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, "".concat(symlinkedDirectory.real).concat(absolutePath.replace(new RegExp(directoryPath, "i"), "")));
+                    symlinkCache.setSymlinkedFile(fileOrDirectoryPath, "" + symlinkedDirectory.real + absolutePath.replace(new RegExp(directoryPath, "i"), ""));
                 }
                 return result;
             }) || false;
@@ -100394,7 +100466,7 @@ var ts;
             var latestSignature;
             if (!sourceFile.isDeclarationFile && !useFileVersionAsSignature) {
                 programOfThisState.emit(sourceFile, function (fileName, text, _writeByteOrderMark, _onError, sourceFiles, data) {
-                    ts.Debug.assert(ts.isDeclarationFileName(fileName), "File extension for signature expected to be dts: Got:: ".concat(fileName));
+                    ts.Debug.assert(ts.isDeclarationFileName(fileName), "File extension for signature expected to be dts: Got:: " + fileName);
                     latestSignature = ts.computeSignatureWithDiagnostics(sourceFile, text, computeHash, getCanonicalFileName, data);
                     if (latestSignature !== prevSignature) {
                         updateExportedModules(state, sourceFile, sourceFiles[0].exportedModulesFromDeclarationEmit);
@@ -101161,7 +101233,7 @@ var ts;
         var sourceFileDirectory;
         if ((_a = data === null || data === void 0 ? void 0 : data.diagnostics) === null || _a === void 0 ? void 0 : _a.length) {
             text += data.diagnostics.map(function (diagnostic) {
-                return "".concat(locationInfo(diagnostic)).concat(ts.DiagnosticCategory[diagnostic.category]).concat(diagnostic.code, ": ").concat(flattenDiagnosticMessageText(diagnostic.messageText));
+                return "" + locationInfo(diagnostic) + ts.DiagnosticCategory[diagnostic.category] + diagnostic.code + ": " + flattenDiagnosticMessageText(diagnostic.messageText);
             }).join("\n");
         }
         return (computeHash !== null && computeHash !== void 0 ? computeHash : ts.generateDjb2Hash)(text);
@@ -101176,10 +101248,10 @@ var ts;
         }
         function locationInfo(diagnostic) {
             if (diagnostic.file.resolvedPath === sourceFile.resolvedPath)
-                return "(".concat(diagnostic.start, ",").concat(diagnostic.length, ")");
+                return "(" + diagnostic.start + "," + diagnostic.length + ")";
             if (sourceFileDirectory === undefined)
                 sourceFileDirectory = ts.getDirectoryPath(sourceFile.resolvedPath);
-            return "".concat(ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(sourceFileDirectory, diagnostic.file.resolvedPath, getCanonicalFileName)), "(").concat(diagnostic.start, ",").concat(diagnostic.length, ")");
+            return ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(sourceFileDirectory, diagnostic.file.resolvedPath, getCanonicalFileName)) + "(" + diagnostic.start + "," + diagnostic.length + ")";
         }
     }
     ts.computeSignatureWithDiagnostics = computeSignatureWithDiagnostics;
@@ -101962,7 +102034,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: ".concat(failedLookupLocation, " failedLookupLocationPath: ").concat(failedLookupLocationPath));
+                ts.Debug.assert(failedLookupSplit.length === failedLookupPathSplit.length, "FailedLookup: " + failedLookupLocation + " failedLookupLocationPath: " + failedLookupLocationPath);
                 if (failedLookupPathSplit.length > rootSplitLength + 1) {
                     return {
                         dir: failedLookupSplit.slice(0, rootSplitLength + 1).join(ts.directorySeparator),
@@ -103042,7 +103114,7 @@ var ts;
         }
         function getJSExtensionForFile(fileName, options) {
             var _a;
-            return (_a = tryGetJSExtensionForFile(fileName, options)) !== null && _a !== void 0 ? _a : ts.Debug.fail("Extension ".concat(ts.extensionFromPath(fileName), " is unsupported:: FileName:: ").concat(fileName));
+            return (_a = tryGetJSExtensionForFile(fileName, options)) !== null && _a !== void 0 ? _a : ts.Debug.fail("Extension " + ts.extensionFromPath(fileName) + " is unsupported:: FileName:: " + fileName);
         }
         function tryGetJSExtensionForFile(fileName, options) {
             var ext = ts.tryGetExtensionFromPath(fileName);
@@ -103132,8 +103204,8 @@ var ts;
         return pretty ?
             function (diagnostic, newLine, options) {
                 clearScreenIfNotWatchingForFileChanges(system, diagnostic, options);
-                var output = "[".concat(ts.formatColorAndReset(getLocaleTimeString(system), ts.ForegroundColorEscapeSequences.Grey), "] ");
-                output += "".concat(ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine)).concat(newLine + newLine);
+                var output = "[" + ts.formatColorAndReset(getLocaleTimeString(system), ts.ForegroundColorEscapeSequences.Grey) + "] ";
+                output += "" + ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine) + (newLine + newLine);
                 system.write(output);
             } :
             function (diagnostic, newLine, options) {
@@ -103141,8 +103213,8 @@ var ts;
                 if (!clearScreenIfNotWatchingForFileChanges(system, diagnostic, options)) {
                     output += newLine;
                 }
-                output += "".concat(getLocaleTimeString(system), " - ");
-                output += "".concat(ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine)).concat(getPlainDiagnosticFollowingNewLines(diagnostic, newLine));
+                output += getLocaleTimeString(system) + " - ";
+                output += "" + ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine) + getPlainDiagnosticFollowingNewLines(diagnostic, newLine);
                 system.write(output);
             };
     }
@@ -103164,7 +103236,7 @@ var ts;
             .map(function (errorDiagnostic) {
             if (errorDiagnostic.file === undefined)
                 return;
-            return "".concat(errorDiagnostic.file.fileName);
+            return "" + errorDiagnostic.file.fileName;
         });
         return filesInError.map(function (fileName) {
             var diagnosticForFileName = ts.find(diagnostics, function (diagnostic) {
@@ -103197,7 +103269,7 @@ var ts;
         if (errorCount === 0)
             return "";
         var nonNilFiles = filesInError.filter(function (fileInError) { return fileInError !== undefined; });
-        var distinctFileNamesWithLines = nonNilFiles.map(function (fileInError) { return "".concat(fileInError.fileName, ":").concat(fileInError.line); })
+        var distinctFileNamesWithLines = nonNilFiles.map(function (fileInError) { return fileInError.fileName + ":" + 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 ?
@@ -103210,7 +103282,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 "".concat(newLine).concat(ts.flattenDiagnosticMessageText(d.messageText, newLine)).concat(newLine).concat(newLine).concat(suffix);
+        return "" + newLine + ts.flattenDiagnosticMessageText(d.messageText, newLine) + newLine + newLine + suffix;
     }
     ts.getErrorSummaryText = getErrorSummaryText;
     function createTabularErrorsDisplay(filesInError, host) {
@@ -103233,7 +103305,7 @@ var ts;
                 " ".repeat(leftPaddingGoal - errorCountDigitsLength)
                 : "";
             var fileRef = prettyPathForFileError(file, host.getCurrentDirectory());
-            tabularData += "".concat(leftPadding).concat(errorCount, "  ").concat(fileRef, "\n");
+            tabularData += "" + leftPadding + errorCount + "  " + fileRef + "\n";
         });
         return tabularData;
     }
@@ -103260,9 +103332,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("".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 = explainIfFileIsRedirectAndImpliedFormat(file, relativeFileName)) === null || _b === void 0 ? void 0 : _b.forEach(function (d) { return write("  ".concat(d.messageText)); });
+            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 = explainIfFileIsRedirectAndImpliedFormat(file, relativeFileName)) === null || _b === void 0 ? void 0 : _b.forEach(function (d) { return write("  " + d.messageText); });
         }
     }
     ts.explainFiles = explainFiles;
@@ -103322,7 +103394,7 @@ var ts;
             if (isJsonFile && !ts.endsWith(includeSpec, ".json"))
                 return false;
             var pattern = ts.getPatternFromSpec(includeSpec, basePath, "files");
-            return !!pattern && ts.getRegexFromPattern("(".concat(pattern, ")$"), useCaseSensitiveFileNames).test(fileName);
+            return !!pattern && ts.getRegexFromPattern("(" + pattern + ")$", useCaseSensitiveFileNames).test(fileName);
         });
     }
     ts.getMatchedIncludeSpec = getMatchedIncludeSpec;
@@ -103331,7 +103403,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) : "\"".concat(referenceLocation.text, "\"");
+            var referenceText = ts.isReferenceFileLocation(referenceLocation) ? referenceLocation.file.text.substring(referenceLocation.pos, referenceLocation.end) : "\"" + 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) {
@@ -103444,7 +103516,7 @@ var ts;
             var currentDir_1 = program.getCurrentDirectory();
             ts.forEach(emittedFiles, function (file) {
                 var filepath = ts.getNormalizedAbsolutePath(file, currentDir_1);
-                write("TSFILE: ".concat(filepath));
+                write("TSFILE: " + filepath);
             });
             listFiles(program, write);
         }
@@ -103666,18 +103738,14 @@ var ts;
         var buildInfo;
         if (host.getBuildInfo) {
             buildInfo = host.getBuildInfo(buildInfoPath, compilerOptions.configFilePath);
-            if (!buildInfo)
-                return undefined;
         }
         else {
             var content = host.readFile(buildInfoPath);
             if (!content)
                 return undefined;
-            buildInfo = ts.getBuildInfo(content);
+            buildInfo = ts.getBuildInfo(buildInfoPath, content);
         }
-        if (buildInfo.version !== ts.version)
-            return undefined;
-        if (!buildInfo.program)
+        if (!buildInfo || buildInfo.version !== ts.version || !buildInfo.program)
             return undefined;
         return ts.createBuilderProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, host);
     }
@@ -103767,7 +103835,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: ".concat(currentDirectory, " CaseSensitiveFileNames: ").concat(useCaseSensitiveFileNames));
+        writeLog("Current directory: " + currentDirectory + " CaseSensitiveFileNames: " + useCaseSensitiveFileNames);
         var configFileWatcher;
         if (configFileName) {
             configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
@@ -103890,7 +103958,8 @@ var ts;
                 }
             }
             var hasInvalidatedResolution = resolutionCache.createHasInvalidatedResolution(userProvidedResolution);
-            if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
+            var _a = ts.changeCompilerHostLikeToUseCache(compilerHost, toPath), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile;
+            if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, function (fileName) { return compilerHost.fileExists(fileName); }, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                 if (hasChangedConfigFileParsingErrors) {
                     if (reportFileChangeDetectedOnCreateProgram) {
                         reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
@@ -103909,14 +103978,19 @@ var ts;
             if (host.afterProgramCreate && program !== builderProgram) {
                 host.afterProgramCreate(builderProgram);
             }
+            compilerHost.readFile = originalReadFile;
+            compilerHost.fileExists = originalFileExists;
+            compilerHost.directoryExists = originalDirectoryExists;
+            compilerHost.createDirectory = originalCreateDirectory;
+            compilerHost.writeFile = originalWriteFile;
             return builderProgram;
         }
         function createNewProgram(hasInvalidatedResolution) {
             writeLog("CreatingProgramWith::");
-            writeLog("  roots: ".concat(JSON.stringify(rootFileNames)));
-            writeLog("  options: ".concat(JSON.stringify(compilerOptions)));
+            writeLog("  roots: " + JSON.stringify(rootFileNames));
+            writeLog("  options: " + JSON.stringify(compilerOptions));
             if (projectReferences)
-                writeLog("  projectReferences: ".concat(JSON.stringify(projectReferences)));
+                writeLog("  projectReferences: " + JSON.stringify(projectReferences));
             var needsUpdateInTypeRootWatch = hasChangedCompilerOptions || !getCurrentProgram();
             hasChangedCompilerOptions = false;
             hasChangedConfigFileParsingErrors = false;
@@ -104051,7 +104125,7 @@ var ts;
                 return resolutionCache.invalidateResolutionsOfFailedLookupLocations();
             }
             var pending = clearInvalidateResolutionsOfFailedLookupLocations();
-            writeLog("Scheduling invalidateFailedLookup".concat(pending ? ", Cancelled earlier one" : ""));
+            writeLog("Scheduling invalidateFailedLookup" + (pending ? ", Cancelled earlier one" : ""));
             timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250);
         }
         function invalidateResolutionsOfFailedLookup() {
@@ -104108,7 +104182,7 @@ var ts;
             synchronizeProgram();
         }
         function reloadConfigFile() {
-            writeLog("Reloading config file: ".concat(configFileName));
+            writeLog("Reloading config file: " + configFileName);
             reloadLevel = ts.ConfigFileProgramReloadLevel.None;
             if (cachedDirectoryStructureHost) {
                 cachedDirectoryStructureHost.clearCache();
@@ -104146,7 +104220,7 @@ var ts;
                     return config.parsedCommandLine;
                 }
             }
-            writeLog("Loading config file: ".concat(configFileName));
+            writeLog("Loading config file: " + configFileName);
             var parsedCommandLine = host.getParsedCommandLine ?
                 host.getParsedCommandLine(configFileName) :
                 getParsedCommandLineFromConfigFileHost(configFileName);
@@ -104328,16 +104402,17 @@ var ts;
         UpToDateStatusType[UpToDateStatusType["UpToDateWithUpstreamTypes"] = 2] = "UpToDateWithUpstreamTypes";
         UpToDateStatusType[UpToDateStatusType["OutOfDateWithPrepend"] = 3] = "OutOfDateWithPrepend";
         UpToDateStatusType[UpToDateStatusType["OutputMissing"] = 4] = "OutputMissing";
-        UpToDateStatusType[UpToDateStatusType["OutOfDateWithSelf"] = 5] = "OutOfDateWithSelf";
-        UpToDateStatusType[UpToDateStatusType["OutOfDateWithUpstream"] = 6] = "OutOfDateWithUpstream";
-        UpToDateStatusType[UpToDateStatusType["OutOfDateBuildInfo"] = 7] = "OutOfDateBuildInfo";
-        UpToDateStatusType[UpToDateStatusType["UpstreamOutOfDate"] = 8] = "UpstreamOutOfDate";
-        UpToDateStatusType[UpToDateStatusType["UpstreamBlocked"] = 9] = "UpstreamBlocked";
-        UpToDateStatusType[UpToDateStatusType["ComputingUpstream"] = 10] = "ComputingUpstream";
-        UpToDateStatusType[UpToDateStatusType["TsVersionOutputOfDate"] = 11] = "TsVersionOutputOfDate";
-        UpToDateStatusType[UpToDateStatusType["UpToDateWithInputFileText"] = 12] = "UpToDateWithInputFileText";
-        UpToDateStatusType[UpToDateStatusType["ContainerOnly"] = 13] = "ContainerOnly";
-        UpToDateStatusType[UpToDateStatusType["ForceBuild"] = 14] = "ForceBuild";
+        UpToDateStatusType[UpToDateStatusType["ErrorReadingFile"] = 5] = "ErrorReadingFile";
+        UpToDateStatusType[UpToDateStatusType["OutOfDateWithSelf"] = 6] = "OutOfDateWithSelf";
+        UpToDateStatusType[UpToDateStatusType["OutOfDateWithUpstream"] = 7] = "OutOfDateWithUpstream";
+        UpToDateStatusType[UpToDateStatusType["OutOfDateBuildInfo"] = 8] = "OutOfDateBuildInfo";
+        UpToDateStatusType[UpToDateStatusType["UpstreamOutOfDate"] = 9] = "UpstreamOutOfDate";
+        UpToDateStatusType[UpToDateStatusType["UpstreamBlocked"] = 10] = "UpstreamBlocked";
+        UpToDateStatusType[UpToDateStatusType["ComputingUpstream"] = 11] = "ComputingUpstream";
+        UpToDateStatusType[UpToDateStatusType["TsVersionOutputOfDate"] = 12] = "TsVersionOutputOfDate";
+        UpToDateStatusType[UpToDateStatusType["UpToDateWithInputFileText"] = 13] = "UpToDateWithInputFileText";
+        UpToDateStatusType[UpToDateStatusType["ContainerOnly"] = 14] = "ContainerOnly";
+        UpToDateStatusType[UpToDateStatusType["ForceBuild"] = 15] = "ForceBuild";
     })(UpToDateStatusType = ts.UpToDateStatusType || (ts.UpToDateStatusType = {}));
     function resolveConfigFileProjectName(project) {
         if (ts.fileExtensionIs(project, ".json")) {
@@ -104389,8 +104464,8 @@ var ts;
     ts.getBuildOrderFromAnyBuildOrder = getBuildOrderFromAnyBuildOrder;
     function createBuilderStatusReporter(system, pretty) {
         return function (diagnostic) {
-            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);
+            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);
             system.write(output);
         };
     }
@@ -104537,6 +104612,7 @@ var ts;
         if (value) {
             return isParsedCommandLine(value) ? value : undefined;
         }
+        ts.performance.mark("SolutionBuilder::beforeConfigFileParsing");
         var diagnostic;
         var parseConfigFileHost = state.parseConfigFileHost, baseCompilerOptions = state.baseCompilerOptions, baseWatchOptions = state.baseWatchOptions, extendedConfigCache = state.extendedConfigCache, host = state.host;
         var parsed;
@@ -104551,6 +104627,8 @@ var ts;
             parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = ts.noop;
         }
         configFileCache.set(configFilePath, parsed || diagnostic);
+        ts.performance.mark("SolutionBuilder::afterConfigFileParsing");
+        ts.performance.measure("SolutionBuilder::Config file parsing", "SolutionBuilder::beforeConfigFileParsing", "SolutionBuilder::afterConfigFileParsing");
         return parsed;
     }
     function resolveProjectName(state, name) {
@@ -104743,6 +104821,7 @@ var ts;
                 if (updateOutputFileStampsPending) {
                     updateOutputTimestamps(state, config, projectPath);
                 }
+                ts.performance.mark("SolutionBuilder::Timestamps only updates");
                 return doneInvalidatedProject(state, projectPath);
             }
         };
@@ -104836,6 +104915,10 @@ var ts;
             };
         function done(cancellationToken, writeFile, customTransformers) {
             executeSteps(BuildStep.Done, cancellationToken, writeFile, customTransformers);
+            if (kind === InvalidatedProjectKind.Build)
+                ts.performance.mark("SolutionBuilder::Projects built");
+            else
+                ts.performance.mark("SolutionBuilder::Bundles updated");
             return doneInvalidatedProject(state, projectPath);
         }
         function withProgramOrUndefined(action) {
@@ -105002,13 +105085,13 @@ var ts;
             var emitterDiagnostics = ts.createDiagnosticCollection();
             var emittedOutputs = new ts.Map();
             var resultFlags = BuildResultFlags.DeclarationOutputUnchanged;
-            var existingBuildInfo = state.buildInfoCache.get(projectPath).buildInfo;
+            var existingBuildInfo = state.buildInfoCache.get(projectPath).buildInfo || undefined;
             outputFiles.forEach(function (_a) {
                 var _b, _c;
                 var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark, buildInfo = _a.buildInfo;
                 emittedOutputs.set(toPath(state, name), name);
                 if (buildInfo) {
-                    if (((_b = buildInfo.program) === null || _b === void 0 ? void 0 : _b.outSignature) !== ((_c = existingBuildInfo.program) === null || _c === void 0 ? void 0 : _c.outSignature)) {
+                    if (((_b = buildInfo.program) === null || _b === void 0 ? void 0 : _b.outSignature) !== ((_c = existingBuildInfo === null || existingBuildInfo === void 0 ? void 0 : existingBuildInfo.program) === null || _c === void 0 ? void 0 : _c.outSignature)) {
                         resultFlags &= ~BuildResultFlags.DeclarationOutputUnchanged;
                     }
                     setBuildInfo(state, buildInfo, projectPath, config.options, resultFlags);
@@ -105167,7 +105250,7 @@ var ts;
     function listEmittedFile(_a, proj, file) {
         var write = _a.write;
         if (write && proj.options.listEmittedFiles) {
-            write("TSFILE: ".concat(file));
+            write("TSFILE: " + file);
         }
     }
     function getOldProgram(_a, proj, parsed) {
@@ -105196,7 +105279,7 @@ var ts;
     function buildErrors(state, resolvedPath, program, config, diagnostics, buildResult, errorType) {
         var canEmitBuildInfo = program && !ts.outFile(program.getCompilerOptions());
         reportAndStoreErrors(state, resolvedPath, diagnostics);
-        state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.Unbuildable, reason: "".concat(errorType, " errors") });
+        state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
         if (canEmitBuildInfo)
             return { buildResult: buildResult, step: BuildStep.EmitBuildInfo };
         afterProgramDone(state, program, config);
@@ -105291,8 +105374,7 @@ var ts;
             return existing.buildInfo || undefined;
         }
         var value = state.readFileWithCache(buildInfoPath);
-        var buildInfo = value ? ts.getBuildInfo(value) : undefined;
-        ts.Debug.assert(modifiedTime || !buildInfo);
+        var buildInfo = value ? ts.getBuildInfo(buildInfoPath, value) : undefined;
         state.buildInfoCache.set(resolvedConfigPath, { path: path, buildInfo: buildInfo || false, modifiedTime: modifiedTime || ts.missingFileModifiedTime });
         return buildInfo;
     }
@@ -105370,7 +105452,13 @@ var ts;
                     missingOutputFileName: buildInfoPath
                 };
             }
-            var buildInfo = ts.Debug.checkDefined(getBuildInfo(state, buildInfoPath, resolvedPath, buildInfoTime));
+            var buildInfo = getBuildInfo(state, buildInfoPath, resolvedPath, buildInfoTime);
+            if (!buildInfo) {
+                return {
+                    type: ts.UpToDateStatusType.ErrorReadingFile,
+                    fileName: buildInfoPath
+                };
+            }
             if ((buildInfo.bundle || buildInfo.program) && buildInfo.version !== ts.version) {
                 return {
                     type: ts.UpToDateStatusType.TsVersionOutputOfDate,
@@ -105399,7 +105487,7 @@ var ts;
             if (inputTime === ts.missingFileModifiedTime) {
                 return {
                     type: ts.UpToDateStatusType.Unbuildable,
-                    reason: "".concat(inputFile, " does not exist")
+                    reason: inputFile + " does not exist"
                 };
             }
             if (buildInfoTime && buildInfoTime < inputTime) {
@@ -105548,7 +105636,10 @@ var ts;
         if (prior !== undefined) {
             return prior;
         }
+        ts.performance.mark("SolutionBuilder::beforeUpToDateCheck");
         var actual = getUpToDateStatusWorker(state, project, resolvedPath);
+        ts.performance.mark("SolutionBuilder::afterUpToDateCheck");
+        ts.performance.measure("SolutionBuilder::Up-to-date check", "SolutionBuilder::beforeUpToDateCheck", "SolutionBuilder::afterUpToDateCheck");
         state.projectStatus.set(resolvedPath, actual);
         return actual;
     }
@@ -105675,6 +105766,13 @@ var ts;
         }
     }
     function build(state, project, cancellationToken, writeFile, getCustomTransformers, onlyReferences) {
+        ts.performance.mark("SolutionBuilder::beforeBuild");
+        var result = buildWorker(state, project, cancellationToken, writeFile, getCustomTransformers, onlyReferences);
+        ts.performance.mark("SolutionBuilder::afterBuild");
+        ts.performance.measure("SolutionBuilder::Build", "SolutionBuilder::beforeBuild", "SolutionBuilder::afterBuild");
+        return result;
+    }
+    function buildWorker(state, project, cancellationToken, writeFile, getCustomTransformers, onlyReferences) {
         var buildOrder = getBuildOrderFor(state, project, onlyReferences);
         if (!buildOrder)
             return ts.ExitStatus.InvalidProject_OutputsSkipped;
@@ -105702,6 +105800,13 @@ var ts;
                     : ts.ExitStatus.DiagnosticsPresent_OutputsSkipped;
     }
     function clean(state, project, onlyReferences) {
+        ts.performance.mark("SolutionBuilder::beforeClean");
+        var result = cleanWorker(state, project, onlyReferences);
+        ts.performance.mark("SolutionBuilder::afterClean");
+        ts.performance.measure("SolutionBuilder::Clean", "SolutionBuilder::beforeClean", "SolutionBuilder::afterClean");
+        return result;
+    }
+    function cleanWorker(state, project, onlyReferences) {
         var buildOrder = getBuildOrderFor(state, project, onlyReferences);
         if (!buildOrder)
             return ts.ExitStatus.InvalidProject_OutputsSkipped;
@@ -105739,7 +105844,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 * ".concat(f); }).join(""));
+            reportStatus(state, ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * " + f; }).join(""));
         }
         return ts.ExitStatus.Success;
     }
@@ -105772,6 +105877,14 @@ var ts;
         state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, time, state, changeDetected);
     }
     function buildNextInvalidatedProject(state, changeDetected) {
+        ts.performance.mark("SolutionBuilder::beforeBuild");
+        var buildOrder = buildNextInvalidatedProjectWorker(state, changeDetected);
+        ts.performance.mark("SolutionBuilder::afterBuild");
+        ts.performance.measure("SolutionBuilder::Build", "SolutionBuilder::beforeBuild", "SolutionBuilder::afterBuild");
+        if (buildOrder)
+            reportErrorSummary(state, buildOrder);
+    }
+    function buildNextInvalidatedProjectWorker(state, changeDetected) {
         state.timerToBuildInvalidatedProject = undefined;
         if (state.reportFileChangeDetected) {
             state.reportFileChangeDetected = false;
@@ -105801,7 +105914,7 @@ var ts;
             }
         }
         disableCache(state);
-        reportErrorSummary(state, buildOrder);
+        return buildOrder;
     }
     function watchConfigFile(state, resolved, resolvedPath, parsed) {
         if (!state.watch || state.allWatchedConfigFiles.has(resolvedPath))
@@ -105856,6 +105969,7 @@ var ts;
     function startWatching(state, buildOrder) {
         if (!state.watchAllProjectsPending)
             return;
+        ts.performance.mark("SolutionBuilder::beforeWatcherCreation");
         state.watchAllProjectsPending = false;
         for (var _i = 0, _a = getBuildOrderFromAnyBuildOrder(buildOrder); _i < _a.length; _i++) {
             var resolved = _a[_i];
@@ -105869,6 +105983,8 @@ var ts;
                 watchPackageJsonFiles(state, resolved, resolvedPath, cfg);
             }
         }
+        ts.performance.mark("SolutionBuilder::afterWatcherCreation");
+        ts.performance.measure("SolutionBuilder::Watcher creation", "SolutionBuilder::beforeWatcherCreation", "SolutionBuilder::afterWatcherCreation");
     }
     function stopWatching(state) {
         ts.clearMap(state.allWatchedConfigFiles, ts.closeFileWatcher);
@@ -105978,6 +106094,8 @@ var ts;
                 return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_1_is_older_than_input_2, relName(state, configFileName), relName(state, status.outOfDateOutputFileName), relName(state, status.newerProjectName));
             case ts.UpToDateStatusType.OutputMissing:
                 return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, relName(state, configFileName), relName(state, status.missingOutputFileName));
+            case ts.UpToDateStatusType.ErrorReadingFile:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_there_was_error_reading_file_1, relName(state, configFileName), relName(state, status.fileName));
             case ts.UpToDateStatusType.OutOfDateBuildInfo:
                 return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitted, relName(state, configFileName), relName(state, status.buildInfoFile));
             case ts.UpToDateStatusType.UpToDate:
@@ -106018,6 +106136,12 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
+    var StatisticType;
+    (function (StatisticType) {
+        StatisticType[StatisticType["time"] = 0] = "time";
+        StatisticType[StatisticType["count"] = 1] = "count";
+        StatisticType[StatisticType["memory"] = 2] = "memory";
+    })(StatisticType = ts.StatisticType || (ts.StatisticType = {}));
     function countLines(program) {
         var counts = getCountsMap();
         ts.forEach(program.getSourceFiles(), function (file) {
@@ -106027,14 +106151,6 @@ var ts;
         });
         return counts;
     }
-    function countNodes(program) {
-        var counts = getCountsMap();
-        ts.forEach(program.getSourceFiles(), function (file) {
-            var key = getCountKey(program, file);
-            counts.set(key, counts.get(key) + file.nodeCount);
-        });
-        return counts;
-    }
     function getCountsMap() {
         var counts = new ts.Map();
         counts.set("Library", 0);
@@ -106099,7 +106215,7 @@ var ts;
             };
         }
         function bold(str) {
-            return "\u001B[1m".concat(str, "\u001B[22m");
+            return "\u001B[1m" + str + "\u001B[22m";
         }
         var isWindows = sys.getEnvironmentVariable("OS") && ts.stringContains(sys.getEnvironmentVariable("OS").toLowerCase(), "windows");
         var isWindowsTerminal = sys.getEnvironmentVariable("WT_SESSION");
@@ -106108,19 +106224,19 @@ var ts;
             if (isWindows && !isWindowsTerminal && !isVSCode) {
                 return brightWhite(str);
             }
-            return "\u001B[94m".concat(str, "\u001B[39m");
+            return "\u001B[94m" + str + "\u001B[39m";
         }
         var supportsRicherColors = sys.getEnvironmentVariable("COLORTERM") === "truecolor" || sys.getEnvironmentVariable("TERM") === "xterm-256color";
         function blueBackground(str) {
             if (supportsRicherColors) {
-                return "\u001B[48;5;68m".concat(str, "\u001B[39;49m");
+                return "\u001B[48;5;68m" + str + "\u001B[39;49m";
             }
             else {
-                return "\u001B[44m".concat(str, "\u001B[39;49m");
+                return "\u001B[44m" + str + "\u001B[39;49m";
             }
         }
         function brightWhite(str) {
-            return "\u001B[97m".concat(str, "\u001B[39m");
+            return "\u001B[97m" + str + "\u001B[39m";
         }
         return {
             bold: bold,
@@ -106130,7 +106246,7 @@ var ts;
         };
     }
     function getDisplayNameTextOfOption(option) {
-        return "--".concat(option.name).concat(option.shortName ? ", -".concat(option.shortName) : "");
+        return "--" + option.name + (option.shortName ? ", -" + option.shortName : "");
     }
     function generateOptionOutput(sys, option, rightAlignOfLeft, leftAlignOfRight) {
         var _a, _b;
@@ -106167,13 +106283,13 @@ var ts;
             text.push(sys.newLine);
             if (showAdditionalInfoOutput(valueCandidates, option)) {
                 if (valueCandidates) {
-                    text.push("".concat(valueCandidates.valueType, " ").concat(valueCandidates.possibleValues));
+                    text.push(valueCandidates.valueType + " " + valueCandidates.possibleValues);
                 }
                 if (defaultValueDescription) {
                     if (valueCandidates)
                         text.push(sys.newLine);
                     var diagType = ts.getDiagnosticText(ts.Diagnostics.default_Colon);
-                    text.push("".concat(diagType, " ").concat(defaultValueDescription));
+                    text.push(diagType + " " + defaultValueDescription);
                 }
                 text.push(sys.newLine);
             }
@@ -106222,7 +106338,7 @@ var ts;
                 }
                 var curRight = remainRight.substr(0, rightCharacterNumber);
                 remainRight = remainRight.slice(rightCharacterNumber);
-                res.push("".concat(curLeft).concat(curRight));
+                res.push("" + curLeft + curRight);
                 isFirstLine = false;
             }
             return res;
@@ -106323,7 +106439,7 @@ var ts;
             categoryMap.set(curCategory, optionsOfCurCategory);
         }
         categoryMap.forEach(function (value, key) {
-            res.push("### ".concat(key).concat(sys.newLine).concat(sys.newLine));
+            res.push("### " + key + sys.newLine + sys.newLine);
             res = __spreadArray(__spreadArray([], res, true), generateGroupOptionOutput(sys, value), true);
         });
         if (afterOptionsDescription) {
@@ -106333,7 +106449,7 @@ var ts;
     }
     function printEasyHelp(sys, simpleOptions) {
         var colors = createColors(sys);
-        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);
+        var output = __spreadArray([], getHeader(sys, ts.getDiagnosticText(ts.Diagnostics.tsc_Colon_The_TypeScript_Compiler) + " - " + 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);
@@ -106359,7 +106475,7 @@ var ts;
         }
     }
     function printAllHelp(sys, compilerOptions, buildOptions, watchOptions) {
-        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);
+        var output = __spreadArray([], getHeader(sys, ts.getDiagnosticText(ts.Diagnostics.tsc_Colon_The_TypeScript_Compiler) + " - " + 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);
@@ -106369,7 +106485,7 @@ var ts;
         }
     }
     function printBuildHelp(sys, buildOptions) {
-        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);
+        var output = __spreadArray([], getHeader(sys, ts.getDiagnosticText(ts.Diagnostics.tsc_Colon_The_TypeScript_Compiler) + " - " + 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];
@@ -106578,15 +106694,26 @@ var ts;
             if (reportWatchModeWithoutSysSupport(sys, reportDiagnostic))
                 return;
             var buildHost_1 = ts.createSolutionBuilderWithWatchHost(sys, undefined, reportDiagnostic, ts.createBuilderStatusReporter(sys, shouldBePretty(sys, buildOptions)), createWatchStatusReporter(sys, buildOptions));
-            updateSolutionBuilderHost(sys, cb, buildHost_1);
+            var solutionPerformance_1 = enableSolutionPerformance(sys, buildOptions);
+            updateSolutionBuilderHost(sys, cb, buildHost_1, solutionPerformance_1);
+            var onWatchStatusChange_1 = buildHost_1.onWatchStatusChange;
+            buildHost_1.onWatchStatusChange = function (d, newLine, options, errorCount) {
+                onWatchStatusChange_1 === null || onWatchStatusChange_1 === void 0 ? void 0 : onWatchStatusChange_1(d, newLine, options, errorCount);
+                if (d.code === ts.Diagnostics.Found_0_errors_Watching_for_file_changes.code ||
+                    d.code === ts.Diagnostics.Found_1_error_Watching_for_file_changes.code) {
+                    reportSolutionBuilderTimes(builder_1, solutionPerformance_1);
+                }
+            };
             var builder_1 = ts.createSolutionBuilderWithWatch(buildHost_1, projects, buildOptions, watchOptions);
             builder_1.build();
             return builder_1;
         }
         var buildHost = ts.createSolutionBuilderHost(sys, undefined, reportDiagnostic, ts.createBuilderStatusReporter(sys, shouldBePretty(sys, buildOptions)), createReportErrorSummary(sys, buildOptions));
-        updateSolutionBuilderHost(sys, cb, buildHost);
+        var solutionPerformance = enableSolutionPerformance(sys, buildOptions);
+        updateSolutionBuilderHost(sys, cb, buildHost, solutionPerformance);
         var builder = ts.createSolutionBuilder(buildHost, projects, buildOptions);
         var exitStatus = buildOptions.clean ? builder.clean() : builder.build();
+        reportSolutionBuilderTimes(builder, solutionPerformance);
         ts.dumpTracingLegend();
         return sys.exit(exitStatus);
     }
@@ -106611,7 +106738,7 @@ var ts;
         };
         var program = ts.createProgram(programOptions);
         var exitStatus = ts.emitFilesAndReportErrorsAndGetExitStatus(program, reportDiagnostic, function (s) { return sys.write(s + sys.newLine); }, createReportErrorSummary(sys, options));
-        reportStatistics(sys, program);
+        reportStatistics(sys, program, undefined);
         cb(program);
         return sys.exit(exitStatus);
     }
@@ -106629,36 +106756,36 @@ var ts;
             reportDiagnostic: reportDiagnostic,
             reportErrorSummary: createReportErrorSummary(sys, options),
             afterProgramEmitAndDiagnostics: function (builderProgram) {
-                reportStatistics(sys, builderProgram.getProgram());
+                reportStatistics(sys, builderProgram.getProgram(), undefined);
                 cb(builderProgram);
             }
         });
         return sys.exit(exitStatus);
     }
-    function updateSolutionBuilderHost(sys, cb, buildHost) {
-        updateCreateProgram(sys, buildHost);
+    function updateSolutionBuilderHost(sys, cb, buildHost, solutionPerformance) {
+        updateCreateProgram(sys, buildHost, true);
         buildHost.afterProgramEmitAndDiagnostics = function (program) {
-            reportStatistics(sys, program.getProgram());
+            reportStatistics(sys, program.getProgram(), solutionPerformance);
             cb(program);
         };
         buildHost.afterEmitBundle = cb;
     }
-    function updateCreateProgram(sys, host) {
+    function updateCreateProgram(sys, host, isBuildMode) {
         var compileUsingBuilder = host.createProgram;
         host.createProgram = function (rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences) {
             ts.Debug.assert(rootNames !== undefined || (options === undefined && !!oldProgram));
             if (options !== undefined) {
-                enableStatisticsAndTracing(sys, options, true);
+                enableStatisticsAndTracing(sys, options, isBuildMode);
             }
             return compileUsingBuilder(rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences);
         };
     }
     function updateWatchCompilationHost(sys, cb, watchCompilerHost) {
-        updateCreateProgram(sys, watchCompilerHost);
+        updateCreateProgram(sys, watchCompilerHost, false);
         var emitFilesUsingBuilder = watchCompilerHost.afterProgramCreate;
         watchCompilerHost.afterProgramCreate = function (builderProgram) {
             emitFilesUsingBuilder(builderProgram);
-            reportStatistics(sys, builderProgram.getProgram());
+            reportStatistics(sys, builderProgram.getProgram(), undefined);
             cb(builderProgram);
         };
     }
@@ -106691,6 +106818,71 @@ var ts;
         updateWatchCompilationHost(system, cb, watchCompilerHost);
         return ts.createWatchProgram(watchCompilerHost);
     }
+    function enableSolutionPerformance(system, options) {
+        if (system === ts.sys && options.extendedDiagnostics) {
+            ts.performance.enable();
+            return createSolutionPerfomrance();
+        }
+    }
+    function createSolutionPerfomrance() {
+        var statistics;
+        return {
+            addAggregateStatistic: addAggregateStatistic,
+            forEachAggregateStatistics: forEachAggreateStatistics,
+            clear: clear,
+        };
+        function addAggregateStatistic(s) {
+            var existing = statistics === null || statistics === void 0 ? void 0 : statistics.get(s.name);
+            if (existing) {
+                if (existing.type === StatisticType.memory)
+                    existing.value = Math.max(existing.value, s.value);
+                else
+                    existing.value += s.value;
+            }
+            else {
+                (statistics !== null && statistics !== void 0 ? statistics : (statistics = new ts.Map())).set(s.name, s);
+            }
+        }
+        function forEachAggreateStatistics(cb) {
+            statistics === null || statistics === void 0 ? void 0 : statistics.forEach(cb);
+        }
+        function clear() {
+            statistics = undefined;
+        }
+    }
+    function reportSolutionBuilderTimes(builder, solutionPerformance) {
+        if (!solutionPerformance)
+            return;
+        if (!ts.performance.isEnabled()) {
+            ts.sys.write(ts.Diagnostics.Performance_timings_for_diagnostics_or_extendedDiagnostics_are_not_available_in_this_session_A_native_implementation_of_the_Web_Performance_API_could_not_be_found.message + "\n");
+            return;
+        }
+        var statistics = [];
+        statistics.push({ name: "Projects in scope", value: ts.getBuildOrderFromAnyBuildOrder(builder.getBuildOrder()).length, type: StatisticType.count });
+        reportSolutionBuilderCountStatistic("SolutionBuilder::Projects built");
+        reportSolutionBuilderCountStatistic("SolutionBuilder::Timestamps only updates");
+        reportSolutionBuilderCountStatistic("SolutionBuilder::Bundles updated");
+        solutionPerformance.forEachAggregateStatistics(function (s) {
+            s.name = "Aggregate " + s.name;
+            statistics.push(s);
+        });
+        ts.performance.forEachMeasure(function (name, duration) {
+            if (isSolutionMarkOrMeasure(name))
+                statistics.push({ name: getNameFromSolutionBuilderMarkOrMeasure(name) + " time", value: duration, type: StatisticType.time });
+        });
+        ts.performance.disable();
+        ts.performance.enable();
+        reportAllStatistics(ts.sys, statistics);
+        function reportSolutionBuilderCountStatistic(name) {
+            var value = ts.performance.getCount(name);
+            if (value) {
+                statistics.push({ name: getNameFromSolutionBuilderMarkOrMeasure(name), value: value, type: StatisticType.count });
+            }
+        }
+        function getNameFromSolutionBuilderMarkOrMeasure(name) {
+            return name.replace("SolutionBuilder::", "");
+        }
+    }
     function canReportDiagnostics(system, compilerOptions) {
         return system === ts.sys && (compilerOptions.diagnostics || compilerOptions.extendedDiagnostics);
     }
@@ -106705,7 +106897,10 @@ var ts;
             ts.startTracing(isBuildMode ? "build" : "project", compilerOptions.generateTrace, compilerOptions.configFilePath);
         }
     }
-    function reportStatistics(sys, program) {
+    function isSolutionMarkOrMeasure(name) {
+        return ts.startsWith(name, "SolutionBuilder::");
+    }
+    function reportStatistics(sys, program, solutionPerformance) {
         var compilerOptions = program.getCompilerOptions();
         if (canTrace(sys, compilerOptions)) {
             ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.stopTracing();
@@ -106716,27 +106911,21 @@ var ts;
             var memoryUsed = sys.getMemoryUsage ? sys.getMemoryUsage() : -1;
             reportCountStatistic("Files", program.getSourceFiles().length);
             var lineCounts = countLines(program);
-            var nodeCounts = countNodes(program);
             if (compilerOptions.extendedDiagnostics) {
                 for (var _i = 0, _a = ts.arrayFrom(lineCounts.keys()); _i < _a.length; _i++) {
                     var key = _a[_i];
                     reportCountStatistic("Lines of " + key, lineCounts.get(key));
                 }
-                for (var _b = 0, _c = ts.arrayFrom(nodeCounts.keys()); _b < _c.length; _b++) {
-                    var key = _c[_b];
-                    reportCountStatistic("Nodes of " + key, nodeCounts.get(key));
-                }
             }
             else {
                 reportCountStatistic("Lines", ts.reduceLeftIterator(lineCounts.values(), function (sum, count) { return sum + count; }, 0));
-                reportCountStatistic("Nodes", ts.reduceLeftIterator(nodeCounts.values(), function (sum, count) { return sum + count; }, 0));
             }
             reportCountStatistic("Identifiers", program.getIdentifierCount());
             reportCountStatistic("Symbols", program.getSymbolCount());
             reportCountStatistic("Types", program.getTypeCount());
             reportCountStatistic("Instantiations", program.getInstantiationCount());
             if (memoryUsed >= 0) {
-                reportStatisticalValue("Memory used", Math.round(memoryUsed / 1000) + "K");
+                reportStatisticalValue({ name: "Memory used", value: memoryUsed, type: StatisticType.memory }, true);
             }
             var isPerformanceEnabled = ts.performance.isEnabled();
             var programTime = isPerformanceEnabled ? ts.performance.getDuration("Program") : 0;
@@ -106750,53 +106939,83 @@ 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("".concat(name, " time"), duration); });
+                    ts.performance.forEachMeasure(function (name, duration) {
+                        if (!isSolutionMarkOrMeasure(name))
+                            reportTimeStatistic(name + " time", duration, true);
+                    });
                 }
             }
             else if (isPerformanceEnabled) {
-                reportTimeStatistic("I/O read", ts.performance.getDuration("I/O Read"));
-                reportTimeStatistic("I/O write", ts.performance.getDuration("I/O Write"));
-                reportTimeStatistic("Parse time", programTime);
-                reportTimeStatistic("Bind time", bindTime);
-                reportTimeStatistic("Check time", checkTime);
-                reportTimeStatistic("Emit time", emitTime);
+                reportTimeStatistic("I/O read", ts.performance.getDuration("I/O Read"), true);
+                reportTimeStatistic("I/O write", ts.performance.getDuration("I/O Write"), true);
+                reportTimeStatistic("Parse time", programTime, true);
+                reportTimeStatistic("Bind time", bindTime, true);
+                reportTimeStatistic("Check time", checkTime, true);
+                reportTimeStatistic("Emit time", emitTime, true);
             }
             if (isPerformanceEnabled) {
-                reportTimeStatistic("Total time", programTime + bindTime + checkTime + emitTime);
+                reportTimeStatistic("Total time", programTime + bindTime + checkTime + emitTime, false);
             }
-            reportStatistics();
+            reportAllStatistics(sys, statistics);
             if (!isPerformanceEnabled) {
                 sys.write(ts.Diagnostics.Performance_timings_for_diagnostics_or_extendedDiagnostics_are_not_available_in_this_session_A_native_implementation_of_the_Web_Performance_API_could_not_be_found.message + "\n");
             }
             else {
-                ts.performance.disable();
-            }
-        }
-        function reportStatistics() {
-            var nameSize = 0;
-            var valueSize = 0;
-            for (var _i = 0, statistics_1 = statistics; _i < statistics_1.length; _i++) {
-                var _a = statistics_1[_i], name = _a.name, value = _a.value;
-                if (name.length > nameSize) {
-                    nameSize = name.length;
+                if (solutionPerformance) {
+                    ts.performance.forEachMeasure(function (name) {
+                        if (!isSolutionMarkOrMeasure(name))
+                            ts.performance.clearMeasures(name);
+                    });
+                    ts.performance.forEachMark(function (name) {
+                        if (!isSolutionMarkOrMeasure(name))
+                            ts.performance.clearMarks(name);
+                    });
                 }
-                if (value.length > valueSize) {
-                    valueSize = value.length;
+                else {
+                    ts.performance.disable();
                 }
             }
-            for (var _b = 0, statistics_2 = statistics; _b < statistics_2.length; _b++) {
-                var _c = statistics_2[_b], name = _c.name, value = _c.value;
-                sys.write(ts.padRight(name + ":", nameSize + 2) + ts.padLeft(value.toString(), valueSize) + sys.newLine);
-            }
         }
-        function reportStatisticalValue(name, value) {
-            statistics.push({ name: name, value: value });
+        function reportStatisticalValue(s, aggregate) {
+            statistics.push(s);
+            if (aggregate)
+                solutionPerformance === null || solutionPerformance === void 0 ? void 0 : solutionPerformance.addAggregateStatistic(s);
         }
         function reportCountStatistic(name, count) {
-            reportStatisticalValue(name, "" + count);
+            reportStatisticalValue({ name: name, value: count, type: StatisticType.count }, true);
+        }
+        function reportTimeStatistic(name, time, aggregate) {
+            reportStatisticalValue({ name: name, value: time, type: StatisticType.time }, aggregate);
         }
-        function reportTimeStatistic(name, time) {
-            reportStatisticalValue(name, (time / 1000).toFixed(2) + "s");
+    }
+    function reportAllStatistics(sys, statistics) {
+        var nameSize = 0;
+        var valueSize = 0;
+        for (var _i = 0, statistics_1 = statistics; _i < statistics_1.length; _i++) {
+            var s = statistics_1[_i];
+            if (s.name.length > nameSize) {
+                nameSize = s.name.length;
+            }
+            var value = statisticValue(s);
+            if (value.length > valueSize) {
+                valueSize = value.length;
+            }
+        }
+        for (var _a = 0, statistics_2 = statistics; _a < statistics_2.length; _a++) {
+            var s = statistics_2[_a];
+            sys.write(ts.padRight(s.name + ":", nameSize + 2) + ts.padLeft(statisticValue(s).toString(), valueSize) + sys.newLine);
+        }
+    }
+    function statisticValue(s) {
+        switch (s.type) {
+            case StatisticType.count:
+                return "" + s.value;
+            case StatisticType.time:
+                return (s.value / 1000).toFixed(2) + "s";
+            case StatisticType.memory:
+                return Math.round(s.value / 1000) + "K";
+            default:
+                ts.Debug.assertNever(s.type);
         }
     }
     function writeConfigFile(sys, reportDiagnostic, options, fileNames) {
@@ -106822,7 +107041,7 @@ var ts;
 // enable deprecation logging
 ts.Debug.loggingHost = {
     log: function (_level, s) {
-        ts.sys.write("".concat(s || "").concat(ts.sys.newLine));
+        ts.sys.write("" + (s || "") + ts.sys.newLine);
     }
 };
 if (ts.Debug.isDebugging) {