Improve typings

home-assistant · Sep 20, 2023 · ddb8971 · ddb8971
1 parent 7dca4d2
commit ddb8971
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 27 deletions.
diff --git a/src/data/lovelace.ts b/src/data/lovelace.ts
@@ -17,12 +17,14 @@ export interface LovelacePanelConfig {
   mode: "yaml" | "storage";
 }
 
+export type LovelaceStrategyConfig<T = Record<string, any>> = {
+  type: string;
+  options?: T;
+};
+
 export interface LovelaceConfig {
   title?: string;
-  strategy?: {
-    type: string;
-    options?: Record<string, unknown>;
-  };
+  strategy?: LovelaceStrategyConfig;
   views: LovelaceViewConfig[];
   background?: string;
 }
@@ -81,10 +83,7 @@ export interface LovelaceViewConfig {
   index?: number;
   title?: string;
   type?: string;
-  strategy?: {
-    type: string;
-    options?: Record<string, unknown>;
-  };
+  strategy?: LovelaceStrategyConfig;
   badges?: Array<string | LovelaceBadgeConfig>;
   cards?: LovelaceCardConfig[];
   path?: string;

diff --git a/src/panels/energy/strategies/energy-view-strategy.ts b/src/panels/energy/strategies/energy-view-strategy.ts
@@ -5,12 +5,12 @@ import {
   getEnergyPreferences,
   GridSourceTypeEnergyPreference,
 } from "../../../data/energy";
-import { LovelaceViewConfig } from "../../../data/lovelace";
-import { HomeAssistant } from "../../../types";
 import {
   LovelaceStrategyConfig,
-  LovelaceStrategyParams,
-} from "../../lovelace/strategies/types";
+  LovelaceViewConfig,
+} from "../../../data/lovelace";
+import { HomeAssistant } from "../../../types";
+import { LovelaceStrategyParams } from "../../lovelace/strategies/types";
 
 const setupWizard = async (): Promise<LovelaceViewConfig> => {
   await import("../cards/energy-setup-wizard-card");

diff --git a/src/panels/lovelace/strategies/get-strategy.ts b/src/panels/lovelace/strategies/get-strategy.ts
@@ -1,11 +1,13 @@
-import { LovelaceConfig, LovelaceViewConfig } from "../../../data/lovelace";
+import {
+  LovelaceConfig,
+  LovelaceStrategyConfig,
+  LovelaceViewConfig,
+} from "../../../data/lovelace";
 import { AsyncReturnType, HomeAssistant } from "../../../types";
 import { isLegacyStrategy } from "./legacy-strategy";
 import {
   LovelaceDashboardStrategy,
   LovelaceStrategy,
-  LovelaceStrategyConfig,
-  LovelaceStrategyConfigType,
   LovelaceStrategyParams,
   LovelaceViewStrategy,
 } from "./types";
@@ -23,6 +25,8 @@ const STRATEGIES: Record<LovelaceStrategyConfigType, Record<string, any>> = {
   },
 };
 
+export type LovelaceStrategyConfigType = "dashboard" | "view";
+
 type Strategies = {
   dashboard: LovelaceDashboardStrategy;
   view: LovelaceViewStrategy;

diff --git a/src/panels/lovelace/strategies/original-states-dashboard-strategy.ts b/src/panels/lovelace/strategies/original-states-dashboard-strategy.ts
@@ -1,8 +1,8 @@
 import { ReactiveElement } from "lit";
 import { customElement } from "lit/decorators";
-import { LovelaceConfig } from "../../../data/lovelace";
+import { LovelaceConfig, LovelaceStrategyConfig } from "../../../data/lovelace";
 import { HomeAssistant } from "../../../types";
-import { LovelaceStrategyConfig, LovelaceStrategyParams } from "./types";
+import { LovelaceStrategyParams } from "./types";
 
 @customElement("original-states-dashboard-strategy")
 export class OriginalStatesDashboardStrategy extends ReactiveElement {

diff --git a/src/panels/lovelace/strategies/original-states-view-strategy.ts b/src/panels/lovelace/strategies/original-states-view-strategy.ts
@@ -3,10 +3,13 @@ import { ReactiveElement } from "lit";
 import { customElement } from "lit/decorators";
 import { isComponentLoaded } from "../../../common/config/is_component_loaded";
 import { getEnergyPreferences } from "../../../data/energy";
-import { LovelaceViewConfig } from "../../../data/lovelace";
+import {
+  LovelaceStrategyConfig,
+  LovelaceViewConfig,
+} from "../../../data/lovelace";
 import { HomeAssistant } from "../../../types";
 import { generateDefaultViewConfig } from "../common/generate-lovelace-config";
-import { LovelaceStrategyConfig, LovelaceStrategyParams } from "./types";
+import { LovelaceStrategyParams } from "./types";
 
 @customElement("original-states-view-strategy")
 export class OriginalStatesViewStrategy extends ReactiveElement {

diff --git a/src/panels/lovelace/strategies/types.ts b/src/panels/lovelace/strategies/types.ts
@@ -1,13 +1,10 @@
-import { LovelaceConfig, LovelaceViewConfig } from "../../../data/lovelace";
+import {
+  LovelaceConfig,
+  LovelaceStrategyConfig,
+  LovelaceViewConfig,
+} from "../../../data/lovelace";
 import { HomeAssistant } from "../../../types";
 
-export type LovelaceStrategyConfigType = "dashboard" | "view";
-
-export type LovelaceStrategyConfig<T = Record<string, any>> = {
-  type: string;
-  options?: T;
-};
-
 export type LovelaceStrategyParams = {
   narrow?: boolean;
 };