GoogleChrome · adamraine · Nov 30, 2021 · Nov 24, 2021 · Nov 29, 2021 · Nov 30, 2021
diff --git a/lighthouse-core/computed/computed-artifact.js b/lighthouse-core/computed/computed-artifact.js
@@ -11,28 +11,35 @@ const log = require('lighthouse-logger');
 /**
  * Decorate computableArtifact with a caching `request()` method which will
  * automatically call `computableArtifact.compute_()` under the hood.
- * @template {{name: string, compute_(artifacts: unknown, context: LH.Artifacts.ComputedContext): Promise<unknown>}} C
+ * @template {{name: string, compute_(dependencies: unknown, context: LH.Artifacts.ComputedContext): Promise<unknown>}} C
+ * @template {Array<keyof FirstParamType<C['compute_']>>} K
  * @param {C} computableArtifact
+ * @param {(K & ([keyof FirstParamType<C['compute_']>] extends [K[number]] ? unknown : never)) | null} keys List of properties of `dependencies` used by `compute_`; other properties are filtered out. Use `null` to allow all properties. Ensures that only required properties are used for caching result.
  */
-function makeComputedArtifact(computableArtifact) {
+function makeComputedArtifact(computableArtifact, keys) {
   // tsc (3.1) has more difficulty with template inter-references in jsdoc, so
   // give types to params and return value the long way, essentially recreating
   // polymorphic-this behavior for C.
   /**
    * Return an automatically cached result from the computed artifact.
-   * @param {FirstParamType<C['compute_']>} artifacts
+   * @param {FirstParamType<C['compute_']>} dependencies
    * @param {LH.Artifacts.ComputedContext} context
    * @return {ReturnType<C['compute_']>}
    */
-  const request = (artifacts, context) => {
+  const request = (dependencies, context) => {
+    const pickedDependencies = keys ?
+      Object.fromEntries(keys.map(key => [key, dependencies[key]])) :
+      dependencies;
+
     // NOTE: break immutability solely for this caching-controller function.
     const computedCache = /** @type {Map<string, ArbitraryEqualityMap>} */ (context.computedCache);
     const computedName = computableArtifact.name;
 
     const cache = computedCache.get(computedName) || new ArbitraryEqualityMap();
     computedCache.set(computedName, cache);
 
-    const computed = /** @type {ReturnType<C['compute_']>|undefined} */ (cache.get(artifacts));
+    /** @type {ReturnType<C['compute_']>|undefined} */
+    const computed = cache.get(pickedDependencies);
     if (computed) {
       return computed;
     }
@@ -41,8 +48,8 @@ function makeComputedArtifact(computableArtifact) {
     log.time(status, 'verbose');
 
     const artifactPromise = /** @type {ReturnType<C['compute_']>} */
-        (computableArtifact.compute_(artifacts, context));
-    cache.set(artifacts, artifactPromise);
+        (computableArtifact.compute_(pickedDependencies, context));
+    cache.set(pickedDependencies, artifactPromise);
 
     artifactPromise.then(() => log.timeEnd(status)).catch(() => log.timeEnd(status));
 

diff --git a/lighthouse-core/computed/critical-request-chains.js b/lighthouse-core/computed/critical-request-chains.js
@@ -143,4 +143,4 @@ class CriticalRequestChains {
   }
 }
 
-module.exports = makeComputedArtifact(CriticalRequestChains);
+module.exports = makeComputedArtifact(CriticalRequestChains, ['URL', 'devtoolsLog', 'trace']);
diff --git a/lighthouse-core/computed/image-records.js b/lighthouse-core/computed/image-records.js
@@ -59,5 +59,5 @@ class ImageRecords {
   }
 }
 
-module.exports = makeComputedArtifact(ImageRecords);
+module.exports = makeComputedArtifact(ImageRecords, ['ImageElements', 'networkRecords']);
 
diff --git a/lighthouse-core/computed/js-bundles.js b/lighthouse-core/computed/js-bundles.js
@@ -116,4 +116,4 @@ class JSBundles {
   }
 }
 
-module.exports = makeComputedArtifact(JSBundles);
+module.exports = makeComputedArtifact(JSBundles, ['ScriptElements', 'SourceMaps']);
diff --git a/lighthouse-core/computed/load-simulator.js b/lighthouse-core/computed/load-simulator.js
@@ -88,4 +88,4 @@ class LoadSimulator {
   }
 }
 
-module.exports = makeComputedArtifact(LoadSimulator);
+module.exports = makeComputedArtifact(LoadSimulator, ['devtoolsLog', 'settings']);
diff --git a/lighthouse-core/computed/main-resource.js b/lighthouse-core/computed/main-resource.js
@@ -31,4 +31,4 @@ class MainResource {
   }
 }
 
