Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions core/audits/insights/insight-audit.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const str_ = i18n.createIcuMessageFn(import.meta.url, {});
/**
* @param {LH.Artifacts} artifacts
* @param {LH.Audit.Context} context
* @return {Promise<{insights: import('@paulirish/trace_engine/models/trace/insights/types.js').InsightSet|undefined, parsedTrace: LH.Artifacts.TraceEngineResult['data']}>}
* @return {Promise<{insights: import('@paulirish/trace_engine/models/trace/insights/types.js').InsightSet|undefined, parsedTrace: LH.Artifacts.TraceEngineResult['parsedTrace']}>}
*/
async function getInsightSet(artifacts, context) {
const settings = context.settings;
Expand All @@ -29,13 +29,13 @@ async function getInsightSet(artifacts, context) {
const key = navigationId ?? NO_NAVIGATION;
const insights = traceEngineResult.insights.get(key);

return {insights, parsedTrace: traceEngineResult.data};
return {insights, parsedTrace: traceEngineResult.parsedTrace};
}

/**
* @typedef CreateDetailsExtras
* @property {import('@paulirish/trace_engine/models/trace/insights/types.js').InsightSet} insights
* @property {LH.Artifacts.TraceEngineResult['data']} parsedTrace
* @property {LH.Artifacts.TraceEngineResult['parsedTrace']} parsedTrace
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion core/audits/layout-shifts.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class LayoutShifts extends Audit {
const SourceMaps = artifacts.SourceMaps;
const traceEngineResult =
await TraceEngineResult.request({trace, settings, SourceMaps}, context);
const clusters = traceEngineResult.data.LayoutShifts.clusters ?? [];
const clusters = traceEngineResult.parsedTrace.LayoutShifts.clusters ?? [];
const {cumulativeLayoutShift: clsSavings, impactByNodeId} =
await CumulativeLayoutShiftComputed.request(trace, context);
const traceElements = artifacts.TraceElements
Expand Down
7 changes: 4 additions & 3 deletions core/computed/metrics/lantern-metric.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,15 @@ async function getComputationDataParamsFromTrace(data, context) {

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

const processedNavigation = Lantern.TraceEngineComputationData.createProcessedNavigation(
traceEngineResult.data, frameId, navigationId);
traceEngineResult.parsedTrace, frameId, navigationId);
const simulator = data.simulator || (await LoadSimulator.request(data, context));

return {simulator, graph, processedNavigation};
Expand Down
6 changes: 3 additions & 3 deletions core/computed/page-dependency-graph.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ class PageDependencyGraph {
if (data.fromTrace) {
const traceEngineResult =
await TraceEngineResult.request({trace, settings, SourceMaps}, context);
const traceEngineData = traceEngineResult.data;
const parsedTrace = traceEngineResult.parsedTrace;
const requests =
Lantern.TraceEngineComputationData.createNetworkRequests(trace, traceEngineData);
Lantern.TraceEngineComputationData.createNetworkRequests(trace, parsedTrace);
const graph =
Lantern.TraceEngineComputationData.createGraph(requests, trace, traceEngineData, URL);
Lantern.TraceEngineComputationData.createGraph(requests, trace, parsedTrace, URL);
// @ts-expect-error for now, ignore that this is a SyntheticNetworkEvent instead of LH's NetworkEvent.
return graph;
}
Expand Down
2 changes: 1 addition & 1 deletion core/computed/trace-engine-result.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class TraceEngineResult {
if (!processor.parsedTrace) throw new Error('No data');
if (!processor.insights) throw new Error('No insights');
this.localizeInsights(processor.insights);
return {data: processor.parsedTrace, insights: processor.insights};
return {parsedTrace: processor.parsedTrace, insights: processor.insights};
}

/**
Expand Down
4 changes: 2 additions & 2 deletions core/gather/gatherers/trace-elements.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
* that may have caused the shift.
*
* @param {LH.Trace} trace
* @param {LH.Artifacts.TraceEngineResult['data']} traceEngineResult
* @param {LH.Artifacts.TraceEngineResult['parsedTrace']} traceEngineResult

Check warning on line 176 in core/gather/gatherers/trace-elements.js

View check run for this annotation

Codecov / codecov/patch

core/gather/gatherers/trace-elements.js#L176

Added line #L176 was not covered by tests
* @param {LH.Gatherer.Context} context
* @return {Promise<Array<{nodeId: number}>>}
*/
Expand Down Expand Up @@ -369,7 +369,7 @@
traceEngineResult, navigationId);
const lcpNodeData = await TraceElements.getLcpElement(trace, context);
const shiftsData = await TraceElements.getTopLayoutShifts(
trace, traceEngineResult.data, context);
trace, traceEngineResult.parsedTrace, context);

Check warning on line 372 in core/gather/gatherers/trace-elements.js

View check run for this annotation

Codecov / codecov/patch

core/gather/gatherers/trace-elements.js#L372

Added line #L372 was not covered by tests
const animatedElementData = await this.getAnimatedElements(mainThreadEvents);
const responsivenessElementData = await TraceElements.getResponsivenessElement(trace, context);

Expand Down
2 changes: 1 addition & 1 deletion types/artifacts.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ declare module Artifacts {
}

interface TraceEngineResult {
data: TraceEngine.Handlers.Types.ParsedTrace;
parsedTrace: TraceEngine.Handlers.Types.ParsedTrace;
insights: TraceEngine.Insights.Types.TraceInsightSets;
}

Expand Down