Merge branch 'develop'

README.md

@@ -62,7 +62,7 @@ The following middleware response will be automatically detected as `application
 
 ```ts
 app.add(() => ({
-  name: 'Ian Malcolm',
+  name: 'Dr Ian Malcolm',
 }));
 ```
 
@@ -83,9 +83,7 @@ app.add((context: Context) => {
   context.response.headers.set('content-type', 'application/hal+json');
 
   return {
-    data: {
-      name: 'Ian Malcolm'
-    }
+    name: 'Dr Ian Malcolm'
   }
 });
 ```
@@ -114,7 +112,7 @@ app.add((_context: Context, next: CallableFunction) => {
 });
 
 app.add(() => ({
-  name: 'Ellie Sattler'
+  name: 'Dr Ellie Sattler'
 }));
 ```
 

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@raptor/framework",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "exports": "./mod.ts",
   "publish": {
     "exclude": [

src/http/context.ts

@@ -1,7 +1,7 @@
 /**
  * The context definition.
  */
-export default class Context implements Context {
+export default class Context {
   /**
    * Initialise an HTTP context.
    *

src/http/processor.ts

@@ -0,0 +1,58 @@
+// deno-lint-ignore-file no-explicit-any
+
+import type Context from "./context.ts";
+
+export default class Processor {
+  /**
+   * Initialise the HTTP processor.
+   *
+   * @param context The current HTTP context.
+   * @constructor
+   */
+  constructor(private context: Context) {}
+
+  /**
+   * Process a body into a valid Response object.
+   *
+   * @param body A body value to process.
+   * @returns A valid HTTP response object.
+   */
+  public process(body: any): Response {
+    // If the middleware provides a Response object, use it.
+    if (body instanceof Response) {
+      return body;
+    }
+
+    const hasContentType = this.context.response.headers.get("content-type");
+
+    // If the middleware returns an object, process it as JSON.
+    if (typeof body === "object") {
+      if (!hasContentType) {
+        this.context.response.headers.set("content-type", "application/json");
+      }
+
+      return new Response(JSON.stringify(body), {
+        headers: this.context.response.headers,
+      });
+    }
+
+    // If the middleware returns a string, process plain text or HTML.
+    if (typeof body === "string") {
+      const isHtml = (new RegExp(/<[a-z/][\s\S]*>/i)).test(body);
+
+      if (!hasContentType) {
+        this.context.response.headers.set("content-type", "text/plain");
+      }
+
+      if (isHtml && !hasContentType) {
+        this.context.response.headers.set("content-type", "text/html");
+      }
+
+      return new Response(body as string, {
+        headers: this.context.response.headers,
+      });
+    }
+
+    return new Response(body as string);
+  }
+}

src/kernel.ts

@@ -1,13 +1,17 @@
-// deno-lint-ignore-file no-explicit-any
-
 import Context from "./http/context.ts";
+import Processor from "./http/processor.ts";
 
 import type { Error } from "./error/interfaces/error.ts";
 
 /**
  * The root initialiser for the framework.
  */
 export default class Kernel {
+  /**
+   * The response processor for the kernel.
+   */
+  private processor: Processor;
+
   /**
    * The current HTTP context.
    */
@@ -18,11 +22,6 @@ export default class Kernel {
    */
   private middleware: CallableFunction[] = [];
 
-  /**
-   * The current middleware index.
-   */
-  private currentIndex: number = 0;
-
   /**
    * Initialise the kernel.
    *
@@ -33,6 +32,8 @@ export default class Kernel {
       new Request(Deno.env.get("APP_URL") as string),
       new Response(null),
     );
+
+    this.processor = new Processor(this.context);
   }
 
   /**
@@ -92,7 +93,7 @@ export default class Kernel {
         );
 
         if (!called) {
-          this.context.response = this.process(body);
+          this.context.response = this.processor.process(body);
         }
       }
     };
@@ -101,51 +102,6 @@ export default class Kernel {
     await execute(0);
   }
 
-  /**
-   * Process middleware into an HTTP response.
-   *
-   * @param body The response body.
-   * @returns
-   */
-  private process(body: any): Response {
-    // If the middleware provides a Response object, use it.
-    if (body instanceof Response) {
-      return body;
-    }
-
-    const hasContentType = this.context.response.headers.get("content-type");
-
-    // If the middleware returns an object, process it as JSON.
-    if (typeof body === "object") {
-      if (!hasContentType) {
-        this.context.response.headers.set("content-type", "application/json");
-      }
-
-      return new Response(JSON.stringify(body), {
-        headers: this.context.response.headers,
-      });
-    }
-
-    // If the middleware returns a string, process plain text or HTML.
-    if (typeof body === "string") {
-      const isHtml = (new RegExp(/<[a-z/][\s\S]*>/i)).test(body);
-
-      if (!hasContentType) {
-        this.context.response.headers.set("content-type", "text/plain");
-      }
-
-      if (isHtml && !hasContentType) {
-        this.context.response.headers.set("content-type", "text/html");
-      }
-
-      return new Response(body as string, {
-        headers: this.context.response.headers,
-      });
-    }
-
-    return new Response(body as string);
-  }
-
   /**
    * Handles an error and returns a response.
    *