-module.exports = makeComputedArtifact(MainResource);
+module.exports = makeComputedArtifact(MainResource, ['URL', 'devtoolsLog']);
diff --git a/lighthouse-core/computed/main-thread-tasks.js b/lighthouse-core/computed/main-thread-tasks.js
@@ -21,4 +21,4 @@ class MainThreadTasks {
   }
 }
 
-module.exports = makeComputedArtifact(MainThreadTasks);
+module.exports = makeComputedArtifact(MainThreadTasks, null);
diff --git a/lighthouse-core/computed/manifest-values.js b/lighthouse-core/computed/manifest-values.js
@@ -132,4 +132,4 @@ class ManifestValues {
   }
 }
 
-module.exports = makeComputedArtifact(ManifestValues);
+module.exports = makeComputedArtifact(ManifestValues, ['InstallabilityErrors', 'WebAppManifest']);
diff --git a/lighthouse-core/computed/metrics/cumulative-layout-shift.js b/lighthouse-core/computed/metrics/cumulative-layout-shift.js
@@ -126,4 +126,4 @@ class CumulativeLayoutShift {
   }
 }
 
-module.exports = makeComputedArtifact(CumulativeLayoutShift);
+module.exports = makeComputedArtifact(CumulativeLayoutShift, null);
diff --git a/lighthouse-core/computed/metrics/first-contentful-paint-all-frames.js b/lighthouse-core/computed/metrics/first-contentful-paint-all-frames.js
@@ -31,4 +31,7 @@ class FirstContentfulPaintAllFrames extends NavigationMetric {
   }
 }
 
-module.exports = makeComputedArtifact(FirstContentfulPaintAllFrames);
+module.exports = makeComputedArtifact(
+  FirstContentfulPaintAllFrames,
+  ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace']
+);
diff --git a/lighthouse-core/computed/metrics/first-contentful-paint.js b/lighthouse-core/computed/metrics/first-contentful-paint.js
@@ -34,4 +34,7 @@ class FirstContentfulPaint extends NavigationMetric {
   }
 }
 
-module.exports = makeComputedArtifact(FirstContentfulPaint);
+module.exports = makeComputedArtifact(
+  FirstContentfulPaint,
+  ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace']
+);
diff --git a/lighthouse-core/computed/metrics/first-meaningful-paint.js b/lighthouse-core/computed/metrics/first-meaningful-paint.js
@@ -38,4 +38,7 @@ class FirstMeaningfulPaint extends NavigationMetric {
   }
 }
 
-module.exports = makeComputedArtifact(FirstMeaningfulPaint);
+module.exports = makeComputedArtifact(
+  FirstMeaningfulPaint,
+  ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace']
+);
diff --git a/lighthouse-core/computed/metrics/interactive.js b/lighthouse-core/computed/metrics/interactive.js
@@ -181,7 +181,10 @@ class Interactive extends NavigationMetric {
   }
 }
 
