inibase 1.0.0-rc.70 → 1.0.0-rc.72

package/dist/index.js

@@ -689,7 +689,7 @@ export default class Inibase {
             if (searchResult) {
                 RETURN = Utils.deepMerge(RETURN, Object.fromEntries(Object.entries(searchResult).filter(([_k, v], _i) => Object.keys(v).length ===
                     Object.keys(criteria.and ?? {}).length)));
-                criteria.and = undefined;
+                delete criteria.and;
                 RETURN_LineNumbers = lineNumbers;
             }
             else
@@ -697,7 +697,7 @@ export default class Inibase {
         }
         if (criteria.or && Utils.isObject(criteria.or)) {
             const [searchResult, lineNumbers] = await this.applyCriteria(tableName, schema, options, criteria.or, false);
-            criteria.or = undefined;
+            delete criteria.or;
             if (searchResult) {
                 RETURN = Utils.deepMerge(RETURN, searchResult);
                 RETURN_LineNumbers = lineNumbers;
@@ -724,7 +724,7 @@ export default class Inibase {
                             searchComparedAtValue = searchCriteria.map((single_or) => single_or[1]);
                             searchLogicalOperator = "or";
                         }
-                        value.or = undefined;
+                        delete value.or;
                     }
                     if (value?.and &&
                         Array.isArray(value?.and)) {
@@ -738,7 +738,7 @@ export default class Inibase {
                             searchComparedAtValue = searchCriteria.map((single_and) => single_and[1]);
                             searchLogicalOperator = "and";
                         }
-                        value.and = undefined;
+                        delete value.and;
                     }
                 }
                 else if (Array.isArray(value)) {

package/dist/utils.js

@@ -243,17 +243,28 @@ export const detectFieldType = (input, availableTypes) => {
 export const validateFieldType = (value, fieldType, fieldChildrenType) => {
     if (value === null)
         return true;
-    if (Array.isArray(fieldType))
-        return detectFieldType(value, fieldType) !== undefined;
-    if (fieldType === "array" && fieldChildrenType && Array.isArray(value))
-        return value.every((v) => detectFieldType(v, Array.isArray(fieldChildrenType)
-            ? fieldChildrenType
-            : [fieldChildrenType]) !== undefined);
+    if (Array.isArray(fieldType)) {
+        const detectedFieldType = detectFieldType(value, fieldType);
+        if (!detectedFieldType)
+            return false;
+        fieldType = detectedFieldType;
+    }
+    if (fieldType === "array" && fieldChildrenType)
+        return value.every((v) => {
+            let _fieldChildrenType = fieldChildrenType;
+            if (Array.isArray(_fieldChildrenType)) {
+                const detectedFieldType = detectFieldType(v, _fieldChildrenType);
+                if (!detectedFieldType)
+                    return false;
+                _fieldChildrenType = detectedFieldType;
+            }
+            return validateFieldType(v, _fieldChildrenType);
+        });
     switch (fieldType) {
         case "string":
             return isString(value);
         case "password":
-            return true; // accept
+            return !Array.isArray(value) && !isObject(value); // accept
         case "number":
             return isNumber(value);
         case "html":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inibase",
-  "version": "1.0.0-rc.70",
+  "version": "1.0.0-rc.72",
   "type": "module",
   "author": {
     "name": "Karim Amahtil",