@typescript-deploys/pr-build 4.5.0-pr-46071-13 → 4.5.0-pr-46218-4

package/lib/typescript.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-insiders.20211001";
+    ts.version = ts.versionMajorMinor + ".0-insiders.20211005";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -42671,9 +42671,11 @@ var ts;
         return idx === -1 ? { packageName: moduleName, rest: "" } : { packageName: moduleName.slice(0, idx), rest: moduleName.slice(idx + 1) };
     }
     ts.parsePackageName = parsePackageName;
+    /* @internal */
     function allKeysStartWithDot(obj) {
         return ts.every(ts.getOwnKeys(obj), function (k) { return ts.startsWith(k, "."); });
     }
+    ts.allKeysStartWithDot = allKeysStartWithDot;
     function noKeyStartsWithDot(obj) {
         return !ts.some(ts.getOwnKeys(obj), function (k) { return ts.startsWith(k, "."); });
     }
@@ -42880,17 +42882,19 @@ var ts;
             }
             return toSearchResult(/*value*/ undefined);
         }
-        function isApplicableVersionedTypesKey(conditions, key) {
-            if (conditions.indexOf("types") === -1)
-                return false; // only apply versioned types conditions if the types condition is applied
-            if (!ts.startsWith(key, "types@"))
-                return false;
-            var range = ts.VersionRange.tryParse(key.substring("types@".length));
-            if (!range)
-                return false;
-            return range.test(ts.version);
-        }
     }
+    /* @internal */
+    function isApplicableVersionedTypesKey(conditions, key) {
+        if (conditions.indexOf("types") === -1)
+            return false; // only apply versioned types conditions if the types condition is applied
+        if (!ts.startsWith(key, "types@"))
+            return false;
+        var range = ts.VersionRange.tryParse(key.substring("types@".length));
+        if (!range)
+            return false;
+        return range.test(ts.version);
+    }
+    ts.isApplicableVersionedTypesKey = isApplicableVersionedTypesKey;
     function loadModuleFromNearestNodeModulesDirectory(extensions, moduleName, directory, state, cache, redirectedReference) {
         return loadModuleFromNearestNodeModulesDirectoryWorker(extensions, moduleName, directory, state, /*typesScopeOnly*/ false, cache, redirectedReference);
     }
@@ -61642,7 +61646,8 @@ var ts;
                     return mapTypeWithAlias(getReducedType(mappedTypeVariable), function (t) {
                         if (t.flags & (3 /* AnyOrUnknown */ | 58982400 /* InstantiableNonPrimitive */ | 524288 /* Object */ | 2097152 /* Intersection */) && t !== wildcardType && !isErrorType(t)) {
                             if (!type.declaration.nameType) {
-                                if (isArrayType(t)) {
+                                var constraint = void 0;
+                                if (isArrayType(t) || (t.flags & 1 /* Any */) && (constraint = getConstraintOfTypeParameter(typeVariable)) && everyType(constraint, ts.or(isArrayType, isTupleType))) {
                                     return instantiateMappedArrayType(t, type, prependTypeMapping(typeVariable, t, mapper));
                                 }
                                 if (isGenericTupleType(t)) {
@@ -63034,10 +63039,6 @@ var ts;
                             }
                         }
                         message = ts.Diagnostics.Type_0_is_not_assignable_to_type_1;
-                        var typeLengthLimit = 30;
-                        if (!errorInfo && compilerOptions.pretty && (sourceType.length > typeLengthLimit || targetType.length > typeLengthLimit)) {
-                            message = formatMessageForTypes(message, typeLengthLimit, sourceType, targetType);
-                        }
                     }
                 }
                 else if (message === ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1
@@ -63047,15 +63048,6 @@ var ts;
                 }
                 reportError(message, generalizedSourceType, targetType);
             }
-            /** Move a printed type to be on its own line if it is longer than 30 characters */
-            function formatMessageForTypes(diagnostic, typeLengthLimit, source, target) {
-                var message = diagnostic.message;
-                if (source.length > typeLengthLimit)
-                    message = message.replace(" '{0}' ", ":\n{0}\n\n");
-                if (target.length > typeLengthLimit)
-                    message = message.replace(" '{1}'", ":\n{1}").replace(".", "");
-                return __assign(__assign({}, diagnostic), { message: message });
-            }
             function tryElaborateErrorsForPrimitivesAndObjects(source, target) {
                 var sourceType = symbolValueDeclarationIsContextSensitive(source.symbol) ? typeToString(source, source.symbol.valueDeclaration) : typeToString(source);
                 var targetType = symbolValueDeclarationIsContextSensitive(target.symbol) ? typeToString(target, target.symbol.valueDeclaration) : typeToString(target);
@@ -119146,6 +119138,78 @@ var ts;
                 }
             }
         }
