use dump safe filters instead of to_json function which should avoid …

…escaping characters malforming the JSON
Nerwyn · Sep 21, 2024 · ef6f617 · ef6f617
1 parent 053e38d
commit ef6f617
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -11,9 +11,9 @@ for (const f in FILTERS) {
 }
 for (const f in HASS_FILTERS) {
     env.addFilter(f, function (...args) {
-        const hass = JSON.parse(decodeURIComponent(new nunjucks.Template('{{ to_json(hass) }}').render(
+        const hass = JSON.parse(new nunjucks.Template('{{ hass | dump | safe }}').render(
         // @ts-ignore
-        this.getVariables())));
+        this.getVariables()));
         return HASS_FILTERS[f](hass, ...args);
     });
 }
@@ -24,9 +24,9 @@ for (const t in TESTS) {
 }
 for (const t in HASS_TESTS) {
     env.addTest(t, function (...args) {
-        const hass = JSON.parse(decodeURIComponent(new nunjucks.Template('{{ to_json(hass) }}').render(
+        const hass = JSON.parse(new nunjucks.Template('{{ hass | dump | safe }}').render(
         // @ts-ignore
-        this.getVariables())));
+        this.getVariables()));
         return HASS_TESTS[t](hass, ...args);
     });
 }

diff --git a/src/index.ts b/src/index.ts
@@ -17,11 +17,9 @@ for (const f in FILTERS) {
 for (const f in HASS_FILTERS) {
 	env.addFilter(f, function (...args) {
 		const hass = JSON.parse(
-			decodeURIComponent(
-				new nunjucks.Template('{{ to_json(hass) }}').render(
-					// @ts-ignore
-					this.getVariables(),
-				),
+			new nunjucks.Template('{{ hass | dump | safe }}').render(
+				// @ts-ignore
+				this.getVariables(),
 			),
 		);
 		return HASS_FILTERS[f](hass, ...args);
@@ -42,11 +40,9 @@ for (const t in HASS_TESTS) {
 		t,
 		function (...args: string[]) {
 			const hass = JSON.parse(
-				decodeURIComponent(
-					new nunjucks.Template('{{ to_json(hass) }}').render(
-						// @ts-ignore
-						this.getVariables(),
-					),
+				new nunjucks.Template('{{ hass | dump | safe }}').render(
+					// @ts-ignore
+					this.getVariables(),
 				),
 			);
 			return HASS_TESTS[t](hass, ...args);