Fix ESM/CJS resolution cache collision in non-nodenext resolution modes by andrewbranch · Pull Request #60910 · microsoft/TypeScript

andrewbranch · 2025-01-03T19:55:00Z

Fixes #60243 for me, and more directly an incorrect resolution result shown in the conformance test. The crash at #60243 occurs when a single file contains a duplicated resolution stored under two different mode-aware cache keys. In the test case, the result for import type pkg from "pkg" with { "resolution-mode": "require" } is stored in the node_modules directory cache under 1|pkg. That result is returned for the "resolution-mode": "import" resolution because the mode is recomputed incorrectly in loadModuleFromNearestNodeModulesDirectoryWorker. This returns a wrong result, but it also
results in that resolution occurring twice in the per-file resolution, once under 1|pkg and once under 99|pkg, so when we iterate over resolutions to stop watching them, we try to process the same resolution twice, causing the crash.

andrewbranch · 2025-01-03T19:57:15Z

src/compiler/moduleNameResolver.ts


 function loadModuleFromNearestNodeModulesDirectoryWorker(extensions: Extensions, moduleName: string, directory: string, state: ModuleResolutionState, typesScopeOnly: boolean, cache: ModuleResolutionCache | undefined, redirectedReference: ResolvedProjectReference | undefined): SearchResult<Resolved> {
-    const mode = state.features === 0 ? undefined : state.features & NodeResolutionFeatures.EsmMode ? ModuleKind.ESNext : ModuleKind.CommonJS;
+    const mode = state.features === 0 ? undefined : (state.features & NodeResolutionFeatures.EsmMode || state.conditions.includes("import")) ? ModuleKind.ESNext : ModuleKind.CommonJS;


We should possibly just plumb resolutionMode through from the top, but this should work too. EsmMode is never set outside of node16–nodenext; it’s only used to disable directory lookups and extension searching. conditions is where we see the actual difference in different import modes in --moduleResolution bundler.

andrewbranch · 2025-01-03T19:57:51Z

@typescript-bot pack this

typescript-bot · 2025-01-03T19:57:55Z

Starting jobs; this comment will be updated as builds start and complete.

Command	Status	Results
`pack this`	✅ Started	✅ Results

typescript-bot · 2025-01-03T20:00:06Z

Hey @andrewbranch, I've packed this into an installable tgz. You can install it for testing by referencing it in your package.json like so:

{
    "devDependencies": {
        "typescript": "https://typescript.visualstudio.com/cf7ac146-d525-443c-b23c-0d58337efebc/_apis/build/builds/164461/artifacts?artifactName=tgz&fileId=12E0C2B8F3DB612B425BC38C307E1FA25B7C2209351D95BF7506225ED87E9FB302&fileName=/typescript-5.8.0-insiders.20250103.tgz"
    }
}

and then running npm install.

There is also a playground for this build and an npm module you can use via "typescript": "npm:@typescript-deploys/pr-build@5.8.0-pr-60910-2".;

andrewbranch · 2025-01-08T16:45:59Z

@typescript-bot test it

typescript-bot · 2025-01-08T16:46:04Z

Starting jobs; this comment will be updated as builds start and complete.

Command	Status	Results
`test top400`	✅ Started
`user test this`	✅ Started	✅ Results
`run dt`	✅ Started	✅ Results
`perf test this faster`	✅ Started	👀 Results

typescript-bot · 2025-01-08T17:07:47Z

@andrewbranch Here are the results of running the user tests with tsc comparing main and refs/pull/60910/merge:

There were infrastructure failures potentially unrelated to your change:

1 instance of "Timeout"
2 instances of "Package install failed"

Otherwise...

Everything looks good!

typescript-bot · 2025-01-08T17:11:05Z

Hey @andrewbranch, the results of running the DT tests are ready.

Everything looks the same!

You can check the log here.

typescript-bot · 2025-01-08T17:37:03Z

@andrewbranch
The results of the perf run you requested are in!

Here they are:

tsc

Comparison Report - baseline..pr

_Metric	_baseline	_pr	_Delta	_Best	_Worst	_p-value
_{Compiler-Unions - node (v18.15.0, x64)}
_Errors	₃₄	₃₄	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_62,363	_62,363	_~	_~	_~	_{p=1.000 n=6}
_Types	_50,395	_50,395	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{194,272k (± 0.95%)}	_{193,685k (± 0.75%)}	_~	_193,019k	_196,625k	_{p=0.298 n=6}
_{Parse Time}	_{1.31s (± 0.57%)}	_{1.31s (± 0.48%)}	_~	_1.30s	_1.32s	_{p=0.718 n=6}
_{Bind Time}	_0.73s	_0.73s	_~	_~	_~	_{p=1.000 n=6}
_{Check Time}	_{9.78s (± 0.59%)}	_{9.79s (± 0.26%)}	_~	_9.75s	_9.82s	_{p=0.871 n=6}
_{Emit Time}	_{2.71s (± 2.04%)}	_{2.73s (± 0.85%)}	_~	_2.71s	_2.77s	_{p=0.935 n=6}
_{Total Time}	_{14.53s (± 0.46%)}	_{14.56s (± 0.30%)}	_~	_14.50s	_14.63s	_{p=0.376 n=6}
_{angular-1 - node (v18.15.0, x64)}
_Errors	₃₇	₃₇	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_947,936	_947,936	_~	_~	_~	_{p=1.000 n=6}
_Types	_410,955	_410,955	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{1,225,809k (± 0.00%)}	_{1,225,829k (± 0.00%)}	_~	_1,225,747k	_1,225,904k	_{p=0.575 n=6}
_{Parse Time}	_{6.67s (± 0.76%)}	_{6.64s (± 0.61%)}	_~	_6.60s	_6.70s	_{p=0.468 n=6}
_{Bind Time}	_{1.89s (± 0.55%)}	_{1.89s (± 0.40%)}	_~	_1.88s	_1.90s	_{p=0.437 n=6}
_{Check Time}	_{31.96s (± 0.51%)}	_{31.93s (± 0.23%)}	_~	_31.80s	_32.01s	_{p=0.378 n=6}
_{Emit Time}	_{15.19s (± 0.25%)}	_{15.19s (± 0.61%)}	_~	_15.09s	_15.33s	_{p=0.630 n=6}
_{Total Time}	_{55.70s (± 0.28%)}	_{55.65s (± 0.32%)}	_~	_55.43s	_55.92s	_{p=0.471 n=6}
_{mui-docs - node (v18.15.0, x64)}
_Errors	₀	₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_2,446,507	_2,446,507	_~	_~	_~	_{p=1.000 n=6}
_Types	_897,064	_897,064	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{2,311,188k (± 0.00%)}	_{2,311,197k (± 0.00%)}	_~	_2,311,124k	_2,311,241k	_{p=0.575 n=6}
_{Parse Time}	_{8.98s (± 0.32%)}	_{8.95s (± 0.37%)}	_~	_8.91s	_8.99s	_{p=0.288 n=6}
_{Bind Time}	_{2.13s (± 0.46%)}	_{2.13s (± 0.66%)}	_~	_2.11s	_2.15s	_{p=0.932 n=6}
_{Check Time}	_{73.36s (± 0.54%)}	_{73.27s (± 0.52%)}	_~	_72.80s	_73.71s	_{p=0.810 n=6}
_{Emit Time}	_{0.29s (± 1.92%)}	_{0.28s (± 2.26%)}	_~	_0.27s	_0.29s	_{p=0.201 n=6}
_{Total Time}	_{84.76s (± 0.48%)}	_{84.63s (± 0.45%)}	_~	_84.15s	_85.04s	_{p=0.810 n=6}
_{self-build-src - node (v18.15.0, x64)}
_Errors	₀	₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_1,226,852	_1,226,938	_{+86 (+ 0.01%)}	_~	_~	_{p=0.001 n=6}
_Types	_266,743	_266,762	_{+19 (+ 0.01%)}	_~	_~	_{p=0.001 n=6}
_{Memory used}	_{3,088,967k (± 0.02%)}	_{3,088,057k (± 0.03%)}	_~	_3,087,030k	_3,089,347k	_{p=0.066 n=6}
_{Parse Time}	_{8.43s (± 0.89%)}	_{8.49s (± 0.48%)}	_~	_8.44s	_8.54s	_{p=0.128 n=6}
_{Bind Time}	_{2.65s (± 0.67%)}	_{2.63s (± 0.76%)}	_~	_2.61s	_2.66s	_{p=0.127 n=6}
_{Check Time}	_{53.08s (± 0.24%)}	_{53.03s (± 0.16%)}	_~	_52.88s	_53.12s	_{p=0.298 n=6}
_{Emit Time}	_{4.24s (± 1.73%)}	_{4.32s (± 2.69%)}	_~	_4.15s	_4.48s	_{p=0.230 n=6}
_{Total Time}	_{68.39s (± 0.28%)}	_{68.46s (± 0.24%)}	_~	_68.27s	_68.66s	_{p=0.689 n=6}
_{self-build-src-public-api - node (v18.15.0, x64)}
_Errors	₀	₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_1,226,852	_1,226,938	_{+86 (+ 0.01%)}	_~	_~	_{p=0.001 n=6}
_Types	_266,743	_266,762	_{+19 (+ 0.01%)}	_~	_~	_{p=0.001 n=6}
_{Memory used}	_{2,425,319k (± 0.03%)}	_{2,424,944k (± 0.02%)}	_~	_2,424,396k	_2,425,983k	_{p=0.298 n=6}
_{Parse Time}	_{5.47s (± 0.51%)}	_{5.47s (± 1.10%)}	_~	_5.41s	_5.57s	_{p=0.748 n=6}
_{Bind Time}	_{1.82s (± 0.54%)}	_{1.82s (± 0.41%)}	_~	_1.81s	_1.83s	_{p=0.554 n=6}
_{Check Time}	_{35.37s (± 0.41%)}	_{35.34s (± 0.49%)}	_~	_35.21s	_35.66s	_{p=0.575 n=6}
_{Emit Time}	_{3.05s (± 2.49%)}	_{3.09s (± 4.35%)}	_~	_3.01s	_3.36s	_{p=0.688 n=6}
_{Total Time}	_{45.72s (± 0.36%)}	_{45.72s (± 0.64%)}	_~	_45.46s	_46.17s	_{p=0.689 n=6}
_{self-compiler - node (v18.15.0, x64)}
_Errors	₀	₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_262,441	_262,441	_~	_~	_~	_{p=1.000 n=6}
_Types	_106,628	_106,628	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{440,191k (± 0.01%)}	_{440,172k (± 0.01%)}	_~	_440,147k	_440,199k	_{p=0.378 n=6}
_{Parse Time}	_{3.55s (± 0.52%)}	_{3.55s (± 1.59%)}	_~	_3.48s	_3.61s	_{p=1.000 n=6}
_{Bind Time}	_{1.32s (± 1.24%)}	_{1.33s (± 0.78%)}	_~	_1.31s	_1.34s	_{p=1.000 n=6}
_{Check Time}	_{18.93s (± 0.19%)}	_{18.95s (± 0.31%)}	_~	_18.86s	_19.00s	_{p=0.572 n=6}
_{Emit Time}	_{1.53s (± 0.76%)}	_{1.54s (± 0.67%)}	_~	_1.52s	_1.55s	_{p=0.456 n=6}
_{Total Time}	_{25.33s (± 0.18%)}	_{25.35s (± 0.42%)}	_~	_25.22s	_25.48s	_{p=0.810 n=6}
_{ts-pre-modules - node (v18.15.0, x64)}
_Errors	₇₀	₇₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_226,062	_226,062	_~	_~	_~	_{p=1.000 n=6}
_Types	_94,488	_94,488	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{371,613k (± 0.01%)}	_{371,813k (± 0.05%)}	_~	_371,572k	_371,993k	_{p=0.128 n=6}
_{Parse Time}	_{2.89s (± 1.27%)}	_{2.88s (± 1.29%)}	_~	_2.82s	_2.92s	_{p=1.000 n=6}
_{Bind Time}	_{1.59s (± 0.92%)}	_{1.58s (± 1.59%)}	_~	_1.53s	_1.60s	_{p=0.452 n=6}
_{Check Time}	_{16.48s (± 0.35%)}	_{16.49s (± 0.56%)}	_~	_16.31s	_16.58s	_{p=0.423 n=6}
_{Emit Time}	_0.00s	_0.00s	_~	_~	_~	_{p=1.000 n=6}
_{Total Time}	_{20.96s (± 0.09%)}	_{20.95s (± 0.54%)}	_~	_20.73s	_21.03s	_{p=0.375 n=6}
_{vscode - node (v18.15.0, x64)}
_Errors	₃	₃	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_3,233,157	_3,233,157	_~	_~	_~	_{p=1.000 n=6}
_Types	_1,112,963	_1,112,963	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{3,296,719k (± 0.01%)}	_{3,296,739k (± 0.01%)}	_~	_3,296,397k	_3,297,250k	_{p=1.000 n=6}
_{Parse Time}	_{17.47s (± 0.41%)}	_{17.43s (± 0.31%)}	_~	_17.36s	_17.50s	_{p=0.520 n=6}
_{Bind Time}	_{5.63s (± 2.86%)}	_{5.71s (± 2.89%)}	_~	_5.53s	_5.91s	_{p=0.336 n=6}
_{Check Time}	_{106.52s (± 0.44%)}	_{108.50s (± 3.13%)}	_~	_105.76s	_114.33s	_{p=0.471 n=6}
_{Emit Time}	_{34.84s (± 2.56%)}	_{33.81s (± 8.23%)}	_~	_28.30s	_35.60s	_{p=0.575 n=6}
_{Total Time}	_{164.46s (± 0.66%)}	_{165.45s (± 1.71%)}	_~	_162.59s	_170.92s	_{p=0.630 n=6}
_{webpack - node (v18.15.0, x64)}
_Errors	₀	₀	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_291,562	_291,562	_~	_~	_~	_{p=1.000 n=6}
_Types	_118,971	_118,971	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{445,365k (± 0.03%)}	_{445,428k (± 0.03%)}	_~	_445,205k	_445,590k	_{p=0.471 n=6}
_{Parse Time}	_{4.10s (± 0.84%)}	_{4.11s (± 0.91%)}	_~	_4.04s	_4.14s	_{p=0.329 n=6}
_{Bind Time}	_{1.78s (± 1.91%)}	_{1.78s (± 1.20%)}	_~	_1.74s	_1.80s	_{p=0.871 n=6}
_{Check Time}	_{18.81s (± 0.39%)}	_{18.82s (± 0.75%)}	_~	_18.64s	_19.00s	_{p=0.810 n=6}
_{Emit Time}	_0.00s	_0.00s	_~	_~	_~	_{p=1.000 n=6}
_{Total Time}	_{24.69s (± 0.46%)}	_{24.72s (± 0.67%)}	_~	_24.45s	_24.87s	_{p=0.688 n=6}
_{xstate-main - node (v18.15.0, x64)}
_Errors	₅	₅	_~	_~	_~	_{p=1.000 n=6}
_Symbols	_555,017	_555,017	_~	_~	_~	_{p=1.000 n=6}
_Types	_186,115	_186,115	_~	_~	_~	_{p=1.000 n=6}
_{Memory used}	_{494,037k (± 0.01%)}	_{494,051k (± 0.02%)}	_~	_493,934k	_494,261k	_{p=0.810 n=6}
_{Parse Time}	_{3.41s (± 0.16%)}	_{3.39s (± 0.88%)}	_~	_3.35s	_3.43s	_{p=0.250 n=6}
_{Bind Time}	_{1.17s (± 0.35%)}	_{1.16s (± 0.89%)}	_~	_1.15s	_1.18s	_{p=0.257 n=6}
_{Check Time}	_{19.56s (± 0.30%)}	_{19.53s (± 0.20%)}	_~	_19.49s	_19.59s	_{p=0.470 n=6}
_{Emit Time}	_0.00s	_0.00s	_~	_~	_~	_{p=1.000 n=6}
_{Total Time}	_{24.14s (± 0.24%)}	_{24.09s (± 0.17%)}	_~	_24.05s	_24.16s	_{p=0.107 n=6}

System info unknown

Hosts

node (v18.15.0, x64)

Scenarios

Compiler-Unions - node (v18.15.0, x64)
angular-1 - node (v18.15.0, x64)
mui-docs - node (v18.15.0, x64)
self-build-src - node (v18.15.0, x64)
self-build-src-public-api - node (v18.15.0, x64)
self-compiler - node (v18.15.0, x64)
ts-pre-modules - node (v18.15.0, x64)
vscode - node (v18.15.0, x64)
webpack - node (v18.15.0, x64)
xstate-main - node (v18.15.0, x64)

_Benchmark	_Name	_Iterations
_Current	_pr	₆
_Baseline	_baseline	₆

Developer Information:

Download Benchmarks

…es (microsoft#60910)

andrewbranch added 2 commits January 3, 2025 11:44

Add failing tests

f8bbbcf

Fix

24d41b1

typescript-bot assigned andrewbranch Jan 3, 2025

typescript-bot added Author: Team For Milestone Bug PRs that fix a bug with a specific milestone labels Jan 3, 2025

andrewbranch commented Jan 3, 2025

View reviewed changes

andrewbranch mentioned this pull request Jan 3, 2025

TS Server fatal error: Debug Failure. #60243

Closed

andrewbranch requested review from jakebailey, sandersn and weswigham January 8, 2025 17:52

jakebailey approved these changes Jan 18, 2025

View reviewed changes

andrewbranch merged commit b78f466 into microsoft:main Jan 21, 2025
32 checks passed

andrewbranch deleted the bug/60243 branch January 21, 2025 19:10

petamoriken pushed a commit to petamoriken/TypeScript that referenced this pull request Jan 22, 2025

Fix ESM/CJS resolution cache collision in non-nodenext resolution mod…

3fd809c

…es (microsoft#60910)

andrewbranch mentioned this pull request Jan 22, 2025

Fix incorrect module resolution cache query microsoft/typescript-go#248

Merged

andrewbranch mentioned this pull request Jan 30, 2025

prevent vscode from constantly restarting tsserver #60630

Closed

sandersn removed this from PR Backlog Apr 22, 2025

microsoft locked as resolved and limited conversation to collaborators Oct 15, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix ESM/CJS resolution cache collision in non-nodenext resolution modes#60910

Fix ESM/CJS resolution cache collision in non-nodenext resolution modes#60910
andrewbranch merged 2 commits intomicrosoft:mainfrom
andrewbranch:bug/60243

andrewbranch commented Jan 3, 2025

Uh oh!

andrewbranch Jan 3, 2025

Uh oh!

andrewbranch commented Jan 3, 2025

Uh oh!

typescript-bot commented Jan 3, 2025 •

edited

Loading

Uh oh!

typescript-bot commented Jan 3, 2025 •

edited

Loading

Uh oh!

andrewbranch commented Jan 8, 2025

Uh oh!

typescript-bot commented Jan 8, 2025 •

edited

Loading

Uh oh!

typescript-bot commented Jan 8, 2025

Uh oh!

typescript-bot commented Jan 8, 2025

Uh oh!

typescript-bot commented Jan 8, 2025

tsc

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

andrewbranch commented Jan 3, 2025

Uh oh!

andrewbranch Jan 3, 2025

Choose a reason for hiding this comment

Uh oh!

andrewbranch commented Jan 3, 2025

Uh oh!

typescript-bot commented Jan 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

typescript-bot commented Jan 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

andrewbranch commented Jan 8, 2025

Uh oh!

typescript-bot commented Jan 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

typescript-bot commented Jan 8, 2025

Uh oh!

typescript-bot commented Jan 8, 2025

Uh oh!

typescript-bot commented Jan 8, 2025

tsc

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

typescript-bot commented Jan 3, 2025 •

edited

Loading

typescript-bot commented Jan 3, 2025 •

edited

Loading

typescript-bot commented Jan 8, 2025 •

edited

Loading