@webtypen/webframez-core 0.2.6 → 0.2.8

package/dist/Database/DBConnection.d.ts

@@ -12,7 +12,7 @@ declare class DBConnectionFacade {
     runQuery(query: QueryBuilder, options?: {
         [name: string]: any;
     }): Promise<any>;
-    execute(data: any, connectionName?: string): Promise<any>;
+    execute(data: any, connectionName?: string, options?: any): Promise<any>;
     getDriver(connectionName?: string): Promise<any>;
     objectId(val?: any, connectionName?: string, options?: ObjectIDType): Promise<any>;
     mapDataToModel(model: any, data: any): any;

package/dist/Database/DBConnection.js

@@ -80,10 +80,10 @@ class DBConnectionFacade {
             return data;
         });
     }
-    execute(data, connectionName) {
+    execute(data, connectionName, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const connection = yield this.getConnection(connectionName);
-            return yield connection.driver.execute(connection.client, data);
+            return yield connection.driver.execute(connection.client, data, options);
         });
     }
     getDriver(connectionName) {

package/dist/Database/Model.d.ts

@@ -51,7 +51,7 @@ export declare class Model {
      * @param aggregation
      * @returns any
      */
-    static aggregate(aggregation: any, collection?: string): Promise<any>;
+    static aggregate(aggregation: any, options?: any, collection?: string): Promise<any>;
     /**
      * Returns the model-data without system- and unmapped-fields (new js-object)
      * @returns object

package/dist/Database/Model.js

@@ -134,14 +134,14 @@ class Model {
      * @param aggregation
      * @returns any
      */
-    static aggregate(aggregation, collection) {
+    static aggregate(aggregation, options, collection) {
         return __awaiter(this, void 0, void 0, function* () {
             const model = new this();
             return yield DBConnection_1.DBConnection.execute({
                 type: "aggregation",
                 table: collection ? collection : model ? model.__table : undefined,
                 aggregation: aggregation,
-            }, model.__connection);
+            }, model.__connection, options);
         });
     }
     /**

package/dist/Functions/FileFunctions.js

@@ -15,6 +15,9 @@ function rootDir(...args) {
 }
 exports.rootDir = rootDir;
 function storageDir(...args) {
+    if (process.env.STORAGE_DIR && process.env.STORAGE_DIR.trim() !== "") {
+        return path_1.default.join(process.env.STORAGE_DIR, ...args);
+    }
     const identifierBuild = "/build/node_modules/@webtypen/webframez-core";
     if (__dirname.indexOf(identifierBuild) > 0) {
         return path_1.default.join(__dirname.substring(0, __dirname.indexOf(identifierBuild)), "storage", ...args);

package/package.json

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

package/src/Database/DBConnection.ts

@@ -88,10 +88,10 @@ class DBConnectionFacade {
         return data;
     }
 
-    async execute(data: any, connectionName?: string) {
+    async execute(data: any, connectionName?: string, options?: any) {
         const connection = await this.getConnection(connectionName);
 
-        return await connection.driver.execute(connection.client, data);
+        return await connection.driver.execute(connection.client, data, options);
     }
 
     async getDriver(connectionName?: string) {

package/src/Database/Model.ts

@@ -124,7 +124,7 @@ export class Model {
      * @param aggregation
      * @returns any
      */
-    static async aggregate(aggregation: any, collection?: string) {
+    static async aggregate(aggregation: any, options?: any,collection?: string) {
         const model = new this();
         return await DBConnection.execute(
             {
@@ -132,7 +132,8 @@ export class Model {
                 table: collection ? collection : model ? model.__table : undefined,
                 aggregation: aggregation,
             },
-            model.__connection
+            model.__connection,
+            options
         );
     }
 

package/src/Functions/FileFunctions.ts

@@ -11,6 +11,10 @@ export function rootDir(...args: any) {
 }
 
 export function storageDir(...args: any) {
+    if (process.env.STORAGE_DIR && process.env.STORAGE_DIR.trim() !== "") {
+        return path.join(process.env.STORAGE_DIR, ...args);
+    }
+
     const identifierBuild = "/build/node_modules/@webtypen/webframez-core";
     if (__dirname.indexOf(identifierBuild) > 0) {
         return path.join(__dirname.substring(0, __dirname.indexOf(identifierBuild)), "storage", ...args);