ha-nunjucks 1.7.0 → 1.7.1

package/dist/index.js

@@ -24,12 +24,50 @@ if (version(packageInfo.version).compare(window.haNunjucks.version || '0.0.0') >
     // Setup on first import
     handleWhenReady(() => {
         const ha = document.querySelector('home-assistant');
-        // Label registry and states object
-        window.haNunjucks.hass = ha.hass;
-        fetchLabelRegistry(ha.hass);
-        fetchEntityRegistry(ha.hass);
-        fetchConfigEntries(ha.hass);
-        fetchRepairsIssues(ha.hass);
+        // Initialize window object
+        window.haNunjucks = {
+            ...window.haNunjucks,
+            hass: ha.hass,
+            labelRegistry: {
+                event: 'label_registry_updated',
+                fetchRegistry: fetchLabelRegistry,
+                labelId: {},
+                name2LabelId: {},
+            },
+            entityRegistry: {
+                event: 'entity_registry_updated',
+                fetchRegistry: fetchEntityRegistry,
+                entityId2ConfigEntryId: {},
+                configEntryId2EntityIds: {},
+            },
+            configEntries: {
+                event: 'config_entries/subscribe',
+                fetchRegistry: fetchConfigEntries,
+                entryId: {},
+                title2EntryId: {},
+            },
+            repairsIssues: {
+                event: 'repairs/list_issues',
+                fetchRegistry: fetchRepairsIssues,
+                issues: {},
+            },
+        };
+        const registries = [
+            'labelRegistry',
+            'entityRegistry',
+            'configEntries',
+            'repairsIssues',
+        ];
+        for (const registry of registries) {
+            window.haNunjucks[registry].fetchRegistry(ha.hass);
+            ha.hass.connection.subscribeEvents(() => {
+                clearTimeout(window.haNunjucks[registry].timeout);
+                window.haNunjucks[registry].timeout = setTimeout(() => {
+                    window.haNunjucks[registry].fetchRegistry(ha.hass);
+                }, 500);
+            }, window.haNunjucks[registry].event);
+        }
+        // States object
         buildStatesObject();
         // Number and datetime translators
         window.haNunjucks.numberFormat = new Intl.NumberFormat(ha.hass.language);
@@ -45,7 +83,7 @@ if (version(packageInfo.version).compare(window.haNunjucks.version || '0.0.0') >
     }, () => {
         const ha = document.querySelector('home-assistant');
         return ha?.hass?.connected && ha?.hass?.connection?.connected;
-    }, 10000, 1, 'ha-nunjucks failed to initialize - Home Assistant connection timeout');
+    }, 10000, 10, 'ha-nunjucks failed to initialize - Home Assistant connection timeout');
     // Initialize global ha-nunjucks environment
     nunjucks.installJinjaCompat();
     window.haNunjucks.env = addTests(addFilters(addGlobals(nunjucks.configure(`${window.location.origin}/local`))));

package/dist/utils/config_entry.d.ts

@@ -1,6 +1,6 @@
 import { HomeAssistant } from '../models/interfaces/hass';
 export declare function fetchConfigEntries(hass: HomeAssistant): Promise<void>;
-export declare function config_entry_id(entity_id: string): string | undefined;
+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];
 export declare function config_entry_attr(config_entry_id: string, attr: ConfigEntryAttribute): string | undefined;

package/dist/utils/config_entry.js

