@webtypen/webframez-core 0.3.11 → 0.3.13

package/dev/app.ts

@@ -6,6 +6,7 @@ import { BaseKernelWeb } from "../src/BaseKernelWeb";
 import { Route } from "../src/Router/Route";
 import { Request } from "../src/Router/Request";
 import { Response } from "../src/Router/Response";
+import { MODULES } from "./modules";
 
 class Kernel extends BaseKernelWeb {
     static controller: { [key: string]: any } = {};
@@ -21,7 +22,14 @@ app.boot({
     },
     port: process.env.PORT ? process.env.PORT : 3000,
     basename: process.env.BASENAME ? process.env.BASENAME : null,
+    modules: MODULES,
     routesFunction: () => {
+        Route.get("/status", (req: Request, res: Response) => {
+            res.send({
+                message: "Seems to run ;)",
+            });
+        });
+
         Route.group({ prefix: "/main", middleware: [] }, () => {
             Route.group({ prefix: "/test", middleware: [] }, () => {
                 Route.get("/:test/details", (req: Request, res: Response) => {

package/dev/modules/index.ts

@@ -0,0 +1,3 @@
+import { TestModuleProvider } from "./test-module/TestModuleProvider";
+
+export const MODULES = [TestModuleProvider];

package/dev/modules/test-module/Controller/TestModuleController.ts

@@ -0,0 +1,8 @@
+import { Request } from "../../../../src/Router/Request";
+import { Response } from "../../../../src/Router/Response";
+
+export class TestModuleController {
+    async test(req: Request, res: Response) {
+        res.send({ status: "success", message: "TestModuleController looks great ..." });
+    }
+}

package/dev/modules/test-module/TestModuleProvider.ts

@@ -0,0 +1,30 @@
+import { ModuleProvider } from "../../../src/Modules/ModuleProvider";
+import { Request } from "../../../src/Router/Request";
+import { Response } from "../../../src/Router/Response";
+import { Route } from "../../../src/Router/Route";
+import { TestModuleController } from "./Controller/TestModuleController";
+
+export class TestModuleProvider extends ModuleProvider {
+    static key = "test-module";
+
+    controller = {
+        TestModuleController: TestModuleController,
+    };
+
+    routes() {
+        Route.group({ middleware: [] }, () => {
+            Route.get("/", (req: Request, res: Response) => {
+                res.send({
+                    module: "TestModule",
+                    status: "active",
+                });
+            });
+
+            Route.get("/testmodule", "TestModuleController@test");
+        });
+    }
+
+    boot() {
+        console.log("On Booot");
+    }
+}

package/dist/DataBuilder/DataBuilder.d.ts

@@ -69,10 +69,7 @@ export declare class DataBuilder {
         data?: undefined;
     } | {
         status: string;
-        data: {
-            _id: any;
-            redirect: any;
-        };
+        data: any;
         errors?: undefined;
     }>;
     delete(db: any, req: any): Promise<{

package/dist/DataBuilder/DataBuilder.js

@@ -366,9 +366,13 @@ class DataBuilder {
                 };
             }
             if (type.unmapped) {
+                const appendData = {};
                 try {
                     if (typeof type.schema.beforeSave === "function") {
-                        yield type.schema.beforeSave(req.body.data, req);
+                        const result = yield type.schema.beforeSave(req.body.data, req);
+                        if (result && result.__append_data) {
+                            Object.assign(appendData, result.__append_data);
+                        }
                     }
                 }
                 catch (e) {
@@ -376,7 +380,10 @@ class DataBuilder {
                 }
                 try {
                     if (typeof type.schema.afterSave === "function") {
-                        yield type.schema.afterSave(req.body.data, req);
+                        const result = yield type.schema.afterSave(req.body.data, req);
+                        if (result && result.__append_data) {
+                            Object.assign(appendData, result.__append_data);
+                        }
                     }
                 }
                 catch (e) {
@@ -389,10 +396,7 @@ class DataBuilder {
                 }
                 return {
                     status: "success",
-                    data: {
-                        _id: req.body.data._id ? req.body.data._id : "__unmapped",
-                        redirect: redirect,
-                    },
+                    data: Object.assign({ _id: req.body.data._id ? req.body.data._id : "__unmapped", redirect: redirect }, appendData),
                 };
             }
             if (!req.body.__builder_id || req.body.__builder_id.toString().trim() === "") {

package/dist/Modules/ModuleProvider.d.ts

@@ -0,0 +1,12 @@
+export declare class ModuleProvider {
+    static key: string;
+    controller: {
+        [key: string]: any;
+    };
+    middleware: {
+        [key: string]: any;
+    };
+    boot(): void;
+    routes(): void;
+    bootByRouter(): void;
+}

package/dist/Modules/ModuleProvider.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModuleProvider = void 0;
+class ModuleProvider {
+    constructor() {
+        this.controller = {};
+        this.middleware = {};
+    }
+    boot() { }
+    routes() { }
+    bootByRouter() {
+        this.boot();
+        this.routes();
+    }
+}
+exports.ModuleProvider = ModuleProvider;
+ModuleProvider.key = "example-module";

package/dist/Modules/ModulesLoader.d.ts

@@ -0,0 +1,6 @@
+export declare class ModulesLoader {
+    private loadedModules;
+    load(modules: any[]): void;
+    initRoutes(): void;
+    loadKernel(kernel: any): void;
+}

package/dist/Modules/ModulesLoader.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModulesLoader = void 0;
+class ModulesLoader {
+    constructor() {
+        this.loadedModules = {};
+    }
+    load(modules) {
+        for (let modClass of modules) {
+            if (!modClass || !modClass.key || modClass.disabled === true)
+                continue;
+            this.loadedModules[modClass.key] = new modClass();
+            this.loadedModules[modClass.key].boot();
+        }
+    }
+    initRoutes() {
+        for (let key in this.loadedModules) {
+            this.loadedModules[key].routes();
+        }
+    }
+    loadKernel(kernel) {
+        if (!kernel)
+            return;
+        for (let key in this.loadedModules) {
+            if (this.loadedModules[key].controller) {
+                for (let ctrlKey in this.loadedModules[key].controller) {
+                    kernel.controller[ctrlKey] = this.loadedModules[key].controller[ctrlKey];
+                }
+                for (let mwKey in this.loadedModules[key].middleware) {
+                    kernel.middleware[mwKey] = this.loadedModules[key].middleware[mwKey];
+                }
+            }
+        }
+    }
+}
+exports.ModulesLoader = ModulesLoader;

package/dist/Router/Router.js

@@ -191,10 +191,12 @@ class RouterFacade {
         else {
             for (const route in routes) {
                 const routeObj = routes[route];
-                const regex = routeObj.path
-                    .replace(/\/:\w+\?/g, "(?:/([^/]+))?")
-                    .replace(/\/:\w+/g, "/([^/]+)")
-                    .replace(/\//g, "\\/");
+                const regex = "^" +
+                    routeObj.path
+                        .replace(/\/:\w+\?/g, "(?:/([^/]+))?")
+                        .replace(/\/:\w+/g, "/([^/]+)")
+                        .replace(/\//g, "\\/") +
+                    "$";
                 const match = url.match(regex);
                 if (match) {
                     if (request) {

package/dist/WebApplication.d.ts

@@ -1,7 +1,9 @@
 /// <reference types="node" />
 import http from "http";
+import { ModulesLoader } from "./Modules/ModulesLoader";
 export declare class WebApplication {
     private server;
+    modulesLoader: ModulesLoader | null;
     /**
      * Init the routes and start the http-server
      */

package/dist/WebApplication.js

@@ -9,7 +9,11 @@ const Config_1 = require("./Config");
 const Router_1 = require("./Router/Router");
 const QueueJobsRegisty_1 = require("./Queue/QueueJobsRegisty");
 const DatatableRegistry_1 = require("./Datatable/DatatableRegistry");
+const ModulesLoader_1 = require("./Modules/ModulesLoader");
 class WebApplication {
+    constructor() {
+        this.modulesLoader = null;
+    }
     /**
      * Init the routes and start the http-server
      */
@@ -19,6 +23,11 @@ class WebApplication {
                 Config_1.Config.register(key, options.config[key]);
             }
         }
+        this.modulesLoader = new ModulesLoader_1.ModulesLoader();
+        this.modulesLoader.load(options && options.modules ? options.modules : []);
+        if (options && options.kernel) {
+            this.modulesLoader.loadKernel(options.kernel);
+        }
         Router_1.Router.init({
             mode: options && options.mode ? options.mode : null,
             kernel: options && options.kernel ? options.kernel : null,
@@ -26,6 +35,7 @@ class WebApplication {
             routesFunction: options && options.routesFunction ? options.routesFunction : null,
             tempDir: options && options.tempDir ? options.tempDir : null,
         });
+        this.modulesLoader.initRoutes();
         if (options && options.datatables) {
             DatatableRegistry_1.DatatableRegistry.registerMany(options.datatables);
         }

package/package.json

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

package/src/BaseKernelWeb.ts

@@ -1,6 +1,6 @@
 import { Controller } from "./Controller/Controller";
 
 export class BaseKernelWeb {
-  static controller: { [key: string]: Controller } = {};
-  static middleware: { [key: string]: any };
+    static controller: { [key: string]: Controller } = {};
+    static middleware: { [key: string]: any };
 }

package/src/DataBuilder/DataBuilder.ts

@@ -449,9 +449,13 @@ export class DataBuilder {
         }
 
         if (type.unmapped) {
+            const appendData: any = {};
             try {
                 if (typeof type.schema.beforeSave === "function") {
-                    await type.schema.beforeSave(req.body.data, req);
+                    const result = await type.schema.beforeSave(req.body.data, req);
+                    if (result && result.__append_data) {
+                        Object.assign(appendData, result.__append_data);
+                    }
                 }
             } catch (e: any) {
                 throw e;
@@ -459,7 +463,10 @@ export class DataBuilder {
 
             try {
                 if (typeof type.schema.afterSave === "function") {
-                    await type.schema.afterSave(req.body.data, req);
+                    const result = await type.schema.afterSave(req.body.data, req);
+                    if (result && result.__append_data) {
+                        Object.assign(appendData, result.__append_data);
+                    }
                 }
             } catch (e: any) {
                 throw e;
@@ -476,6 +483,7 @@ export class DataBuilder {
                 data: {
                     _id: req.body.data._id ? req.body.data._id : "__unmapped",
                     redirect: redirect,
+                    ...appendData,
                 },
             };
         }

package/src/Modules/ModuleProvider.ts

@@ -0,0 +1,15 @@
+export class ModuleProvider {
+    static key: string = "example-module";
+
+    controller: { [key: string]: any } = {};
+    middleware: { [key: string]: any } = {};
+
+    boot() {}
+
+    routes() {}
+
+    bootByRouter() {
+        this.boot();
+        this.routes();
+    }
+}

package/src/Modules/ModulesLoader.ts

@@ -0,0 +1,34 @@
+export class ModulesLoader {
+    private loadedModules: { [key: string]: any } = {};
+
+    load(modules: any[]) {
+        for (let modClass of modules) {
+            if (!modClass || !modClass.key || modClass.disabled === true) continue;
+
+            this.loadedModules[modClass.key] = new modClass();
+            this.loadedModules[modClass.key].boot();
+        }
+    }
+
+    initRoutes() {
+        for (let key in this.loadedModules) {
+            this.loadedModules[key].routes();
+        }
+    }
+
+    loadKernel(kernel: any) {
+        if (!kernel) return;
+
+        for (let key in this.loadedModules) {
+            if (this.loadedModules[key].controller) {
+                for (let ctrlKey in this.loadedModules[key].controller) {
+                    kernel.controller[ctrlKey] = this.loadedModules[key].controller[ctrlKey];
+                }
+
+                for (let mwKey in this.loadedModules[key].middleware) {
+                    kernel.middleware[mwKey] = this.loadedModules[key].middleware[mwKey];
+                }
+            }
+        }
+    }
+}

package/src/Router/Router.ts

@@ -223,10 +223,13 @@ class RouterFacade {
         } else {
             for (const route in routes) {
                 const routeObj = routes[route];
-                const regex = routeObj.path
-                    .replace(/\/:\w+\?/g, "(?:/([^/]+))?")
-                    .replace(/\/:\w+/g, "/([^/]+)")
-                    .replace(/\//g, "\\/");
+                const regex =
+                    "^" +
+                    routeObj.path
+                        .replace(/\/:\w+\?/g, "(?:/([^/]+))?")
+                        .replace(/\/:\w+/g, "/([^/]+)")
+                        .replace(/\//g, "\\/") +
+                    "$";
                 const match = url.match(regex);
 
                 if (match) {

package/src/WebApplication.ts

@@ -3,9 +3,11 @@ import { Config } from "./Config";
 import { Router } from "./Router/Router";
 import { QueueJobsRegisty } from "./Queue/QueueJobsRegisty";
 import { DatatableRegistry } from "./Datatable/DatatableRegistry";
+import { ModulesLoader } from "./Modules/ModulesLoader";
 
 export class WebApplication {
     private server!: Server;
+    modulesLoader: ModulesLoader | null = null;
 
     /**
      * Init the routes and start the http-server
@@ -17,6 +19,13 @@ export class WebApplication {
             }
         }
 
+        this.modulesLoader = new ModulesLoader();
+        this.modulesLoader.load(options && options.modules ? options.modules : []);
+
+        if (options && options.kernel) {
+            this.modulesLoader.loadKernel(options.kernel);
+        }
+
         Router.init({
             mode: options && options.mode ? options.mode : null,
             kernel: options && options.kernel ? options.kernel : null,
@@ -25,6 +34,8 @@ export class WebApplication {
             tempDir: options && options.tempDir ? options.tempDir : null,
         });
 
+        this.modulesLoader.initRoutes();
+
         if (options && options.datatables) {
             DatatableRegistry.registerMany(options.datatables);
         }