@webtypen/webframez-core 0.3.29 → 0.3.30

package/README.md

@@ -1,207 +1,422 @@
-# webtypen webframez Docs
+# @webtypen/webframez-core
 
-## Controller
+TypeScript-first backend framework core for Node.js.
 
-### Register a controller
+This README reflects the current API in this repository and focuses on:
+- Routing
+- Datatables
+- DataBuilder
+- Console Commands
+- Queue and Jobs
 
-A new controller is registered via the `controller` attribute in `app/Kernel.ts`. Just add a new entry for the controller to the object. The key of the object is the unique name of the controller, this is used again when connecting routes.
+## Requirements
 
-The controllers are initialized once when the web service is started. When calling a route, a single controller instance is created per request and thrown away after the request finishes.
+- Node.js `>= 20` (recommended)
+- TypeScript for development
 
-## Routing
+## Installation
 
-### Register a route
+```bash
+npm i @webtypen/webframez-core
+```
 
-Routes are managed via the app/routes.ts. Routes can be registered and configured with the Route Facade. Routes can be associated strictly with a request method (GET, POST, PUT, DELETE) or all request methods (ANY):
+## Basic Web Setup
 
 ```ts
-Route.get("/", "TestController@test");
-Route.post("/test2", "TestController@test");
-Route.put("/test2", "TestController@test");
-Route.delete("/test2", "TestController@test");
-Route.any("/test2", "TestController@test");
+import { BaseKernelWeb, Request, Response, Route, WebApplication } from "@webtypen/webframez-core";
+
+class Kernel extends BaseKernelWeb {
+  static controller = {
+    TestController: class {
+      async index(req: Request, res: Response) {
+        return res.send({ status: "ok" });
+      }
+    }
+  };
+
+  static middleware = {
+    auth: async (next: Function, reject: Function, req: Request, res: Response) => {
+      const isAllowed = true;
+      if (!isAllowed) {
+        return reject(new Error("Unauthorized"));
+      }
+      next(true);
+    }
+  };
+}
+
+const app = new WebApplication();
+app.boot({
+  kernel: Kernel,
+  port: 3000,
+  basename: null,
+  routesFunction: () => {
+    Route.get("/", "TestController@index");
+  }
+});
 ```
 
-The URL path is specified in the first parameter. The second parameter connects the route to a controller method. A previously registered controller can be connected using the syntax `[CONTROLLER]@[METHODE]`.
+`WebApplication.boot(...)` supports:
+- `kernel`
+- `port`
+- `basename`
+- `routesFunction`
+- `modules`
+- `config`
+- `datatables`
+- `jobs`
+- `mode`
+- `onBoot`
 
-Alternatively, a function can be specified directly or a previously imported one can be used:
+## Routing
+
+### Register Routes
 
 ```ts
-// Directly
-Route.get("/", (req: Request, res: Response) => res.send({ status: "success" }));
+Route.get("/", "HomeController@index");
+Route.post("/login", "AuthController@login");
+Route.put("/users/:id", "UserController@update");
+Route.delete("/users/:id", "UserController@delete");
+```
+
+You can also register inline handlers:
 
-// Imported
-import { myFunction } from "./myfunction";
-Route.get("/", myFunction);
+```ts
+Route.get("/health", (req: Request, res: Response) => {
+  return res.send({ status: "ok" });
+});
 ```
 
-### Register a middleware
+### Path Parameters and Wildcards
 
-Middleware functions are also registered in `app/Kernel.ts.` A middleware function can be associated with one or more routes. When calling these routes, the middleware function is called before executing the route logic. In this function, the request can be continued or aborted, for example, authorization rules can be implemented and easily reused for multiple routes.
+Supported path patterns:
+- Required parameter: `/:id`
+- Optional parameter: `/:id?`
+- Single wildcard: `/*`
+- Catch-all wildcard: `/**`
 
-Middleware functions are usually created under `app/Middleware`. A middleware function is called with the parameters (next, abort, req and res):
+Matched values are available in `req.params`.
 
