@webtypen/webframez-core 0.2.29 → 0.2.31

package/dist/DataBuilder/DataBuilder.d.ts

@@ -6,6 +6,8 @@ export type DataBuilderSchema = {
     primaryKeyPlain?: boolean;
     beforeSave?: any;
     afterSave?: any;
+    beforeDelete?: any;
+    afterDelete?: any;
     getAggregation?: any;
     events?: {
         [key: string]: any;
@@ -13,6 +15,7 @@ export type DataBuilderSchema = {
     fields: {
         [key: string]: any;
     };
+    newDataHandler?: Function;
 };
 export type DataBuilderType = {
     key: string;
@@ -37,7 +40,6 @@ export type DataBuilderFieldType = {
 export declare class DataBuilder {
     private types;
     private fieldTypes;
-    newDataHandler: null | ((req: Request) => Promise<any>);
     getType(key: string): DataBuilderType | null;
     registerType(typeObj: DataBuilderType): this;
     registerFieldType(key: string, options?: any): this;
@@ -70,6 +72,18 @@ export declare class DataBuilder {
         };
         errors?: undefined;
     }>;
+    delete(db: any, req: any): Promise<{
+        status: string;
+        errors: any;
+        data?: undefined;
+    } | {
+        status: string;
+        data: {
+            _id: any;
+            redirect: any;
+        };
+        errors?: undefined;
+    }>;
     getField(req: Request, type: DataBuilderType, path: string): Promise<any>;
     removeArrayIndicators(str: string): string;
     details(db: any, req: any): Promise<{
@@ -84,7 +98,7 @@ export declare class DataBuilder {
         status: string;
         data: any;
         message?: undefined;
-    } | undefined>;
+    }>;
     apiAutoComplete(req: any): Promise<{
         status: string;
         data: void;

package/dist/DataBuilder/DataBuilder.js

@@ -19,7 +19,6 @@ class DataBuilder {
     constructor() {
         this.types = {};
         this.fieldTypes = {};
-        this.newDataHandler = null;
     }
     getType(key) {
         return this.types[key] && this.types[key].key ? this.types[key] : null;
@@ -178,7 +177,7 @@ class DataBuilder {
     loadType(req) {
         return __awaiter(this, void 0, void 0, function* () {
             const type = this.getTypeFromRequest(req);
-            const data = Object.assign(Object.assign({}, (yield this.typeForFrontend(type, req))), { fieldtypes: this.getFieldTypesFrontend(), new_data_handler: this.newDataHandler !== null ? true : false });
+            const data = Object.assign(Object.assign({}, (yield this.typeForFrontend(type, req))), { fieldtypes: this.getFieldTypesFrontend(), new_data_handler: type.schema && type.schema.newDataHandler && typeof type.schema.newDataHandler === "function" ? true : false });
             return {
                 status: "success",
                 data: Object.assign(Object.assign({}, data), { schema: Object.assign(Object.assign({}, (data.schema ? data.schema : {})), { fields: yield this.getFieldsFrontend(type.schema
@@ -381,6 +380,83 @@ class DataBuilder {
             };
         });
     }
+    delete(db, req) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!req || !req.body || typeof req.body !== "object" || !req.body.__builder_id || req.body.__builder_id.toString().trim() === "") {
+                throw new Error("Missing id ...");
+            }
+            if (typeof req.body.data !== "object") {
+                throw new Error("Missing id ...");
+            }
+            const type = this.getTypeFromRequest(req.body);
+            if (!type || !type.schema || !type.schema.fields) {
+                throw new Error("Missing schema fields ...");
+            }
+            const schemaFields = typeof type.schema.fields === "function" ? yield type.schema.fields(req) : type.schema.fields;
+            const errors = yield this.validateFields(schemaFields, req.body.data);
+            if (errors && Object.keys(errors).length > 0) {
+                return {
+                    status: "error",
+                    errors: errors,
+                };
+            }
+            const collection = type.schema && type.schema.collection ? type.schema.collection : undefined;
+            if (!collection || collection.trim() === "") {
+                throw new Error("Missing collection ...");
+            }
+            let element = null;
+            if (req.body.__builder_id === "new") {
+                throw new Error("Cannot delete a new object ...");
+            }
+            else {
+                const result = yield db
+                    .collection(collection)
+                    .aggregate(type.schema && typeof type.schema.getAggregation === "function"
+                    ? yield type.schema.getAggregation(yield this.getAggregation(type, req), req)
+                    : yield this.getAggregation(type, req), collection)
+                    .toArray();
+                if (!result || !result[0] || !result[0][type.schema.primaryKey ? type.schema.primaryKey : "_id"]) {
+                    throw new Error("Element '" + req.body.__builder_id + "' not found ...");
+                }
+                element = result[0];
+            }
+            if (!element || !element._id) {
+                throw new Error("Element '" + req.body.__builder_id + "' not found ...");
+            }
+            try {
+                if (typeof type.schema.beforeDelete === "function") {
+                    yield type.schema.beforeDelete(element, req);
+                }
+            }
+            catch (e) {
+                throw e;
+            }
+            yield db.collection(collection).deleteOne({ _id: element._id });
+            try {
+                if (typeof type.schema.afterDelete === "function") {
+                    yield type.schema.afterDelete(element, req);
+                }
+            }
+            catch (e) {
+                throw e;
+            }
+            let redirect = undefined;
+            const forms = typeof type.forms === "function" ? yield type.forms(req) : type.forms;
+            if (forms && forms.main && forms.main.onDeleteRedirect && typeof forms.main.onDeleteRedirect === "function") {
+                redirect = yield forms.main.onDeleteRedirect(element, req);
+            }
+            else if (forms && forms.main && forms.main.onSaveRedirect && typeof forms.main.onSaveRedirect === "function") {
+                redirect = yield forms.main.onSaveRedirect(element, req);
+            }
+            return {
+                status: "success",
+                data: {
+                    _id: element._id,
+                    redirect: redirect,
+                },
+            };
+        });
+    }
     getField(req, type, path) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!path || path.trim() === "") {
@@ -428,16 +504,16 @@ class DataBuilder {
     }
     detailsNewData(db, req) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.newDataHandler) {
-                return;
-            }
             const type = this.getTypeFromRequest(req);
             if (!type || !type.schema || !type.schema.fields) {
                 throw new Error("Missing schema fields ...");
             }
+            if (!type.schema || !type.schema.newDataHandler || typeof type.schema.newDataHandler !== "function") {
+                throw new Error("Missing newDataHandler-Function ...");
+            }
             let data = null;
             try {
-                data = yield this.newDataHandler(req);
+                data = yield type.schema.newDataHandler(req);
             }
             catch (e) {
                 console.error(e);

package/dist/DataBuilder/DataBuilderController.js

@@ -33,6 +33,9 @@ class DataBuilderController extends Controller_1.Controller {
             else if (req.body.__builder_rest_api === "save") {
                 return res.send(yield this.builder.save(db.client.db(null), req));
             }
+            else if (req.body.__builder_rest_api === "delete") {
+                return res.send(yield this.builder.delete(db.client.db(null), req));
+            }
             else if (req.body.__builder_rest_api === "type") {
                 return res.send(yield this.builder.loadType(req));
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webtypen/webframez-core",
-    "version": "0.2.29",
+    "version": "0.2.31",
     "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

@@ -9,9 +9,12 @@ export type DataBuilderSchema = {
     primaryKeyPlain?: boolean;
     beforeSave?: any;
     afterSave?: any;
+    beforeDelete?: any;
+    afterDelete?: any;
     getAggregation?: any;
     events?: { [key: string]: any };
     fields: { [key: string]: any };
+    newDataHandler?: Function;
 };
 
 export type DataBuilderType = {
@@ -40,8 +43,6 @@ export class DataBuilder {
     private types: { [key: string]: DataBuilderType } = {};
     private fieldTypes: { [key: string]: DataBuilderFieldType } = {};
 
-    newDataHandler: null | ((req: Request) => Promise<any>) = null;
-
     getType(key: string) {
         return this.types[key] && this.types[key].key ? this.types[key] : null;
     }
@@ -225,7 +226,7 @@ export class DataBuilder {
         const data = {
             ...(await this.typeForFrontend(type, req)),
             fieldtypes: this.getFieldTypesFrontend(),
-            new_data_handler: this.newDataHandler !== null ? true : false,
+            new_data_handler: type.schema && type.schema.newDataHandler && typeof type.schema.newDataHandler === "function" ? true : false,
         };
         return {
             status: "success",
@@ -465,6 +466,93 @@ export class DataBuilder {
         };
     }
 
+    async delete(db: any, req: any) {
+        if (!req || !req.body || typeof req.body !== "object" || !req.body.__builder_id || req.body.__builder_id.toString().trim() === "") {
+            throw new Error("Missing id ...");
+        }
+
+        if (typeof req.body.data !== "object") {
+            throw new Error("Missing id ...");
+        }
+
+        const type = this.getTypeFromRequest(req.body);
+        if (!type || !type.schema || !type.schema.fields) {
+            throw new Error("Missing schema fields ...");
+        }
+
+        const schemaFields = typeof type.schema.fields === "function" ? await type.schema.fields(req) : type.schema.fields;
+        const errors: any = await this.validateFields(schemaFields, req.body.data);
+        if (errors && Object.keys(errors).length > 0) {
+            return {
+                status: "error",
+                errors: errors,
+            };
+        }
+
+        const collection = type.schema && type.schema.collection ? type.schema.collection : undefined;
+        if (!collection || collection.trim() === "") {
+            throw new Error("Missing collection ...");
+        }
+
+        let element: any = null;
+        if (req.body.__builder_id === "new") {
+            throw new Error("Cannot delete a new object ...");
+        } else {
+            const result = await db
+                .collection(collection)
+                .aggregate(
+                    type.schema && typeof type.schema.getAggregation === "function"
+                        ? await type.schema.getAggregation(await this.getAggregation(type, req), req)
+                        : await this.getAggregation(type, req),
+                    collection
+                )
+                .toArray();
+
+            if (!result || !result[0] || !result[0][type.schema.primaryKey ? type.schema.primaryKey : "_id"]) {
+                throw new Error("Element '" + req.body.__builder_id + "' not found ...");
+            }
+            element = result[0];
+        }
+
+        if (!element || !element._id) {
+            throw new Error("Element '" + req.body.__builder_id + "' not found ...");
+        }
+
+        try {
+            if (typeof type.schema.beforeDelete === "function") {
+                await type.schema.beforeDelete(element, req);
+            }
+        } catch (e: any) {
+            throw e;
+        }
+
+        await db.collection(collection).deleteOne({ _id: element._id });
+
+        try {
+            if (typeof type.schema.afterDelete === "function") {
+                await type.schema.afterDelete(element, req);
+            }
+        } catch (e: any) {
+            throw e;
+        }
+
+        let redirect: any = undefined;
+        const forms = typeof type.forms === "function" ? await type.forms(req) : type.forms;
+        if (forms && forms.main && forms.main.onDeleteRedirect && typeof forms.main.onDeleteRedirect === "function") {
+            redirect = await forms.main.onDeleteRedirect(element, req);
+        } else if (forms && forms.main && forms.main.onSaveRedirect && typeof forms.main.onSaveRedirect === "function") {
+            redirect = await forms.main.onSaveRedirect(element, req);
+        }
+
+        return {
+            status: "success",
+            data: {
+                _id: element._id,
+                redirect: redirect,
+            },
+        };
+    }
+
     async getField(req: Request, type: DataBuilderType, path: string) {
         if (!path || path.trim() === "") {
             return null;
@@ -517,18 +605,18 @@ export class DataBuilder {
     }
 
     async detailsNewData(db: any, req: any) {
-        if (!this.newDataHandler) {
-            return;
-        }
-
         const type = this.getTypeFromRequest(req);
         if (!type || !type.schema || !type.schema.fields) {
             throw new Error("Missing schema fields ...");
         }
 
+        if (!type.schema || !type.schema.newDataHandler || typeof type.schema.newDataHandler !== "function") {
+            throw new Error("Missing newDataHandler-Function ...");
+        }
+
         let data: any = null;
         try {
-            data = await this.newDataHandler(req);
+            data = await type.schema.newDataHandler(req);
         } catch (e: any) {
             console.error(e);
         }

package/src/DataBuilder/DataBuilderController.ts

@@ -22,6 +22,8 @@ export class DataBuilderController extends Controller {
             return res.send(await this.builder.detailsNewData(db.client.db(null), req));
         } else if (req.body.__builder_rest_api === "save") {
             return res.send(await this.builder.save(db.client.db(null), req));
+        } else if (req.body.__builder_rest_api === "delete") {
+            return res.send(await this.builder.delete(db.client.db(null), req));
         } else if (req.body.__builder_rest_api === "type") {
             return res.send(await this.builder.loadType(req));
         }