added dejs

Author: gjuoun

.vscode/launch.json

@@ -10,8 +10,7 @@
       "request": "launch",
       "cwd": "${workspaceFolder}",
       "runtimeExecutable": "deno",
-      "runtimeArgs": ["run", "-A", "--inspect-brk"],
-      "args": ["${relativeFile}"],
+      "runtimeArgs": ["run", "--inspect-brk", "-A", "./src/app.ts"],
       "port": 9229,
       "outputCapture": "std"
     },
@@ -21,9 +20,22 @@
       "request": "launch",
       "cwd": "${workspaceFolder}",
       "runtimeExecutable": "deno",
-      "runtimeArgs": ["test", "-A", "--inspect-brk"],
+      "runtimeArgs": [
+        "test",
+        "-A",
+        "--inspect-brk"
+      ],
       "port": 9229,
       "outputCapture": "std"
+    },
+    {
+      "name": "Deno Attach",
+      "port": 9229,
+      "request": "attach",
+      "skipFiles": [
+        "<node_internals>/**"
+      ],
+      "type": "node"
     }
   ]
-}
+}

lib/adapters/oak/oak.adapter.ts

@@ -51,12 +51,16 @@ export const oakAdapter: Adapter = (
         let template = await getTemplate(viewConfig.viewRoot!, fileName);
 
         ctx.response.headers.set("Content-Type", "text/html; charset=utf-8");
-        ctx.response.body = await renderEngine(
-          template,
-          data ?? {},
-          ctx.app.viewConcig,
-          fileName
-        );
+        
+        ctx.response.body = async () => {
+          return renderEngine(
+            template,
+            data ?? {},
+            ctx.app.viewConcig,
+            fileName
+          );
+        }
+
       } catch (e) {
         ctx.response.status = 404;
         console.error("View-Engine: ", e.message);

lib/adapters/oak/oak.utils.ts

@@ -5,12 +5,8 @@ const urlRegex =
 
 
 export async function getTemplate(viewRoot: string, fileName: string) {
-  let filePath = viewRoot + fileName;
-
-  if (filePath.match(urlRegex)) {
-    return await fetch(filePath).then((res) => res.text());
-  } else {
-    filePath = path.join(viewRoot, fileName);
-    return Deno.readTextFileSync(filePath);
-  }
+  const filePath = path.join(viewRoot, fileName);
+  console.log(filePath);
+  
+  return Deno.readTextFileSync(filePath);
 }

lib/engines/dejs/dejs.engine.ts

@@ -0,0 +1,19 @@
+import * as dejs from "https://deno.land/x/dejs@0.10.2/mod.ts";
+import type { Engine, ViewConfig } from "../../viewEngine.type.ts";
+
+export const dejsEngine: Engine = async (
+  template: string,
+  data: object = {},
+  config: ViewConfig = {},
+  filename: string = ""
+): Promise<string> => {
+
+  return new Promise<string>(async (resolve, reject) => {
+    try{
+      const result = await dejs.renderToString(template, data) 
+      resolve(result)
+    }catch(e){
+      reject(e)
+    }
+  })
+};

lib/engines/denjuck/denjuck.engine.ts

@@ -8,9 +8,18 @@ export const denjuckEngine: Engine = (
   config: ViewConfig = {},
   filename: string = "",
 ) => {
+
   if (config.viewRoot) {
     denjucks.configure(config.viewRoot);
   }
 
-  return denjucks.renderString(template, data);
+  return new Promise<string>((resolve, reject) => {
+    try {
+      const result = denjucks.render(template, data) as string;
+      resolve(result);
+    } catch (e) {
+      reject(e);
+    }
+  });
+
 };

lib/engines/ejs/ejs.engine.ts

@@ -7,11 +7,20 @@ export const ejsEngine: Engine = (
   data: object = {},
   config: ViewConfig = {},
   filename: string = ""
-): string => {
-  if (config.viewRoot) {
-    let option: EjsOptions = { filename: path.join(config.viewRoot, filename) };
-    return ejs.render(template, data, option) as string;
-  } else {
-    return ejs.render(template, data, { filename }) as string;
-  }
+) => {
+  return new Promise<string>((resolve, reject) => {
+    try {
+      if (config.viewRoot) {
+        let option: EjsOptions = { filename: path.join(config.viewRoot, filename) };
+        const result =  ejs.render(template, data, option) as string;
+        resolve(result);
+      } else {
+        const result =  ejs.render(template, data, { filename }) as string;
+        resolve(result);
+      }
+    }
+    catch (e) {
+      reject(e);
+    }
+  });
 };

lib/engines/handlebars/handlebars.engine.ts

@@ -9,6 +9,14 @@ export const handlebarsEngine: Engine = (
   config: ViewConfig = {},
   filename: string = "",
 
-): string => {
-  return hbs.compile(template)(data);
+) => {
+  return new Promise<string>((resolve, reject) => {
+    try {
+      const result = hbs.compile(template)(data) as string;
+      resolve(result);
+    } catch (e) {
+      reject(e);
+    }
+  });
+
 };

lib/viewEngine.type.ts

@@ -13,4 +13,4 @@ export type Engine = (
   data: object,
   config?: ViewConfig,
   filename?:string
-) => string;
+) => Promise<string>;

mod.ts

@@ -2,6 +2,7 @@
 export { ejsEngine } from "./lib/engines/ejs/ejs.engine.ts";
 export { denjuckEngine } from "./lib/engines/denjuck/denjuck.engine.ts";
 export { handlebarsEngine } from "./lib/engines/handlebars/handlebars.engine.ts";
+export { dejsEngine } from "./lib/engines/dejs/dejs.engine.ts";
 
 //! type
 export type { Engine, Adapter, ViewConfig } from "./lib/viewEngine.type.ts"