--   `next`: Function that signals when called that the request may be continued
--   `abort`: Function that aborts the request when called. An HTTP status code can be specified in the first parameter and a request body (usually text or JSON) in the second.
--   `req`: The Request-Object
--   `res`: The Response-Object
+### Route Groups
 
-Alternatively, middleware functions can also be defined directly in Kernel.ts:
+```ts
+Route.group({ prefix: "/admin", middleware: ["auth"] }, () => {
+  Route.get("/dashboard", "AdminController@dashboard");
+
+  Route.group({ prefix: "/users" }, () => {
+    Route.get("/:id", "AdminUserController@details");
+  });
+});
+```
+
+### Route Middleware
+
+Attach middleware by key via route options:
 
 ```ts
-static middleware: { [key: string]: any } = {
-  auth: async (next: any, abort: any, req: Request, res: Response) => {
-    console.log("auth-middleware");
-    next();
-  },
-};
+Route.get("/me", "AccountController@me", { middleware: ["auth"] });
 ```
 
-A route can be connected to several middleware functions, which are called one after the other but before executing the route logic.
+Middleware signature:
 
-### Connect a route with a middleware
+```ts
+(next, reject, req, res) => {
+  // allow:
+  next(true);
 
-When registering a route, a configuration object can be passed in the third parameter. This can contain an array with middleware keys in the `middleware` parameter. The middlewares specified here are executed prior to executing the route logic when invoking this route. If a specified middleware aborts the request, it will not be executed:
+  // abort with error:
+  // reject(new Error("Forbidden"));
+}
+```
+
+### Extend the Route Facade
+
+You can add custom route registration helpers:
 
 ```ts
-Route.get("/auth-data", "AuthController@authData", { middleware: ["auth"] });
+Route.extend("jsonGet", (route) => {
+  return (path: string, component: any, options?: any) => {
+    route.get(path, async (req: Request, res: Response) => {
+      res.header("Content-Type", "application/json");
+      return component(req, res);
+    }, options);
+  };
+});
+
+(Route as any).jsonGet("/x", (req: Request, res: Response) => res.send({ ok: true }));
 ```
 
-### Group routes
+## Request and Response
+
+### Request
 
-With the grouping of routes, the code of the application can be significantly reduced and kept clear. Here's how the following configurations can be used with a multiple route definition:
+`Request` includes:
+- `method`, `url`, `headers`, `rawHeaders`
+- `body`, `bodyPlain`
+- `query`, `queryRaw`
+- `params`
+- `files`
+- `message` (native `IncomingMessage`)
 
--   `prefix`: A route path prefix used for all routes in this group:
+### Response
+
+Common helpers:
 
 ```ts
-Route.group({ prefix: "/admin", () => {
-    Route.get("/dashboard", "AdminDashboardController@data");
-    // Path for this route would be: /admin/dashboard
-}});
+res.status(201);
+res.header("X-Test", "1");
+res.send({ status: "success" });
 ```
 
--   `middleware`: An array of middleware-keys used for all routes in this group:
+Also available:
+- `sendCsv(...)`
+- `download(filepath, options?)`
+- `stream(req, filepath, filename, mimeType)`
+- `registerEvent("after", fn)`
+
+## Datatables
+
+Use `Datatable` + `DatatableRegistry` + `DatatableController`.
+
+### Define a Datatable
 
 ```ts
-Route.group({ middleware: ["auth"], () => {
-    // Route with middleware auth
-    Route.get("/auth-data", "AuthController@authData");
+import { Datatable, Request } from "@webtypen/webframez-core";
+
+export class UsersTable extends Datatable {
+  collection = "users";
+  perPage = 25;
 
-    // Route with middleware auth and admin
-    Route.get("/dashboard", "AdminDashboardController@data", { middleware: ["admin"] });
-}});
+  columns = {
+    name: { label: "Name" },
+    email: { label: "E-Mail" }
+  };
+
+  filter = {
+    name: { type: "text", mapping: "name" }
+  };
+
+  aggregation = async (req: Request) => {
+    return [{ $sort: { created_at: -1 } }];
+  };
+}
+```
+
+### Register Datatables
+
+```ts
+app.boot({
+  // ...
+  datatables: {
+    users: UsersTable
+  }
+});
 ```
 
