lighthouse 12.0.0-dev.20240611 → 12.0.0-dev.20240613

package/core/lib/lantern/{metric.js → Metric.js}

@@ -4,20 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as Lantern from './types/lantern.js';
-import {BaseNode} from './base-node.js';
-import {RESOURCE_TYPES} from '../network-request.js';
+import * as Lantern from './lantern.js';
 
-/** @typedef {import('./base-node.js').Node} Node */
-/** @typedef {import('./network-node.js').NetworkNode} NetworkNode */
-/** @typedef {import('./simulator/simulator.js').Simulator} Simulator */
+/** @typedef {import('./BaseNode.js').Node} Node */
+/** @typedef {import('./NetworkNode.js').NetworkNode} NetworkNode */
+/** @typedef {import('./simulation/Simulator.js').Simulator} Simulator */
 
 /**
  * @typedef Extras
  * @property {boolean} optimistic
- * @property {Lantern.Metric=} fcpResult
- * @property {Lantern.Metric=} lcpResult
- * @property {Lantern.Metric=} interactiveResult
+ * @property {Lantern.Metrics.Result=} fcpResult
+ * @property {Lantern.Metrics.Result=} lcpResult
+ * @property {Lantern.Metrics.Result=} interactiveResult
  * @property {number=} observedSpeedIndex
  */
 