@@ -1,10 +1,22 @@
 export async function fetchConfigEntries(hass) {
-    window.haNunjucks.configEntries = await hass.callWS({
+    const entries = await hass.callWS({
         type: 'config_entries/get',
     });
+    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.find((entry) => entry.entity_id == entity_id)?.config_entry_id;
+    return window.haNunjucks.entityRegistry.entityId2ConfigEntryId[entity_id];
 }
 const ConfigEntryAttributes = [
     'domain',
@@ -17,5 +29,5 @@ export function config_entry_attr(config_entry_id, attr) {
     if (!ConfigEntryAttributes.includes(attr)) {
         throw Error('Invalid config entry attribute');
     }
-    return window.haNunjucks.configEntries.find((entry) => entry.entry_id == config_entry_id)?.[attr];
+    return window.haNunjucks.configEntries.entryId[config_entry_id]?.[attr];
 }

package/dist/utils/entities.js

@@ -1,7 +1,21 @@
 export async function fetchEntityRegistry(hass) {
-    window.haNunjucks.entityRegistry = await hass.connection.sendMessagePromise({
+    const entities = await hass.connection.sendMessagePromise({
         type: 'config/entity_registry/list',
     });
+    const entityId2ConfigEntryId = {};
+    const configEntryId2EntityIds = {};
+    for (const entity of entities) {
+        if (entity.config_entry_id) {
+            entityId2ConfigEntryId[entity.entity_id] = entity.config_entry_id;
+            configEntryId2EntityIds[entity.config_entry_id] ??= [];
+            configEntryId2EntityIds[entity.config_entry_id].push(entity.entity_id);
+        }
+    }
+    window.haNunjucks.entityRegistry = {
+        ...window.haNunjucks.entityRegistry,
+        entityId2ConfigEntryId,
+        configEntryId2EntityIds,
+    };
 }
 export function is_hidden_entity(hass, entity_id) {
     try {

package/dist/utils/iif.js

@@ -11,12 +11,12 @@ export function iif(hass, condition, if_true, if_false, if_none) {
             return if_none;
         }
     }
-    const template = `
-		{% if ${condition} %}
-		${if_true ?? true}
-		{% else %}
-		${if_false ?? false}
-		{% endif %}
+    const template = `
+		{% if ${condition} %}
+		${if_true ?? true}
+		{% else %}
+		${if_false ?? false}
+		{% endif %}
 	`;
     return renderTemplate(hass, template);
 }

package/dist/utils/integrations.d.ts

@@ -1,2 +1,2 @@
 import { HomeAssistant } from '../models/interfaces/hass';
-export declare function integration_entities(hass: HomeAssistant, integration: string): (string | undefined)[];
+export declare function integration_entities(hass: HomeAssistant, integration: string): string[];

package/dist/utils/integrations.js

@@ -15,11 +15,9 @@ export function integration_entities(hass, integration) {
             return entityIds;
         }
         // Config entry title
-        const configEntryIds = window.haNunjucks.configEntries
-            .filter((entry) => entry.title == integration)
-            .map((entry) => entry.entry_id);
+        const configEntryIds = window.haNunjucks.configEntries.title2EntryId[integration];
         for (const entryId of configEntryIds) {
-            entityIds.push(window.haNunjucks.entityRegistry.find((entity) => entity.config_entry_id == entryId)?.entity_id);
+            entityIds.push(...window.haNunjucks.entityRegistry.configEntryId2EntityIds[entryId]);
         }
         entityIds.sort();
         return entityIds.filter(Boolean);

package/dist/utils/issues.js

@@ -2,13 +2,15 @@ export async function fetchRepairsIssues(hass) {
     const repairsIssues = (await hass.connection.sendMessagePromise({
         type: 'repairs/list_issues',
     })).issues;
+    const issues = {};
     for (const issue of repairsIssues) {
-        window.haNunjucks.repairsIssues[`${issue.issue_domain || issue.domain},${issue.issue_id}`] = issue;
+        issues[`${issue.issue_domain || issue.domain},${issue.issue_id}`] = issue;
     }
+    window.haNunjucks.repairsIssues.issues = issues;
 }
 export function issues() {
-    return window.haNunjucks.repairsIssues;
+    return window.haNunjucks.repairsIssues.issues;
 }
 export function issue(domain, issue_id) {
-    return window.haNunjucks.repairsIssues[`${domain},${issue_id}`];
+    return window.haNunjucks.repairsIssues.issues[`${domain},${issue_id}`];
 }

package/dist/utils/labels.d.ts

@@ -1,8 +1,8 @@
 import { HomeAssistant } from '../models/interfaces/hass';
 export declare function fetchLabelRegistry(hass: HomeAssistant): Promise<void>;
 export declare function labels(hass: HomeAssistant, lookup_value?: string): string[];
-export declare function label_id(lookup_value: string): string | undefined;
-export declare function label_name(lookup_value: string): string | undefined;
+export declare function label_id(lookup_value: string): string;
+export declare function label_name(lookup_value: string): string;
 export declare function label_description(lookup_value: string): string | undefined;
 export declare function label_areas(hass: HomeAssistant, label_name_or_id: string): string[];
 export declare function label_devices(hass: HomeAssistant, label_name_or_id: string): string[];

package/dist/utils/labels.js

@@ -3,12 +3,22 @@ export async function fetchLabelRegistry(hass) {
         type: 'config/label_registry/list',
     });
     labels.sort((ent1, ent2) => ent1.name.localeCompare(ent2.name));
-    window.haNunjucks.labelRegistry = labels;
+    const labelId = {};
+    const name2LabelId = {};
+    for (const label of labels) {
+        labelId[label.label_id] = label;
+        name2LabelId[label.name] = label.label_id;
+    }
+    window.haNunjucks.labelRegistry = {
+        ...window.haNunjucks.labelRegistry,
+        labelId,
+        name2LabelId,
+    };
 }
 export function labels(hass, lookup_value) {
     try {
         if (!lookup_value) {
-            return window.haNunjucks.labelRegistry.map((entry) => entry.label_id);
+            return Object.keys(window.haNunjucks.labelRegistry.labelId);
         }
         return (hass.entities[lookup_value]?.labels ??
             hass.devices[lookup_value]?.labels ??
@@ -20,20 +30,20 @@ export function labels(hass, lookup_value) {
     }
 }
 export function label_id(lookup_value) {
-    return window.haNunjucks.labelRegistry.find((entry) => entry.name == lookup_value)?.label_id;
+    return window.haNunjucks.labelRegistry.name2LabelId[lookup_value];
 }
 export function label_name(lookup_value) {
-    return window.haNunjucks.labelRegistry.find((entry) => entry.label_id == lookup_value)?.name;
+    return window.haNunjucks.labelRegistry.labelId[lookup_value]?.name;
 }
 export function label_description(lookup_value) {
-    return window.haNunjucks.labelRegistry.find((entry) => entry.label_id == lookup_value)?.description;
+    return window.haNunjucks.labelRegistry.labelId[lookup_value]?.description;
 }
 export function label_areas(hass, label_name_or_id) {
     try {
         const areaIds = [];
         let labelId = undefined;
         if (label_name_or_id) {
-            if (window.haNunjucks.labelRegistry.find((entry) => entry.label_id == label_name_or_id)) {
+            if (window.haNunjucks.labelRegistry.labelId[label_name_or_id]) {
                 labelId = label_name_or_id;
             }
             else {
@@ -60,7 +70,7 @@ export function label_devices(hass, label_name_or_id) {
         const deviceIds = [];
         if (label_name_or_id) {
             let labelId = undefined;
-            if (window.haNunjucks.labelRegistry.find((entry) => entry.label_id == label_name_or_id)) {
+            if (window.haNunjucks.labelRegistry.labelId[label_name_or_id]) {
                 labelId = label_name_or_id;
             }
             else {
@@ -87,7 +97,7 @@ export function label_entities(hass, label_name_or_id) {
         const entityIds = [];
         if (label_name_or_id) {
             let labelId = undefined;
-            if (window.haNunjucks.labelRegistry.find((entry) => entry.label_id == label_name_or_id)) {
+            if (window.haNunjucks.labelRegistry.labelId[label_name_or_id]) {
                 labelId = label_name_or_id;
             }
             else {

package/package.json

@@ -1,63 +1,63 @@
-{
-	"name": "ha-nunjucks",
-	"version": "1.7.0",
-	"description": "Wrapper for nunjucks for use with Home Assistant frontend custom components to render templates",
-	"main": "./dist/index.js",
-	"files": [
-		"dist/**"
-	],
-	"type": "module",
-	"scripts": {
-		"test": "ts-mocha tests/**/*.test.ts --require tests/fixtures.mjs",
-		"build": "tsc",
-		"prelint": "tsc --noemit",
-		"lint": "eslint --config ./eslint.config.js",
-		"setup": "git config --add core.hooksPath githooks && chmod +x githooks/pre-commit && npm i"
-	},
-	"lint-staged": {
-		"*": "prettier -w"
-	},
-	"author": "Nerwyn",
-	"license": "Apache-2.0",
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/Nerwyn/ha-nunjucks.git"
-	},
-	"bugs": {
-		"url": "https://github.com/Nerwyn/ha-nunjucks/issues"
-	},
-	"homepage": "https://github.com/Nerwyn/ha-nunjucks#readme",
-	"dependencies": {
-		"buffer": "latest",
-		"create-hash": "latest",
-		"home-assistant-js-websocket": "latest",
-		"mersenne-twister": "latest",
-		"nunjucks": "latest",
-		"python-struct": "latest",
-		"slugify": "latest",
-		"stream": "npm:stream-browserify@latest",
-		"ts-py-datetime": "latest"
-	},
-	"devDependencies": {
-		"@types/create-hash": "latest",
-		"@types/mersenne-twister": "latest",
-		"@types/mocha": "latest",
-		"@types/nunjucks": "latest",
-		"@types/python-struct": "latest",
-		"@typescript-eslint/eslint-plugin": "latest",
-		"@typescript-eslint/parser": "latest",
-		"eslint": "latest",
-		"eslint-config-prettier": "latest",
-		"eslint-plugin-prettier": "latest",
-		"global-jsdom": "latest",
-		"lint-staged": "latest",
-		"mocha": "latest",
-		"prettier": "latest",
-		"prettier-plugin-organize-imports": "latest",
-		"ts-loader": "latest",
-		"ts-mocha": "latest",
-		"ts-node": "latest",
-		"tsx": "latest",
-		"typescript": "latest"
-	}
-}
+{
+	"name": "ha-nunjucks",
+	"version": "1.7.1",
+	"description": "Wrapper for nunjucks for use with Home Assistant frontend custom components to render templates",
+	"main": "./dist/index.js",
+	"files": [
+		"dist/**"
+	],
+	"type": "module",
+	"scripts": {
+		"test": "ts-mocha tests/**/*.test.ts --require tests/fixtures.mjs",
+		"build": "tsc",
+		"prelint": "tsc --noemit",
+		"lint": "eslint --config ./eslint.config.js",
+		"setup": "git config --add core.hooksPath githooks && chmod +x githooks/pre-commit && npm i"
+	},
+	"lint-staged": {
+		"*": "prettier -w"
+	},
+	"author": "Nerwyn",
+	"license": "Apache-2.0",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/Nerwyn/ha-nunjucks.git"
+	},
+	"bugs": {
+		"url": "https://github.com/Nerwyn/ha-nunjucks/issues"
+	},
+	"homepage": "https://github.com/Nerwyn/ha-nunjucks#readme",
+	"dependencies": {
+		"buffer": "latest",
+		"create-hash": "latest",
+		"home-assistant-js-websocket": "latest",
+		"mersenne-twister": "latest",
+		"nunjucks": "latest",
+		"python-struct": "latest",
+		"slugify": "latest",
+		"stream": "npm:stream-browserify@latest",
+		"ts-py-datetime": "latest"
+	},
+	"devDependencies": {
+		"@types/create-hash": "latest",
+		"@types/mersenne-twister": "latest",
+		"@types/mocha": "latest",
+		"@types/nunjucks": "latest",
+		"@types/python-struct": "latest",
+		"@typescript-eslint/eslint-plugin": "latest",
+		"@typescript-eslint/parser": "latest",
+		"eslint": "latest",
+		"eslint-config-prettier": "latest",
+		"eslint-plugin-prettier": "latest",
+		"global-jsdom": "latest",
+		"lint-staged": "latest",
+		"mocha": "^11.3.0",
+		"prettier": "latest",
+		"prettier-plugin-organize-imports": "latest",
+		"ts-loader": "^9.2.1",
+		"ts-mocha": "latest",
+		"ts-node": "latest",
+		"tsx": "latest",
+		"typescript": "latest"
+	}
+}