Fix localize key errors for helpers (#14496)

src/common/array/literal-includes.ts

@@ -0,0 +1,5 @@
+// Creates a type predicate function for determining if an array literal includes a given value
+export const arrayLiteralIncludes =
+  <T extends readonly unknown[]>(array: T) =>
+  (searchElement: unknown, fromIndex?: number): searchElement is T[number] =>
+    array.includes(searchElement as T[number], fromIndex);

src/common/translations/localize.ts

@@ -30,7 +30,6 @@ export type LocalizeKeys =
   | `ui.panel.config.dashboard.${string}`
   | `ui.panel.config.devices.${string}`
   | `ui.panel.config.energy.${string}`
-  | `ui.panel.config.helpers.${string}`
   | `ui.panel.config.info.${string}`
   | `ui.panel.config.logs.${string}`
   | `ui.panel.config.lovelace.${string}`

src/components/entity/ha-statistic-picker.ts

@@ -3,7 +3,7 @@ import { html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import { customElement, property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
-import { ensureArray } from "../../common/ensure-array";
+import { ensureArray } from "../../common/array/ensure-array";
 import { fireEvent } from "../../common/dom/fire_event";
 import { stringCompare } from "../../common/string/compare";
 import {

src/components/ha-target-picker.ts

@@ -18,7 +18,7 @@ import { css, CSSResultGroup, html, LitElement, unsafeCSS } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { fireEvent } from "../common/dom/fire_event";
-import { ensureArray } from "../common/ensure-array";
+import { ensureArray } from "../common/array/ensure-array";
 import { computeDomain } from "../common/entity/compute_domain";
 import { computeStateName } from "../common/entity/compute_state_name";
 import {

src/components/trace/hat-script-graph.ts

@@ -25,7 +25,7 @@ import {
 import { css, html, LitElement, PropertyValues } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
-import { ensureArray } from "../../common/ensure-array";
+import { ensureArray } from "../../common/array/ensure-array";
 import { Condition, Trigger } from "../../data/automation";
 import {
   Action,

src/data/automation_i18n.ts

@@ -1,6 +1,6 @@
 import { formatDuration } from "../common/datetime/format_duration";
 import secondsToDuration from "../common/datetime/seconds_to_duration";
-import { ensureArray } from "../common/ensure-array";
+import { ensureArray } from "../common/array/ensure-array";
 import { computeStateName } from "../common/entity/compute_state_name";
 import type { HomeAssistant } from "../types";
 import { Condition, Trigger } from "./automation";

src/data/script.ts

@@ -15,6 +15,7 @@ import {
   Describe,
   boolean,
 } from "superstruct";
+import { arrayLiteralIncludes } from "../common/array/literal-includes";
 import { navigate } from "../common/navigate";
 import { HomeAssistant } from "../types";
 import {
@@ -28,11 +29,7 @@ import { BlueprintInput } from "./blueprint";
 
 export const MODES = ["single", "restart", "queued", "parallel"] as const;
 export const MODES_MAX = ["queued", "parallel"] as const;
-
-export const isMaxMode = (
-  mode: typeof MODES[number]
-): mode is typeof MODES_MAX[number] =>
-  MODES_MAX.includes(mode as typeof MODES_MAX[number]);
+export const isMaxMode = arrayLiteralIncludes(MODES_MAX);
 
 export const baseActionStruct = object({
   alias: optional(string()),

src/data/script_i18n.ts

@@ -1,6 +1,6 @@
 import { formatDuration } from "../common/datetime/format_duration";
 import secondsToDuration from "../common/datetime/seconds_to_duration";
-import { ensureArray } from "../common/ensure-array";
+import { ensureArray } from "../common/array/ensure-array";
 import { computeStateName } from "../common/entity/compute_state_name";
 import { isTemplate } from "../common/string/has-template";
 import { HomeAssistant } from "../types";

src/panels/config/automation/action/types/ha-automation-action-choose.ts

@@ -2,7 +2,7 @@ import { mdiDelete, mdiPlus } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../../common/dom/fire_event";
-import { ensureArray } from "../../../../../common/ensure-array";
+import { ensureArray } from "../../../../../common/array/ensure-array";
 import "../../../../../components/ha-icon-button";
 import { Condition } from "../../../../../data/automation";
 import { Action, ChooseAction } from "../../../../../data/script";

src/panels/config/automation/action/types/ha-automation-action-wait_for_trigger.ts

@@ -10,7 +10,7 @@ import { ActionElement, handleChangeEvent } from "../ha-automation-action-row";
 import "../../../../../components/ha-duration-input";
 import { createDurationData } from "../../../../../common/datetime/create_duration_data";
 import { TimeChangedEvent } from "../../../../../components/ha-base-time-input";
-import { ensureArray } from "../../../../../common/ensure-array";
+import { ensureArray } from "../../../../../common/array/ensure-array";
 
 @customElement("ha-automation-action-wait_for_trigger")
 export class HaWaitForTriggerAction

src/panels/config/automation/condition/types/ha-automation-condition-trigger.ts

@@ -3,7 +3,7 @@ import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import { html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../../common/dom/fire_event";
-import { ensureArray } from "../../../../../common/ensure-array";
+import { ensureArray } from "../../../../../common/array/ensure-array";
 import "../../../../../components/ha-select";
 import type {
   AutomationConfig,

src/panels/config/automation/trigger/types/ha-automation-trigger-state.ts

@@ -11,7 +11,7 @@ import {
   union,
 } from "superstruct";
 import memoizeOne from "memoize-one";
-import { ensureArray } from "../../../../../common/ensure-array";
+import { ensureArray } from "../../../../../common/array/ensure-array";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import { hasTemplate } from "../../../../../common/string/has-template";
 import { StateTrigger } from "../../../../../data/automation";

src/panels/config/helpers/const.ts

@@ -1,3 +1,4 @@
+import { arrayLiteralIncludes } from "../../../common/array/literal-includes";
 import type { Counter } from "../../../data/counter";
 import type { InputBoolean } from "../../../data/input_boolean";
 import type { InputButton } from "../../../data/input_button";
@@ -18,7 +19,10 @@ export const HELPER_DOMAINS = [
   "counter",
   "timer",
   "schedule",
-];
+] as const;
+
+export type HelperDomain = typeof HELPER_DOMAINS[number];
+export const isHelperDomain = arrayLiteralIncludes(HELPER_DOMAINS);
 
 export type Helper =
   | InputBoolean

src/panels/config/helpers/dialog-helper-detail.ts

@@ -25,7 +25,7 @@ import { showConfigFlowDialog } from "../../../dialogs/config-flow/show-dialog-c
 import { haStyleDialog } from "../../../resources/styles";
 import { HomeAssistant } from "../../../types";
 import { brandsUrl } from "../../../util/brands-url";
-import { Helper } from "./const";
+import { Helper, HelperDomain } from "./const";
 import "./forms/ha-counter-form";
 import "./forms/ha-input_boolean-form";
 import "./forms/ha-input_button-form";
@@ -37,7 +37,18 @@ import "./forms/ha-schedule-form";
 import "./forms/ha-timer-form";
 import type { ShowDialogHelperDetailParams } from "./show-dialog-helper-detail";
 
-const HELPERS = {
+type HelperCreators = {
+  [domain in HelperDomain]: (
+    hass: HomeAssistant,
+    // Not properly typed because there is currently a mismatch for this._item between:
+    // 1. Type passed to form should be Helper
+    // 2. Type received by creator should be MutableParams version
+    // The two are not compatible.
+    params: any
+  ) => Promise<Helper>;
+};
+
+const HELPERS: HelperCreators = {
   input_boolean: createInputBoolean,
   input_button: createInputButton,
   input_text: createInputText,
@@ -57,7 +68,7 @@ export class DialogHelperDetail extends LitElement {
 
   @state() private _opened = false;
 
-  @state() private _domain?: string;
+  @state() private _domain?: HelperDomain;
 
   @state() private _error?: string;
 
@@ -127,7 +138,7 @@ export class DialogHelperDetail extends LitElement {
     } else {
       const items: [string, string][] = [];
 
-      for (const helper of Object.keys(HELPERS)) {
+      for (const helper of Object.keys(HELPERS) as (keyof typeof HELPERS)[]) {
         items.push([
           helper,
           this.hass.localize(`ui.panel.config.helpers.types.${helper}`) ||

src/panels/config/helpers/ha-config-helpers.ts

@@ -35,7 +35,7 @@ import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
 import { HomeAssistant, Route } from "../../../types";
 import { configSections } from "../ha-panel-config";
 import "../integrations/ha-integration-overflow-menu";
-import { HELPER_DOMAINS } from "./const";
+import { HelperDomain, isHelperDomain } from "./const";
 import { showHelperDetailDialog } from "./show-dialog-helper-detail";
 
 // This groups items by a key but only returns last entry per key.
@@ -118,7 +118,7 @@ export class HaConfigHelpers extends SubscribeMixin(LitElement) {
         sortable: true,
         width: "25%",
         filterable: true,
-        template: (type, row) =>
+        template: (type: HelperDomain, row) =>
           row.configEntry
             ? domainToName(localize, type)
             : html`
@@ -243,7 +243,7 @@ export class HaConfigHelpers extends SubscribeMixin(LitElement) {
     if (!domain) {
       return;
     }
-    if (HELPER_DOMAINS.includes(domain)) {
+    if (isHelperDomain(domain)) {
       showHelperDetailDialog(this, {
         domain,
       });
@@ -330,7 +330,7 @@ export class HaConfigHelpers extends SubscribeMixin(LitElement) {
     const newStates = Object.values(this.hass!.states).filter(
       (entity) =>
         extraEntities.has(entity.entity_id) ||
-        HELPER_DOMAINS.includes(computeStateDomain(entity))
+        isHelperDomain(computeStateDomain(entity))
     );
 
     if (

src/panels/config/helpers/show-dialog-helper-detail.ts

@@ -1,10 +1,11 @@
 import { fireEvent } from "../../../common/dom/fire_event";
 import { DataEntryFlowDialogParams } from "../../../dialogs/config-flow/show-dialog-data-entry-flow";
+import { HelperDomain } from "./const";
 
 export const loadHelperDetailDialog = () => import("./dialog-helper-detail");
 
 export interface ShowDialogHelperDetailParams {
-  domain?: string;
+  domain?: HelperDomain;
   // Only used for config entries
   dialogClosedCallback?: DataEntryFlowDialogParams["dialogClosedCallback"];
 }

src/panels/config/integrations/ha-config-integrations.ts

@@ -70,7 +70,7 @@ import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
 import { haStyle } from "../../../resources/styles";
 import type { HomeAssistant, Route } from "../../../types";
 import { configSections } from "../ha-panel-config";
-import { HELPER_DOMAINS } from "../helpers/const";
+import { isHelperDomain } from "../helpers/const";
 import "./ha-config-flow-card";
 import "./ha-ignored-config-entry-card";
 import "./ha-integration-card";
@@ -785,7 +785,7 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
     }
 
     // If not an integration or supported brand, try helper else show alert
-    if (HELPER_DOMAINS.includes(domain)) {
+    if (isHelperDomain(domain)) {
       navigate(`/config/helpers/add?domain=${domain}`, {
         replace: true,
       });

src/panels/history/ha-panel-history.ts

@@ -18,7 +18,7 @@ import { css, html, LitElement, PropertyValues } from "lit";
 import { property, state } from "lit/decorators";
 import { firstWeekdayIndex } from "../../common/datetime/first_weekday";
 import { LocalStorage } from "../../common/decorators/local-storage";
-import { ensureArray } from "../../common/ensure-array";
+import { ensureArray } from "../../common/array/ensure-array";
 import { navigate } from "../../common/navigate";
 import {
   createSearchParam,

src/panels/logbook/ha-logbook.ts

@@ -1,7 +1,7 @@
 import { css, html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { isComponentLoaded } from "../../common/config/is_component_loaded";
-import { ensureArray } from "../../common/ensure-array";
+import { ensureArray } from "../../common/array/ensure-array";
 import { computeStateDomain } from "../../common/entity/compute_state_domain";
 import { throttle } from "../../common/util/throttle";
 import "../../components/ha-circular-progress";

src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts

@@ -20,7 +20,7 @@ import {
   union,
 } from "superstruct";
 import { fireEvent } from "../../../../common/dom/fire_event";
-import { ensureArray } from "../../../../common/ensure-array";
+import { ensureArray } from "../../../../common/array/ensure-array";
 import type { LocalizeFunc } from "../../../../common/translations/localize";
 import { deepEqual } from "../../../../common/util/deep-equal";
 import {