Skip to content

Commit 23d4836

Browse files
andrewbranchandrewbranch
authored
Add to module resolution tracing (microsoft#54478)
1 parent 1e0b2f4 commit 23d4836

File tree

220 files changed

+3698
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+3698
-0
lines changed

‎src/compiler/diagnosticMessages.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5606,6 +5606,14 @@
56065606
"category": "Message",
56075607
"code": 6416
56085608
},
5609+
"Searching all ancestor node_modules directories for preferred extensions: {0}.": {
5610+
"category": "Message",
5611+
"code": 6417
5612+
},
5613+
"Searching all ancestor node_modules directories for fallback extensions: {0}.": {
5614+
"category": "Message",
5615+
"code": 6418
5616+
},
56095617

56105618
"The expected type comes from property '{0}' which is declared here on type '{1}'": {
56115619
"category": "Message",

‎src/compiler/moduleNameResolver.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2821,11 +2821,13 @@ function loadModuleFromNearestNodeModulesDirectoryWorker(extensions: Extensions,
28212821
const secondaryExtensions = extensions & ~(Extensions.TypeScript | Extensions.Declaration);
28222822
// (1)
28232823
if (priorityExtensions) {
2824+
traceIfEnabled(state, Diagnostics.Searching_all_ancestor_node_modules_directories_for_preferred_extensions_Colon_0, formatExtensions(priorityExtensions));
28242825
const result = lookup(priorityExtensions);
28252826
if (result) return result;
28262827
}
28272828
// (2)
28282829
if (secondaryExtensions && !typesScopeOnly) {
2830+
traceIfEnabled(state, Diagnostics.Searching_all_ancestor_node_modules_directories_for_fallback_extensions_Colon_0, formatExtensions(secondaryExtensions));
28292831
return lookup(secondaryExtensions);
28302832
}
28312833

‎tests/baselines/reference/bundlerConditionsExcludesNode.trace.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"Resolving in CJS mode with conditions 'import', 'types'.",
55
"File '/package.json' does not exist.",
66
"Loading module 'conditions' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON.",
7+
"Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.",
78
"Found 'package.json' at '/node_modules/conditions/package.json'.",
89
"Entering conditional exports.",
910
"Saw non-matching condition 'node'.",
@@ -20,61 +21,73 @@
2021
"======== Resolving module '@typescript/lib-es5' from '__lib_node_modules_lookup_lib.es5.d.ts__.ts'. ========",
2122
"Explicitly specified module resolution kind: 'Node10'.",
2223
"Loading module '@typescript/lib-es5' from 'node_modules' folder, target file types: TypeScript, Declaration.",
24+
"Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.",
2325
"Directory 'node_modules' does not exist, skipping all lookups in it.",
2426
"Scoped package detected, looking in 'typescript__lib-es5'",
2527
"Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
2628
"Scoped package detected, looking in 'typescript__lib-es5'",
2729
"Loading module '@typescript/lib-es5' from 'node_modules' folder, target file types: JavaScript.",
30+
"Searching all ancestor node_modules directories for fallback extensions: JavaScript.",
2831
"Directory 'node_modules' does not exist, skipping all lookups in it.",
2932
"======== Module name '@typescript/lib-es5' was not resolved. ========",
3033
"======== Resolving module '@typescript/lib-decorators' from '__lib_node_modules_lookup_lib.decorators.d.ts__.ts'. ========",
3134
"Explicitly specified module resolution kind: 'Node10'.",
3235
"Loading module '@typescript/lib-decorators' from 'node_modules' folder, target file types: TypeScript, Declaration.",
36+
"Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.",
3337
"Directory 'node_modules' does not exist, skipping all lookups in it.",
3438
"Scoped package detected, looking in 'typescript__lib-decorators'",
3539
"Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
3640
"Scoped package detected, looking in 'typescript__lib-decorators'",
3741
"Loading module '@typescript/lib-decorators' from 'node_modules' folder, target file types: JavaScript.",
42+
"Searching all ancestor node_modules directories for fallback extensions: JavaScript.",
3843
"Directory 'node_modules' does not exist, skipping all lookups in it.",
3944
"======== Module name '@typescript/lib-decorators' was not resolved. ========",
4045
"======== Resolving module '@typescript/lib-decorators/legacy' from '__lib_node_modules_lookup_lib.decorators.legacy.d.ts__.ts'. ========",
4146
"Explicitly specified module resolution kind: 'Node10'.",
4247
"Loading module '@typescript/lib-decorators/legacy' from 'node_modules' folder, target file types: TypeScript, Declaration.",
48+
"Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.",
4349
"Directory 'node_modules' does not exist, skipping all lookups in it.",
4450
"Scoped package detected, looking in 'typescript__lib-decorators/legacy'",
4551
"Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
4652
"Scoped package detected, looking in 'typescript__lib-decorators/legacy'",
4753
"Loading module '@typescript/lib-decorators/legacy' from 'node_modules' folder, target file types: JavaScript.",
54+
"Searching all ancestor node_modules directories for fallback extensions: JavaScript.",
4855
"Directory 'node_modules' does not exist, skipping all lookups in it.",
4956
"======== Module name '@typescript/lib-decorators/legacy' was not resolved. ========",
5057
"======== Resolving module '@typescript/lib-dom' from '__lib_node_modules_lookup_lib.dom.d.ts__.ts'. ========",
5158
"Explicitly specified module resolution kind: 'Node10'.",
5259
"Loading module '@typescript/lib-dom' from 'node_modules' folder, target file types: TypeScript, Declaration.",
60+
"Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.",
5361
"Directory 'node_modules' does not exist, skipping all lookups in it.",
5462
"Scoped package detected, looking in 'typescript__lib-dom'",
5563
"Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
5664
"Scoped package detected, looking in 'typescript__lib-dom'",
5765
"Loading module '@typescript/lib-dom' from 'node_modules' folder, target file types: JavaScript.",
66+
"Searching all ancestor node_modules directories for fallback extensions: JavaScript.",
5867
"Directory 'node_modules' does not exist, skipping all lookups in it.",
5968
"======== Module name '@typescript/lib-dom' was not resolved. ========",
6069
"======== Resolving module '@typescript/lib-webworker/importscripts' from '__lib_node_modules_lookup_lib.webworker.importscripts.d.ts__.ts'. ========",
6170
"Explicitly specified module resolution kind: 'Node10'.",
6271
"Loading module '@typescript/lib-webworker/importscripts' from 'node_modules' folder, target file types: TypeScript, Declaration.",
72+
"Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.",
6373
"Directory 'node_modules' does not exist, skipping all lookups in it.",
6474
"Scoped package detected, looking in 'typescript__lib-webworker/importscripts'",
6575
"Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
6676
"Scoped package detected, looking in 'typescript__lib-webworker/importscripts'",
6777
"Loading module '@typescript/lib-webworker/importscripts' from 'node_modules' folder, target file types: JavaScript.",
78+
"Searching all ancestor node_modules directories for fallback extensions: JavaScript.",
6879
"Directory 'node_modules' does not exist, skipping all lookups in it.",
6980
"======== Module name '@typescript/lib-webworker/importscripts' was not resolved. ========",
7081
"======== Resolving module '@typescript/lib-scripthost' from '__lib_node_modules_lookup_lib.scripthost.d.ts__.ts'. ========",
7182
"Explicitly specified module resolution kind: 'Node10'.",
7283
"Loading module '@typescript/lib-scripthost' from 'node_modules' folder, target file types: TypeScript, Declaration.",
84+
"Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.",
7385
"Directory 'node_modules' does not exist, skipping all lookups in it.",
7486
"Scoped package detected, looking in 'typescript__lib-scripthost'",
7587
"Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
7688
"Scoped package detected, looking in 'typescript__lib-scripthost'",
7789
"Loading module '@typescript/lib-scripthost' from 'node_modules' folder, target file types: JavaScript.",
90+
"Searching all ancestor node_modules directories for fallback extensions: JavaScript.",
7891
"Directory 'node_modules' does not exist, skipping all lookups in it.",
7992
"======== Module name '@typescript/lib-scripthost' was not resolved. ========"
8093
]

‎tests/baselines/reference/bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=false).trace.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,66 +112,78 @@
112112
"======== Resolving module '@typescript/lib-es5' from '__lib_node_modules_lookup_lib.es5.d.ts__.ts'. ========",
113113
"Explicitly specified module resolution kind: 'Node10'.",
114114
"Loading module '@typescript/lib-es5' from 'node_modules' folder, target file types: TypeScript, Declaration.",
115+
"Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.",
115116
"Directory 'node_modules' does not exist, skipping all lookups in it.",
116117
"Scoped package detected, looking in 'typescript__lib-es5'",
117118
"Directory '/node_modules' does not exist, skipping all lookups in it.",
118119
"Scoped package detected, looking in 'typescript__lib-es5'",
119120
"Loading module '@typescript/lib-es5' from 'node_modules' folder, target file types: JavaScript.",
121+
"Searching all ancestor node_modules directories for fallback extensions: JavaScript.",
120122
"Directory 'node_modules' does not exist, skipping all lookups in it.",
121123
"Directory '/node_modules' does not exist, skipping all lookups in it.",
122124
"======== Module name '@typescript/lib-es5' was not resolved. ========",
123125
"======== Resolving module '@typescript/lib-decorators' from '__lib_node_modules_lookup_lib.decorators.d.ts__.ts'. ========",
124126
"Explicitly specified module resolution kind: 'Node10'.",
125127
"Loading module '@typescript/lib-decorators' from 'node_modules' folder, target file types: TypeScript, Declaration.",
128+
"Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.",
126129
"Directory 'node_modules' does not exist, skipping all lookups in it.",
127130
"Scoped package detected, looking in 'typescript__lib-decorators'",
128131
"Directory '/node_modules' does not exist, skipping all lookups in it.",
129132
"Scoped package detected, looking in 'typescript__lib-decorators'",
130133
"Loading module '@typescript/lib-decorators' from 'node_modules' folder, target file types: JavaScript.",
134+
"Searching all ancestor node_modules directories for fallback extensions: JavaScript.",
131135
"Directory 'node_modules' does not exist, skipping all lookups in it.",
132136
"Directory '/node_modules' does not exist, skipping all lookups in it.",
133137
"======== Module name '@typescript/lib-decorators' was not resolved. ========",
134138
"======== Resolving module '@typescript/lib-decorators/legacy' from '__lib_node_modules_lookup_lib.decorators.legacy.d.ts__.ts'. ========",
135139
"Explicitly specified module resolution kind: 'Node10'.",
136140
"Loading module '@typescript/lib-decorators/legacy' from 'node_modules' folder, target file types: TypeScript, Declaration.",
141+
"Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.",
137142
"Directory 'node_modules' does not exist, skipping all lookups in it.",
138143
"Scoped package detected, looking in 'typescript__lib-decorators/legacy'",
139144
"Directory '/node_modules' does not exist, skipping all lookups in it.",
140145
"Scoped package detected, looking in 'typescript__lib-decorators/legacy'",
141146
"Loading module '@typescript/lib-decorators/legacy' from 'node_modules' folder, target file types: JavaScript.",
147+
"Searching all ancestor node_modules directories for fallback extensions: JavaScript.",
142148
"Directory 'node_modules' does not exist, skipping all lookups in it.",
143149
"Directory '/node_modules' does not exist, skipping all lookups in it.",
144150
"======== Module name '@typescript/lib-decorators/legacy' was not resolved. ========",
145151
"======== Resolving module '@typescript/lib-dom' from '__lib_node_modules_lookup_lib.dom.d.ts__.ts'. ========",
146152
"Explicitly specified module resolution kind: 'Node10'.",
147153
"Loading module '@typescript/lib-dom' from 'node_modules' folder, target file types: TypeScript, Declaration.",
154+
"Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.",
148155
"Directory 'node_modules' does not exist, skipping all lookups in it.",
149156
"Scoped package detected, looking in 'typescript__lib-dom'",
150157
"Directory '/node_modules' does not exist, skipping all lookups in it.",
151158
"Scoped package detected, looking in 'typescript__lib-dom'",
152159
"Loading module '@typescript/lib-dom' from 'node_modules' folder, target file types: JavaScript.",
160+
"Searching all ancestor node_modules directories for fallback extensions: JavaScript.",
153161
"Directory 'node_modules' does not exist, skipping all lookups in it.",
154162
"Directory '/node_modules' does not exist, skipping all lookups in it.",
155163
"======== Module name '@typescript/lib-dom' was not resolved. ========",
156164
"======== Resolving module '@typescript/lib-webworker/importscripts' from '__lib_node_modules_lookup_lib.webworker.importscripts.d.ts__.ts'. ========",
157165
"Explicitly specified module resolution kind: 'Node10'.",
158166
"Loading module '@typescript/lib-webworker/importscripts' from 'node_modules' folder, target file types: TypeScript, Declaration.",
167+
"Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.",
159168
"Directory 'node_modules' does not exist, skipping all lookups in it.",
160169
"Scoped package detected, looking in 'typescript__lib-webworker/importscripts'",
161170
"Directory '/node_modules' does not exist, skipping all lookups in it.",
162171
"Scoped package detected, looking in 'typescript__lib-webworker/importscripts'",
163172
"Loading module '@typescript/lib-webworker/importscripts' from 'node_modules' folder, target file types: JavaScript.",
173+
"Searching all ancestor node_modules directories for fallback extensions: JavaScript.",
164174
"Directory 'node_modules' does not exist, skipping all lookups in it.",
165175
"Directory '/node_modules' does not exist, skipping all lookups in it.",
166176
"======== Module name '@typescript/lib-webworker/importscripts' was not resolved. ========",
167177
"======== Resolving module '@typescript/lib-scripthost' from '__lib_node_modules_lookup_lib.scripthost.d.ts__.ts'. ========",
168178
"Explicitly specified module resolution kind: 'Node10'.",
169179
"Loading module '@typescript/lib-scripthost' from 'node_modules' folder, target file types: TypeScript, Declaration.",
180+
"Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.",
170181
"Directory 'node_modules' does not exist, skipping all lookups in it.",
171182
"Scoped package detected, looking in 'typescript__lib-scripthost'",
172183
"Directory '/node_modules' does not exist, skipping all lookups in it.",
173184
"Scoped package detected, looking in 'typescript__lib-scripthost'",
174185
"Loading module '@typescript/lib-scripthost' from 'node_modules' folder, target file types: JavaScript.",
186+
"Searching all ancestor node_modules directories for fallback extensions: JavaScript.",
175187
"Directory 'node_modules' does not exist, skipping all lookups in it.",
176188
"Directory '/node_modules' does not exist, skipping all lookups in it.",
177189
"======== Module name '@typescript/lib-scripthost' was not resolved. ========"

0 commit comments

Comments
 (0)