@typescript-deploys/pr-build 4.6.0-pr-47000-3 → 4.6.0-pr-47050-2

package/lib/lib.es5.d.ts

@@ -1515,7 +1515,7 @@ interface Promise<T> {
 type Awaited<T> =
     T extends null | undefined ? T : // special case for `null | undefined` when not in `--strictNullChecks` mode
         T extends object & { then(onfulfilled: infer F): any } ? // `await` only unwraps object types with a callable `then`. Non-object types are not unwrapped
-            F extends ((value: infer V) => any) ? // if the argument to `then` is callable, extracts the argument
+            F extends ((value: infer V, ...args: any) => any) ? // if the argument to `then` is callable, extracts the first argument
                 Awaited<V> : // recursively unwrap the value
                 never : // the argument to `then` was not callable
         T; // non-object or non-thenable

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.6";
-    ts.version = ts.versionMajorMinor + ".0-insiders.20211206";
+    ts.version = ts.versionMajorMinor + ".0-insiders.20211208";
     var NativeCollections;
     (function (NativeCollections) {
         function tryGetNativeMap() {
@@ -6103,6 +6103,7 @@ var ts;
         DIRECTORY: diag(6038, ts.DiagnosticCategory.Message, "DIRECTORY_6038", "DIRECTORY"),
         STRATEGY: diag(6039, ts.DiagnosticCategory.Message, "STRATEGY_6039", "STRATEGY"),
         FILE_OR_DIRECTORY: diag(6040, ts.DiagnosticCategory.Message, "FILE_OR_DIRECTORY_6040", "FILE OR DIRECTORY"),
+        Errors_Files: diag(6041, ts.DiagnosticCategory.Message, "Errors_Files_6041", "Errors  Files"),
         Generates_corresponding_map_file: diag(6043, ts.DiagnosticCategory.Message, "Generates_corresponding_map_file_6043", "Generates corresponding '.map' file."),
         Compiler_option_0_expects_an_argument: diag(6044, ts.DiagnosticCategory.Error, "Compiler_option_0_expects_an_argument_6044", "Compiler option '{0}' expects an argument."),
         Unterminated_quoted_string_in_response_file_0: diag(6045, ts.DiagnosticCategory.Error, "Unterminated_quoted_string_in_response_file_0_6045", "Unterminated quoted string in response file '{0}'."),
@@ -6296,6 +6297,9 @@ var ts;
         Output_Formatting: diag(6256, ts.DiagnosticCategory.Message, "Output_Formatting_6256", "Output Formatting"),
         Completeness: diag(6257, ts.DiagnosticCategory.Message, "Completeness_6257", "Completeness"),
         _0_should_be_set_inside_the_compilerOptions_object_of_the_config_json_file: diag(6258, ts.DiagnosticCategory.Error, "_0_should_be_set_inside_the_compilerOptions_object_of_the_config_json_file_6258", "'{0}' should be set inside the 'compilerOptions' object of the config json file"),
+        Found_1_error_in_1: diag(6259, ts.DiagnosticCategory.Message, "Found_1_error_in_1_6259", "Found 1 error in {1}"),
+        Found_0_errors_in_1_file: diag(6260, ts.DiagnosticCategory.Message, "Found_0_errors_in_1_file_6260", "Found {0} errors in 1 file."),
+        Found_0_errors_in_1_files: diag(6261, ts.DiagnosticCategory.Message, "Found_0_errors_in_1_files_6261", "Found {0} errors in {1} files."),
         Directory_0_has_no_containing_package_json_scope_Imports_will_not_resolve: diag(6270, ts.DiagnosticCategory.Message, "Directory_0_has_no_containing_package_json_scope_Imports_will_not_resolve_6270", "Directory '{0}' has no containing package.json scope. Imports will not resolve."),
         Import_specifier_0_does_not_exist_in_package_json_scope_at_path_1: diag(6271, ts.DiagnosticCategory.Message, "Import_specifier_0_does_not_exist_in_package_json_scope_at_path_1_6271", "Import specifier '{0}' does not exist in package.json scope at path '{1}'."),
         Invalid_import_specifier_0_has_no_possible_resolutions: diag(6272, ts.DiagnosticCategory.Message, "Invalid_import_specifier_0_has_no_possible_resolutions_6272", "Invalid import specifier '{0}' has no possible resolutions."),
@@ -27083,7 +27087,11 @@ var ts;
             if (type && !allowAmbiguity && typeHasArrowFunctionBlockingParseError(type)) {
                 return undefined;
             }
-            var hasJSDocFunctionType = type && (ts.isJSDocFunctionType(type) || ts.isParenthesizedTypeNode(type) && ts.isJSDocFunctionType(type.type));
+            var unwrappedType = type;
+            while ((unwrappedType === null || unwrappedType === void 0 ? void 0 : unwrappedType.kind) === 190) {
+                unwrappedType = unwrappedType.type;
+            }
+            var hasJSDocFunctionType = unwrappedType && ts.isJSDocFunctionType(unwrappedType);
             if (!allowAmbiguity && token() !== 38 && (hasJSDocFunctionType || token() !== 18)) {
                 return undefined;
             }
@@ -47433,7 +47441,7 @@ var ts;
                 }
                 if (t.flags & 268435456) {
                     var constraint = getBaseConstraint(t.type);
-                    return constraint ? getStringMappingType(t.symbol, constraint) : stringType;
+                    return constraint && constraint !== t.type ? getStringMappingType(t.symbol, constraint) : stringType;
                 }
                 if (t.flags & 8388608) {
                     var baseObjectType = getBaseConstraint(t.objectType);
@@ -49982,9 +49990,11 @@ var ts;
         }
         function getStringMappingType(symbol, type) {
             return type.flags & (1048576 | 131072) ? mapType(type, function (t) { return getStringMappingType(symbol, t); }) :
-                isGenericIndexType(type) ? getStringMappingTypeForGenericType(symbol, type) :
-                    type.flags & 128 ? getStringLiteralType(applyStringMapping(symbol, type.value)) :
-                        type;
+                type.flags & 268435456 && symbol === type.symbol ? type :
+                    isGenericIndexType(type) || isPatternLiteralPlaceholderType(type) ? getStringMappingTypeForGenericType(symbol, isPatternLiteralPlaceholderType(type) && !(type.flags & 268435456) ? getTemplateLiteralType(["", ""], [type]) : type) :
+                        type.flags & 128 ? getStringLiteralType(applyStringMapping(symbol, type.value)) :
+                            type.flags & 134217728 ? getTemplateLiteralType.apply(void 0, applyTemplateStringMapping(symbol, type.texts, type.types)) :
+                                type;
         }
         function applyStringMapping(symbol, str) {
             switch (intrinsicTypeKinds.get(symbol.escapedName)) {
@@ -49995,6 +50005,15 @@ var ts;
             }
             return str;
         }
+        function applyTemplateStringMapping(symbol, texts, types) {
+            switch (intrinsicTypeKinds.get(symbol.escapedName)) {
+                case 0: return [texts.map(function (t) { return t.toUpperCase(); }), types.map(function (t) { return getStringMappingType(symbol, t); })];
+                case 1: return [texts.map(function (t) { return t.toLowerCase(); }), types.map(function (t) { return getStringMappingType(symbol, t); })];
+                case 2: return [texts[0] === "" ? texts : __spreadArray([texts[0].charAt(0).toUpperCase() + texts[0].slice(1)], texts.slice(1), true), texts[0] === "" ? __spreadArray([getStringMappingType(symbol, types[0])], types.slice(1), true) : types];
+                case 3: return [texts[0] === "" ? texts : __spreadArray([texts[0].charAt(0).toLowerCase() + texts[0].slice(1)], texts.slice(1), true), texts[0] === "" ? __spreadArray([getStringMappingType(symbol, types[0])], types.slice(1), true) : types];
+            }
+            return [texts, types];
+        }
         function getStringMappingTypeForGenericType(symbol, type) {
             var id = getSymbolId(symbol) + "," + getTypeId(type);
             var result = stringMappingTypes.get(id);
@@ -50224,7 +50243,7 @@ var ts;
                         accessNode;
         }
         function isPatternLiteralPlaceholderType(type) {
-            return !!(type.flags & (1 | 4 | 8 | 64));
+            return !!(type.flags & (1 | 4 | 8 | 64)) || !!(type.flags & 268435456 && isPatternLiteralPlaceholderType(type.type));
         }
         function isPatternLiteralType(type) {
             return !!(type.flags & 134217728) && ts.every(type.types, isPatternLiteralPlaceholderType);
@@ -53350,6 +53369,13 @@ var ts;
                         return -1;
                     }
                 }
+                else if (target.flags & 268435456) {
+                    if (!(source.flags & 268435456)) {
+                        if (isUnchangedByStringMapping(target.symbol, source)) {
+                            return -1;
+                        }
+                    }
+                }
                 if (source.flags & 8650752) {
                     if (!(source.flags & 8388608 && target.flags & 8388608)) {
                         var constraint = getConstraintOfType(source);
@@ -53385,7 +53411,10 @@ var ts;
                     }
                 }
                 else if (source.flags & 268435456) {
-                    if (target.flags & 268435456 && source.symbol === target.symbol) {
+                    if (target.flags & 268435456) {
+                        if (source.symbol !== target.symbol) {
+                            return 0;
+                        }
                         if (result = isRelatedTo(source.type, target.type, 3, reportErrors)) {
                             resetErrorInfo(saveErrorInfo);
                             return result;
@@ -54159,7 +54188,7 @@ var ts;
                     return typeCouldHaveTopLevelSingletonTypes(constraint);
                 }
             }
-            return isUnitType(type) || !!(type.flags & 134217728);
+            return isUnitType(type) || !!(type.flags & 134217728) || !!(type.flags & 268435456);
         }
         function getExactOptionalUnassignableProperties(source, target) {
             if (isTupleType(source) && isTupleType(target))
@@ -55386,6 +55415,9 @@ var ts;
             var flags = scanner.getTokenFlags();
             return success && result === 9 && scanner.getTextPos() === (s.length + 1) && !(flags & 512);
         }
+        function isUnchangedByStringMapping(symbol, value) {
+            return value === getStringMappingType(symbol, value);
+        }
         function isValidTypeForTemplateLiteralPlaceholder(source, target) {
             if (source === target || target.flags & (1 | 4)) {
                 return true;
@@ -55394,7 +55426,8 @@ var ts;
                 var value = source.value;
                 return !!(target.flags & 8 && value !== "" && isFinite(+value) ||
                     target.flags & 64 && value !== "" && isValidBigIntString(value) ||
-                    target.flags & (512 | 98304) && value === target.intrinsicName);
+                    target.flags & (512 | 98304) && value === target.intrinsicName ||
+                    target.flags & 268435456 && isUnchangedByStringMapping(target.symbol, getStringLiteralType(value)));
             }
             if (source.flags & 134217728) {
                 var texts = source.texts;
@@ -99009,19 +99042,74 @@ var ts;
         return ts.countWhere(diagnostics, function (diagnostic) { return diagnostic.category === ts.DiagnosticCategory.Error; });
     }
     ts.getErrorCountForSummary = getErrorCountForSummary;
+    function getFilesInErrorForSummary(diagnostics) {
+        var filesInError = ts.filter(diagnostics, function (diagnostic) { return diagnostic.category === ts.DiagnosticCategory.Error; })
+            .map(function (errorDiagnostic) {
+            if (errorDiagnostic.file === undefined)
+                return;
+            return "" + errorDiagnostic.file.fileName;
+        });
+        return filesInError.map(function (fileName) {
+            var diagnosticForFileName = ts.find(diagnostics, function (diagnostic) {
+                return diagnostic.file !== undefined && diagnostic.file.fileName === fileName;
+            });
+            if (diagnosticForFileName !== undefined) {
+                var line = ts.getLineAndCharacterOfPosition(diagnosticForFileName.file, diagnosticForFileName.start).line;
+                return {
+                    fileName: fileName,
+                    line: line + 1,
+                };
+            }
+        });
+    }
+    ts.getFilesInErrorForSummary = getFilesInErrorForSummary;
     function getWatchErrorSummaryDiagnosticMessage(errorCount) {
         return errorCount === 1 ?
             ts.Diagnostics.Found_1_error_Watching_for_file_changes :
             ts.Diagnostics.Found_0_errors_Watching_for_file_changes;
     }
     ts.getWatchErrorSummaryDiagnosticMessage = getWatchErrorSummaryDiagnosticMessage;
-    function getErrorSummaryText(errorCount, newLine) {
+    function getErrorSummaryText(errorCount, filesInError, newLine) {
         if (errorCount === 0)
             return "";
-        var d = ts.createCompilerDiagnostic(errorCount === 1 ? ts.Diagnostics.Found_1_error : ts.Diagnostics.Found_0_errors, errorCount);
-        return "" + newLine + ts.flattenDiagnosticMessageText(d.messageText, newLine) + newLine + newLine;
+        var nonNilFiles = filesInError.filter(function (fileInError) { return fileInError !== undefined; });
+        var distinctFileNamesWithLines = nonNilFiles.map(function (fileInError) { return fileInError.fileName + ":" + fileInError.line; })
+            .filter(function (value, index, self) { return self.indexOf(value) === index; });
+        var d = errorCount === 1 ?
+            ts.createCompilerDiagnostic(filesInError[0] !== undefined ?
+                ts.Diagnostics.Found_1_error_in_1 :
+                ts.Diagnostics.Found_1_error, errorCount, distinctFileNamesWithLines[0]) :
+            ts.createCompilerDiagnostic(distinctFileNamesWithLines.length === 0 ?
+                ts.Diagnostics.Found_0_errors :
+                distinctFileNamesWithLines.length === 1 ?
+                    ts.Diagnostics.Found_0_errors_in_1_file :
+                    ts.Diagnostics.Found_0_errors_in_1_files, errorCount, distinctFileNamesWithLines.length);
+        return "" + newLine + ts.flattenDiagnosticMessageText(d.messageText, newLine) + newLine + newLine + (errorCount > 1 ? createTabularErrorsDisplay(nonNilFiles) : "");
     }
     ts.getErrorSummaryText = getErrorSummaryText;
+    function createTabularErrorsDisplay(filesInError) {
+        var distinctFiles = filesInError.filter(function (value, index, self) { return index === self.findIndex(function (file) { return (file === null || file === void 0 ? void 0 : file.fileName) === (value === null || value === void 0 ? void 0 : value.fileName); }); });
+        if (distinctFiles.length === 0)
+            return "";
+        var numberLength = function (num) { return Math.log(num) * Math.LOG10E + 1; };
+        var fileToErrorCount = distinctFiles.map(function (file) { return [file, ts.countWhere(filesInError, function (fileInError) { return fileInError.fileName === file.fileName; })]; });
+        var maxErrors = fileToErrorCount.reduce(function (acc, value) { return Math.max(acc, value[1] || 0); }, 0);
+        var headerRow = ts.Diagnostics.Errors_Files.message;
+        var leftColumnHeadingLength = headerRow.split(" ")[0].length;
+        var leftPaddingGoal = Math.max(leftColumnHeadingLength, numberLength(maxErrors));
+        var headerPadding = Math.max(numberLength(maxErrors) - leftColumnHeadingLength, 0);
+        var tabularData = "";
+        tabularData += " ".repeat(headerPadding) + headerRow + "\n";
+        fileToErrorCount.forEach(function (row) {
+            var file = row[0], errorCount = row[1];
+            var errorCountDigitsLength = Math.log(errorCount) * Math.LOG10E + 1 | 0;
+            var leftPadding = errorCountDigitsLength < leftPaddingGoal ?
+                " ".repeat(leftPaddingGoal - errorCountDigitsLength)
+                : "";
+            tabularData += "" + leftPadding + errorCount + "  " + file.fileName + ":" + file.line + "\n";
+        });
+        return tabularData;
+    }
     function isBuilderProgram(program) {
         return !!program.getState;
     }
@@ -99210,7 +99298,7 @@ var ts;
             listFiles(program, write);
         }
         if (reportSummary) {
-            reportSummary(getErrorCountForSummary(diagnostics));
+            reportSummary(getErrorCountForSummary(diagnostics), getFilesInErrorForSummary(diagnostics));
         }
         return {
             emitResult: emitResult,
@@ -99400,7 +99488,7 @@ var ts;
         var system = input.system || ts.sys;
         var host = input.host || (input.host = ts.createIncrementalCompilerHost(input.options, system));
         var builderProgram = ts.createIncrementalProgram(input);
-        var exitStatus = emitFilesAndReportErrorsAndGetExitStatus(builderProgram, input.reportDiagnostic || createDiagnosticReporter(system), function (s) { return host.trace && host.trace(s); }, input.reportErrorSummary || input.options.pretty ? function (errorCount) { return system.write(getErrorSummaryText(errorCount, system.newLine)); } : undefined);
+        var exitStatus = emitFilesAndReportErrorsAndGetExitStatus(builderProgram, input.reportDiagnostic || createDiagnosticReporter(system), function (s) { return host.trace && host.trace(s); }, input.reportErrorSummary || input.options.pretty ? function (errorCount, filesInError) { return system.write(getErrorSummaryText(errorCount, filesInError, system.newLine)); } : undefined);
         if (input.afterProgramEmitAndDiagnostics)
             input.afterProgramEmitAndDiagnostics(builderProgram);
         return exitStatus;
@@ -101458,11 +101546,14 @@ var ts;
         var canReportSummary = state.watch || !!state.host.reportErrorSummary;
         var diagnostics = state.diagnostics;
         var totalErrors = 0;
+        var filesInError = [];
         if (isCircularBuildOrder(buildOrder)) {
             reportBuildQueue(state, buildOrder.buildOrder);
             reportErrors(state, buildOrder.circularDiagnostics);
             if (canReportSummary)
                 totalErrors += ts.getErrorCountForSummary(buildOrder.circularDiagnostics);
+            if (canReportSummary)
+                filesInError = __spreadArray(__spreadArray([], filesInError, true), ts.getFilesInErrorForSummary(buildOrder.circularDiagnostics), true);
         }
         else {
             buildOrder.forEach(function (project) {
@@ -101473,12 +101564,14 @@ var ts;
             });
             if (canReportSummary)
                 diagnostics.forEach(function (singleProjectErrors) { return totalErrors += ts.getErrorCountForSummary(singleProjectErrors); });
+            if (canReportSummary)
+                diagnostics.forEach(function (singleProjectErrors) { return __spreadArray(__spreadArray([], filesInError, true), ts.getFilesInErrorForSummary(singleProjectErrors), true); });
         }
         if (state.watch) {
             reportWatchStatus(state, ts.getWatchErrorSummaryDiagnosticMessage(totalErrors), totalErrors);
         }
         else if (state.host.reportErrorSummary) {
-            state.host.reportErrorSummary(totalErrors);
+            state.host.reportErrorSummary(totalErrors, filesInError);
         }
     }
     function reportBuildQueue(state, buildQueue) {
@@ -102105,7 +102198,7 @@ var ts;
     }
     function createReportErrorSummary(sys, options) {
         return shouldBePretty(sys, options) ?
-            function (errorCount) { return sys.write(ts.getErrorSummaryText(errorCount, sys.newLine)); } :
+            function (errorCount, filesInError) { return sys.write(ts.getErrorSummaryText(errorCount, filesInError, sys.newLine)); } :
             undefined;
     }
     function performCompilation(sys, cb, reportDiagnostic, config) {

package/lib/tsserver.js

@@ -100,7 +100,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-insiders.20211206";
+    ts.version = ts.versionMajorMinor + ".0-insiders.20211208";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -8889,6 +8889,7 @@ var ts;
         DIRECTORY: diag(6038, ts.DiagnosticCategory.Message, "DIRECTORY_6038", "DIRECTORY"),
         STRATEGY: diag(6039, ts.DiagnosticCategory.Message, "STRATEGY_6039", "STRATEGY"),
         FILE_OR_DIRECTORY: diag(6040, ts.DiagnosticCategory.Message, "FILE_OR_DIRECTORY_6040", "FILE OR DIRECTORY"),
+        Errors_Files: diag(6041, ts.DiagnosticCategory.Message, "Errors_Files_6041", "Errors  Files"),
         Generates_corresponding_map_file: diag(6043, ts.DiagnosticCategory.Message, "Generates_corresponding_map_file_6043", "Generates corresponding '.map' file."),
         Compiler_option_0_expects_an_argument: diag(6044, ts.DiagnosticCategory.Error, "Compiler_option_0_expects_an_argument_6044", "Compiler option '{0}' expects an argument."),
         Unterminated_quoted_string_in_response_file_0: diag(6045, ts.DiagnosticCategory.Error, "Unterminated_quoted_string_in_response_file_0_6045", "Unterminated quoted string in response file '{0}'."),
@@ -9082,6 +9083,9 @@ var ts;
         Output_Formatting: diag(6256, ts.DiagnosticCategory.Message, "Output_Formatting_6256", "Output Formatting"),
         Completeness: diag(6257, ts.DiagnosticCategory.Message, "Completeness_6257", "Completeness"),
         _0_should_be_set_inside_the_compilerOptions_object_of_the_config_json_file: diag(6258, ts.DiagnosticCategory.Error, "_0_should_be_set_inside_the_compilerOptions_object_of_the_config_json_file_6258", "'{0}' should be set inside the 'compilerOptions' object of the config json file"),
+        Found_1_error_in_1: diag(6259, ts.DiagnosticCategory.Message, "Found_1_error_in_1_6259", "Found 1 error in {1}"),
+        Found_0_errors_in_1_file: diag(6260, ts.DiagnosticCategory.Message, "Found_0_errors_in_1_file_6260", "Found {0} errors in 1 file."),
+        Found_0_errors_in_1_files: diag(6261, ts.DiagnosticCategory.Message, "Found_0_errors_in_1_files_6261", "Found {0} errors in {1} files."),
         Directory_0_has_no_containing_package_json_scope_Imports_will_not_resolve: diag(6270, ts.DiagnosticCategory.Message, "Directory_0_has_no_containing_package_json_scope_Imports_will_not_resolve_6270", "Directory '{0}' has no containing package.json scope. Imports will not resolve."),
         Import_specifier_0_does_not_exist_in_package_json_scope_at_path_1: diag(6271, ts.DiagnosticCategory.Message, "Import_specifier_0_does_not_exist_in_package_json_scope_at_path_1_6271", "Import specifier '{0}' does not exist in package.json scope at path '{1}'."),
         Invalid_import_specifier_0_has_no_possible_resolutions: diag(6272, ts.DiagnosticCategory.Message, "Invalid_import_specifier_0_has_no_possible_resolutions_6272", "Invalid import specifier '{0}' has no possible resolutions."),
@@ -33620,10 +33624,14 @@ var ts;
             //  - "(x,y)" is a comma expression parsed as a signature with two parameters.
             //  - "a ? (b): c" will have "(b):" parsed as a signature with a return type annotation.
             //  - "a ? (b): function() {}" will too, since function() is a valid JSDoc function type.
-            //  - "a ? (b): (function() {})" as well, but inside of a parenthesized type.
+            //  - "a ? (b): (function() {})" as well, but inside of a parenthesized type with an arbitrary amount of nesting.
             //
             // So we need just a bit of lookahead to ensure that it can only be a signature.
-            var hasJSDocFunctionType = type && (ts.isJSDocFunctionType(type) || ts.isParenthesizedTypeNode(type) && ts.isJSDocFunctionType(type.type));
+            var unwrappedType = type;
+            while ((unwrappedType === null || unwrappedType === void 0 ? void 0 : unwrappedType.kind) === 190 /* ParenthesizedType */) {
+                unwrappedType = unwrappedType.type; // Skip parens if need be
+            }
+            var hasJSDocFunctionType = unwrappedType && ts.isJSDocFunctionType(unwrappedType);
             if (!allowAmbiguity && token() !== 38 /* EqualsGreaterThanToken */ && (hasJSDocFunctionType || token() !== 18 /* OpenBraceToken */)) {
                 // Returning undefined here will cause our caller to rewind to where we started from.
                 return undefined;
@@ -57324,7 +57332,7 @@ var ts;
                 }
                 if (t.flags & 268435456 /* StringMapping */) {
                     var constraint = getBaseConstraint(t.type);
-                    return constraint ? getStringMappingType(t.symbol, constraint) : stringType;
+                    return constraint && constraint !== t.type ? getStringMappingType(t.symbol, constraint) : stringType;
                 }
                 if (t.flags & 8388608 /* IndexedAccess */) {
                     var baseObjectType = getBaseConstraint(t.objectType);
@@ -60195,9 +60203,12 @@ var ts;
         }
         function getStringMappingType(symbol, type) {
             return type.flags & (1048576 /* Union */ | 131072 /* Never */) ? mapType(type, function (t) { return getStringMappingType(symbol, t); }) :
-                isGenericIndexType(type) ? getStringMappingTypeForGenericType(symbol, type) :
-                    type.flags & 128 /* StringLiteral */ ? getStringLiteralType(applyStringMapping(symbol, type.value)) :
-                        type;
+                // Mapping<Mapping<T>> === Mapping<T>
+                type.flags & 268435456 /* StringMapping */ && symbol === type.symbol ? type :
+                    isGenericIndexType(type) || isPatternLiteralPlaceholderType(type) ? getStringMappingTypeForGenericType(symbol, isPatternLiteralPlaceholderType(type) && !(type.flags & 268435456 /* StringMapping */) ? getTemplateLiteralType(["", ""], [type]) : type) :
+                        type.flags & 128 /* StringLiteral */ ? getStringLiteralType(applyStringMapping(symbol, type.value)) :
+                            type.flags & 134217728 /* TemplateLiteral */ ? getTemplateLiteralType.apply(void 0, applyTemplateStringMapping(symbol, type.texts, type.types)) :
+                                type;
         }
         function applyStringMapping(symbol, str) {
             switch (intrinsicTypeKinds.get(symbol.escapedName)) {
@@ -60208,6 +60219,15 @@ var ts;
             }
             return str;
         }
+        function applyTemplateStringMapping(symbol, texts, types) {
+            switch (intrinsicTypeKinds.get(symbol.escapedName)) {
+                case 0 /* Uppercase */: return [texts.map(function (t) { return t.toUpperCase(); }), types.map(function (t) { return getStringMappingType(symbol, t); })];
+                case 1 /* Lowercase */: return [texts.map(function (t) { return t.toLowerCase(); }), types.map(function (t) { return getStringMappingType(symbol, t); })];
+                case 2 /* Capitalize */: return [texts[0] === "" ? texts : __spreadArray([texts[0].charAt(0).toUpperCase() + texts[0].slice(1)], texts.slice(1), true), texts[0] === "" ? __spreadArray([getStringMappingType(symbol, types[0])], types.slice(1), true) : types];
+                case 3 /* Uncapitalize */: return [texts[0] === "" ? texts : __spreadArray([texts[0].charAt(0).toLowerCase() + texts[0].slice(1)], texts.slice(1), true), texts[0] === "" ? __spreadArray([getStringMappingType(symbol, types[0])], types.slice(1), true) : types];
+            }
+            return [texts, types];
+        }
         function getStringMappingTypeForGenericType(symbol, type) {
             var id = getSymbolId(symbol) + "," + getTypeId(type);
             var result = stringMappingTypes.get(id);
@@ -60449,7 +60469,7 @@ var ts;
                         accessNode;
         }
         function isPatternLiteralPlaceholderType(type) {
-            return !!(type.flags & (1 /* Any */ | 4 /* String */ | 8 /* Number */ | 64 /* BigInt */));
+            return !!(type.flags & (1 /* Any */ | 4 /* String */ | 8 /* Number */ | 64 /* BigInt */)) || !!(type.flags & 268435456 /* StringMapping */ && isPatternLiteralPlaceholderType(type.type));
         }
         function isPatternLiteralType(type) {
             return !!(type.flags & 134217728 /* TemplateLiteral */) && ts.every(type.types, isPatternLiteralPlaceholderType);
@@ -64048,6 +64068,13 @@ var ts;
                         return -1 /* True */;
                     }
                 }
+                else if (target.flags & 268435456 /* StringMapping */) {
+                    if (!(source.flags & 268435456 /* StringMapping */)) {
+                        if (isUnchangedByStringMapping(target.symbol, source)) {
+                            return -1 /* True */;
+                        }
+                    }
+                }
                 if (source.flags & 8650752 /* TypeVariable */) {
                     // IndexedAccess comparisons are handled above in the `target.flags & TypeFlage.IndexedAccess` branch
                     if (!(source.flags & 8388608 /* IndexedAccess */ && target.flags & 8388608 /* IndexedAccess */)) {
@@ -64087,7 +64114,10 @@ var ts;
                     }
                 }
                 else if (source.flags & 268435456 /* StringMapping */) {
-                    if (target.flags & 268435456 /* StringMapping */ && source.symbol === target.symbol) {
+                    if (target.flags & 268435456 /* StringMapping */) {
+                        if (source.symbol !== target.symbol) {
+                            return 0 /* False */;
+                        }
                         if (result = isRelatedTo(source.type, target.type, 3 /* Both */, reportErrors)) {
                             resetErrorInfo(saveErrorInfo);
                             return result;
@@ -64982,7 +65012,7 @@ var ts;
                     return typeCouldHaveTopLevelSingletonTypes(constraint);
                 }
             }
-            return isUnitType(type) || !!(type.flags & 134217728 /* TemplateLiteral */);
+            return isUnitType(type) || !!(type.flags & 134217728 /* TemplateLiteral */) || !!(type.flags & 268435456 /* StringMapping */);
         }
         function getExactOptionalUnassignableProperties(source, target) {
             if (isTupleType(source) && isTupleType(target))
@@ -66395,6 +66425,9 @@ var ts;
             // * it does not contain a numeric seperator (the `BigInt` constructor does not accept a numeric seperator in its input)
             return success && result === 9 /* BigIntLiteral */ && scanner.getTextPos() === (s.length + 1) && !(flags & 512 /* ContainsSeparator */);
         }
+        function isUnchangedByStringMapping(symbol, value) {
+            return value === getStringMappingType(symbol, value);
+        }
         function isValidTypeForTemplateLiteralPlaceholder(source, target) {
             if (source === target || target.flags & (1 /* Any */ | 4 /* String */)) {
                 return true;
@@ -66403,7 +66436,8 @@ var ts;
                 var value = source.value;
                 return !!(target.flags & 8 /* Number */ && value !== "" && isFinite(+value) ||
                     target.flags & 64 /* BigInt */ && value !== "" && isValidBigIntString(value) ||
-                    target.flags & (512 /* BooleanLiteral */ | 98304 /* Nullable */) && value === target.intrinsicName);
+                    target.flags & (512 /* BooleanLiteral */ | 98304 /* Nullable */) && value === target.intrinsicName ||
+                    target.flags & 268435456 /* StringMapping */ && isUnchangedByStringMapping(target.symbol, getStringLiteralType(value)));
             }
             if (source.flags & 134217728 /* TemplateLiteral */) {
                 var texts = source.texts;
@@ -119721,7 +119755,7 @@ var ts;
         getCanonicalFileName: ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames)
     } : undefined;
     /**
-     * Create a function that reports error by writing to the system and handles the formating of the diagnostic
+     * Create a function that reports error by writing to the system and handles the formatting of the diagnostic
      */
     function createDiagnosticReporter(system, pretty) {
         var host = system === ts.sys && sysFormatDiagnosticsHost ? sysFormatDiagnosticsHost : {
@@ -119807,19 +119841,74 @@ var ts;
         return ts.countWhere(diagnostics, function (diagnostic) { return diagnostic.category === ts.DiagnosticCategory.Error; });
     }
     ts.getErrorCountForSummary = getErrorCountForSummary;
+    function getFilesInErrorForSummary(diagnostics) {
+        var filesInError = ts.filter(diagnostics, function (diagnostic) { return diagnostic.category === ts.DiagnosticCategory.Error; })
+            .map(function (errorDiagnostic) {
+            if (errorDiagnostic.file === undefined)
+                return;
+            return "" + errorDiagnostic.file.fileName;
+        });
+        return filesInError.map(function (fileName) {
+            var diagnosticForFileName = ts.find(diagnostics, function (diagnostic) {
+                return diagnostic.file !== undefined && diagnostic.file.fileName === fileName;
+            });
+            if (diagnosticForFileName !== undefined) {
+                var line = ts.getLineAndCharacterOfPosition(diagnosticForFileName.file, diagnosticForFileName.start).line;
+                return {
+                    fileName: fileName,
+                    line: line + 1,
+                };
+            }
+        });
+    }
+    ts.getFilesInErrorForSummary = getFilesInErrorForSummary;
     function getWatchErrorSummaryDiagnosticMessage(errorCount) {
         return errorCount === 1 ?
             ts.Diagnostics.Found_1_error_Watching_for_file_changes :
             ts.Diagnostics.Found_0_errors_Watching_for_file_changes;
     }
     ts.getWatchErrorSummaryDiagnosticMessage = getWatchErrorSummaryDiagnosticMessage;
-    function getErrorSummaryText(errorCount, newLine) {
+    function getErrorSummaryText(errorCount, filesInError, newLine) {
         if (errorCount === 0)
             return "";
-        var d = ts.createCompilerDiagnostic(errorCount === 1 ? ts.Diagnostics.Found_1_error : ts.Diagnostics.Found_0_errors, errorCount);
-        return "" + newLine + ts.flattenDiagnosticMessageText(d.messageText, newLine) + newLine + newLine;
+        var nonNilFiles = filesInError.filter(function (fileInError) { return fileInError !== undefined; });
+        var distinctFileNamesWithLines = nonNilFiles.map(function (fileInError) { return fileInError.fileName + ":" + fileInError.line; })
+            .filter(function (value, index, self) { return self.indexOf(value) === index; });
+        var d = errorCount === 1 ?
+            ts.createCompilerDiagnostic(filesInError[0] !== undefined ?
+                ts.Diagnostics.Found_1_error_in_1 :
+                ts.Diagnostics.Found_1_error, errorCount, distinctFileNamesWithLines[0]) :
+            ts.createCompilerDiagnostic(distinctFileNamesWithLines.length === 0 ?
+                ts.Diagnostics.Found_0_errors :
+                distinctFileNamesWithLines.length === 1 ?
+                    ts.Diagnostics.Found_0_errors_in_1_file :
+                    ts.Diagnostics.Found_0_errors_in_1_files, errorCount, distinctFileNamesWithLines.length);
+        return "" + newLine + ts.flattenDiagnosticMessageText(d.messageText, newLine) + newLine + newLine + (errorCount > 1 ? createTabularErrorsDisplay(nonNilFiles) : "");
     }
     ts.getErrorSummaryText = getErrorSummaryText;
+    function createTabularErrorsDisplay(filesInError) {
+        var distinctFiles = filesInError.filter(function (value, index, self) { return index === self.findIndex(function (file) { return (file === null || file === void 0 ? void 0 : file.fileName) === (value === null || value === void 0 ? void 0 : value.fileName); }); });
+        if (distinctFiles.length === 0)
+            return "";
+        var numberLength = function (num) { return Math.log(num) * Math.LOG10E + 1; };
+        var fileToErrorCount = distinctFiles.map(function (file) { return [file, ts.countWhere(filesInError, function (fileInError) { return fileInError.fileName === file.fileName; })]; });
+        var maxErrors = fileToErrorCount.reduce(function (acc, value) { return Math.max(acc, value[1] || 0); }, 0);
+        var headerRow = ts.Diagnostics.Errors_Files.message;
+        var leftColumnHeadingLength = headerRow.split(" ")[0].length;
+        var leftPaddingGoal = Math.max(leftColumnHeadingLength, numberLength(maxErrors));
+        var headerPadding = Math.max(numberLength(maxErrors) - leftColumnHeadingLength, 0);
+        var tabularData = "";
+        tabularData += " ".repeat(headerPadding) + headerRow + "\n";
+        fileToErrorCount.forEach(function (row) {
+            var file = row[0], errorCount = row[1];
+            var errorCountDigitsLength = Math.log(errorCount) * Math.LOG10E + 1 | 0;
+            var leftPadding = errorCountDigitsLength < leftPaddingGoal ?
+                " ".repeat(leftPaddingGoal - errorCountDigitsLength)
+                : "";
+            tabularData += "" + leftPadding + errorCount + "  " + file.fileName + ":" + file.line + "\n";
+        });
+        return tabularData;
+    }
     function isBuilderProgram(program) {
         return !!program.getState;
     }
@@ -120023,7 +120112,7 @@ var ts;
             listFiles(program, write);
         }
         if (reportSummary) {
-            reportSummary(getErrorCountForSummary(diagnostics));
+            reportSummary(getErrorCountForSummary(diagnostics), getFilesInErrorForSummary(diagnostics));
         }
         return {
             emitResult: emitResult,
@@ -120234,7 +120323,7 @@ var ts;
         var system = input.system || ts.sys;
         var host = input.host || (input.host = ts.createIncrementalCompilerHost(input.options, system));
         var builderProgram = ts.createIncrementalProgram(input);
-        var exitStatus = emitFilesAndReportErrorsAndGetExitStatus(builderProgram, input.reportDiagnostic || createDiagnosticReporter(system), function (s) { return host.trace && host.trace(s); }, input.reportErrorSummary || input.options.pretty ? function (errorCount) { return system.write(getErrorSummaryText(errorCount, system.newLine)); } : undefined);
+        var exitStatus = emitFilesAndReportErrorsAndGetExitStatus(builderProgram, input.reportDiagnostic || createDiagnosticReporter(system), function (s) { return host.trace && host.trace(s); }, input.reportErrorSummary || input.options.pretty ? function (errorCount, filesInError) { return system.write(getErrorSummaryText(errorCount, filesInError, system.newLine)); } : undefined);
         if (input.afterProgramEmitAndDiagnostics)
             input.afterProgramEmitAndDiagnostics(builderProgram);
         return exitStatus;
@@ -122453,11 +122542,14 @@ var ts;
         var canReportSummary = state.watch || !!state.host.reportErrorSummary;
         var diagnostics = state.diagnostics;
         var totalErrors = 0;
+        var filesInError = [];
         if (isCircularBuildOrder(buildOrder)) {
             reportBuildQueue(state, buildOrder.buildOrder);
             reportErrors(state, buildOrder.circularDiagnostics);
             if (canReportSummary)
                 totalErrors += ts.getErrorCountForSummary(buildOrder.circularDiagnostics);
+            if (canReportSummary)
+                filesInError = __spreadArray(__spreadArray([], filesInError, true), ts.getFilesInErrorForSummary(buildOrder.circularDiagnostics), true);
         }
         else {
             // Report errors from the other projects
@@ -122469,12 +122561,14 @@ var ts;
             });
             if (canReportSummary)
                 diagnostics.forEach(function (singleProjectErrors) { return totalErrors += ts.getErrorCountForSummary(singleProjectErrors); });
+            if (canReportSummary)
+                diagnostics.forEach(function (singleProjectErrors) { return __spreadArray(__spreadArray([], filesInError, true), ts.getFilesInErrorForSummary(singleProjectErrors), true); });
         }
         if (state.watch) {
             reportWatchStatus(state, ts.getWatchErrorSummaryDiagnosticMessage(totalErrors), totalErrors);
         }
         else if (state.host.reportErrorSummary) {
-            state.host.reportErrorSummary(totalErrors);
+            state.host.reportErrorSummary(totalErrors, filesInError);
         }
     }
     /**
@@ -127331,6 +127425,9 @@ var ts;
                             }
                             return;
                     }
+                    if (ts.isConstTypeReference(token.parent)) {
+                        return 3 /* keyword */;
+                    }
                 }
                 return 2 /* identifier */;
             }
