ha-nunjucks 1.7.1 → 1.7.4

package/dist/index.js

@@ -4,7 +4,7 @@ import { addFilters } from './filters';
 import { addGlobals } from './globals';
 import { handleWhenReady } from './helpers';
 import { addTests } from './tests';
-import { fetchConfigEntries } from './utils/config_entry';
+import { subscribeConfigEntries } from './utils/config_entry';
 import { fetchEntityRegistry } from './utils/entities';
 import { fetchRepairsIssues } from './utils/issues';
 import { fetchLabelRegistry } from './utils/labels';
@@ -29,33 +29,30 @@ if (version(packageInfo.version).compare(window.haNunjucks.version || '0.0.0') >
             ...window.haNunjucks,
             hass: ha.hass,
             labelRegistry: {
-                event: 'label_registry_updated',
+                updateEvent: 'label_registry_updated',
                 fetchRegistry: fetchLabelRegistry,
                 labelId: {},
                 name2LabelId: {},
             },
             entityRegistry: {
-                event: 'entity_registry_updated',
+                updateEvent: 'entity_registry_updated',
                 fetchRegistry: fetchEntityRegistry,
                 entityId2ConfigEntryId: {},
                 configEntryId2EntityIds: {},
             },
-            configEntries: {
-                event: 'config_entries/subscribe',
-                fetchRegistry: fetchConfigEntries,
-                entryId: {},
-                title2EntryId: {},
-            },
             repairsIssues: {
-                event: 'repairs/list_issues',
+                updateEvent: 'repairs_issue_registry_updated',
                 fetchRegistry: fetchRepairsIssues,
                 issues: {},
             },
+            configEntries: {
+                entryId: {},
+                title2EntryId: {},
+            },
         };
         const registries = [
             'labelRegistry',
             'entityRegistry',
-            'configEntries',
             'repairsIssues',
         ];
         for (const registry of registries) {
@@ -65,8 +62,9 @@ if (version(packageInfo.version).compare(window.haNunjucks.version || '0.0.0') >
                 window.haNunjucks[registry].timeout = setTimeout(() => {
                     window.haNunjucks[registry].fetchRegistry(ha.hass);
                 }, 500);
-            }, window.haNunjucks[registry].event);
+            }, window.haNunjucks[registry].updateEvent);
         }
+        subscribeConfigEntries(ha.hass);
         // States object
         buildStatesObject();
         // Number and datetime translators
@@ -80,6 +78,7 @@ if (version(packageInfo.version).compare(window.haNunjucks.version || '0.0.0') >
         window.haNunjucks.datetimeFormat = new Intl.DateTimeFormat(ha.hass.language, { dateStyle: 'full', timeStyle: 'long' });
         window.haNunjucks.ordinalFormat = new Intl.PluralRules('en-US', // ha.hass.language, // Use english for proper numeric suffixes
         { type: 'ordinal' });
+        console.info(`%c HA-NUNJUCKS v${packageInfo.version}`, 'color: white; font-weight: bold; background: darkgreen');
     }, () => {
         const ha = document.querySelector('home-assistant');
         return ha?.hass?.connected && ha?.hass?.connection?.connected;

package/dist/models/interfaces/registries.d.ts

@@ -153,6 +153,10 @@ export interface ConfigEntry {
     error_reason_translation_key?: string;
     error_reason_translation_placeholders?: Record<string, string>;
 }
+export interface ConfigEntryUpdate {
+    type: null | 'added' | 'removed' | 'updated';
+    entry: ConfigEntry;
+}
 export interface RepairsIssue {
     domain: string;
     issue_domain?: string;

package/dist/utils/config_entry.d.ts

@@ -1,5 +1,5 @@
 import { HomeAssistant } from '../models/interfaces/hass';
-export declare function fetchConfigEntries(hass: HomeAssistant): Promise<void>;
+export declare function subscribeConfigEntries(hass: HomeAssistant): Promise<void>;
 export declare function config_entry_id(entity_id: string): string;
 declare const ConfigEntryAttributes: readonly ["domain", "title", "state", "source", "disabled_by"];
 type ConfigEntryAttribute = (typeof ConfigEntryAttributes)[number];

package/dist/utils/config_entry.js

@@ -1,19 +1,37 @@
-export async function fetchConfigEntries(hass) {
-    const entries = await hass.callWS({
-        type: 'config_entries/get',
+export async function subscribeConfigEntries(hass) {
+    await hass.connection.subscribeMessage((updates) => {
+        const entryId = window.haNunjucks.configEntries.entryId || {};
+        const title2EntryId = window.haNunjucks.configEntries.title2EntryId || {};
+        for (const update of updates) {
+            if (update.type == 'removed') {
+                delete entryId[update.entry.entry_id];
+                if (title2EntryId[update.entry.title]) {
+                    title2EntryId[update.entry.title] = title2EntryId[update.entry.title].filter((id) => id != update.entry.entry_id);
+                    if (!title2EntryId[update.entry.title].length) {
+                        delete title2EntryId[update.entry.title];
+                    }
+                }
+            }
+            else {
+                if (entryId[update.entry.entry_id] &&
+                    entryId[update.entry.entry_id].title != update.entry.title) {
+                    delete title2EntryId[entryId[update.entry.entry_id].title];
+                }
+                entryId[update.entry.entry_id] = update.entry;
+                title2EntryId[update.entry.title] ??= [];
+                if (!title2EntryId[update.entry.title].includes(update.entry.entry_id)) {
+                    title2EntryId[update.entry.title].push(update.entry.entry_id);
+                }
+            }
+        }
+        window.haNunjucks.configEntries = {
+            ...window.haNunjucks.configEntries,
+            entryId,
+            title2EntryId,
+        };
+    }, {
+        type: 'config_entries/subscribe',
     });
-    const entryId = {};
-    const title2EntryId = {};
-    for (const entry of entries) {
-        entryId[entry.entry_id] = entry;
-        title2EntryId[entry.title] ??= [];
-        title2EntryId[entry.title].push(entry.entry_id);
-    }
-    window.haNunjucks.configEntries = {
-        ...window.haNunjucks.configEntries,
-        entryId,
-        title2EntryId,
-    };
 }
 export function config_entry_id(entity_id) {
     return window.haNunjucks.entityRegistry.entityId2ConfigEntryId[entity_id];

package/dist/utils/issues.js

@@ -4,7 +4,9 @@ export async function fetchRepairsIssues(hass) {
     })).issues;
     const issues = {};
     for (const issue of repairsIssues) {
-        issues[`${issue.issue_domain || issue.domain},${issue.issue_id}`] = issue;
+        if (!issue.ignored) {
+            issues[`${issue.issue_domain || issue.domain},${issue.issue_id}`] = issue;
+        }
     }
     window.haNunjucks.repairsIssues.issues = issues;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ha-nunjucks",
-	"version": "1.7.1",
+	"version": "1.7.4",
 	"description": "Wrapper for nunjucks for use with Home Assistant frontend custom components to render templates",
 	"main": "./dist/index.js",
 	"files": [