+        var MatchingMode;
+        (function (MatchingMode) {
+            MatchingMode[MatchingMode["Exact"] = 0] = "Exact";
+            MatchingMode[MatchingMode["Directory"] = 1] = "Directory";
+            MatchingMode[MatchingMode["Pattern"] = 2] = "Pattern";
+        })(MatchingMode || (MatchingMode = {}));
+        function tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, exports, conditions, mode) {
+            if (mode === void 0) { mode = 0 /* Exact */; }
+            if (typeof exports === "string") {
+                var pathOrPattern = ts.getNormalizedAbsolutePath(ts.combinePaths(packageDirectory, exports), /*currentDirectory*/ undefined);
+                var extensionSwappedTarget = ts.hasTSFileExtension(targetFilePath) ? ts.removeFileExtension(targetFilePath) + tryGetJSExtensionForFile(targetFilePath, options) : undefined;
+                switch (mode) {
+                    case 0 /* Exact */:
+                        if (ts.comparePaths(targetFilePath, pathOrPattern) === 0 /* EqualTo */ || (extensionSwappedTarget && ts.comparePaths(extensionSwappedTarget, pathOrPattern) === 0 /* EqualTo */)) {
+                            return { moduleFileToTry: packageName };
+                        }
+                        break;
+                    case 1 /* Directory */:
+                        if (ts.containsPath(pathOrPattern, targetFilePath)) {
+                            var fragment = ts.getRelativePathFromDirectory(pathOrPattern, targetFilePath, /*ignoreCase*/ false);
+                            return { moduleFileToTry: ts.getNormalizedAbsolutePath(ts.combinePaths(ts.combinePaths(packageName, exports), fragment), /*currentDirectory*/ undefined) };
+                        }
+                        break;
+                    case 2 /* Pattern */:
+                        var starPos = pathOrPattern.indexOf("*");
+                        var leadingSlice = pathOrPattern.slice(0, starPos);
+                        var trailingSlice = pathOrPattern.slice(starPos + 1);
+                        if (ts.startsWith(targetFilePath, leadingSlice) && ts.endsWith(targetFilePath, trailingSlice)) {
+                            var starReplacement = targetFilePath.slice(leadingSlice.length, targetFilePath.length - trailingSlice.length);
+                            return { moduleFileToTry: packageName.replace("*", starReplacement) };
+                        }
+                        if (extensionSwappedTarget && ts.startsWith(extensionSwappedTarget, leadingSlice) && ts.endsWith(extensionSwappedTarget, trailingSlice)) {
+                            var starReplacement = extensionSwappedTarget.slice(leadingSlice.length, extensionSwappedTarget.length - trailingSlice.length);
+                            return { moduleFileToTry: packageName.replace("*", starReplacement) };
+                        }
+                        break;
+                }
+            }
+            else if (Array.isArray(exports)) {
+                return ts.forEach(exports, function (e) { return tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, e, conditions); });
+            }
+            else if (typeof exports === "object" && exports !== null) { // eslint-disable-line no-null/no-null
+                if (ts.allKeysStartWithDot(exports)) {
+                    // sub-mappings
+                    // 3 cases:
+                    // * directory mappings (legacyish, key ends with / (technically allows index/extension resolution under cjs mode))
+                    // * pattern mappings (contains a *)
+                    // * exact mappings (no *, does not end with /)
+                    return ts.forEach(ts.getOwnKeys(exports), function (k) {
+                        var subPackageName = ts.getNormalizedAbsolutePath(ts.combinePaths(packageName, k), /*currentDirectory*/ undefined);
+                        var mode = ts.endsWith(k, "/") ? 1 /* Directory */
+                            : ts.stringContains(k, "*") ? 2 /* Pattern */
+                                : 0 /* Exact */;
+                        return tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, subPackageName, exports[k], conditions, mode);
+                    });
+                }
+                else {
+                    // conditional mapping
+                    for (var _i = 0, _a = ts.getOwnKeys(exports); _i < _a.length; _i++) {
+                        var key = _a[_i];
+                        if (key === "default" || conditions.indexOf(key) >= 0 || ts.isApplicableVersionedTypesKey(conditions, key)) {
+                            var subTarget = exports[key];
+                            var result = tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, subTarget, conditions);
+                            if (result) {
+                                return result;
+                            }
+                        }
+                    }
+                }
+            }
+            return undefined;
+        }
         function tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName, ending, compilerOptions) {
             var normalizedTargetPath = getPathRelativeToRootDirs(moduleFileName, rootDirs, getCanonicalFileName);
             if (normalizedTargetPath === undefined) {
@@ -119175,7 +119239,15 @@ var ts;
                 var moduleFileNameForExtensionless = void 0;
                 while (true) {
                     // If the module could be imported by a directory name, use that directory's name
-                    var _c = tryDirectoryWithPackageJson(packageRootIndex), moduleFileToTry = _c.moduleFileToTry, packageRootPath = _c.packageRootPath;
+                    var _c = tryDirectoryWithPackageJson(packageRootIndex), moduleFileToTry = _c.moduleFileToTry, packageRootPath = _c.packageRootPath, blockedByExports = _c.blockedByExports, verbatimFromExports = _c.verbatimFromExports;
+                    if (ts.getEmitModuleResolutionKind(options) !== ts.ModuleResolutionKind.Classic) {
+                        if (blockedByExports) {
+                            return undefined; // File is under this package.json, but is not publicly exported - there's no way to name it via `node_modules` resolution
+                        }
+                        if (verbatimFromExports) {
+                            return moduleFileToTry;
+                        }
+                    }
                     if (packageRootPath) {
                         moduleSpecifier = packageRootPath;
                         isPackageRootPath = true;
@@ -119212,6 +119284,15 @@ var ts;
                 var moduleFileToTry = path;
                 if (host.fileExists(packageJsonPath)) {
                     var packageJsonContent = JSON.parse(host.readFile(packageJsonPath));
+                    // TODO: Inject `require` or `import` condition based on the intended import mode
+                    var fromExports = packageJsonContent.exports && typeof packageJsonContent.name === "string" ? tryGetModuleNameFromExports(options, path, packageRootPath, packageJsonContent.name, packageJsonContent.exports, ["node", "types"]) : undefined;
+                    if (fromExports) {
+                        var withJsExtension = !ts.hasTSFileExtension(fromExports.moduleFileToTry) ? fromExports : { moduleFileToTry: ts.removeFileExtension(fromExports.moduleFileToTry) + tryGetJSExtensionForFile(fromExports.moduleFileToTry, options) };
+                        return __assign(__assign({}, withJsExtension), { verbatimFromExports: true });
+                    }
+                    if (packageJsonContent.exports) {
+                        return { moduleFileToTry: path, blockedByExports: true };
+                    }
                     var versionPaths = packageJsonContent.typesVersions
                         ? ts.getPackageJsonTypesVersionsPaths(packageJsonContent.typesVersions)
                         : undefined;
@@ -138732,6 +138813,7 @@ var ts;
                     return false;
             }
         }
+        Rename.nodeIsEligibleForRename = nodeIsEligibleForRename;
     })(Rename = ts.Rename || (ts.Rename = {}));
 })(ts || (ts = {}));
 /* @internal */
