lighthouse 12.0.0-dev.20240610 → 12.0.0-dev.20240611

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/types/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/types/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/computed/processed-navigation.d.ts

@@ -1,6 +1,6 @@
 export { ProcessedNavigationComputed as ProcessedNavigation };
 declare const ProcessedNavigationComputed: typeof ProcessedNavigation & {
-    request: (dependencies: import("../index.js").Artifacts.ProcessedTrace | import("../index.js").Trace, context: import("../../types/utility-types.js").default.ImmutableObject<{
+    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>;
 };

package/core/computed/tbt-impact-tasks.js

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as Lantern from '../lib/lantern/types/lantern.js';
 import {makeComputedArtifact} from './computed-artifact.js';
 import {MainThreadTasks} from './main-thread-tasks.js';
 import {FirstContentfulPaint} from './metrics/first-contentful-paint.js';
@@ -132,7 +133,7 @@ class TBTImpactTasks {
     /** @type {Map<LH.Artifacts.TaskNode, {start: number, end: number, duration: number}>} */
     const topLevelTaskToEvent = new Map();
 
-    /** @type {Map<LH.TraceEvent, LH.Artifacts.TaskNode>} */
+    /** @type {Map<Lantern.TraceEvent, LH.Artifacts.TaskNode>} */
     const traceEventToTask = new Map();
     for (const task of tasks) {
       traceEventToTask.set(task.event, task);

package/core/config/constants.d.ts

@@ -1,43 +1,31 @@
-export namespace throttling {
-    export { DEVTOOLS_RTT_ADJUSTMENT_FACTOR };
-    export { DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR };
-    export namespace mobileSlow4G {
-        const rttMs: number;
-        const throughputKbps: number;
-        const requestLatencyMs: number;
-        const downloadThroughputKbps: number;
-        const uploadThroughputKbps: number;
-        const cpuSlowdownMultiplier: number;
-    }
-    export namespace mobileRegular3G {
-        const rttMs_1: number;
-        export { rttMs_1 as rttMs };
-        const throughputKbps_1: number;
-        export { throughputKbps_1 as throughputKbps };
-        const requestLatencyMs_1: number;
-        export { requestLatencyMs_1 as requestLatencyMs };
-        const downloadThroughputKbps_1: number;
-        export { downloadThroughputKbps_1 as downloadThroughputKbps };
-        const uploadThroughputKbps_1: number;
-        export { uploadThroughputKbps_1 as uploadThroughputKbps };
-        const cpuSlowdownMultiplier_1: number;
-        export { cpuSlowdownMultiplier_1 as cpuSlowdownMultiplier };
-    }
-    export namespace desktopDense4G {
-        const rttMs_2: number;
-        export { rttMs_2 as rttMs };
-        const throughputKbps_2: number;
-        export { throughputKbps_2 as throughputKbps };
-        const cpuSlowdownMultiplier_2: number;
-        export { cpuSlowdownMultiplier_2 as cpuSlowdownMultiplier };
-        const requestLatencyMs_2: number;
-        export { requestLatencyMs_2 as requestLatencyMs };
-        const downloadThroughputKbps_2: number;
-        export { downloadThroughputKbps_2 as downloadThroughputKbps };
-        const uploadThroughputKbps_2: number;
-        export { uploadThroughputKbps_2 as uploadThroughputKbps };
-    }
-}
+export const throttling: {
+    DEVTOOLS_RTT_ADJUSTMENT_FACTOR: number;
+    DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR: number;
+    mobileSlow4G: {
+        rttMs: number;
+        throughputKbps: number;
+        requestLatencyMs: number;
+        downloadThroughputKbps: number;
+        uploadThroughputKbps: number;
+        cpuSlowdownMultiplier: number;
+    };
+    mobileRegular3G: {
+        rttMs: number;
+        throughputKbps: number;
+        requestLatencyMs: number;
+        downloadThroughputKbps: number;
+        uploadThroughputKbps: number;
+        cpuSlowdownMultiplier: number;
+    };
+    desktopDense4G: {
+        rttMs: number;
+        throughputKbps: number;
+        cpuSlowdownMultiplier: number;
+        requestLatencyMs: number;
+        downloadThroughputKbps: number;
+        uploadThroughputKbps: number;
+    };
+};
 export namespace screenEmulationMetrics {
     export { MOTOGPOWER_EMULATION_METRICS as mobile };
     export { DESKTOP_EMULATION_METRICS as desktop };
@@ -54,19 +42,6 @@ export namespace nonSimulatedSettingsOverrides {
     const networkQuietThresholdMs: number;
     const cpuQuietThresholdMs: number;
 }
-/**
- * @license
- * Copyright 2018 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-/**
- * Adjustments needed for DevTools network throttling to simulate
- * more realistic network conditions.
- * @see https://crbug.com/721112
- * @see https://docs.google.com/document/d/10lfVdS1iDWCRKQXPfbxEn4Or99D64mvNlugP1AQuFlE/edit
- */
-declare const DEVTOOLS_RTT_ADJUSTMENT_FACTOR: 3.75;
-declare const DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR: 0.9;
 /**
  * @type {Required<LH.SharedFlagsSettings['screenEmulation']>}
  */

package/core/config/constants.js

@@ -4,50 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * Adjustments needed for DevTools network throttling to simulate
- * more realistic network conditions.
- * @see https://crbug.com/721112
- * @see https://docs.google.com/document/d/10lfVdS1iDWCRKQXPfbxEn4Or99D64mvNlugP1AQuFlE/edit
- */
-const DEVTOOLS_RTT_ADJUSTMENT_FACTOR = 3.75;
-const DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR = 0.9;
+import * as Lantern from '../lib/lantern/lantern.js';
 
-const throttling = {
-  DEVTOOLS_RTT_ADJUSTMENT_FACTOR,
-  DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
-  // These values align with WebPageTest's definition of "Fast 3G"
-  // But offer similar characteristics to roughly the 75th percentile of 4G connections.
-  mobileSlow4G: {
-    rttMs: 150,
-    throughputKbps: 1.6 * 1024,
-    requestLatencyMs: 150 * DEVTOOLS_RTT_ADJUSTMENT_FACTOR,
-    downloadThroughputKbps: 1.6 * 1024 * DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
-    uploadThroughputKbps: 750 * DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
-    cpuSlowdownMultiplier: 4,
-  },
-  // These values partially align with WebPageTest's definition of "Regular 3G".
-  // These values are meant to roughly align with Chrome UX report's 3G definition which are based
-  // on HTTP RTT of 300-1400ms and downlink throughput of <700kbps.
-  mobileRegular3G: {
-    rttMs: 300,
-    throughputKbps: 700,
-    requestLatencyMs: 300 * DEVTOOLS_RTT_ADJUSTMENT_FACTOR,
-    downloadThroughputKbps: 700 * DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
-    uploadThroughputKbps: 700 * DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
-    cpuSlowdownMultiplier: 4,
-  },
-  // Using a "broadband" connection type
-  // Corresponds to "Dense 4G 25th percentile" in https://docs.google.com/document/d/1Ft1Bnq9-t4jK5egLSOc28IL4TvR-Tt0se_1faTA4KTY/edit#heading=h.bb7nfy2x9e5v
-  desktopDense4G: {
-    rttMs: 40,
-    throughputKbps: 10 * 1024,
-    cpuSlowdownMultiplier: 1,
-    requestLatencyMs: 0, // 0 means unset
-    downloadThroughputKbps: 0,
-    uploadThroughputKbps: 0,
-  },
-};
+const throttling = Lantern.constants.throttling;
 
 /**
  * @type {Required<LH.SharedFlagsSettings['screenEmulation']>}

package/core/lib/lantern/cpu-node.d.ts

@@ -4,13 +4,13 @@
  */
 export class CPUNode<T = any> extends BaseNode<T> {
     /**
-     * @param {LH.TraceEvent} parentEvent
-     * @param {LH.TraceEvent[]=} childEvents
+     * @param {Lantern.TraceEvent} parentEvent
+     * @param {Lantern.TraceEvent[]=} childEvents
      * @param {number=} correctedEndTs
      */
-    constructor(parentEvent: LH.TraceEvent, childEvents?: LH.TraceEvent[] | undefined, correctedEndTs?: number | undefined);
-    _event: LH.TraceEvent;
-    _childEvents: LH.TraceEvent[];
+    constructor(parentEvent: Lantern.TraceEvent, childEvents?: Lantern.TraceEvent[] | undefined, correctedEndTs?: number | undefined);
+    _event: Lantern.TraceEvent;
+    _childEvents: Lantern.TraceEvent[];
     _correctedEndTs: number | undefined;
     get type(): "cpu";
     /**
@@ -18,13 +18,13 @@ export class CPUNode<T = any> extends BaseNode<T> {
      */
     get duration(): number;
     /**
-     * @return {LH.TraceEvent}
+     * @return {Lantern.TraceEvent}
      */
-    get event(): LH.TraceEvent;
+    get event(): Lantern.TraceEvent;
     /**
-     * @return {LH.TraceEvent[]}
+     * @return {Lantern.TraceEvent[]}
      */
-    get childEvents(): LH.TraceEvent[];
+    get childEvents(): Lantern.TraceEvent[];
     /**
      * Returns true if this node contains a Layout task.
      * @return {boolean}
@@ -40,5 +40,5 @@ export class CPUNode<T = any> extends BaseNode<T> {
     cloneWithoutRelationships(): CPUNode;
 }
 import { BaseNode } from './base-node.js';
-import * as LH from '../../../types/lh.js';
+import * as Lantern from './types/lantern.js';
 //# sourceMappingURL=cpu-node.d.ts.map

package/core/lib/lantern/cpu-node.js

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as LH from '../../../types/lh.js';
+import * as Lantern from './types/lantern.js';
 import {BaseNode} from './base-node.js';
 
 /**
@@ -13,8 +13,8 @@ import {BaseNode} from './base-node.js';
  */
 class CPUNode extends BaseNode {
   /**
-   * @param {LH.TraceEvent} parentEvent
-   * @param {LH.TraceEvent[]=} childEvents
+   * @param {Lantern.TraceEvent} parentEvent
+   * @param {Lantern.TraceEvent[]=} childEvents
    * @param {number=} correctedEndTs
    */
   constructor(parentEvent, childEvents = [], correctedEndTs) {
@@ -53,14 +53,14 @@ class CPUNode extends BaseNode {
   }
 
   /**
-   * @return {LH.TraceEvent}
+   * @return {Lantern.TraceEvent}
    */
   get event() {
     return this._event;
   }
 
   /**
-   * @return {LH.TraceEvent[]}
+   * @return {Lantern.TraceEvent[]}
    */
   get childEvents() {
     return this._childEvents;

package/core/lib/lantern/lantern.d.ts

@@ -1,8 +1,50 @@
-/**
- * @license
- * Copyright 2024 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-/** @type {LH.Util.SelfMap<LH.Crdp.Network.ResourceType>} */
-export const NetworkRequestTypes: LH.Util.SelfMap<LH.Crdp.Network.ResourceType>;
+/** @type {Lantern.Util.SelfMap<Lantern.ResourceType>} */
+export const NetworkRequestTypes: Lantern.Util.SelfMap<Lantern.ResourceType>;
+export namespace constants {
+    export { throttling };
+}
+import * as Lantern from './types/lantern.js';
+declare namespace throttling {
+    export { DEVTOOLS_RTT_ADJUSTMENT_FACTOR };
+    export { DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR };
+    export namespace mobileSlow4G {
+        const rttMs: number;
+        const throughputKbps: number;
+        const requestLatencyMs: number;
+        const downloadThroughputKbps: number;
+        const uploadThroughputKbps: number;
+        const cpuSlowdownMultiplier: number;
+    }
+    export namespace mobileRegular3G {
+        const rttMs_1: number;
+        export { rttMs_1 as rttMs };
+        const throughputKbps_1: number;
+        export { throughputKbps_1 as throughputKbps };
+        const requestLatencyMs_1: number;
+        export { requestLatencyMs_1 as requestLatencyMs };
+        const downloadThroughputKbps_1: number;
+        export { downloadThroughputKbps_1 as downloadThroughputKbps };
+        const uploadThroughputKbps_1: number;
+        export { uploadThroughputKbps_1 as uploadThroughputKbps };
+        const cpuSlowdownMultiplier_1: number;
+        export { cpuSlowdownMultiplier_1 as cpuSlowdownMultiplier };
+    }
+    export namespace desktopDense4G {
+        const rttMs_2: number;
+        export { rttMs_2 as rttMs };
+        const throughputKbps_2: number;
+        export { throughputKbps_2 as throughputKbps };
+        const cpuSlowdownMultiplier_2: number;
+        export { cpuSlowdownMultiplier_2 as cpuSlowdownMultiplier };
+        const requestLatencyMs_2: number;
+        export { requestLatencyMs_2 as requestLatencyMs };
+        const downloadThroughputKbps_2: number;
+        export { downloadThroughputKbps_2 as downloadThroughputKbps };
+        const uploadThroughputKbps_2: number;
+        export { uploadThroughputKbps_2 as uploadThroughputKbps };
+    }
+}
+declare const DEVTOOLS_RTT_ADJUSTMENT_FACTOR: 3.75;
+declare const DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR: 0.9;
+export {};
 //# sourceMappingURL=lantern.d.ts.map

package/core/lib/lantern/lantern.js

@@ -4,7 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/** @type {LH.Util.SelfMap<LH.Crdp.Network.ResourceType>} */
+import * as Lantern from './types/lantern.js';
+
+/** @type {Lantern.Util.SelfMap<Lantern.ResourceType>} */
 const NetworkRequestTypes = {
   XHR: 'XHR',
   Fetch: 'Fetch',
@@ -26,6 +28,48 @@ const NetworkRequestTypes = {
   Prefetch: 'Prefetch',
 };
 
+const DEVTOOLS_RTT_ADJUSTMENT_FACTOR = 3.75;
+const DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR = 0.9;
+
+const throttling = {
+  DEVTOOLS_RTT_ADJUSTMENT_FACTOR,
+  DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
+  // These values align with WebPageTest's definition of "Fast 3G"
+  // But offer similar characteristics to roughly the 75th percentile of 4G connections.
+  mobileSlow4G: {
+    rttMs: 150,
+    throughputKbps: 1.6 * 1024,
+    requestLatencyMs: 150 * DEVTOOLS_RTT_ADJUSTMENT_FACTOR,
+    downloadThroughputKbps: 1.6 * 1024 * DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
+    uploadThroughputKbps: 750 * DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
+    cpuSlowdownMultiplier: 4,
+  },
+  // These values partially align with WebPageTest's definition of "Regular 3G".
+  // These values are meant to roughly align with Chrome UX report's 3G definition which are based
+  // on HTTP RTT of 300-1400ms and downlink throughput of <700kbps.
+  mobileRegular3G: {
+    rttMs: 300,
+    throughputKbps: 700,
+    requestLatencyMs: 300 * DEVTOOLS_RTT_ADJUSTMENT_FACTOR,
+    downloadThroughputKbps: 700 * DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
+    uploadThroughputKbps: 700 * DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
+    cpuSlowdownMultiplier: 4,
+  },
+  // Using a "broadband" connection type
+  // Corresponds to "Dense 4G 25th percentile" in https://docs.google.com/document/d/1Ft1Bnq9-t4jK5egLSOc28IL4TvR-Tt0se_1faTA4KTY/edit#heading=h.bb7nfy2x9e5v
+  desktopDense4G: {
+    rttMs: 40,
+    throughputKbps: 10 * 1024,
+    cpuSlowdownMultiplier: 1,
+    requestLatencyMs: 0, // 0 means unset
+    downloadThroughputKbps: 0,
+    uploadThroughputKbps: 0,
+  },
+};
+
+const constants = {throttling};
+
 export {
   NetworkRequestTypes,
+  constants,
 };

package/core/lib/lantern/metric.d.ts

@@ -3,9 +3,9 @@ export type NetworkNode = import('./network-node.js').NetworkNode;
 export type Simulator = import('./simulator/simulator.js').Simulator;
 export type Extras = {
     optimistic: boolean;
-    fcpResult?: LH.Artifacts.LanternMetric | undefined;
-    lcpResult?: LH.Artifacts.LanternMetric | undefined;
-    interactiveResult?: LH.Artifacts.LanternMetric | undefined;
+    fcpResult?: Lantern.Metric | undefined;
+    lcpResult?: Lantern.Metric | undefined;
+    interactiveResult?: Lantern.Metric | undefined;
     observedSpeedIndex?: number | undefined;
 };
 /** @typedef {import('./base-node.js').Node} Node */
@@ -14,9 +14,9 @@ export type Extras = {
 /**
  * @typedef Extras
  * @property {boolean} optimistic
- * @property {LH.Artifacts.LanternMetric=} fcpResult
- * @property {LH.Artifacts.LanternMetric=} lcpResult
- * @property {LH.Artifacts.LanternMetric=} interactiveResult
+ * @property {Lantern.Metric=} fcpResult
+ * @property {Lantern.Metric=} lcpResult
+ * @property {Lantern.Metric=} interactiveResult
  * @property {number=} observedSpeedIndex
  */
 export class Metric {
@@ -61,9 +61,9 @@ export class Metric {
     /**
      * @param {Lantern.Simulation.MetricComputationDataInput} data
      * @param {Omit<Extras, 'optimistic'>=} extras
-     * @return {Promise<LH.Artifacts.LanternMetric>}
+     * @return {Promise<Lantern.Metric>}
      */
-    static compute(data: Lantern.Simulation.MetricComputationDataInput, extras?: Omit<Extras, 'optimistic'> | undefined): Promise<LH.Artifacts.LanternMetric>;
+    static compute(data: Lantern.Simulation.MetricComputationDataInput, extras?: Omit<Extras, 'optimistic'> | undefined): Promise<Lantern.Metric>;
 }
 import * as Lantern from './types/lantern.js';
 //# sourceMappingURL=metric.d.ts.map

package/core/lib/lantern/metric.js

@@ -5,8 +5,8 @@
  */
 
 import * as Lantern from './types/lantern.js';
-import {BaseNode} from '../../lib/lantern/base-node.js';
-import {RESOURCE_TYPES} from '../../lib/network-request.js';
+import {BaseNode} from './base-node.js';
+import {RESOURCE_TYPES} from '../network-request.js';
 
 /** @typedef {import('./base-node.js').Node} Node */
 /** @typedef {import('./network-node.js').NetworkNode} NetworkNode */
@@ -15,9 +15,9 @@ import {RESOURCE_TYPES} from '../../lib/network-request.js';
 /**
  * @typedef Extras
  * @property {boolean} optimistic
- * @property {LH.Artifacts.LanternMetric=} fcpResult
- * @property {LH.Artifacts.LanternMetric=} lcpResult
- * @property {LH.Artifacts.LanternMetric=} interactiveResult
+ * @property {Lantern.Metric=} fcpResult
+ * @property {Lantern.Metric=} lcpResult
+ * @property {Lantern.Metric=} interactiveResult
  * @property {number=} observedSpeedIndex
  */
 
@@ -92,7 +92,7 @@ class Metric {
   /**
    * @param {Lantern.Simulation.MetricComputationDataInput} data
    * @param {Omit<Extras, 'optimistic'>=} extras
-   * @return {Promise<LH.Artifacts.LanternMetric>}
+   * @return {Promise<Lantern.Metric>}
    */
   static async compute(data, extras) {
     const {simulator, graph, processedNavigation} = data;

package/core/lib/lantern/metrics/interactive.d.ts

@@ -11,16 +11,11 @@ export class Interactive extends Metric {
      */
     static getPessimisticGraph(dependencyGraph: Node): Node;
     /**
-     * @param {LH.Gatherer.Simulation.Result} simulationResult
-     * @param {import('../metric.js').Extras} extras
-     * @return {LH.Gatherer.Simulation.Result}
-     */
-    static getEstimateFromSimulation(simulationResult: LH.Gatherer.Simulation.Result, extras: import('../metric.js').Extras): LH.Gatherer.Simulation.Result;
-    /**
-     * @param {LH.Gatherer.Simulation.Result['nodeTimings']} nodeTimings
+     * @param {Lantern.Simulation.Result['nodeTimings']} nodeTimings
      * @return {number}
      */
-    static getLastLongTaskEndTime(nodeTimings: LH.Gatherer.Simulation.Result['nodeTimings'], duration?: number): number;
+    static getLastLongTaskEndTime(nodeTimings: Lantern.Simulation.Result['nodeTimings'], duration?: number): number;
 }
 import { Metric } from '../metric.js';
+import * as Lantern from '../types/lantern.js';
 //# sourceMappingURL=interactive.d.ts.map

package/core/lib/lantern/metrics/interactive.js

@@ -16,7 +16,7 @@ const CRITICAL_LONG_TASK_THRESHOLD = 20;
 
 class Interactive extends Metric {
   /**
-   * @return {LH.Gatherer.Simulation.MetricCoefficients}
+   * @return {Lantern.Simulation.MetricCoefficients}
    */
   static get COEFFICIENTS() {
     return {
@@ -61,9 +61,9 @@ class Interactive extends Metric {
   }
 
   /**
-   * @param {LH.Gatherer.Simulation.Result} simulationResult
+   * @param {Lantern.Simulation.Result} simulationResult
    * @param {import('../metric.js').Extras} extras
-   * @return {LH.Gatherer.Simulation.Result}
+   * @return {Lantern.Simulation.Result}
    */
   static getEstimateFromSimulation(simulationResult, extras) {
     if (!extras.lcpResult) throw new Error('missing lcpResult');
@@ -81,7 +81,7 @@ class Interactive extends Metric {
   /**
    * @param {Lantern.Simulation.MetricComputationDataInput} data
    * @param {Omit<import('../metric.js').Extras, 'optimistic'>=} extras
-   * @return {Promise<LH.Artifacts.LanternMetric>}
+   * @return {Promise<Lantern.Metric>}
    */
   static async compute(data, extras) {
     const lcpResult = extras?.lcpResult;
@@ -95,7 +95,7 @@ class Interactive extends Metric {
   }
 
   /**
-   * @param {LH.Gatherer.Simulation.Result['nodeTimings']} nodeTimings
+   * @param {Lantern.Simulation.Result['nodeTimings']} nodeTimings
    * @return {number}
    */
   static getLastLongTaskEndTime(nodeTimings, duration = 50) {

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

@@ -10,10 +10,11 @@ export class LargestContentfulPaint extends Metric {
      */
     static isNotLowPriorityImageNode(node: Node): boolean;
     /**
-     * @param {LH.Gatherer.Simulation.Result} simulationResult
-     * @return {LH.Gatherer.Simulation.Result}
+     * @param {Lantern.Simulation.Result} simulationResult
+     * @return {Lantern.Simulation.Result}
      */
-    static getEstimateFromSimulation(simulationResult: LH.Gatherer.Simulation.Result): LH.Gatherer.Simulation.Result;
+    static getEstimateFromSimulation(simulationResult: Lantern.Simulation.Result): Lantern.Simulation.Result;
 }
 import { Metric } from '../metric.js';
+import * as Lantern from '../types/lantern.js';
 //# sourceMappingURL=largest-contentful-paint.d.ts.map

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

@@ -13,7 +13,7 @@ import {LanternError} from '../lantern-error.js';
 
 class LargestContentfulPaint extends Metric {
   /**
-   * @return {LH.Gatherer.Simulation.MetricCoefficients}
+   * @return {Lantern.Simulation.MetricCoefficients}
    */
   static get COEFFICIENTS() {
     return {
@@ -74,8 +74,8 @@ class LargestContentfulPaint extends Metric {
   }
 
   /**
-   * @param {LH.Gatherer.Simulation.Result} simulationResult
-   * @return {LH.Gatherer.Simulation.Result}
+   * @param {Lantern.Simulation.Result} simulationResult
+   * @return {Lantern.Simulation.Result}
    */
   static getEstimateFromSimulation(simulationResult) {
     const nodeTimesNotOffscreenImages = Array.from(simulationResult.nodeTimings.entries())
@@ -91,7 +91,7 @@ class LargestContentfulPaint extends Metric {
   /**
    * @param {Lantern.Simulation.MetricComputationDataInput} data
    * @param {Omit<import('../metric.js').Extras, 'optimistic'>=} extras
-   * @return {Promise<LH.Artifacts.LanternMetric>}
+   * @return {Promise<Lantern.Metric>}
    */
   static async compute(data, extras) {
     const fcpResult = extras?.fcpResult;