change HelperThis type

lumeland · Dec 23, 2023 · db834cd · db834cd
1 parent 441d48b
commit db834cd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/core/renderer.ts b/core/renderer.ts
@@ -359,8 +359,9 @@ export interface Engine<T = string | { toString(): string }> {
 export interface HelperThis {
   data: Data;
 }
+
 // deno-lint-ignore no-explicit-any
-export type Helper = (this: HelperThis, ...args: any[]) => any;
+export type Helper = (this: HelperThis | void, ...args: any[]) => any;
 
 /** The options for a template helper */
 export interface HelperOptions {

diff --git a/plugins/pug.ts b/plugins/pug.ts
@@ -102,7 +102,10 @@ export class PugEngine implements Engine {
       case "filter": {
         this.options.filters ||= {};
 
-        const filter: Helper = (text: string, opt: Record<string, unknown>) => {
+        const filter: Helper = function (
+          text: string,
+          opt: Record<string, unknown>,
+        ) {
           delete opt.filename;
           const args = Object.values(opt);
           return fn(text, ...args);

diff --git a/tests/liquid.test.ts b/tests/liquid.test.ts
@@ -44,15 +44,15 @@ Deno.test("build a site with liquid", async (t) => {
   );
 
   site.filter("fromPage", function (key) {
-    return this.data[key];
+    return this?.data[key];
   });
   site.filter("fromPageAsync", function (key) {
-    return Promise.resolve(this.data[key]);
+    return Promise.resolve(this?.data[key]);
   }, true);
   site.helper(
     "fromPageTagAsync",
     function (key) {
-      return Promise.resolve(`<strong>${this.data[key]}</strong>`);
+      return Promise.resolve(`<strong>${this?.data[key]}</strong>`);
     },
     { type: "tag", body: true, async: true },
   );

diff --git a/tests/nunjucks.test.ts b/tests/nunjucks.test.ts
@@ -44,15 +44,15 @@ Deno.test("build a site with nunjucks", async (t) => {
   );
 
   site.filter("fromPage", function (key) {
-    return this.data[key];
+    return this?.data[key];
   });
   site.filter("fromPageAsync", function (key) {
-    return Promise.resolve(this.data[key]);
+    return Promise.resolve(this?.data[key]);
   }, true);
   site.helper(
     "fromPageTagAsync",
     function (key) {
-      return Promise.resolve(`<strong>${this.data[key]}</strong>`);
+      return Promise.resolve(`<strong>${this?.data[key]}</strong>`);
     },
     { type: "tag", body: true, async: true },
   );