@radatek/microserver 2.3.2 → 2.3.4

package/microserver.d.ts

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 2.3.2
+ * @version 2.3.4
  * @package @radatek/microserver
  * @copyright Darius Kisonas 2022
  * @license MIT
@@ -199,8 +199,8 @@ export declare class WebSocket extends EventEmitter {
  * ```
 */
 export declare class Controller<T extends Model<any> = any> {
-    protected req: ServerRequest<T>;
-    protected res: ServerResponse<T>;
+    req: ServerRequest<T>;
+    res: ServerResponse<T>;
     get model(): T | undefined;
     constructor(req: ServerRequest<T>, res: ServerResponse<T>);
     /** Generate routes for this controller */
@@ -231,7 +231,7 @@ export declare class Router extends EventEmitter {
     /** bind middleware or create one from string like: 'redirect:302,https://redirect.to', 'error:422', 'param:name=value', 'acl:users/get', 'model:User', 'group:Users', 'user:admin' */
     bind(fn: string | Function | object): Function;
     /** Handler */
-    handler(req: ServerRequest, res: ServerResponse, next: Function, method?: string): any;
+    handler(req: ServerRequest, res: ServerResponse, next: Function, method?: string): void;
     /** Clear routes and middlewares */
     clear(): this;
     /**
@@ -733,13 +733,22 @@ export type ModelDocument<T extends ModelSchema> = {
 export declare interface ModelCollections {
     collection(name: string): Promise<MicroCollection>;
 }
+export declare class Models {
+}
 export declare class Model<TSchema extends ModelSchema> {
     static collections: ModelCollections;
-    static models: Record<string, Model<any>>;
+    static models: Models;
     static set db(db: any);
     static get db(): any;
+    /** Dynamic model extension */
+    static dynamic<T extends Model<any>>(model: T, options: {
+        controller?: Controller;
+        collection?: MicroCollection<any>;
+        req?: ServerRequest;
+    } | Controller): T;
+    static register<K extends string, T extends Model<any>>(name: K, model: T): typeof Model;
     /** Define model */
-    static define<T extends ModelSchema>(name: string, schema: T, options?: {
+    static define<K extends string, T extends ModelSchema>(name: K, schema: T, options?: {
         collection?: MicroCollection | Promise<MicroCollection>;
         class?: typeof Model;
     }): Model<T>;

package/microserver.js

@@ -1,6 +1,6 @@
 /**
  * MicroServer
- * @version 2.3.2
+ * @version 2.3.4
  * @package @radatek/microserver
  * @copyright Darius Kisonas 2022
  * @license MIT
@@ -838,10 +838,6 @@ export class Controller {
                 method = keyMatch[1];
                 url = keyMatch[2].startsWith('/') ? keyMatch[2] : ('/' + prefix + keyMatch[2]);
             }
-            if (!url && !method) {
-                method = 'GET';
-                url = '/' + prefix + key;
-            }
             if (!method)
                 return;
             let autoAcl = method.toLowerCase();
@@ -908,14 +904,7 @@ export class Controller {
                     req.model = modelName instanceof Model ? modelName : Model.models[modelName];
                     if (!obj.model)
                         throw new InvalidData(modelName, 'model');
-                    const modelOptions = { ...obj.model.options, user: req.user, params: req.params };
-                    req.model = new Proxy(req.model, {
-                        get: (target, prop) => {
-                            if (prop === 'options')
-                                return modelOptions;
-                            return target[prop];
-                        }
-                    });
+                    req.model = Model.dynamic(req.model, { controller: obj });
                 }
                 return func.apply(obj, req.paramsList);
             });
@@ -1077,13 +1066,10 @@ export class Router extends EventEmitter {
     handler(req, res, next, method) {
         const nextAfter = next;
         next = () => this._walkStack(this._stackAfter, req, res, nextAfter);
-        if (method)
-            return !this._walkTree(this._tree[method], req, res, next) && next();
-        const walk = () => {
-            if (!this._walkTree(this._tree[req.method || 'GET'], req, res, next) &&
-                !this._walkTree(this._tree['*'], req, res, next))
-                next();
-        };
+        const walkTree = (method) => this._walkTree(this._tree[method], req, res, next);
+        const walk = method ?
+            () => { !walkTree(method) && next(); } :
+            () => { !walkTree(req.method || 'GET') && !walkTree('*') && next(); };
         req.rewrite = (url) => {
             if (req.originalUrl)
                 res.error(508);
@@ -2592,6 +2578,8 @@ class ModelCollectionsInternal {
         return db.collection(name);
     }
 }
+export class Models {
+}
 export class Model {
     static set db(db) {
         this.collections.db = db;
@@ -2599,6 +2587,31 @@ export class Model {
     static get db() {
         return this.collections.db;
     }
+    /** Dynamic model extension */
+    static dynamic(model, options) {
+        if (options instanceof Controller)
+            options = { controller: options };
+        const collection = options?.collection || model.collection;
+        const modelOptions = { ...model.options };
+        const req = options.req || options.controller?.req;
+        if (req) {
+            modelOptions.user = req.user;
+            modelOptions.params = req.params;
+        }
+        return new Proxy(model, {
+            get: (target, prop) => {
+                if (prop === 'collection')
+                    return collection;
+                if (prop === 'options')
+                    return modelOptions;
+                return target[prop];
+            }
+        });
+    }
+    static register(name, model) {
+        Model.models[name] = model;
+        return this;
+    }
     /** Define model */
     static define(name, schema, options) {
         options = options || {};
@@ -2607,7 +2620,7 @@ export class Model {
         const inst = options?.class
             ? new options.class(schema, { name, ...options })
             : new Model(schema, { name, ...options });
-        Model.models[name] = inst;
+        this.register(name, inst);
         return inst;
     }
     /** Create model acording to description */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radatek/microserver",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "description": "HTTP MicroServer",
   "author": "Darius Kisonas",
   "license": "MIT",