-The configuration parameters of a route group can of course be combined with each other.
+### Datatable Endpoints
 
-Nesting of the route groups is also possible:
+Use `DatatableController` in your routes:
 
 ```ts
-Route.group({ prefix: "/test" }, () => {
-    Route.get("/", "TestController@test"); // Path: /test/
-    Route.get("/test2", "TestController@test"); // Path: /test2/
+import { DatatableController, Route } from "@webtypen/webframez-core";
 
-    Route.group({ middleware: ["auth"], prefix: "/auth" }, () => {
-        Route.get("/data", "AuthController@data"); // Path: /test/auth/data; Middleware: auth
-    });
-});
+Route.post("/api/datatable", "DatatableController@restApi");
+Route.post("/api/datatable/export", "DatatableController@tableExport");
 ```
 
-## Database
+`restApi` supports:
+- init requests (`init_request`)
+- paginated data
+- selectable functions (`apiFunction`)
 
-### Connect
+`tableExport` uses your table `exports` definition.
 
-The application can handle multiple database connections, but one is defined as the default connection and is automatically used by the system if models and database requests are not explicitly executed over another connection.
+## DataBuilder
 
-The connections are configured in the `config/database.ts` file. Each connection is given a unique key in the `connections` object and uses a driver. The following drivers are currently available:
+Use `DataBuilder` + `DataBuilderController` for schema-driven CRUD flows.
 
--   MongoDB Driver
+### Define and Register Types
 
-Depending on the driver, the database connection must be configured with different parameters.
+```ts
+import { DataBuilder } from "@webtypen/webframez-core";
+
+const builder = new DataBuilder();
+
+builder.registerType({
+  key: "user",
+  singular: "User",
+  plural: "Users",
+  schema: {
+    version: "1.0.0",
+    collection: "users",
+    fields: {
+      email: { type: "text", required: true, unique: { match: {} } },
+      age: { type: "integer" }
+    }
+  }
+});
+```
+
+You can also use:
+- `registerModelType(...)`
+- `registerFieldType(...)`
 
-**MongoDB Connection example:**
+### Expose the REST API
 
 ```ts
-export default {
-    defaultConnection: "default",
-    connections: {
-        ["default"]: {
-            driver: "mongodb",
-            url: "mongodb://...",
-        },
-    },
-};
+import { DataBuilderController, Route } from "@webtypen/webframez-core";
+
+class MyDataBuilderController extends DataBuilderController {
+  constructor() {
+    super(builder);
+  }
+}
+
+// Register controller in kernel, then:
+Route.post("/api/builder", "MyDataBuilderController@restApi");
 ```
 
-### Model
-
-Models are usually placed under `app/Models`. Each model class inherits from `Model` and must store the table / collection name, in which the models data sets are stored, in the `__table` attribute.
-
-```ts
-import { Model, hasMany, QueryBuilder } from "@webtypen/webframez-core";
-import { File } from "./File";
-import { Session } from "./Session";
-import { CustomerGroups } from "./CustomerGroups";
-
-export class User extends Model {
-    __table = "users";
-
-    /**
-     * @param File                 Dependency Model
-     * @param foreignKey
-     * @param localKey             (optional)
-     * @param queryBuilderFunction (optional) customize the query
-     **/
-    @hasOne(() => File, "_user_avatar", "_id", (query: QueryBuilder) => {
-        query.where("status", "=", "uploaded");
-    })
-    avatar!: () => File;
-
-    /**
-     * @param Session              Dependency Model
-     * @param foreignKey
-     * @param localKey             (optional)
-     * @param queryBuilderFunction (optional) customize the query
-     **/
-    @hasMany(() => Session, "_user")
-    sessions!: () => Session[];
-
-    /**
-     * @param CustomerGroups       Dependency Model
-     * @param foreignKey
-     * @param localKey             (optional)
-     * @param queryBuilderFunction (optional) customize the query
-     **/
-    @hasManyArray(() => CustomerGroups, "_groups")
-    groups!: () => CustomerGroups[];
+`__builder_rest_api` actions:
+- `type`
+- `details`
+- `details-newdata`
+- `save`
+- `delete`
+- `api-autocomplete`
+
+## Console Commands
+
+Use `ConsoleApplication` with `BaseKernelConsole`.
+
+```ts
+import { BaseKernelConsole, ConsoleApplication, ConsoleCommand } from "@webtypen/webframez-core";
+
+class HelloCommand extends ConsoleCommand {
+  static signature = "hello";
+  static description = "Print a greeting";
+
+  async handle() {
+    this.success("Hello world");
+  }
+}
+
+class KernelConsole extends BaseKernelConsole {
+  static commands = [HelloCommand];
 }
