refactor: Retire the use of unmaintained custom-card-helpers (#1956)

- Closes #1295

src/components/date-picker.ts

@@ -4,7 +4,7 @@ import { createRef, ref, Ref } from 'lit/directives/ref.js';
 import { localize } from '../localize/localize';
 import datePickerStyle from '../scss/date-picker.scss';
 import { stopEventFromActivatingCardWideActions } from '../utils/action';
-import { dispatchAdvancedCameraCardEvent } from '../utils/basic';
+import { fireAdvancedCameraCardEvent } from '../utils/fire-advanced-camera-card-event';
 import './icon';
 
 export interface DatePickerEvent {
@@ -32,7 +32,7 @@ export class AdvancedCameraCardDatePicker extends LitElement {
     const changed = () => {
       const value = this._refInput.value?.value;
 
-      dispatchAdvancedCameraCardEvent<DatePickerEvent>(this, 'date-picker:change', {
+      fireAdvancedCameraCardEvent<DatePickerEvent>(this, 'date-picker:change', {
         date: value ? new Date(value) : null,
       });
     };

src/components/diagnostics.ts

@@ -1,8 +1,8 @@
-import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
 import { CSSResultGroup, html, LitElement, TemplateResult, unsafeCSS } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { until } from 'lit/directives/until.js';
 import { RawAdvancedCameraCardConfig } from '../config/types';
+import { HomeAssistant } from '../ha/types';
 import { localize } from '../localize/localize';
 import basicBlockStyle from '../scss/basic-block.scss';
 import { getDiagnostics } from '../utils/diagnostics';

src/components/elements.ts

@@ -1,4 +1,3 @@
-import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
 import {
   CSSResultGroup,
   html,
@@ -8,9 +7,9 @@ import {
   unsafeCSS,
 } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
+import { dispatchAdvancedCameraCardErrorEvent } from '../components-lib/message/dispatch.js';
 import { ConditionsManager } from '../conditions/conditions-manager.js';
 import { getConditionStateManagerViaEvent } from '../conditions/state-manager-via-event.js';
-import { dispatchAdvancedCameraCardErrorEvent } from '../components-lib/message/dispatch.js';
 import {
   AdvancedCameraCardConditional,
   MenuIcon,
@@ -24,10 +23,12 @@ import {
   StatusBarItem,
   StatusBarString,
 } from '../config/types.js';
+import { HomeAssistant } from '../ha/types.js';
 import { localize } from '../localize/localize.js';
 import elementsStyle from '../scss/elements.scss';
 import { AdvancedCameraCardError } from '../types.js';
-import { dispatchAdvancedCameraCardEvent, errorToConsole } from '../utils/basic.js';
+import { errorToConsole } from '../utils/basic.js';
+import { fireAdvancedCameraCardEvent } from '../utils/fire-advanced-camera-card-event.js';
 
 /* A note on picture element rendering:
  *
@@ -169,7 +170,7 @@ export class AdvancedCameraCardElements extends LitElement {
   protected _menuRemoveHandler = (ev: Event): void => {
     // Re-dispatch event from this element (instead of the disconnected one, as
     // there is no parent of the disconnected element).
-    dispatchAdvancedCameraCardEvent<MenuItem>(
+    fireAdvancedCameraCardEvent<MenuItem>(
       this,
       'menu:remove',
       (ev as CustomEvent).detail,
@@ -179,7 +180,7 @@ export class AdvancedCameraCardElements extends LitElement {
   protected _statusBarRemoveHandler = (ev: Event): void => {
     // Re-dispatch event from this element (instead of the disconnected one, as
     // there is no parent of the disconnected element).
-    dispatchAdvancedCameraCardEvent<StatusBarItem>(
+    fireAdvancedCameraCardEvent<StatusBarItem>(
       this,
       'status-bar:remove',
       (ev as CustomEvent).detail,
@@ -346,7 +347,7 @@ export class AdvancedCameraCardElementsBaseItem<ConfigType> extends LitElement {
   connectedCallback(): void {
     super.connectedCallback();
     if (this._config) {
-      dispatchAdvancedCameraCardEvent<ConfigType>(
+      fireAdvancedCameraCardEvent<ConfigType>(
         this,
         `${this._eventCategory}:add`,
         this._config,
@@ -356,7 +357,7 @@ export class AdvancedCameraCardElementsBaseItem<ConfigType> extends LitElement {
 
   disconnectedCallback(): void {
     if (this._config) {
-      dispatchAdvancedCameraCardEvent<ConfigType>(
+      fireAdvancedCameraCardEvent<ConfigType>(
         this,
         `${this._eventCategory}:remove`,
         this._config,

src/components/gallery.ts

@@ -14,10 +14,10 @@ import { CameraManager, ExtendedMediaQueryResult } from '../camera-manager/manag
 import { EventQuery, MediaQuery, RecordingQuery } from '../camera-manager/types';
 import { ViewManagerEpoch } from '../card-controller/view/types.js';
 import { CardWideConfig, configDefaults, GalleryConfig } from '../config/types';
+import { HomeAssistant } from '../ha/types.js';
 import { localize } from '../localize/localize';
 import galleryCoreStyle from '../scss/gallery-core.scss';
 import galleryStyle from '../scss/gallery.scss';
-import { ExtendedHomeAssistant } from '../types.js';
 import { stopEventFromActivatingCardWideActions } from '../utils/action.js';
 import { errorToConsole, sleep } from '../utils/basic';
 import { scrollIntoView } from '../utils/scroll.js';
@@ -44,7 +44,7 @@ const MIN_GALLERY_EXTENSION_SECONDS = 0.5;
 @customElement('advanced-camera-card-gallery')
 export class AdvancedCameraCardGallery extends LitElement {
   @property({ attribute: false })
-  public hass?: ExtendedHomeAssistant;
+  public hass?: HomeAssistant;
 
   @property({ attribute: false })
   public viewManagerEpoch?: ViewManagerEpoch;
@@ -112,7 +112,7 @@ export class AdvancedCameraCardGallery extends LitElement {
 @customElement('advanced-camera-card-gallery-core')
 export class AdvancedCameraCardGalleryCore extends LitElement {
   @property({ attribute: false })
-  public hass?: ExtendedHomeAssistant;
+  public hass?: HomeAssistant;
 
   @property({ attribute: false })
   public viewManagerEpoch?: ViewManagerEpoch;

src/components/icon.ts

@@ -1,4 +1,3 @@
-import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
 import {
   CSSResultGroup,
   html,
@@ -9,6 +8,7 @@ import {
 } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { IconController } from '../components-lib/icon-controller';
+import { HomeAssistant } from '../ha/types';
 import iconStyle from '../scss/icon.scss';
 import { Icon } from '../types';
 

src/components/image-updating-player.ts

@@ -1,4 +1,3 @@
-import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
 import { HassEntity } from 'home-assistant-js-websocket';
 import {
   CSSResultGroup,
@@ -17,6 +16,7 @@ import { getCameraEntityFromConfig } from '../camera-manager/utils/camera-entity
 import { CachedValueController } from '../components-lib/cached-value-controller.js';
 import { UpdatingImageMediaPlayerController } from '../components-lib/media-player/updating-image.js';
 import { CameraConfig, ImageMode, ImageViewConfig } from '../config/types.js';
+import { HomeAssistant } from '../ha/types.js';
 import defaultImage from '../images/iris-screensaver.jpg';
 import { localize } from '../localize/localize.js';
 import imageUpdatingPlayerStyle from '../scss/image-updating-player.scss';

src/components/image.ts

@@ -1,4 +1,3 @@
-import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
 import {
   CSSResultGroup,
   html,
@@ -23,6 +22,7 @@ import { updateElementStyleFromMediaLayoutConfig } from '../utils/media-layout.j
 import './image-updating-player';
 import { resolveImageMode } from './image-updating-player';
 import './zoomer.js';
+import { HomeAssistant } from '../ha/types';
 
 @customElement('advanced-camera-card-image')
 export class AdvancedCameraCardImage extends LitElement implements MediaPlayer {

src/components/live/carousel.ts

@@ -23,8 +23,8 @@ import {
   LiveConfig,
   TransitionEffect,
 } from '../../config/types.js';
+import { HomeAssistant } from '../../ha/types.js';
 import liveCarouselStyle from '../../scss/live-carousel.scss';
-import { ExtendedHomeAssistant } from '../../types.js';
 import { stopEventFromActivatingCardWideActions } from '../../utils/action.js';
 import { CarouselSelected } from '../../utils/embla/carousel-controller.js';
 import { AutoLazyLoad } from '../../utils/embla/plugins/auto-lazy-load/auto-lazy-load.js';
@@ -56,7 +56,7 @@ interface CameraNeighbors {
 @customElement('advanced-camera-card-live-carousel')
 export class AdvancedCameraCardLiveCarousel extends LitElement {
   @property({ attribute: false })
-  public hass?: ExtendedHomeAssistant;
+  public hass?: HomeAssistant;
 
   @property({ attribute: false })
   public viewManagerEpoch?: ViewManagerEpoch;

src/components/live/grid.ts

@@ -13,14 +13,14 @@ import { MicrophoneState } from '../../card-controller/types.js';
 import { ViewManagerEpoch } from '../../card-controller/view/types.js';
 import { MediaGridSelected } from '../../components-lib/media-grid-controller.js';
 import { CardWideConfig, LiveConfig } from '../../config/types.js';
+import { HomeAssistant } from '../../ha/types.js';
 import liveGridStyle from '../../scss/live-grid.scss';
-import { ExtendedHomeAssistant } from '../../types.js';
 import './carousel.js';
 
 @customElement('advanced-camera-card-live-grid')
 export class AdvancedCameraCardLiveGrid extends LitElement {
   @property({ attribute: false })
-  public hass?: ExtendedHomeAssistant;
+  public hass?: HomeAssistant;
 
   @property({ attribute: false })
   public viewManagerEpoch?: ViewManagerEpoch;

src/components/live/index.ts

@@ -5,14 +5,14 @@ import { MicrophoneState } from '../../card-controller/types.js';
 import { ViewManagerEpoch } from '../../card-controller/view/types.js';
 import { LiveController } from '../../components-lib/live/live-controller.js';
 import { CardWideConfig, LiveConfig } from '../../config/types.js';
+import { HomeAssistant } from '../../ha/types.js';
 import basicBlockStyle from '../../scss/basic-block.scss';
-import { ExtendedHomeAssistant } from '../../types.js';
 import './grid.js';
 
 @customElement('advanced-camera-card-live')
 export class AdvancedCameraCardLive extends LitElement {
   @property({ attribute: false })
-  public hass?: ExtendedHomeAssistant;
+  public hass?: HomeAssistant;
 
   @property({ attribute: false })
   public viewManagerEpoch?: ViewManagerEpoch;

src/components/live/provider.ts

@@ -22,14 +22,10 @@ import {
   LiveProvider,
 } from '../../config/types.js';
 import { STREAM_TROUBLESHOOTING_URL } from '../../const.js';
+import { HomeAssistant } from '../../ha/types.js';
 import { localize } from '../../localize/localize.js';
 import liveProviderStyle from '../../scss/live-provider.scss';
-import {
-  ExtendedHomeAssistant,
-  MediaPlayer,
-  MediaPlayerController,
-  MediaPlayerElement,
-} from '../../types.js';
+import { MediaPlayer, MediaPlayerController, MediaPlayerElement } from '../../types.js';
 import { aspectRatioToString } from '../../utils/basic.js';
 import { dispatchMediaUnloadedEvent } from '../../utils/media-info.js';
 import { updateElementStyleFromMediaLayoutConfig } from '../../utils/media-layout.js';
@@ -42,7 +38,7 @@ import '../surround.js';
 @customElement('advanced-camera-card-live-provider')
 export class AdvancedCameraCardLiveProvider extends LitElement implements MediaPlayer {
   @property({ attribute: false })
-  public hass?: ExtendedHomeAssistant;
+  public hass?: HomeAssistant;
 
   @property({ attribute: false })
   public cameraConfig?: CameraConfig;

src/components/live/providers/go2rtc/index.ts

@@ -12,14 +12,10 @@ import { MicrophoneState } from '../../../../card-controller/types.js';
 import { dispatchLiveErrorEvent } from '../../../../components-lib/live/utils/dispatch-live-error.js';
 import { VideoMediaPlayerController } from '../../../../components-lib/media-player/video.js';
 import { CameraConfig, MicrophoneConfig } from '../../../../config/types.js';
+import { HomeAssistant } from '../../../../ha/types.js';
 import { localize } from '../../../../localize/localize.js';
 import liveGo2RTCStyle from '../../../../scss/live-go2rtc.scss';
-import {
-  ExtendedHomeAssistant,
-  MediaPlayer,
-  MediaPlayerController,
-  Message,
-} from '../../../../types.js';
+import { MediaPlayer, MediaPlayerController, Message } from '../../../../types.js';
 import { convertEndpointAddressToSignedWebsocket } from '../../../../utils/endpoint.js';
 import { renderMessage } from '../../../message.js';
 import { VideoRTC } from './video-rtc.js';
@@ -36,7 +32,7 @@ const GO2RTC_URL_SIGN_EXPIRY_SECONDS = 24 * 60 * 60;
 @customElement('advanced-camera-card-live-go2rtc')
 export class AdvancedCameraCardGo2RTC extends LitElement implements MediaPlayer {
   // Not an reactive property to avoid resetting the video.
-  public hass?: ExtendedHomeAssistant;
+  public hass?: HomeAssistant;
 
   @property({ attribute: false })
   public cameraConfig?: CameraConfig;

src/components/live/providers/ha.ts

@@ -1,8 +1,8 @@
-import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
 import { CSSResultGroup, html, LitElement, TemplateResult, unsafeCSS } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { createRef, Ref, ref } from 'lit/directives/ref.js';
 import { CameraConfig } from '../../../config/types';
+import { HomeAssistant } from '../../../ha/types';
 import '../../../patches/ha-camera-stream';
 import '../../../patches/ha-hls-player.js';
 import '../../../patches/ha-web-rtc-player.js';

src/components/live/providers/image.ts

@@ -1,8 +1,8 @@
-import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
 import { CSSResultGroup, html, LitElement, TemplateResult, unsafeCSS } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { createRef, ref, Ref } from 'lit/directives/ref.js';
 import { CameraConfig } from '../../../config/types';
+import { HomeAssistant } from '../../../ha/types';
 import basicBlockStyle from '../../../scss/basic-block.scss';
 import {
   MediaPlayer,

src/components/live/providers/jsmpeg.ts

@@ -13,14 +13,10 @@ import { CameraEndpoints } from '../../../camera-manager/types.js';
 import { dispatchLiveErrorEvent } from '../../../components-lib/live/utils/dispatch-live-error.js';
 import { JSMPEGMediaPlayerController } from '../../../components-lib/media-player/jsmpeg.js';
 import { CameraConfig, CardWideConfig } from '../../../config/types.js';
+import { HomeAssistant } from '../../../ha/types.js';
 import { localize } from '../../../localize/localize.js';
 import liveJSMPEGStyle from '../../../scss/live-jsmpeg.scss';
-import {
-  ExtendedHomeAssistant,
-  MediaPlayer,
-  MediaPlayerController,
-  Message,
-} from '../../../types.js';
+import { MediaPlayer, MediaPlayerController, Message } from '../../../types.js';
 import { convertEndpointAddressToSignedWebsocket } from '../../../utils/endpoint.js';
 import {
   dispatchMediaLoadedEvent,
@@ -41,7 +37,7 @@ const JSMPEG_URL_SIGN_REFRESH_THRESHOLD_SECONDS = 1 * 60 * 60;
 
 @customElement('advanced-camera-card-live-jsmpeg')
 export class AdvancedCameraCardLiveJSMPEG extends LitElement implements MediaPlayer {
-  protected hass?: ExtendedHomeAssistant;
+  protected hass?: HomeAssistant;
 
   @property({ attribute: false })
   public cameraConfig?: CameraConfig;

src/components/live/providers/webrtc-card.ts

@@ -1,4 +1,3 @@
-import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
 import { Task } from '@lit-labs/task';
 import {
   CSSResultGroup,
@@ -14,6 +13,7 @@ import { dispatchLiveErrorEvent } from '../../../components-lib/live/utils/dispa
 import { getTechnologyForVideoRTC } from '../../../components-lib/live/utils/get-technology-for-video-rtc.js';
 import { VideoMediaPlayerController } from '../../../components-lib/media-player/video.js';
 import { CameraConfig, CardWideConfig } from '../../../config/types.js';
+import { HomeAssistant } from '../../../ha/types.js';
 import { localize } from '../../../localize/localize.js';
 import liveWebRTCCardStyle from '../../../scss/live-webrtc-card.scss';
 import {

src/components/media-filter.ts

@@ -1,4 +1,3 @@
-import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
 import { ScopedRegistryHost } from '@lit-labs/scoped-registry-mixin';
 import {
   CSSResultGroup,
@@ -12,6 +11,7 @@ import { customElement, property } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { createRef, ref, Ref } from 'lit/directives/ref.js';
 import { CameraManager } from '../camera-manager/manager';
+import { ViewManagerEpoch } from '../card-controller/view/types';
 import {
   MediaFilterController,
   MediaFilterCoreFavoriteSelection,
@@ -19,13 +19,13 @@ import {
   MediaFilterMediaType,
 } from '../components-lib/media-filter-controller';
 import { CardWideConfig } from '../config/types';
+import { HomeAssistant } from '../ha/types';
 import { localize } from '../localize/localize';
 import mediaFilterStyle from '../scss/media-filter.scss';
 import { AdvancedCameraCardDatePicker } from './date-picker';
 import './date-picker.js';
 import { AdvancedCameraCardSelect } from './select';
 import './select.js';
-import { ViewManagerEpoch } from '../card-controller/view/types';
 
 @customElement('advanced-camera-card-media-filter')
 class AdvancedCameraCardMediaFilter extends ScopedRegistryHost(LitElement) {

src/components/menu.ts

@@ -1,10 +1,10 @@
-import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
 import { CSSResultGroup, LitElement, TemplateResult, html, unsafeCSS } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { styleMap } from 'lit/directives/style-map.js';
 import { actionHandler } from '../action-handler-directive.js';
 import { MenuController } from '../components-lib/menu-controller.js';
 import type { MenuConfig, MenuItem } from '../config/types.js';
+import { HomeAssistant } from '../ha/types.js';
 import menuStyle from '../scss/menu.scss';
 import { hasAction } from '../utils/action.js';
 import { getEntityTitle } from '../utils/ha/index.js';

src/components/next-prev-control.ts

@@ -1,8 +1,8 @@
-import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
 import { CSSResultGroup, LitElement, TemplateResult, html, unsafeCSS } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { NextPreviousControlConfig } from '../config/types.js';
+import { HomeAssistant } from '../ha/types.js';
 import controlStyle from '../scss/next-previous-control.scss';
 import { Icon } from '../types.js';
 import { renderTask } from '../utils/task.js';

src/components/ptz.ts

@@ -1,4 +1,3 @@
-import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
 import {
   CSSResultGroup,
   LitElement,
@@ -14,6 +13,7 @@ import { CameraManager } from '../camera-manager/manager.js';
 import { PTZController } from '../components-lib/ptz/ptz-controller.js';
 import { PTZControllerActions } from '../components-lib/ptz/types.js';
 import { Actions, PTZControlsConfig } from '../config/types.js';
+import { HomeAssistant } from '../ha/types.js';
 import { localize } from '../localize/localize.js';
 import ptzStyle from '../scss/ptz.scss';
 import { Interaction } from '../types.js';

src/components/select.ts

@@ -9,7 +9,8 @@ import {
 import { property } from 'lit/decorators.js';
 import { createRef, ref, Ref } from 'lit/directives/ref.js';
 import selectStyle from '../scss/select.scss';
-import { contentsChanged, dispatchAdvancedCameraCardEvent } from '../utils/basic';
+import { contentsChanged } from '../utils/basic';
+import { fireAdvancedCameraCardEvent } from '../utils/fire-advanced-camera-card-event';
 import { ScopedRegistryHost } from '@lit-labs/scoped-registry-mixin';
 import { grSelectElements } from '../scoped-elements/gr-select';
 import isEqual from 'lodash-es/isEqual';
@@ -73,7 +74,7 @@ export class AdvancedCameraCardSelect extends ScopedRegistryHost(LitElement) {
       // (even when the user has not interacted with the control). Do not
       // dispatch events for this.
       if (!initialValueSet) {
-        dispatchAdvancedCameraCardEvent(this, 'select:change', value);
+        fireAdvancedCameraCardEvent(this, 'select:change', value);
       }
     }
   }

src/components/submenu/index.ts

@@ -1,9 +1,9 @@
-import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
 import { CSSResultGroup, html, LitElement, TemplateResult, unsafeCSS } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { styleMap } from 'lit/directives/style-map.js';
 import { actionHandler } from '../../action-handler-directive.js';
+import { HomeAssistant } from '../../ha/types.js';
 import submenuStyle from '../../scss/submenu.scss';
 import {
   hasAction,

src/components/submenu/select-button.ts

@@ -1,4 +1,3 @@
-import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
 import {
   CSSResultGroup,
   html,
@@ -10,6 +9,7 @@ import {
 import { customElement, property, state } from 'lit/decorators.js';
 import { styleMap } from 'lit/directives/style-map.js';
 import { MenuSubmenu, MenuSubmenuItem, MenuSubmenuSelect } from '../../config/types.js';
+import { HomeAssistant } from '../../ha/types.js';
 import menuButtonStyle from '../../scss/menu-button.scss';
 import { getEntityTitle, isHassDifferent } from '../../utils/ha';
 import { getEntityStateTranslation } from '../../utils/ha/entity-state-translation.js';

src/components/submenu/submenu-button.ts

@@ -1,9 +1,10 @@
-import { hasAction, HomeAssistant } from '@dermotduffy/custom-card-helpers';
 import { CSSResultGroup, html, LitElement, TemplateResult, unsafeCSS } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { styleMap } from 'lit/directives/style-map.js';
 import { actionHandler } from '../../action-handler-directive.js';
 import { MenuSubmenu } from '../../config/types.js';
+import { hasAction } from '../../ha/has-action.js';
+import { HomeAssistant } from '../../ha/types.js';
 import menuButtonStyle from '../../scss/menu-button.scss';
 import '../icon.js';
 import './index.js';

src/components/surround.ts

@@ -15,16 +15,17 @@ import {
   MiniTimelineControlConfig,
   ThumbnailsControlConfig,
 } from '../config/types.js';
+import { HomeAssistant } from '../ha/types.js';
 import basicBlockStyle from '../scss/basic-block.scss';
-import { ExtendedHomeAssistant } from '../types.js';
-import { contentsChanged, dispatchAdvancedCameraCardEvent } from '../utils/basic.js';
+import { contentsChanged } from '../utils/basic.js';
+import { fireAdvancedCameraCardEvent } from '../utils/fire-advanced-camera-card-event.js';
 import './surround-basic.js';
 import { ThumbnailCarouselTap } from './thumbnail-carousel.js';
 
 @customElement('advanced-camera-card-surround')
 export class AdvancedCameraCardSurround extends LitElement {
   @property({ attribute: false })
-  public hass?: ExtendedHomeAssistant;
+  public hass?: HomeAssistant;
 
   @property({ attribute: false })
   public viewManagerEpoch?: ViewManagerEpoch;
@@ -112,7 +113,7 @@ export class AdvancedCameraCardSurround extends LitElement {
       // from the origin of the inbound event, so it can be handled by
       // <advanced-camera-card-surround> .
       if (this.thumbnailConfig && this._hasDrawer()) {
-        dispatchAdvancedCameraCardEvent(ev.composedPath()[0], 'drawer:' + action, {
+        fireAdvancedCameraCardEvent(ev.composedPath()[0], 'drawer:' + action, {
           drawer: this.thumbnailConfig.mode,
         });
       }

src/components/thumbnail-carousel.ts

@@ -11,11 +11,11 @@ import { classMap } from 'lit/directives/class-map.js';
 import { CameraManager } from '../camera-manager/manager.js';
 import { ViewManagerEpoch } from '../card-controller/view/types.js';
 import { ThumbnailsControlConfig } from '../config/types.js';
+import { HomeAssistant } from '../ha/types.js';
 import thumbnailCarouselStyle from '../scss/thumbnail-carousel.scss';
-import { ExtendedHomeAssistant } from '../types.js';
 import { stopEventFromActivatingCardWideActions } from '../utils/action.js';
-import { dispatchAdvancedCameraCardEvent } from '../utils/basic.js';
 import { CarouselDirection } from '../utils/embla/carousel-controller.js';
+import { fireAdvancedCameraCardEvent } from '../utils/fire-advanced-camera-card-event.js';
 import { MediaQueriesResults } from '../view/media-queries-results';
 import './carousel.js';
 import './thumbnail.js';
@@ -27,7 +27,7 @@ export interface ThumbnailCarouselTap {
 @customElement('advanced-camera-card-thumbnail-carousel')
 export class AdvancedCameraCardThumbnailCarousel extends LitElement {
   @property({ attribute: false })
-  public hass?: ExtendedHomeAssistant;
+  public hass?: HomeAssistant;
 
   @property({ attribute: false })
   public viewManagerEpoch?: ViewManagerEpoch;
@@ -111,7 +111,7 @@ export class AdvancedCameraCardThumbnailCarousel extends LitElement {
           @click=${(ev: Event) => {
             const view = this.viewManagerEpoch?.manager.getView();
             if (view && view.queryResults) {
-              dispatchAdvancedCameraCardEvent<ThumbnailCarouselTap>(
+              fireAdvancedCameraCardEvent<ThumbnailCarouselTap>(
                 this,
                 'thumbnail-carousel:tap',
                 {

src/components/thumbnail.ts

@@ -15,12 +15,12 @@ import { CameraManagerCameraMetadata } from '../camera-manager/types.js';
 import { RemoveContextViewModifier } from '../card-controller/view/modifiers/remove-context.js';
 import { ViewManagerEpoch } from '../card-controller/view/types.js';
 import { dispatchAdvancedCameraCardErrorEvent } from '../components-lib/message/dispatch.js';
+import { HomeAssistant } from '../ha/types.js';
 import { localize } from '../localize/localize.js';
 import thumbnailDetailsStyle from '../scss/thumbnail-details.scss';
 import thumbnailFeatureTextStyle from '../scss/thumbnail-feature-text.scss';
 import thumbnailFeatureThumbnailStyle from '../scss/thumbnail-feature-thumbnail.scss';
 import thumbnailStyle from '../scss/thumbnail.scss';
-import type { ExtendedHomeAssistant } from '../types.js';
 import { stopEventFromActivatingCardWideActions } from '../utils/action.js';
 import {
   errorToConsole,
@@ -43,7 +43,7 @@ export class AdvancedCameraCardThumbnailFeatureThumbnail extends LitElement {
   public thumbnail?: string;
 
   @property({ attribute: false })
-  public hass?: ExtendedHomeAssistant;
+  public hass?: HomeAssistant;
 
   @state()
   protected _thumbnailError = false;
@@ -368,7 +368,7 @@ export class AdvancedCameraCardThumbnail extends LitElement {
   // a re-render. The HomeAssistant object may be required for thumbnail signing
   // (after initial signing the thumbnail is stored in a data URL, so the
   // signing will not expire).
-  public hass?: ExtendedHomeAssistant;
+  public hass?: HomeAssistant;
 
   // Performance: During timeline scrubbing, the view will be updated
   // continuously. As it is not needed for the thumbnail rendering itself, it

src/components/timeline-core.ts

@@ -46,19 +46,19 @@ import {
   TimelinePanMode,
   configDefaults,
 } from '../config/types';
+import { HomeAssistant } from '../ha/types';
 import { localize } from '../localize/localize';
 import timelineCoreStyle from '../scss/timeline-core.scss';
-import { ExtendedHomeAssistant } from '../types';
 import { stopEventFromActivatingCardWideActions } from '../utils/action';
 import {
   contentsChanged,
-  dispatchAdvancedCameraCardEvent,
   formatDateAndTime,
   isHoverableDevice,
   isTruthy,
   setOrRemoveAttribute,
 } from '../utils/basic';
 import { findBestMediaIndex } from '../utils/find-best-media-index';
+import { fireAdvancedCameraCardEvent } from '../utils/fire-advanced-camera-card-event';
 import { ViewMedia } from '../view/media';
 import { ViewMediaClassifier } from '../view/media-classifier';
 import {
@@ -108,7 +108,7 @@ interface ExtendedTimeline extends Timeline {
 // note below on why this is necessary.
 interface ThumbnailDataRequest {
   item: IdType;
-  hass?: ExtendedHomeAssistant;
+  hass?: HomeAssistant;
   cameraManager?: CameraManager;
   cameraConfig?: CameraConfig;
   media?: ViewMedia;
@@ -187,7 +187,7 @@ export class AdvancedCameraCardTimelineThumbnail extends LitElement {
 @customElement('advanced-camera-card-timeline-core')
 export class AdvancedCameraCardTimelineCore extends LitElement {
   @property({ attribute: false })
-  public hass?: ExtendedHomeAssistant;
+  public hass?: HomeAssistant;
 
   @property({ attribute: false })
   public viewManagerEpoch?: ViewManagerEpoch;
@@ -632,7 +632,7 @@ export class AdvancedCameraCardTimelineCore extends LitElement {
       }
     }
 
-    dispatchAdvancedCameraCardEvent(this, `thumbnails:${drawerAction}`);
+    fireAdvancedCameraCardEvent(this, `thumbnails:${drawerAction}`);
 
     this._ignoreClick = false;
   }

src/components/timeline.ts

@@ -3,15 +3,15 @@ import { customElement, property } from 'lit/decorators.js';
 import { CameraManager } from '../camera-manager/manager';
 import { ViewManagerEpoch } from '../card-controller/view/types';
 import { CardWideConfig, TimelineConfig } from '../config/types';
+import { HomeAssistant } from '../ha/types';
 import basicBlockStyle from '../scss/basic-block.scss';
-import { ExtendedHomeAssistant } from '../types';
 import './surround.js';
 import './timeline-core.js';
 
 @customElement('advanced-camera-card-timeline')
 export class AdvancedCameraCardTimeline extends LitElement {
   @property({ attribute: false })
-  public hass?: ExtendedHomeAssistant;
+  public hass?: HomeAssistant;
 
   @property({ attribute: false })
   public viewManagerEpoch?: ViewManagerEpoch;

src/components/viewer/carousel.ts

@@ -19,14 +19,11 @@ import {
   TransitionEffect,
   ViewerConfig,
 } from '../../config/types.js';
+import { HomeAssistant } from '../../ha/types.js';
 import { localize } from '../../localize/localize.js';
 import '../../patches/ha-hls-player.js';
 import viewerCarouselStyle from '../../scss/viewer-carousel.scss';
-import {
-  ExtendedHomeAssistant,
-  MediaLoadedInfo,
-  MediaPlayerController,
-} from '../../types.js';
+import { MediaLoadedInfo, MediaPlayerController } from '../../types.js';
 import { stopEventFromActivatingCardWideActions } from '../../utils/action.js';
 import { contentsChanged, setOrRemoveAttribute } from '../../utils/basic.js';
 import { CarouselSelected } from '../../utils/embla/carousel-controller.js';
@@ -59,7 +56,7 @@ const ADVANCED_CAMERA_CARD_VIEWER_PROVIDER = 'advanced-camera-card-viewer-provid
 @customElement('advanced-camera-card-viewer-carousel')
 export class AdvancedCameraCardViewerCarousel extends LitElement {
   @property({ attribute: false })
-  public hass?: ExtendedHomeAssistant;
+  public hass?: HomeAssistant;
 
   @property({ attribute: false })
   public viewManagerEpoch?: ViewManagerEpoch;

src/components/viewer/grid.ts

@@ -12,16 +12,16 @@ import { CameraManager } from '../../camera-manager/manager.js';
 import { ViewManagerEpoch } from '../../card-controller/view/types.js';
 import { MediaGridSelected } from '../../components-lib/media-grid-controller.js';
 import { CardWideConfig, ViewerConfig } from '../../config/types.js';
+import { HomeAssistant } from '../../ha/types.js';
 import '../../patches/ha-hls-player.js';
 import basicBlockStyle from '../../scss/basic-block.scss';
-import { ExtendedHomeAssistant } from '../../types.js';
 import { ResolvedMediaCache } from '../../utils/ha/resolved-media.js';
 import './carousel';
 
 @customElement('advanced-camera-card-viewer-grid')
 export class AdvancedCameraCardViewerGrid extends LitElement {
   @property({ attribute: false })
-  public hass?: ExtendedHomeAssistant;
+  public hass?: HomeAssistant;
 
   @property({ attribute: false })
   public viewManagerEpoch?: ViewManagerEpoch;

src/components/viewer/index.ts

@@ -3,10 +3,10 @@ import { customElement, property } from 'lit/decorators.js';
 import { CameraManager } from '../../camera-manager/manager.js';
 import { ViewManagerEpoch } from '../../card-controller/view/types.js';
 import { CardWideConfig, ViewerConfig } from '../../config/types.js';
+import { HomeAssistant } from '../../ha/types.js';
 import { localize } from '../../localize/localize.js';
 import '../../patches/ha-hls-player.js';
 import viewerStyle from '../../scss/viewer.scss';
-import { ExtendedHomeAssistant } from '../../types.js';
 import { ResolvedMediaCache } from '../../utils/ha/resolved-media.js';
 import { renderMessage } from '../message.js';
 import './grid';
@@ -24,7 +24,7 @@ declare module 'view' {
 @customElement('advanced-camera-card-viewer')
 export class AdvancedCameraCardViewer extends LitElement {
   @property({ attribute: false })
-  public hass?: ExtendedHomeAssistant;
+  public hass?: HomeAssistant;
 
   @property({ attribute: false })
   public viewManagerEpoch?: ViewManagerEpoch;

src/components/viewer/provider.ts

@@ -14,10 +14,10 @@ import { ViewManagerEpoch } from '../../card-controller/view/types.js';
 import { ZoomSettingsObserved } from '../../components-lib/zoom/types.js';
 import { handleZoomSettingsObservedEvent } from '../../components-lib/zoom/zoom-view-context.js';
 import { CardWideConfig, ViewerConfig } from '../../config/types.js';
+import { HomeAssistant } from '../../ha/types.js';
 import '../../patches/ha-hls-player.js';
 import viewerProviderStyle from '../../scss/viewer-provider.scss';
 import {
-  ExtendedHomeAssistant,
   MediaPlayer,
   MediaPlayerController,
   MediaPlayerElement,
@@ -46,7 +46,7 @@ import '../video-player.js';
 @customElement('advanced-camera-card-viewer-provider')
 export class AdvancedCameraCardViewerProvider extends LitElement implements MediaPlayer {
   @property({ attribute: false })
-  public hass?: ExtendedHomeAssistant;
+  public hass?: HomeAssistant;
 
   @property({ attribute: false })
   public viewManagerEpoch?: ViewManagerEpoch;

src/components/views.ts

@@ -16,8 +16,8 @@ import {
   CardWideConfig,
   RawAdvancedCameraCardConfig,
 } from '../config/types.js';
+import { HomeAssistant } from '../ha/types.js';
 import viewsStyle from '../scss/views.scss';
-import { ExtendedHomeAssistant } from '../types.js';
 import { DeviceRegistryManager } from '../utils/ha/registry/device/index.js';
 import { ResolvedMediaCache } from '../utils/ha/resolved-media.js';
 import './surround.js';
@@ -29,7 +29,7 @@ import './diagnostics.js';
 @customElement('advanced-camera-card-views')
 export class AdvancedCameraCardViews extends LitElement {
   @property({ attribute: false })
-  public hass?: ExtendedHomeAssistant;
+  public hass?: HomeAssistant;
 
   @property({ attribute: false })
   public viewManagerEpoch?: ViewManagerEpoch;