For now make sure module resolution cache usage doesnt go past progra…

…m creation
microsoft · Oct 25, 2023 · a0f7406 · a0f7406
1 parent 64aee47
commit a0f7406
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 14 deletions.
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -785,9 +785,9 @@ export function resolvePackageNameToPackageJson(
     containingDirectory: string,
     options: CompilerOptions,
     host: ModuleResolutionHost,
-    cache: ModuleResolutionCache | undefined,
+    cache: PackageJsonInfoCache | undefined,
 ): PackageJsonInfo | undefined {
-    const moduleResolutionState = getTemporaryModuleResolutionState(cache?.getPackageJsonInfoCache(), host, options);
+    const moduleResolutionState = getTemporaryModuleResolutionState(cache, host, options);
 
     return forEachAncestorDirectory(containingDirectory, ancestorDirectory => {
         if (getBaseFileName(ancestorDirectory) !== "node_modules") {
@@ -2198,7 +2198,7 @@ export function getEntrypointsFromPackageJsonInfo(
     packageJsonInfo: PackageJsonInfo,
     options: CompilerOptions,
     host: GetPackageJsonEntrypointsHost,
-    cache: ModuleResolutionCache | undefined,
+    cache: PackageJsonInfoCache | undefined,
     resolveJs?: boolean,
 ): string[] | false {
     if (!resolveJs && packageJsonInfo.contents.resolvedEntrypoints !== undefined) {
@@ -2210,7 +2210,7 @@ export function getEntrypointsFromPackageJsonInfo(
     let entrypoints: string[] | undefined;
     const extensions = Extensions.TypeScript | Extensions.Declaration | (resolveJs ? Extensions.JavaScript : 0);
     const features = getNodeResolutionFeatures(options);
-    const loadPackageJsonMainState = getTemporaryModuleResolutionState(cache?.getPackageJsonInfoCache(), host, options);
+    const loadPackageJsonMainState = getTemporaryModuleResolutionState(cache, host, options);
     loadPackageJsonMainState.conditions = getConditions(options);
     loadPackageJsonMainState.requestContainingDirectory = packageJsonInfo.packageDirectory;
     const mainResolution = loadNodeModuleFromDirectoryWorker(

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1869,14 +1869,16 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
     resolvedLibProcessing = undefined;
     resolvedModulesProcessing = undefined;
     resolvedTypeReferenceDirectiveNamesProcessing = undefined;
+    const packageJsonCache = moduleResolutionCache?.getPackageJsonInfoCache();
+    moduleResolutionCache = undefined;
 
     const program: Program = {
         getRootFileNames: () => rootNames,
         getSourceFile,
         getSourceFileByPath,
         getSourceFiles: () => files,
         getMissingFilePaths: () => missingFilePaths!, // TODO: GH#18217
-        getModuleResolutionCache: () => moduleResolutionCache,
+        getPackageJsonInfoCache: () => packageJsonCache,
         getFilesByNameMap: () => filesByName,
         getCompilerOptions: () => options,
         getSyntacticDiagnostics,

diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -4666,7 +4666,7 @@ export interface Program extends ScriptReferenceHost {
      */
     getMissingFilePaths(): readonly Path[];
     /** @internal */
-    getModuleResolutionCache(): ModuleResolutionCache | undefined;
+    getPackageJsonInfoCache(): PackageJsonInfoCache | undefined;
     /** @internal */
     getFilesByNameMap(): Map<string, SourceFile | false | undefined>;
 

diff --git a/src/server/project.ts b/src/server/project.ts
@@ -832,6 +832,11 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
         return this.resolutionCache.getModuleResolutionCache();
     }
 
+    /** @internal */
+    getPackageJsonInfoCache() {
+        return this.resolutionCache.getModuleResolutionCache().getPackageJsonInfoCache();
+    }
+
     /** @internal */
     resolveTypeReferenceDirectiveReferences<T extends string | FileReference>(
         typeDirectiveReferences: readonly T[],
@@ -2624,7 +2629,7 @@ export class AutoImportProviderProject extends Project {
                     hostProject.currentDirectory,
                     compilerOptions,
                     host,
-                    program.getModuleResolutionCache(),
+                    program.getPackageJsonInfoCache(),
                 );
                 if (packageJson) {
                     const entrypoints = getRootNamesFromPackageJson(packageJson, program, symlinkCache);
@@ -2644,7 +2649,7 @@ export class AutoImportProviderProject extends Project {
                             directory,
                             compilerOptions,
                             host,
-                            program.getModuleResolutionCache(),
+                            program.getPackageJsonInfoCache(),
                         );
                         if (typesPackageJson) {
                             const entrypoints = getRootNamesFromPackageJson(typesPackageJson, program, symlinkCache);
@@ -2684,7 +2689,7 @@ export class AutoImportProviderProject extends Project {
                 packageJson,
                 compilerOptions,
                 host,
-                program.getModuleResolutionCache(),
+                program.getPackageJsonInfoCache(),
                 resolveJs,
             );
             if (entrypoints) {
@@ -2835,8 +2840,8 @@ export class AutoImportProviderProject extends Project {
     }
 
     /** @internal */
-    override getModuleResolutionCache() {
-        return this.hostProject.getCurrentProgram()?.getModuleResolutionCache();
+    override getPackageJsonInfoCache() {
+        return this.hostProject.getPackageJsonInfoCache();
     }
 }
 

diff --git a/src/server/session.ts b/src/server/session.ts
@@ -1594,7 +1594,7 @@ export class Session<TMessage = string> implements EventSender {
             if (nodeModulesPathParts && fileName.lastIndexOf(nodeModulesPathPart) === nodeModulesPathParts.topLevelNodeModulesIndex) {
                 // Second check ensures the fileName only contains one `/node_modules/`. If there's more than one I give up.
                 const packageDirectory = fileName.substring(0, nodeModulesPathParts.packageRootIndex);
-                const packageJsonCache = project.getModuleResolutionCache()?.getPackageJsonInfoCache();
+                const packageJsonCache = project.getPackageJsonInfoCache();
                 const compilerOptions = project.getCompilationSettings();
                 const packageJson = getPackageScopeForPath(getNormalizedAbsolutePath(packageDirectory + "/package.json", project.getCurrentDirectory()), getTemporaryModuleResolutionState(packageJsonCache, project, compilerOptions));
                 if (!packageJson) return undefined;
@@ -1605,7 +1605,7 @@ export class Session<TMessage = string> implements EventSender {
                     packageJson,
                     { moduleResolution: ModuleResolutionKind.Node10 },
                     project,
-                    project.getModuleResolutionCache(),
+                    packageJsonCache,
                 );
                 // This substring is correct only because we checked for a single `/node_modules/` at the top.
                 const packageNamePathPart = fileName.substring(

diff --git a/src/services/utilities.ts b/src/services/utilities.ts
@@ -2463,7 +2463,7 @@ export function createModuleSpecifierResolutionHost(program: Program, host: Lang
         useCaseSensitiveFileNames: maybeBind(host, host.useCaseSensitiveFileNames),
         getSymlinkCache: maybeBind(host, host.getSymlinkCache) || program.getSymlinkCache,
         getModuleSpecifierCache: maybeBind(host, host.getModuleSpecifierCache),
-        getPackageJsonInfoCache: () => program.getModuleResolutionCache()?.getPackageJsonInfoCache(),
+        getPackageJsonInfoCache: () => program.getPackageJsonInfoCache(),
         getGlobalTypingsCacheLocation: maybeBind(host, host.getGlobalTypingsCacheLocation),
         redirectTargetsMap: program.redirectTargetsMap,
         getProjectReferenceRedirect: fileName => program.getProjectReferenceRedirect(fileName),