+
+const app = new ConsoleApplication();
+app.boot({
+  kernel: KernelConsole,
+  config: {}
+});
 ```
 
-### Load a model
+`ConsoleCommand` helpers include:
+- `getArguments()`, `getOptions()`, `getOption(...)`
+- `ask(...)`
+- `write`, `writeln`, `info`, `warning`, `success`, `error`
+- progress helpers (`progress`, `progressIncrement`, `progressFinish`)
+
+## Queue and Jobs
+
+Queue workers run through console commands and use `queue_jobs` storage.
+
+### Create a Job
 
 ```ts
-import { User } from "../Models/User";
+import { BaseQueueJob } from "@webtypen/webframez-core";
+
+export class SendMailJob extends BaseQueueJob {
+  async handle(job: any) {
+    this.log("Sending mail", job.payload);
+    // do work...
+
+    // optional delayed re-run:
+    // return this.executeAgain(5, "minutes");
+  }
+}
+```
 
-const users = await User.where("is_active", "=", true).get();
-const testUser = await User.where("email", "=", "test@test.de").where("is_active", "=", true).first();
+Create a new queue entry:
+
+```ts
+await SendMailJob.create({
+  payload: { userId: "..." },
+  priority: 5,
+  worker: null
+});
 ```
 
-#### Dependency Injection
+### Register Jobs
 
 ```ts
-const sessions = await testUser.session();
-const avatarUrl = await testUser.avatar()?.url;
-const customerGroups = await testUser.groups();
+app.boot({
+  // ConsoleApplication or WebApplication
+  jobs: [SendMailJob]
+});
 ```
 
-##### Disable cache / force dependency-reload:
+### Queue Config
+
+Configure workers in `config.queue`:
 
 ```ts
-const refreshedData = await testUser.session({ force: true });
+export default {
+  workers: {
+    default: {
+      is_active: true,
+      jobclasses: ["SendMailJob"],
+      automation: [
+        {
+          jobclass: "SendMailJob",
+          executions: [
+            ["every_x_mins", 15],
+            ["daily", "08:00"],
+            ["every_hour", 5],
+            ["mondays", "09:30"]
+          ]
+        }
+      ]
+    }
+  }
+};
 ```
 
-##### Get dependency-query:
+### Built-in Queue Commands
+
+- `queue:start`
+- `queue:status`
+- `queue:stop`
+- `queue:log`
+- `queue:worker`
+- `queue:worker:autorestart`
+
+Additional built-in command:
+- `build`
+
+## Modules
+
+You can load module providers via `modules` in `WebApplication.boot(...)`.
+
+A module provider can:
+- register controllers/middleware
+- define `boot()`
+- define `routes()`
+
+## Lambda Mode
+
+`LambdaApplication` uses the same router in AWS Lambda mode:
 
 ```ts
