Skip to content

Commit 192e509

Browse files
misc(chore): rename traceEngineData to parsedTrace (#16270)
Co-authored-by: Connor Clark <cjamcl@google.com>
1 parent 968a1de commit 192e509

File tree

7 files changed

+15
-14
lines changed

7 files changed

+15
-14
lines changed

core/audits/insights/insight-audit.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const str_ = i18n.createIcuMessageFn(import.meta.url, {});
1616
/**
1717
* @param {LH.Artifacts} artifacts
1818
* @param {LH.Audit.Context} context
19-
* @return {Promise<{insights: import('@paulirish/trace_engine/models/trace/insights/types.js').InsightSet|undefined, parsedTrace: LH.Artifacts.TraceEngineResult['data']}>}
19+
* @return {Promise<{insights: import('@paulirish/trace_engine/models/trace/insights/types.js').InsightSet|undefined, parsedTrace: LH.Artifacts.TraceEngineResult['parsedTrace']}>}
2020
*/
2121
async function getInsightSet(artifacts, context) {
2222
const settings = context.settings;
@@ -29,13 +29,13 @@ async function getInsightSet(artifacts, context) {
2929
const key = navigationId ?? NO_NAVIGATION;
3030
const insights = traceEngineResult.insights.get(key);
3131

32-
return {insights, parsedTrace: traceEngineResult.data};
32+
return {insights, parsedTrace: traceEngineResult.parsedTrace};
3333
}
3434

3535
/**
3636
* @typedef CreateDetailsExtras
3737
* @property {import('@paulirish/trace_engine/models/trace/insights/types.js').InsightSet} insights
38-
* @property {LH.Artifacts.TraceEngineResult['data']} parsedTrace
38+
* @property {LH.Artifacts.TraceEngineResult['parsedTrace']} parsedTrace
3939
*/
4040

4141
/**

core/audits/layout-shifts.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class LayoutShifts extends Audit {
6262
const SourceMaps = artifacts.SourceMaps;
6363
const traceEngineResult =
6464
await TraceEngineResult.request({trace, settings, SourceMaps}, context);
65-
const clusters = traceEngineResult.data.LayoutShifts.clusters ?? [];
65+
const clusters = traceEngineResult.parsedTrace.LayoutShifts.clusters ?? [];
6666
const {cumulativeLayoutShift: clsSavings, impactByNodeId} =
6767
await CumulativeLayoutShiftComputed.request(trace, context);
6868
const traceElements = artifacts.TraceElements

core/computed/metrics/lantern-metric.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,15 @@ async function getComputationDataParamsFromTrace(data, context) {
3838

3939
const graph = await PageDependencyGraph.request({...data, fromTrace: true}, context);
4040
const traceEngineResult = await TraceEngineResult.request(data, context);
41-
const frameId = traceEngineResult.data.Meta.mainFrameId;
42-
const navigationId = traceEngineResult.data.Meta.mainFrameNavigations[0].args.data?.navigationId;
41+
const frameId = traceEngineResult.parsedTrace.Meta.mainFrameId;
42+
const navigationId =
43+
traceEngineResult.parsedTrace.Meta.mainFrameNavigations[0].args.data?.navigationId;
4344
if (!navigationId) {
4445
throw new Error(`Lantern metrics could not be calculated due to missing navigation id`);
4546
}
4647

4748
const processedNavigation = Lantern.TraceEngineComputationData.createProcessedNavigation(
48-
traceEngineResult.data, frameId, navigationId);
49+
traceEngineResult.parsedTrace, frameId, navigationId);
4950
const simulator = data.simulator || (await LoadSimulator.request(data, context));
5051

5152
return {simulator, graph, processedNavigation};

core/computed/page-dependency-graph.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ class PageDependencyGraph {
2727
if (data.fromTrace) {
2828
const traceEngineResult =
2929
await TraceEngineResult.request({trace, settings, SourceMaps}, context);
30-
const traceEngineData = traceEngineResult.data;
30+
const parsedTrace = traceEngineResult.parsedTrace;
3131
const requests =
32-
Lantern.TraceEngineComputationData.createNetworkRequests(trace, traceEngineData);
32+
Lantern.TraceEngineComputationData.createNetworkRequests(trace, parsedTrace);
3333
const graph =
34-
Lantern.TraceEngineComputationData.createGraph(requests, trace, traceEngineData, URL);
34+
Lantern.TraceEngineComputationData.createGraph(requests, trace, parsedTrace, URL);
3535
// @ts-expect-error for now, ignore that this is a SyntheticNetworkEvent instead of LH's NetworkEvent.
3636
return graph;
3737
}

core/computed/trace-engine-result.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class TraceEngineResult {
6363
if (!processor.parsedTrace) throw new Error('No data');
6464
if (!processor.insights) throw new Error('No insights');
6565
this.localizeInsights(processor.insights);
66-
return {data: processor.parsedTrace, insights: processor.insights};
66+
return {parsedTrace: processor.parsedTrace, insights: processor.insights};
6767
}
6868

6969
/**

core/gather/gatherers/trace-elements.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ class TraceElements extends BaseGatherer {
173173
* that may have caused the shift.
174174
*
175175
* @param {LH.Trace} trace
176-
* @param {LH.Artifacts.TraceEngineResult['data']} traceEngineResult
176+
* @param {LH.Artifacts.TraceEngineResult['parsedTrace']} traceEngineResult
177177
* @param {LH.Gatherer.Context} context
178178
* @return {Promise<Array<{nodeId: number}>>}
179179
*/
@@ -369,7 +369,7 @@ class TraceElements extends BaseGatherer {
369369
traceEngineResult, navigationId);
370370
const lcpNodeData = await TraceElements.getLcpElement(trace, context);
371371
const shiftsData = await TraceElements.getTopLayoutShifts(
372-
trace, traceEngineResult.data, context);
372+
trace, traceEngineResult.parsedTrace, context);
373373
const animatedElementData = await this.getAnimatedElements(mainThreadEvents);
374374
const responsivenessElementData = await TraceElements.getResponsivenessElement(trace, context);
375375

types/artifacts.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ declare module Artifacts {
508508
}
509509

510510
interface TraceEngineResult {
511-
data: TraceEngine.Handlers.Types.ParsedTrace;
511+
parsedTrace: TraceEngine.Handlers.Types.ParsedTrace;
512512
insights: TraceEngine.Insights.Types.TraceInsightSets;
513513
}
514514

0 commit comments

Comments
 (0)