switcheroo

GoogleChrome · Sep 8, 2018 · d8e6372 · d8e6372
1 parent 2e52a90
commit d8e6372
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/lighthouse-core/audits/manifest-short-name-length.js b/lighthouse-core/audits/manifest-short-name-length.js
@@ -30,7 +30,8 @@ class ManifestShortNameLength extends Audit {
    * @return {Promise<LH.Audit.Product>}
    */
   static async audit(artifacts, context) {
-    const manifestValues = await new ManifestValues().request(artifacts.Manifest, context);
+    const manifestValues = await new ManifestValues().request(context.computedCaches,
+        artifacts.Manifest);
     // If there's no valid manifest, this audit is not applicable
     if (manifestValues.isParseFailure) {
       return {

diff --git a/lighthouse-core/audits/splash-screen.js b/lighthouse-core/audits/splash-screen.js
@@ -72,7 +72,8 @@ class SplashScreen extends MultiCheckAudit {
     /** @type {Array<string>} */
     const failures = [];
 
-    const manifestValues = await new ManifestValues().request(artifacts.Manifest, context);
+    const manifestValues = await new ManifestValues().request(context.computedCaches,
+        artifacts.Manifest);
     SplashScreen.assessManifest(manifestValues, failures);
 
     return {

diff --git a/lighthouse-core/audits/themed-omnibox.js b/lighthouse-core/audits/themed-omnibox.js
@@ -71,7 +71,8 @@ class ThemedOmnibox extends MultiCheckAudit {
     /** @type {Array<string>} */
     const failures = [];
 
-    const manifestValues = await new ManifestValues().request(artifacts.Manifest, context);
+    const manifestValues = await new ManifestValues().request(context.computedCaches,
+        artifacts.Manifest);
     ThemedOmnibox.assessManifest(manifestValues, failures);
     ThemedOmnibox.assessMetaThemecolor(artifacts.ThemeColor, failures);
 

diff --git a/lighthouse-core/audits/webapp-install-banner.js b/lighthouse-core/audits/webapp-install-banner.js
@@ -128,8 +128,8 @@ class WebappInstallBanner extends MultiCheckAudit {
     /** @type {Array<string>} */
     let offlineWarnings = [];
 
-    const manifestValues = await new ManifestValues()
-      .request(artifacts.Manifest, context);
+    const manifestValues = await new ManifestValues().request(context.computedCaches,
+        artifacts.Manifest);
     const manifestFailures = WebappInstallBanner.assessManifest(manifestValues);
     const swFailures = WebappInstallBanner.assessServiceWorker(artifacts);
     if (!swFailures.length) {

diff --git a/lighthouse-core/gather/computed/new-computed-artifact.js b/lighthouse-core/gather/computed/new-computed-artifact.js
@@ -35,13 +35,13 @@ class ComputedArtifact {
    * Request a computed artifact, caching the result based on the input
    * artifact(s). Types of `artifact` and the return value are inferred from the
    * `compute_` method on classes derived from ComputedArtifact.
+   * @param {LH.Audit.Context['computedCaches']} caches
    * @param {FirstParamType<this['compute_']>} artifact
-   * @param {LH.Audit.Context} context
    * @return {Promise<ReturnType<this['compute_']>>}
    */
-  async request(artifact, context) {
-    const cache = context.computedCaches.get(this.name) || new ArbitraryEqualityMap();
-    context.computedCaches.set(this.name, cache);
+  async request(caches, artifact) {
+    const cache = caches.get(this.name) || new ArbitraryEqualityMap();
+    caches.set(this.name, cache);
 
     const computed = /** @type {ReturnType<this['compute_']>|undefined} */ (cache.get(artifact));
     if (computed) {

diff --git a/tsconfig.json b/tsconfig.json
@@ -7,7 +7,7 @@
     "checkJs": true,
     "strict": true,
     // "listFiles": true,
-    "noErrorTruncation": true,
+    // "noErrorTruncation": true,
     "typeRoots": [
       "@types",
       "./typings"