-module.exports = makeComputedArtifact(Interactive);
+module.exports = makeComputedArtifact(
+  Interactive,
+  ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace']
+);
 
 /**
  * @typedef TimePeriod

diff --git a/lighthouse-core/computed/metrics/lantern-first-contentful-paint.js b/lighthouse-core/computed/metrics/lantern-first-contentful-paint.js
@@ -196,4 +196,7 @@ class LanternFirstContentfulPaint extends LanternMetric {
   }
 }
 
-module.exports = makeComputedArtifact(LanternFirstContentfulPaint);
+module.exports = makeComputedArtifact(
+  LanternFirstContentfulPaint,
+  ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace']
+);
diff --git a/lighthouse-core/computed/metrics/lantern-first-meaningful-paint.js b/lighthouse-core/computed/metrics/lantern-first-meaningful-paint.js
@@ -77,4 +77,7 @@ class LanternFirstMeaningfulPaint extends LanternMetric {
   }
 }
 
-module.exports = makeComputedArtifact(LanternFirstMeaningfulPaint);
+module.exports = makeComputedArtifact(
+  LanternFirstMeaningfulPaint,
+  ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace']
+);
diff --git a/lighthouse-core/computed/metrics/lantern-interactive.js b/lighthouse-core/computed/metrics/lantern-interactive.js
@@ -107,4 +107,7 @@ class LanternInteractive extends LanternMetric {
   }
 }
 
-module.exports = makeComputedArtifact(LanternInteractive);
+module.exports = makeComputedArtifact(
+  LanternInteractive,
+  ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace']
+);
diff --git a/lighthouse-core/computed/metrics/lantern-largest-contentful-paint.js b/lighthouse-core/computed/metrics/lantern-largest-contentful-paint.js
@@ -105,4 +105,7 @@ class LanternLargestContentfulPaint extends LanternMetric {
   }
 }
 
-module.exports = makeComputedArtifact(LanternLargestContentfulPaint);
+module.exports = makeComputedArtifact(
+  LanternLargestContentfulPaint,
+  ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace']
+);
diff --git a/lighthouse-core/computed/metrics/lantern-max-potential-fid.js b/lighthouse-core/computed/metrics/lantern-max-potential-fid.js
@@ -87,4 +87,7 @@ class LanternMaxPotentialFID extends LanternMetricArtifact {
   }
 }
 
-module.exports = makeComputedArtifact(LanternMaxPotentialFID);
+module.exports = makeComputedArtifact(
+  LanternMaxPotentialFID,
+  ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace']
+);
diff --git a/lighthouse-core/computed/metrics/lantern-speed-index.js b/lighthouse-core/computed/metrics/lantern-speed-index.js
@@ -144,4 +144,7 @@ class LanternSpeedIndex extends LanternMetric {
   }
 }
 
-module.exports = makeComputedArtifact(LanternSpeedIndex);
+module.exports = makeComputedArtifact(
+  LanternSpeedIndex,
+  ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace']
+);
diff --git a/lighthouse-core/computed/metrics/lantern-total-blocking-time.js b/lighthouse-core/computed/metrics/lantern-total-blocking-time.js
@@ -120,4 +120,7 @@ class LanternTotalBlockingTime extends LanternMetric {
   }
 }
 
-module.exports = makeComputedArtifact(LanternTotalBlockingTime);
+module.exports = makeComputedArtifact(
+  LanternTotalBlockingTime,
+  ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace']
+);
diff --git a/lighthouse-core/computed/metrics/largest-contentful-paint-all-frames.js b/lighthouse-core/computed/metrics/largest-contentful-paint-all-frames.js
@@ -39,4 +39,7 @@ class LargestContentfulPaintAllFrames extends NavigationMetric {
   }
 }
 
-module.exports = makeComputedArtifact(LargestContentfulPaintAllFrames);
+module.exports = makeComputedArtifact(
+  LargestContentfulPaintAllFrames,
+  ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace']
+);
diff --git a/lighthouse-core/computed/metrics/largest-contentful-paint.js b/lighthouse-core/computed/metrics/largest-contentful-paint.js
@@ -46,4 +46,7 @@ class LargestContentfulPaint extends NavigationMetric {
   }
 }
 
-module.exports = makeComputedArtifact(LargestContentfulPaint);
+module.exports = makeComputedArtifact(
+  LargestContentfulPaint,
+  ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace']
+);
diff --git a/lighthouse-core/computed/metrics/max-potential-fid.js b/lighthouse-core/computed/metrics/max-potential-fid.js
@@ -39,4 +39,7 @@ class MaxPotentialFID extends NavigationMetric {
   }
 }
 
-module.exports = makeComputedArtifact(MaxPotentialFID);
+module.exports = makeComputedArtifact(
+  MaxPotentialFID,
+  ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace']
+);
diff --git a/lighthouse-core/computed/metrics/speed-index.js b/lighthouse-core/computed/metrics/speed-index.js
@@ -34,4 +34,7 @@ class SpeedIndex extends NavigationMetric {
   }
 }
 
-module.exports = makeComputedArtifact(SpeedIndex);
+module.exports = makeComputedArtifact(
+  SpeedIndex,
+  ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace']
+);
diff --git a/lighthouse-core/computed/metrics/timing-summary.js b/lighthouse-core/computed/metrics/timing-summary.js
@@ -144,4 +144,7 @@ class TimingSummary {
   }
 }
 
-module.exports = makeComputedArtifact(TimingSummary);
+module.exports = makeComputedArtifact(
+  TimingSummary,
+  ['devtoolsLog', 'gatherContext', 'settings', 'trace']
+);
diff --git a/lighthouse-core/computed/metrics/total-blocking-time.js b/lighthouse-core/computed/metrics/total-blocking-time.js
@@ -68,4 +68,7 @@ class TotalBlockingTime extends ComputedMetric {
   }
 }
 
-module.exports = makeComputedArtifact(TotalBlockingTime);
+module.exports = makeComputedArtifact(
+  TotalBlockingTime,
+  ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace']
+);
diff --git a/lighthouse-core/computed/module-duplication.js b/lighthouse-core/computed/module-duplication.js
@@ -74,7 +74,7 @@ class ModuleDuplication {
   }
 
   /**
-   * @param {LH.Artifacts} artifacts
+   * @param {Pick<LH.Artifacts, 'ScriptElements'|'SourceMaps'>} artifacts
    * @param {LH.Artifacts.ComputedContext} context
    */
   static async compute_(artifacts, context) {
@@ -133,4 +133,4 @@ class ModuleDuplication {
   }
 }
 
