@webtypen/webframez-core 0.2.29 → 0.2.30

package/dist/DataBuilder/DataBuilder.d.ts

@@ -13,6 +13,7 @@ export type DataBuilderSchema = {
     fields: {
         [key: string]: any;
     };
+    newDataHandler?: Function;
 };
 export type DataBuilderType = {
     key: string;
@@ -37,7 +38,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;
@@ -84,7 +84,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
@@ -428,16 +427,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/package.json

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

@@ -12,6 +12,7 @@ export type DataBuilderSchema = {
     getAggregation?: any;
     events?: { [key: string]: any };
     fields: { [key: string]: any };
+    newDataHandler?: Function;
 };
 
 export type DataBuilderType = {
@@ -40,8 +41,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 +224,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",
@@ -517,18 +516,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);
         }