typescript 4.7.0-dev.20220319 → 4.7.0-dev.20220322

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-dev.20220319";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220322";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -127954,7 +127954,7 @@ var ts;
                         packageName = ts.unmangleScopedPackageName(ts.getPackageNameFromTypesPackageName(moduleFile.fileName.substring(topLevelPackageNameIndex + 1, packageRootIndex)));
                         if (ts.startsWith(importingFile, moduleFile.path.substring(0, topLevelNodeModulesIndex))) {
                             var prevDeepestNodeModulesPath = packages.get(packageName);
-                            var nodeModulesPath = moduleFile.fileName.substring(0, topLevelPackageNameIndex);
+                            var nodeModulesPath = moduleFile.fileName.substring(0, topLevelPackageNameIndex + 1);
                             if (prevDeepestNodeModulesPath) {
                                 var prevDeepestNodeModulesIndex = prevDeepestNodeModulesPath.indexOf(ts.nodeModulesPathPart);
                                 if (topLevelNodeModulesIndex > prevDeepestNodeModulesIndex) {
@@ -128125,6 +128125,9 @@ var ts;
         function isNotShadowedByDeeperNodeModulesPackage(info, packageName) {
             if (!packageName || !info.moduleFileName)
                 return true;
+            var typingsCacheLocation = host.getGlobalTypingsCacheLocation();
+            if (typingsCacheLocation && ts.startsWith(info.moduleFileName, typingsCacheLocation))
+                return true;
             var packageDeepestNodeModulesPath = packages.get(packageName);
             return !packageDeepestNodeModulesPath || ts.startsWith(info.moduleFileName, packageDeepestNodeModulesPath);
         }
@@ -128203,6 +128206,7 @@ var ts;
         var cache = ((_b = host.getCachedExportInfoMap) === null || _b === void 0 ? void 0 : _b.call(host)) || createCacheableExportInfoMap({
             getCurrentProgram: function () { return program; },
             getPackageJsonAutoImportProvider: function () { var _a; return (_a = host.getPackageJsonAutoImportProvider) === null || _a === void 0 ? void 0 : _a.call(host); },
+            getGlobalTypingsCacheLocation: function () { var _a; return (_a = host.getGlobalTypingsCacheLocation) === null || _a === void 0 ? void 0 : _a.call(host); },
         });
         if (cache.isUsableByFile(importingFile.path)) {
             (_c = host.log) === null || _c === void 0 ? void 0 : _c.call(host, "getExportInfoMap: cache hit");
@@ -168792,13 +168796,12 @@ var ts;
                 }
                 var dependenciesAdded = 0;
                 if (dependencyNames) {
-                    var symlinkCache = hostProject.getSymlinkCache();
-                    for (var _c = 0, _d = ts.arrayFrom(dependencyNames.keys()); _c < _d.length; _c++) {
-                        var name = _d[_c];
+                    var symlinkCache_1 = hostProject.getSymlinkCache();
+                    var _loop_2 = function (name) {
                         // Avoid creating a large project that would significantly slow down time to editor interactivity
-                        if (dependencySelection === 2 /* Auto */ && dependenciesAdded > this.maxDependencies) {
-                            hostProject.log("AutoImportProviderProject: attempted to add more than " + this.maxDependencies + " dependencies. Aborting.");
-                            return ts.emptyArray;
+                        if (dependencySelection === 2 /* Auto */ && dependenciesAdded > this_2.maxDependencies) {
+                            hostProject.log("AutoImportProviderProject: attempted to add more than " + this_2.maxDependencies + " dependencies. Aborting.");
+                            return { value: ts.emptyArray };
                         }
                         // 1. Try to load from the implementation package. For many dependencies, the
                         //    package.json will exist, but the package will not contain any typings,
@@ -168806,29 +168809,43 @@ var ts;
                         //    is missing altogether, we will move on to trying the @types package (2).
                         var packageJson = ts.resolvePackageNameToPackageJson(name, hostProject.currentDirectory, compilerOptions, moduleResolutionHost, program.getModuleResolutionCache());
                         if (packageJson) {
-                            var entrypoints = getRootNamesFromPackageJson(packageJson, program, symlinkCache);
+                            var entrypoints = getRootNamesFromPackageJson(packageJson, program, symlinkCache_1);
                             if (entrypoints) {
                                 rootNames = ts.concatenate(rootNames, entrypoints);
                                 dependenciesAdded += entrypoints.length ? 1 : 0;
-                                continue;
+                                return "continue";
                             }
                         }
-                        // 2. Try to load from the @types package.
-                        var typesPackageJson = ts.resolvePackageNameToPackageJson("@types/" + name, hostProject.currentDirectory, compilerOptions, moduleResolutionHost, program.getModuleResolutionCache());
-                        if (typesPackageJson) {
-                            var entrypoints = getRootNamesFromPackageJson(typesPackageJson, program, symlinkCache);
-                            rootNames = ts.concatenate(rootNames, entrypoints);
-                            dependenciesAdded += (entrypoints === null || entrypoints === void 0 ? void 0 : entrypoints.length) ? 1 : 0;
-                            continue;
-                        }
+                        // 2. Try to load from the @types package in the tree and in the global
+                        //    typings cache location, if enabled.
+                        var done = ts.forEach([hostProject.currentDirectory, hostProject.getGlobalTypingsCacheLocation()], function (directory) {
+                            if (directory) {
+                                var typesPackageJson = ts.resolvePackageNameToPackageJson("@types/" + name, directory, compilerOptions, moduleResolutionHost, program.getModuleResolutionCache());
+                                if (typesPackageJson) {
+                                    var entrypoints = getRootNamesFromPackageJson(typesPackageJson, program, symlinkCache_1);
+                                    rootNames = ts.concatenate(rootNames, entrypoints);
+                                    dependenciesAdded += (entrypoints === null || entrypoints === void 0 ? void 0 : entrypoints.length) ? 1 : 0;
+                                    return true;
+                                }
+                            }
+                        });
+                        if (done)
+                            return "continue";
                         // 3. If the @types package did not exist and the user has settings that
                         //    allow processing JS from node_modules, go back to the implementation
                         //    package and load the JS.
                         if (packageJson && compilerOptions.allowJs && compilerOptions.maxNodeModuleJsDepth) {
-                            var entrypoints = getRootNamesFromPackageJson(packageJson, program, symlinkCache, /*allowJs*/ true);
+                            var entrypoints = getRootNamesFromPackageJson(packageJson, program, symlinkCache_1, /*allowJs*/ true);
                             rootNames = ts.concatenate(rootNames, entrypoints);
                             dependenciesAdded += (entrypoints === null || entrypoints === void 0 ? void 0 : entrypoints.length) ? 1 : 0;
                         }
+                    };
+                    var this_2 = this;
+                    for (var _c = 0, _d = ts.arrayFrom(dependencyNames.keys()); _c < _d.length; _c++) {
+                        var name = _d[_c];
+                        var state_1 = _loop_2(name);
+                        if (typeof state_1 === "object")
+                            return state_1.value;
                     }
                 }
                 if (rootNames === null || rootNames === void 0 ? void 0 : rootNames.length) {
@@ -170227,7 +170244,7 @@ var ts;
                 }
                 project.updateGraph();
                 if (!this.useSingleInferredProject && !project.projectRootPath) {
-                    var _loop_2 = function (inferredProject) {
+                    var _loop_3 = function (inferredProject) {
                         if (inferredProject === project || inferredProject.isOrphan()) {
                             return "continue";
                         }
@@ -170248,7 +170265,7 @@ var ts;
                     // Note that we need to create a copy of the array since the list of project can change
                     for (var _i = 0, _a = this.inferredProjects; _i < _a.length; _i++) {
                         var inferredProject = _a[_i];
-                        _loop_2(inferredProject);
+                        _loop_3(inferredProject);
                     }
                 }
                 return project;
@@ -171189,7 +171206,7 @@ var ts;
                 return projects;
                 function combineProjects(toAddInfo) {
                     if (toAddInfo !== info) {
-                        var _loop_3 = function (project) {
+                        var _loop_4 = function (project) {
                             // Add the projects only if they can use symLink targets and not already in the list
                             if (project.languageServiceEnabled &&
                                 !project.isOrphan() &&
@@ -171206,7 +171223,7 @@ var ts;
                         };
                         for (var _i = 0, _a = toAddInfo.containingProjects; _i < _a.length; _i++) {
                             var project = _a[_i];
-                            _loop_3(project);
+                            _loop_4(project);
                         }
                     }
                 }
@@ -172136,13 +172153,13 @@ var ts;
                 return result;
             };
             ProjectService.prototype.collectChanges = function (lastKnownProjectVersions, currentProjects, includeProjectReferenceRedirectInfo, result) {
-                var _loop_4 = function (proj) {
+                var _loop_5 = function (proj) {
                     var knownProject = ts.find(lastKnownProjectVersions, function (p) { return p.projectName === proj.getProjectName(); });
                     result.push(proj.getChangesSinceVersion(knownProject && knownProject.version, includeProjectReferenceRedirectInfo));
                 };
                 for (var _i = 0, currentProjects_1 = currentProjects; _i < currentProjects_1.length; _i++) {
                     var proj = currentProjects_1[_i];
-                    _loop_4(proj);
+                    _loop_5(proj);
                 }
             };
             /* @internal */
@@ -172282,12 +172299,12 @@ var ts;
                 var excludeRules = [];
                 var normalizedNames = rootFiles.map(function (f) { return ts.normalizeSlashes(f.fileName); });
                 var excludedFiles = [];
-                var _loop_5 = function (name) {
-                    var rule = this_2.safelist[name];
+                var _loop_6 = function (name) {
+                    var rule = this_3.safelist[name];
                     for (var _b = 0, normalizedNames_1 = normalizedNames; _b < normalizedNames_1.length; _b++) {
                         var root = normalizedNames_1[_b];
                         if (rule.match.test(root)) {
-                            this_2.logger.info("Excluding files based on rule " + name + " matching file '" + root + "'");
+                            this_3.logger.info("Excluding files based on rule " + name + " matching file '" + root + "'");
                             // If the file matches, collect its types packages and exclude rules
                             if (rule.types) {
                                 for (var _c = 0, _d = rule.types; _c < _d.length; _c++) {
@@ -172300,7 +172317,7 @@ var ts;
                                 }
                             }
                             if (rule.exclude) {
-                                var _loop_7 = function (exclude) {
+                                var _loop_8 = function (exclude) {
                                     var processedRule = root.replace(rule.match, function () {
                                         var groups = [];
                                         for (var _i = 0; _i < arguments.length; _i++) {
@@ -172327,7 +172344,7 @@ var ts;
                                 };
                                 for (var _e = 0, _f = rule.exclude; _e < _f.length; _e++) {
                                     var exclude = _f[_e];
-                                    _loop_7(exclude);
+                                    _loop_8(exclude);
                                 }
                             }
                             else {
@@ -172340,14 +172357,14 @@ var ts;
                         }
                     }
                 };
-                var this_2 = this;
+                var this_3 = this;
                 for (var _i = 0, _a = Object.keys(this.safelist); _i < _a.length; _i++) {
                     var name = _a[_i];
-                    _loop_5(name);
+                    _loop_6(name);
                 }
                 var excludeRegexes = excludeRules.map(function (e) { return new RegExp(e, "i"); });
                 var filesToKeep = [];
-                var _loop_6 = function (i) {
+                var _loop_7 = function (i) {
                     if (excludeRegexes.some(function (re) { return re.test(normalizedNames[i]); })) {
                         excludedFiles.push(normalizedNames[i]);
                     }
@@ -172358,9 +172375,9 @@ var ts;
                             if (ts.fileExtensionIs(baseName, "js")) {
                                 var inferredTypingName = ts.removeFileExtension(baseName);
                                 var cleanedTypingName = ts.removeMinAndVersionNumbers(inferredTypingName);
-                                var typeName = this_3.legacySafelist.get(cleanedTypingName);
+                                var typeName = this_4.legacySafelist.get(cleanedTypingName);
                                 if (typeName !== undefined) {
-                                    this_3.logger.info("Excluded '" + normalizedNames[i] + "' because it matched " + cleanedTypingName + " from the legacy safelist");
+                                    this_4.logger.info("Excluded '" + normalizedNames[i] + "' because it matched " + cleanedTypingName + " from the legacy safelist");
                                     excludedFiles.push(normalizedNames[i]);
                                     // *exclude* it from the project...
                                     exclude = true;
@@ -172383,9 +172400,9 @@ var ts;
                         }
                     }
                 };
-                var this_3 = this;
+                var this_4 = this;
                 for (var i = 0; i < proj.rootFiles.length; i++) {
-                    _loop_6(i);
+                    _loop_7(i);
                 }
                 proj.rootFiles = filesToKeep;
                 return excludedFiles;
@@ -173039,7 +173056,7 @@ var ts;
                 logger.info("Finding references to " + location.fileName + " position " + location.pos + " in project " + project.getProjectName());
                 var projectOutputs = project.getLanguageService().findReferences(location.fileName, location.pos);
                 if (projectOutputs) {
-                    var _loop_8 = function (referencedSymbol) {
+                    var _loop_9 = function (referencedSymbol) {
                         var mappedDefinitionFile = getMappedLocation(project, documentSpanLocation(referencedSymbol.definition));
                         var definition = mappedDefinitionFile === undefined ?
                             referencedSymbol.definition : __assign(__assign({}, referencedSymbol.definition), { textSpan: ts.createTextSpan(mappedDefinitionFile.pos, referencedSymbol.definition.textSpan.length), fileName: mappedDefinitionFile.fileName, contextSpan: getMappedContextSpan(referencedSymbol.definition, project) });
@@ -173058,7 +173075,7 @@ var ts;
                     };
                     for (var _i = 0, projectOutputs_2 = projectOutputs; _i < projectOutputs_2.length; _i++) {
                         var referencedSymbol = projectOutputs_2[_i];
-                        _loop_8(referencedSymbol);
+                        _loop_9(referencedSymbol);
                     }
                 }
             });

package/lib/tsserverlibrary.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.20220319";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220322";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -128565,7 +128565,7 @@ var ts;
                         packageName = ts.unmangleScopedPackageName(ts.getPackageNameFromTypesPackageName(moduleFile.fileName.substring(topLevelPackageNameIndex + 1, packageRootIndex)));
                         if (ts.startsWith(importingFile, moduleFile.path.substring(0, topLevelNodeModulesIndex))) {
                             var prevDeepestNodeModulesPath = packages.get(packageName);
-                            var nodeModulesPath = moduleFile.fileName.substring(0, topLevelPackageNameIndex);
+                            var nodeModulesPath = moduleFile.fileName.substring(0, topLevelPackageNameIndex + 1);
                             if (prevDeepestNodeModulesPath) {
                                 var prevDeepestNodeModulesIndex = prevDeepestNodeModulesPath.indexOf(ts.nodeModulesPathPart);
                                 if (topLevelNodeModulesIndex > prevDeepestNodeModulesIndex) {
@@ -128736,6 +128736,9 @@ var ts;
         function isNotShadowedByDeeperNodeModulesPackage(info, packageName) {
             if (!packageName || !info.moduleFileName)
                 return true;
+            var typingsCacheLocation = host.getGlobalTypingsCacheLocation();
+            if (typingsCacheLocation && ts.startsWith(info.moduleFileName, typingsCacheLocation))
+                return true;
             var packageDeepestNodeModulesPath = packages.get(packageName);
             return !packageDeepestNodeModulesPath || ts.startsWith(info.moduleFileName, packageDeepestNodeModulesPath);
         }
@@ -128814,6 +128817,7 @@ var ts;
         var cache = ((_b = host.getCachedExportInfoMap) === null || _b === void 0 ? void 0 : _b.call(host)) || createCacheableExportInfoMap({
             getCurrentProgram: function () { return program; },
             getPackageJsonAutoImportProvider: function () { var _a; return (_a = host.getPackageJsonAutoImportProvider) === null || _a === void 0 ? void 0 : _a.call(host); },
+            getGlobalTypingsCacheLocation: function () { var _a; return (_a = host.getGlobalTypingsCacheLocation) === null || _a === void 0 ? void 0 : _a.call(host); },
         });
         if (cache.isUsableByFile(importingFile.path)) {
             (_c = host.log) === null || _c === void 0 ? void 0 : _c.call(host, "getExportInfoMap: cache hit");
@@ -168986,13 +168990,12 @@ var ts;
                 }
                 var dependenciesAdded = 0;
                 if (dependencyNames) {
-                    var symlinkCache = hostProject.getSymlinkCache();
-                    for (var _c = 0, _d = ts.arrayFrom(dependencyNames.keys()); _c < _d.length; _c++) {
-                        var name = _d[_c];
+                    var symlinkCache_1 = hostProject.getSymlinkCache();
+                    var _loop_2 = function (name) {
                         // Avoid creating a large project that would significantly slow down time to editor interactivity
-                        if (dependencySelection === 2 /* Auto */ && dependenciesAdded > this.maxDependencies) {
-                            hostProject.log("AutoImportProviderProject: attempted to add more than " + this.maxDependencies + " dependencies. Aborting.");
-                            return ts.emptyArray;
+                        if (dependencySelection === 2 /* Auto */ && dependenciesAdded > this_2.maxDependencies) {
+                            hostProject.log("AutoImportProviderProject: attempted to add more than " + this_2.maxDependencies + " dependencies. Aborting.");
+                            return { value: ts.emptyArray };
                         }
                         // 1. Try to load from the implementation package. For many dependencies, the
                         //    package.json will exist, but the package will not contain any typings,
@@ -169000,29 +169003,43 @@ var ts;
                         //    is missing altogether, we will move on to trying the @types package (2).
                         var packageJson = ts.resolvePackageNameToPackageJson(name, hostProject.currentDirectory, compilerOptions, moduleResolutionHost, program.getModuleResolutionCache());
                         if (packageJson) {
-                            var entrypoints = getRootNamesFromPackageJson(packageJson, program, symlinkCache);
+                            var entrypoints = getRootNamesFromPackageJson(packageJson, program, symlinkCache_1);
                             if (entrypoints) {
                                 rootNames = ts.concatenate(rootNames, entrypoints);
                                 dependenciesAdded += entrypoints.length ? 1 : 0;
-                                continue;
+                                return "continue";
                             }
                         }
-                        // 2. Try to load from the @types package.
-                        var typesPackageJson = ts.resolvePackageNameToPackageJson("@types/" + name, hostProject.currentDirectory, compilerOptions, moduleResolutionHost, program.getModuleResolutionCache());
-                        if (typesPackageJson) {
-                            var entrypoints = getRootNamesFromPackageJson(typesPackageJson, program, symlinkCache);
-                            rootNames = ts.concatenate(rootNames, entrypoints);
-                            dependenciesAdded += (entrypoints === null || entrypoints === void 0 ? void 0 : entrypoints.length) ? 1 : 0;
-                            continue;
-                        }
+                        // 2. Try to load from the @types package in the tree and in the global
+                        //    typings cache location, if enabled.
+                        var done = ts.forEach([hostProject.currentDirectory, hostProject.getGlobalTypingsCacheLocation()], function (directory) {
+                            if (directory) {
+                                var typesPackageJson = ts.resolvePackageNameToPackageJson("@types/" + name, directory, compilerOptions, moduleResolutionHost, program.getModuleResolutionCache());
+                                if (typesPackageJson) {
+                                    var entrypoints = getRootNamesFromPackageJson(typesPackageJson, program, symlinkCache_1);
+                                    rootNames = ts.concatenate(rootNames, entrypoints);
+                                    dependenciesAdded += (entrypoints === null || entrypoints === void 0 ? void 0 : entrypoints.length) ? 1 : 0;
+                                    return true;
+                                }
+                            }
+                        });
+                        if (done)
+                            return "continue";
                         // 3. If the @types package did not exist and the user has settings that
                         //    allow processing JS from node_modules, go back to the implementation
                         //    package and load the JS.
                         if (packageJson && compilerOptions.allowJs && compilerOptions.maxNodeModuleJsDepth) {
-                            var entrypoints = getRootNamesFromPackageJson(packageJson, program, symlinkCache, /*allowJs*/ true);
+                            var entrypoints = getRootNamesFromPackageJson(packageJson, program, symlinkCache_1, /*allowJs*/ true);
                             rootNames = ts.concatenate(rootNames, entrypoints);
                             dependenciesAdded += (entrypoints === null || entrypoints === void 0 ? void 0 : entrypoints.length) ? 1 : 0;
                         }
+                    };
+                    var this_2 = this;
+                    for (var _c = 0, _d = ts.arrayFrom(dependencyNames.keys()); _c < _d.length; _c++) {
+                        var name = _d[_c];
+                        var state_1 = _loop_2(name);
+                        if (typeof state_1 === "object")
+                            return state_1.value;
                     }
                 }
                 if (rootNames === null || rootNames === void 0 ? void 0 : rootNames.length) {
@@ -170421,7 +170438,7 @@ var ts;
                 }
                 project.updateGraph();
                 if (!this.useSingleInferredProject && !project.projectRootPath) {
-                    var _loop_2 = function (inferredProject) {
+                    var _loop_3 = function (inferredProject) {
                         if (inferredProject === project || inferredProject.isOrphan()) {
                             return "continue";
                         }
@@ -170442,7 +170459,7 @@ var ts;
                     // Note that we need to create a copy of the array since the list of project can change
                     for (var _i = 0, _a = this.inferredProjects; _i < _a.length; _i++) {
                         var inferredProject = _a[_i];
-                        _loop_2(inferredProject);
+                        _loop_3(inferredProject);
                     }
                 }
                 return project;
@@ -171383,7 +171400,7 @@ var ts;
                 return projects;
                 function combineProjects(toAddInfo) {
                     if (toAddInfo !== info) {
-                        var _loop_3 = function (project) {
+                        var _loop_4 = function (project) {
                             // Add the projects only if they can use symLink targets and not already in the list
                             if (project.languageServiceEnabled &&
                                 !project.isOrphan() &&
@@ -171400,7 +171417,7 @@ var ts;
                         };
                         for (var _i = 0, _a = toAddInfo.containingProjects; _i < _a.length; _i++) {
                             var project = _a[_i];
-                            _loop_3(project);
+                            _loop_4(project);
                         }
                     }
                 }
@@ -172330,13 +172347,13 @@ var ts;
                 return result;
             };
             ProjectService.prototype.collectChanges = function (lastKnownProjectVersions, currentProjects, includeProjectReferenceRedirectInfo, result) {
-                var _loop_4 = function (proj) {
+                var _loop_5 = function (proj) {
                     var knownProject = ts.find(lastKnownProjectVersions, function (p) { return p.projectName === proj.getProjectName(); });
                     result.push(proj.getChangesSinceVersion(knownProject && knownProject.version, includeProjectReferenceRedirectInfo));
                 };
                 for (var _i = 0, currentProjects_1 = currentProjects; _i < currentProjects_1.length; _i++) {
                     var proj = currentProjects_1[_i];
-                    _loop_4(proj);
+                    _loop_5(proj);
                 }
             };
             /* @internal */
@@ -172476,12 +172493,12 @@ var ts;
                 var excludeRules = [];
                 var normalizedNames = rootFiles.map(function (f) { return ts.normalizeSlashes(f.fileName); });
                 var excludedFiles = [];
-                var _loop_5 = function (name) {
-                    var rule = this_2.safelist[name];
+                var _loop_6 = function (name) {
+                    var rule = this_3.safelist[name];
                     for (var _b = 0, normalizedNames_1 = normalizedNames; _b < normalizedNames_1.length; _b++) {
                         var root = normalizedNames_1[_b];
                         if (rule.match.test(root)) {
-                            this_2.logger.info("Excluding files based on rule " + name + " matching file '" + root + "'");
+                            this_3.logger.info("Excluding files based on rule " + name + " matching file '" + root + "'");
                             // If the file matches, collect its types packages and exclude rules
                             if (rule.types) {
                                 for (var _c = 0, _d = rule.types; _c < _d.length; _c++) {
@@ -172494,7 +172511,7 @@ var ts;
                                 }
                             }
                             if (rule.exclude) {
-                                var _loop_7 = function (exclude) {
+                                var _loop_8 = function (exclude) {
                                     var processedRule = root.replace(rule.match, function () {
                                         var groups = [];
                                         for (var _i = 0; _i < arguments.length; _i++) {
@@ -172521,7 +172538,7 @@ var ts;
                                 };
                                 for (var _e = 0, _f = rule.exclude; _e < _f.length; _e++) {
                                     var exclude = _f[_e];
-                                    _loop_7(exclude);
+                                    _loop_8(exclude);
                                 }
                             }
                             else {
@@ -172534,14 +172551,14 @@ var ts;
                         }
                     }
                 };
-                var this_2 = this;
+                var this_3 = this;
                 for (var _i = 0, _a = Object.keys(this.safelist); _i < _a.length; _i++) {
                     var name = _a[_i];
-                    _loop_5(name);
+                    _loop_6(name);
                 }
                 var excludeRegexes = excludeRules.map(function (e) { return new RegExp(e, "i"); });
                 var filesToKeep = [];
-                var _loop_6 = function (i) {
+                var _loop_7 = function (i) {
                     if (excludeRegexes.some(function (re) { return re.test(normalizedNames[i]); })) {
                         excludedFiles.push(normalizedNames[i]);
                     }
@@ -172552,9 +172569,9 @@ var ts;
                             if (ts.fileExtensionIs(baseName, "js")) {
                                 var inferredTypingName = ts.removeFileExtension(baseName);
                                 var cleanedTypingName = ts.removeMinAndVersionNumbers(inferredTypingName);
-                                var typeName = this_3.legacySafelist.get(cleanedTypingName);
+                                var typeName = this_4.legacySafelist.get(cleanedTypingName);
                                 if (typeName !== undefined) {
-                                    this_3.logger.info("Excluded '" + normalizedNames[i] + "' because it matched " + cleanedTypingName + " from the legacy safelist");
+                                    this_4.logger.info("Excluded '" + normalizedNames[i] + "' because it matched " + cleanedTypingName + " from the legacy safelist");
                                     excludedFiles.push(normalizedNames[i]);
                                     // *exclude* it from the project...
                                     exclude = true;
@@ -172577,9 +172594,9 @@ var ts;
                         }
                     }
                 };
-                var this_3 = this;
+                var this_4 = this;
                 for (var i = 0; i < proj.rootFiles.length; i++) {
-                    _loop_6(i);
+                    _loop_7(i);
                 }
                 proj.rootFiles = filesToKeep;
                 return excludedFiles;
@@ -173233,7 +173250,7 @@ var ts;
                 logger.info("Finding references to " + location.fileName + " position " + location.pos + " in project " + project.getProjectName());
                 var projectOutputs = project.getLanguageService().findReferences(location.fileName, location.pos);
                 if (projectOutputs) {
-                    var _loop_8 = function (referencedSymbol) {
+                    var _loop_9 = function (referencedSymbol) {
                         var mappedDefinitionFile = getMappedLocation(project, documentSpanLocation(referencedSymbol.definition));
                         var definition = mappedDefinitionFile === undefined ?
                             referencedSymbol.definition : __assign(__assign({}, referencedSymbol.definition), { textSpan: ts.createTextSpan(mappedDefinitionFile.pos, referencedSymbol.definition.textSpan.length), fileName: mappedDefinitionFile.fileName, contextSpan: getMappedContextSpan(referencedSymbol.definition, project) });
@@ -173252,7 +173269,7 @@ var ts;
                     };
                     for (var _i = 0, projectOutputs_2 = projectOutputs; _i < projectOutputs_2.length; _i++) {
                         var referencedSymbol = projectOutputs_2[_i];
-                        _loop_8(referencedSymbol);
+                        _loop_9(referencedSymbol);
                     }
                 }
             });

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-dev.20220319";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220322";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -128565,7 +128565,7 @@ var ts;
                         packageName = ts.unmangleScopedPackageName(ts.getPackageNameFromTypesPackageName(moduleFile.fileName.substring(topLevelPackageNameIndex + 1, packageRootIndex)));
                         if (ts.startsWith(importingFile, moduleFile.path.substring(0, topLevelNodeModulesIndex))) {
                             var prevDeepestNodeModulesPath = packages.get(packageName);
-                            var nodeModulesPath = moduleFile.fileName.substring(0, topLevelPackageNameIndex);
+                            var nodeModulesPath = moduleFile.fileName.substring(0, topLevelPackageNameIndex + 1);
                             if (prevDeepestNodeModulesPath) {
                                 var prevDeepestNodeModulesIndex = prevDeepestNodeModulesPath.indexOf(ts.nodeModulesPathPart);
                                 if (topLevelNodeModulesIndex > prevDeepestNodeModulesIndex) {
@@ -128736,6 +128736,9 @@ var ts;
         function isNotShadowedByDeeperNodeModulesPackage(info, packageName) {
             if (!packageName || !info.moduleFileName)
                 return true;
+            var typingsCacheLocation = host.getGlobalTypingsCacheLocation();
+            if (typingsCacheLocation && ts.startsWith(info.moduleFileName, typingsCacheLocation))
+                return true;
             var packageDeepestNodeModulesPath = packages.get(packageName);
             return !packageDeepestNodeModulesPath || ts.startsWith(info.moduleFileName, packageDeepestNodeModulesPath);
         }
@@ -128814,6 +128817,7 @@ var ts;
         var cache = ((_b = host.getCachedExportInfoMap) === null || _b === void 0 ? void 0 : _b.call(host)) || createCacheableExportInfoMap({
             getCurrentProgram: function () { return program; },
             getPackageJsonAutoImportProvider: function () { var _a; return (_a = host.getPackageJsonAutoImportProvider) === null || _a === void 0 ? void 0 : _a.call(host); },
+            getGlobalTypingsCacheLocation: function () { var _a; return (_a = host.getGlobalTypingsCacheLocation) === null || _a === void 0 ? void 0 : _a.call(host); },
         });
         if (cache.isUsableByFile(importingFile.path)) {
             (_c = host.log) === null || _c === void 0 ? void 0 : _c.call(host, "getExportInfoMap: cache hit");

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.20220319";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220322";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -128565,7 +128565,7 @@ var ts;
                         packageName = ts.unmangleScopedPackageName(ts.getPackageNameFromTypesPackageName(moduleFile.fileName.substring(topLevelPackageNameIndex + 1, packageRootIndex)));
                         if (ts.startsWith(importingFile, moduleFile.path.substring(0, topLevelNodeModulesIndex))) {
                             var prevDeepestNodeModulesPath = packages.get(packageName);
-                            var nodeModulesPath = moduleFile.fileName.substring(0, topLevelPackageNameIndex);
+                            var nodeModulesPath = moduleFile.fileName.substring(0, topLevelPackageNameIndex + 1);
                             if (prevDeepestNodeModulesPath) {
                                 var prevDeepestNodeModulesIndex = prevDeepestNodeModulesPath.indexOf(ts.nodeModulesPathPart);
                                 if (topLevelNodeModulesIndex > prevDeepestNodeModulesIndex) {
@@ -128736,6 +128736,9 @@ var ts;
         function isNotShadowedByDeeperNodeModulesPackage(info, packageName) {
             if (!packageName || !info.moduleFileName)
                 return true;
+            var typingsCacheLocation = host.getGlobalTypingsCacheLocation();
+            if (typingsCacheLocation && ts.startsWith(info.moduleFileName, typingsCacheLocation))
+                return true;
             var packageDeepestNodeModulesPath = packages.get(packageName);
             return !packageDeepestNodeModulesPath || ts.startsWith(info.moduleFileName, packageDeepestNodeModulesPath);
         }
@@ -128814,6 +128817,7 @@ var ts;
         var cache = ((_b = host.getCachedExportInfoMap) === null || _b === void 0 ? void 0 : _b.call(host)) || createCacheableExportInfoMap({
             getCurrentProgram: function () { return program; },
             getPackageJsonAutoImportProvider: function () { var _a; return (_a = host.getPackageJsonAutoImportProvider) === null || _a === void 0 ? void 0 : _a.call(host); },
+            getGlobalTypingsCacheLocation: function () { var _a; return (_a = host.getGlobalTypingsCacheLocation) === null || _a === void 0 ? void 0 : _a.call(host); },
         });
         if (cache.isUsableByFile(importingFile.path)) {
             (_c = host.log) === null || _c === void 0 ? void 0 : _c.call(host, "getExportInfoMap: cache hit");

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.20220319";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220322";
     /* @internal */
     var Comparison;
     (function (Comparison) {