Merge pull request #37 from deligenius/eta-support

gjuoun · web-flow · commit 00d2419da536 · 2022-04-21T01:34:47.000-03:00
add Eta support
diff --git a/deps.ts b/deps.ts
@@ -6,3 +6,7 @@ export { green, blue } from "https://deno.land/std@0.131.0/fmt/colors.ts";
 export { assertEquals, assert } from "https://deno.land/std@0.131.0/testing/asserts.ts";
 
 export { Application } from "https://deno.land/x/oak@v10.5.1/mod.ts";
+
+
+export * as eta from 'https://deno.land/x/eta@v1.12.3/mod.ts'
+export * as dejs from "https://deno.land/x/dejs@0.10.2/mod.ts";
diff --git a/lib/adapters/oak/oak.utils.ts b/lib/adapters/oak/oak.utils.ts
@@ -6,7 +6,5 @@ const urlRegex =
 
 export async function getTemplate(viewRoot: string, fileName: string) {
   const filePath = path.join(viewRoot, fileName);
-  console.log(filePath);
-  
   return Deno.readTextFileSync(filePath);
 }
diff --git a/lib/engines/dejs/dejs.engine.ts b/lib/engines/dejs/dejs.engine.ts
@@ -1,4 +1,4 @@
-import * as dejs from "https://deno.land/x/dejs@0.10.2/mod.ts";
+import { dejs } from "../../../deps.ts";
 import type { Engine, ViewConfig } from "../../viewEngine.type.ts";
 
 export const dejsEngine: Engine = async (
diff --git a/lib/engines/engines_test.ts b/lib/engines/engines_test.ts
@@ -1,6 +1,7 @@
 import { assertEquals, blue } from "../../deps.ts";
 
 import { denjuckEngine } from "./denjuck/denjuck.engine.ts";
+import { etaEngine } from "./eta/eta.engine.ts";
 import { handlebarsEngine } from "./handlebars/handlebars.engine.ts";
 
 Deno.test({
@@ -25,3 +26,14 @@ Deno.test({
     assertEquals(actual, expect);
   },
 });
+
+Deno.test({
+  name: blue("Testing eta"),
+  async fn() {
+    const template = `<h1><%= it.name %></h1>`;
+
+    const actual =await etaEngine(template,  { name: "John" } );
+    const expect = `<h1>John</h1>`;
+    assertEquals(actual, expect);
+  },
+});
diff --git a/lib/engines/eta/eta.engine.ts b/lib/engines/eta/eta.engine.ts
@@ -0,0 +1,19 @@
+import { eta } from "../../../deps.ts";
+import type { Engine, ViewConfig } from "../../viewEngine.type.ts";
+
+export const etaEngine: Engine = async (
+  template: string,
+  data: object = {},
+  config: ViewConfig = {},
+  filename: string = ""
+): Promise<string> => {
+
+  return new Promise<string>(async (resolve, reject) => {
+    try{
+      const result = await eta.render( template, data) as string
+      resolve(result)
+    }catch(e){
+      reject(e)
+    }
+  })
+};
diff --git a/mod.ts b/mod.ts
@@ -2,6 +2,7 @@
 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";
+export { etaEngine } from "./lib/engines/eta/eta.engine.ts";
 
 //! type
 export type { Engine, Adapter, ViewConfig } from "./lib/viewEngine.type.ts"
diff --git a/views/eta/index.ejs b/views/eta/index.ejs
@@ -0,0 +1,3 @@
+<body>
+  <h1><%= it.name %></h1>
+</body>

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,5 @@ const urlRegex =`
`6`	`6`
`7`	`7`	`export async function getTemplate(viewRoot: string, fileName: string) {`
`8`	`8`	`const filePath = path.join(viewRoot, fileName);`
`9`		`- console.log(filePath);`
`10`		`-`
`11`	`9`	`return Deno.readTextFileSync(filePath);`
`12`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import * as dejs from "https://deno.land/x/dejs@0.10.2/mod.ts";`
	`1`	`+import { dejs } from "../../../deps.ts";`
`2`	`2`	`import type { Engine, ViewConfig } from "../../viewEngine.type.ts";`
`3`	`3`
`4`	`4`	`export const dejsEngine: Engine = async (`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<body>`
	`2`	`+ <h1><%= it.name %></h1>`
	`3`	`+</body>`