@@ -160028,6 +160110,8 @@ var ts;
             synchronizeHostData();
             var sourceFile = getValidSourceFile(fileName);
             var node = ts.getAdjustedRenameLocation(ts.getTouchingPropertyName(sourceFile, position));
+            if (!ts.Rename.nodeIsEligibleForRename(node))
+                return undefined;
             if (ts.isIdentifier(node) && (ts.isJsxOpeningElement(node.parent) || ts.isJsxClosingElement(node.parent)) && ts.isIntrinsicJsxName(node.escapedText)) {
                 var _a = node.parent.parent, openingElement = _a.openingElement, closingElement = _a.closingElement;
                 return [openingElement, closingElement].map(function (node) {

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-insiders.20211001";
+    ts.version = ts.versionMajorMinor + ".0-insiders.20211005";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -42671,9 +42671,11 @@ var ts;
         return idx === -1 ? { packageName: moduleName, rest: "" } : { packageName: moduleName.slice(0, idx), rest: moduleName.slice(idx + 1) };
     }
     ts.parsePackageName = parsePackageName;
+    /* @internal */
     function allKeysStartWithDot(obj) {
         return ts.every(ts.getOwnKeys(obj), function (k) { return ts.startsWith(k, "."); });
     }
+    ts.allKeysStartWithDot = allKeysStartWithDot;
     function noKeyStartsWithDot(obj) {
         return !ts.some(ts.getOwnKeys(obj), function (k) { return ts.startsWith(k, "."); });
     }
@@ -42880,17 +42882,19 @@ var ts;
             }
             return toSearchResult(/*value*/ undefined);
         }
-        function isApplicableVersionedTypesKey(conditions, key) {
-            if (conditions.indexOf("types") === -1)
-                return false; // only apply versioned types conditions if the types condition is applied
-            if (!ts.startsWith(key, "types@"))
-                return false;
-            var range = ts.VersionRange.tryParse(key.substring("types@".length));
-            if (!range)
-                return false;
-            return range.test(ts.version);
-        }
     }
