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

Set impliedNodeFormat based on redirectedReference options #60039

Draft
wants to merge 19 commits into
base: main
Choose a base branch
from
Draft

Set impliedNodeFormat based on redirectedReference options #60039

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
daad420
Add failing test
andrewbranch Sep 23, 2024
5a97e07
Set impliedNodeFormat based on redirectedReference options
andrewbranch Sep 23, 2024
6badddc
Use traceResolution setting of current project, not referenced project
andrewbranch Sep 23, 2024
a01b643
Merge branch 'main' into bug/57553
andrewbranch Sep 23, 2024
15a114f
Update baseline
andrewbranch Sep 23, 2024
100f939
Add failing test
andrewbranch Sep 23, 2024
8ba691a
Always set impliedNodeFormat on source files, filter when looking it up
andrewbranch Sep 24, 2024
778b288
Add trace baselines
andrewbranch Sep 24, 2024
632e498
Add unit test / fourslash server baselines
andrewbranch Sep 24, 2024
fd13d3b
Update compiler tests/baselines
andrewbranch Sep 24, 2024
6951b0b
Update unit test assertions
andrewbranch Sep 24, 2024
c0afec1
moduleResolution no longer affects SourceFile, I think
andrewbranch Sep 24, 2024
56c9473
Merge branch 'main' into bug/57553
andrewbranch Sep 24, 2024
e19fe20
Update API baseline
andrewbranch Sep 24, 2024
5c07256
Add extra test case for a weird situation with symlinks and potential…
Andarist Sep 26, 2024
5457461
Merge branch 'main' into bug/57553
andrewbranch Oct 17, 2024
80fd886
Merge pull request #3 from Andarist/add-extra-test-around-implied-nod…
andrewbranch Oct 23, 2024
ac24ab7
Merge remote-tracking branch 'origin/main' into bug/57553-resolve-con…
Andarist Dec 3, 2024
1325ee2
Merge pull request #5 from Andarist/bug/57553-resolve-conflicts
andrewbranch Dec 3, 2024
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
36 changes: 17 additions & 19 deletions src/compiler/program.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2504,7 +2504,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
const seenPackageNames = new Map<string, SeenPackageName>();

for (const oldSourceFile of oldSourceFiles) {
const sourceFileOptions = getCreateSourceFileOptions(oldSourceFile.fileName, moduleResolutionCache, host, options);
const sourceFileOptions = getCreateSourceFileOptions(oldSourceFile.fileName, moduleResolutionCache, host, options, oldProgram.getResolvedProjectReferenceToRedirect(oldSourceFile.fileName));
andrewbranch marked this conversation as resolved.
Show resolved Hide resolved
let newSourceFile = host.getSourceFileByPath
? host.getSourceFileByPath(oldSourceFile.fileName, oldSourceFile.resolvedPath, sourceFileOptions, /*onError*/ undefined, shouldCreateNewSourceFile)
: host.getSourceFile(oldSourceFile.fileName, sourceFileOptions, /*onError*/ undefined, shouldCreateNewSourceFile); // TODO: GH#18217
Expand Down Expand Up @@ -3705,11 +3705,11 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
return result;
}

