@cocreate/mongodb 1.16.1 → 1.17.1

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [1.17.1](https://github.com/CoCreate-app/CoCreate-mongodb/compare/v1.17.0...v1.17.1) (2024-01-18)
+
+
+### Bug Fixes
+
+* handle stroage if $storage string ([732a2b9](https://github.com/CoCreate-app/CoCreate-mongodb/commit/732a2b9e0ac6cb10225a202df204f046e6728733))
+
+# [1.17.0](https://github.com/CoCreate-app/CoCreate-mongodb/compare/v1.16.1...v1.17.0) (2024-01-17)
+
+
+### Bug Fixes
+
+* update to support new query system ([7555076](https://github.com/CoCreate-app/CoCreate-mongodb/commit/7555076cf718f68d56547988879e910770a45c5e))
+
+
+### Features
+
+* parseRegex expresion function to seperate pattern from options ([9401b07](https://github.com/CoCreate-app/CoCreate-mongodb/commit/9401b07b459f3a809e2ef0496a5df08adb5840b1))
+
 ## [1.16.1](https://github.com/CoCreate-app/CoCreate-mongodb/compare/v1.16.0...v1.16.1) (2024-01-08)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/mongodb",
-  "version": "1.16.1",
+  "version": "1.17.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

@@ -1,5 +1,5 @@
 const { MongoClient, ObjectId } = require('mongodb');
-const { dotNotationToObject, queryData, searchData, sortData, isValidDate } = require('@cocreate/utils')
+const { dotNotationToObject, query, searchData, sortData, isValidDate } = require('@cocreate/utils')
 const clients = new Map()
 const organizations = {}
 
@@ -294,6 +294,14 @@ function object(method, data) {
                         let $storage = data[type][i].$storage || []
                         let $database = data[type][i].$database || []
                         let $array = data[type][i].$array || []
+
+                        if (!Array.isArray($storage))
+                            $storage = [data[type][i].$storage]
+                        if (!Array.isArray($database))
+                            $database = [data[type][i].$database]
+                        if (!Array.isArray($array))
+                            $array = [data[type][i].$array]
+
                         $storage.push(data.storageName)
                         $database.push(database)
                         $array.push(array)
@@ -617,7 +625,7 @@ async function createFilter(data, arrayObj) {
 
     if (data.$filter) {
         if (data.$filter.query)
-            query = createQuery(data.$filter.query);
+            query = data.$filter.query
 
         if (data.$filter.sort) {
             for (let i = 0; i < data.$filter.sort.length; i++) {
@@ -648,116 +656,12 @@ async function createFilter(data, arrayObj) {
     return { query, sort, index, limit, count }
 }
 
-
-// TODO: improve mongodb query to cover many cases
-function createQuery(queries) {
-    let query = new Object();
-
-    for (let item of queries) {
-
-        if (!item.key)
-            continue
-
-        if (item.key == "_id") {
-            if (item.value)
-                try {
-                    item.value = ObjectId(item.value)
-                } catch (error) {
-                    continue
-                }
-            else
-                continue
-        }
-
-        if (isValidDate(item.value))
-            item.value = new Date(item.value)
-
-        let key = item.key;
-        if (!query[key]) {
-            query[key] = {};
-        }
-
-        switch (item.operator) {
-            case '$includes':
-            case 'includes':
-                query[key]['$regex'] = item.value;
-                break;
-
-            case '$range':
-                if (item.value[0] !== null && item.value[1] !== null) {
-                    query[key] = { $gte: item.value[0], $lte: item.value[1] };
-                } else if (item.value[0] !== null) {
-                    query[key] = { $gte: item.value[0] };
-                } else if (item.value[1] !== null) {
-                    query[key] = { $lte: item.value[1] };
-                }
-                break;
-
-            case 'equals':
-                query[$eq][item.operator] = item.value;
-            case '$eq':
-            case '$ne':
-            case '$lt':
-            case '$lte':
-            case '$gt':
-            case '$gte':
-            case '$regex':
-                query[key][item.operator] = item.value;
-                break;
-            case '$in':
-                if (!Array.isArray(item.value))
-                    query[key][item.operator] = [item.value]
-                else
-                    query[key] = { $in: item.value }
-                break;
-
-            case '$nin':
-                if (!Array.isArray(item.value))
-                    query[key][item.operator] = [item.value]
-                else
-                    query[key] = { $nin: item.value }
-                break;
-            case '$elemMatch':
-                query[key] = {
-                    "$elemMatch": {
-                        name: {
-                            $in: item.value
-                        }
-                    }
-                }
-                break;
-            case '$or':
-                if (!query[item.operator])
-                    query[item.operator] = [{ [key]: item.value }];
-                else
-                    query[item.operator].push({ [key]: item.value })
-                delete query[key]
-                break;
-            case '$geoWithin':
-                try {
-                    let value = JSON.parse(item.value);
-                    if (item.type) {
-                        query[key]['$geoWithin'] = {
-                            [item.type]: value
-                        }
-                    }
-                } catch (e) {
-                    console.log('geowithin error');
-                }
-                break;
-            case 'dotNotation':
-                // TODO: handle CoCreate query using dotNotation, objects and utils.dotNotionToObject to perform deep merge
-                break;
-        }
-    }
-
-    //. global search
-    //. we have to set indexes in text fields ex: db.chart.createIndex({ "$**": "text" })
-    // if (data['searchKey']) {
-    //   query["$text"] = {$search: "\"Ni\""};
-    // }
-
-    return query;
+function parseRegExp(regExpString) {
+    let matches = regExpString.match(/\/(.*)\/(.*)/);
+    return {
+        pattern: matches[1],
+        options: matches[2]
+    };
 }
 
 function createProjection(data) {