+    /* @internal */
+    function isApplicableVersionedTypesKey(conditions, key) {
+        if (conditions.indexOf("types") === -1)
+            return false; // only apply versioned types conditions if the types condition is applied
+        if (!ts.startsWith(key, "types@"))
+            return false;
+        var range = ts.VersionRange.tryParse(key.substring("types@".length));
+        if (!range)
+            return false;
+        return range.test(ts.version);
+    }
+    ts.isApplicableVersionedTypesKey = isApplicableVersionedTypesKey;
     function loadModuleFromNearestNodeModulesDirectory(extensions, moduleName, directory, state, cache, redirectedReference) {
         return loadModuleFromNearestNodeModulesDirectoryWorker(extensions, moduleName, directory, state, /*typesScopeOnly*/ false, cache, redirectedReference);
     }
@@ -61642,7 +61646,8 @@ var ts;
                     return mapTypeWithAlias(getReducedType(mappedTypeVariable), function (t) {
                         if (t.flags & (3 /* AnyOrUnknown */ | 58982400 /* InstantiableNonPrimitive */ | 524288 /* Object */ | 2097152 /* Intersection */) && t !== wildcardType && !isErrorType(t)) {
                             if (!type.declaration.nameType) {
-                                if (isArrayType(t)) {
+                                var constraint = void 0;
+                                if (isArrayType(t) || (t.flags & 1 /* Any */) && (constraint = getConstraintOfTypeParameter(typeVariable)) && everyType(constraint, ts.or(isArrayType, isTupleType))) {
                                     return instantiateMappedArrayType(t, type, prependTypeMapping(typeVariable, t, mapper));
                                 }
                                 if (isGenericTupleType(t)) {
@@ -63034,10 +63039,6 @@ var ts;
                             }
                         }
                         message = ts.Diagnostics.Type_0_is_not_assignable_to_type_1;
-                        var typeLengthLimit = 30;
-                        if (!errorInfo && compilerOptions.pretty && (sourceType.length > typeLengthLimit || targetType.length > typeLengthLimit)) {
-                            message = formatMessageForTypes(message, typeLengthLimit, sourceType, targetType);
-                        }
                     }
                 }
                 else if (message === ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1
@@ -63047,15 +63048,6 @@ var ts;
                 }
                 reportError(message, generalizedSourceType, targetType);
             }
-            /** Move a printed type to be on its own line if it is longer than 30 characters */
-            function formatMessageForTypes(diagnostic, typeLengthLimit, source, target) {
-                var message = diagnostic.message;
-                if (source.length > typeLengthLimit)
-                    message = message.replace(" '{0}' ", ":\n{0}\n\n");
-                if (target.length > typeLengthLimit)
-                    message = message.replace(" '{1}'", ":\n{1}").replace(".", "");
-                return __assign(__assign({}, diagnostic), { message: message });
-            }
             function tryElaborateErrorsForPrimitivesAndObjects(source, target) {
                 var sourceType = symbolValueDeclarationIsContextSensitive(source.symbol) ? typeToString(source, source.symbol.valueDeclaration) : typeToString(source);
                 var targetType = symbolValueDeclarationIsContextSensitive(target.symbol) ? typeToString(target, target.symbol.valueDeclaration) : typeToString(target);
@@ -119146,6 +119138,78 @@ var ts;
                 }
             }
         }
