typescript 4.8.0-dev.20220809 → 4.9.0-dev.20220812

package/lib/tsc.js

@@ -68,8 +68,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var ts;
 (function (ts) {
-    ts.versionMajorMinor = "4.8";
-    ts.version = ts.versionMajorMinor + ".0-dev.20220809";
+    ts.versionMajorMinor = "4.9";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220812";
     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 " + 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) {
@@ -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;
         }
@@ -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."),
@@ -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) {
@@ -22352,9 +22378,10 @@ var ts;
             };
             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;
             };
@@ -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);
@@ -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) {
@@ -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);
@@ -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);
@@ -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) {
@@ -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;
@@ -61824,9 +61874,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)) {
@@ -65043,11 +65098,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);
             }
@@ -65279,8 +65336,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;
             }
@@ -73404,6 +73461,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)) {
@@ -88487,6 +88550,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);
@@ -90728,8 +90797,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)));
                 }
@@ -92038,8 +92111,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 = {
@@ -92113,17 +92186,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));
@@ -96367,7 +96439,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));
@@ -96402,21 +96482,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);
@@ -96429,7 +96497,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) {
@@ -96439,9 +96507,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);
         }
@@ -96505,7 +96577,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 {
@@ -96523,7 +96595,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();
@@ -103677,18 +103763,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);
     }
@@ -103901,7 +103983,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);
@@ -103920,6 +104003,11 @@ 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) {
@@ -104339,16 +104427,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")) {
@@ -104548,6 +104637,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;
@@ -104562,6 +104652,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) {
@@ -104754,6 +104846,7 @@ var ts;
                 if (updateOutputFileStampsPending) {
                     updateOutputTimestamps(state, config, projectPath);
                 }
+                ts.performance.mark("SolutionBuilder::Timestamps only updates");
                 return doneInvalidatedProject(state, projectPath);
             }
         };
@@ -104847,6 +104940,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) {
@@ -105013,13 +105110,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);
@@ -105302,8 +105399,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;
     }
@@ -105381,7 +105477,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,
@@ -105559,7 +105661,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;
     }
@@ -105686,6 +105791,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;
@@ -105713,6 +105825,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;
@@ -105783,6 +105902,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;
@@ -105812,7 +105939,7 @@ var ts;
             }
         }
         disableCache(state);
-        reportErrorSummary(state, buildOrder);
+        return buildOrder;
     }
     function watchConfigFile(state, resolved, resolvedPath, parsed) {
         if (!state.watch || state.allWatchedConfigFiles.has(resolvedPath))
@@ -105867,6 +105994,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];
@@ -105880,6 +106008,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);
@@ -105989,6 +106119,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:
@@ -106029,6 +106161,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) {
@@ -106038,14 +106176,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);
@@ -106589,15 +106719,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);
     }
@@ -106622,7 +106763,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);
     }
@@ -106640,36 +106781,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);
         };
     }
@@ -106702,6 +106843,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);
     }
@@ -106716,7 +106922,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();
@@ -106727,27 +106936,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;
@@ -106761,53 +106964,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(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) {
-            reportStatisticalValue(name, (time / 1000).toFixed(2) + "s");
+        function reportTimeStatistic(name, time, aggregate) {
+            reportStatisticalValue({ name: name, value: time, type: StatisticType.time }, aggregate);
+        }
+    }
+    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) {