Merge pull request #7 from momentumframework/v0.8.1

V0.8.1

core/context-accessor.ts

@@ -91,11 +91,35 @@ export class ContextAccessor {
     )) as string;
   }
 
+  /**
+   * Get a state item from the context
+   */
+  async getState(name: string) {
+    return await this.#platform.getContextItem("state", this.#context, name);
+  }
+
+  /**
+   * Get a request state item from the context
+   */
+  async getRequestState(name: string) {
+    return await this.#platform.getContextItem(
+      "requestState",
+      this.#context,
+      name,
+    );
+  }
+
   /**
    * Set a cookie on the response
    */
-  async setCookie(name: string, value: string) {
-    await this.#platform.setContextItem("cookie", this.#context, value, name);
+  async setCookie(name: string, value: string, options?: unknown) {
+    await this.#platform.setContextItem(
+      "cookie",
+      this.#context,
+      value,
+      name,
+      options,
+    );
   }
 
   /**
@@ -123,6 +147,25 @@ export class ContextAccessor {
     await this.#platform.setContextItem("status", this.#context, status);
   }
 
+  /**
+   * Set a state item on the context
+   */
+  async setState(name: string, value: unknown) {
+    await this.#platform.setContextItem("state", this.#context, value, name);
+  }
+
+  /**
+   * Set a request state item on the context
+   */
+  async setRequestState(name: string, value: unknown) {
+    await this.#platform.setContextItem(
+      "requestState",
+      this.#context,
+      value,
+      name,
+    );
+  }
+
   /**
    * Set a file as a response
    */

core/decorators/body.ts

@@ -15,5 +15,6 @@ export function Body(name: string): any;
 export function Body(name?: string) {
   return createParameterDecorator(
     async (contextAccessor) => await contextAccessor.getBody(name),
+    name ?? "body",
   );
 }

core/decorators/cookie.ts

@@ -8,5 +8,6 @@ import { createParameterDecorator } from "./create-parameter-decorator.ts";
 export function Cookie(name: string) {
   return createParameterDecorator(
     async (contextAccessor) => await contextAccessor.getCookie(name),
+    name,
   );
 }

core/decorators/create-parameter-decorator.ts