+        var MatchingMode;
+        (function (MatchingMode) {
+            MatchingMode[MatchingMode["Exact"] = 0] = "Exact";
+            MatchingMode[MatchingMode["Directory"] = 1] = "Directory";
+            MatchingMode[MatchingMode["Pattern"] = 2] = "Pattern";
+        })(MatchingMode || (MatchingMode = {}));
+        function tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, exports, conditions, mode) {
+            if (mode === void 0) { mode = 0 /* Exact */; }
+            if (typeof exports === "string") {
+                var pathOrPattern = ts.getNormalizedAbsolutePath(ts.combinePaths(packageDirectory, exports), /*currentDirectory*/ undefined);
+                var extensionSwappedTarget = ts.hasTSFileExtension(targetFilePath) ? ts.removeFileExtension(targetFilePath) + tryGetJSExtensionForFile(targetFilePath, options) : undefined;
+                switch (mode) {
+                    case 0 /* Exact */:
+                        if (ts.comparePaths(targetFilePath, pathOrPattern) === 0 /* EqualTo */ || (extensionSwappedTarget && ts.comparePaths(extensionSwappedTarget, pathOrPattern) === 0 /* EqualTo */)) {
+                            return { moduleFileToTry: packageName };
+                        }
+                        break;
+                    case 1 /* Directory */:
+                        if (ts.containsPath(pathOrPattern, targetFilePath)) {
+                            var fragment = ts.getRelativePathFromDirectory(pathOrPattern, targetFilePath, /*ignoreCase*/ false);
+                            return { moduleFileToTry: ts.getNormalizedAbsolutePath(ts.combinePaths(ts.combinePaths(packageName, exports), fragment), /*currentDirectory*/ undefined) };
+                        }
+                        break;
+                    case 2 /* Pattern */:
+                        var starPos = pathOrPattern.indexOf("*");
+                        var leadingSlice = pathOrPattern.slice(0, starPos);
+                        var trailingSlice = pathOrPattern.slice(starPos + 1);
+                        if (ts.startsWith(targetFilePath, leadingSlice) && ts.endsWith(targetFilePath, trailingSlice)) {
+                            var starReplacement = targetFilePath.slice(leadingSlice.length, targetFilePath.length - trailingSlice.length);
+                            return { moduleFileToTry: packageName.replace("*", starReplacement) };
+                        }
+                        if (extensionSwappedTarget && ts.startsWith(extensionSwappedTarget, leadingSlice) && ts.endsWith(extensionSwappedTarget, trailingSlice)) {
+                            var starReplacement = extensionSwappedTarget.slice(leadingSlice.length, extensionSwappedTarget.length - trailingSlice.length);
+                            return { moduleFileToTry: packageName.replace("*", starReplacement) };
+                        }
+                        break;
+                }
+            }
+            else if (Array.isArray(exports)) {
+                return ts.forEach(exports, function (e) { return tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, e, conditions); });
+            }
+            else if (typeof exports === "object" && exports !== null) { // eslint-disable-line no-null/no-null
+                if (ts.allKeysStartWithDot(exports)) {
+                    // sub-mappings
+                    // 3 cases:
+                    // * directory mappings (legacyish, key ends with / (technically allows index/extension resolution under cjs mode))
+                    // * pattern mappings (contains a *)
+                    // * exact mappings (no *, does not end with /)
+                    return ts.forEach(ts.getOwnKeys(exports), function (k) {
+                        var subPackageName = ts.getNormalizedAbsolutePath(ts.combinePaths(packageName, k), /*currentDirectory*/ undefined);
+                        var mode = ts.endsWith(k, "/") ? 1 /* Directory */
+                            : ts.stringContains(k, "*") ? 2 /* Pattern */
+                                : 0 /* Exact */;
+                        return tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, subPackageName, exports[k], conditions, mode);
+                    });
+                }
+                else {
+                    // conditional mapping
+                    for (var _i = 0, _a = ts.getOwnKeys(exports); _i < _a.length; _i++) {
+                        var key = _a[_i];
+                        if (key === "default" || conditions.indexOf(key) >= 0 || ts.isApplicableVersionedTypesKey(conditions, key)) {
+                            var subTarget = exports[key];
+                            var result = tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, subTarget, conditions);
+                            if (result) {
+                                return result;
+                            }
+                        }
+                    }
+                }
+            }
+            return undefined;
+        }
         function tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName, ending, compilerOptions) {
             var normalizedTargetPath = getPathRelativeToRootDirs(moduleFileName, rootDirs, getCanonicalFileName);
             if (normalizedTargetPath === undefined) {
@@ -119175,7 +119239,15 @@ var ts;
                 var moduleFileNameForExtensionless = void 0;
                 while (true) {
                     // If the module could be imported by a directory name, use that directory's name
-                    var _c = tryDirectoryWithPackageJson(packageRootIndex), moduleFileToTry = _c.moduleFileToTry, packageRootPath = _c.packageRootPath;
+                    var _c = tryDirectoryWithPackageJson(packageRootIndex), moduleFileToTry = _c.moduleFileToTry, packageRootPath = _c.packageRootPath, blockedByExports = _c.blockedByExports, verbatimFromExports = _c.verbatimFromExports;
+                    if (ts.getEmitModuleResolutionKind(options) !== ts.ModuleResolutionKind.Classic) {
+                        if (blockedByExports) {
+                            return undefined; // File is under this package.json, but is not publicly exported - there's no way to name it via `node_modules` resolution
+                        }
+                        if (verbatimFromExports) {
+                            return moduleFileToTry;
+                        }
+                    }
                     if (packageRootPath) {
                         moduleSpecifier = packageRootPath;
                         isPackageRootPath = true;
@@ -119212,6 +119284,15 @@ var ts;
                 var moduleFileToTry = path;
                 if (host.fileExists(packageJsonPath)) {
                     var packageJsonContent = JSON.parse(host.readFile(packageJsonPath));
+                    // TODO: Inject `require` or `import` condition based on the intended import mode
+                    var fromExports = packageJsonContent.exports && typeof packageJsonContent.name === "string" ? tryGetModuleNameFromExports(options, path, packageRootPath, packageJsonContent.name, packageJsonContent.exports, ["node", "types"]) : undefined;
+                    if (fromExports) {
+                        var withJsExtension = !ts.hasTSFileExtension(fromExports.moduleFileToTry) ? fromExports : { moduleFileToTry: ts.removeFileExtension(fromExports.moduleFileToTry) + tryGetJSExtensionForFile(fromExports.moduleFileToTry, options) };
+                        return __assign(__assign({}, withJsExtension), { verbatimFromExports: true });
+                    }
+                    if (packageJsonContent.exports) {
+                        return { moduleFileToTry: path, blockedByExports: true };
+                    }
                     var versionPaths = packageJsonContent.typesVersions
                         ? ts.getPackageJsonTypesVersionsPaths(packageJsonContent.typesVersions)
                         : undefined;
@@ -138732,6 +138813,7 @@ var ts;
                     return false;
             }
         }
+        Rename.nodeIsEligibleForRename = nodeIsEligibleForRename;
     })(Rename = ts.Rename || (ts.Rename = {}));
 })(ts || (ts = {}));
 /* @internal */
