Replace all default exports in common/ with named exports (#3790)

src/cards/ha-camera-card.js

@@ -2,7 +2,7 @@ import "@polymer/paper-styles/element-styles/paper-material-styles";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 
-import computeStateName from "../common/entity/compute_state_name";
+import { computeStateName } from "../common/entity/compute_state_name";
 import { EventsMixin } from "../mixins/events-mixin";
 import LocalizeMixin from "../mixins/localize-mixin";
 import { fetchThumbnailUrlWithCache } from "../data/camera";

src/cards/ha-entities-card.js

@@ -6,10 +6,10 @@ import "../components/entity/ha-entity-toggle";
 import "../components/ha-card";
 import "../state-summary/state-card-content";
 
-import computeStateDomain from "../common/entity/compute_state_domain";
+import { computeStateDomain } from "../common/entity/compute_state_domain";
-import computeStateName from "../common/entity/compute_state_name";
+import { computeStateName } from "../common/entity/compute_state_name";
-import stateMoreInfoType from "../common/entity/state_more_info_type";
+import { stateMoreInfoType } from "../common/entity/state_more_info_type";
-import canToggleState from "../common/entity/can_toggle_state";
+import { canToggleState } from "../common/entity/can_toggle_state";
 import { EventsMixin } from "../mixins/events-mixin";
 import LocalizeMixin from "../mixins/localize-mixin";
 

src/cards/ha-history_graph-card.js

@@ -5,7 +5,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import "../components/state-history-charts";
 import "../data/ha-state-history-data";
 
-import computeStateName from "../common/entity/compute_state_name";
+import { computeStateName } from "../common/entity/compute_state_name";
 import { EventsMixin } from "../mixins/events-mixin";
 
 /*

src/cards/ha-media_player-card.js

@@ -8,7 +8,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import HassMediaPlayerEntity from "../util/hass-media-player-model";
 import { fetchMediaPlayerThumbnailWithCache } from "../data/media-player";
 
-import computeStateName from "../common/entity/compute_state_name";
+import { computeStateName } from "../common/entity/compute_state_name";
 import { EventsMixin } from "../mixins/events-mixin";
 import LocalizeMixin from "../mixins/localize-mixin";
 

src/cards/ha-persistent_notification-card.js

@@ -5,9 +5,9 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import "../components/ha-card";
 import "../components/ha-markdown";
 
-import computeStateName from "../common/entity/compute_state_name";
+import { computeStateName } from "../common/entity/compute_state_name";
 import LocalizeMixin from "../mixins/localize-mixin";
-import computeObjectId from "../common/entity/compute_object_id";
+import { computeObjectId } from "../common/entity/compute_object_id";
 
 /*
  * @appliesMixin LocalizeMixin

src/cards/ha-plant-card.js

@@ -4,7 +4,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import "../components/ha-card";
 import "../components/ha-icon";
 
-import computeStateName from "../common/entity/compute_state_name";
+import { computeStateName } from "../common/entity/compute_state_name";
 import { EventsMixin } from "../mixins/events-mixin";
 
 class HaPlantCard extends EventsMixin(PolymerElement) {

src/cards/ha-weather-card.js

@@ -1,7 +1,7 @@
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 
-import computeStateName from "../common/entity/compute_state_name";
+import { computeStateName } from "../common/entity/compute_state_name";
 
 import "../components/ha-card";
 import "../components/ha-icon";

src/common/entity/attribute_class_names.ts

@@ -1,9 +1,9 @@
 import { HassEntity } from "home-assistant-js-websocket";
 
-export default function attributeClassNames(
+export const attributeClassNames = (
   stateObj: HassEntity,
   attributes: string[]
-): string {
+): string => {
   if (!stateObj) {
     return "";
   }
@@ -13,4 +13,4 @@ export default function attributeClassNames(
     )
     .filter((attr) => attr !== "")
     .join(" ");
-}
+};

src/common/entity/binary_sensor_icon.ts

@@ -2,7 +2,7 @@ import { HassEntity } from "home-assistant-js-websocket";
 
 /** Return an icon representing a binary sensor state. */
 
-export default function binarySensorIcon(state: HassEntity) {
+export const binarySensorIcon = (state: HassEntity) => {
   const activated = state.state && state.state === "off";
   switch (state.attributes.device_class) {
     case "battery":
@@ -48,4 +48,4 @@ export default function binarySensorIcon(state: HassEntity) {
     default:
       return activated ? "hass:radiobox-blank" : "hass:checkbox-marked-circle";
   }
-}
+};

src/common/entity/can_toggle_domain.ts

@@ -1,6 +1,6 @@
 import { HomeAssistant } from "../../types";
 
-export default function canToggleDomain(hass: HomeAssistant, domain: string) {
+export const canToggleDomain = (hass: HomeAssistant, domain: string) => {
   const services = hass.services[domain];
   if (!services) {
     return false;
@@ -13,4 +13,4 @@ export default function canToggleDomain(hass: HomeAssistant, domain: string) {
     return "open_cover" in services;
   }
   return "turn_on" in services;
-}
+};

src/common/entity/can_toggle_state.ts

@@ -1,13 +1,10 @@
 import { HassEntity } from "home-assistant-js-websocket";
-import canToggleDomain from "./can_toggle_domain";
+import { canToggleDomain } from "./can_toggle_domain";
-import computeStateDomain from "./compute_state_domain";
+import { computeStateDomain } from "./compute_state_domain";
 import { HomeAssistant } from "../../types";
 import { supportsFeature } from "./supports-feature";
 
-export default function canToggleState(
+export const canToggleState = (hass: HomeAssistant, stateObj: HassEntity) => {
-  hass: HomeAssistant,
-  stateObj: HassEntity
-) {
   const domain = computeStateDomain(stateObj);
   if (domain === "group") {
     return stateObj.state === "on" || stateObj.state === "off";
@@ -17,4 +14,4 @@ export default function canToggleState(
   }
 
   return canToggleDomain(hass, domain);
-}
+};

src/common/entity/compute_domain.ts

@@ -1,3 +1,3 @@
-export default function computeDomain(entityId: string): string {
+export const computeDomain = (entityId: string): string => {
   return entityId.substr(0, entityId.indexOf("."));
-}
+};

src/common/entity/compute_object_id.ts

@@ -1,4 +1,4 @@
 /** Compute the object ID of a state. */
-export default function computeObjectId(entityId: string): string {
+export const computeObjectId = (entityId: string): string => {
   return entityId.substr(entityId.indexOf(".") + 1);
-}
+};

src/common/entity/compute_state_display.ts

@@ -1,11 +1,11 @@
 import { HassEntity } from "home-assistant-js-websocket";
-import computeStateDomain from "./compute_state_domain";
+import { computeStateDomain } from "./compute_state_domain";
 import formatDateTime from "../datetime/format_date_time";
 import formatDate from "../datetime/format_date";
 import formatTime from "../datetime/format_time";
 import { LocalizeFunc } from "../translations/localize";
 
-export default (
+export const computeStateDisplay = (
   localize: LocalizeFunc,
   stateObj: HassEntity,
   language: string

src/common/entity/compute_state_domain.ts

@@ -1,6 +1,6 @@
 import { HassEntity } from "home-assistant-js-websocket";
-import computeDomain from "./compute_domain";
+import { computeDomain } from "./compute_domain";
 
-export default function computeStateDomain(stateObj: HassEntity) {
+export const computeStateDomain = (stateObj: HassEntity) => {
   return computeDomain(stateObj.entity_id);
-}
+};

src/common/entity/compute_state_name.ts

@@ -1,7 +1,8 @@
 import { HassEntity } from "home-assistant-js-websocket";
-import computeObjectId from "./compute_object_id";
+import { computeObjectId } from "./compute_object_id";
 
-export default (stateObj: HassEntity): string =>
+export const computeStateName = (stateObj: HassEntity): string => {
-  stateObj.attributes.friendly_name === undefined
+  return stateObj.attributes.friendly_name === undefined
     ? computeObjectId(stateObj.entity_id).replace(/_/g, " ")
     : stateObj.attributes.friendly_name || "";
+};

src/common/entity/cover_icon.ts

@@ -1,8 +1,8 @@
 /** Return an icon representing a cover state. */
 import { HassEntity } from "home-assistant-js-websocket";
-import domainIcon from "./domain_icon";
+import { domainIcon } from "./domain_icon";
 
-export default function coverIcon(state: HassEntity): string {
+export const coverIcon = (state: HassEntity): string => {
   const open = state.state !== "closed";
   switch (state.attributes.device_class) {
     case "garage":
@@ -18,4 +18,4 @@ export default function coverIcon(state: HassEntity): string {
     default:
       return domainIcon("cover", state.state);
   }
-}
+};

src/common/entity/domain_icon.ts

@@ -48,7 +48,7 @@ const fixedIcons = {
   weblink: "hass:open-in-new",
 };
 
-export default function domainIcon(domain: string, state?: string): string {
+export const domainIcon = (domain: string, state?: string): string => {
   if (domain in fixedIcons) {
     return fixedIcons[domain];
   }
@@ -103,4 +103,4 @@ export default function domainIcon(domain: string, state?: string): string {
       );
       return DEFAULT_DOMAIN_ICON;
   }
-}
+};

src/common/entity/entity_filter.ts

@@ -1,4 +1,4 @@
-import computeDomain from "./compute_domain";
+import { computeDomain } from "./compute_domain";
 
 export type FilterFunc = (entityId: string) => boolean;
 

src/common/entity/extract_views.ts

@@ -3,7 +3,7 @@ import { DEFAULT_VIEW_ENTITY_ID } from "../const";
 import { GroupEntity } from "../../types";
 
 // Return an ordered array of available views
-export default function extractViews(entities: HassEntities): GroupEntity[] {
+export const extractViews = (entities: HassEntities): GroupEntity[] => {
   const views: GroupEntity[] = [];
 
   Object.keys(entities).forEach((entityId) => {
@@ -24,4 +24,4 @@ export default function extractViews(entities: HassEntities): GroupEntity[] {
   });
 
   return views;
-}
+};

src/common/entity/feature_class_names.ts

@@ -2,10 +2,10 @@ import { HassEntity } from "home-assistant-js-websocket";
 import { supportsFeature } from "./supports-feature";
 
 // Expects classNames to be an object mapping feature-bit -> className
-export default function featureClassNames(
+export const featureClassNames = (
   stateObj: HassEntity,
   classNames: { [feature: number]: string }
-) {
+) => {
   if (!stateObj || !stateObj.attributes.supported_features) {
     return "";
   }
@@ -16,4 +16,4 @@ export default function featureClassNames(
     )
     .filter((attr) => attr !== "")
     .join(" ");
-}
+};

src/common/entity/get_group_entities.ts

@@ -1,10 +1,10 @@
 import { HassEntities } from "home-assistant-js-websocket";
 import { GroupEntity } from "../../types";
 
-export default function getGroupEntities(
+export const getGroupEntities = (
   entities: HassEntities,
   group: GroupEntity
-) {
+) => {
   const result = {};
 
   group.attributes.entity_id.forEach((entityId) => {
@@ -16,4 +16,4 @@ export default function getGroupEntities(
   });
 
   return result;
-}
+};

src/common/entity/get_view_entities.ts

@@ -1,14 +1,14 @@
 import { HassEntities } from "home-assistant-js-websocket";
-import computeDomain from "./compute_domain";
+import { computeDomain } from "./compute_domain";
-import getGroupEntities from "./get_group_entities";
+import { getGroupEntities } from "./get_group_entities";
 import { GroupEntity } from "../../types";
 
 // Return an object containing all entities that the view will show
 // including embedded groups.
-export default function getViewEntities(
+export const getViewEntities = (
   entities: HassEntities,
   view: GroupEntity
-): HassEntities {
+): HassEntities => {
   const viewEntities = {};
 
   view.attributes.entity_id.forEach((entityId) => {
@@ -32,4 +32,4 @@ export default function getViewEntities(
   });
 
   return viewEntities;
-}
+};

src/common/entity/has_location.ts

@@ -1,7 +1,7 @@
 import { HassEntity } from "home-assistant-js-websocket";
 
-export default function hasLocation(stateObj: HassEntity) {
+export const hasLocation = (stateObj: HassEntity) => {
   return (
     "latitude" in stateObj.attributes && "longitude" in stateObj.attributes
   );
-}
+};

src/common/entity/input_dateteime_icon.ts

@@ -1,8 +1,8 @@
 /** Return an icon representing an input datetime state. */
-import domainIcon from "./domain_icon";
+import { domainIcon } from "./domain_icon";
 import { HassEntity } from "home-assistant-js-websocket";
 
-export default function inputDateTimeIcon(state: HassEntity): string {
+export const inputDateTimeIcon = (state: HassEntity): string => {
   if (!state.attributes.has_date) {
     return "hass:clock";
   }
@@ -10,4 +10,4 @@ export default function inputDateTimeIcon(state: HassEntity): string {
     return "hass:calendar";
   }
   return domainIcon("input_datetime");
-}
+};

src/common/entity/sensor_icon.ts

@@ -1,7 +1,7 @@
 /** Return an icon representing a sensor state. */
 import { HassEntity } from "home-assistant-js-websocket";
 import { UNIT_C, UNIT_F } from "../const";
-import domainIcon from "./domain_icon";
+import { domainIcon } from "./domain_icon";
 
 const fixedDeviceClassIcons = {
   humidity: "hass:water-percent",
@@ -12,7 +12,7 @@ const fixedDeviceClassIcons = {
   signal_strength: "hass:wifi",
 };
 
-export default function sensorIcon(state: HassEntity) {
+export const sensorIcon = (state: HassEntity) => {
   const dclass = state.attributes.device_class;
 
   if (dclass && dclass in fixedDeviceClassIcons) {
@@ -49,4 +49,4 @@ export default function sensorIcon(state: HassEntity) {
     return "hass:thermometer";
   }
   return domainIcon("sensor");
-}
+};

src/common/entity/split_by_groups.ts

@@ -1,11 +1,11 @@
-import computeDomain from "./compute_domain";
+import { computeDomain } from "./compute_domain";
 import { HassEntities } from "home-assistant-js-websocket";
 import { GroupEntity } from "../../types";
 
 // Split a collection into a list of groups and a 'rest' list of ungrouped
 // entities.
 // Returns { groups: [], ungrouped: {} }
-export default function splitByGroups(entities: HassEntities) {
+export const splitByGroups = (entities: HassEntities) => {
   const groups: GroupEntity[] = [];
   const ungrouped: HassEntities = {};
 
@@ -26,4 +26,4 @@ export default function splitByGroups(entities: HassEntities) {
   );
 
   return { groups, ungrouped };
-}
+};

src/common/entity/state_card_type.ts

@@ -1,13 +1,10 @@
 import { HassEntity } from "home-assistant-js-websocket";
-import canToggleState from "./can_toggle_state";
+import { canToggleState } from "./can_toggle_state";
-import computeStateDomain from "./compute_state_domain";
+import { computeStateDomain } from "./compute_state_domain";
 import { DOMAINS_WITH_CARD } from "../const";
 import { HomeAssistant } from "../../types";
 
-export default function stateCardType(
+export const stateCardType = (hass: HomeAssistant, stateObj: HassEntity) => {
-  hass: HomeAssistant,
-  stateObj: HassEntity
-) {
   if (stateObj.state === "unavailable") {
     return "display";
   }
@@ -24,4 +21,4 @@ export default function stateCardType(
     return "toggle";
   }
   return "display";
-}
+};

src/common/entity/state_icon.ts

@@ -1,14 +1,13 @@
 /** Return an icon representing a state. */
 import { HassEntity } from "home-assistant-js-websocket";
 import { DEFAULT_DOMAIN_ICON } from "../const";
+import { binarySensorIcon } from "./binary_sensor_icon";
 
-import computeDomain from "./compute_domain";
+import { computeDomain } from "./compute_domain";
-import domainIcon from "./domain_icon";
+import { domainIcon } from "./domain_icon";
-
+import { coverIcon } from "./cover_icon";
-import binarySensorIcon from "./binary_sensor_icon";
+import { sensorIcon } from "./sensor_icon";
-import coverIcon from "./cover_icon";
+import { inputDateTimeIcon } from "./input_dateteime_icon";
-import sensorIcon from "./sensor_icon";
-import inputDateTimeIcon from "./input_dateteime_icon";
 
 const domainIcons = {
   binary_sensor: binarySensorIcon,
@@ -17,7 +16,7 @@ const domainIcons = {
   input_datetime: inputDateTimeIcon,
 };
 
-export default function stateIcon(state: HassEntity) {
+export const stateIcon = (state: HassEntity) => {
   if (!state) {
     return DEFAULT_DOMAIN_ICON;
   }
@@ -31,4 +30,4 @@ export default function stateIcon(state: HassEntity) {
     return domainIcons[domain](state);
   }
   return domainIcon(domain, state.state);
-}
+};

src/common/entity/state_more_info_type.ts

@@ -1,8 +1,8 @@
 import { HassEntity } from "home-assistant-js-websocket";
-import computeStateDomain from "./compute_state_domain";
+import { computeStateDomain } from "./compute_state_domain";
 import { DOMAINS_HIDE_MORE_INFO, DOMAINS_WITH_MORE_INFO } from "../const";
 
-export default function stateMoreInfoType(stateObj: HassEntity) {
+export const stateMoreInfoType = (stateObj: HassEntity) => {
   const domain = computeStateDomain(stateObj);
 
   if (DOMAINS_WITH_MORE_INFO.includes(domain)) {
@@ -12,4 +12,4 @@ export default function stateMoreInfoType(stateObj: HassEntity) {
     return "hidden";
   }
   return "default";
-}
+};

src/common/entity/states_sort_by_name.ts

@@ -3,15 +3,12 @@
  *
  * Usage:
  *   const states = [state1, state2]
- *   states.sort(statesSortByName);
+ *   states.sort(statessortStatesByName);
  */
 import { HassEntity } from "home-assistant-js-websocket";
-import computeStateName from "./compute_state_name";
+import { computeStateName } from "./compute_state_name";
 
-export default function sortStatesByName(
+export const sortStatesByName = (entityA: HassEntity, entityB: HassEntity) => {
-  entityA: HassEntity,
-  entityB: HassEntity
-) {
   const nameA = computeStateName(entityA);
   const nameB = computeStateName(entityB);
   if (nameA < nameB) {
@@ -21,4 +18,4 @@ export default function sortStatesByName(
     return 1;
   }
   return 0;
-}
+};

src/common/entity/timer_time_remaining.ts

@@ -1,7 +1,7 @@
 import { HassEntity } from "home-assistant-js-websocket";
 import durationToSeconds from "../datetime/duration_to_seconds";
 
-export default function timerTimeRemaining(stateObj: HassEntity) {
+export const timerTimeRemaining = (stateObj: HassEntity) => {
   let timeRemaining = durationToSeconds(stateObj.attributes.remaining);
 
   if (stateObj.state === "active") {
@@ -11,4 +11,4 @@ export default function timerTimeRemaining(stateObj: HassEntity) {
   }
 
   return timeRemaining;
-}
+};

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

@@ -7,7 +7,7 @@ import memoizeOne from "memoize-one";
 
 import "./state-badge";
 
-import computeStateName from "../../common/entity/compute_state_name";
+import { computeStateName } from "../../common/entity/compute_state_name";
 import {
   LitElement,
   TemplateResult,

src/components/entity/ha-entity-toggle.ts

@@ -14,8 +14,8 @@ import { HomeAssistant } from "../../types";
 import { HassEntity } from "home-assistant-js-websocket";
 import { forwardHaptic } from "../../data/haptics";
 
-import computeStateDomain from "../../common/entity/compute_state_domain";
+import { computeStateDomain } from "../../common/entity/compute_state_domain";
-import computeStateName from "../../common/entity/compute_state_name";
+import { computeStateName } from "../../common/entity/compute_state_name";
 
 import "../ha-switch";
 

src/components/entity/ha-state-icon.js

@@ -2,7 +2,7 @@ import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 
 import "../ha-icon";
-import stateIcon from "../../common/entity/state_icon";
+import { stateIcon } from "../../common/entity/state_icon";
 
 class HaStateIcon extends PolymerElement {
   static get template() {

src/components/entity/ha-state-label-badge.ts

@@ -14,11 +14,11 @@ import { classMap } from "lit-html/directives/class-map";
 import { fireEvent } from "../../common/dom/fire_event";
 import { HomeAssistant } from "../../types";
 
-import computeStateDomain from "../../common/entity/compute_state_domain";
+import { computeStateDomain } from "../../common/entity/compute_state_domain";
-import computeStateName from "../../common/entity/compute_state_name";
+import { computeStateName } from "../../common/entity/compute_state_name";
-import domainIcon from "../../common/entity/domain_icon";
+import { domainIcon } from "../../common/entity/domain_icon";
-import stateIcon from "../../common/entity/state_icon";
+import { stateIcon } from "../../common/entity/state_icon";
-import timerTimeRemaining from "../../common/entity/timer_time_remaining";
+import { timerTimeRemaining } from "../../common/entity/timer_time_remaining";
 import secondsToDuration from "../../common/datetime/seconds_to_duration";
 
 import "../ha-label-badge";

src/components/entity/state-badge.ts

@@ -9,8 +9,8 @@ import {
   query,
 } from "lit-element";
 import "../ha-icon";
-import computeStateDomain from "../../common/entity/compute_state_domain";
+import { computeStateDomain } from "../../common/entity/compute_state_domain";
-import stateIcon from "../../common/entity/state_icon";
+import { stateIcon } from "../../common/entity/state_icon";
 import { HassEntity } from "home-assistant-js-websocket";
 // Not duplicate, this is for typing.
 // tslint:disable-next-line

src/components/entity/state-info.js

@@ -3,7 +3,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 
 import "../ha-relative-time";
 import "./state-badge";
-import computeStateName from "../../common/entity/compute_state_name";
+import { computeStateName } from "../../common/entity/compute_state_name";
 import { computeRTL } from "../../common/util/compute_rtl";
 
 class StateInfo extends PolymerElement {

src/components/ha-camera-stream.ts

@@ -9,7 +9,7 @@ import {
   customElement,
 } from "lit-element";
 
-import computeStateName from "../common/entity/compute_state_name";
+import { computeStateName } from "../common/entity/compute_state_name";
 import { HomeAssistant, CameraEntity } from "../types";
 import { fireEvent } from "../common/dom/fire_event";
 import {

src/components/ha-cards.js

@@ -8,9 +8,9 @@ import "../cards/ha-badges-card";
 import "../cards/ha-card-chooser";
 import "./ha-demo-badge";
 
-import computeStateDomain from "../common/entity/compute_state_domain";
+import { computeStateDomain } from "../common/entity/compute_state_domain";
-import splitByGroups from "../common/entity/split_by_groups";
+import { splitByGroups } from "../common/entity/split_by_groups";
-import getGroupEntities from "../common/entity/get_group_entities";
+import { getGroupEntities } from "../common/entity/get_group_entities";
 
 // mapping domain to size of the card.
 const DOMAINS_WITH_CARD = {

src/components/ha-menu-button.ts

@@ -13,7 +13,7 @@ import { fireEvent } from "../common/dom/fire_event";
 import { HomeAssistant } from "../types";
 import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import { subscribeNotifications } from "../data/persistent_notification";
-import computeDomain from "../common/entity/compute_domain";
+import { computeDomain } from "../common/entity/compute_domain";
 
 @customElement("ha-menu-button")
 class HaMenuButton extends LitElement {

src/components/ha-sidebar.ts

@@ -27,7 +27,7 @@ import {
   PersistentNotification,
   subscribeNotifications,
 } from "../data/persistent_notification";
-import computeDomain from "../common/entity/compute_domain";
+import { computeDomain } from "../common/entity/compute_domain";
 import { classMap } from "lit-html/directives/class-map";
 // tslint:disable-next-line: no-duplicate-imports
 import { PaperIconItemElement } from "@polymer/paper-item/paper-icon-item";

src/data/device_automation.ts

@@ -1,5 +1,5 @@
 import { HomeAssistant } from "../types";
-import compute_state_name from "../common/entity/compute_state_name";
+import { computeStateName } from "../common/entity/compute_state_name";
 
 export interface DeviceAutomation {
   device_id: string;
@@ -69,7 +69,7 @@ export const localizeDeviceAutomationAction = (
   return hass.localize(
     `component.${action.domain}.device_automation.action_type.${action.type}`,
     "entity_name",
-    state ? compute_state_name(state) : "<unknown>",
+    state ? computeStateName(state) : "<unknown>",
     "subtype",
     hass.localize(
       `component.${action.domain}.device_automation.action_subtype.${
@@ -91,7 +91,7 @@ export const localizeDeviceAutomationCondition = (
       condition.type
     }`,
     "entity_name",
-    state ? compute_state_name(state) : "<unknown>",
+    state ? computeStateName(state) : "<unknown>",
     "subtype",
     hass.localize(
       `component.${condition.domain}.device_automation.condition_subtype.${
@@ -111,7 +111,7 @@ export const localizeDeviceAutomationTrigger = (
       trigger.type
     }`,
     "entity_name",
-    state ? compute_state_name(state) : "<unknown>",
+    state ? computeStateName(state) : "<unknown>",
     "subtype",
     hass.localize(
       `component.${trigger.domain}.device_automation.trigger_subtype.${

src/data/entity_registry.ts

@@ -1,6 +1,6 @@
 import { createCollection, Connection } from "home-assistant-js-websocket";
 import { HomeAssistant } from "../types";
-import computeStateName from "../common/entity/compute_state_name";
+import { computeStateName } from "../common/entity/compute_state_name";
 import { debounce } from "../common/util/debounce";
 
 export interface EntityRegistryEntry {

src/data/history.ts

@@ -1,9 +1,9 @@
-import computeStateName from "../common/entity/compute_state_name";
+import { computeStateName } from "../common/entity/compute_state_name";
-import computeStateDomain from "../common/entity/compute_state_domain";
+import { computeStateDomain } from "../common/entity/compute_state_domain";
-import computeStateDisplay from "../common/entity/compute_state_display";
 import { HassEntity } from "home-assistant-js-websocket";
 import { HomeAssistant } from "../types";
 import { LocalizeFunc } from "../common/translations/localize";
+import { computeStateDisplay } from "../common/entity/compute_state_display";
 
 const DOMAINS_USE_LAST_UPDATED = ["climate", "water_heater"];
 const LINE_ATTRIBUTES_TO_KEEP = [

src/data/script.ts

@@ -1,5 +1,5 @@
 import { HomeAssistant } from "../types";
-import computeObjectId from "../common/entity/compute_object_id";
+import { computeObjectId } from "../common/entity/compute_object_id";
 
 export interface EventAction {
   event: string;

src/dialogs/ha-more-info-dialog.js

@@ -8,7 +8,7 @@ import "../resources/ha-style";
 import "./more-info/more-info-controls";
 import "./more-info/more-info-settings";
 
-import computeStateDomain from "../common/entity/compute_state_domain";
+import { computeStateDomain } from "../common/entity/compute_state_domain";
 import isComponentLoaded from "../common/config/is_component_loaded";
 
 import DialogMixin from "../mixins/dialog-mixin";

src/dialogs/more-info/controls/more-info-content.ts

@@ -27,7 +27,7 @@ import "./more-info-vacuum";
 import "./more-info-water_heater";
 import "./more-info-weather";
 
-import stateMoreInfoType from "../../../common/entity/state_more_info_type";
+import { stateMoreInfoType } from "../../../common/entity/state_more_info_type";
 import dynamicContentUpdater from "../../../common/dom/dynamic_content_updater";
 import { HomeAssistant } from "../../../types";
 

src/dialogs/more-info/controls/more-info-cover.js

@@ -5,13 +5,13 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 
 import "../../../components/ha-cover-tilt-controls";
 import "../../../components/ha-labeled-slider";
+
 import CoverEntity from "../../../util/cover-model";
-
+import { featureClassNames } from "../../../common/entity/feature_class_names";
-import attributeClassNames from "../../../common/entity/attribute_class_names";
-import featureClassNames from "../../../common/entity/feature_class_names";
-
 import LocalizeMixin from "../../../mixins/localize-mixin";
 
+import { attributeClassNames } from "../../../common/entity/attribute_class_names";
+
 const FEATURE_CLASS_NAMES = {
   128: "has-set_tilt_position",
 };

src/dialogs/more-info/controls/more-info-fan.js

@@ -10,8 +10,8 @@ import "../../../components/ha-paper-dropdown-menu";
 import "../../../components/ha-switch";
 
 import { EventsMixin } from "../../../mixins/events-mixin";
+import { attributeClassNames } from "../../../common/entity/attribute_class_names";
 
-import attributeClassNames from "../../../common/entity/attribute_class_names";
 import LocalizeMixin from "../../../mixins/localize-mixin";
 
 /*

src/dialogs/more-info/controls/more-info-group.js

@@ -4,7 +4,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 
 import "../../../state-summary/state-card-content";
 
-import computeStateDomain from "../../../common/entity/compute_state_domain";
+import { computeStateDomain } from "../../../common/entity/compute_state_domain";
 import dynamicContentUpdater from "../../../common/dom/dynamic_content_updater";
 
 class MoreInfoGroup extends PolymerElement {

src/dialogs/more-info/controls/more-info-input_datetime.js

@@ -7,7 +7,7 @@ import "@vaadin/vaadin-date-picker/vaadin-date-picker";
 import "../../../components/ha-relative-time";
 import "../../../components/paper-time-input";
 
-import attributeClassNames from "../../../common/entity/attribute_class_names";
+import { attributeClassNames } from "../../../common/entity/attribute_class_names";
 
 class DatetimeInput extends PolymerElement {
   static get template() {

src/dialogs/more-info/controls/more-info-light.js

@@ -10,7 +10,7 @@ import "../../../components/ha-color-picker";
 import "../../../components/ha-labeled-slider";
 import "../../../components/ha-paper-dropdown-menu";
 
-import featureClassNames from "../../../common/entity/feature_class_names";
+import { featureClassNames } from "../../../common/entity/feature_class_names";
 import { EventsMixin } from "../../../mixins/events-mixin";
 import LocalizeMixin from "../../../mixins/localize-mixin";
 

src/dialogs/more-info/controls/more-info-media_player.js

@@ -10,7 +10,7 @@ import "../../../components/ha-paper-slider";
 import "../../../components/ha-paper-dropdown-menu";
 import HassMediaPlayerEntity from "../../../util/hass-media-player-model";
 
-import attributeClassNames from "../../../common/entity/attribute_class_names";
+import { attributeClassNames } from "../../../common/entity/attribute_class_names";
 import isComponentLoaded from "../../../common/config/is_component_loaded";
 import { EventsMixin } from "../../../mixins/events-mixin";
 import LocalizeMixin from "../../../mixins/localize-mixin";

src/dialogs/more-info/controls/more-info-water_heater.js

@@ -14,7 +14,7 @@ import "../../../components/ha-switch";
 import { supportsFeature } from "../../../common/entity/supports-feature";
 import { EventsMixin } from "../../../mixins/events-mixin";
 
-import featureClassNames from "../../../common/entity/feature_class_names";
+import { featureClassNames } from "../../../common/entity/feature_class_names";
 import LocalizeMixin from "../../../mixins/localize-mixin";
 
 /*

src/dialogs/more-info/more-info-controls.js

@@ -11,8 +11,8 @@ import "../../state-summary/state-card-content";
 
 import "./controls/more-info-content";
 
-import computeStateName from "../../common/entity/compute_state_name";
+import { computeStateName } from "../../common/entity/compute_state_name";
-import computeStateDomain from "../../common/entity/compute_state_domain";
+import { computeStateDomain } from "../../common/entity/compute_state_domain";
 import isComponentLoaded from "../../common/config/is_component_loaded";
 import { DOMAINS_MORE_INFO_NO_HISTORY } from "../../common/const";
 import { EventsMixin } from "../../mixins/events-mixin";

src/dialogs/more-info/more-info-settings.js

@@ -8,8 +8,8 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import { EventsMixin } from "../../mixins/events-mixin";
 import LocalizeMixin from "../../mixins/localize-mixin";
 
-import computeStateName from "../../common/entity/compute_state_name";
+import { computeStateName } from "../../common/entity/compute_state_name";
-import computeDomain from "../../common/entity/compute_domain";
+import { computeDomain } from "../../common/entity/compute_domain";
 import { updateEntityRegistryEntry } from "../../data/entity_registry";
 import { showSaveSuccessToast } from "../../util/toast-saved-success";
 

src/dialogs/notifications/notification-drawer.js

@@ -12,7 +12,7 @@ import "../../components/ha-paper-icon-button-prev";
 import { EventsMixin } from "../../mixins/events-mixin";
 import LocalizeMixin from "../../mixins/localize-mixin";
 import { subscribeNotifications } from "../../data/persistent_notification";
-import computeDomain from "../../common/entity/compute_domain";
+import { computeDomain } from "../../common/entity/compute_domain";
 /*
  * @appliesMixin EventsMixin
  * @appliesMixin LocalizeMixin

src/panels/config/automation/ha-automation-editor.ts

@@ -20,7 +20,7 @@ import "../../../layouts/ha-app-layout";
 
 import Automation from "../js/automation";
 import unmountPreact from "../../../common/preact/unmount";
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 
 import { haStyle } from "../../../resources/styles";
 import { HomeAssistant } from "../../../types";

src/panels/config/automation/ha-automation-picker.ts

@@ -19,7 +19,7 @@ import "../../../components/entity/ha-entity-toggle";
 
 import "../ha-config-section";
 
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 import { computeRTL } from "../../../common/util/compute_rtl";
 import { haStyle } from "../../../resources/styles";
 import { HomeAssistant } from "../../../types";

src/panels/config/automation/ha-config-automation.js

@@ -5,7 +5,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import "./ha-automation-editor";
 import "./ha-automation-picker";
 
-import computeStateDomain from "../../../common/entity/compute_state_domain";
+import { computeStateDomain } from "../../../common/entity/compute_state_domain";
 
 class HaConfigAutomation extends PolymerElement {
   static get template() {

src/panels/config/cloud/alexa/cloud-alexa.ts

@@ -35,8 +35,8 @@ import { AlexaEntity, fetchCloudAlexaEntities } from "../../../../data/alexa";
 // tslint:disable-next-line: no-duplicate-imports
 import { HaSwitch } from "../../../../components/ha-switch";
 
-import computeStateName from "../../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../../common/entity/compute_state_name";
-import computeDomain from "../../../../common/entity/compute_domain";
+import { computeDomain } from "../../../../common/entity/compute_domain";
 
 const DEFAULT_CONFIG_EXPOSE = true;
 const IGNORE_INTERFACES = ["Alexa.EndpointHealth"];

src/panels/config/cloud/google-assistant/cloud-google-assistant.ts

@@ -40,8 +40,8 @@ import {
 // tslint:disable-next-line: no-duplicate-imports
 import { HaSwitch } from "../../../../components/ha-switch";
 
-import computeStateName from "../../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../../common/entity/compute_state_name";
-import computeDomain from "../../../../common/entity/compute_domain";
+import { computeDomain } from "../../../../common/entity/compute_domain";
 
 const DEFAULT_CONFIG_EXPOSE = true;
 

src/panels/config/customize/ha-config-customize.js

@@ -12,9 +12,9 @@ import "../ha-config-section";
 import "../ha-entity-config";
 import "./ha-form-customize";
 
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
-import computeStateDomain from "../../../common/entity/compute_state_domain";
+import { computeStateDomain } from "../../../common/entity/compute_state_domain";
-import sortByName from "../../../common/entity/states_sort_by_name";
+import { sortStatesByName } from "../../../common/entity/states_sort_by_name";
 import LocalizeMixin from "../../../mixins/localize-mixin";
 
 /*
@@ -93,7 +93,7 @@ class HaConfigCustomize extends LocalizeMixin(PolymerElement) {
   computeEntities(hass) {
     return Object.keys(hass.states)
       .map((key) => hass.states[key])
-      .sort(sortByName);
+      .sort(sortStatesByName);
   }
 }
 customElements.define("ha-config-customize", HaConfigCustomize);

src/panels/config/customize/ha-form-customize.js

@@ -7,7 +7,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import hassAttributeUtil from "../../../util/hass-attributes-util";
 import "./ha-form-customize-attributes";
 
-import computeStateDomain from "../../../common/entity/compute_state_domain";
+import { computeStateDomain } from "../../../common/entity/compute_state_domain";
 
 class HaFormCustomize extends PolymerElement {
   static get template() {

src/panels/config/devices/ha-config-devices-dashboard.ts

@@ -36,7 +36,7 @@ import { ConfigEntry } from "../../../data/config_entries";
 import { AreaRegistryEntry } from "../../../data/area_registry";
 import { navigate } from "../../../common/navigate";
 import { LocalizeFunc } from "../../../common/translations/localize";
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 
 interface DeviceRowData extends DeviceRegistryEntry {
   device?: DeviceRowData;

src/panels/config/devices/ha-device-card.js

@@ -11,7 +11,7 @@ import "../../../layouts/hass-subpage";
 
 import { EventsMixin } from "../../../mixins/events-mixin";
 import LocalizeMixin from "../../../mixins/localize-mixin";
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 import "../../../components/entity/state-badge";
 import { compare } from "../../../common/string/compare";
 import {

src/panels/config/entity_registry/dialog-entity-registry-detail.ts

@@ -20,8 +20,8 @@ import { HassEntity } from "home-assistant-js-websocket";
 // tslint:disable-next-line: no-duplicate-imports
 import { HaSwitch } from "../../../components/ha-switch";
 
-import computeDomain from "../../../common/entity/compute_domain";
+import { computeDomain } from "../../../common/entity/compute_domain";
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 
 class DialogEntityRegistryDetail extends LitElement {
   @property() public hass!: HomeAssistant;

src/panels/config/entity_registry/ha-config-entity-registry.ts

@@ -21,9 +21,9 @@ import "../../../layouts/hass-subpage";
 import "../../../layouts/hass-loading-screen";
 import "../../../components/ha-card";
 import "../../../components/ha-icon";
-import domainIcon from "../../../common/entity/domain_icon";
+import { domainIcon } from "../../../common/entity/domain_icon";
-import stateIcon from "../../../common/entity/state_icon";
+import { stateIcon } from "../../../common/entity/state_icon";
-import computeDomain from "../../../common/entity/compute_domain";
+import { computeDomain } from "../../../common/entity/compute_domain";
 import "../ha-config-section";
 import {
   showEntityRegistryDetailDialog,

src/panels/config/ha-entity-config.js

@@ -7,7 +7,7 @@ import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 import "../../components/ha-card";
 
-import computeStateName from "../../common/entity/compute_state_name";
+import { computeStateName } from "../../common/entity/compute_state_name";
 
 class HaEntityConfig extends PolymerElement {
   static get template() {

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

@@ -18,7 +18,7 @@ import "../../../components/ha-icon";
 import { computeRTL } from "../../../common/util/compute_rtl";
 import "../ha-config-section";
 
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 import {
   loadConfigFlowDialog,
   showConfigFlowDialog,

src/panels/config/js/condition/zone.tsx

@@ -1,7 +1,7 @@
 import { h, Component } from "preact";
 import "../../../../components/entity/ha-entity-picker";
-import hasLocation from "../../../../common/entity/has_location";
+import { hasLocation } from "../../../../common/entity/has_location";
-import computeStateDomain from "../../../../common/entity/compute_state_domain";
+import { computeStateDomain } from "../../../../common/entity/compute_state_domain";
 
 function zoneAndLocationFilter(stateObj) {
   return hasLocation(stateObj) && computeStateDomain(stateObj) !== "zone";

src/panels/config/js/trigger/zone.tsx

@@ -3,8 +3,8 @@ import "@polymer/paper-radio-button/paper-radio-button";
 import "@polymer/paper-radio-group/paper-radio-group";
 import "../../../../components/entity/ha-entity-picker";
 
-import hasLocation from "../../../../common/entity/has_location";
+import { hasLocation } from "../../../../common/entity/has_location";
-import computeStateDomain from "../../../../common/entity/compute_state_domain";
+import { computeStateDomain } from "../../../../common/entity/compute_state_domain";
 
 function zoneAndLocationFilter(stateObj) {
   return hasLocation(stateObj) && computeStateDomain(stateObj) !== "zone";

src/panels/config/script/ha-config-script.js

@@ -5,8 +5,8 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import "./ha-script-editor";
 import "./ha-script-picker";
 
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
-import computeStateDomain from "../../../common/entity/compute_state_domain";
+import { computeStateDomain } from "../../../common/entity/compute_state_domain";
 
 class HaConfigScript extends PolymerElement {
   static get template() {

src/panels/config/script/ha-script-editor.js

@@ -12,8 +12,8 @@ import "../../../components/ha-fab";
 import Script from "../js/script";
 import unmountPreact from "../../../common/preact/unmount";
 
-import computeObjectId from "../../../common/entity/compute_object_id";
+import { computeObjectId } from "../../../common/entity/compute_object_id";
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 import NavigateMixin from "../../../mixins/navigate-mixin";
 import LocalizeMixin from "../../../mixins/localize-mixin";
 

src/panels/config/script/ha-script-picker.ts

@@ -20,7 +20,7 @@ import "../../../components/ha-fab";
 
 import "../ha-config-section";
 
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 import { haStyle } from "../../../resources/styles";
 import { HomeAssistant } from "../../../types";
 import { triggerScript } from "../../../data/script";

src/panels/config/zha/zha-device-card.ts

@@ -41,7 +41,7 @@ import { ItemSelectedEvent, NodeServiceData } from "./types";
 import { navigate } from "../../../common/navigate";
 import { UnsubscribeFunc, HassEvent } from "home-assistant-js-websocket";
 import { formatAsPaddedHex } from "./functions";
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 
 declare global {
   // for fire event

src/panels/config/zwave/ha-config-zwave.js

@@ -26,9 +26,9 @@ import "./zwave-usercodes";
 import "./zwave-values";
 import "./zwave-node-protection";
 
-import sortByName from "../../../common/entity/states_sort_by_name";
+import { sortStatesByName } from "../../../common/entity/states_sort_by_name";
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
-import computeStateDomain from "../../../common/entity/compute_state_domain";
+import { computeStateDomain } from "../../../common/entity/compute_state_domain";
 import { EventsMixin } from "../../../mixins/events-mixin";
 import LocalizeMixin from "../../../mixins/localize-mixin";
 
@@ -461,7 +461,7 @@ class HaConfigZwave extends LocalizeMixin(EventsMixin(PolymerElement)) {
     return Object.keys(hass.states)
       .map((key) => hass.states[key])
       .filter((ent) => ent.entity_id.match("zwave[.]"))
-      .sort(sortByName);
+      .sort(sortStatesByName);
   }
 
   computeEntities(selectedNode) {
@@ -481,7 +481,7 @@ class HaConfigZwave extends LocalizeMixin(EventsMixin(PolymerElement)) {
           !ent.entity_id.match("zwave[.]")
         );
       })
-      .sort(sortByName);
+      .sort(sortStatesByName);
   }
 
   selectedNodeChanged(selectedNode) {

src/panels/config/zwave/zwave-groups.js

@@ -7,7 +7,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import "../../../components/buttons/ha-call-service-button";
 import "../../../components/ha-card";
 
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 
 class ZwaveGroups extends PolymerElement {
   static get template() {

src/panels/logbook/ha-logbook.js

@@ -6,7 +6,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import formatTime from "../../common/datetime/format_time";
 import formatDate from "../../common/datetime/format_date";
 import { EventsMixin } from "../../mixins/events-mixin";
-import domainIcon from "../../common/entity/domain_icon";
+import { domainIcon } from "../../common/entity/domain_icon";
 import { computeRTL } from "../../common/util/compute_rtl";
 
 /*

src/panels/lovelace/cards/hui-entities-card.ts

@@ -21,7 +21,7 @@ import { processConfigEntities } from "../common/process-config-entities";
 import { createRowElement } from "../common/create-row-element";
 import { EntitiesCardConfig, EntitiesCardEntityConfig } from "./types";
 
-import computeDomain from "../../../common/entity/compute_domain";
+import { computeDomain } from "../../../common/entity/compute_domain";
 import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
 
 @customElement("hui-entities-card")

src/panels/lovelace/cards/hui-entity-button-card.ts

@@ -16,11 +16,11 @@ import "../../../components/ha-card";
 import "../components/hui-warning";
 
 import isValidEntityId from "../../../common/entity/valid_entity_id";
-import stateIcon from "../../../common/entity/state_icon";
+import { stateIcon } from "../../../common/entity/state_icon";
-import computeStateDomain from "../../../common/entity/compute_state_domain";
+import { computeStateDomain } from "../../../common/entity/compute_state_domain";
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
-import computeDomain from "../../../common/entity/compute_domain";
+import { computeDomain } from "../../../common/entity/compute_domain";
 
 import { HomeAssistant, LightEntity } from "../../../types";
 import { LovelaceCard, LovelaceCardEditor } from "../types";

src/panels/lovelace/cards/hui-gauge-card.ts

@@ -15,7 +15,7 @@ import "../components/hui-warning";
 
 import isValidEntityId from "../../../common/entity/valid_entity_id";
 import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 
 import { HomeAssistant } from "../../../types";
 import { fireEvent } from "../../../common/dom/fire_event";

src/panels/lovelace/cards/hui-glance-card.ts

@@ -10,8 +10,7 @@ import {
 } from "lit-element";
 import { classMap } from "lit-html/directives/class-map";
 
-import computeStateDisplay from "../../../common/entity/compute_state_display";
+import { computeStateName } from "../../../common/entity/compute_state_name";
-import computeStateName from "../../../common/entity/compute_state_name";
 import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
 import relativeTime from "../../../common/datetime/relative_time";
 
@@ -20,6 +19,7 @@ import "../../../components/ha-card";
 import "../../../components/ha-icon";
 import "../components/hui-warning-element";
 
+import { computeStateDisplay } from "../../../common/entity/compute_state_display";
 import { HomeAssistant } from "../../../types";
 import { LovelaceCard, LovelaceCardEditor } from "../types";
 import { longPress } from "../common/directives/long-press-directive";

src/panels/lovelace/cards/hui-legacy-wrapper-card.js

@@ -1,5 +1,5 @@
 import { createErrorCardConfig } from "./hui-error-card";
-import computeDomain from "../../../common/entity/compute_domain";
+import { computeDomain } from "../../../common/entity/compute_domain";
 
 export default class LegacyWrapperCard extends HTMLElement {
   constructor(tag, domain) {

src/panels/lovelace/cards/hui-light-card.ts

@@ -9,8 +9,8 @@ import {
 import "@polymer/paper-icon-button/paper-icon-button";
 import "@thomasloven/round-slider";
 
-import stateIcon from "../../../common/entity/state_icon";
+import { stateIcon } from "../../../common/entity/state_icon";
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
 
 import "../../../components/ha-card";

src/panels/lovelace/cards/hui-map-card.ts

@@ -18,11 +18,11 @@ import {
   createTileLayer,
   LeafletModuleType,
 } from "../../../common/dom/setup-leaflet-map";
-import computeStateDomain from "../../../common/entity/compute_state_domain";
+import { computeStateDomain } from "../../../common/entity/compute_state_domain";
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 import { debounce } from "../../../common/util/debounce";
 import parseAspectRatio from "../../../common/util/parse-aspect-ratio";
-import computeDomain from "../../../common/entity/compute_domain";
+import { computeDomain } from "../../../common/entity/compute_domain";
 
 import { HomeAssistant } from "../../../types";
 import { LovelaceCard } from "../types";

src/panels/lovelace/cards/hui-picture-entity-card.ts

@@ -14,10 +14,10 @@ import "../../../components/ha-card";
 import "../components/hui-image";
 import "../components/hui-warning";
 
-import computeDomain from "../../../common/entity/compute_domain";
+import { computeDomain } from "../../../common/entity/compute_domain";
-import computeStateDisplay from "../../../common/entity/compute_state_display";
+import { computeStateName } from "../../../common/entity/compute_state_name";
-import computeStateName from "../../../common/entity/compute_state_name";
 
+import { computeStateDisplay } from "../../../common/entity/compute_state_display";
 import { longPress } from "../common/directives/long-press-directive";
 import { HomeAssistant } from "../../../types";
 import { LovelaceCard, LovelaceCardEditor } from "../types";

src/panels/lovelace/cards/hui-picture-glance-card.ts

@@ -10,16 +10,16 @@ import {
 } from "lit-element";
 import { classMap } from "lit-html/directives/class-map";
 
-import computeStateDisplay from "../../../common/entity/compute_state_display";
+import { computeStateName } from "../../../common/entity/compute_state_name";
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeDomain } from "../../../common/entity/compute_domain";
-import computeDomain from "../../../common/entity/compute_domain";
+import { stateIcon } from "../../../common/entity/state_icon";
-import stateIcon from "../../../common/entity/state_icon";
 
 import "../../../components/ha-card";
 import "../../../components/ha-icon";
 import "../components/hui-image";
 import "../components/hui-warning-element";
 
+import { computeStateDisplay } from "../../../common/entity/compute_state_display";
 import { DOMAINS_TOGGLE } from "../../../common/const";
 import { LovelaceCard } from "../types";
 import { EntityConfig } from "../entity-rows/types";

src/panels/lovelace/cards/hui-plant-status-card.ts

@@ -13,7 +13,7 @@ import { HassEntity } from "home-assistant-js-websocket";
 import "../../../components/ha-card";
 import "../../../components/ha-icon";
 
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 
 import { LovelaceCardEditor, LovelaceCard } from "../types";
 import { HomeAssistant } from "../../../types";

src/panels/lovelace/cards/hui-sensor-card.ts

@@ -12,8 +12,8 @@ import {
 import "@polymer/paper-spinner/paper-spinner";
 
 import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
-import stateIcon from "../../../common/entity/state_icon";
+import { stateIcon } from "../../../common/entity/state_icon";
 
 import "../../../components/ha-card";
 import "../../../components/ha-icon";

src/panels/lovelace/cards/hui-thermostat-card.ts

@@ -14,7 +14,7 @@ import "../../../components/ha-icon";
 import "../components/hui-warning";
 
 import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 
 import { hasConfigOrEntityChanged } from "../common/has-changed";
 import { HomeAssistant } from "../../../types";

src/panels/lovelace/cards/hui-weather-forecast-card.ts

@@ -13,7 +13,7 @@ import "../../../components/ha-card";
 import "../components/hui-warning";
 
 import isValidEntityId from "../../../common/entity/valid_entity_id";
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 
 import { HomeAssistant } from "../../../types";
 import { hasConfigOrEntityChanged } from "../common/has-changed";

src/panels/lovelace/common/compute-tooltip.ts

@@ -1,4 +1,4 @@
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 import { HomeAssistant } from "../../../types";
 import { LovelaceElementConfig } from "../elements/types";
 import { ActionConfig } from "../../../data/lovelace";

src/panels/lovelace/common/entity/turn-on-off-entities.ts

@@ -1,4 +1,4 @@
-import computeDomain from "../../../../common/entity/compute_domain";
+import { computeDomain } from "../../../../common/entity/compute_domain";
 import { STATES_OFF } from "../../../../common/const";
 import { HomeAssistant } from "../../../../types";
 

src/panels/lovelace/common/entity/turn-on-off-entity.ts

@@ -1,4 +1,4 @@
-import computeDomain from "../../../../common/entity/compute_domain";
+import { computeDomain } from "../../../../common/entity/compute_domain";
 import { HomeAssistant } from "../../../../types";
 
 export const turnOnOffEntity = (

src/panels/lovelace/common/generate-lovelace-config.ts

@@ -10,13 +10,13 @@ import {
   HassConfig,
 } from "home-assistant-js-websocket";
 
-import extractViews from "../../../common/entity/extract_views";
+import { extractViews } from "../../../common/entity/extract_views";
-import getViewEntities from "../../../common/entity/get_view_entities";
+import { getViewEntities } from "../../../common/entity/get_view_entities";
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
-import splitByGroups from "../../../common/entity/split_by_groups";
+import { splitByGroups } from "../../../common/entity/split_by_groups";
-import computeObjectId from "../../../common/entity/compute_object_id";
+import { computeObjectId } from "../../../common/entity/compute_object_id";
-import computeStateDomain from "../../../common/entity/compute_state_domain";
+import { computeStateDomain } from "../../../common/entity/compute_state_domain";
-import computeDomain from "../../../common/entity/compute_domain";
+import { computeDomain } from "../../../common/entity/compute_domain";
 
 import { EntityRowConfig, WeblinkConfig } from "../entity-rows/types";
 import { LocalizeFunc } from "../../../common/translations/localize";

src/panels/lovelace/components/hui-generic-entity-row.ts

@@ -1,4 +1,4 @@
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 import {
   LitElement,
   html,

src/panels/lovelace/editor/unused-entities/hui-unused-entities.ts

@@ -25,8 +25,8 @@ import {
   DataTabelColumnContainer,
 } from "../../../../components/ha-data-table";
 
-import computeStateName from "../../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../../common/entity/compute_state_name";
-import computeDomain from "../../../../common/entity/compute_domain";
+import { computeDomain } from "../../../../common/entity/compute_domain";
 
 import { computeRTL } from "../../../../common/util/compute_rtl";
 import { computeUnusedEntities } from "../../common/compute-unused-entities";

src/panels/lovelace/elements/hui-state-badge-element.ts

@@ -10,7 +10,7 @@ import {
 import "../../../components/entity/ha-state-label-badge";
 import "../components/hui-warning-element";
 
-import computeStateName from "../../../common/entity/compute_state_name";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 import { LovelaceElement, StateBadgeElementConfig } from "./types";
 import { HomeAssistant } from "../../../types";
 import { hasConfigOrEntityChanged } from "../common/has-changed";