Merge pull request #75 from syumai/override-include

support overriding include func

mod.ts

@@ -48,10 +48,7 @@ async function include(path: string, params: Params): Promise<string> {
 }
 
 function sanitize(str: string): string {
-  return str
-    .replace(/\`/g, "\\\`")
-    .replace(/\$/g, "\\\$")
-    .replace(/\\+$/, ""); // Trim backslashes at line end. TODO: Fix this to render backslashes.
+  return str.replace(/\`/g, "\\`").replace(/\$/g, "\\$").replace(/\\+$/, ""); // Trim backslashes at line end. TODO: Fix this to render backslashes.
 }
 
 async function bufToStr(buf: Buffer): Promise<string> {
@@ -71,8 +68,8 @@ function NewTemplate(script: string): Template {
     const output: Array<string> = [];
     await new Promise((resolve, reject) => {
       const args = {
-        ...params,
         include,
+        ...params,
         $$OUTPUT: output,
         $$FINISHED: resolve,
         $$ERROR: reject,
@@ -156,7 +153,9 @@ export async function compile(reader: Reader): Promise<Template> {
           case ReadMode.Escaped:
             statements.push(
               `;$$OUTPUT.push($$ESCAPE(${
-                removeLastSemi(await bufToStr(statementBuf))
+                removeLastSemi(
+                  await bufToStr(statementBuf),
+                )
               }));`,
             );
             break;

mod_test.ts

@@ -192,3 +192,21 @@ const decoder = new TextDecoder("utf-8");
     });
   }
 })();
+
+Deno.test({
+  name: "override include",
+  fn: async () => {
+    const buf = new Buffer();
+    const overriddenInclude = () => "overridden";
+    await copy(
+      await dejs.renderFile(`${cwd()}/testdata/raw-include.ejs`, {
+        param: {},
+        include: overriddenInclude,
+      }),
+      buf,
+    );
+    const actual = decoder.decode(await readAll(buf));
+    const expected = "overridden";
+    assertEquals(actual, expected);
+  },
+});