@webtypen/webframez-core 0.1.9 → 0.1.11

package/dist/Database/Model.d.ts

@@ -14,39 +14,39 @@ export declare class Model {
      * @param value
      * @returns QueryBulder
      */
-    static where(column: any, operator: any, value: any): QueryBuilder;
+    static where(column: any, operator: any, value: any, collection?: string): QueryBuilder;
     /**
      * Creates a new query-builder object and adds a orderBy-clause
      * @param column
      * @param sort
      * @returns QueryBulder
      */
-    static orderBy(column: any, sort: any): QueryBuilder;
+    static orderBy(column: any, sort: any, collection?: string): QueryBuilder;
     /**
      * Creates a new query-builder object and executes first()
      * @param options?
      * @returns QueryBulder
      */
-    static first(options?: any): Promise<any>;
+    static first(options?: any, collection?: string): Promise<any>;
     /**
      * Creates a new query-builder object and executes get()
      * @param options?
      * @returns QueryBulder
      */
-    static get(options?: any): Promise<any>;
+    static get(options?: any, collection?: string): Promise<any>;
     /**
      * Creates a new query-builder object and executes paginate()
      * @param count
      * @param options?
      * @returns QueryBulder
      */
-    static paginate(count: number, options?: any): Promise<any>;
+    static paginate(count: number, options?: any, collection?: string): Promise<any>;
     /**
      * Executes a database-aggregation (mostly used by no-sql connections)
      * @param aggregation
      * @returns any
      */
-    static aggregate(aggregation: any): Promise<any>;
+    static aggregate(aggregation: any, collection?: string): Promise<any>;
     /**
      * Returns the model-data without system- and unmapped-fields (new js-object)
      * @returns object

package/dist/Database/Model.js

@@ -19,15 +19,7 @@ class Model {
         this.__connection = undefined;
         this.__hidden = [];
         this.__unmapped = [];
-        this.__unmappedSystem = [
-            "__primaryKey",
-            "__table",
-            "__connection",
-            "__unmapped",
-            "__unmappedSystem",
-            "__is_deleted",
-            "__hidden",
-        ];
+        this.__unmappedSystem = ["__primaryKey", "__table", "__connection", "__unmapped", "__unmappedSystem", "__is_deleted", "__hidden"];
     }
     /**
      * Creates a new query-builder object and adds a where-clause
@@ -36,11 +28,16 @@ class Model {
      * @param value
      * @returns QueryBulder
      */
-    static where(column, operator, value) {
-        const model = new this();
+    static where(column, operator, value, collection) {
+        const model = collection ? null : new this();
         const queryBuilder = new QueryBuilder_1.QueryBuilder();
         queryBuilder.setModelMapping(this);
-        queryBuilder.table(model.__table);
+        if (model) {
+            queryBuilder.table(model.__table);
+        }
+        else if (collection) {
+            queryBuilder.table(collection);
+        }
         queryBuilder.where(column, operator, value);
         return queryBuilder;
     }
@@ -50,11 +47,16 @@ class Model {
      * @param sort
      * @returns QueryBulder
      */
-    static orderBy(column, sort) {
-        const model = new this();
+    static orderBy(column, sort, collection) {
+        const model = collection ? null : new this();
         const queryBuilder = new QueryBuilder_1.QueryBuilder();
         queryBuilder.setModelMapping(this);
-        queryBuilder.table(model.__table);
+        if (model) {
+            queryBuilder.table(model.__table);
+        }
+        else if (collection) {
+            queryBuilder.table(collection);
+        }
         queryBuilder.orderBy(column, sort);
         return queryBuilder;
     }
@@ -63,12 +65,17 @@ class Model {
      * @param options?
      * @returns QueryBulder
      */
-    static first(options) {
+    static first(options, collection) {
         return __awaiter(this, void 0, void 0, function* () {
-            const model = new this();
+            const model = collection ? null : new this();
             const queryBuilder = new QueryBuilder_1.QueryBuilder();
             queryBuilder.setModelMapping(this);
-            queryBuilder.table(model.__table);
+            if (model) {
+                queryBuilder.table(model.__table);
+            }
+            else if (collection) {
+                queryBuilder.table(collection);
+            }
             return yield queryBuilder.first(options);
         });
     }
@@ -77,12 +84,17 @@ class Model {
      * @param options?
      * @returns QueryBulder
      */
-    static get(options) {
+    static get(options, collection) {
         return __awaiter(this, void 0, void 0, function* () {
-            const model = new this();
+            const model = collection ? null : new this();
             const queryBuilder = new QueryBuilder_1.QueryBuilder();
             queryBuilder.setModelMapping(this);
-            queryBuilder.table(model.__table);
+            if (model) {
+                queryBuilder.table(model.__table);
+            }
+            else if (collection) {
+                queryBuilder.table(collection);
+            }
             return yield queryBuilder.get(options);
         });
     }
@@ -92,12 +104,17 @@ class Model {
      * @param options?
      * @returns QueryBulder
      */
-    static paginate(count, options) {
+    static paginate(count, options, collection) {
         return __awaiter(this, void 0, void 0, function* () {
-            const model = new this();
+            const model = collection ? null : new this();
             const queryBuilder = new QueryBuilder_1.QueryBuilder();
             queryBuilder.setModelMapping(this);
-            queryBuilder.table(model.__table);
+            if (model) {
+                queryBuilder.table(model.__table);
+            }
+            else if (collection) {
+                queryBuilder.table(collection);
+            }
             return yield queryBuilder.paginate(count, options);
         });
     }
@@ -106,12 +123,12 @@ class Model {
      * @param aggregation
      * @returns any
      */
-    static aggregate(aggregation) {
+    static aggregate(aggregation, collection) {
         return __awaiter(this, void 0, void 0, function* () {
             const model = new this();
             return yield DBConnection_1.DBConnection.execute({
                 type: "aggregation",
-                table: model.__table,
+                table: collection ? collection : model ? model.__table : undefined,
                 aggregation: aggregation,
             }, model.__connection);
         });
@@ -136,9 +153,7 @@ class Model {
     toArray() {
         const out = {};
         for (let i in this) {
-            if (!this.__unmapped.includes(i) &&
-                !this.__unmappedSystem.includes(i) &&
-                !this.__hidden.includes(i)) {
+            if (!this.__unmapped.includes(i) && !this.__unmappedSystem.includes(i) && !this.__hidden.includes(i)) {
                 out[i] = this[i];
             }
         }

package/package.json

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

package/src/Database/Model.ts

@@ -2,193 +2,201 @@ import { DBConnection } from "./DBConnection";
 import { QueryBuilder } from "./QueryBuilder";
 
 export class Model {
-  [key: string]: any | undefined; // allow-custom-properties
-  __primaryKey = "_id";
-  __table: string = "";
-  __connection: string | undefined = undefined;
-  __hidden: string[] = [];
-  __unmapped: string[] = [];
-  __unmappedSystem: string[] = [
-    "__primaryKey",
-    "__table",
-    "__connection",
-    "__unmapped",
-    "__unmappedSystem",
-    "__is_deleted",
-    "__hidden",
-  ];
-
-  /**
-   * Creates a new query-builder object and adds a where-clause
-   * @param column
-   * @param operator
-   * @param value
-   * @returns QueryBulder
-   */
-  static where(column: any, operator: any, value: any): QueryBuilder {
-    const model = new this();
-    const queryBuilder = new QueryBuilder();
-    queryBuilder.setModelMapping(this);
-    queryBuilder.table(model.__table);
-    queryBuilder.where(column, operator, value);
-
-    return queryBuilder;
-  }
-  
-  /**
-   * Creates a new query-builder object and adds a orderBy-clause
-   * @param column
-   * @param sort
-   * @returns QueryBulder
-   */
-  static orderBy(column: any, sort: any): QueryBuilder {
-    const model = new this();
-    const queryBuilder = new QueryBuilder();
-    queryBuilder.setModelMapping(this);
-    queryBuilder.table(model.__table);
-    queryBuilder.orderBy(column, sort);
-
-    return queryBuilder;
-  }
-  
-  /**
-   * Creates a new query-builder object and executes first()
-   * @param options?
-   * @returns QueryBulder
-   */
-  static async first(options?: any) {
-    const model = new this();
-    const queryBuilder = new QueryBuilder();
-    queryBuilder.setModelMapping(this);
-    queryBuilder.table(model.__table);
-
-    return await queryBuilder.first(options);
-  }
-  
-  /**
-   * Creates a new query-builder object and executes get()
-   * @param options?
-   * @returns QueryBulder
-   */
-  static async get(options?: any) {
-    const model = new this();
-    const queryBuilder = new QueryBuilder();
-    queryBuilder.setModelMapping(this);
-    queryBuilder.table(model.__table);
-
-    return await queryBuilder.get(options);
-  }
-  
-  /**
-   * Creates a new query-builder object and executes paginate()
-   * @param count
-   * @param options?
-   * @returns QueryBulder
-   */
-  static async paginate(count: number, options?: any) {
-    const model = new this();
-    const queryBuilder = new QueryBuilder();
-    queryBuilder.setModelMapping(this);
-    queryBuilder.table(model.__table);
-
-    return await queryBuilder.paginate(count, options);
-  }
-
-  /**
-   * Executes a database-aggregation (mostly used by no-sql connections)
-   * @param aggregation
-   * @returns any
-   */
-  static async aggregate(aggregation: any) {
-    const model = new this();
-    return await DBConnection.execute(
-      {
-        type: "aggregation",
-        table: model.__table,
-        aggregation: aggregation,
-      },
-      model.__connection
-    );
-  }
-
-  /**
-   * Returns the model-data without system- and unmapped-fields (new js-object)
-   * @returns object
-   */
-  getModelData(): object {
-    const out: { [key: string]: any } = {};
-    for (let i in this) {
-      if (!this.__unmapped.includes(i) && !this.__unmappedSystem.includes(i)) {
-        out[i] = this[i];
-      }
+    [key: string]: any | undefined; // allow-custom-properties
+    __primaryKey = "_id";
+    __table: string = "";
+    __connection: string | undefined = undefined;
+    __hidden: string[] = [];
+    __unmapped: string[] = [];
+    __unmappedSystem: string[] = ["__primaryKey", "__table", "__connection", "__unmapped", "__unmappedSystem", "__is_deleted", "__hidden"];
+
+    /**
+     * Creates a new query-builder object and adds a where-clause
+     * @param column
+     * @param operator
+     * @param value
+     * @returns QueryBulder
+     */
+    static where(column: any, operator: any, value: any, collection?: string): QueryBuilder {
+        const model = collection ? null : new this();
+        const queryBuilder = new QueryBuilder();
+        queryBuilder.setModelMapping(this);
+        if (model) {
+            queryBuilder.table(model.__table);
+        } else if (collection) {
+            queryBuilder.table(collection);
+        }
+        queryBuilder.where(column, operator, value);
+
+        return queryBuilder;
     }
-    return out;
-  }
-
-  /**
-   * Returns the model-data without system-, unmapped- and hidden-fields (new js-object)
-   * @returns object
-   */
-  toArray(): object {
-    const out: { [key: string]: any } = {};
-    for (let i in this) {
-      if (
-        !this.__unmapped.includes(i) &&
-        !this.__unmappedSystem.includes(i) &&
-        !this.__hidden.includes(i)
-      ) {
-        out[i] = this[i];
-      }
+
+    /**
+     * Creates a new query-builder object and adds a orderBy-clause
+     * @param column
+     * @param sort
+     * @returns QueryBulder
+     */
+    static orderBy(column: any, sort: any, collection?: string): QueryBuilder {
+        const model = collection ? null : new this();
+        const queryBuilder = new QueryBuilder();
+        queryBuilder.setModelMapping(this);
+        if (model) {
+            queryBuilder.table(model.__table);
+        } else if (collection) {
+            queryBuilder.table(collection);
+        }
+        queryBuilder.orderBy(column, sort);
+
+        return queryBuilder;
+    }
+
+    /**
+     * Creates a new query-builder object and executes first()
+     * @param options?
+     * @returns QueryBulder
+     */
+    static async first(options?: any, collection?: string) {
+        const model = collection ? null : new this();
+        const queryBuilder = new QueryBuilder();
+        queryBuilder.setModelMapping(this);
+        if (model) {
+            queryBuilder.table(model.__table);
+        } else if (collection) {
+            queryBuilder.table(collection);
+        }
+
+        return await queryBuilder.first(options);
+    }
+
+    /**
+     * Creates a new query-builder object and executes get()
+     * @param options?
+     * @returns QueryBulder
+     */
+    static async get(options?: any, collection?: string) {
+        const model = collection ? null : new this();
+        const queryBuilder = new QueryBuilder();
+        queryBuilder.setModelMapping(this);
+        if (model) {
+            queryBuilder.table(model.__table);
+        } else if (collection) {
+            queryBuilder.table(collection);
+        }
+
+        return await queryBuilder.get(options);
+    }
+
+    /**
+     * Creates a new query-builder object and executes paginate()
+     * @param count
+     * @param options?
+     * @returns QueryBulder
+     */
+    static async paginate(count: number, options?: any, collection?: string) {
+        const model = collection ? null : new this();
+        const queryBuilder = new QueryBuilder();
+        queryBuilder.setModelMapping(this);
+        if (model) {
+            queryBuilder.table(model.__table);
+        } else if (collection) {
+            queryBuilder.table(collection);
+        }
+
+        return await queryBuilder.paginate(count, options);
     }
-    return out;
-  }
-
-  /**
-   * Saves the object in the database
-   * @returns Model
-   */
-  async save() {
-    let status = null;
-    if (this[this.__primaryKey] !== undefined && this[this.__primaryKey]) {
-      // Update
-      status = await DBConnection.execute({
-        type: "updateOne",
-        table: this.__table,
-        primaryKey: this.__primaryKey,
-        filter: { [this.__primaryKey]: this[this.__primaryKey] },
-        data: this.getModelData(),
-      });
-    } else {
-      // Insert
-      status = await DBConnection.execute({
-        type: "insertOne",
-        table: this.__table,
-        data: this.getModelData(),
-      });
+
+    /**
+     * Executes a database-aggregation (mostly used by no-sql connections)
+     * @param aggregation
+     * @returns any
+     */
+    static async aggregate(aggregation: any, collection?: string) {
+        const model = new this();
+        return await DBConnection.execute(
+            {
+                type: "aggregation",
+                table: collection ? collection : model ? model.__table : undefined,
+                aggregation: aggregation,
+            },
+            model.__connection
+        );
+    }
+
+    /**
+     * Returns the model-data without system- and unmapped-fields (new js-object)
+     * @returns object
+     */
+    getModelData(): object {
+        const out: { [key: string]: any } = {};
+        for (let i in this) {
+            if (!this.__unmapped.includes(i) && !this.__unmappedSystem.includes(i)) {
+                out[i] = this[i];
+            }
+        }
+        return out;
     }
 
-    // onModelSave
-    const driver = await DBConnection.getDriver(this.__connection);
-    return driver.onModelSave(this, status);
-  }
-
-  /**
-   * Deletes the object from the database
-   * @returns boolean
-   */
-  async delete() {
-    if (!this[this.__primaryKey]) {
-      return false;
+    /**
+     * Returns the model-data without system-, unmapped- and hidden-fields (new js-object)
+     * @returns object
+     */
+    toArray(): object {
+        const out: { [key: string]: any } = {};
+        for (let i in this) {
+            if (!this.__unmapped.includes(i) && !this.__unmappedSystem.includes(i) && !this.__hidden.includes(i)) {
+                out[i] = this[i];
+            }
+        }
+        return out;
     }
 
-    const queryBuilder = new QueryBuilder();
-    queryBuilder.setModelMapping(this);
-    queryBuilder.table(this.__table);
-    queryBuilder.where(this.__primaryKey, "=", this[this.__primaryKey]);
-    await queryBuilder.delete({ mode: "deleteOne" });
+    /**
+     * Saves the object in the database
+     * @returns Model
+     */
+    async save() {
+        let status = null;
+        if (this[this.__primaryKey] !== undefined && this[this.__primaryKey]) {
+            // Update
+            status = await DBConnection.execute({
+                type: "updateOne",
+                table: this.__table,
+                primaryKey: this.__primaryKey,
+                filter: { [this.__primaryKey]: this[this.__primaryKey] },
+                data: this.getModelData(),
+            });
+        } else {
+            // Insert
+            status = await DBConnection.execute({
+                type: "insertOne",
+                table: this.__table,
+                data: this.getModelData(),
+            });
+        }
+
+        // onModelSave
+        const driver = await DBConnection.getDriver(this.__connection);
+        return driver.onModelSave(this, status);
+    }
 
-    this.__is_deleted = true;
+    /**
+     * Deletes the object from the database
+     * @returns boolean
+     */
+    async delete() {
+        if (!this[this.__primaryKey]) {
+            return false;
+        }
 
-    return true;
-  }
+        const queryBuilder = new QueryBuilder();
+        queryBuilder.setModelMapping(this);
+        queryBuilder.table(this.__table);
+        queryBuilder.where(this.__primaryKey, "=", this[this.__primaryKey]);
+        await queryBuilder.delete({ mode: "deleteOne" });
+
+        this.__is_deleted = true;
+
+        return true;
+    }
 }