core(fr): fix usage of distributed conditional type (#12565)

GoogleChrome · May 26, 2021 · a8b22fd · a8b22fd
1 parent 80f4a75
commit a8b22fd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lighthouse-core/fraggle-rock/gather/runner-helpers.js b/lighthouse-core/fraggle-rock/gather/runner-helpers.js
@@ -19,6 +19,8 @@
 
 /** @typedef {Record<CollectPhaseArtifactOptions['phase'], IntermediateArtifacts>} ArtifactState */
 
+/** @typedef {LH.Gatherer.FRTransitionalContext<LH.Gatherer.DependencyKey>['dependencies']} Dependencies */
+
 /**
  *
  * @param {{id: string}} dependency
@@ -70,7 +72,7 @@ async function collectPhaseArtifacts(options) {
     const artifactPromise = priorArtifactPromise.then(async () => {
       const dependencies = phase === 'getArtifact'
         ? await collectArtifactDependencies(artifactDefn, artifactState.getArtifact)
-        : {};
+        : /** @type {Dependencies} */ ({});
 
       return gatherer[phase]({
         url: await driver.url(),
@@ -89,10 +91,10 @@ async function collectPhaseArtifacts(options) {
 /**
  * @param {LH.Config.ArtifactDefn} artifact
  * @param {Record<string, LH.Gatherer.PhaseResult>} artifactsById
- * @return {Promise<LH.Gatherer.FRTransitionalContext<LH.Gatherer.DependencyKey>['dependencies']>}
+ * @return {Promise<Dependencies>}
  */
 async function collectArtifactDependencies(artifact, artifactsById) {
-  if (!artifact.dependencies) return {};
+  if (!artifact.dependencies) return /** @type {Dependencies} */ ({});
 
   const dependencyPromises = Object.entries(artifact.dependencies).map(
     async ([dependencyName, dependency]) => {

diff --git a/types/gatherer.d.ts b/types/gatherer.d.ts
@@ -45,9 +45,7 @@ declare global {
       /** The cached results of computed artifacts. */
       computedCache: Map<string, ArbitraryEqualityMap>;
       /** The set of available dependencies requested by the current gatherer. */
-      dependencies: TDependencies extends DefaultDependenciesKey ?
-        {} :
-        Pick<GathererArtifacts, Exclude<TDependencies, DefaultDependenciesKey>>;
+      dependencies: Pick<GathererArtifacts, Exclude<TDependencies, DefaultDependenciesKey>>;
     }
 
     export interface PassContext {