@@ -131151,8 +131248,10 @@ var ts;
         }
         /** Get the corresponding JSDocTag node if the position is in a jsDoc comment */
         function getJsDocTagAtPosition(node, position) {
-            var jsdoc = ts.findAncestor(node, ts.isJSDoc);
-            return jsdoc && jsdoc.tags && (ts.rangeContainsPosition(jsdoc, position) ? ts.findLast(jsdoc.tags, function (tag) { return tag.pos < position; }) : undefined);
+            return ts.findAncestor(node, function (n) {
+                return ts.isJSDocTag(n) && ts.rangeContainsPosition(n, position) ? true :
+                    ts.isJSDoc(n) ? "quit" : false;
+            });
         }
         function getPropertiesForObjectExpression(contextualType, completionsType, obj, checker) {
             var hasCompletionsType = completionsType && completionsType !== contextualType;

package/lib/tsserverlibrary.d.ts

@@ -5352,7 +5352,11 @@ declare namespace ts {
         traceResolution?: boolean;
         [option: string]: CompilerOptionsValue | undefined;
     }
-    type ReportEmitErrorSummary = (errorCount: number) => void;
+    type ReportEmitErrorSummary = (errorCount: number, filesInError: (ReportFileInError | undefined)[]) => void;
+    interface ReportFileInError {
+        fileName: string;
+        line: number;
+    }
     interface SolutionBuilderHostBase<T extends BuilderProgram> extends ProgramHost<T> {
         createDirectory?(path: string): void;
         /**