@@ -32,8 +30,8 @@ class Metric {
     const scriptUrls = new Set();
 
     dependencyGraph.traverse(node => {
-      if (node.type !== BaseNode.TYPES.NETWORK) return;
-      if (node.request.resourceType !== RESOURCE_TYPES.Script) return;
+      if (node.type !== Lantern.BaseNode.TYPES.NETWORK) return;
+      if (node.request.resourceType !== Lantern.NetworkRequestTypes.Script) return;
       if (treatNodeAsRenderBlocking?.(node)) {
         scriptUrls.add(node.request.url);
       }
@@ -92,7 +90,7 @@ class Metric {
   /**
    * @param {Lantern.Simulation.MetricComputationDataInput} data
    * @param {Omit<Extras, 'optimistic'>=} extras
-   * @return {Promise<Lantern.Metric>}
+   * @return {Promise<Lantern.Metrics.Result>}
    */
   static async compute(data, extras) {
     const {simulator, graph, processedNavigation} = data;

package/core/lib/lantern/{network-node.d.ts → NetworkNode.d.ts}

@@ -1,8 +1,8 @@
 /**
  * @template [T=any]
- * @extends {BaseNode<T>}
+ * @extends {Lantern.BaseNode<T>}
  */
-export class NetworkNode<T = any> extends BaseNode<T> {
+export class NetworkNode<T = any> extends Lantern.BaseNode<T> {
     /**
      * @param {Lantern.NetworkRequest<T>} networkRequest
      */
@@ -45,6 +45,5 @@ export class NetworkNode<T = any> extends BaseNode<T> {
      */
     cloneWithoutRelationships(): NetworkNode<T>;
 }
-import { BaseNode } from './base-node.js';
-import * as Lantern from './types/lantern.js';
-//# sourceMappingURL=network-node.d.ts.map
+import * as Lantern from './lantern.js';
+//# sourceMappingURL=NetworkNode.d.ts.map

package/core/lib/lantern/{network-node.js → NetworkNode.js}

@@ -4,9 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as Lantern from './types/lantern.js';
+import * as Lantern from './lantern.js';
 import {NetworkRequestTypes} from './lantern.js';
-import {BaseNode} from './base-node.js';
 
 const NON_NETWORK_SCHEMES = [
   'blob', // @see https://developer.mozilla.org/en-US/docs/Web/API/URL/createObjectURL
@@ -35,9 +34,9 @@ function isNonNetworkProtocol(protocol) {
 
 /**
  * @template [T=any]
- * @extends {BaseNode<T>}
+ * @extends {Lantern.BaseNode<T>}
  */
-class NetworkNode extends BaseNode {
+class NetworkNode extends Lantern.BaseNode {
   /**
    * @param {Lantern.NetworkRequest<T>} networkRequest
    */
@@ -48,7 +47,7 @@ class NetworkNode extends BaseNode {
   }
 
   get type() {
-    return BaseNode.TYPES.NETWORK;
+    return Lantern.BaseNode.TYPES.NETWORK;
   }
 
   /**

package/core/lib/lantern/{page-dependency-graph.d.ts → PageDependencyGraph.d.ts}

@@ -1,4 +1,4 @@
-export type Node = import('./base-node.js').Node;
+export type Node = import('./BaseNode.js').Node;
 export type NetworkNodeOutput = {
     nodes: Array<NetworkNode>;
     idToNodeMap: Map<string, NetworkNode>;
@@ -76,7 +76,7 @@ export class PageDependencyGraph {
      */
     static printGraph(rootNode: Node, widthInCharacters?: number): void;
 }
-import { NetworkNode } from './network-node.js';
-import * as Lantern from './types/lantern.js';
-import { CPUNode } from './cpu-node.js';
-//# sourceMappingURL=page-dependency-graph.d.ts.map
+import { NetworkNode } from './NetworkNode.js';
+import * as Lantern from './lantern.js';
+import { CPUNode } from './CpuNode.js';
+//# sourceMappingURL=PageDependencyGraph.d.ts.map

package/core/lib/lantern/{page-dependency-graph.js → PageDependencyGraph.js}

@@ -4,11 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as Lantern from './types/lantern.js';
-import {NetworkRequestTypes} from './lantern.js';
-import {NetworkNode} from './network-node.js';
-import {CPUNode} from './cpu-node.js';
-import {NetworkAnalyzer} from './simulator/network-analyzer.js';
+import * as Lantern from './lantern.js';
+import {NetworkNode} from './NetworkNode.js';
+import {CPUNode} from './CpuNode.js';
 
 // COMPAT: m71+ We added RunTask to `disabled-by-default-lighthouse`
 const SCHEDULABLE_TASK_TITLE_LH = 'RunTask';
@@ -19,7 +17,7 @@ const SCHEDULABLE_TASK_TITLE_ALT2 = 'ThreadControllerImpl::DoWork';
 // m65 and earlier
 const SCHEDULABLE_TASK_TITLE_ALT3 = 'TaskQueueManager::ProcessTaskFromWorkQueue';
 
-/** @typedef {import('./base-node.js').Node} Node */
+/** @typedef {import('./BaseNode.js').Node} Node */
 
 /**
  * @typedef {Object} NetworkNodeOutput
@@ -104,7 +102,7 @@ class PageDependencyGraph {
       // If the request was for the root document of an iframe, save an entry in our
       // map so we can link up the task `args.data.frame` dependencies later in graph creation.
       if (request.frameId &&
-          request.resourceType === NetworkRequestTypes.Document &&
+          request.resourceType === Lantern.NetworkRequestTypes.Document &&
           request.documentURL === request.url) {
         // If there's ever any ambiguity, permanently set the value to `false` to avoid loops in the graph.
         const value = frameIdToNodeMap.has(request.frameId) ? null : node;
@@ -245,7 +243,9 @@ class PageDependencyGraph {
   static linkCPUNodes(rootNode, networkNodeOutput, cpuNodes) {
     /** @type {Set<Lantern.ResourceType|undefined>} */
     const linkableResourceTypes = new Set([
-      NetworkRequestTypes.XHR, NetworkRequestTypes.Fetch, NetworkRequestTypes.Script,
+      Lantern.NetworkRequestTypes.XHR,
+      Lantern.NetworkRequestTypes.Fetch,
+      Lantern.NetworkRequestTypes.Script,
     ]);
 
     /** @param {CPUNode} cpuNode @param {string} reqId */
@@ -553,12 +553,13 @@ class PageDependencyGraph {
     if (!requestedUrl) throw new Error('requestedUrl is required to get the root request');
     if (!mainDocumentUrl) throw new Error('mainDocumentUrl is required to get the main resource');
 
-    const rootRequest = NetworkAnalyzer.findResourceForUrl(networkRequests, requestedUrl);
+    const rootRequest =
+      Lantern.Simulation.NetworkAnalyzer.findResourceForUrl(networkRequests, requestedUrl);
     if (!rootRequest) throw new Error('rootRequest not found');
     const rootNode = networkNodeOutput.idToNodeMap.get(rootRequest.requestId);
     if (!rootNode) throw new Error('rootNode not found');
     const mainDocumentRequest =
-      NetworkAnalyzer.findLastDocumentForUrl(networkRequests, mainDocumentUrl);
+      Lantern.Simulation.NetworkAnalyzer.findLastDocumentForUrl(networkRequests, mainDocumentUrl);
     if (!mainDocumentRequest) throw new Error('mainDocumentRequest not found');
     const mainDocumentNode = networkNodeOutput.idToNodeMap.get(mainDocumentRequest.requestId);
     if (!mainDocumentNode) throw new Error('mainDocumentNode not found');