Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix incorrect mode calculation in typereference resolution #60049

Merged
merged 1 commit into from
Sep 24, 2024
Merged

Fix incorrect mode calculation in typereference resolution #60049

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions src/compiler/program.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2120,7 +2120,11 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
}

function getResolvedTypeReferenceDirectiveFromTypeReferenceDirective(typeRef: FileReference, sourceFile: SourceFile) {
return getResolvedTypeReferenceDirective(sourceFile, typeRef.fileName, typeRef.resolutionMode || sourceFile.impliedNodeFormat);
return getResolvedTypeReferenceDirective(
sourceFile,
typeRef.fileName,
getModeForTypeReferenceDirectiveInFile(typeRef, sourceFile),
);
}

function forEachResolvedModule(
Expand Down Expand Up @@ -2648,11 +2652,12 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
const moduleNames = getModuleNames(newSourceFile);
const resolutions = resolveModuleNamesReusingOldState(moduleNames, newSourceFile);
(resolvedModulesProcessing ??= new Map()).set(newSourceFile.path, resolutions);
const optionsForFile = getCompilerOptionsForFile(newSourceFile);
// ensure that module resolution results are still correct
const resolutionsChanged = hasChangesInResolutions(
moduleNames,
resolutions,
name => oldProgram.getResolvedModule(newSourceFile, name.text, getModeForUsageLocation(newSourceFile, name)),
name => oldProgram.getResolvedModule(newSourceFile, name.text, getModeForUsageLocationWorker(newSourceFile, name, optionsForFile)),
moduleResolutionIsEqualTo,
);
if (resolutionsChanged) structureIsReused = StructureIsReused.SafeModules;
Expand All @@ -2663,7 +2668,12 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
const typeReferenceResolutionsChanged = hasChangesInResolutions(
typesReferenceDirectives,
typeReferenceResolutions,
name => oldProgram.getResolvedTypeReferenceDirective(newSourceFile, getTypeReferenceResolutionName(name), getModeForFileReference(name, newSourceFile.impliedNodeFormat)),
name =>
oldProgram.getResolvedTypeReferenceDirective(
newSourceFile,
getTypeReferenceResolutionName(name),
getModeForTypeReferenceDirectiveInFile(name, newSourceFile),
),
typeDirectiveIsEqualTo,
);
if (typeReferenceResolutionsChanged) structureIsReused = StructureIsReused.SafeModules;
Expand Down Expand Up @@ -4044,8 +4054,8 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
const resolvedTypeReferenceDirective = resolutions[index];
// store resolved type directive on the file
const fileName = ref.fileName;
resolutionsInFile.set(fileName, getModeForFileReference(ref, file.impliedNodeFormat), resolvedTypeReferenceDirective);
const mode = ref.resolutionMode || getDefaultResolutionModeForFile(file);
const mode = getModeForTypeReferenceDirectiveInFile(ref, file);
resolutionsInFile.set(fileName, mode, resolvedTypeReferenceDirective);
processTypeReferenceDirective(fileName, mode, resolvedTypeReferenceDirective, { kind: FileIncludeKind.TypeReferenceDirective, file: file.path, index });
}
}
Expand Down Expand Up @@ -5224,6 +5234,10 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
function shouldTransformImportCall(sourceFile: SourceFile): boolean {
return shouldTransformImportCallWorker(sourceFile, getCompilerOptionsForFile(sourceFile));
}

function getModeForTypeReferenceDirectiveInFile(ref: FileReference, sourceFile: SourceFile) {
return ref.resolutionMode || getDefaultResolutionModeForFile(sourceFile);
}
}

function shouldTransformImportCallWorker(sourceFile: Pick<SourceFile, "fileName" | "impliedNodeFormat" | "packageJsonScope">, options: CompilerOptions): boolean {
Expand Down