Merge pull request #34 from deligenius/0.114.0

Remove factory, support oak@10.5.1

Author: gjuoun

.github/workflows/CI.yml

@@ -13,15 +13,17 @@ jobs:
   # This workflow contains a single job called "build"
   test:
     # The type of runner that the job will run on
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - uses: actions/checkout@v2
+
     - name: Start Deno test
-      uses: denolib/setup-deno@v2
+      uses: denoland/setup-deno@v1
       with:
-        deno-version: v1.x
+        deno-version: v1.20.5
+
     - run: deno --version
     - run: deno test -A

.vscode/settings.json

@@ -1,8 +1,3 @@
 {
   "deno.enable": true,
-  "workbench.colorCustomizations": {
-    "activityBar.background": "#2D3005",
-    "titleBar.activeBackground": "#3F4306",
-    "titleBar.activeForeground": "#FAFCE2"
-  },
 }

deps.ts

@@ -1,5 +1,8 @@
-export * from "https://deno.land/x/oak@v6.5.0/mod.ts";
+export { existsSync } from "https://deno.land/std@0.131.0/fs/exists.ts";
+export * as path from "https://deno.land/std@0.131.0/path/mod.ts";
 
+// test dependencies
+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 {existsSync} from 'https://deno.land/std@0.84.0/fs/exists.ts'
-export * as path from 'https://deno.land/std@0.84.0/path/mod.ts'
+export { Application } from "https://deno.land/x/oak@v10.5.1/mod.ts";

lib/adapterFactory.ts

@@ -0,0 +1,68 @@
+import type {
+  Context,
+  RouteParams,
+  State,
+} from "https://deno.land/x/oak@v10.5.1/mod.ts";
+
+import type { ViewConfig,Adapter,Engine } from "../../viewEngine.type.ts";
+import { getTemplate } from "./oak.utils.ts";
+
+declare module "https://deno.land/x/oak@v10.5.1/mod.ts" {
+  // App level Context
+  interface Context {
+    render: (fileName: string, data?: object) => void;
+  }
+
+  // Router level Context
+  interface RouterContext<
+    R extends string,
+    P extends RouteParams<R> = RouteParams<R>,
+    // deno-lint-ignore no-explicit-any
+    S extends State = Record<string, any>
+  > {
+    render: (fileName: string, data?: object) => void;
+  }
+
+  // add viewConfig to Application interface
+  interface Application {
+    viewConcig: ViewConfig;
+  }
+}
+
+//! Add `render` function to Context
+export const oakAdapter: Adapter = (
+  renderEngine: Engine,
+  config: ViewConfig = <ViewConfig>{}
+) => {
+  return async function (ctx: Context, next: Function) {
+    // load default view setting
+    if (!ctx.app.viewConcig) {
+      ctx.app.viewConcig = {
+        viewEngine: config.viewEngine,
+        viewRoot: config.viewRoot ?? "./",
+      };
+    }
+
+    ctx.render = async function (fileName: string, data?: object) {
+      try {
+        const viewConfig = ctx.app.viewConcig;
+
+        // find template file path, either on internet or in local file system
+        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
+        );
+      } catch (e) {
+        ctx.response.status = 404;
+        console.error("View-Engine: ", e.message);
+      }
+    };
+
+    await next();
+  };
+};

lib/adapters/oak.ts

@@ -1,4 +1,4 @@
-import { path } from "../../deps.ts";
+import { path } from "../../../deps.ts";
 
 const urlRegex =
 /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/;

lib/adapters/oak/oak.adapter.ts

@@ -0,0 +1,34 @@
+// app.ts
+import { Application, green, assertEquals, assert } from "../../../deps.ts";
+import {
+  viewEngine,
+  oakAdapter,
+  ejsEngine,
+  handlebarsEngine,
+} from "../../../mod.ts";
+
+const removeRegex = /\r?\n|\r|\s/g;
+
+Deno.test({
+  name: green("Testing Oak - EjsEngine"),
+  async fn() {
+    const controller = new AbortController();
+    const { signal } = controller;
+    const app = new Application();
+    app.use(viewEngine(oakAdapter, ejsEngine, { viewRoot: "./views/ejs" }));
+
+    app.use(async (ctx, next) => {
+      ctx.render("index.ejs", { data: { name: "John" } });
+    });
+    setTimeout(async () => {
+      const actual = await fetch("http://localhost:8000").then((res) =>
+        res.text()
+      );
+
+      assert(actual.includes("John"));
+      controller.abort();
+    }, 500);
+
+    await app.listen({ port: 8000, signal });
+  },
+});