@webtypen/webframez-core 0.3.8 → 0.3.10

package/dist/Commands/ConsoleCommand.js

@@ -65,7 +65,7 @@ class ConsoleCommand {
         return this.args.options[name] || null;
     }
     write(message, options) {
-        ConsoleOutputHelper_1.ConsoleOutputHelper.writeln(message, options);
+        ConsoleOutputHelper_1.ConsoleOutputHelper.write(message, options);
         return this;
     }
     writeln(message, options) {

package/dist/DataBuilder/DataBuilder.d.ts

@@ -26,6 +26,7 @@ export type DataBuilderType = {
     forms?: {
         [key: string]: any;
     };
+    unmapped?: boolean;
 };
 export type DataBuilderFieldType = {
     key: string;

package/dist/DataBuilder/DataBuilder.js

@@ -347,11 +347,11 @@ class DataBuilder {
     }
     save(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 (!req || !req.body || typeof req.body !== "object") {
+                throw new Error("Missing request-body ...");
             }
             if (typeof req.body.data !== "object") {
-                throw new Error("Missing id ...");
+                throw new Error("Missing request-data ...");
             }
             const type = this.getTypeFromRequest(req.body);
             if (!type || !type.schema || !type.schema.fields) {
@@ -365,6 +365,39 @@ class DataBuilder {
                     errors: errors,
                 };
             }
+            if (type.unmapped) {
+                try {
+                    if (typeof type.schema.afterSave === "function") {
+                        yield type.schema.beforeSave(req.body.data, req);
+                    }
+                }
+                catch (e) {
+                    throw e;
+                }
+                try {
+                    if (typeof type.schema.afterSave === "function") {
+                        yield type.schema.afterSave(req.body.data, 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.onSaveRedirect && typeof forms.main.onSaveRedirect === "function") {
+                    redirect = yield forms.main.onSaveRedirect(req.body.data, req);
+                }
+                return {
+                    status: "success",
+                    data: {
+                        _id: req.body.data._id ? req.body.data._id : "__unmapped",
+                        redirect: redirect,
+                    },
+                };
+            }
+            if (!req.body.__builder_id || req.body.__builder_id.toString().trim() === "") {
+                throw new Error("Missing id ...");
+            }
             const collection = type.schema && type.schema.collection ? type.schema.collection : undefined;
             if (!collection || collection.trim() === "") {
                 throw new Error("Missing collection ...");

package/package.json

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

package/src/Commands/ConsoleCommand.ts

@@ -55,7 +55,7 @@ export class ConsoleCommand {
     }
 
     write(message: string, options?: WriteOptions) {
-        ConsoleOutputHelper.writeln(message, options);
+        ConsoleOutputHelper.write(message, options);
         return this;
     }
 

package/src/DataBuilder/DataBuilder.ts

@@ -24,6 +24,7 @@ export type DataBuilderType = {
     plural: string;
     schema: DataBuilderSchema;
     forms?: { [key: string]: any };
+    unmapped?: boolean;
 };
 
 export type DataBuilderFieldType =
@@ -425,12 +426,12 @@ export class DataBuilder {
     }
 
     async save(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 (!req || !req.body || typeof req.body !== "object") {
+            throw new Error("Missing request-body ...");
         }
 
         if (typeof req.body.data !== "object") {
-            throw new Error("Missing id ...");
+            throw new Error("Missing request-data ...");
         }
 
         const type = this.getTypeFromRequest(req.body);
@@ -447,6 +448,42 @@ export class DataBuilder {
             };
         }
 
+        if (type.unmapped) {
+            try {
+                if (typeof type.schema.afterSave === "function") {
+                    await type.schema.beforeSave(req.body.data, req);
+                }
+            } catch (e: any) {
+                throw e;
+            }
+
+            try {
+                if (typeof type.schema.afterSave === "function") {
+                    await type.schema.afterSave(req.body.data, 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.onSaveRedirect && typeof forms.main.onSaveRedirect === "function") {
+                redirect = await forms.main.onSaveRedirect(req.body.data, req);
+            }
+
+            return {
+                status: "success",
+                data: {
+                    _id: req.body.data._id ? req.body.data._id : "__unmapped",
+                    redirect: redirect,
+                },
+            };
+        }
+
+        if (!req.body.__builder_id || req.body.__builder_id.toString().trim() === "") {
+            throw new Error("Missing id ...");
+        }
+
         const collection = type.schema && type.schema.collection ? type.schema.collection : undefined;
         if (!collection || collection.trim() === "") {
             throw new Error("Missing collection ...");