Skip to content

Make traces where #50762 happens machine analyzable #52602

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

Merged
merged 2 commits into from
Feb 6, 2023
Merged

Make traces where #50762 happens machine analyzable #52602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b12d57b
Trace when executing a buggy resolution behavior
andrewbranch Feb 3, 2023
c3c7467
Make trace pattern parseable
andrewbranch Feb 4, 2023
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
16 changes: 16 additions & 0 deletions src/compiler/diagnosticMessages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5558,6 +5558,22 @@
"category": "Message",
"code": 6412
},
"Entering conditional exports.": {
"category": "Message",
"code": 6413
},
"Resolved under condition '{0}'.": {
"category": "Message",
"code": 6414
},
"Failed to resolve under condition '{0}'.": {
"category": "Message",
"code": 6415
},
"Exiting conditional exports.": {
"category": "Message",
"code": 6416
},

"The expected type comes from property '{0}' which is declared here on type '{1}'": {
"category": "Message",
Expand Down
7 changes: 7 additions & 0 deletions src/compiler/moduleNameResolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2584,19 +2584,26 @@ function getLoadModuleFromTargetImportOrExport(extensions: Extensions, state: Mo
}
else if (typeof target === "object" && target !== null) { // eslint-disable-line no-null/no-null
if (!Array.isArray(target)) {
traceIfEnabled(state, Diagnostics.Entering_conditional_exports);
for (const condition of getOwnKeys(target as MapLike<unknown>)) {
if (condition === "default" || state.conditions.indexOf(condition) >= 0 || isApplicableVersionedTypesKey(state.conditions, condition)) {
traceIfEnabled(state, Diagnostics.Matched_0_condition_1, isImports ? "imports" : "exports", condition);
const subTarget = (target as MapLike<unknown>)[condition];
const result = loadModuleFromTargetImportOrExport(subTarget, subpath, pattern, key);
if (result) {
traceIfEnabled(state, Diagnostics.Resolved_under_condition_0, condition);
traceIfEnabled(state, Diagnostics.Exiting_conditional_exports);
return result;
}
else {
traceIfEnabled(state, Diagnostics.Failed_to_resolve_under_condition_0, condition);
}
}
else {
traceIfEnabled(state, Diagnostics.Saw_non_matching_condition_0, condition);
}
}
traceIfEnabled(state, Diagnostics.Exiting_conditional_exports);
return undefined;
}
else {
Expand Down
3 changes: 3 additions & 0 deletions tests/baselines/reference/bundlerNodeModules1.trace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@
"File '/package.json' does not exist.",
"Loading module 'dual' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON.",
"Found 'package.json' at '/node_modules/dual/package.json'.",
"Entering conditional exports.",
"Matched 'exports' condition 'import'.",
"Using 'exports' subpath '.' with target './index.js'.",
"File name '/node_modules/dual/index.js' has a '.js' extension - stripping it.",
"File '/node_modules/dual/index.ts' does not exist.",
"File '/node_modules/dual/index.tsx' does not exist.",
"File '/node_modules/dual/index.d.ts' exists - use it as a name resolution result.",
"Resolved under condition 'import'.",
"Exiting conditional exports.",
"Resolving real path for '/node_modules/dual/index.d.ts', result '/node_modules/dual/index.d.ts'.",
"======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.ts' with Package ID 'dual/index.d.ts@1.0.0'. ========",
"======== Resolving module 'dual' from '/main.mts'. ========",
Expand Down
22 changes: 22 additions & 0 deletions ...lines/reference/conditionalExportsResolutionFallback(moduleresolution=bundler).trace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[
"======== Resolving module 'dep' from '/index.mts'. ========",
"Explicitly specified module resolution kind: 'Bundler'.",
"File '/package.json' does not exist.",
"Loading module 'dep' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON.",
"Found 'package.json' at '/node_modules/dep/package.json'.",
"Entering conditional exports.",
"Matched 'exports' condition 'import'.",
"Using 'exports' subpath '.' with target './dist/index.mjs'.",
"File name '/node_modules/dep/dist/index.mjs' has a '.mjs' extension - stripping it.",
"File '/node_modules/dep/dist/index.mts' does not exist.",
"File '/node_modules/dep/dist/index.d.mts' does not exist.",
"Failed to resolve under condition 'import'.",
"Saw non-matching condition 'require'.",
"Matched 'exports' condition 'types'.",
"Using 'exports' subpath '.' with target './dist/index.d.ts'.",
"File '/node_modules/dep/dist/index.d.ts' exists - use it as a name resolution result.",
"Resolved under condition 'types'.",
"Exiting conditional exports.",
"Resolving real path for '/node_modules/dep/dist/index.d.ts', result '/node_modules/dep/dist/index.d.ts'.",
"======== Module name 'dep' was successfully resolved to '/node_modules/dep/dist/index.d.ts' with Package ID 'dep/dist/index.d.ts@1.0.0'. ========"
]
39 changes: 39 additions & 0 deletions ...elines/reference/conditionalExportsResolutionFallback(moduleresolution=node16).trace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
[
"File '/node_modules/dep/dist/package.json' does not exist.",
"Found 'package.json' at '/node_modules/dep/package.json'.",
"======== Resolving module 'dep' from '/index.mts'. ========",
"Explicitly specified module resolution kind: 'Node16'.",
"Resolving in ESM mode with conditions 'node', 'import', 'types'.",
"File '/package.json' does not exist.",
"Loading module 'dep' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration.",
"File '/node_modules/dep/package.json' exists according to earlier cached lookups.",
"Entering conditional exports.",
"Matched 'exports' condition 'import'.",
"Using 'exports' subpath '.' with target './dist/index.mjs'.",
"File name '/node_modules/dep/dist/index.mjs' has a '.mjs' extension - stripping it.",
"File '/node_modules/dep/dist/index.mts' does not exist.",
"File '/node_modules/dep/dist/index.d.mts' does not exist.",
"Failed to resolve under condition 'import'.",
"Saw non-matching condition 'require'.",
"Matched 'exports' condition 'types'.",
"Using 'exports' subpath '.' with target './dist/index.d.ts'.",
"File '/node_modules/dep/dist/index.d.ts' exists - use it as a name resolution result.",
"Resolved under condition 'types'.",
"Exiting conditional exports.",
"Resolving real path for '/node_modules/dep/dist/index.d.ts', result '/node_modules/dep/dist/index.d.ts'.",
"======== Module name 'dep' was successfully resolved to '/node_modules/dep/dist/index.d.ts' with Package ID 'dep/dist/index.d.ts@1.0.0'. ========",
"File 'package.json' does not exist.",
"File '/package.json' does not exist according to earlier cached lookups.",
"File 'package.json' does not exist according to earlier cached lookups.",
"File '/package.json' does not exist according to earlier cached lookups.",
"File 'package.json' does not exist according to earlier cached lookups.",
"File '/package.json' does not exist according to earlier cached lookups.",
"File 'package.json' does not exist according to earlier cached lookups.",
"File '/package.json' does not exist according to earlier cached lookups.",
"File 'package.json' does not exist according to earlier cached lookups.",
"File '/package.json' does not exist according to earlier cached lookups.",
"File 'package.json' does not exist according to earlier cached lookups.",
"File '/package.json' does not exist according to earlier cached lookups.",
"File 'package.json' does not exist according to earlier cached lookups.",
"File '/package.json' does not exist according to earlier cached lookups."
]
39 changes: 39 additions & 0 deletions ...ines/reference/conditionalExportsResolutionFallback(moduleresolution=nodenext).trace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
[
"File '/node_modules/dep/dist/package.json' does not exist.",
"Found 'package.json' at '/node_modules/dep/package.json'.",
"======== Resolving module 'dep' from '/index.mts'. ========",
"Explicitly specified module resolution kind: 'NodeNext'.",
"Resolving in ESM mode with conditions 'node', 'import', 'types'.",
"File '/package.json' does not exist.",
"Loading module 'dep' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration.",
"File '/node_modules/dep/package.json' exists according to earlier cached lookups.",
"Entering conditional exports.",
"Matched 'exports' condition 'import'.",
"Using 'exports' subpath '.' with target './dist/index.mjs'.",
"File name '/node_modules/dep/dist/index.mjs' has a '.mjs' extension - stripping it.",
"File '/node_modules/dep/dist/index.mts' does not exist.",
"File '/node_modules/dep/dist/index.d.mts' does not exist.",
"Failed to resolve under condition 'import'.",
"Saw non-matching condition 'require'.",
"Matched 'exports' condition 'types'.",
"Using 'exports' subpath '.' with target './dist/index.d.ts'.",
"File '/node_modules/dep/dist/index.d.ts' exists - use it as a name resolution result.",
"Resolved under condition 'types'.",
"Exiting conditional exports.",
"Resolving real path for '/node_modules/dep/dist/index.d.ts', result '/node_modules/dep/dist/index.d.ts'.",
"======== Module name 'dep' was successfully resolved to '/node_modules/dep/dist/index.d.ts' with Package ID 'dep/dist/index.d.ts@1.0.0'. ========",
"File 'package.json' does not exist.",
"File '/package.json' does not exist according to earlier cached lookups.",
"File 'package.json' does not exist according to earlier cached lookups.",
"File '/package.json' does not exist according to earlier cached lookups.",
"File 'package.json' does not exist according to earlier cached lookups.",
"File '/package.json' does not exist according to earlier cached lookups.",
"File 'package.json' does not exist according to earlier cached lookups.",
"File '/package.json' does not exist according to earlier cached lookups.",
"File 'package.json' does not exist according to earlier cached lookups.",
"File '/package.json' does not exist according to earlier cached lookups.",
"File 'package.json' does not exist according to earlier cached lookups.",
"File '/package.json' does not exist according to earlier cached lookups.",
"File 'package.json' does not exist according to earlier cached lookups.",
"File '/package.json' does not exist according to earlier cached lookups."
]
3 changes: 3 additions & 0 deletions tests/baselines/reference/customConditions(resolvepackagejsonexports=true).trace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@
"File '/package.json' does not exist.",
"Loading module 'lodash' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON.",
"Found 'package.json' at '/node_modules/lodash/package.json'.",
"Entering conditional exports.",
"Saw non-matching condition 'browser'.",
"Matched 'exports' condition 'webpack'.",
"Using 'exports' subpath '.' with target './webpack.js'.",
"File name '/node_modules/lodash/webpack.js' has a '.js' extension - stripping it.",
"File '/node_modules/lodash/webpack.ts' does not exist.",
"File '/node_modules/lodash/webpack.tsx' does not exist.",
"File '/node_modules/lodash/webpack.d.ts' exists - use it as a name resolution result.",
"Resolved under condition 'webpack'.",
"Exiting conditional exports.",
"Resolving real path for '/node_modules/lodash/webpack.d.ts', result '/node_modules/lodash/webpack.d.ts'.",
"======== Module name 'lodash' was successfully resolved to '/node_modules/lodash/webpack.d.ts' with Package ID 'lodash/webpack.d.ts@1.0.0'. ========"
]
20 changes: 20 additions & 0 deletions tests/baselines/reference/nodeModulesExportsBlocksTypesVersions(module=node16).trace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,12 @@
"File '/package.json' does not exist according to earlier cached lookups.",
"Loading module 'exports-and-types-versions/yep' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration.",
"File '/node_modules/exports-and-types-versions/package.json' exists according to earlier cached lookups.",
"Entering conditional exports.",
"Matched 'exports' condition 'types'.",
"Using 'exports' subpath './yep' with target './types/foo.d.ts'.",
"File '/node_modules/exports-and-types-versions/types/foo.d.ts' exists - use it as a name resolution result.",
"Resolved under condition 'types'.",
"Exiting conditional exports.",
"Resolving real path for '/node_modules/exports-and-types-versions/types/foo.d.ts', result '/node_modules/exports-and-types-versions/types/foo.d.ts'.",
"======== Module name 'exports-and-types-versions/yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions/types/foo.d.ts@1.0.0'. ========",
"======== Resolving module 'exports-and-types-versions/versioned-yep' from '/main.cts'. ========",
Expand All @@ -50,9 +53,12 @@
"File '/package.json' does not exist according to earlier cached lookups.",
"Loading module 'exports-and-types-versions/versioned-yep' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration.",
"File '/node_modules/exports-and-types-versions/package.json' exists according to earlier cached lookups.",
"Entering conditional exports.",
"Matched 'exports' condition 'types@>=4'.",
"Using 'exports' subpath './versioned-yep' with target './types/foo.d.ts'.",
"File '/node_modules/exports-and-types-versions/types/foo.d.ts' exists - use it as a name resolution result.",
"Resolved under condition 'types@>=4'.",
"Exiting conditional exports.",
"Resolving real path for '/node_modules/exports-and-types-versions/types/foo.d.ts', result '/node_modules/exports-and-types-versions/types/foo.d.ts'.",
"======== Module name 'exports-and-types-versions/versioned-yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions/types/foo.d.ts@1.0.0'. ========",
"======== Resolving module 'exports-and-types-versions/versioned-nah' from '/main.cts'. ========",
Expand All @@ -61,11 +67,15 @@
"File '/package.json' does not exist according to earlier cached lookups.",
"Loading module 'exports-and-types-versions/versioned-nah' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration.",
"File '/node_modules/exports-and-types-versions/package.json' exists according to earlier cached lookups.",
"Entering conditional exports.",
"Saw non-matching condition 'types@<4'.",
"Exiting conditional exports.",
"Export specifier './versioned-nah' does not exist in package.json scope at path '/node_modules/exports-and-types-versions'.",
"Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
"File '/node_modules/exports-and-types-versions/package.json' exists according to earlier cached lookups.",
"Entering conditional exports.",
"Saw non-matching condition 'types@<4'.",
"Exiting conditional exports.",
"Export specifier './versioned-nah' does not exist in package.json scope at path '/node_modules/exports-and-types-versions'.",
"======== Module name 'exports-and-types-versions/versioned-nah' was not resolved. ========",
"======== Resolving module 'just-types-versions/foo' from '/main.cts'. ========",
Expand Down Expand Up @@ -126,9 +136,12 @@
"File '/package.json' does not exist according to earlier cached lookups.",
"Loading module 'exports-and-types-versions/yep' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration.",
"File '/node_modules/exports-and-types-versions/package.json' exists according to earlier cached lookups.",
"Entering conditional exports.",
"Matched 'exports' condition 'types'.",
"Using 'exports' subpath './yep' with target './types/foo.d.ts'.",
"File '/node_modules/exports-and-types-versions/types/foo.d.ts' exists - use it as a name resolution result.",
"Resolved under condition 'types'.",
"Exiting conditional exports.",
"Resolving real path for '/node_modules/exports-and-types-versions/types/foo.d.ts', result '/node_modules/exports-and-types-versions/types/foo.d.ts'.",
"======== Module name 'exports-and-types-versions/yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions/types/foo.d.ts@1.0.0'. ========",
"======== Resolving module 'exports-and-types-versions/versioned-yep' from '/main.mts'. ========",
Expand All @@ -137,9 +150,12 @@
"File '/package.json' does not exist according to earlier cached lookups.",
"Loading module 'exports-and-types-versions/versioned-yep' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration.",
"File '/node_modules/exports-and-types-versions/package.json' exists according to earlier cached lookups.",
"Entering conditional exports.",
"Matched 'exports' condition 'types@>=4'.",
"Using 'exports' subpath './versioned-yep' with target './types/foo.d.ts'.",
"File '/node_modules/exports-and-types-versions/types/foo.d.ts' exists - use it as a name resolution result.",
"Resolved under condition 'types@>=4'.",
"Exiting conditional exports.",
"Resolving real path for '/node_modules/exports-and-types-versions/types/foo.d.ts', result '/node_modules/exports-and-types-versions/types/foo.d.ts'.",
"======== Module name 'exports-and-types-versions/versioned-yep' was successfully resolved to '/node_modules/exports-and-types-versions/types/foo.d.ts' with Package ID 'exports-and-types-versions/types/foo.d.ts@1.0.0'. ========",
"======== Resolving module 'exports-and-types-versions/versioned-nah' from '/main.mts'. ========",
Expand All @@ -148,11 +164,15 @@
"File '/package.json' does not exist according to earlier cached lookups.",
"Loading module 'exports-and-types-versions/versioned-nah' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration.",
"File '/node_modules/exports-and-types-versions/package.json' exists according to earlier cached lookups.",
"Entering conditional exports.",
"Saw non-matching condition 'types@<4'.",
"Exiting conditional exports.",
"Export specifier './versioned-nah' does not exist in package.json scope at path '/node_modules/exports-and-types-versions'.",
"Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
"File '/node_modules/exports-and-types-versions/package.json' exists according to earlier cached lookups.",
"Entering conditional exports.",
"Saw non-matching condition 'types@<4'.",
"Exiting conditional exports.",
"Export specifier './versioned-nah' does not exist in package.json scope at path '/node_modules/exports-and-types-versions'.",
"======== Module name 'exports-and-types-versions/versioned-nah' was not resolved. ========",
"======== Resolving module 'just-types-versions/foo' from '/main.mts'. ========",
Expand Down
Loading