Merge pull request #36 from wrapperup/fix-escape

Fix: Convert any value to string when escaping
ventojs · Feb 26, 2024 · a921536 · a921536
2 parents 627b42f + beb7698
commit a921536
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 3 deletions.
diff --git a/plugins/escape.ts b/plugins/escape.ts
@@ -3,6 +3,8 @@ import type { Environment } from "../src/environment.ts";
 
 export default function () {
   return (env: Environment) => {
-    env.filters.escape = html.escape;
+    // deno-lint-ignore no-explicit-any
+    env.filters.escape = (value: any) =>
+      value ? html.escape(value.toString()) : "";
   };
 }
diff --git a/plugins/unescape.ts b/plugins/unescape.ts
@@ -3,6 +3,8 @@ import type { Environment } from "../src/environment.ts";
 
 export default function () {
   return (env: Environment) => {
-    env.filters.unescape = html.unescape;
+    // deno-lint-ignore no-explicit-any
+    env.filters.unescape = (value: any) =>
+      value ? html.unescape(value.toString()) : "";
   };
 }
diff --git a/test/escape.test.ts b/test/escape.test.ts
@@ -35,3 +35,33 @@ Deno.test("Escape by default", async () => {
     expected: "&lt;h1&gt;Hello world&lt;/h1&gt;",
   });
 });
+
+Deno.test("Escape non-string", async () => {
+  await test({
+    template: `
+    {{ 100 |> escape }}
+    `,
+    expected: "100",
+  });
+  testSync({
+    template: `
+    {{ 100 |> escape }}
+    `,
+    expected: "100",
+  });
+});
+
+Deno.test("Escape undefined", async () => {
+  await test({
+    template: `
+    {{ undefined |> escape }}
+    `,
+    expected: "",
+  });
+  testSync({
+    template: `
+    {{ undefined |> escape }}
+    `,
+    expected: "",
+  });
+});
diff --git a/test/unescape.test.ts b/test/unescape.test.ts
@@ -15,7 +15,7 @@ Deno.test("Unescape filter", async () => {
   });
 });
 
-Deno.test("Escape by default", async () => {
+Deno.test("Unescape with escape by default", async () => {
   await test({
     options: {
       autoescape: true,
@@ -35,3 +35,33 @@ Deno.test("Escape by default", async () => {
     expected: "<h1>Hello world</h1>",
   });
 });
+
+Deno.test("Unescape non-string", async () => {
+  await test({
+    template: `
+    {{ 100 |> unescape }}
+    `,
+    expected: "100",
+  });
+  testSync({
+    template: `
+    {{ 100 |> unescape }}
+    `,
+    expected: "100",
+  });
+});
+
+Deno.test("Unescape undefined", async () => {
+  await test({
+    template: `
+    {{ undefined |> unescape }}
+    `,
+    expected: "",
+  });
+  testSync({
+    template: `
+    {{ undefined |> unescape }}
+    `,
+    expected: "",
+  });
+});