RPP: add default to InsightModel generic

We had some cases where we passed `any`, others where we passed `{}`. If
we set the default explicitly, we can not pass anything and be
consistent.

Bug: none
Change-Id: I4bc500cb55587abf2c5892af8438f4994935c063
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6316669
Commit-Queue: Jack Franklin <[email protected]>
Auto-Submit: Jack Franklin <[email protected]>
Commit-Queue: Nikolay Vitkov <[email protected]>
Reviewed-by: Nikolay Vitkov <[email protected]>

Author: jackfranklin

front_end/models/trace/insights/LCPPhases.ts

@@ -90,7 +90,7 @@ interface LCPPhases {
   renderDelay: Types.Timing.Milli;
 }
 
-export function isLCPPhases(model: InsightModel<{}, {}>): model is LCPPhasesInsightModel {
+export function isLCPPhases(model: InsightModel): model is LCPPhasesInsightModel {
   return model.insightKey === 'LCPPhases';
 }
 export type LCPPhasesInsightModel = InsightModel<typeof UIStrings, {

front_end/models/trace/insights/types.ts

@@ -79,23 +79,25 @@ export type RelatedEventsMap = Map<Types.Events.Event, string[]>;
 
 export type Checklist<Keys extends string> = Record<Keys, {label: Common.UIString.LocalizedString, value: boolean}>;
 
-export type InsightModel<UIStrings extends Record<string, string>, R extends Record<string, unknown>> = R&{
-  /** Used internally to identify the type of a model, not shown visibly to users **/
-  insightKey: keyof InsightModelsType,
-  /** Not used within DevTools - this is for external consumers (like Lighthouse). */
-  strings: UIStrings,
-  title: Common.UIString.LocalizedString,
-  description: Common.UIString.LocalizedString,
-  category: InsightCategory,
-  state: 'pass' | 'fail' | 'informative',
-  relatedEvents?: RelatedEventsMap | Types.Events.Event[],
-  warnings?: InsightWarning[],
-  metricSavings?: MetricSavings,
-  /**
-   * If this insight is attached to a navigation, this stores its ID.
-   */
-  navigationId?: string,
-};
+export type InsightModel<UIStrings extends Record<string, string> = Record<string, string>,
+                                           ExtraDetail extends Record<string, unknown> = Record<string, unknown>> =
+    ExtraDetail&{
+      /** Used internally to identify the type of a model, not shown visibly to users **/
+      insightKey: keyof InsightModelsType,
+      /** Not used within DevTools - this is for external consumers (like Lighthouse). */
+      strings: UIStrings,
+      title: Common.UIString.LocalizedString,
+      description: Common.UIString.LocalizedString,
+      category: InsightCategory,
+      state: 'pass' | 'fail' | 'informative',
+      relatedEvents?: RelatedEventsMap | Types.Events.Event[],
+      warnings?: InsightWarning[],
+      metricSavings?: MetricSavings,
+      /**
+       * If this insight is attached to a navigation, this stores its ID.
+       */
+      navigationId?: string,
+    };
 
 export type PartialInsightModel<T> =
     Omit<T, 'strings'|'title'|'description'|'category'|'state'|'insightKey'|'navigationId'>;

front_end/panels/ai_assistance/data_formatters/PerformanceInsightFormatter.ts

@@ -23,8 +23,8 @@ function formatMicro(x: number|undefined): string {
 }
 
 export class PerformanceInsightFormatter {
-  #insight: Trace.Insights.Types.InsightModel<{}, {}>;
-  constructor(insight: Trace.Insights.Types.InsightModel<{}, {}>) {
+  #insight: Trace.Insights.Types.InsightModel;
+  constructor(insight: Trace.Insights.Types.InsightModel) {
     this.#insight = insight;
   }
 

front_end/panels/timeline/components/Sidebar.ts

@@ -10,7 +10,7 @@ import {SidebarAnnotationsTab} from './SidebarAnnotationsTab.js';
 import {SidebarInsightsTab} from './SidebarInsightsTab.js';
 
 export interface ActiveInsight {
-  model: Trace.Insights.Types.InsightModel<{}, {}>;
+  model: Trace.Insights.Types.InsightModel;
   insightSetKey: string;
 }
 

front_end/panels/timeline/components/SidebarSingleInsightSet.test.ts

@@ -13,7 +13,7 @@ import * as Components from './components.js';
 import type * as InsightComponents from './insights/insights.js';
 
 type BaseInsightComponent =
-    InsightComponents.BaseInsightComponent.BaseInsightComponent<Trace.Insights.Types.InsightModel<{}, {}>>;
+    InsightComponents.BaseInsightComponent.BaseInsightComponent<Trace.Insights.Types.InsightModel>;
 
 function getUserVisibleInsights(component: Components.SidebarSingleInsightSet.SidebarSingleInsightSet):
     BaseInsightComponent[] {

front_end/panels/timeline/components/SidebarSingleInsightSet.ts

@@ -92,8 +92,8 @@ export interface SidebarSingleInsightSetData {
 const EXPERIMENTAL_INSIGHTS: ReadonlySet<string> = new Set([
 ]);
 
-type InsightNameToComponentMapping = Record<
-    string, typeof Insights.BaseInsightComponent.BaseInsightComponent<Trace.Insights.Types.InsightModel<{}, {}>>>;
+type InsightNameToComponentMapping =
+    Record<string, typeof Insights.BaseInsightComponent.BaseInsightComponent<Trace.Insights.Types.InsightModel>>;
 
 /**
  * Every insight (INCLUDING experimental ones).

front_end/panels/timeline/components/insights/BaseInsightComponent.test.ts

@@ -18,7 +18,7 @@ const {html} = Lit;
 
 describeWithEnvironment('BaseInsightComponent', () => {
   const {BaseInsightComponent} = Insights.BaseInsightComponent;
-  class TestInsightComponent extends BaseInsightComponent<Trace.Insights.Types.InsightModel<{}, {}>> {
+  class TestInsightComponent extends BaseInsightComponent<Trace.Insights.Types.InsightModel> {
     override internalName = 'test-insight';
     override createOverlays(): TimelineOverlay[] {
       return [];

front_end/panels/timeline/components/insights/BaseInsightComponent.ts

@@ -58,7 +58,7 @@ export interface BaseInsightData {
   insightSetKey: string|null;
 }
 
-export abstract class BaseInsightComponent<T extends InsightModel<{}, {}>> extends HTMLElement {
+export abstract class BaseInsightComponent<T extends InsightModel> extends HTMLElement {
   abstract internalName: string;
   // So we can use the TypeScript BaseInsight class without getting warnings
   // about litTagName. Every child should overrwrite this.

front_end/panels/timeline/components/insights/SidebarInsight.ts

@@ -18,7 +18,7 @@ export interface InsightDetails {
 export class InsightActivated extends Event {
   static readonly eventName = 'insightactivated';
 
-  constructor(public model: InsightModel<{}, {}>, public insightSetKey: string) {
+  constructor(public model: InsightModel, public insightSetKey: string) {
     super(InsightActivated.eventName, {bubbles: true, composed: true});
   }
 }

front_end/panels/timeline/components/insights/Table.ts

@@ -18,7 +18,7 @@ tableStyles.replaceSync(tableStylesRaw.cssContent);
 
 const {html} = Lit;
 
-type BaseInsightComponent = BaseInsightComponent.BaseInsightComponent<Trace.Insights.Types.InsightModel<{}, {}>>;
+type BaseInsightComponent = BaseInsightComponent.BaseInsightComponent<Trace.Insights.Types.InsightModel>;
 
 /**
  * @fileoverview An interactive table component.
@@ -53,7 +53,6 @@ export interface TableDataRow {
 }
 
 export class Table extends HTMLElement {
-
   readonly #shadow = this.attachShadow({mode: 'open'});
   readonly #boundRender = this.#render.bind(this);
   #insight?: BaseInsightComponent;