function getCreateSourceFileOptions(fileName: string, moduleResolutionCache: ModuleResolutionCache | undefined, host: CompilerHost, options: CompilerOptions): CreateSourceFileOptions {
function getCreateSourceFileOptions(fileName: string, moduleResolutionCache: ModuleResolutionCache | undefined, host: CompilerHost, options: CompilerOptions, redirectedReference: ResolvedProjectReference | undefined): CreateSourceFileOptions {
// It's a _little odd_ that we can't set `impliedNodeFormat` until the program step - but it's the first and only time we have a resolution cache
// and a freshly made source file node on hand at the same time, and we need both to set the field. Persisting the resolution cache all the way
// to the check and emit steps would be bad - so we much prefer detecting and storing the format information on the source file node upfront.
const result = getImpliedNodeFormatForFileWorker(getNormalizedAbsolutePath(fileName, currentDirectory), moduleResolutionCache?.getPackageJsonInfoCache(), host, options);
const result = getImpliedNodeFormatForFileWorker(getNormalizedAbsolutePath(fileName, currentDirectory), moduleResolutionCache?.getPackageJsonInfoCache(), host, redirectedReference?.commandLine.options ?? options);
const languageVersion = getEmitScriptTarget(options);
const setExternalModuleIndicator = getSetExternalModuleIndicator(options);
return typeof result === "object" ?
Expand Down Expand Up @@ -3790,26 +3790,24 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
}

let redirectedPath: Path | undefined;
if (!useSourceOfProjectReferenceRedirect) {
const redirectProject = getProjectReferenceRedirectProject(fileName);
if (redirectProject) {
if (redirectProject.commandLine.options.outFile) {
// Shouldnt create many to 1 mapping file in --out scenario
return undefined;
}
const redirect = getProjectReferenceOutputName(redirectProject, fileName);
fileName = redirect;
// Once we start redirecting to a file, we can potentially come back to it
// via a back-reference from another file in the .d.ts folder. If that happens we'll
// end up trying to add it to the program *again* because we were tracking it via its
// original (un-redirected) name. So we have to map both the original path and the redirected path
// to the source file we're about to find/create
redirectedPath = toPath(redirect);
const redirectProject = getProjectReferenceRedirectProject(fileName);
if (!useSourceOfProjectReferenceRedirect && redirectProject) {
if (redirectProject.commandLine.options.outFile) {
// Shouldnt create many to 1 mapping file in --out scenario
return undefined;
}
const redirect = getProjectReferenceOutputName(redirectProject, fileName);
fileName = redirect;
// Once we start redirecting to a file, we can potentially come back to it
// via a back-reference from another file in the .d.ts folder. If that happens we'll
// end up trying to add it to the program *again* because we were tracking it via its
// original (un-redirected) name. So we have to map both the original path and the redirected path
// to the source file we're about to find/create
redirectedPath = toPath(redirect);
}

// We haven't looked for this file, do so now and cache result
const sourceFileOptions = getCreateSourceFileOptions(fileName, moduleResolutionCache, host, options);
const sourceFileOptions = getCreateSourceFileOptions(fileName, moduleResolutionCache, host, options, redirectProject);
const file = host.getSourceFile(
fileName,
sourceFileOptions,
Expand Down
37 changes: 0 additions & 37 deletions tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project-with-nodenext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,28 +513,10 @@ Resolving in CJS mode with conditions 'require', 'types', 'node'.
Loading module as file / folder, candidate module location '/user/username/projects/sample1/core/anotherModule', target file types: TypeScript, JavaScript, Declaration.
File '/user/username/projects/sample1/core/anotherModule.ts' exists - use it as a name resolution result.
======== Module name '../core/anotherModule' was successfully resolved to '/user/username/projects/sample1/core/anotherModule.ts'. ========
File '/user/username/projects/sample1/core/package.json' does not exist.
File '/user/username/projects/sample1/package.json' does not exist according to earlier cached lookups.
File '/user/username/projects/package.json' does not exist according to earlier cached lookups.
File '/user/username/package.json' does not exist according to earlier cached lookups.
File '/user/package.json' does not exist according to earlier cached lookups.
File '/package.json' does not exist according to earlier cached lookups.
File '/user/username/projects/sample1/logic/package.json' does not exist.
File '/user/username/projects/sample1/package.json' does not exist according to earlier cached lookups.
File '/user/username/projects/package.json' does not exist according to earlier cached lookups.
File '/user/username/package.json' does not exist according to earlier cached lookups.
File '/user/package.json' does not exist according to earlier cached lookups.
File '/package.json' does not exist according to earlier cached lookups.
andrewbranch marked this conversation as resolved.
Show resolved Hide resolved
======== Resolving module '../core/anotherModule' from '/user/username/projects/sample1/logic/index.ts'. ========
Using compiler options of project reference redirect '/user/username/projects/sample1/logic/tsconfig.json'.
Module resolution kind is not specified, using 'NodeNext'.
======== Module name '../core/anotherModule' was successfully resolved to '/user/username/projects/sample1/core/anotherModule.ts'. ========
File '/user/username/projects/sample1/core/package.json' does not exist according to earlier cached lookups.
File '/user/username/projects/sample1/package.json' does not exist according to earlier cached lookups.
File '/user/username/projects/package.json' does not exist according to earlier cached lookups.
File '/user/username/package.json' does not exist according to earlier cached lookups.
File '/user/package.json' does not exist according to earlier cached lookups.
File '/package.json' does not exist according to earlier cached lookups.
File '/home/src/tslibs/TS/Lib/package.json' does not exist.
File '/home/src/tslibs/TS/package.json' does not exist.
File '/home/src/tslibs/package.json' does not exist.
Expand Down Expand Up @@ -1335,29 +1317,10 @@ File '/package.json' does not exist according to earlier cached lookups.
Reusing resolution of module '../core/index' from '/user/username/projects/sample1/tests/index.ts' of old program, it was successfully resolved to '/user/username/projects/sample1/core/index.ts'.
Reusing resolution of module '../logic/index' from '/user/username/projects/sample1/tests/index.ts' of old program, it was successfully resolved to '/user/username/projects/sample1/logic/index.ts'.
Reusing resolution of module '../core/anotherModule' from '/user/username/projects/sample1/tests/index.ts' of old program, it was successfully resolved to '/user/username/projects/sample1/core/anotherModule.ts'.
File '/user/username/projects/sample1/core/package.json' does not exist according to earlier cached lookups.
File '/user/username/projects/sample1/package.json' does not exist according to earlier cached lookups.
File '/user/username/projects/package.json' does not exist according to earlier cached lookups.
File '/user/username/package.json' does not exist according to earlier cached lookups.
File '/user/package.json' does not exist according to earlier cached lookups.
File '/package.json' does not exist according to earlier cached lookups.
File '/user/username/projects/sample1/logic/decls/package.json' does not exist.
File '/user/username/projects/sample1/logic/package.json' does not exist according to earlier cached lookups.
File '/user/username/projects/sample1/package.json' does not exist according to earlier cached lookups.
File '/user/username/projects/package.json' does not exist according to earlier cached lookups.
File '/user/username/package.json' does not exist according to earlier cached lookups.
File '/user/package.json' does not exist according to earlier cached lookups.
File '/package.json' does not exist according to earlier cached lookups.
======== Resolving module '../core/anotherModule' from '/user/username/projects/sample1/logic/index.ts'. ========
Using compiler options of project reference redirect '/user/username/projects/sample1/logic/tsconfig.json'.
Module resolution kind is not specified, using 'NodeNext'.
======== Module name '../core/anotherModule' was successfully resolved to '/user/username/projects/sample1/core/anotherModule.ts'. ========
File '/user/username/projects/sample1/core/package.json' does not exist according to earlier cached lookups.
File '/user/username/projects/sample1/package.json' does not exist according to earlier cached lookups.
File '/user/username/projects/package.json' does not exist according to earlier cached lookups.
File '/user/username/package.json' does not exist according to earlier cached lookups.
File '/user/package.json' does not exist according to earlier cached lookups.
File '/package.json' does not exist according to earlier cached lookups.
File '/home/src/tslibs/TS/Lib/package.json' does not exist according to earlier cached lookups.
File '/home/src/tslibs/TS/package.json' does not exist according to earlier cached lookups.
File '/home/src/tslibs/package.json' does not exist according to earlier cached lookups.
Expand Down
Loading
Loading