lighthouse 12.1.0 → 12.2.0

package/core/computed/metrics/lantern-max-potential-fid.js

@@ -9,18 +9,16 @@ import {makeComputedArtifact} from '../computed-artifact.js';
 import {getComputationDataParams, lanternErrorAdapter} from './lantern-metric.js';
 import {LanternFirstContentfulPaint} from './lantern-first-contentful-paint.js';
 
-/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
-
 class LanternMaxPotentialFID extends Lantern.Metrics.MaxPotentialFID {
   /**
    * @param {LH.Artifacts.MetricComputationDataInput} data
    * @param {LH.Artifacts.ComputedContext} context
-   * @param {Omit<Extras, 'optimistic'>=} extras
+   * @param {Omit<Lantern.Metrics.Extras, 'optimistic'>=} extras
    * @return {Promise<LH.Artifacts.LanternMetric>}
    */
   static async computeMetricWithGraphs(data, context, extras) {
-    return this.compute(await getComputationDataParams(data, context), extras)
-      .catch(lanternErrorAdapter);
+    const params = await getComputationDataParams(data, context);
+    return Promise.resolve(this.compute(params, extras)).catch(lanternErrorAdapter);
   }
 
   /**

package/core/computed/metrics/lantern-metric.d.ts

@@ -3,17 +3,17 @@
  * @param {LH.Artifacts.ComputedContext} context
  */
 export function getComputationDataParamsFromTrace(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext): Promise<{
-    simulator: Lantern.Simulation.Simulator<any>;
-    graph: import("../page-dependency-graph.js").Node;
-    processedNavigation: import("../../lib/lantern/types/lantern.js").Simulation.ProcessedNavigation;
+    simulator: import("../../../types/gatherer.js").default.Simulation.Simulator;
+    graph: import("../../../types/gatherer.js").default.Simulation.GraphNode;
+    processedNavigation: Lantern.Types.Simulation.ProcessedNavigation;
 }>;
 /**
  * @param {LH.Artifacts.MetricComputationDataInput} data
  * @param {LH.Artifacts.ComputedContext} context
  */
 export function getComputationDataParamsFromDevtoolsLog(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext): Promise<{
-    simulator: Lantern.Simulation.Simulator<any>;
-    graph: import("../page-dependency-graph.js").Node;
+    simulator: import("../../../types/gatherer.js").default.Simulation.Simulator;
+    graph: import("../../../types/gatherer.js").default.Simulation.GraphNode;
     processedNavigation: import("../../index.js").Artifacts.ProcessedNavigation;
 }>;
 /**
@@ -21,9 +21,9 @@ export function getComputationDataParamsFromDevtoolsLog(data: LH.Artifacts.Metri
  * @param {LH.Artifacts.ComputedContext} context
  */
 export function getComputationDataParams(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext): Promise<{
-    simulator: Lantern.Simulation.Simulator<any>;
-    graph: import("../page-dependency-graph.js").Node;
-    processedNavigation: import("../../lib/lantern/types/lantern.js").Simulation.ProcessedNavigation;
+    simulator: import("../../../types/gatherer.js").default.Simulation.Simulator;
+    graph: import("../../../types/gatherer.js").default.Simulation.GraphNode;
+    processedNavigation: Lantern.Types.Simulation.ProcessedNavigation;
 }>;
 /**
  * @param {unknown} err

package/core/computed/metrics/lantern-metric.js

@@ -50,7 +50,7 @@ async function getComputationDataParamsFromTrace(data, context) {
  * @return {never}
  */
 function lanternErrorAdapter(err) {
-  if (!(err instanceof Lantern.Error)) {
+  if (!(err instanceof Lantern.Core.LanternError)) {
     throw err;
   }
 

package/core/computed/metrics/lantern-speed-index.d.ts

@@ -1,19 +1,15 @@
 export { LanternSpeedIndexComputed as LanternSpeedIndex };
-export type Extras = import('../../lib/lantern/Metric.js').Extras;
 declare const LanternSpeedIndexComputed: typeof LanternSpeedIndex & {
-    request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: import("../../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<import("../../index.js").Artifacts.LanternMetric>;
+    request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext) => ReturnType<typeof LanternSpeedIndex.compute_>;
 };
-/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
 declare class LanternSpeedIndex extends Lantern.Metrics.SpeedIndex {
     /**
      * @param {LH.Artifacts.MetricComputationDataInput} data
      * @param {LH.Artifacts.ComputedContext} context
-     * @param {Omit<Extras, 'optimistic'>=} extras
+     * @param {Omit<Lantern.Metrics.Extras, 'optimistic'>=} extras
      * @return {Promise<LH.Artifacts.LanternMetric>}
      */
-    static computeMetricWithGraphs(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext, extras?: Omit<Extras, 'optimistic'> | undefined): Promise<LH.Artifacts.LanternMetric>;
+    static computeMetricWithGraphs(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext, extras?: Omit<Lantern.Metrics.Extras, "optimistic"> | undefined): Promise<LH.Artifacts.LanternMetric>;
     /**
      * @param {LH.Artifacts.MetricComputationDataInput} data
      * @param {LH.Artifacts.ComputedContext} context

package/core/computed/metrics/lantern-speed-index.js

@@ -10,18 +10,16 @@ import {getComputationDataParams, lanternErrorAdapter} from './lantern-metric.js
 import {Speedline} from '../speedline.js';
 import {LanternFirstContentfulPaint} from './lantern-first-contentful-paint.js';
 
-/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
-
 class LanternSpeedIndex extends Lantern.Metrics.SpeedIndex {
   /**
    * @param {LH.Artifacts.MetricComputationDataInput} data
    * @param {LH.Artifacts.ComputedContext} context
-   * @param {Omit<Extras, 'optimistic'>=} extras
+   * @param {Omit<Lantern.Metrics.Extras, 'optimistic'>=} extras
    * @return {Promise<LH.Artifacts.LanternMetric>}
    */
   static async computeMetricWithGraphs(data, context, extras) {
-    return this.compute(await getComputationDataParams(data, context), extras)
-      .catch(lanternErrorAdapter);
+    const params = await getComputationDataParams(data, context);
+    return Promise.resolve(this.compute(params, extras)).catch(lanternErrorAdapter);
   }
 
   /**

package/core/computed/metrics/lantern-total-blocking-time.d.ts

@@ -1,19 +1,15 @@
 export { LanternTotalBlockingTimeComputed as LanternTotalBlockingTime };
-export type Extras = import('../../lib/lantern/Metric.js').Extras;
 declare const LanternTotalBlockingTimeComputed: typeof LanternTotalBlockingTime & {
-    request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: import("../../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<import("../../index.js").Artifacts.LanternMetric>;
+    request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext) => ReturnType<typeof LanternTotalBlockingTime.compute_>;
 };
-/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
 declare class LanternTotalBlockingTime extends Lantern.Metrics.TotalBlockingTime {
     /**
      * @param {LH.Artifacts.MetricComputationDataInput} data
      * @param {LH.Artifacts.ComputedContext} context
-     * @param {Omit<Extras, 'optimistic'>=} extras
+     * @param {Omit<Lantern.Metrics.Extras, 'optimistic'>=} extras
      * @return {Promise<LH.Artifacts.LanternMetric>}
      */
-    static computeMetricWithGraphs(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext, extras?: Omit<Extras, 'optimistic'> | undefined): Promise<LH.Artifacts.LanternMetric>;
+    static computeMetricWithGraphs(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext, extras?: Omit<Lantern.Metrics.Extras, "optimistic"> | undefined): Promise<LH.Artifacts.LanternMetric>;
     /**
      * @param {LH.Artifacts.MetricComputationDataInput} data
      * @param {LH.Artifacts.ComputedContext} context

package/core/computed/metrics/lantern-total-blocking-time.js

@@ -10,13 +10,11 @@ import {LanternFirstContentfulPaint} from './lantern-first-contentful-paint.js';
 import {LanternInteractive} from './lantern-interactive.js';
 import {getComputationDataParams} from './lantern-metric.js';
 
-/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
-
 class LanternTotalBlockingTime extends Lantern.Metrics.TotalBlockingTime {
   /**
    * @param {LH.Artifacts.MetricComputationDataInput} data
    * @param {LH.Artifacts.ComputedContext} context
-   * @param {Omit<Extras, 'optimistic'>=} extras
+   * @param {Omit<Lantern.Metrics.Extras, 'optimistic'>=} extras
    * @return {Promise<LH.Artifacts.LanternMetric>}
    */
   static async computeMetricWithGraphs(data, context, extras) {

package/core/computed/metrics/largest-contentful-paint-all-frames.d.ts

@@ -1,8 +1,6 @@
 export { LargestContentfulPaintAllFramesComputed as LargestContentfulPaintAllFrames };
 declare const LargestContentfulPaintAllFramesComputed: typeof LargestContentfulPaintAllFrames & {
-    request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: import("../../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<import("../../index.js").Artifacts.Metric | import("../../index.js").Artifacts.LanternMetric>;
+    request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext) => ReturnType<typeof NavigationMetric.compute_>;
 };
 declare class LargestContentfulPaintAllFrames extends NavigationMetric {
     /**

package/core/computed/metrics/largest-contentful-paint.d.ts

@@ -1,8 +1,6 @@
 export { LargestContentfulPaintComputed as LargestContentfulPaint };
 declare const LargestContentfulPaintComputed: typeof LargestContentfulPaint & {
-    request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: import("../../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<import("../../index.js").Artifacts.Metric | import("../../index.js").Artifacts.LanternMetric>;
+    request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext) => ReturnType<typeof NavigationMetric.compute_>;
 };
 declare class LargestContentfulPaint extends NavigationMetric {
     /**

package/core/computed/metrics/lcp-breakdown.d.ts

@@ -1,12 +1,6 @@
 export { LCPBreakdownComputed as LCPBreakdown };
 declare const LCPBreakdownComputed: typeof LCPBreakdown & {
-    request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: import("../../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<{
-        ttfb: number;
-        loadStart?: number | undefined;
-        loadEnd?: number | undefined;
-    }>;
+    request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext) => ReturnType<typeof LCPBreakdown.compute_>;
 };
 declare class LCPBreakdown {
     /**
@@ -16,8 +10,8 @@ declare class LCPBreakdown {
      */
     static compute_(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext): Promise<{
         ttfb: number;
-        loadStart?: number | undefined;
-        loadEnd?: number | undefined;
+        loadStart?: number;
+        loadEnd?: number;
     }>;
 }
 //# sourceMappingURL=lcp-breakdown.d.ts.map

package/core/computed/metrics/max-potential-fid.d.ts

@@ -1,8 +1,6 @@
 export { MaxPotentialFIDComputed as MaxPotentialFID };
 declare const MaxPotentialFIDComputed: typeof MaxPotentialFID & {
-    request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: import("../../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<import("../../index.js").Artifacts.Metric | import("../../index.js").Artifacts.LanternMetric>;
+    request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext) => ReturnType<typeof NavigationMetric.compute_>;
 };
 declare class MaxPotentialFID extends NavigationMetric {
     /**

package/core/computed/metrics/responsiveness.d.ts

@@ -1,15 +1,15 @@
 export { ResponsivenessComputed as Responsiveness };
 export type ResponsivenessEvent = LH.Trace.CompleteEvent & {
-    name: 'Responsiveness.Renderer.UserInteraction';
+    name: "Responsiveness.Renderer.UserInteraction";
     args: {
         frame: string;
         data: {
-            interactionType: 'drag' | 'keyboard' | 'tapOrClick';
+            interactionType: "drag" | "keyboard" | "tapOrClick";
             maxDuration: number;
         };
     };
 };
-export type EventTimingType = 'keydown' | 'keypress' | 'keyup' | 'mousedown' | 'mouseup' | 'pointerdown' | 'pointerup' | 'click';
+export type EventTimingType = "keydown" | "keypress" | "keyup" | "mousedown" | "mouseup" | "pointerdown" | "pointerup" | "click";
 export type EventTimingData = {
     frame: string;
     /**
@@ -33,7 +33,7 @@ export type EventTimingData = {
     interactionId: number;
 };
 export type EventTimingEvent = LH.Trace.AsyncEvent & {
-    name: 'EventTiming';
+    name: "EventTiming";
     args: {
         data: EventTimingData;
     };
@@ -41,10 +41,8 @@ export type EventTimingEvent = LH.Trace.AsyncEvent & {
 declare const ResponsivenessComputed: typeof Responsiveness & {
     request: (dependencies: {
         trace: LH.Trace;
-        settings: LH.Audit.Context['settings'];
-    }, context: import("../../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<EventTimingEvent | null>;
+        settings: LH.Audit.Context["settings"];
+    }, context: LH.Artifacts.ComputedContext) => ReturnType<typeof Responsiveness.compute_>;
 };
 declare class Responsiveness {
     /**
@@ -72,8 +70,7 @@ declare class Responsiveness {
      */
     static compute_(data: {
         trace: LH.Trace;
-        settings: LH.Audit.Context['settings'];
+        settings: LH.Audit.Context["settings"];
     }, context: LH.Artifacts.ComputedContext): Promise<EventTimingEvent | null>;
 }
-import { ProcessedTrace } from '../processed-trace.js';
 //# sourceMappingURL=responsiveness.d.ts.map

package/core/computed/metrics/speed-index.d.ts

@@ -1,8 +1,6 @@
 export { SpeedIndexComputed as SpeedIndex };
 declare const SpeedIndexComputed: typeof SpeedIndex & {
-    request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: import("../../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<import("../../index.js").Artifacts.Metric | import("../../index.js").Artifacts.LanternMetric>;
+    request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext) => ReturnType<typeof NavigationMetric.compute_>;
 };
 declare class SpeedIndex extends NavigationMetric {
     /**

package/core/computed/metrics/time-to-first-byte.d.ts

@@ -1,8 +1,6 @@
 export { TimeToFirstByteComputed as TimeToFirstByte };
 declare const TimeToFirstByteComputed: typeof TimeToFirstByte & {
-    request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: import("../../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<import("../../index.js").Artifacts.Metric | import("../../index.js").Artifacts.LanternMetric>;
+    request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext) => ReturnType<typeof NavigationMetric.compute_>;
 };
 declare class TimeToFirstByte extends NavigationMetric {
     /**

package/core/computed/metrics/timing-summary.d.ts

@@ -2,16 +2,11 @@ export { TimingSummaryComputed as TimingSummary };
 declare const TimingSummaryComputed: typeof TimingSummary & {
     request: (dependencies: {
         trace: LH.Trace;
-        devtoolsLog: import("../../index.js").DevtoolsLog;
-        gatherContext: LH.Artifacts['GatherContext'];
+        devtoolsLog: LH.DevtoolsLog;
+        gatherContext: LH.Artifacts["GatherContext"];
         settings: LH.Util.ImmutableObject<LH.Config.Settings>;
-        URL: LH.Artifacts['URL'];
-    }, context: import("../../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<{
-        metrics: LH.Artifacts.TimingSummary;
-        debugInfo: Record<string, boolean>;
-    }>;
+        URL: LH.Artifacts["URL"];
+    }, context: LH.Artifacts.ComputedContext) => ReturnType<typeof TimingSummary.compute_>;
 };
 declare class TimingSummary {
     /**
@@ -23,7 +18,7 @@ declare class TimingSummary {
        * @param {LH.Artifacts.ComputedContext} context
        * @return {Promise<{metrics: LH.Artifacts.TimingSummary, debugInfo: Record<string,boolean>}>}
        */
-    static summarize(trace: LH.Trace, devtoolsLog: import("../../index.js").DevtoolsLog, gatherContext: LH.Artifacts['GatherContext'], settings: LH.Util.ImmutableObject<LH.Config.Settings>, URL: LH.Artifacts['URL'], context: LH.Artifacts.ComputedContext): Promise<{
+    static summarize(trace: LH.Trace, devtoolsLog: LH.DevtoolsLog, gatherContext: LH.Artifacts["GatherContext"], settings: LH.Util.ImmutableObject<LH.Config.Settings>, URL: LH.Artifacts["URL"], context: LH.Artifacts.ComputedContext): Promise<{
         metrics: LH.Artifacts.TimingSummary;
         debugInfo: Record<string, boolean>;
     }>;
@@ -34,10 +29,10 @@ declare class TimingSummary {
      */
     static compute_(data: {
         trace: LH.Trace;
-        devtoolsLog: import("../../index.js").DevtoolsLog;
-        gatherContext: LH.Artifacts['GatherContext'];
+        devtoolsLog: LH.DevtoolsLog;
+        gatherContext: LH.Artifacts["GatherContext"];
         settings: LH.Util.ImmutableObject<LH.Config.Settings>;
-        URL: LH.Artifacts['URL'];
+        URL: LH.Artifacts["URL"];
     }, context: LH.Artifacts.ComputedContext): Promise<{
         metrics: LH.Artifacts.TimingSummary;
         debugInfo: Record<string, boolean>;

package/core/computed/metrics/total-blocking-time.d.ts

@@ -1,8 +1,6 @@
 export { TotalBlockingTimeComputed as TotalBlockingTime };
 declare const TotalBlockingTimeComputed: typeof TotalBlockingTime & {
-    request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: import("../../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<import("../../index.js").Artifacts.Metric | import("../../index.js").Artifacts.LanternMetric>;
+    request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext) => ReturnType<typeof ComputedMetric.compute_>;
 };
 /**
  * @fileoverview This audit determines Total Blocking Time.

package/core/computed/metrics/total-blocking-time.js

@@ -11,7 +11,7 @@ import {TraceProcessor} from '../../lib/tracehouse/trace-processor.js';
 import {LanternTotalBlockingTime} from './lantern-total-blocking-time.js';
 import {Interactive} from './interactive.js';
 
-const {calculateSumOfBlockingTime} = Lantern.TBTUtils;
+const {calculateSumOfBlockingTime} = Lantern.Metrics.TBTUtils;
 
 /**
  * @fileoverview This audit determines Total Blocking Time.

package/core/computed/module-duplication.d.ts

@@ -1,12 +1,6 @@
 export { ModuleDuplicationComputed as ModuleDuplication };
 declare const ModuleDuplicationComputed: typeof ModuleDuplication & {
-    request: (dependencies: Pick<import("../index.js").Artifacts, "SourceMaps" | "Scripts">, context: import("../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<Map<string, {
-        scriptId: string;
-        scriptUrl: string;
-        resourceSize: number;
-    }[]>>;
+    request: (dependencies: Pick<import("../index.js").Artifacts, "SourceMaps" | "Scripts">, context: LH.Artifacts.ComputedContext) => ReturnType<typeof ModuleDuplication.compute_>;
 };
 declare class ModuleDuplication {
     /**
@@ -28,7 +22,7 @@ declare class ModuleDuplication {
      * @param {Pick<LH.Artifacts, 'Scripts'|'SourceMaps'>} artifacts
      * @param {LH.Artifacts.ComputedContext} context
      */
-    static compute_(artifacts: Pick<LH.Artifacts, 'Scripts' | 'SourceMaps'>, context: LH.Artifacts.ComputedContext): Promise<Map<string, {
+    static compute_(artifacts: Pick<LH.Artifacts, "Scripts" | "SourceMaps">, context: LH.Artifacts.ComputedContext): Promise<Map<string, {
         scriptId: string;
         scriptUrl: string;
         resourceSize: number;

package/core/computed/navigation-insights.d.ts

@@ -1,8 +1,6 @@
 export { NavigationInsightsComputed as NavigationInsights };
 declare const NavigationInsightsComputed: typeof NavigationInsights & {
-    request: (dependencies: import("../index.js").Trace, context: import("../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<import("@paulirish/trace_engine/models/trace/insights/types.js").NavigationInsightData<typeof import("@paulirish/trace_engine/models/trace/handlers/ModelHandlers.js")>>;
+    request: (dependencies: import("../index.js").Trace, context: LH.Artifacts.ComputedContext) => ReturnType<typeof NavigationInsights.compute_>;
 };
 /**
  * @fileoverview Gets insights from the shared trace engine for the navigation audited by Lighthouse.
@@ -13,6 +11,6 @@ declare class NavigationInsights {
       * @param {LH.Trace} trace
       * @param {LH.Artifacts.ComputedContext} context
      */
-    static compute_(trace: LH.Trace, context: LH.Artifacts.ComputedContext): Promise<import("@paulirish/trace_engine/models/trace/insights/types.js").NavigationInsightData<typeof import("@paulirish/trace_engine/models/trace/handlers/ModelHandlers.js")>>;
+    static compute_(trace: LH.Trace, context: LH.Artifacts.ComputedContext): Promise<import("@paulirish/trace_engine/models/trace/insights/types.js").NavigationInsightData>;
 }
 //# sourceMappingURL=navigation-insights.d.ts.map

package/core/computed/network-analysis.d.ts

@@ -1,8 +1,6 @@
 export { NetworkAnalysisComputed as NetworkAnalysis };
 declare const NetworkAnalysisComputed: typeof NetworkAnalysis & {
-    request: (dependencies: import("../index.js").DevtoolsLog, context: import("../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<import("../index.js").Artifacts.NetworkAnalysis>;
+    request: (dependencies: import("../index.js").DevtoolsLog, context: LH.Artifacts.ComputedContext) => ReturnType<typeof NetworkAnalysis.compute_>;
 };
 declare class NetworkAnalysis {
     /**
@@ -10,6 +8,6 @@ declare class NetworkAnalysis {
      * @param {LH.Artifacts.ComputedContext} context
      * @return {Promise<LH.Artifacts.NetworkAnalysis>}
      */
-    static compute_(devtoolsLog: import("../index.js").DevtoolsLog, context: LH.Artifacts.ComputedContext): Promise<LH.Artifacts.NetworkAnalysis>;
+    static compute_(devtoolsLog: LH.DevtoolsLog, context: LH.Artifacts.ComputedContext): Promise<LH.Artifacts.NetworkAnalysis>;
 }
 //# sourceMappingURL=network-analysis.d.ts.map

package/core/computed/network-analysis.js

@@ -16,7 +16,7 @@ class NetworkAnalysis {
    */
   static async compute_(devtoolsLog, context) {
     const records = await NetworkRecords.request(devtoolsLog, context);
-    return Lantern.Simulation.NetworkAnalyzer.analyze(records);
+    return Lantern.Core.NetworkAnalyzer.analyze(records);
   }
 }
 

package/core/computed/network-records.d.ts

@@ -1,8 +1,6 @@
 export { NetworkRecordsComputed as NetworkRecords };
 declare const NetworkRecordsComputed: typeof NetworkRecords & {
-    request: (dependencies: LH.DevtoolsLog, context: LH.Util.ImmutableObject<{
-        computedCache: Map<string, import("../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<import("../lib/network-request.js").NetworkRequest[]>;
+    request: (dependencies: LH.DevtoolsLog, context: LH.Artifacts.ComputedContext) => ReturnType<typeof NetworkRecords.compute_>;
 };
 declare class NetworkRecords {
     /**

package/core/computed/page-dependency-graph.d.ts

@@ -1,28 +1,23 @@
 export { PageDependencyGraphComputed as PageDependencyGraph };
-export type Node = import('../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>;
 declare const PageDependencyGraphComputed: typeof PageDependencyGraph & {
     request: (dependencies: {
         trace: LH.Trace;
-        devtoolsLog: import("../index.js").DevtoolsLog;
-        URL: LH.Artifacts['URL'];
-        fromTrace?: boolean | undefined;
-    }, context: import("../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<Node>;
+        devtoolsLog: LH.DevtoolsLog;
+        URL: LH.Artifacts["URL"];
+        fromTrace?: boolean;
+    }, context: LH.Artifacts.ComputedContext) => ReturnType<typeof PageDependencyGraph.compute_>;
 };
-import { NetworkRequest } from '../lib/network-request.js';
-/** @typedef {import('../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>} Node */
 declare class PageDependencyGraph {
     /**
      * @param {{trace: LH.Trace, devtoolsLog: LH.DevtoolsLog, URL: LH.Artifacts['URL'], fromTrace?: boolean}} data
      * @param {LH.Artifacts.ComputedContext} context
-     * @return {Promise<Node>}
+     * @return {Promise<LH.Gatherer.Simulation.GraphNode>}
      */
     static compute_(data: {
         trace: LH.Trace;
-        devtoolsLog: import("../index.js").DevtoolsLog;
-        URL: LH.Artifacts['URL'];
-        fromTrace?: boolean | undefined;
-    }, context: LH.Artifacts.ComputedContext): Promise<Node>;
+        devtoolsLog: LH.DevtoolsLog;
+        URL: LH.Artifacts["URL"];
+        fromTrace?: boolean;
+    }, context: LH.Artifacts.ComputedContext): Promise<LH.Gatherer.Simulation.GraphNode>;
 }
 //# sourceMappingURL=page-dependency-graph.d.ts.map

package/core/computed/page-dependency-graph.js

@@ -11,13 +11,11 @@ import {ProcessedTrace} from './processed-trace.js';
 import {NetworkRecords} from './network-records.js';
 import {TraceEngineResult} from './trace-engine-result.js';
 
-/** @typedef {import('../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>} Node */
-
 class PageDependencyGraph {
   /**
    * @param {{trace: LH.Trace, devtoolsLog: LH.DevtoolsLog, URL: LH.Artifacts['URL'], fromTrace?: boolean}} data
    * @param {LH.Artifacts.ComputedContext} context
-   * @return {Promise<Node>}
+   * @return {Promise<LH.Gatherer.Simulation.GraphNode>}
    */
   static async compute_(data, context) {
     const {trace, devtoolsLog, URL} = data;
@@ -33,11 +31,12 @@ class PageDependencyGraph {
         Lantern.TraceEngineComputationData.createNetworkRequests(trace, traceEngineData);
       const graph =
         Lantern.TraceEngineComputationData.createGraph(requests, trace, traceEngineData, URL);
+      // @ts-expect-error for now, ignore that this is a SyntheticNetworkEvent instead of LH's NetworkEvent.
       return graph;
     }
 
     const lanternRequests = networkRecords.map(NetworkRequest.asLanternNetworkRequest);
-    return Lantern.PageDependencyGraph.createGraph(mainThreadEvents, lanternRequests, URL);
+    return Lantern.Graph.PageDependencyGraph.createGraph(mainThreadEvents, lanternRequests, URL);
   }
 }
 

package/core/computed/processed-navigation.d.ts

@@ -1,15 +1,13 @@
 export { ProcessedNavigationComputed as ProcessedNavigation };
 declare const ProcessedNavigationComputed: typeof ProcessedNavigation & {
-    request: (dependencies: import("../index.js").Trace | import("../index.js").Artifacts.ProcessedTrace, context: import("../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<import("../index.js").Artifacts.ProcessedNavigation>;
+    request: (dependencies: import("../index.js").Trace | import("../index.js").Artifacts.ProcessedTrace, context: LH.Artifacts.ComputedContext) => ReturnType<typeof ProcessedNavigation.compute_>;
 };
 declare class ProcessedNavigation {
     /**
      * @param {LH.Trace | LH.Artifacts.ProcessedTrace} traceOrProcessedTrace
      * @return {traceOrProcessedTrace is LH.Artifacts.ProcessedTrace}
      */
-    static isProcessedTrace(traceOrProcessedTrace: LH.Trace | LH.Artifacts.ProcessedTrace): traceOrProcessedTrace is import("../index.js").Artifacts.ProcessedTrace;
+    static isProcessedTrace(traceOrProcessedTrace: LH.Trace | LH.Artifacts.ProcessedTrace): traceOrProcessedTrace is LH.Artifacts.ProcessedTrace;
     /**
      * @param {LH.Trace | LH.Artifacts.ProcessedTrace} traceOrProcessedTrace
      * @param {LH.Artifacts.ComputedContext} context
@@ -17,5 +15,4 @@ declare class ProcessedNavigation {
      */
     static compute_(traceOrProcessedTrace: LH.Trace | LH.Artifacts.ProcessedTrace, context: LH.Artifacts.ComputedContext): Promise<LH.Artifacts.ProcessedNavigation>;
 }
-import { ProcessedTrace } from './processed-trace.js';
 //# sourceMappingURL=processed-navigation.d.ts.map

package/core/computed/processed-trace.d.ts

@@ -1,8 +1,6 @@
 export { ProcessedTraceComputed as ProcessedTrace };
 declare const ProcessedTraceComputed: typeof ProcessedTrace & {
-    request: (dependencies: import("../index.js").Trace, context: import("../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<import("../index.js").Artifacts.ProcessedTrace>;
+    request: (dependencies: import("../index.js").Trace, context: LH.Artifacts.ComputedContext) => ReturnType<typeof ProcessedTrace.compute_>;
 };
 declare class ProcessedTrace {
     /**

package/core/computed/resource-summary.d.ts

@@ -4,14 +4,12 @@ export type ResourceEntry = {
     resourceSize: number;
     transferSize: number;
 };
-export type ResourceType = 'stylesheet' | 'image' | 'media' | 'font' | 'script' | 'document' | 'other' | 'third-party' | 'total';
+export type ResourceType = "stylesheet" | "image" | "media" | "font" | "script" | "document" | "other" | "third-party" | "total";
 declare const ResourceSummaryComputed: typeof ResourceSummary & {
     request: (dependencies: {
-        URL: LH.Artifacts['URL'];
-        devtoolsLog: import("../index.js").DevtoolsLog;
-    }, context: import("../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<Record<ResourceType, ResourceEntry>>;
+        URL: LH.Artifacts["URL"];
+        devtoolsLog: LH.DevtoolsLog;
+    }, context: LH.Artifacts.ComputedContext) => ReturnType<typeof ResourceSummary.compute_>;
 };
 /** @typedef {{count: number, resourceSize: number, transferSize: number}} ResourceEntry */
 /** @typedef {'stylesheet'|'image'|'media'|'font'|'script'|'document'|'other'|'third-party'|'total'} ResourceType */
@@ -34,10 +32,8 @@ declare class ResourceSummary {
      * @return {Promise<Record<ResourceType,ResourceEntry>>}
      */
     static compute_(data: {
-        URL: LH.Artifacts['URL'];
-        devtoolsLog: import("../index.js").DevtoolsLog;
+        URL: LH.Artifacts["URL"];
+        devtoolsLog: LH.DevtoolsLog;
     }, context: LH.Artifacts.ComputedContext): Promise<Record<ResourceType, ResourceEntry>>;
 }
-import { NetworkRequest } from '../lib/network-request.js';
-import { EntityClassification } from './entity-classification.js';
 //# sourceMappingURL=resource-summary.d.ts.map

package/core/computed/screenshots.d.ts

@@ -1,11 +1,6 @@
 export { ScreenshotsComputed as Screenshots };
 declare const ScreenshotsComputed: typeof Screenshots & {
-    request: (dependencies: import("../index.js").Trace, context: import("../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<{
-        timestamp: number;
-        datauri: string;
-    }[]>;
+    request: (dependencies: import("../index.js").Trace, context: LH.Artifacts.ComputedContext) => ReturnType<typeof Screenshots.compute_>;
 };
 declare class Screenshots {
     /**

package/core/computed/speedline.d.ts

@@ -1,8 +1,6 @@
 export { SpeedlineComputed as Speedline };
 declare const SpeedlineComputed: typeof Speedline & {
-    request: (dependencies: import("../index.js").Trace, context: import("../../types/utility-types.js").default.ImmutableObject<{
-        computedCache: Map<string, import("../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<import("../index.js").Artifacts.Speedline>;
+    request: (dependencies: import("../index.js").Trace, context: LH.Artifacts.ComputedContext) => ReturnType<typeof Speedline.compute_>;
 };
 declare class Speedline {
     /**