Skip to content

Commit

Permalink
Resolutions cache stays for lifetime..
Browse files Browse the repository at this point in the history 
But when do we gc Resolution caches esp for non relative names etc?
Also TODO:: handle change in module reosolution options
Postpone stopping watching resolutions as they can still be shared from different file
  • Loading branch information
@sheetalkamat
sheetalkamat committed Nov 13, 2023
1 parent 6b9f7c0 commit 6fe87d6
Show file tree
Hide file tree
Showing 8 changed files with 96 additions and 110 deletions.
61 changes: 49 additions & 12 deletions src/compiler/moduleNameResolver.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ import {
hasProperty,
hasTrailingDirectorySeparator,
hostGetCanonicalFileName,
identity,
inferredTypesContainingFile,
isArray,
isDeclarationFileName,
Expand Down Expand Up @@ -1056,6 +1057,7 @@ function createPerDirectoryResolutionCache<T>(
getCanonicalFileName: GetCanonicalFileName,
options: CompilerOptions | undefined,
optionsToRedirectsKey: Map<CompilerOptions, RedirectsCacheKey>,
getValidResolution: (resolution: T | undefined) => T | undefined,
): PerDirectoryResolutionCache<T> {
const directoryToModuleNameMap = createCacheWithRedirects<Path, ModeAwareCache<T>>(options, optionsToRedirectsKey);
return {
Expand All @@ -1081,7 +1083,7 @@ function createPerDirectoryResolutionCache<T>(

function getFromDirectoryCache(name: string, mode: ResolutionMode, directoryName: string, redirectedReference: ResolvedProjectReference | undefined) {
const path = toPath(directoryName, currentDirectory, getCanonicalFileName);
return directoryToModuleNameMap.getMapOfCacheRedirects(redirectedReference)?.get(path)?.get(name, mode);
return getValidResolution(directoryToModuleNameMap.getMapOfCacheRedirects(redirectedReference)?.get(path)?.get(name, mode));
}
}

Expand Down Expand Up @@ -1145,6 +1147,7 @@ function createNonRelativeNameResolutionCache<T>(
options: CompilerOptions | undefined,
getResolvedFileName: (result: T) => string | undefined,
optionsToRedirectsKey: Map<CompilerOptions, RedirectsCacheKey>,
getValidResolution: (resolution: T | undefined) => T | undefined,
): NonRelativeNameResolutionCache<T> {
const moduleNameToDirectoryMap = createCacheWithRedirects<ModeAwareCacheKey, PerNonRelativeNameCache<T>>(options, optionsToRedirectsKey);
return {
Expand All @@ -1164,12 +1167,19 @@ function createNonRelativeNameResolutionCache<T>(

function getFromNonRelativeNameCache(nonRelativeModuleName: string, mode: ResolutionMode, directoryName: string, redirectedReference?: ResolvedProjectReference): T | undefined {
Debug.assert(!isExternalModuleNameRelative(nonRelativeModuleName));
return moduleNameToDirectoryMap.getMapOfCacheRedirects(redirectedReference)?.get(createModeAwareCacheKey(nonRelativeModuleName, mode))?.get(directoryName);
return moduleNameToDirectoryMap.getMapOfCacheRedirects(redirectedReference)?.get(
createModeAwareCacheKey(nonRelativeModuleName, mode),
)?.get(directoryName);
}

function getOrCreateCacheForNonRelativeName(nonRelativeModuleName: string, mode: ResolutionMode, redirectedReference?: ResolvedProjectReference): PerNonRelativeNameCache<T> {
Debug.assert(!isExternalModuleNameRelative(nonRelativeModuleName));
return getOrCreateCache(moduleNameToDirectoryMap, redirectedReference, createModeAwareCacheKey(nonRelativeModuleName, mode), createPerModuleNameCache);
return getOrCreateCache(
moduleNameToDirectoryMap,
redirectedReference,
createModeAwareCacheKey(nonRelativeModuleName, mode),
createPerModuleNameCache,
);
}

function createPerModuleNameCache(): PerNonRelativeNameCache<T> {
Expand All @@ -1178,7 +1188,11 @@ function createNonRelativeNameResolutionCache<T>(
return { get, set };

function get(directory: string): T | undefined {
return directoryPathMap.get(toPath(directory, currentDirectory, getCanonicalFileName));
return getByPath(toPath(directory, currentDirectory, getCanonicalFileName));
}

function getByPath(directoryPath: Path): T | undefined {
return getValidResolution(directoryPathMap.get(directoryPath));
}

/**
Expand All @@ -1195,32 +1209,45 @@ function createNonRelativeNameResolutionCache<T>(
function set(directory: string, result: T): void {
const path = toPath(directory, currentDirectory, getCanonicalFileName);
// if entry is already in cache do nothing
if (directoryPathMap.has(path)) {
if (getByPath(path)) {
return;
}

const existing = directoryPathMap.get(path);
// Remove invalidated result from parent
if (existing) {
const existingCommonPrefix = getCommonPrefix(path, existing);
withCommonPrefix(path, existingCommonPrefix, parent => directoryPathMap.delete(parent));
}

directoryPathMap.set(path, result);

const resolvedFileName = getResolvedFileName(result);
// find common prefix between directory and resolved file name
// this common prefix should be the shortest path that has the same resolution
// directory: /a/b/c/d/e
// resolvedFileName: /a/b/foo.d.ts
// commonPrefix: /a/b
// for failed lookups cache the result for every directory up to root
const commonPrefix = resolvedFileName && getCommonPrefix(path, resolvedFileName);
const commonPrefix = getCommonPrefix(path, result);
withCommonPrefix(path, commonPrefix, parent => directoryPathMap.set(parent, result));
}

function withCommonPrefix(path: Path, commonPrefix: Path | undefined, action: (parent: Path) => void) {
let current = path;
while (current !== commonPrefix) {
const parent = getDirectoryPath(current);
if (parent === current || directoryPathMap.has(parent)) {
if (parent === current || getByPath(parent)) {
break;
}
directoryPathMap.set(parent, result);
action(parent);
current = parent;
}
}

function getCommonPrefix(directory: Path, resolution: string) {
const resolutionDirectory = toPath(getDirectoryPath(resolution), currentDirectory, getCanonicalFileName);
function getCommonPrefix(directory: Path, resolution: T) {
const resolvedFileName = getResolvedFileName(resolution);
if (!resolvedFileName) return undefined;
const resolutionDirectory = toPath(getDirectoryPath(resolvedFileName), currentDirectory, getCanonicalFileName);

// find first position where directory and resolution differs
let i = 0;
Expand All @@ -1239,7 +1266,7 @@ function createNonRelativeNameResolutionCache<T>(
if (sep === -1) {
return undefined;
}
return directory.substr(0, Math.max(sep, rootLength));
return directory.substr(0, Math.max(sep, rootLength)) as Path;
}
}
}
Expand All @@ -1256,20 +1283,24 @@ function createModuleOrTypeReferenceResolutionCache<T>(
packageJsonInfoCache: PackageJsonInfoCache | undefined,
getResolvedFileName: (result: T) => string | undefined,
optionsToRedirectsKey: Map<CompilerOptions, RedirectsCacheKey> | undefined,
getValidResolution: ((resolution: T | undefined) => T | undefined) | undefined,
): ModuleOrTypeReferenceResolutionCache<T> {
optionsToRedirectsKey ??= new Map();
getValidResolution ??= identity;
const perDirectoryResolutionCache = createPerDirectoryResolutionCache<T>(
currentDirectory,
getCanonicalFileName,
options,
optionsToRedirectsKey,
getValidResolution,
);
const nonRelativeNameResolutionCache = createNonRelativeNameResolutionCache(
currentDirectory,
getCanonicalFileName,
options,
getResolvedFileName,
optionsToRedirectsKey,
getValidResolution,
);
packageJsonInfoCache ??= createPackageJsonInfoCache(currentDirectory, getCanonicalFileName);

Expand Down Expand Up @@ -1313,13 +1344,15 @@ export function createModuleResolutionCache(
options?: CompilerOptions,
packageJsonInfoCache?: PackageJsonInfoCache,
optionsToRedirectsKey?: Map<CompilerOptions, RedirectsCacheKey>,
getValidResolution?: (resolution: ResolvedModuleWithFailedLookupLocations | undefined) => ResolvedModuleWithFailedLookupLocations | undefined,
): ModuleResolutionCache;
export function createModuleResolutionCache(
currentDirectory: string,
getCanonicalFileName: (s: string) => string,
options?: CompilerOptions,
packageJsonInfoCache?: PackageJsonInfoCache,
optionsToRedirectsKey?: Map<CompilerOptions, RedirectsCacheKey>,
getValidResolution?: (resolution: ResolvedModuleWithFailedLookupLocations | undefined) => ResolvedModuleWithFailedLookupLocations | undefined,
): ModuleResolutionCache {
const result = createModuleOrTypeReferenceResolutionCache(
currentDirectory,
Expand All @@ -1328,6 +1361,7 @@ export function createModuleResolutionCache(
packageJsonInfoCache,
getOriginalOrResolvedModuleFileName,
optionsToRedirectsKey,
getValidResolution,
) as ModuleResolutionCache;
result.getOrCreateCacheForModuleName = (nonRelativeName, mode, redirectedReference) => result.getOrCreateCacheForNonRelativeName(nonRelativeName, mode, redirectedReference);
return result;
Expand All @@ -1346,13 +1380,15 @@ export function createTypeReferenceDirectiveResolutionCache(
options?: CompilerOptions,
packageJsonInfoCache?: PackageJsonInfoCache,
optionsToRedirectsKey?: Map<CompilerOptions, RedirectsCacheKey>,
getValidResolution?: (resolution: ResolvedTypeReferenceDirectiveWithFailedLookupLocations | undefined) => ResolvedTypeReferenceDirectiveWithFailedLookupLocations | undefined,
): TypeReferenceDirectiveResolutionCache;
export function createTypeReferenceDirectiveResolutionCache(
currentDirectory: string,
getCanonicalFileName: (s: string) => string,
options?: CompilerOptions,
packageJsonInfoCache?: PackageJsonInfoCache,
optionsToRedirectsKey?: Map<CompilerOptions, RedirectsCacheKey>,
getValidResolution?: (resolution: ResolvedTypeReferenceDirectiveWithFailedLookupLocations | undefined) => ResolvedTypeReferenceDirectiveWithFailedLookupLocations | undefined,
): TypeReferenceDirectiveResolutionCache {
return createModuleOrTypeReferenceResolutionCache(
currentDirectory,
Expand All @@ -1361,6 +1397,7 @@ export function createTypeReferenceDirectiveResolutionCache(
packageJsonInfoCache,
getOriginalOrResolvedTypeReferenceFileName,
optionsToRedirectsKey,
getValidResolution,
);
}

Expand Down
3 changes: 1 addition & 2 deletions src/compiler/program.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,6 @@ import {
removeSuffix,
resolutionExtensionIsTSOrJson,
ResolutionMode,
ResolutionWithFailedLookupLocations,
resolveConfigFileProjectName,
ResolvedConfigFileName,
ResolvedModuleFull,
Expand Down Expand Up @@ -4063,7 +4062,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
resolveModuleNamesReusingOldState(moduleNames, file);
Debug.assert(resolutions.length === moduleNames.length);
const optionsForFile = (useSourceOfProjectReferenceRedirect ? getRedirectReferenceForResolution(file)?.commandLine.options : undefined) || options;
const resolutionsInFile = createModeAwareCache<ResolutionWithFailedLookupLocations>();
const resolutionsInFile = createModeAwareCache<ResolvedModuleWithFailedLookupLocations>();
(resolvedModules ??= new Map()).set(file.path, resolutionsInFile);
for (let index = 0; index < moduleNames.length; index++) {
const resolution = resolutions[index].resolvedModule;
Expand Down
Loading

0 comments on commit 6fe87d6

Please sign in to comment.