-module.exports = makeComputedArtifact(ModuleDuplication);
+module.exports = makeComputedArtifact(ModuleDuplication, ['ScriptElements', 'SourceMaps']);
diff --git a/lighthouse-core/computed/network-analysis.js b/lighthouse-core/computed/network-analysis.js
@@ -61,4 +61,4 @@ class NetworkAnalysis {
   }
 }
 
-module.exports = makeComputedArtifact(NetworkAnalysis);
+module.exports = makeComputedArtifact(NetworkAnalysis, null);
diff --git a/lighthouse-core/computed/network-records.js b/lighthouse-core/computed/network-records.js
@@ -18,4 +18,4 @@ class NetworkRecords {
   }
 }
 
-module.exports = makeComputedArtifact(NetworkRecords);
+module.exports = makeComputedArtifact(NetworkRecords, null);
diff --git a/lighthouse-core/computed/page-dependency-graph.js b/lighthouse-core/computed/page-dependency-graph.js
@@ -467,7 +467,7 @@ class PageDependencyGraph {
   }
 }
 
-module.exports = makeComputedArtifact(PageDependencyGraph);
+module.exports = makeComputedArtifact(PageDependencyGraph, ['devtoolsLog', 'trace']);
 
 /**
  * @typedef {Object} NetworkNodeOutput

diff --git a/lighthouse-core/computed/processed-navigation.js b/lighthouse-core/computed/processed-navigation.js
@@ -18,4 +18,4 @@ class ProcessedNavigation {
   }
 }
 
-module.exports = makeComputedArtifact(ProcessedNavigation);
+module.exports = makeComputedArtifact(ProcessedNavigation, null);
diff --git a/lighthouse-core/computed/processed-trace.js b/lighthouse-core/computed/processed-trace.js
@@ -18,4 +18,4 @@ class ProcessedTrace {
   }
 }
 
-module.exports = makeComputedArtifact(ProcessedTrace);
+module.exports = makeComputedArtifact(ProcessedTrace, null);
diff --git a/lighthouse-core/computed/resource-summary.js b/lighthouse-core/computed/resource-summary.js
@@ -111,4 +111,4 @@ class ResourceSummary {
   }
 }
 
-module.exports = makeComputedArtifact(ResourceSummary);
+module.exports = makeComputedArtifact(ResourceSummary, ['URL', 'devtoolsLog', 'budgets']);
diff --git a/lighthouse-core/computed/screenshots.js b/lighthouse-core/computed/screenshots.js
@@ -26,4 +26,4 @@ class Screenshots {
   }
 }
 
-module.exports = makeComputedArtifact(Screenshots);
+module.exports = makeComputedArtifact(Screenshots, null);
diff --git a/lighthouse-core/computed/speedline.js b/lighthouse-core/computed/speedline.js
@@ -51,4 +51,4 @@ class Speedline {
   }
 }
 
-module.exports = makeComputedArtifact(Speedline);
+module.exports = makeComputedArtifact(Speedline, null);
diff --git a/lighthouse-core/computed/trace-of-tab.js b/lighthouse-core/computed/trace-of-tab.js
@@ -26,5 +26,5 @@ class TraceOfTab {
 }
 
 log.warn(`trace-of-tab`, `trace-of-tab is deprecated, use processed-trace / processed-navigation instead`); // eslint-disable-line max-len
-module.exports = makeComputedArtifact(TraceOfTab);
+module.exports = makeComputedArtifact(TraceOfTab, null);
 
diff --git a/lighthouse-core/computed/unused-css.js b/lighthouse-core/computed/unused-css.js
@@ -151,4 +151,4 @@ class UnusedCSS {
   }
 }
 
-module.exports = makeComputedArtifact(UnusedCSS);
+module.exports = makeComputedArtifact(UnusedCSS, ['CSSUsage', 'URL', 'devtoolsLog']);
diff --git a/lighthouse-core/computed/unused-javascript-summary.js b/lighthouse-core/computed/unused-javascript-summary.js
@@ -169,4 +169,7 @@ class UnusedJavascriptSummary {
   }
 }
 
-module.exports = makeComputedArtifact(UnusedJavascriptSummary);
+module.exports = makeComputedArtifact(
+  UnusedJavascriptSummary,
+  ['bundle', 'scriptCoverages', 'url']
+);
diff --git a/lighthouse-core/computed/user-timings.js b/lighthouse-core/computed/user-timings.js
@@ -80,4 +80,4 @@ class UserTimings {
   }
 }
 
-module.exports = makeComputedArtifact(UserTimings);
+module.exports = makeComputedArtifact(UserTimings, null);
diff --git a/lighthouse-core/computed/viewport-meta.js b/lighthouse-core/computed/viewport-meta.js
@@ -46,7 +46,7 @@ class ViewportMeta {
   }
 }
 
-module.exports = makeComputedArtifact(ViewportMeta);
+module.exports = makeComputedArtifact(ViewportMeta, null);
 
 /**
  * @typedef {object} ViewportMetaResult