refactor: improve null value handling in validateAndSetFieldValue and normalizeMongoValue methods

Author: NoOne7135

adminforth/dataConnectors/baseConnector.ts

@@ -223,7 +223,9 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
   validateAndSetFieldValue(field: AdminForthResourceColumn, value: any): any {
     // Int
     if (field.type === AdminForthDataTypes.INTEGER) {
-      if (value === "" || value === null) return this.setFieldValue(field, null); 
+      if (value === "" || value === null) {
+        return this.setFieldValue(field, null);
+      }
       if (!Number.isFinite(value)) {
         throw new Error(`Value is not an integer. Field ${field.name} with type is ${field.type}, but got value: ${value} with type ${typeof value}`);
       }
@@ -232,7 +234,9 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
 
     // Float
     if (field.type === AdminForthDataTypes.FLOAT) {
-      if (value === "" || value === null) return this.setFieldValue(field, null);
+      if (value === "" || value === null) {
+        return this.setFieldValue(field, null);
+      }
 
       if (typeof value !== "number" || !Number.isFinite(value)) {
         throw new Error(
@@ -245,11 +249,17 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
 
     // Decimal
     if (field.type === AdminForthDataTypes.DECIMAL) {
-      if (value === "" || value === null) return this.setFieldValue(field, null);
+      if (value === "" || value === null) {
+        return this.setFieldValue(field, null);
+      }
       if (typeof value === "string") {
         const string = value.trim();
-        if (!string) return this.setFieldValue(field, null);
-        if (Number.isFinite(Number(string))) return this.setFieldValue(field, string);
+        if (!string) {
+          return this.setFieldValue(field, null);
+        }
+        if (Number.isFinite(Number(string))) {
+          return this.setFieldValue(field, string);
+        }
         throw new Error(`Value is not a decimal. Field ${field.name} with type is ${field.type}, but got value: ${value} with type ${typeof value}`);
       }
 
@@ -261,7 +271,9 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
 
     // DateTime
     if (field.type === AdminForthDataTypes.DATETIME) {
-      if (value === "" || value === null) return this.setFieldValue(field, null);
+      if (value === "" || value === null) {
+        return this.setFieldValue(field, null);
+      }
       if (!dayjs(value).isValid()) {
         throw new Error(`Value is not a valid datetime. Field ${field.name} with type is ${field.type}, but got value: ${value} with type ${typeof value}`);
       }
@@ -272,7 +284,9 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
 
     // Boolean
     if (field.type === AdminForthDataTypes.BOOLEAN) {
-      if (value === "" || value === null) return this.setFieldValue(field, null);
+      if (value === "" || value === null) {
+        return this.setFieldValue(field, null);
+      }
       if (typeof value !== 'boolean') {
         throw new Error(`Value is not a boolean. Field ${field.name} with type is ${field.type}, but got value: ${value} with type ${typeof value}`);
       }
@@ -283,7 +297,9 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
 
     // String
     if (field.type === AdminForthDataTypes.STRING) {
-      if (value === "" || value === null) return this.setFieldValue(field, null);
+      if (value === "" || value === null){
+        return this.setFieldValue(field, null);
+      }
     }
     return this.setFieldValue(field, value);
   }

adminforth/dataConnectors/mongo.ts

@@ -10,11 +10,21 @@ const escapeRegex = (value) => {
     return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // Escapes special characters
 };
 function normalizeMongoValue(v: any) {
-  if (v == null) return v;
-  if (v instanceof Decimal128) return v.toString();
-  if (v instanceof Double) return v.valueOf();
-  if (typeof v === "object" && v.$numberDecimal) return String(v.$numberDecimal);
-  if (typeof v === "object" && v.$numberDouble) return Number(v.$numberDouble);
+  if (v == null) {
+    return v;
+  }
+  if (v instanceof Decimal128) {
+    return v.toString();
+  }
+  if (v instanceof Double) {
+    return v.valueOf();
+  }
+  if (typeof v === "object" && v.$numberDecimal) {
+    return String(v.$numberDecimal);
+  }
+  if (typeof v === "object" && v.$numberDouble) {
+    return Number(v.$numberDouble);
+  }
   return v;
 }
 
@@ -212,22 +222,30 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
         if (value === null) return null;
 
         if (field.type === AdminForthDataTypes.DATETIME) {
-            if (value === "" || value === null) return null;
+            if (value === "" || value === null) {
+                return null;
+            }
             return dayjs(value).isValid() ? dayjs(value).toDate() : null;
         }
 
         if (field.type === AdminForthDataTypes.INTEGER) {
-            if (value === "" || value === null) return null;
+            if (value === "" || value === null) {
+                return null;
+            }
             return Number.isFinite(value) ? Math.trunc(value) : null;
         }
 
         if (field.type === AdminForthDataTypes.FLOAT) {
-            if (value === "" || value === null) return null;
+            if (value === "" || value === null) {
+                return null;
+            }
             return Number.isFinite(value) ? value : null;
         }
 
         if (field.type === AdminForthDataTypes.DECIMAL) {
-            if (value === "" || value === null) return null;
+            if (value === "" || value === null) {
+                return null;
+            }
             return value.toString();
         }