-const oldSessions = await testUser.session({ query: true }).where("date", "<", moment().subtract(30, "days").format("YYYY-MM-DD")).get();
+import { LambdaApplication } from "@webtypen/webframez-core";
+
+const app = new LambdaApplication();
+export const handler = (event: any, context: any) => {
+  return app.boot(event, context, {
+    kernel: Kernel,
+    routesFunction: () => {
+      Route.get("/status", (req, res) => res.send({ ok: true }));
+    }
+  });
+};
 ```

package/dist/Router/Route.d.ts

@@ -1,6 +1,16 @@
+type RouteRegistrationOptions = {
+    [key: string]: any;
+};
+type RouteExtensionFactory = (route: RouteFacade) => (...args: any[]) => any;
 export declare class RouteFacade {
     tempGroupPrefix: string | null;
     tempGroupMiddleware: string[] | null;
+    private registerWithGroupContext;
+    /**
+     * Register a custom route-method on the Route facade.
+     * Allows optional packages to add framework-specific route helpers.
+     */
+    extend(name: string, factory: RouteExtensionFactory): this;
     /**
      * Register a GET-Method
      *
@@ -8,9 +18,7 @@ export declare class RouteFacade {
      * @param component
      * @param options
      */
-    get(path: string, component: any, options?: {
-        [key: string]: any;
-    }): void;
+    get(path: string, component: any, options?: RouteRegistrationOptions): void;
     /**
      * Register a POST-Method
      *
@@ -18,9 +26,7 @@ export declare class RouteFacade {
      * @param component
      * @param options
      */
-    post(path: string, component: any, options?: {
-        [key: string]: any;
-    }): void;
+    post(path: string, component: any, options?: RouteRegistrationOptions): void;
     /**
      * Register a PUT-Method
      *
@@ -28,9 +34,7 @@ export declare class RouteFacade {
      * @param component
      * @param options
      */
-    put(path: string, component: any, options?: {
-        [key: string]: any;
-    }): void;
+    put(path: string, component: any, options?: RouteRegistrationOptions): void;
     /**
      * Register a DELETE-Method
      *
@@ -38,11 +42,10 @@ export declare class RouteFacade {
      * @param component
      * @param options
      */
-    delete(path: string, component: any, options?: {
-        [key: string]: any;
-    }): void;
+    delete(path: string, component: any, options?: RouteRegistrationOptions): void;
     group(config: {
         [key: string]: any;
     }, children: any): void;
 }
 export declare const Route: RouteFacade;
+export {};

package/dist/Router/Route.js

@@ -6,6 +6,32 @@ class RouteFacade {
     constructor() {
         this.tempGroupPrefix = null;
         this.tempGroupMiddleware = null;
+        this.registerWithGroupContext = (method, path, component, options) => {
+            Router_1.Router.register(method, (this.tempGroupPrefix ? this.tempGroupPrefix : "") + path, component, options || this.tempGroupMiddleware
+                ? Object.assign(Object.assign({}, (options ? options : {})), { middleware: this.tempGroupMiddleware || (options && options.middleware)
+                        ? [
+                            ...(this.tempGroupMiddleware ? this.tempGroupMiddleware : []),
+                            ...(options && options.middleware ? options.middleware : []),
+                        ]
+                        : null }) : {});
+        };
+    }
+    /**
+     * Register a custom route-method on the Route facade.
+     * Allows optional packages to add framework-specific route helpers.
+     */
+    extend(name, factory) {
+        if (!name || name.trim() === "") {
+            throw new Error("Route.extend requires a non-empty method name");
+        }
+        if (name in this && typeof this[name] === "function") {
+            throw new Error("Route method '" + name + "' already exists");
+        }
+        if (!factory || typeof factory !== "function") {
+            throw new Error("Route.extend requires a factory function");
+        }
+        this[name] = factory(this);
+        return this;
     }
     /**
      * Register a GET-Method
@@ -15,13 +41,7 @@ class RouteFacade {
      * @param options
      */
     get(path, component, options) {
-        Router_1.Router.register("GET", (this.tempGroupPrefix ? this.tempGroupPrefix : "") + path, component, options || this.tempGroupMiddleware
-            ? Object.assign(Object.assign({}, (options ? options : {})), { middleware: this.tempGroupMiddleware || (options && options.middleware)
-                    ? [
-                        ...(this.tempGroupMiddleware ? this.tempGroupMiddleware : []),
-                        ...(options && options.middleware ? options.middleware : []),
-                    ]
-                    : null }) : {});
+        this.registerWithGroupContext("GET", path, component, options);
     }
     /**
      * Register a POST-Method
@@ -31,13 +51,7 @@ class RouteFacade {
      * @param options
      */
     post(path, component, options) {
-        Router_1.Router.register("POST", (this.tempGroupPrefix ? this.tempGroupPrefix : "") + path, component, options || this.tempGroupMiddleware
-            ? Object.assign(Object.assign({}, (options ? options : {})), { middleware: this.tempGroupMiddleware || (options && options.middleware)
-                    ? [
-                        ...(this.tempGroupMiddleware ? this.tempGroupMiddleware : []),
-                        ...(options && options.middleware ? options.middleware : []),
-                    ]
-                    : null }) : {});
+        this.registerWithGroupContext("POST", path, component, options);
     }
     /**
      * Register a PUT-Method
@@ -47,13 +61,7 @@ class RouteFacade {
      * @param options
      */
     put(path, component, options) {
-        Router_1.Router.register("PUT", (this.tempGroupPrefix ? this.tempGroupPrefix : "") + path, component, options || this.tempGroupMiddleware
-            ? Object.assign(Object.assign({}, (options ? options : {})), { middleware: this.tempGroupMiddleware || (options && options.middleware)
-                    ? [
-                        ...(this.tempGroupMiddleware ? this.tempGroupMiddleware : []),
-                        ...(options && options.middleware ? options.middleware : []),
-                    ]
-                    : null }) : {});
+        this.registerWithGroupContext("PUT", path, component, options);
     }
     /**
      * Register a DELETE-Method
@@ -63,13 +71,7 @@ class RouteFacade {
      * @param options
      */
     delete(path, component, options) {
-        Router_1.Router.register("DELETE", (this.tempGroupPrefix ? this.tempGroupPrefix : "") + path, component, options || this.tempGroupMiddleware
-            ? Object.assign(Object.assign({}, (options ? options : {})), { middleware: this.tempGroupMiddleware || (options && options.middleware)
-                    ? [
-                        ...(this.tempGroupMiddleware ? this.tempGroupMiddleware : []),
-                        ...(options && options.middleware ? options.middleware : []),
-                    ]
-                    : null }) : {});
+        this.registerWithGroupContext("DELETE", path, component, options);
     }
     group(config, children) {
         // Handle group prefix

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webtypen/webframez-core",
-    "version": "0.3.29",
+    "version": "0.3.30",
     "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
     "homepage": "https://webtypen.de/",
     "license": "MIT",

package/src/Router/Route.ts

@@ -1,19 +1,22 @@
 import { Router } from "./Router";
 
+type RouteRegistrationOptions = { [key: string]: any };
+type RouteRegistrationHandler = (
+    method: string,
+    path: string,
+    component: any,
+    options?: RouteRegistrationOptions
+) => void;
+
+type RouteExtensionFactory = (route: RouteFacade) => (...args: any[]) => any;
+
 export class RouteFacade {
     tempGroupPrefix: string | null = null;
     tempGroupMiddleware: string[] | null = null;
 
-    /**
-     * Register a GET-Method
-     *
-     * @param path
-     * @param component
-     * @param options
-     */
-    get(path: string, component: any, options?: { [key: string]: any }) {
+    private registerWithGroupContext: RouteRegistrationHandler = (method, path, component, options) => {
         Router.register(
-            "GET",
+            method,
             (this.tempGroupPrefix ? this.tempGroupPrefix : "") + path,
             component,
             options || this.tempGroupMiddleware
@@ -29,6 +32,38 @@ export class RouteFacade {
                   }
                 : {}
         );
+    };
+
+    /**
+     * Register a custom route-method on the Route facade.
+     * Allows optional packages to add framework-specific route helpers.
+     */
+    extend(name: string, factory: RouteExtensionFactory) {
+        if (!name || name.trim() === "") {
+            throw new Error("Route.extend requires a non-empty method name");
+        }
+
+        if (name in this && typeof (this as any)[name] === "function") {
+            throw new Error("Route method '" + name + "' already exists");
+        }
+
+        if (!factory || typeof factory !== "function") {
+            throw new Error("Route.extend requires a factory function");
+        }
+
+        (this as any)[name] = factory(this);
+        return this;
+    }
+
+    /**
+     * Register a GET-Method
+     *
+     * @param path
+     * @param component
+     * @param options
+     */
+    get(path: string, component: any, options?: RouteRegistrationOptions) {
+        this.registerWithGroupContext("GET", path, component, options);
     }
 
     /**
@@ -38,24 +73,8 @@ export class RouteFacade {
      * @param component
      * @param options
      */
-    post(path: string, component: any, options?: { [key: string]: any }) {
-        Router.register(
-            "POST",
-            (this.tempGroupPrefix ? this.tempGroupPrefix : "") + path,
-            component,
-            options || this.tempGroupMiddleware
-                ? {
-                      ...(options ? options : {}),
-                      middleware:
-                          this.tempGroupMiddleware || (options && options.middleware)
-                              ? [
-                                    ...(this.tempGroupMiddleware ? this.tempGroupMiddleware : []),
-                                    ...(options && options.middleware ? options.middleware : []),
-                                ]
-                              : null,
-                  }
-                : {}
-        );
+    post(path: string, component: any, options?: RouteRegistrationOptions) {
+        this.registerWithGroupContext("POST", path, component, options);
     }
 
     /**
@@ -65,24 +84,8 @@ export class RouteFacade {
      * @param component
      * @param options
      */
-    put(path: string, component: any, options?: { [key: string]: any }) {
-        Router.register(
-            "PUT",
-            (this.tempGroupPrefix ? this.tempGroupPrefix : "") + path,
-            component,
-            options || this.tempGroupMiddleware
-                ? {
-                      ...(options ? options : {}),
-                      middleware:
-                          this.tempGroupMiddleware || (options && options.middleware)
-                              ? [
-                                    ...(this.tempGroupMiddleware ? this.tempGroupMiddleware : []),
-                                    ...(options && options.middleware ? options.middleware : []),
-                                ]
-                              : null,
-                  }
-                : {}
-        );
+    put(path: string, component: any, options?: RouteRegistrationOptions) {
+        this.registerWithGroupContext("PUT", path, component, options);
     }
 
     /**
@@ -92,30 +95,15 @@ export class RouteFacade {
      * @param component
      * @param options
      */
-    delete(path: string, component: any, options?: { [key: string]: any }) {
-        Router.register(
-            "DELETE",
-            (this.tempGroupPrefix ? this.tempGroupPrefix : "") + path,
-            component,
-            options || this.tempGroupMiddleware
-                ? {
-                      ...(options ? options : {}),
-                      middleware:
-                          this.tempGroupMiddleware || (options && options.middleware)
-                              ? [
-                                    ...(this.tempGroupMiddleware ? this.tempGroupMiddleware : []),
-                                    ...(options && options.middleware ? options.middleware : []),
-                                ]
-                              : null,
-                  }
-                : {}
-        );
+    delete(path: string, component: any, options?: RouteRegistrationOptions) {
+        this.registerWithGroupContext("DELETE", path, component, options);
     }
 
     group(config: { [key: string]: any }, children: any) {
         // Handle group prefix
         const tempGroupPrefixBefore = this.tempGroupPrefix ? this.tempGroupPrefix + "" : null;
-        const tempGroupMiddlewareBefore = this.tempGroupMiddleware && this.tempGroupMiddleware.length > 0 ? this.tempGroupMiddleware : null;
+        const tempGroupMiddlewareBefore =
+            this.tempGroupMiddleware && this.tempGroupMiddleware.length > 0 ? this.tempGroupMiddleware : null;
         if (config && config.prefix && config.prefix.trim() !== "") {
             this.tempGroupPrefix = (this.tempGroupPrefix ? this.tempGroupPrefix : "") + config.prefix;
         }