fix input_boolean type, fix input intial value

Matchlighter · Feb 2, 2024 · 8b24df6 · 8b24df6
1 parent a735f42
commit 8b24df6
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/src/plugins/home_assistant/api_entities.ts b/src/plugins/home_assistant/api_entities.ts
@@ -10,7 +10,7 @@ import { chainedDecorators, dec_once } from "../../common/decorators";
 import { current } from "../../hypervisor/current";
 import { persistent } from "../../runtime/persistence";
 import { Annotable, assert_application_context, client_call_safe, getOrCreateLocalData, notePluginAnnotation } from "../base";
-import { ButtonOptions, InputButton, InputEntity, InputOptions, InputSelect, NumberInputOptions, TDEntity } from "./entity_api";
+import { ButtonOptions, HABoolean, InputButton, InputEntity, InputOptions, InputSelect, NumberInputOptions, TDEntity } from "./entity_api";
 import { trackAutocleanEntity } from "./entity_api/auto_cleaning";
 import { domain_entities } from "./entity_api/domains";
 import { EntityClass, EntityClassConstructor, EntityClassOptions, EntityClassType } from "./entity_api/domains/base";
@@ -64,7 +64,7 @@ export const _entitySubApi = (_plugin: () => HomeAssistantPlugin) => {
     }
 
     function _linkFieldEntityBase<T extends TDEntity<any>>(
-        construct: () => T,
+        construct: (self: any) => T,
         context: DecoratorContext,
         roptions: EntityRegistrationOptions,
         init_callback?: (self, ent: T) => void,
@@ -80,7 +80,7 @@ export const _entitySubApi = (_plugin: () => HomeAssistantPlugin) => {
         const init_linked = async (self) => {
             if (get_linked(self, false)) return;
 
-            const ent = construct();
+            const ent = construct(self);
             init_callback?.(self, ent);
             ents.set(self, ent);
 
@@ -219,13 +219,28 @@ export const _entitySubApi = (_plugin: () => HomeAssistantPlugin) => {
         return ((access, context) => {
             const { entity_options, registration_options } = separateRegistrationOptions(options);
 
+            if (entity_options.existing) {
+                if (registration_options.auto_clean) throw new Error("Cannot use auto_clean: true with existing: true");
+                registration_options.auto_clean = false;
+            }
+
+            const initialValues = new WeakMap<any, any>();
+
             const { get_linked } = _linkFieldEntityBase(
-                () => new InputEntity(entity_options.id || String(context.name), { domain, ...entity_options }),
+                (self) => new InputEntity(entity_options.id || String(context.name), {
+                    domain,
+                    initial: initialValues.get(self),
+                    ...entity_options,
+                }),
                 context,
                 registration_options,
             )
 
             return {
+                init(v) {
+                    initialValues.set(this, v);
+                    return v;
+                },
                 get() {
                     return get_linked(this, true).state;
                 },
@@ -330,10 +345,10 @@ export const _entitySubApi = (_plugin: () => HomeAssistantPlugin) => {
         text: inputApi<string, { min?: number, max?: number, pattern?: string | RegExp, mode?: 'text' | 'password' } & InputOptions<string>>("input_text"),
 
         /** Create an `input_boolean` helper and sync it with the decorated accessor */
-        boolean: inputApi<boolean, InputOptions<boolean>>("input_boolean"),
+        boolean: inputApi<HABoolean, InputOptions<HABoolean>>("input_boolean"),
 
         /** Create an `input_boolean` helper and sync it with the decorated accessor */
-        bool: inputApi<boolean, InputOptions<boolean>>("input_boolean"),
+        bool: inputApi<HABoolean, InputOptions<HABoolean>>("input_boolean"),
 
         /** Create an `input_datetime` helper and sync it with the decorated accessor */
         datetime: inputApi<Date | number | Iso8601String, { has_date?: boolean, has_time?: boolean } & InputOptions<string>>("input_datetime"),

diff --git a/src/plugins/home_assistant/entity_api/input.ts b/src/plugins/home_assistant/entity_api/input.ts
@@ -1,4 +1,5 @@
 import { observable, runInAction } from "mobx";
+import * as moment from "moment";
 
 import type { HomeAssistantPlugin } from "..";
 import { client_call_safe } from "../../base";
@@ -31,6 +32,8 @@ export interface NumberInputOptions extends InputOptions<number> {
     mode?: 'slider' | 'box';
 }
 
+export type HABoolean = "on" | "off";
+
 class InputEntity<T> extends TDEntity<T> {
     constructor(readonly id: string, readonly options: InputOptions<T>) {
         super();
@@ -79,6 +82,16 @@ class InputEntity<T> extends TDEntity<T> {
             entity_id: this.uuid,
         };
 
+        if (this.domain == "input_datetime" && value instanceof Date) {
+            value = value.toISOString() as any;
+        }
+        if (this.domain == "input_datetime" && moment.isMoment(value)) {
+            value = value.toISOString() as any;
+        }
+        if (this.domain == "input_boolean" && typeof value == "boolean") {
+            value = value ? "on" : "off" as any;
+        }
+
         if (this.domain == "input_select") {
             service = "input_select.select_option";
             service_params["option"] = value;