@cocreate/mongodb 1.17.6 → 1.18.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.18.1](https://github.com/CoCreate-app/CoCreate-mongodb/compare/v1.18.0...v1.18.1) (2024-06-22)
+
+
+### Bug Fixes
+
+* handling of $storage, $database, and $array refrence ([788c27f](https://github.com/CoCreate-app/CoCreate-mongodb/commit/788c27f4bf1ab8f37aabeb0e7d18d7378385cc07))
+
+# [1.18.0](https://github.com/CoCreate-app/CoCreate-mongodb/compare/v1.17.6...v1.18.0) (2024-04-28)
+
+
+### Features
+
+* handle date queries ([7d437f2](https://github.com/CoCreate-app/CoCreate-mongodb/commit/7d437f28a98b1c89066a7be3885cba137a524d65))
+
 ## [1.17.6](https://github.com/CoCreate-app/CoCreate-mongodb/compare/v1.17.5...v1.17.6) (2024-02-20)
 
 

package/package.json

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

package/src/index.js

@@ -632,8 +632,43 @@ async function createFilter(data, arrayObj) {
     let query = {}, sort = {}, index = 0, limit = 0, count
 
     if (data.$filter) {
-        if (data.$filter.query)
-            query = data.$filter.query
+        function convertIfDate(value) {
+            if (typeof value === 'string' && value.match(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/)) {
+                return new Date(value);
+            }
+            return value;
+        }
+
+        if (data.$filter.query) {
+            for (let key in data.$filter.query) {
+                if (Array.isArray(data.$filter.query[key])) {
+                    // Handle $or operator with an array of conditions
+                    query[key] = data.$filter.query[key].map(condition => {
+                        let newCondition = {};
+                        for (let subKey in condition) {
+                            if (typeof condition[subKey] === 'object' && condition[subKey] !== null) {
+                                newCondition[subKey] = {};
+                                for (let subCondition in condition[subKey]) {
+                                    newCondition[subKey][subCondition] = convertIfDate(condition[subKey][subCondition]);
+                                }
+                            } else {
+                                newCondition[subKey] = convertIfDate(condition[subKey]);
+                            }
+                        }
+                        return newCondition;
+                    });
+                } else if (typeof data.$filter.query[key] === 'object' && data.$filter.query[key] !== null) {
+                    // Handle general object conditions
+                    query[key] = {};
+                    for (let condition in data.$filter.query[key]) {
+                        query[key][condition] = convertIfDate(data.$filter.query[key][condition]);
+                    }
+                } else {
+                    // Handle direct values
+                    query[key] = convertIfDate(data.$filter.query[key]);
+                }
+            }
+        }
 
         if (data.$filter.sort) {
             for (let i = 0; i < data.$filter.sort.length; i++) {
@@ -729,18 +764,19 @@ function createData(data, array, type, dataTransferedIn, dataTransferedOut) {
         for (let i = 0; i < array.length; i++) {
             const matchIndex = data[type].findIndex((item) => item[key] === array[i][key]);
             if (matchIndex !== -1) {
-                if (!data[type][matchIndex].$storage)
-                    data[type][matchIndex].$storage = []
-                if (!data[type][matchIndex].$database)
-                    data[type][matchIndex].$database = []
-                if (!data[type][matchIndex].$array)
-                    data[type][matchIndex].$array = []
-                data[type][matchIndex].$storage.push(array[i].$storage)
-                delete array[i].$storage
-                data[type][matchIndex].$database.push(array[i].$database)
-                delete array[i].$database
-                data[type][matchIndex].$array.push(array[i].$array)
-                delete array[i].$array
+                for (let $type of ['$storage', '$database', '$array']) {
+                    if (!data[type][matchIndex][$type])
+                        data[type][matchIndex][$type] = []
+                    if (!Array.isArray(data[type][matchIndex][$type])) {
+                        data[type][matchIndex][$type] = [data[type][matchIndex][$type]]
+                        if (!data[type][matchIndex][$type].includes(array[i][$type])) {
+                            data[type][matchIndex][$type].push(array[i][$type])
+                        }
+                    } else {
+                        data[type][matchIndex][$type].push(array[i][$type])
+                    }
+                    delete array[i][$type]
+                }
 
                 // TODO: compare dates and merge and and updates to keep all synced and up to date
                 data[type][matchIndex] = { ...data[type][matchIndex], ...array[i] };