deps: apply a few more renames

core/audits/layout-shifts.js

@@ -61,7 +61,7 @@ class LayoutShifts extends Audit {
   static async audit(artifacts, context) {
     const trace = artifacts.traces[Audit.DEFAULT_PASS];
     const traceEngineResult = await TraceEngineResult.request({trace}, 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

core/computed/metrics/lantern-metric.js

@@ -38,10 +38,11 @@ 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;
   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};

core/computed/page-dependency-graph.js

@@ -26,11 +26,11 @@ class PageDependencyGraph {
 
     if (data.fromTrace) {
       const traceEngineResult = await TraceEngineResult.request({trace}, 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;
     }

core/computed/trace-engine-result.js

@@ -35,7 +35,7 @@ class TraceEngineResult {
     ), {});
     if (!processor.parsedTrace) throw new Error('No data');
     if (!processor.insights) throw new Error('No insights');
-    return {data: processor.parsedTrace, insights: processor.insights};
+    return {parsedTrace: processor.parsedTrace, insights: processor.insights};
   }
 
   /**

core/gather/gatherers/root-causes.js

@@ -21,10 +21,10 @@ class RootCauses extends BaseGatherer {
 
   /**
    * @param {LH.Gatherer.Driver} driver
-   * @param {LH.Artifacts.TraceEngineResult['data']} traceParsedData
+   * @param {LH.Artifacts.TraceEngineResult['parsedTrace']} parsedTrace
    * @return {Promise<LH.Artifacts.TraceEngineRootCauses>}
    */
-  static async runRootCauseAnalysis(driver, traceParsedData) {
+  static async runRootCauseAnalysis(driver, parsedTrace) {
     await driver.defaultSession.sendCommand('DOM.enable');
     await driver.defaultSession.sendCommand('CSS.enable');
 
@@ -112,9 +112,9 @@ class RootCauses extends BaseGatherer {
       layoutShifts: {},
     };
     const rootCausesEngine = new TraceEngine.RootCauses(protocolInterface);
-    const layoutShiftEvents = traceParsedData.LayoutShifts.clusters.flatMap(c => c.events);
+    const layoutShiftEvents = parsedTrace.LayoutShifts.clusters.flatMap(c => c.events);
     for (const event of layoutShiftEvents) {
-      const r = await rootCausesEngine.layoutShifts.rootCausesForEvent(traceParsedData, event);
+      const r = await rootCausesEngine.layoutShifts.rootCausesForEvent(parsedTrace, event);
       if (!r) continue;
 
       for (const cause of r.fontChanges) {
@@ -137,7 +137,7 @@ class RootCauses extends BaseGatherer {
   async getArtifact(context) {
     const trace = context.dependencies.Trace;
     const traceEngineResult = await TraceEngineResult.request({trace}, context);
-    return RootCauses.runRootCauseAnalysis(context.driver, traceEngineResult.data);
+    return RootCauses.runRootCauseAnalysis(context.driver, traceEngineResult.parsedTrace);
   }
 }
 

core/gather/gatherers/trace-elements.js

@@ -122,7 +122,7 @@ class TraceElements extends BaseGatherer {
    * that may have caused the shift.
    *
    * @param {LH.Trace} trace
-   * @param {LH.Artifacts.TraceEngineResult['data']} traceEngineResult
+   * @param {LH.Artifacts.TraceEngineResult['parsedTrace']} traceEngineResult
    * @param {LH.Artifacts.TraceEngineRootCauses} rootCauses
    * @param {LH.Gatherer.Context} context
    * @return {Promise<Array<{nodeId: number}>>}
@@ -322,7 +322,7 @@ class TraceElements extends BaseGatherer {
 
     const lcpNodeData = await TraceElements.getLcpElement(trace, context);
     const shiftsData = await TraceElements.getTopLayoutShifts(
-      trace, traceEngineResult.data, rootCauses, context);
+      trace, traceEngineResult.parsedTrace, rootCauses, context);
     const animatedElementData = await this.getAnimatedElements(mainThreadEvents);
     const responsivenessElementData = await TraceElements.getResponsivenessElement(trace, context);
 

types/artifacts.d.ts

@@ -510,7 +510,7 @@ declare module Artifacts {
   }
 
   interface TraceEngineResult {
-    data: TraceEngine.Handlers.Types.ParsedTrace;
+    parsedTrace: TraceEngine.Handlers.Types.ParsedTrace;
     insights: TraceEngine.Insights.Types.TraceInsightSets;
   }