@@ -160028,6 +160110,8 @@ var ts;
             synchronizeHostData();
             var sourceFile = getValidSourceFile(fileName);
             var node = ts.getAdjustedRenameLocation(ts.getTouchingPropertyName(sourceFile, position));
+            if (!ts.Rename.nodeIsEligibleForRename(node))
+                return undefined;
             if (ts.isIdentifier(node) && (ts.isJsxOpeningElement(node.parent) || ts.isJsxClosingElement(node.parent)) && ts.isIntrinsicJsxName(node.escapedText)) {
                 var _a = node.parent.parent, openingElement = _a.openingElement, closingElement = _a.closingElement;
                 return [openingElement, closingElement].map(function (node) {

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-insiders.20211001";
+    ts.version = ts.versionMajorMinor + ".0-insiders.20211005";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -42466,9 +42466,11 @@ var ts;
         return idx === -1 ? { packageName: moduleName, rest: "" } : { packageName: moduleName.slice(0, idx), rest: moduleName.slice(idx + 1) };
     }
     ts.parsePackageName = parsePackageName;
+    /* @internal */
     function allKeysStartWithDot(obj) {
         return ts.every(ts.getOwnKeys(obj), function (k) { return ts.startsWith(k, "."); });
     }
+    ts.allKeysStartWithDot = allKeysStartWithDot;
     function noKeyStartsWithDot(obj) {
         return !ts.some(ts.getOwnKeys(obj), function (k) { return ts.startsWith(k, "."); });
     }
@@ -42675,17 +42677,19 @@ var ts;
             }
             return toSearchResult(/*value*/ undefined);
         }
-        function isApplicableVersionedTypesKey(conditions, key) {
-            if (conditions.indexOf("types") === -1)
-                return false; // only apply versioned types conditions if the types condition is applied
-            if (!ts.startsWith(key, "types@"))
-                return false;
-            var range = ts.VersionRange.tryParse(key.substring("types@".length));
-            if (!range)
-                return false;
-            return range.test(ts.version);
-        }
     }
+    /* @internal */
+    function isApplicableVersionedTypesKey(conditions, key) {
+        if (conditions.indexOf("types") === -1)
+            return false; // only apply versioned types conditions if the types condition is applied
+        if (!ts.startsWith(key, "types@"))
+            return false;
+        var range = ts.VersionRange.tryParse(key.substring("types@".length));
+        if (!range)
+            return false;
+        return range.test(ts.version);
+    }
+    ts.isApplicableVersionedTypesKey = isApplicableVersionedTypesKey;
     function loadModuleFromNearestNodeModulesDirectory(extensions, moduleName, directory, state, cache, redirectedReference) {
         return loadModuleFromNearestNodeModulesDirectoryWorker(extensions, moduleName, directory, state, /*typesScopeOnly*/ false, cache, redirectedReference);
     }
