typescript 4.8.0-dev.20220616 → 4.8.0-dev.20220617

package/lib/typescriptServices.js

@@ -294,7 +294,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-dev.20220616";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220617";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -9857,6 +9857,8 @@ var ts;
         Qualified_name_0_is_not_allowed_without_a_leading_param_object_1: diag(8032, ts.DiagnosticCategory.Error, "Qualified_name_0_is_not_allowed_without_a_leading_param_object_1_8032", "Qualified name '{0}' is not allowed without a leading '@param {object} {1}'."),
         A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags: diag(8033, ts.DiagnosticCategory.Error, "A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags_8033", "A JSDoc '@typedef' comment may not contain multiple '@type' tags."),
         The_tag_was_first_specified_here: diag(8034, ts.DiagnosticCategory.Error, "The_tag_was_first_specified_here_8034", "The tag was first specified here."),
+        You_cannot_rename_elements_that_are_defined_in_a_node_modules_folder: diag(8035, ts.DiagnosticCategory.Error, "You_cannot_rename_elements_that_are_defined_in_a_node_modules_folder_8035", "You cannot rename elements that are defined in a 'node_modules' folder."),
+        You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder: diag(8036, ts.DiagnosticCategory.Error, "You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder_8036", "You cannot rename elements that are defined in another 'node_modules' folder."),
         Declaration_emit_for_this_file_requires_using_private_name_0_An_explicit_type_annotation_may_unblock_declaration_emit: diag(9005, ts.DiagnosticCategory.Error, "Declaration_emit_for_this_file_requires_using_private_name_0_An_explicit_type_annotation_may_unblock_9005", "Declaration emit for this file requires using private name '{0}'. An explicit type annotation may unblock declaration emit."),
         Declaration_emit_for_this_file_requires_using_private_name_0_from_module_1_An_explicit_type_annotation_may_unblock_declaration_emit: diag(9006, ts.DiagnosticCategory.Error, "Declaration_emit_for_this_file_requires_using_private_name_0_from_module_1_An_explicit_type_annotati_9006", "Declaration emit for this file requires using private name '{0}' from module '{1}'. An explicit type annotation may unblock declaration emit."),
         JSX_attributes_must_only_be_assigned_a_non_empty_expression: diag(17000, ts.DiagnosticCategory.Error, "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", "JSX attributes must only be assigned a non-empty 'expression'."),
@@ -49095,9 +49097,9 @@ var ts;
                 return moduleSpecifier && resolveExternalModuleName(moduleSpecifier, moduleSpecifier, /*ignoreErrors*/ true);
             },
             resolveExternalModuleSymbol: resolveExternalModuleSymbol,
-            tryGetThisTypeAt: function (nodeIn, includeGlobalThis) {
+            tryGetThisTypeAt: function (nodeIn, includeGlobalThis, container) {
                 var node = ts.getParseTreeNode(nodeIn);
-                return node && tryGetThisTypeAt(node, includeGlobalThis);
+                return node && tryGetThisTypeAt(node, includeGlobalThis, container);
             },
             getTypeArgumentConstraint: function (nodeIn) {
                 var node = ts.getParseTreeNode(nodeIn, ts.isTypeNode);
@@ -59545,7 +59547,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 */) {
                     if (isMappedTypeGenericIndexedAccess(t)) {
@@ -62515,9 +62517,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)) {
@@ -62528,6 +62533,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);
@@ -62769,7 +62783,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);
@@ -66481,6 +66495,13 @@ var ts;
                         return -1 /* True */;
                     }
                 }
