@cocreate/utils 1.27.3 → 1.27.4

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.27.4](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.27.3...v1.27.4) (2023-11-18)
+
+
+### Bug Fixes
+
+* $in operator support ([891577e](https://github.com/CoCreate-app/CoCreate-utils/commit/891577eb61ba2760b2441f1e031e759242ba5797))
+* improved handeling of $nin operator ([740c98f](https://github.com/CoCreate-app/CoCreate-utils/commit/740c98ff080751d1da83ccadef80d142a42a5ba7))
+
 ## [1.27.3](https://github.com/CoCreate-app/CoCreate-utils/compare/v1.27.2...v1.27.3) (2023-11-16)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/utils",
-  "version": "1.27.3",
+  "version": "1.27.4",
   "description": "A simple utils component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "utils",

package/src/index.js

@@ -109,14 +109,14 @@
                 for (let i = 0; i < keys.length; i++) {
                     if (/\[([0-9]*)\]/g.test(keys[i])) {
                         let [k, index] = keys[i].split('[');
-                        index = index.slice(0, -1)
+                        index = index.slice(0, -1) || 0
+                        newObject[k] = oldObject[k] || [];
                         if (length == i) {
                             if (value === undefined)
                                 newObject[k].splice(index, 1);
                             else
                                 newObject[k][index] = value;
                         } else {
-                            newObject[k] = oldObject[k] || [];
                             newObject[k][index] = oldObject[k][index] || {};
                             newObject = newObject[k][index]
                             oldObject = oldObject[k][index]
@@ -446,8 +446,13 @@
                     dataValue = ''
                 let logicalOperator = query[i].logicalOperator || 'and'
                 let queryValues = query[i].value
+
+                let queryIsArray = false
                 if (!Array.isArray(queryValues))
                     queryValues = [queryValues]
+                else
+                    queryIsArray = true
+
 
                 let queryStatus = false
                 for (let queryValue of queryValues) {
@@ -462,7 +467,6 @@
                         dataValue = new Date(dataValue)
                         queryValue = new Date(queryValue)
                     }
-
                     switch (query[i].operator) {
                         case '$includes':
                         case 'includes':
@@ -478,8 +482,16 @@
                                 queryStatus = true
                             break;
                         case '$ne':
-                            // if (dataValue != queryValue)
-                            queryStatus = (dataValue != queryValue)
+                            if (Array.isArray(dataValue)) {
+                                // Check if the entire array is different from queryValue
+                                queryStatus = !isEqualArray(dataValue, queryValue);
+                            } else if (Array.isArray(queryValue)) {
+                                // If queryValue is an array, check if dataValue is different from this array
+                                queryStatus = !isEqualArray(queryValue, dataValue);
+                            } else {
+                                // If neither is an array, simple comparison
+                                queryStatus = (dataValue != queryValue);
+                            }
                             break;
                         case '$lt':
                             if (dataValue < queryValue)
@@ -498,12 +510,18 @@
                                 queryStatus = true
                             break;
                         case '$in':
-                            if (Array.isArray(dataValue) && dataValue.some(x => queryValue.includes(x)))
-                                queryStatus = true
+                            if (Array.isArray(dataValue)) {
+                                queryStatus = dataValue.some(element => queryValue.includes(element));
+                            } else {
+                                queryStatus = queryValue.includes(dataValue);
+                            }
                             break;
                         case '$nin':
-                            if (!Array.isArray(dataValue) || !dataValue.some(x => queryValue.includes(x)))
-                                queryStatus = true
+                            if (Array.isArray(dataValue)) {
+                                queryStatus = !dataValue.some(element => queryValue.includes(element));
+                            } else {
+                                queryStatus = !queryValue.includes(dataValue);
+                            }
                             break;
                         case '$range':
                             if (queryValue[0] !== null && queryValue[1] !== null) {
@@ -521,17 +539,19 @@
                                 queryStatus = true
                             break;
                     }
-
-                    switch (logicalOperator) {
-                        case 'and':
-                            if (queryStatus == false)
-                                return false
-                            break;
-                        // case 'or':
-                        //     if (queryStatus == true)
-                        //         queryResult = queryStatus
-                        //     break;
-                    }
+                    if (!queryIsArray || query[i].operator === "$nin") {
+                        switch (logicalOperator) {
+                            case 'and':
+                                if (queryStatus == false)
+                                    return false
+                                break;
+                            // case 'or':
+                            //     if (queryStatus == true)
+                            //         queryResult = queryStatus
+                            //     break;
+                        }
+                    } else if (queryStatus && query[i].operator === "$in")
+                        return true
                     queryResult = queryStatus
                 }
             }
@@ -540,6 +560,35 @@
         return queryResult;
     }
 
+    function isEqualArray(arr1, arr2) {
+        if (arr1.length !== arr2.length) {
+            return false;
+        }
+        for (let i = 0; i < arr1.length; i++) {
+            if (!isEqualObject(arr1[i], arr2[i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    function isEqualObject(obj1, obj2) {
+        const keys1 = Object.keys(obj1);
+        const keys2 = Object.keys(obj2);
+
+        if (keys1.length !== keys2.length) {
+            return false;
+        }
+
+        for (const key of keys1) {
+            if (obj1[key] !== obj2[key]) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     function searchData(data, search) {
         if (!search)
             return true