@@ -61437,7 +61441,8 @@ var ts;
                     return mapTypeWithAlias(getReducedType(mappedTypeVariable), function (t) {
                         if (t.flags & (3 /* AnyOrUnknown */ | 58982400 /* InstantiableNonPrimitive */ | 524288 /* Object */ | 2097152 /* Intersection */) && t !== wildcardType && !isErrorType(t)) {
                             if (!type.declaration.nameType) {
-                                if (isArrayType(t)) {
+                                var constraint = void 0;
+                                if (isArrayType(t) || (t.flags & 1 /* Any */) && (constraint = getConstraintOfTypeParameter(typeVariable)) && everyType(constraint, ts.or(isArrayType, isTupleType))) {
                                     return instantiateMappedArrayType(t, type, prependTypeMapping(typeVariable, t, mapper));
                                 }
                                 if (isGenericTupleType(t)) {
@@ -62829,10 +62834,6 @@ var ts;
                             }
                         }
                         message = ts.Diagnostics.Type_0_is_not_assignable_to_type_1;
-                        var typeLengthLimit = 30;
-                        if (!errorInfo && compilerOptions.pretty && (sourceType.length > typeLengthLimit || targetType.length > typeLengthLimit)) {
-                            message = formatMessageForTypes(message, typeLengthLimit, sourceType, targetType);
-                        }
                     }
                 }
                 else if (message === ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1
@@ -62842,15 +62843,6 @@ var ts;
                 }
                 reportError(message, generalizedSourceType, targetType);
             }
-            /** Move a printed type to be on its own line if it is longer than 30 characters */
-            function formatMessageForTypes(diagnostic, typeLengthLimit, source, target) {
-                var message = diagnostic.message;
-                if (source.length > typeLengthLimit)
-                    message = message.replace(" '{0}' ", ":\n{0}\n\n");
-                if (target.length > typeLengthLimit)
-                    message = message.replace(" '{1}'", ":\n{1}").replace(".", "");
-                return __assign(__assign({}, diagnostic), { message: message });
-            }
             function tryElaborateErrorsForPrimitivesAndObjects(source, target) {
                 var sourceType = symbolValueDeclarationIsContextSensitive(source.symbol) ? typeToString(source, source.symbol.valueDeclaration) : typeToString(source);
                 var targetType = symbolValueDeclarationIsContextSensitive(target.symbol) ? typeToString(target, target.symbol.valueDeclaration) : typeToString(target);
@@ -118941,6 +118933,78 @@ var ts;
                 }
             }
         }
