@webtypen/webframez-core 0.2.31 → 0.2.32

package/dist/DataBuilder/DataBuilder.js

@@ -216,7 +216,15 @@ class DataBuilder {
                 }
                 else {
                     let elementVal = null;
-                    if (value !== undefined &&
+                    if (fields[key].type === "ObjectId") {
+                        if (value && (value.toString().length === 12 || value.toString().length === 24)) {
+                            elementVal = typeof value === "string" ? yield Model_1.Model.objectId(value) : value;
+                        }
+                        else {
+                            elementVal = yield Model_1.Model.objectId();
+                        }
+                    }
+                    else if (value !== undefined &&
                         value !== null &&
                         !(typeof value === "string" && value.trim() === "") &&
                         !(typeof value === "number" && value.toString().trim() === "")) {
@@ -238,19 +246,6 @@ class DataBuilder {
                         }
                     }
                     lodash_1.default.set(element, fieldPath, elementVal);
-                    // lodash.set(
-                    //     element,
-                    //     fieldPath,
-                    //     value === undefined || value === null || (typeof value === "string" && value.trim() === "")
-                    //         ? null
-                    //         : customType && typeof customType.onSave === "function"
-                    //         ? await customType.onSave(value, { ...payload, ...fields[key].payload })
-                    //         : fields[key].type === "currency" || fields[key].type === "float"
-                    //         ? parseFloat(value.toString().replace(",", "."))
-                    //         : fields[key].type === "integer"
-                    //         ? parseInt(value)
-                    //         : value
-                    // );
                 }
             }
             return element;

package/package.json

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

@@ -281,7 +281,13 @@ export class DataBuilder {
                 }
             } else {
                 let elementVal = null;
-                if (
+                if (fields[key].type === "ObjectId") {
+                    if (value && (value.toString().length === 12 || value.toString().length === 24)) {
+                        elementVal = typeof value === "string" ? await Model.objectId(value) : value;
+                    } else {
+                        elementVal = await Model.objectId();
+                    }
+                } else if (
                     value !== undefined &&
                     value !== null &&
                     !(typeof value === "string" && value.trim() === "") &&
@@ -309,19 +315,6 @@ export class DataBuilder {
                 }
 
                 lodash.set(element, fieldPath, elementVal);
-                // lodash.set(
-                //     element,
-                //     fieldPath,
-                //     value === undefined || value === null || (typeof value === "string" && value.trim() === "")
-                //         ? null
-                //         : customType && typeof customType.onSave === "function"
-                //         ? await customType.onSave(value, { ...payload, ...fields[key].payload })
-                //         : fields[key].type === "currency" || fields[key].type === "float"
-                //         ? parseFloat(value.toString().replace(",", "."))
-                //         : fields[key].type === "integer"
-                //         ? parseInt(value)
-                //         : value
-                // );
             }
         }