@@ -11,6 +11,7 @@ import { ValueProvider } from "../value-provider.ts";
  */
 export function createParameterDecorator(
   valueProvider?: ValueProvider,
+  name?: string,
 ): ParameterDecorator {
   return function (
     // deno-lint-ignore ban-types
@@ -28,7 +29,7 @@ export function createParameterDecorator(
       propertyKey.toString(),
       {
         index: parameterIndex,
-        name: propertyKey.toString(),
+        name,
         type: parameterType,
       },
     );

core/decorators/ctx.ts

@@ -6,5 +6,6 @@ import { createParameterDecorator } from "./create-parameter-decorator.ts";
 export function Ctx() {
   return createParameterDecorator(
     async (contextAccessor) => await contextAccessor.getContext(),
+    "ctx",
   );
 }

core/decorators/header.ts

@@ -8,5 +8,6 @@ import { createParameterDecorator } from "./create-parameter-decorator.ts";
 export function Header(name: string) {
   return createParameterDecorator(
     async (contextAccessor) => await contextAccessor.getHeader(name),
+    name,
   );
 }

core/decorators/param.ts

@@ -8,5 +8,6 @@ import { createParameterDecorator } from "./create-parameter-decorator.ts";
 export function Param(name: string) {
   return createParameterDecorator(
     async (contextAccessor) => await contextAccessor.getParameter(name),
+    name,
   );
 }

core/decorators/query.ts

@@ -8,5 +8,6 @@ import { createParameterDecorator } from "./create-parameter-decorator.ts";
 export function Query(name: string) {
   return createParameterDecorator(
     async (contextAccessor) => await contextAccessor.getQuery(name),
+    name,
   );
 }

core/decorators/req.ts

@@ -6,5 +6,6 @@ import { createParameterDecorator } from "./create-parameter-decorator.ts";
 export function Req() {
   return createParameterDecorator(
     async (contextAccessor) => await contextAccessor.getRequest(),
+    "req",
   );
 }

core/decorators/res.ts

@@ -6,5 +6,6 @@ import { createParameterDecorator } from "./create-parameter-decorator.ts";
 export function Res() {
   return createParameterDecorator(
     async (contextAccessor) => await contextAccessor.getResponse(),
+    "res",
   );
 }

core/mv-middleware.ts

@@ -1,3 +1,5 @@
+import { ContextAccessor } from "./context-accessor.ts";
+
 export type NextMiddlewareFunction = () => Promise<void>;
 
 /**
@@ -7,5 +9,8 @@ export type NextMiddlewareFunction = () => Promise<void>;
  * Middleware will be executed immediately before a request is processed.
  */
 export interface MvMiddleware {
-  execute(context: unknown, next: NextMiddlewareFunction): Promise<void>;
+  execute(
+    context: ContextAccessor,
+    next: NextMiddlewareFunction,
+  ): Promise<void>;
 }

core/platform.ts

@@ -220,17 +220,27 @@ export abstract class ServerPlatform extends Platform {
       | "body"
       | "cookie"
       | "header"
+      | "state"
+      | "requestState"
       | "request"
       | "response",
     context: unknown,
     identifier?: unknown,
   ): Promise<unknown>;
 
   abstract setContextItem(
-    kind: "body" | "status" | "cookie" | "header" | "status",
+    kind:
+      | "body"
+      | "status"
+      | "cookie"
+      | "header"
+      | "status"
+      | "state"
+      | "requestState",
     context: unknown,
     value: unknown,
     identifier?: unknown,
+    options?: unknown,
   ): void | Promise<void>;
 
   abstract sendFile(context: unknown, path: string): void | Promise<void>;

core/server-controller.ts

@@ -256,15 +256,6 @@ export class ServerController {
 
   private async handleError(err: unknown, contextAccessor: ContextAccessor) {
     this.#logger.error(err, "An unhandled exception occurred");
-    for (const handler of this.getGlobalErrorHandlers()) {
-      try {
-        const result = await handler(err, contextAccessor);
-        if (result && result.handled) {
-          return;
-        }
-        // deno-lint-ignore no-empty
-      } catch {}
-    }
     if (err instanceof ServerException) {
       try {
         let content: string;
@@ -284,6 +275,15 @@ export class ServerController {
         // deno-lint-ignore no-empty
       } catch {}
     }
+    for (const handler of this.getGlobalErrorHandlers()) {
+      try {
+        const result = await handler(err, contextAccessor);
+        if (result && result.handled) {
+          return;
+        }
+        // deno-lint-ignore no-empty
+      } catch {}
+    }
     contextAccessor.setBody("An unknown error occurred");
     contextAccessor.setHeader("Content-Type", "text/plain");
     contextAccessor.setStatus(500);

mvc/mvc-filter.ts

@@ -1,5 +1,6 @@
 import {
   ActionMetadata,
+  ActionResult,
   ContextAccessor,
   ControllerMetadata,
   Injectable,
@@ -20,6 +21,9 @@ export class MvcFilter implements MvFilter {
     actionMetadata?: ActionMetadata,
   ): Promise<unknown> {
     const model = await next();
+    if (model instanceof ActionResult) {
+      return model;
+    }
     if (!controllerMetadata || !actionMetadata) {
       return model;
     }

platform-oak/platform-oak.ts

@@ -74,7 +74,6 @@ export class OakPlatform extends ServerPlatform {
   }
 
   async postBootstrap() {
-    this.#app.use(this.#router.routes());
     this.#app.addEventListener("listen", ({ hostname, port, secure }) => {
       this.logger.log([
         `PlatformOak listening on `,
@@ -84,6 +83,7 @@ export class OakPlatform extends ServerPlatform {
       ].join(""));
     });
     await super.postBootstrap();
+    this.#app.use(this.#router.routes());
   }
 
   addRouteHandler(
@@ -139,6 +139,8 @@ export class OakPlatform extends ServerPlatform {
       | "body"
       | "cookie"
       | "header"
+      | "state"
+      | "requestState"
       | "request"
       | "response",
     context: RouterContext,
@@ -173,6 +175,18 @@ export class OakPlatform extends ServerPlatform {
         return context.cookies.get(identifier);
       case "header":
         return context.request.headers.get(identifier);
+      case "state":
+        return context.state[identifier];
+      case "requestState": {
+        const request = context.request as unknown as {
+          __state: Record<string, unknown>;
+        };
+        let state = request.__state;
+        if (!state) {
+          return;
+        }
+        return state[identifier];
+      }
       case "request":
         return context.request;
       case "response":
@@ -183,12 +197,14 @@ export class OakPlatform extends ServerPlatform {
   }
 
   setContextItem(
-    kind: "body" | "status" | "cookie" | "header",
+    kind: "body" | "status" | "cookie" | "header" | "state" | "requestState",
     context: RouterContext,
     // deno-lint-ignore no-explicit-any
     value: any,
     // deno-lint-ignore no-explicit-any
     identifier?: any,
+    // deno-lint-ignore no-explicit-any
+    options?: any,
   ) {
     switch (kind) {
       case "body":
@@ -198,11 +214,25 @@ export class OakPlatform extends ServerPlatform {
         context.response.status = value;
         break;
       case "cookie":
-        context.cookies.set(identifier, value);
+        context.cookies.set(identifier, value, options);
         break;
       case "header":
         context.response.headers.set(identifier, value);
         break;
+      case "state":
+        context.state[identifier] = value;
+        break;
+      case "requestState": {
+        const request = context.request as unknown as {
+          __state: Record<string, unknown>;
+        };
+        let state = request.__state;
+        if (!state) {
+          state = {};
+          request.__state = state;
+        }
+        state[identifier] = value;
+      }
     }
   }
 

static-files/static-file.module.ts

@@ -16,7 +16,7 @@ import { StaticFilesConfig } from "./static-files-config.ts";
   providers: [StaticFileMiddleware],
 })
 export class StaticFileModule {
-  static register(config: StaticFilesConfig): DynamicModule {
+  static register(config: Partial<StaticFilesConfig>): DynamicModule {
     return {
       type: StaticFileModule,
       providers: [