@cocreate/mongodb 1.17.0 → 1.17.2

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [1.17.2](https://github.com/CoCreate-app/CoCreate-mongodb/compare/v1.17.1...v1.17.2) (2024-01-30)
+
+
+### Bug Fixes
+
+* error message ([0344407](https://github.com/CoCreate-app/CoCreate-mongodb/commit/03444076bbc9da8379d8d9a112170ff1c2d416f3))
+* query.organization_id ([1bcbff7](https://github.com/CoCreate-app/CoCreate-mongodb/commit/1bcbff7c57df52aa984b16e1df800d9b3cb0a581))
+* queryData ([e49ab52](https://github.com/CoCreate-app/CoCreate-mongodb/commit/e49ab526bfcd9897f7fb30f578cb142c9c5b0efd))
+
+## [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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/mongodb",
-  "version": "1.17.0",
+  "version": "1.17.2",
   "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, query, searchData, sortData, isValidDate } = require('@cocreate/utils')
+const { dotNotationToObject, queryData, 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)
@@ -397,6 +405,10 @@ function object(method, data) {
                             }
                         } else if (isFilter) {
                             try {
+                                // TODO: index is 1 if indexeddb already returned an item interfering with query
+                                // if (data.array === "keys")
+                                //     index = 0
+
                                 if (method === 'read')
                                     projection = { ...projections, ...projection }
 
@@ -424,7 +436,7 @@ function object(method, data) {
                                         let object = data[type].find(obj => obj._id && obj._id.toString() === document._id.toString())
                                         if (object) {
                                             if (object.$storage && object.modified && object.modified.on) {
-                                                if (document && new Date(object.modified.on) > new Date(document.modified.on)) {
+                                                if (document && document.modified && new Date(object.modified.on) > new Date(document.modified.on)) {
                                                     object = { ...document, ...object }
                                                     createUpdate(update, options, object)
                                                     document = await arrayObj.updateOne(query, update, options);
@@ -643,7 +655,7 @@ async function createFilter(data, arrayObj) {
     }
 
     if (data['organization_id'])
-        query['organization_id'] = { $eq: data['organization_id'] }
+        query['organization_id'] = data['organization_id']
 
     return { query, sort, index, limit, count }
 }
@@ -730,19 +742,23 @@ function getBytes(data) {
 }
 
 function errorHandler(data, error, database, array) {
-    if (typeof error == 'object')
-        error['storage'] = 'mongodb'
-    else
-        error = { storage: data.storageName, message: error }
+    let errorMessage = typeof error === 'object' && error.message ? error.message : error;
+
+    let errorObject = {
+        message: errorMessage,
+        storage: 'mongodb'
+    };
 
     if (database)
-        error['database'] = database
+        errorObject.database = database;
     if (array)
-        error['array'] = array
-    if (data.error)
-        data.error.push(error)
-    else
-        data.error = [error]
+        errorObject.array = array;
+
+    if (Array.isArray(data.error)) {
+        data.error.push(errorObject);
+    } else {
+        data.error = [errorObject];
+    }
 }
 
 module.exports = { send }