lighthouse 12.0.0-dev.20240610 → 12.0.0-dev.20240612

package/core/audits/byte-efficiency/byte-efficiency-audit.d.ts

@@ -1,5 +1,5 @@
-export type Simulator = import('../../lib/lantern/simulator/simulator.js').Simulator;
-export type Node = import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>;
+export type Simulator = import('../../lib/lantern/simulation/Simulator.js').Simulator;
+export type Node = import('../../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>;
 export type ByteEfficiencyProduct = {
     items: Array<LH.Audit.ByteEfficiencyItem>;
     wastedBytesByUrl?: Map<string, number> | undefined;

package/core/audits/byte-efficiency/byte-efficiency-audit.js

@@ -14,8 +14,8 @@ import {LCPImageRecord} from '../../computed/lcp-image-record.js';
 
 const str_ = i18n.createIcuMessageFn(import.meta.url, {});
 
-/** @typedef {import('../../lib/lantern/simulator/simulator.js').Simulator} Simulator */
-/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
+/** @typedef {import('../../lib/lantern/simulation/Simulator.js').Simulator} Simulator */
+/** @typedef {import('../../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>} Node */
 
 // Parameters for log-normal distribution scoring. These values were determined by fitting the
 // log-normal cumulative distribution function curve to the former method of linear interpolation

package/core/audits/byte-efficiency/render-blocking-resources.d.ts

@@ -1,7 +1,7 @@
 export default RenderBlockingResources;
-export type Simulator = import('../../lib/lantern/simulator/simulator.js').Simulator;
-export type Node = import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>;
-export type NetworkNode = import('../../lib/lantern/network-node.js').NetworkNode<LH.Artifacts.NetworkRequest>;
+export type Simulator = import('../../lib/lantern/simulation/Simulator.js').Simulator;
+export type Node = import('../../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>;
+export type NetworkNode = import('../../lib/lantern/NetworkNode.js').NetworkNode<LH.Artifacts.NetworkRequest>;
 declare class RenderBlockingResources extends Audit {
     /**
      * @param {LH.Artifacts} artifacts

package/core/audits/byte-efficiency/render-blocking-resources.js

@@ -11,7 +11,7 @@
 
 import {Audit} from '../audit.js';
 import * as i18n from '../../lib/i18n/i18n.js';
-import {BaseNode} from '../../lib/lantern/base-node.js';
+import {BaseNode} from '../../lib/lantern/lantern.js';
 import {UnusedCSS} from '../../computed/unused-css.js';
 import {NetworkRequest} from '../../lib/network-request.js';
 import {LoadSimulator} from '../../computed/load-simulator.js';
@@ -20,9 +20,9 @@ import {LCPImageRecord} from '../../computed/lcp-image-record.js';
 import {NavigationInsights} from '../../computed/navigation-insights.js';
 
 
-/** @typedef {import('../../lib/lantern/simulator/simulator.js').Simulator} Simulator */
-/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
-/** @typedef {import('../../lib/lantern/network-node.js').NetworkNode<LH.Artifacts.NetworkRequest>} NetworkNode */
+/** @typedef {import('../../lib/lantern/simulation/Simulator.js').Simulator} Simulator */
+/** @typedef {import('../../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>} Node */
+/** @typedef {import('../../lib/lantern/NetworkNode.js').NetworkNode<LH.Artifacts.NetworkRequest>} NetworkNode */
 
 // Because of the way we detect blocking stylesheets, asynchronously loaded
 // CSS with link[rel=preload] and an onload handler (see https://github.com/filamentgroup/loadCSS)

package/core/audits/dobetterweb/uses-http2.d.ts

@@ -1,6 +1,6 @@
 export default UsesHTTP2Audit;
-export type Simulator = import('../../lib/lantern/simulator/simulator.js').Simulator;
-export type Node = import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>;
+export type Simulator = import('../../lib/lantern/simulation/Simulator.js').Simulator;
+export type Node = import('../../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>;
 declare class UsesHTTP2Audit extends Audit {
     /**
      * Computes the estimated effect of all results being converted to http/2 on the provided graph.

package/core/audits/dobetterweb/uses-http2.js

@@ -9,8 +9,8 @@
  * origin are over the http/2 protocol.
  */
 
-/** @typedef {import('../../lib/lantern/simulator/simulator.js').Simulator} Simulator */
-/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
+/** @typedef {import('../../lib/lantern/simulation/Simulator.js').Simulator} Simulator */
+/** @typedef {import('../../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>} Node */
 
 import {Audit} from '../audit.js';
 import {EntityClassification} from '../../computed/entity-classification.js';

package/core/audits/long-tasks.d.ts

@@ -25,11 +25,11 @@ declare class LongTasks extends Audit {
      * most time will be attributed to 'other' (the category of the top-level
      * RunTask). See pruning in `PageDependencyGraph.linkCPUNodes`.
      * @param {LH.Artifacts.TaskNode} task
-     * @param {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
+     * @param {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
      * @param {Map<TaskGroupIds, number>} [timeByTaskGroup]
      * @return {{startTime: number, duration: number, timeByTaskGroup: Map<TaskGroupIds, number>}}
      */
-    static getTimingBreakdown(task: LH.Artifacts.TaskNode, taskTimingsByEvent: Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming> | undefined, timeByTaskGroup?: Map<import("../lib/tracehouse/task-groups.js").TaskGroupIds, number> | undefined): {
+    static getTimingBreakdown(task: LH.Artifacts.TaskNode, taskTimingsByEvent: Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming> | undefined, timeByTaskGroup?: Map<import("../lib/tracehouse/task-groups.js").TaskGroupIds, number> | undefined): {
         startTime: number;
         duration: number;
         timeByTaskGroup: Map<TaskGroupIds, number>;
@@ -37,17 +37,17 @@ declare class LongTasks extends Audit {
     /**
      * @param {Array<LH.Artifacts.TaskNode>} longTasks
      * @param {Set<string>} jsUrls
-     * @param {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
+     * @param {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
      * @return {LH.Audit.Details.DebugData}
      */
-    static makeDebugData(longTasks: Array<LH.Artifacts.TaskNode>, jsUrls: Set<string>, taskTimingsByEvent: Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming> | undefined): LH.Audit.Details.DebugData;
+    static makeDebugData(longTasks: Array<LH.Artifacts.TaskNode>, jsUrls: Set<string>, taskTimingsByEvent: Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming> | undefined): LH.Audit.Details.DebugData;
     /**
      * Get timing from task, overridden by taskTimingsByEvent if provided.
      * @param {LH.Artifacts.TaskNode} task
-     * @param {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
+     * @param {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
      * @return {Timing}
      */
-    static getTiming(task: LH.Artifacts.TaskNode, taskTimingsByEvent: Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming> | undefined): Timing;
+    static getTiming(task: LH.Artifacts.TaskNode, taskTimingsByEvent: Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming> | undefined): Timing;
     /**
      * @param {LH.Artifacts} artifacts
      * @param {LH.Audit.Context} context
@@ -61,4 +61,5 @@ export namespace UIStrings {
     const displayValue: string;
 }
 import { Audit } from './audit.js';
+import * as Lantern from '../lib/lantern/lantern.js';
 //# sourceMappingURL=long-tasks.d.ts.map

package/core/audits/long-tasks.js

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as Lantern from '../lib/lantern/lantern.js';
 import {Audit} from './audit.js';
 import {NetworkRecords} from '../computed/network-records.js';
 import * as i18n from '../lib/i18n/i18n.js';
@@ -85,7 +86,7 @@ class LongTasks extends Audit {
    * most time will be attributed to 'other' (the category of the top-level
    * RunTask). See pruning in `PageDependencyGraph.linkCPUNodes`.
    * @param {LH.Artifacts.TaskNode} task
-   * @param {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
+   * @param {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
    * @param {Map<TaskGroupIds, number>} [timeByTaskGroup]
    * @return {{startTime: number, duration: number, timeByTaskGroup: Map<TaskGroupIds, number>}}
    */
@@ -116,7 +117,7 @@ class LongTasks extends Audit {
   /**
    * @param {Array<LH.Artifacts.TaskNode>} longTasks
    * @param {Set<string>} jsUrls
-   * @param {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
+   * @param {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
    * @return {LH.Audit.Details.DebugData}
    */
   static makeDebugData(longTasks, jsUrls, taskTimingsByEvent) {
@@ -154,7 +155,7 @@ class LongTasks extends Audit {
   /**
    * Get timing from task, overridden by taskTimingsByEvent if provided.
    * @param {LH.Artifacts.TaskNode} task
-   * @param {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
+   * @param {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
    * @return {Timing}
    */
   static getTiming(task, taskTimingsByEvent) {
@@ -184,7 +185,7 @@ class LongTasks extends Audit {
     const metricComputationData = Audit.makeMetricComputationDataInput(artifacts, context);
     const tbtResult = await TotalBlockingTime.request(metricComputationData, context);
 
-    /** @type {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} */
+    /** @type {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} */
     let taskTimingsByEvent;
 
     if (settings.throttlingMethod === 'simulate') {

package/core/audits/prioritize-lcp-image.d.ts

@@ -39,7 +39,7 @@ declare class PrioritizeLcpImage extends Audit {
      * @return {{lcpNodeToPreload?: LH.Gatherer.Simulation.GraphNetworkNode, initiatorPath?: InitiatorPath}}
      */
     static getLCPNodeToPreload(mainResource: LH.Artifacts.NetworkRequest, graph: LH.Gatherer.Simulation.GraphNode, lcpRecord: NetworkRequest | undefined): {
-        lcpNodeToPreload?: import("../lib/lantern/network-node.js").NetworkNode<NetworkRequest> | undefined;
+        lcpNodeToPreload?: import("../lib/lantern/NetworkNode.js").NetworkNode<NetworkRequest> | undefined;
         initiatorPath?: InitiatorPath | undefined;
     };
     /**

package/core/computed/document-urls.js

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {NetworkAnalyzer} from '../lib/lantern/simulator/network-analyzer.js';
+import * as Lantern from '../lib/lantern/lantern.js';
 import {makeComputedArtifact} from './computed-artifact.js';
 import {NetworkRecords} from './network-records.js';
 import {ProcessedTrace} from './processed-trace.js';
@@ -41,7 +41,8 @@ class DocumentUrls {
     }
     if (!requestedUrl || !mainDocumentUrl) throw new Error('No main frame navigations found');
 
-    const initialRequest = NetworkAnalyzer.findResourceForUrl(networkRecords, requestedUrl);
+    const initialRequest =
+      Lantern.Simulation.NetworkAnalyzer.findResourceForUrl(networkRecords, requestedUrl);
     if (initialRequest?.redirects?.length) requestedUrl = initialRequest.redirects[0].url;
 
     return {requestedUrl, mainDocumentUrl};

package/core/computed/load-simulator.d.ts

@@ -5,24 +5,24 @@ declare const LoadSimulatorComputed: typeof LoadSimulator & {
         settings: LH.Audit.Context['settings'];
     }, context: import("../../types/utility-types.js").default.ImmutableObject<{
         computedCache: Map<string, import("../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<Simulator<any>>;
+    }>) => Promise<Lantern.Simulation.Simulator<any>>;
 };
 declare class LoadSimulator {
     /**
      * @param {{devtoolsLog: LH.DevtoolsLog, settings: LH.Audit.Context['settings']}} data
      * @param {LH.Artifacts.ComputedContext} context
-     * @return {Promise<Simulator>}
+     * @return {Promise<Lantern.Simulation.Simulator>}
      */
     static compute_(data: {
         devtoolsLog: import("../index.js").DevtoolsLog;
         settings: LH.Audit.Context['settings'];
-    }, context: LH.Artifacts.ComputedContext): Promise<Simulator>;
+    }, context: LH.Artifacts.ComputedContext): Promise<Lantern.Simulation.Simulator>;
     /**
      * @param {LH.Artifacts.NetworkAnalysis} networkAnalysis
      * @return {LH.PrecomputedLanternData}
      */
     static convertAnalysisToSaveableLanternData(networkAnalysis: LH.Artifacts.NetworkAnalysis): LH.PrecomputedLanternData;
 }
-import { Simulator } from '../lib/lantern/simulator/simulator.js';
+import * as Lantern from '../lib/lantern/lantern.js';
 import { NetworkAnalysis } from './network-analysis.js';
 //# sourceMappingURL=load-simulator.d.ts.map

package/core/computed/load-simulator.js

@@ -5,18 +5,18 @@
  */
 
 import {makeComputedArtifact} from './computed-artifact.js';
-import {Simulator} from '../lib/lantern/simulator/simulator.js';
+import * as Lantern from '../lib/lantern/lantern.js';
 import {NetworkAnalysis} from './network-analysis.js';
 
 class LoadSimulator {
   /**
    * @param {{devtoolsLog: LH.DevtoolsLog, settings: LH.Audit.Context['settings']}} data
    * @param {LH.Artifacts.ComputedContext} context
-   * @return {Promise<Simulator>}
+   * @return {Promise<Lantern.Simulation.Simulator>}
    */
   static async compute_(data, context) {
     const networkAnalysis = await NetworkAnalysis.request(data.devtoolsLog, context);
-    return Simulator.createSimulator({...data.settings, networkAnalysis});
+    return Lantern.Simulation.Simulator.createSimulator({...data.settings, networkAnalysis});
   }
 
   /**

package/core/computed/main-resource.js

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as Lantern from '../lib/lantern/lantern.js';
 import {makeComputedArtifact} from './computed-artifact.js';
 import {NetworkRecords} from './network-records.js';
-import {NetworkAnalyzer} from '../lib/lantern/simulator/network-analyzer.js';
 
 /**
  * @fileoverview This artifact identifies the main resource on the page. Current solution assumes
@@ -28,7 +28,8 @@ class MainResource {
     // document request, we should return the last candidate here. Besides, the browser
     // would have evicted the first request by the time `MainDocumentRequest` (a consumer
     // of this computed artifact) attempts to fetch the contents, resulting in a protocol error.
-    const mainResource = NetworkAnalyzer.findLastDocumentForUrl(records, mainDocumentUrl);
+    const mainResource =
+      Lantern.Simulation.NetworkAnalyzer.findLastDocumentForUrl(records, mainDocumentUrl);
     if (!mainResource) {
       throw new Error('Unable to identify the main resource');
     }

package/core/computed/metrics/lantern-first-contentful-paint.d.ts

@@ -1,12 +1,12 @@
 export { LanternFirstContentfulPaintComputed as LanternFirstContentfulPaint };
-export type Extras = import('../../lib/lantern/metric.js').Extras;
+export type Extras = import('../../lib/lantern/Metric.js').Extras;
 declare const LanternFirstContentfulPaintComputed: typeof LanternFirstContentfulPaint & {
     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>;
 };
-/** @typedef {import('../../lib/lantern/metric.js').Extras} Extras */
-declare class LanternFirstContentfulPaint extends FirstContentfulPaint {
+/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
+declare class LanternFirstContentfulPaint extends Lantern.Metrics.FirstContentfulPaint {
     /**
      * @param {LH.Artifacts.MetricComputationDataInput} data
      * @param {LH.Artifacts.ComputedContext} context
@@ -21,5 +21,5 @@ declare class LanternFirstContentfulPaint extends FirstContentfulPaint {
      */
     static compute_(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext): Promise<LH.Artifacts.LanternMetric>;
 }
-import { FirstContentfulPaint } from '../../lib/lantern/metrics/first-contentful-paint.js';
+import * as Lantern from '../../lib/lantern/lantern.js';
 //# sourceMappingURL=lantern-first-contentful-paint.d.ts.map

package/core/computed/metrics/lantern-first-contentful-paint.js

@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as Lantern from '../../lib/lantern/lantern.js';
 import {makeComputedArtifact} from '../computed-artifact.js';
 import {getComputationDataParams, lanternErrorAdapter} from './lantern-metric.js';
-import {FirstContentfulPaint} from '../../lib/lantern/metrics/first-contentful-paint.js';
 
-/** @typedef {import('../../lib/lantern/metric.js').Extras} Extras */
+/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
 
-class LanternFirstContentfulPaint extends FirstContentfulPaint {
+class LanternFirstContentfulPaint extends Lantern.Metrics.FirstContentfulPaint {
   /**
    * @param {LH.Artifacts.MetricComputationDataInput} data
    * @param {LH.Artifacts.ComputedContext} context

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

@@ -1,12 +1,12 @@
 export { LanternInteractiveComputed as LanternInteractive };
-export type Extras = import('../../lib/lantern/metric.js').Extras;
+export type Extras = import('../../lib/lantern/Metric.js').Extras;
 declare const LanternInteractiveComputed: typeof LanternInteractive & {
     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>;
 };
-/** @typedef {import('../../lib/lantern/metric.js').Extras} Extras */
-declare class LanternInteractive extends Interactive {
+/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
+declare class LanternInteractive extends Lantern.Metrics.Interactive {
     /**
      * @param {LH.Artifacts.MetricComputationDataInput} data
      * @param {LH.Artifacts.ComputedContext} context
@@ -21,5 +21,5 @@ declare class LanternInteractive extends Interactive {
      */
     static compute_(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext): Promise<LH.Artifacts.LanternMetric>;
 }
-import { Interactive } from '../../lib/lantern/metrics/interactive.js';
+import * as Lantern from '../../lib/lantern/lantern.js';
 //# sourceMappingURL=lantern-interactive.d.ts.map

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

@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as Lantern from '../../lib/lantern/lantern.js';
 import {makeComputedArtifact} from '../computed-artifact.js';
 import {LanternLargestContentfulPaint} from './lantern-largest-contentful-paint.js';
-import {Interactive} from '../../lib/lantern/metrics/interactive.js';
 import {getComputationDataParams, lanternErrorAdapter} from './lantern-metric.js';
 
-/** @typedef {import('../../lib/lantern/metric.js').Extras} Extras */
+/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
 
-class LanternInteractive extends Interactive {
+class LanternInteractive extends Lantern.Metrics.Interactive {
   /**
    * @param {LH.Artifacts.MetricComputationDataInput} data
    * @param {LH.Artifacts.ComputedContext} context

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

@@ -1,12 +1,12 @@
 export { LanternLargestContentfulPaintComputed as LanternLargestContentfulPaint };
-export type Extras = import('../../lib/lantern/metric.js').Extras;
+export type Extras = import('../../lib/lantern/Metric.js').Extras;
 declare const LanternLargestContentfulPaintComputed: typeof LanternLargestContentfulPaint & {
     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>;
 };
-/** @typedef {import('../../lib/lantern/metric.js').Extras} Extras */
-declare class LanternLargestContentfulPaint extends LargestContentfulPaint {
+/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
+declare class LanternLargestContentfulPaint extends Lantern.Metrics.LargestContentfulPaint {
     /**
      * @param {LH.Artifacts.MetricComputationDataInput} data
      * @param {LH.Artifacts.ComputedContext} context
@@ -21,5 +21,5 @@ declare class LanternLargestContentfulPaint extends LargestContentfulPaint {
      */
     static compute_(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext): Promise<LH.Artifacts.LanternMetric>;
 }
-import { LargestContentfulPaint } from '../../lib/lantern/metrics/largest-contentful-paint.js';
+import * as Lantern from '../../lib/lantern/lantern.js';
 //# sourceMappingURL=lantern-largest-contentful-paint.d.ts.map

package/core/computed/metrics/lantern-largest-contentful-paint.js

@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as Lantern from '../../lib/lantern/lantern.js';
 import {makeComputedArtifact} from '../computed-artifact.js';
-import {LargestContentfulPaint} from '../../lib/lantern/metrics/largest-contentful-paint.js';
 import {getComputationDataParams, lanternErrorAdapter} from './lantern-metric.js';
 import {LanternFirstContentfulPaint} from './lantern-first-contentful-paint.js';
 
-/** @typedef {import('../../lib/lantern/metric.js').Extras} Extras */
+/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
 
-class LanternLargestContentfulPaint extends LargestContentfulPaint {
+class LanternLargestContentfulPaint extends Lantern.Metrics.LargestContentfulPaint {
   /**
    * @param {LH.Artifacts.MetricComputationDataInput} data
    * @param {LH.Artifacts.ComputedContext} context

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

@@ -1,12 +1,12 @@
 export { LanternMaxPotentialFIDComputed as LanternMaxPotentialFID };
-export type Extras = import('../../lib/lantern/metric.js').Extras;
+export type Extras = import('../../lib/lantern/Metric.js').Extras;
 declare const LanternMaxPotentialFIDComputed: typeof LanternMaxPotentialFID & {
     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>;
 };
-/** @typedef {import('../../lib/lantern/metric.js').Extras} Extras */
-declare class LanternMaxPotentialFID extends MaxPotentialFID {
+/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
+declare class LanternMaxPotentialFID extends Lantern.Metrics.MaxPotentialFID {
     /**
      * @param {LH.Artifacts.MetricComputationDataInput} data
      * @param {LH.Artifacts.ComputedContext} context
@@ -21,5 +21,5 @@ declare class LanternMaxPotentialFID extends MaxPotentialFID {
      */
     static compute_(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext): Promise<LH.Artifacts.LanternMetric>;
 }
-import { MaxPotentialFID } from '../../lib/lantern/metrics/max-potential-fid.js';
+import * as Lantern from '../../lib/lantern/lantern.js';
 //# sourceMappingURL=lantern-max-potential-fid.d.ts.map

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

@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as Lantern from '../../lib/lantern/lantern.js';
 import {makeComputedArtifact} from '../computed-artifact.js';
-import {MaxPotentialFID} from '../../lib/lantern/metrics/max-potential-fid.js';
 import {getComputationDataParams, lanternErrorAdapter} from './lantern-metric.js';
 import {LanternFirstContentfulPaint} from './lantern-first-contentful-paint.js';
 
-/** @typedef {import('../../lib/lantern/metric.js').Extras} Extras */
+/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
 
-class LanternMaxPotentialFID extends MaxPotentialFID {
+class LanternMaxPotentialFID extends Lantern.Metrics.MaxPotentialFID {
   /**
    * @param {LH.Artifacts.MetricComputationDataInput} data
    * @param {LH.Artifacts.ComputedContext} context

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

@@ -3,7 +3,7 @@
  * @param {LH.Artifacts.ComputedContext} context
  */
 export function getComputationDataParamsFromTrace(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext): Promise<{
-    simulator: import("../../lib/lantern/simulator/simulator.js").Simulator<any>;
+    simulator: Lantern.Simulation.Simulator<any>;
     graph: import("../page-dependency-graph.js").Node;
     processedNavigation: import("../../lib/lantern/types/lantern.js").Simulation.ProcessedNavigation;
 }>;
@@ -12,7 +12,7 @@ export function getComputationDataParamsFromTrace(data: LH.Artifacts.MetricCompu
  * @param {LH.Artifacts.ComputedContext} context
  */
 export function getComputationDataParamsFromDevtoolsLog(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext): Promise<{
-    simulator: import("../../lib/lantern/simulator/simulator.js").Simulator<any>;
+    simulator: Lantern.Simulation.Simulator<any>;
     graph: import("../page-dependency-graph.js").Node;
     processedNavigation: import("../../index.js").Artifacts.ProcessedNavigation;
 }>;
@@ -21,7 +21,7 @@ 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: import("../../lib/lantern/simulator/simulator.js").Simulator<any>;
+    simulator: Lantern.Simulation.Simulator<any>;
     graph: import("../page-dependency-graph.js").Node;
     processedNavigation: import("../../lib/lantern/types/lantern.js").Simulation.ProcessedNavigation;
 }>;
@@ -30,4 +30,5 @@ export function getComputationDataParams(data: LH.Artifacts.MetricComputationDat
  * @return {never}
  */
 export function lanternErrorAdapter(err: unknown): never;
+import * as Lantern from '../../lib/lantern/lantern.js';
 //# sourceMappingURL=lantern-metric.d.ts.map

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

@@ -4,13 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {LanternError} from '../../lib/lantern/lantern-error.js';
+import * as Lantern from '../../lib/lantern/lantern.js';
 import {LighthouseError} from '../../lib/lh-error.js';
 import {LoadSimulator} from '../load-simulator.js';
 import {ProcessedNavigation} from '../processed-navigation.js';
 import {PageDependencyGraph} from '../page-dependency-graph.js';
 import {TraceEngineResult} from '../trace-engine-result.js';
-import {createProcessedNavigation} from '../../lib/lantern/trace-engine-computation-data.js';
 
 /**
  * @param {LH.Artifacts.MetricComputationDataInput} data
@@ -39,7 +38,8 @@ async function getComputationDataParamsFromTrace(data, context) {
 
   const graph = await PageDependencyGraph.request({...data, fromTrace: true}, context);
   const traceEngineResult = await TraceEngineResult.request(data, context);
-  const processedNavigation = createProcessedNavigation(traceEngineResult.data);
+  const processedNavigation =
+    Lantern.TraceEngineComputationData.createProcessedNavigation(traceEngineResult.data);
   const simulator = data.simulator || (await LoadSimulator.request(data, context));
 
   return {simulator, graph, processedNavigation};
@@ -50,7 +50,7 @@ async function getComputationDataParamsFromTrace(data, context) {
  * @return {never}
  */
 function lanternErrorAdapter(err) {
-  if (!(err instanceof LanternError)) {
+  if (!(err instanceof Lantern.Error)) {
     throw err;
   }
 

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

@@ -1,12 +1,12 @@
 export { LanternSpeedIndexComputed as LanternSpeedIndex };
-export type Extras = import('../../lib/lantern/metric.js').Extras;
+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>;
 };
-/** @typedef {import('../../lib/lantern/metric.js').Extras} Extras */
-declare class LanternSpeedIndex extends SpeedIndex {
+/** @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
@@ -21,5 +21,5 @@ declare class LanternSpeedIndex extends SpeedIndex {
      */
     static compute_(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext): Promise<LH.Artifacts.LanternMetric>;
 }
-import { SpeedIndex } from '../../lib/lantern/metrics/speed-index.js';
+import * as Lantern from '../../lib/lantern/lantern.js';
 //# sourceMappingURL=lantern-speed-index.d.ts.map

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

@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as Lantern from '../../lib/lantern/lantern.js';
 import {makeComputedArtifact} from '../computed-artifact.js';
 import {getComputationDataParams, lanternErrorAdapter} from './lantern-metric.js';
 import {Speedline} from '../speedline.js';
 import {LanternFirstContentfulPaint} from './lantern-first-contentful-paint.js';
-import {SpeedIndex} from '../../lib/lantern/metrics/speed-index.js';
 
-/** @typedef {import('../../lib/lantern/metric.js').Extras} Extras */
+/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
 
-class LanternSpeedIndex extends SpeedIndex {
+class LanternSpeedIndex extends Lantern.Metrics.SpeedIndex {
   /**
    * @param {LH.Artifacts.MetricComputationDataInput} data
    * @param {LH.Artifacts.ComputedContext} context

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

@@ -1,12 +1,12 @@
 export { LanternTotalBlockingTimeComputed as LanternTotalBlockingTime };
-export type Extras = import('../../lib/lantern/metric.js').Extras;
+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>;
 };
-/** @typedef {import('../../lib/lantern/metric.js').Extras} Extras */
-declare class LanternTotalBlockingTime extends TotalBlockingTime {
+/** @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
@@ -21,5 +21,5 @@ declare class LanternTotalBlockingTime extends TotalBlockingTime {
      */
     static compute_(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext): Promise<LH.Artifacts.LanternMetric>;
 }
-import { TotalBlockingTime } from '../../lib/lantern/metrics/total-blocking-time.js';
+import * as Lantern from '../../lib/lantern/lantern.js';
 //# sourceMappingURL=lantern-total-blocking-time.d.ts.map

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

@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {TotalBlockingTime} from '../../lib/lantern/metrics/total-blocking-time.js';
+import * as Lantern from '../../lib/lantern/lantern.js';
 import {makeComputedArtifact} from '../computed-artifact.js';
 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 */
+/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
 
-class LanternTotalBlockingTime extends TotalBlockingTime {
+class LanternTotalBlockingTime extends Lantern.Metrics.TotalBlockingTime {
   /**
    * @param {LH.Artifacts.MetricComputationDataInput} data
    * @param {LH.Artifacts.ComputedContext} context

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

@@ -4,12 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as Lantern from '../../lib/lantern/lantern.js';
 import {makeComputedArtifact} from '../computed-artifact.js';
 import ComputedMetric from './metric.js';
 import {TraceProcessor} from '../../lib/tracehouse/trace-processor.js';
 import {LanternTotalBlockingTime} from './lantern-total-blocking-time.js';
 import {Interactive} from './interactive.js';
-import {calculateSumOfBlockingTime} from '../../lib/lantern/tbt-utils.js';
+
+const {calculateSumOfBlockingTime} = Lantern.TBTUtils;
 
 /**
  * @fileoverview This audit determines Total Blocking Time.