switch global context back to global functions using new hopefully fa…

…st method for retrieving hass object
Nerwyn · Sep 22, 2024 · 6117631 · 6117631
1 parent 267218a
commit 6117631
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -1,10 +1,11 @@
 import nunjucks from 'nunjucks';
-import { CONTEXT } from './context';
 import { addFilters } from './filters';
+import { addGlobals } from './globals';
 import { addTests } from './tests';
+import { buildStatesObject } from './utils/states';
 export let HASS;
 nunjucks.installJinjaCompat();
-const env = addTests(addFilters(new nunjucks.Environment()));
+const env = addTests(addFilters(addGlobals(new nunjucks.Environment())));
 /**
  * Render a Home Assistant template string using nunjucks
  * @param {HomeAssistant} hass The Home Assistant object
@@ -19,9 +20,9 @@ export function renderTemplate(hass, str, context) {
         HASS = hass;
         str = env
             .renderString(structuredClone(str), {
-            // hass,
-            // _states: buildStatesObject(hass),
-            ...CONTEXT(hass),
+            hass,
+            _states: buildStatesObject(hass),
+            // ...CONTEXT(hass),
             ...context,
         })
             .trim();

diff --git a/src/index.ts b/src/index.ts
@@ -1,13 +1,14 @@
 import { HomeAssistant } from 'custom-card-helpers';
 import nunjucks from 'nunjucks';
 
-import { CONTEXT } from './context';
 import { addFilters } from './filters';
+import { addGlobals } from './globals';
 import { addTests } from './tests';
+import { buildStatesObject } from './utils/states';
 
 export let HASS: HomeAssistant;
 nunjucks.installJinjaCompat();
-const env = addTests(addFilters(new nunjucks.Environment()));
+const env = addTests(addFilters(addGlobals(new nunjucks.Environment())));
 
 /**
  * Render a Home Assistant template string using nunjucks
@@ -29,9 +30,9 @@ export function renderTemplate(
 		HASS = hass;
 		str = env
 			.renderString(structuredClone(str), {
-				// hass,
-				// _states: buildStatesObject(hass),
-				...CONTEXT(hass),
+				hass,
+				_states: buildStatesObject(hass),
+				// ...CONTEXT(hass),
 				...context,
 			})
 			.trim();