@webtypen/webframez-core 0.2.41 → 0.2.45

package/.github/workflows/npm-publish.yml

@@ -28,6 +28,10 @@ jobs:
                   registry-url: https://registry.npmjs.org/
             - run: npm install
             - run: npm run build
+            - run: npm whoami
+              env:
+                NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+            - run: npm config get registry
             - run: npm publish --access public
               env:
                   NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

package/README.md

@@ -141,6 +141,7 @@ Models are usually placed under `app/Models`. Each model class inherits from `Mo
 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";
@@ -157,13 +158,22 @@ export class User extends Model {
     avatar!: () => File;
 
     /**
-     * @param File                 Dependency Model
+     * @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[];
 }
 ```
 
@@ -181,6 +191,7 @@ const testUser = await User.where("email", "=", "test@test.de").where("is_active
 ```ts
 const sessions = await testUser.session();
 const avatarUrl = await testUser.avatar()?.url;
+const customerGroups = await testUser.groups();
 ```
 
 ##### Disable cache / force dependency-reload:

package/dist/DataBuilder/DataBuilder.js

@@ -220,6 +220,11 @@ class DataBuilder {
                         else if (type.forms[form].fields) {
                             newData.forms[form].fields = JSON.parse(JSON.stringify(type.forms[form].fields));
                         }
+                        newData.forms[form].allowDeletion =
+                            (typeof type.forms[form].allowDeletion === "boolean" && type.forms[form].allowDeletion) ||
+                                (typeof type.forms[form].allowDeletion === "function" && (yield type.forms[form].allowDeletion(req)))
+                                ? true
+                                : false;
                     }
                 }
                 else {

package/dist/Database/Model.d.ts

@@ -4,6 +4,7 @@ type ObjectIDType = {
 };
 export declare function hasOne(modelGetter: () => any, foreignKey: string, localKey?: string, queryFunction?: Function): (target: any, propertyKey: string, v2?: any) => void;
 export declare function hasMany(modelGetter: () => any, foreignKey: string, localKey?: string, queryFunction?: Function): (target: any, propertyKey: string) => void;
+export declare function hasManyArray(modelGetter: () => any, localArrayKey: string, foreignKey?: string, queryFunction?: Function): (target: any, propertyKey: string) => void;
 export declare class Model {
     [key: string]: any | undefined;
     __primaryKey: string;
@@ -56,6 +57,7 @@ export declare class Model {
      */
     static aggregate(aggregation: any, options?: any, collection?: string): Promise<any>;
     buildRelationship(model: any, foreignKey: string, localKey?: string): any;
+    buildArrayRelationship(model: any, localArrayKey: string, foreignKey?: string): any;
     /**
      * Returns the model-data without system- and unmapped-fields (new js-object)
      * @returns object

package/dist/Database/Model.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Model = exports.hasMany = exports.hasOne = void 0;
+exports.Model = exports.hasManyArray = exports.hasMany = exports.hasOne = void 0;
 const DBConnection_1 = require("./DBConnection");
 const QueryBuilder_1 = require("./QueryBuilder");
 function hasOne(modelGetter, foreignKey, localKey, queryFunction) {
@@ -76,6 +76,38 @@ function hasMany(modelGetter, foreignKey, localKey, queryFunction) {
     };
 }
 exports.hasMany = hasMany;
+function hasManyArray(modelGetter, localArrayKey, foreignKey, queryFunction) {
+    return function (target, propertyKey) {
+        Object.defineProperty(target, propertyKey, {
+            value: function (options) {
+                return __awaiter(this, void 0, void 0, function* () {
+                    if ((!options || !options.force) && this.__dependencies && this.__dependencies[propertyKey] !== undefined) {
+                        return this.__dependencies[propertyKey];
+                    }
+                    const model = modelGetter();
+                    if (!model) {
+                        throw new Error(`Model for foreignKey "${foreignKey}" konnte nicht aufgelöst werden.`);
+                    }
+                    if (!this.__dependencies) {
+                        this.__dependencies = {};
+                    }
+                    const query = this.buildArrayRelationship(model, localArrayKey, foreignKey);
+                    if (queryFunction && typeof queryFunction === "function") {
+                        queryFunction(query);
+                    }
+                    if (options && options.query) {
+                        return query;
+                    }
+                    this.__dependencies[propertyKey] = yield query.get();
+                    return this.__dependencies[propertyKey];
+                });
+            },
+            writable: false,
+            configurable: true,
+        });
+    };
+}
+exports.hasManyArray = hasManyArray;
 class Model {
     constructor() {
         this.__primaryKey = "_id";
@@ -221,6 +253,11 @@ class Model {
     buildRelationship(model, foreignKey, localKey) {
         return model.where(foreignKey, "=", this[localKey !== null && localKey !== void 0 ? localKey : "_id"]);
     }
+    buildArrayRelationship(model, localArrayKey, foreignKey) {
+        return model.where(foreignKey !== null && foreignKey !== void 0 ? foreignKey : "_id", "=", {
+            $in: this[localArrayKey] && Array.isArray(this[localArrayKey]) ? this[localArrayKey] : [],
+        });
+    }
     /**
      * Returns the model-data without system- and unmapped-fields (new js-object)
      * @returns object

package/package.json

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

package/src/DataBuilder/DataBuilder.ts

@@ -259,7 +259,6 @@ export class DataBuilder {
                     }
 
                     newData.forms[form] = {};
-
                     if (typeof type.forms[form].pageActions === "function") {
                         newData.forms[form].pageActions = await type.forms[form].pageActions(req);
                     } else if (type.forms[form].pageActions) {
@@ -275,6 +274,12 @@ export class DataBuilder {
                     } else if (type.forms[form].fields) {
                         newData.forms[form].fields = JSON.parse(JSON.stringify(type.forms[form].fields));
                     }
+
+                    newData.forms[form].allowDeletion =
+                        (typeof type.forms[form].allowDeletion === "boolean" && type.forms[form].allowDeletion) ||
+                        (typeof type.forms[form].allowDeletion === "function" && (await type.forms[form].allowDeletion(req)))
+                            ? true
+                            : false;
                 }
             } else {
                 newData[key] = type[key];

package/src/Database/Model.ts

@@ -73,6 +73,40 @@ export function hasMany(modelGetter: () => any, foreignKey: string, localKey?: s
     };
 }
 
+export function hasManyArray(modelGetter: () => any, localArrayKey: string, foreignKey?: string, queryFunction?: Function) {
+    return function (target: any, propertyKey: string) {
+        Object.defineProperty(target, propertyKey, {
+            value: async function (options?: any) {
+                if ((!options || !options.force) && this.__dependencies && this.__dependencies[propertyKey] !== undefined) {
+                    return this.__dependencies[propertyKey];
+                }
+
+                const model = modelGetter();
+                if (!model) {
+                    throw new Error(`Model for foreignKey "${foreignKey}" konnte nicht aufgelöst werden.`);
+                }
+
+                if (!this.__dependencies) {
+                    this.__dependencies = {};
+                }
+
+                const query = this.buildArrayRelationship(model, localArrayKey, foreignKey);
+                if (queryFunction && typeof queryFunction === "function") {
+                    queryFunction(query);
+                }
+
+                if (options && options.query) {
+                    return query;
+                }
+                this.__dependencies[propertyKey] = await query.get();
+                return this.__dependencies[propertyKey];
+            },
+            writable: false,
+            configurable: true,
+        });
+    };
+}
+
 export class Model {
     [key: string]: any | undefined; // allow-custom-properties
     __primaryKey = "_id";
@@ -218,6 +252,12 @@ export class Model {
         return model.where(foreignKey, "=", this[localKey ?? "_id"]);
     }
 
+    buildArrayRelationship(model: any, localArrayKey: string, foreignKey?: string): any {
+        return model.where(foreignKey ?? "_id", "=", {
+            $in: this[localArrayKey] && Array.isArray(this[localArrayKey]) ? this[localArrayKey] : [],
+        });
+    }
+
     /**
      * Returns the model-data without system- and unmapped-fields (new js-object)
      * @returns object