+        var MatchingMode;
+        (function (MatchingMode) {
+            MatchingMode[MatchingMode["Exact"] = 0] = "Exact";
+            MatchingMode[MatchingMode["Directory"] = 1] = "Directory";
+            MatchingMode[MatchingMode["Pattern"] = 2] = "Pattern";
+        })(MatchingMode || (MatchingMode = {}));
+        function tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, exports, conditions, mode) {
+            if (mode === void 0) { mode = 0 /* Exact */; }
+            if (typeof exports === "string") {
+                var pathOrPattern = ts.getNormalizedAbsolutePath(ts.combinePaths(packageDirectory, exports), /*currentDirectory*/ undefined);
+                var extensionSwappedTarget = ts.hasTSFileExtension(targetFilePath) ? ts.removeFileExtension(targetFilePath) + tryGetJSExtensionForFile(targetFilePath, options) : undefined;
+                switch (mode) {
+                    case 0 /* Exact */:
+                        if (ts.comparePaths(targetFilePath, pathOrPattern) === 0 /* EqualTo */ || (extensionSwappedTarget && ts.comparePaths(extensionSwappedTarget, pathOrPattern) === 0 /* EqualTo */)) {
+                            return { moduleFileToTry: packageName };
+                        }
+                        break;
+                    case 1 /* Directory */:
+                        if (ts.containsPath(pathOrPattern, targetFilePath)) {
+                            var fragment = ts.getRelativePathFromDirectory(pathOrPattern, targetFilePath, /*ignoreCase*/ false);
+                            return { moduleFileToTry: ts.getNormalizedAbsolutePath(ts.combinePaths(ts.combinePaths(packageName, exports), fragment), /*currentDirectory*/ undefined) };
+                        }
+                        break;
+                    case 2 /* Pattern */:
+                        var starPos = pathOrPattern.indexOf("*");
+                        var leadingSlice = pathOrPattern.slice(0, starPos);
+                        var trailingSlice = pathOrPattern.slice(starPos + 1);
+                        if (ts.startsWith(targetFilePath, leadingSlice) && ts.endsWith(targetFilePath, trailingSlice)) {
+                            var starReplacement = targetFilePath.slice(leadingSlice.length, targetFilePath.length - trailingSlice.length);
+                            return { moduleFileToTry: packageName.replace("*", starReplacement) };
+                        }
+                        if (extensionSwappedTarget && ts.startsWith(extensionSwappedTarget, leadingSlice) && ts.endsWith(extensionSwappedTarget, trailingSlice)) {
+                            var starReplacement = extensionSwappedTarget.slice(leadingSlice.length, extensionSwappedTarget.length - trailingSlice.length);
+                            return { moduleFileToTry: packageName.replace("*", starReplacement) };
+                        }
+                        break;
+                }
+            }
+            else if (Array.isArray(exports)) {
+                return ts.forEach(exports, function (e) { return tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, e, conditions); });
+            }
+            else if (typeof exports === "object" && exports !== null) { // eslint-disable-line no-null/no-null
+                if (ts.allKeysStartWithDot(exports)) {
+                    // sub-mappings
+                    // 3 cases:
+                    // * directory mappings (legacyish, key ends with / (technically allows index/extension resolution under cjs mode))
+                    // * pattern mappings (contains a *)
+                    // * exact mappings (no *, does not end with /)
+                    return ts.forEach(ts.getOwnKeys(exports), function (k) {
+                        var subPackageName = ts.getNormalizedAbsolutePath(ts.combinePaths(packageName, k), /*currentDirectory*/ undefined);
+                        var mode = ts.endsWith(k, "/") ? 1 /* Directory */
+                            : ts.stringContains(k, "*") ? 2 /* Pattern */
+                                : 0 /* Exact */;
+                        return tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, subPackageName, exports[k], conditions, mode);
+                    });
+                }
+                else {
+                    // conditional mapping
+                    for (var _i = 0, _a = ts.getOwnKeys(exports); _i < _a.length; _i++) {
+                        var key = _a[_i];
+                        if (key === "default" || conditions.indexOf(key) >= 0 || ts.isApplicableVersionedTypesKey(conditions, key)) {
+                            var subTarget = exports[key];
+                            var result = tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, subTarget, conditions);
+                            if (result) {
+                                return result;
+                            }
+                        }
+                    }
+                }
+            }
+            return undefined;
+        }
         function tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName, ending, compilerOptions) {
             var normalizedTargetPath = getPathRelativeToRootDirs(moduleFileName, rootDirs, getCanonicalFileName);
             if (normalizedTargetPath === undefined) {
@@ -118970,7 +119034,15 @@ var ts;
                 var moduleFileNameForExtensionless = void 0;
                 while (true) {
                     // If the module could be imported by a directory name, use that directory's name
-                    var _c = tryDirectoryWithPackageJson(packageRootIndex), moduleFileToTry = _c.moduleFileToTry, packageRootPath = _c.packageRootPath;
+                    var _c = tryDirectoryWithPackageJson(packageRootIndex), moduleFileToTry = _c.moduleFileToTry, packageRootPath = _c.packageRootPath, blockedByExports = _c.blockedByExports, verbatimFromExports = _c.verbatimFromExports;
+                    if (ts.getEmitModuleResolutionKind(options) !== ts.ModuleResolutionKind.Classic) {
+                        if (blockedByExports) {
+                            return undefined; // File is under this package.json, but is not publicly exported - there's no way to name it via `node_modules` resolution
+                        }
+                        if (verbatimFromExports) {
+                            return moduleFileToTry;
+                        }
+                    }
                     if (packageRootPath) {
                         moduleSpecifier = packageRootPath;
                         isPackageRootPath = true;
@@ -119007,6 +119079,15 @@ var ts;
                 var moduleFileToTry = path;
                 if (host.fileExists(packageJsonPath)) {
                     var packageJsonContent = JSON.parse(host.readFile(packageJsonPath));
+                    // TODO: Inject `require` or `import` condition based on the intended import mode
+                    var fromExports = packageJsonContent.exports && typeof packageJsonContent.name === "string" ? tryGetModuleNameFromExports(options, path, packageRootPath, packageJsonContent.name, packageJsonContent.exports, ["node", "types"]) : undefined;
+                    if (fromExports) {
+                        var withJsExtension = !ts.hasTSFileExtension(fromExports.moduleFileToTry) ? fromExports : { moduleFileToTry: ts.removeFileExtension(fromExports.moduleFileToTry) + tryGetJSExtensionForFile(fromExports.moduleFileToTry, options) };
+                        return __assign(__assign({}, withJsExtension), { verbatimFromExports: true });
+                    }
+                    if (packageJsonContent.exports) {
+                        return { moduleFileToTry: path, blockedByExports: true };
+                    }
                     var versionPaths = packageJsonContent.typesVersions
                         ? ts.getPackageJsonTypesVersionsPaths(packageJsonContent.typesVersions)
                         : undefined;