+                else if (target.flags & 268435456 /* StringMapping */) {
+                    if (!(source.flags & 268435456 /* StringMapping */)) {
+                        if (isMemberOfStringMapping(source, target)) {
+                            return -1 /* True */;
+                        }
+                    }
+                }
                 if (sourceFlags & 8650752 /* TypeVariable */) {
                     // IndexedAccess comparisons are handled above in the `targetFlags & TypeFlage.IndexedAccess` branch
                     if (!(sourceFlags & 8388608 /* IndexedAccess */ && targetFlags & 8388608 /* IndexedAccess */)) {
@@ -66524,7 +66545,10 @@ var ts;
                     }
                 }
                 else if (sourceFlags & 268435456 /* StringMapping */) {
-                    if (targetFlags & 268435456 /* StringMapping */ && source.symbol === target.symbol) {
+                    if (targetFlags & 268435456 /* StringMapping */) {
+                        if (source.symbol !== target.symbol) {
+                            return 0 /* False */;
+                        }
                         if (result = isRelatedTo(source.type, target.type, 3 /* Both */, reportErrors)) {
                             resetErrorInfo(saveErrorInfo);
                             return result;
@@ -67449,7 +67473,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))
@@ -68920,6 +68944,31 @@ var ts;
             return success && result === 9 /* BigIntLiteral */ && scanner.getTextPos() === (s.length + 1) && !(flags & 512 /* ContainsSeparator */)
                 && (!roundTripOnly || s === ts.pseudoBigIntToString({ negative: negative, base10Value: ts.parsePseudoBigInt(scanner.getTokenValue()) }));
         }
+        function isMemberOfStringMapping(source, target) {
+            if (target.flags & (4 /* String */ | 3 /* AnyOrUnknown */)) {
+                return true;
+            }
+            if (target.flags & 134217728 /* TemplateLiteral */) {
+                return isTypeAssignableTo(source, target);
+            }
+            if (target.flags & 268435456 /* StringMapping */) {
+                // We need to see whether applying the same mappings of the target
+                // onto the source would produce an identical type *and* that
+                // it's compatible with the inner-most non-string-mapped type.
+                //
+                // The intuition here is that if same mappings don't affect the source at all,
+                // and the source is compatible with the unmapped target, then they must
+                // still reside in the same domain.
+                var mappingStack = [];
+                while (target.flags & 268435456 /* StringMapping */) {
+                    mappingStack.unshift(target.symbol);
+                    target = target.type;
+                }
+                var mappedSource = ts.reduceLeft(mappingStack, function (memo, value) { return getStringMappingType(value, memo); }, source);
+                return mappedSource === source && isMemberOfStringMapping(source, target);
+            }
+            return false;
+        }
         function isValidTypeForTemplateLiteralPlaceholder(source, target) {
             if (source === target || target.flags & (1 /* Any */ | 4 /* String */)) {
                 return true;
@@ -68928,7 +68977,8 @@ var ts;
                 var value = source.value;
                 return !!(target.flags & 8 /* Number */ && isValidNumberString(value, /*roundTripOnly*/ false) ||
                     target.flags & 64 /* BigInt */ && isValidBigIntString(value, /*roundTripOnly*/ false) ||
-                    target.flags & (512 /* BooleanLiteral */ | 98304 /* Nullable */) && value === target.intrinsicName);
+                    target.flags & (512 /* BooleanLiteral */ | 98304 /* Nullable */) && value === target.intrinsicName ||
+                    target.flags & 268435456 /* StringMapping */ && isMemberOfStringMapping(getStringLiteralType(value), target));
             }
             if (source.flags & 134217728 /* TemplateLiteral */) {
                 var texts = source.texts;
@@ -135386,7 +135436,7 @@ var ts;
                 }
                 // Need to insert 'this.' before properties of `this` type, so only do that if `includeInsertTextCompletions`
                 if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 305 /* SourceFile */) {
-                    var thisType = typeChecker.tryGetThisTypeAt(scopeNode, /*includeGlobalThis*/ false);
+                    var thisType = typeChecker.tryGetThisTypeAt(scopeNode, /*includeGlobalThis*/ false, ts.isClassLike(scopeNode.parent) ? scopeNode : undefined);
                     if (thisType && !isProbablyGlobalType(thisType, sourceFile, typeChecker)) {
                         for (var _i = 0, _a = getPropertiesForCompletion(thisType, typeChecker); _i < _a.length; _i++) {
                             var symbol = _a[_i];
@@ -144724,10 +144774,10 @@ var ts;
 (function (ts) {
     var Rename;
     (function (Rename) {
-        function getRenameInfo(program, sourceFile, position, options) {
+        function getRenameInfo(program, sourceFile, position, preferences) {
             var node = ts.getAdjustedRenameLocation(ts.getTouchingPropertyName(sourceFile, position));
             if (nodeIsEligibleForRename(node)) {
-                var renameInfo = getRenameInfoForNode(node, program.getTypeChecker(), sourceFile, program, options);
+                var renameInfo = getRenameInfoForNode(node, program.getTypeChecker(), sourceFile, program, preferences);
                 if (renameInfo) {
                     return renameInfo;
                 }
@@ -144735,7 +144785,7 @@ var ts;
             return getRenameInfoError(ts.Diagnostics.You_cannot_rename_this_element);
         }
         Rename.getRenameInfo = getRenameInfo;
-        function getRenameInfoForNode(node, typeChecker, sourceFile, program, options) {
+        function getRenameInfoForNode(node, typeChecker, sourceFile, program, preferences) {
             var symbol = typeChecker.getSymbolAtLocation(node);
             if (!symbol) {
                 if (ts.isStringLiteralLike(node)) {
@@ -144763,7 +144813,12 @@ var ts;
                 return undefined;
             }
             if (ts.isStringLiteralLike(node) && ts.tryGetImportFromModuleSpecifier(node)) {
-                return options && options.allowRenameOfImportPath ? getRenameInfoForModule(node, sourceFile, symbol) : undefined;
+                return preferences.allowRenameOfImportPath ? getRenameInfoForModule(node, sourceFile, symbol) : undefined;
+            }
+            // Disallow rename for elements that would rename across `*/node_modules/*` packages.
+            var wouldRenameNodeModules = wouldRenameInOtherNodeModules(sourceFile, symbol, typeChecker, preferences);
+            if (wouldRenameNodeModules) {
+                return getRenameInfoError(wouldRenameNodeModules);
             }
             var kind = ts.SymbolDisplay.getSymbolKind(typeChecker, symbol, node);
             var specifierName = (ts.isImportOrExportSpecifierName(node) || ts.isStringOrNumericLiteralLike(node) && node.parent.kind === 162 /* ComputedPropertyName */)
@@ -144777,6 +144832,49 @@ var ts;
             var sourceFile = declaration.getSourceFile();
             return program.isSourceFileDefaultLibrary(sourceFile) && ts.fileExtensionIs(sourceFile.fileName, ".d.ts" /* Dts */);
         }
+        function wouldRenameInOtherNodeModules(originalFile, symbol, checker, preferences) {
+            if (!preferences.providePrefixAndSuffixTextForRename && symbol.flags & 2097152 /* Alias */) {
+                var importSpecifier = symbol.declarations && ts.find(symbol.declarations, function (decl) { return ts.isImportSpecifier(decl); });
+                if (importSpecifier && !importSpecifier.propertyName) {
+                    symbol = checker.getAliasedSymbol(symbol);
+                }
+            }
+            var declarations = symbol.declarations;
+            if (!declarations) {
+                return undefined;
+            }
+            var originalPackage = getPackagePathComponents(originalFile.path);
+            if (originalPackage === undefined) { // original source file is not in node_modules
+                if (ts.some(declarations, function (declaration) { return ts.isInsideNodeModules(declaration.getSourceFile().path); })) {
+                    return ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_a_node_modules_folder;
+                }
+                else {
+                    return undefined;
+                }
+            }
+            // original source file is in node_modules
+            for (var _i = 0, declarations_4 = declarations; _i < declarations_4.length; _i++) {
+                var declaration = declarations_4[_i];
+                var declPackage = getPackagePathComponents(declaration.getSourceFile().path);
+                if (declPackage) {
+                    var length_2 = Math.min(originalPackage.length, declPackage.length);
+                    for (var i = 0; i <= length_2; i++) {
+                        if (ts.compareStringsCaseSensitive(originalPackage[i], declPackage[i]) !== 0 /* EqualTo */) {
+                            return ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder;
+                        }
+                    }
+                }
+            }
+            return undefined;
+        }
+        function getPackagePathComponents(filePath) {
+            var components = ts.getPathComponents(filePath);
+            var nodeModulesIdx = components.lastIndexOf("node_modules");
+            if (nodeModulesIdx === -1) {
+                return undefined;
+            }
+            return components.slice(0, nodeModulesIdx + 2);
+        }
         function getRenameInfoForModule(node, sourceFile, moduleSymbol) {
             if (!ts.isExternalModuleNameRelative(node.text)) {
                 return getRenameInfoError(ts.Diagnostics.You_cannot_rename_a_module_via_a_global_import);
@@ -161816,11 +161914,11 @@ var ts;
                         }
                     }
                     else if (ts.isVariableStatement(node) || ts.isVariableDeclarationList(node)) {
-                        var declarations_5 = ts.isVariableStatement(node) ? node.declarationList.declarations : node.declarations;
+                        var declarations_6 = ts.isVariableStatement(node) ? node.declarationList.declarations : node.declarations;
                         var numInitializers = 0;
                         var lastInitializer = void 0;
-                        for (var _i = 0, declarations_4 = declarations_5; _i < declarations_4.length; _i++) {
-                            var declaration = declarations_4[_i];
+                        for (var _i = 0, declarations_5 = declarations_6; _i < declarations_5.length; _i++) {
+                            var declaration = declarations_5[_i];
                             if (declaration.initializer) {
                                 numInitializers++;
                                 lastInitializer = declaration.initializer;
@@ -165957,8 +166055,8 @@ var ts;
                     tags = __spreadArray(__spreadArray([], inheritedTags, true), tags, true);
                 }
             };
-            for (var _i = 0, declarations_6 = declarations; _i < declarations_6.length; _i++) {
-                var declaration = declarations_6[_i];
+            for (var _i = 0, declarations_7 = declarations; _i < declarations_7.length; _i++) {
+                var declaration = declarations_7[_i];
                 _loop_21(declaration);
             }
         }
@@ -165984,8 +166082,8 @@ var ts;
                 if (inheritedDocs)
                     doc = doc.length === 0 ? inheritedDocs.slice() : inheritedDocs.concat(ts.lineBreakPart(), doc);
             };
-            for (var _i = 0, declarations_7 = declarations; _i < declarations_7.length; _i++) {
-                var declaration = declarations_7[_i];
+            for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
+                var declaration = declarations_8[_i];
                 _loop_22(declaration);
             }
         }
@@ -167562,9 +167660,9 @@ var ts;
                 return ts.stringContains(path, "/node_modules/");
             }
         }
-        function getRenameInfo(fileName, position, options) {
+        function getRenameInfo(fileName, position, preferences) {
             synchronizeHostData();
-            return ts.Rename.getRenameInfo(program, getValidSourceFile(fileName), position, options);
+            return ts.Rename.getRenameInfo(program, getValidSourceFile(fileName), position, preferences || {});
         }
         function getRefactorContext(file, positionOrRange, preferences, formatOptions, triggerReason, kind) {
             var _a = typeof positionOrRange === "number" ? [positionOrRange, undefined] : [positionOrRange.pos, positionOrRange.end], startPosition = _a[0], endPosition = _a[1];
@@ -168930,9 +169028,9 @@ var ts;
             var _this = this;
             return this.forwardJSONCall("getImplementationAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getImplementationAtPosition(fileName, position); });
         };
-        LanguageServiceShimObject.prototype.getRenameInfo = function (fileName, position, options) {
+        LanguageServiceShimObject.prototype.getRenameInfo = function (fileName, position, preferences) {
             var _this = this;
-            return this.forwardJSONCall("getRenameInfo('" + fileName + "', " + position + ")", function () { return _this.languageService.getRenameInfo(fileName, position, options); });
+            return this.forwardJSONCall("getRenameInfo('" + fileName + "', " + position + ")", function () { return _this.languageService.getRenameInfo(fileName, position, preferences); });
         };
         LanguageServiceShimObject.prototype.getSmartSelectionRange = function (fileName, position) {
             var _this = this;

package/lib/typingsInstaller.js

@@ -89,7 +89,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-dev.20220616";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220617";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -9652,6 +9652,8 @@ var ts;
         Qualified_name_0_is_not_allowed_without_a_leading_param_object_1: diag(8032, ts.DiagnosticCategory.Error, "Qualified_name_0_is_not_allowed_without_a_leading_param_object_1_8032", "Qualified name '{0}' is not allowed without a leading '@param {object} {1}'."),
         A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags: diag(8033, ts.DiagnosticCategory.Error, "A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags_8033", "A JSDoc '@typedef' comment may not contain multiple '@type' tags."),
         The_tag_was_first_specified_here: diag(8034, ts.DiagnosticCategory.Error, "The_tag_was_first_specified_here_8034", "The tag was first specified here."),
+        You_cannot_rename_elements_that_are_defined_in_a_node_modules_folder: diag(8035, ts.DiagnosticCategory.Error, "You_cannot_rename_elements_that_are_defined_in_a_node_modules_folder_8035", "You cannot rename elements that are defined in a 'node_modules' folder."),
+        You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder: diag(8036, ts.DiagnosticCategory.Error, "You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder_8036", "You cannot rename elements that are defined in another 'node_modules' folder."),
         Declaration_emit_for_this_file_requires_using_private_name_0_An_explicit_type_annotation_may_unblock_declaration_emit: diag(9005, ts.DiagnosticCategory.Error, "Declaration_emit_for_this_file_requires_using_private_name_0_An_explicit_type_annotation_may_unblock_9005", "Declaration emit for this file requires using private name '{0}'. An explicit type annotation may unblock declaration emit."),
         Declaration_emit_for_this_file_requires_using_private_name_0_from_module_1_An_explicit_type_annotation_may_unblock_declaration_emit: diag(9006, ts.DiagnosticCategory.Error, "Declaration_emit_for_this_file_requires_using_private_name_0_from_module_1_An_explicit_type_annotati_9006", "Declaration emit for this file requires using private name '{0}' from module '{1}'. An explicit type annotation may unblock declaration emit."),
         JSX_attributes_must_only_be_assigned_a_non_empty_expression: diag(17000, ts.DiagnosticCategory.Error, "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", "JSX attributes must only be assigned a non-empty 'expression'."),
@@ -48890,9 +48892,9 @@ var ts;
                 return moduleSpecifier && resolveExternalModuleName(moduleSpecifier, moduleSpecifier, /*ignoreErrors*/ true);
             },
             resolveExternalModuleSymbol: resolveExternalModuleSymbol,
-            tryGetThisTypeAt: function (nodeIn, includeGlobalThis) {
+            tryGetThisTypeAt: function (nodeIn, includeGlobalThis, container) {
                 var node = ts.getParseTreeNode(nodeIn);
-                return node && tryGetThisTypeAt(node, includeGlobalThis);
+                return node && tryGetThisTypeAt(node, includeGlobalThis, container);
             },
             getTypeArgumentConstraint: function (nodeIn) {
                 var node = ts.getParseTreeNode(nodeIn, ts.isTypeNode);
@@ -59340,7 +59342,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 */) {
                     if (isMappedTypeGenericIndexedAccess(t)) {
@@ -62310,9 +62312,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)) {
@@ -62323,6 +62328,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);
@@ -62564,7 +62578,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);
@@ -66276,6 +66290,13 @@ var ts;
                         return -1 /* True */;
                     }
                 }
+                else if (target.flags & 268435456 /* StringMapping */) {
+                    if (!(source.flags & 268435456 /* StringMapping */)) {
+                        if (isMemberOfStringMapping(source, target)) {
+                            return -1 /* True */;
+                        }
+                    }
+                }
                 if (sourceFlags & 8650752 /* TypeVariable */) {
                     // IndexedAccess comparisons are handled above in the `targetFlags & TypeFlage.IndexedAccess` branch
                     if (!(sourceFlags & 8388608 /* IndexedAccess */ && targetFlags & 8388608 /* IndexedAccess */)) {
@@ -66319,7 +66340,10 @@ var ts;
                     }
                 }
                 else if (sourceFlags & 268435456 /* StringMapping */) {
-                    if (targetFlags & 268435456 /* StringMapping */ && source.symbol === target.symbol) {
+                    if (targetFlags & 268435456 /* StringMapping */) {
+                        if (source.symbol !== target.symbol) {
+                            return 0 /* False */;
+                        }
                         if (result = isRelatedTo(source.type, target.type, 3 /* Both */, reportErrors)) {
                             resetErrorInfo(saveErrorInfo);
                             return result;
@@ -67244,7 +67268,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))
@@ -68715,6 +68739,31 @@ var ts;
             return success && result === 9 /* BigIntLiteral */ && scanner.getTextPos() === (s.length + 1) && !(flags & 512 /* ContainsSeparator */)
                 && (!roundTripOnly || s === ts.pseudoBigIntToString({ negative: negative, base10Value: ts.parsePseudoBigInt(scanner.getTokenValue()) }));
         }
+        function isMemberOfStringMapping(source, target) {
+            if (target.flags & (4 /* String */ | 3 /* AnyOrUnknown */)) {
+                return true;
+            }
+            if (target.flags & 134217728 /* TemplateLiteral */) {
+                return isTypeAssignableTo(source, target);
+            }
+            if (target.flags & 268435456 /* StringMapping */) {
+                // We need to see whether applying the same mappings of the target
+                // onto the source would produce an identical type *and* that
+                // it's compatible with the inner-most non-string-mapped type.
+                //
+                // The intuition here is that if same mappings don't affect the source at all,
+                // and the source is compatible with the unmapped target, then they must
+                // still reside in the same domain.
+                var mappingStack = [];
+                while (target.flags & 268435456 /* StringMapping */) {
+                    mappingStack.unshift(target.symbol);
+                    target = target.type;
+                }
+                var mappedSource = ts.reduceLeft(mappingStack, function (memo, value) { return getStringMappingType(value, memo); }, source);
+                return mappedSource === source && isMemberOfStringMapping(source, target);
+            }
+            return false;
+        }
         function isValidTypeForTemplateLiteralPlaceholder(source, target) {
             if (source === target || target.flags & (1 /* Any */ | 4 /* String */)) {
                 return true;
@@ -68723,7 +68772,8 @@ var ts;
                 var value = source.value;
                 return !!(target.flags & 8 /* Number */ && isValidNumberString(value, /*roundTripOnly*/ false) ||
                     target.flags & 64 /* BigInt */ && isValidBigIntString(value, /*roundTripOnly*/ false) ||
-                    target.flags & (512 /* BooleanLiteral */ | 98304 /* Nullable */) && value === target.intrinsicName);
+                    target.flags & (512 /* BooleanLiteral */ | 98304 /* Nullable */) && value === target.intrinsicName ||
+                    target.flags & 268435456 /* StringMapping */ && isMemberOfStringMapping(getStringLiteralType(value), target));
             }
             if (source.flags & 134217728 /* TemplateLiteral */) {
                 var texts = source.texts;

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "4.8.0-dev.20220616",
+    "version": "4.8.0-dev.20220617",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -38,8 +38,8 @@
         "@types/gulp": "^4.0.9",
         "@types/gulp-concat": "latest",
         "@types/gulp-newer": "latest",
-        "@types/gulp-rename": "0.0.33",
-        "@types/gulp-sourcemaps": "0.0.32",
+        "@types/gulp-rename": "latest",
+        "@types/gulp-sourcemaps": "latest",
         "@types/merge2": "latest",
         "@types/microsoft__typescript-etw": "latest",
         "@types/minimatch": "latest",
@@ -48,29 +48,28 @@
         "@types/mocha": "latest",
         "@types/ms": "latest",
         "@types/node": "latest",
-        "@types/node-fetch": "^2.3.4",
         "@types/q": "latest",
         "@types/source-map-support": "latest",
-        "@types/xml2js": "^0.4.0",
-        "@typescript-eslint/eslint-plugin": "^4.28.0",
-        "@typescript-eslint/experimental-utils": "^4.28.0",
-        "@typescript-eslint/parser": "^4.28.0",
+        "@types/xml2js": "^0.4.11",
+        "@typescript-eslint/eslint-plugin": "^5.28.0",
+        "@typescript-eslint/parser": "^5.28.0",
+        "@typescript-eslint/utils": "^5.28.0",
         "async": "latest",
-        "azure-devops-node-api": "^11.0.1",
+        "azure-devops-node-api": "^11.1.1",
         "chai": "latest",
         "chalk": "^4.1.2",
         "convert-source-map": "latest",
-        "del": "5.1.0",
-        "diff": "^4.0.2",
-        "eslint": "7.12.1",
-        "eslint-formatter-autolinkable-stylish": "1.1.4",
-        "eslint-plugin-import": "2.22.1",
-        "eslint-plugin-jsdoc": "30.7.6",
+        "del": "6.1.1",
+        "diff": "^5.1.0",
+        "eslint": "8.17.0",
+        "eslint-formatter-autolinkable-stylish": "1.2.0",
+        "eslint-plugin-import": "2.26.0",
+        "eslint-plugin-jsdoc": "39.3.2",
         "eslint-plugin-no-null": "1.0.2",
         "fancy-log": "latest",
-        "fs-extra": "^9.0.0",
+        "fs-extra": "^9.1.0",
         "glob": "latest",
-        "gulp": "^4.0.0",
+        "gulp": "^4.0.2",
         "gulp-concat": "latest",
         "gulp-insert": "latest",
         "gulp-newer": "latest",
@@ -82,14 +81,14 @@
         "mocha": "latest",
         "mocha-fivemat-progress-reporter": "latest",
         "ms": "^2.1.3",
-        "node-fetch": "^2.6.1",
-        "prex": "^0.4.3",
+        "node-fetch": "^3.2.6",
+        "prex": "^0.4.7",
         "q": "latest",
         "source-map-support": "latest",
         "typescript": "^4.5.5",
         "vinyl": "latest",
         "vinyl-sourcemaps-apply": "latest",
-        "xml2js": "^0.4.19"
+        "xml2js": "^0.4.23"
     },
     "scripts": {
         "prepare": "gulp build-eslint-rules",