@cocreate/mongodb 1.9.0 → 1.10.0

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+# [1.10.0](https://github.com/CoCreate-app/CoCreate-mongodb/compare/v1.9.1...v1.10.0) (2023-10-09)
+
+
+### Bug Fixes
+
+* ObjectId generated by db to maintain integrity and atomicity of message_log ([63a1d4a](https://github.com/CoCreate-app/CoCreate-mongodb/commit/63a1d4a0f7387cf5a7ea242de8c5047572377313))
+
+
+### Features
+
+* $currentDate operator to add timestamp in ([057e067](https://github.com/CoCreate-app/CoCreate-mongodb/commit/057e067ee6e359a901736f43955883935330436d))
+* isValidDate imported from utils to check key values for date strings and convert to date object ([16f6695](https://github.com/CoCreate-app/CoCreate-mongodb/commit/16f6695a67e43232a5feccee70e19b826bc43b3a))
+* Support for $each update operator ([d955bd6](https://github.com/CoCreate-app/CoCreate-mongodb/commit/d955bd6b4f15db5d745ed1d392637aa4348d1aa5))
+
+## [1.9.1](https://github.com/CoCreate-app/CoCreate-mongodb/compare/v1.9.0...v1.9.1) (2023-09-18)
+
+
+### Bug Fixes
+
+*  Add path and pathname ([7ae3b2d](https://github.com/CoCreate-app/CoCreate-mongodb/commit/7ae3b2d7b57fdfbbfe26782ca260e5ad01b13cd0))
+* Update dCoCreate dpendencies to latest versions ([b583adc](https://github.com/CoCreate-app/CoCreate-mongodb/commit/b583adc423db188577fe8e1fbac6304dabf8c86a))
+
 # [1.9.0](https://github.com/CoCreate-app/CoCreate-mongodb/compare/v1.8.0...v1.9.0) (2023-09-17)
 
 

package/CoCreate.config.js

@@ -8,15 +8,15 @@ module.exports = {
             "object": {
                 "_id": "60145dc49f64ba1680b86693",
                 "name": "index.html",
-                "path": "/docs/mongodb/index.html",
+                "path": "/docs/mongodb",
+                "pathname": "/docs/mongodb/index.html",
                 "src": "{{./docs/index.html}}",
                 "host": [
                     "*"
                 ],
-                "directory": "/docs/mongodb",
+                "directory": "mongodb",
                 "content-type": "text/html",
-                "public": "true",
-                "website_id": "5ffbceb7f11d2d00103c4535"
+                "public": "true"
             }
         }
     ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/mongodb",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "A simple mongodb component in vanilla javascript. Easily configured using HTML5 data-attributes and/or JavaScript API.",
   "keywords": [
     "mongodb",
@@ -45,7 +45,7 @@
   },
   "main": "./src/index.js",
   "dependencies": {
-    "@cocreate/utils": "^1.24.0",
+    "@cocreate/utils": "^1.24.2",
     "mongodb": "^4.12.1"
   }
 }

package/src/index.js

@@ -1,5 +1,5 @@
 const { MongoClient, ObjectId } = require('mongodb');
-const { dotNotationToObject, queryData, searchData, sortData } = require('@cocreate/utils')
+const { dotNotationToObject, queryData, searchData, sortData, isValidDate } = require('@cocreate/utils')
 const clients = new Map()
 
 
@@ -249,7 +249,9 @@ function object(action, data) {
                 data[type] = data.request
 
             if (!data['timeStamp'])
-                data['timeStamp'] = new Date().toISOString()
+                data['timeStamp'] = new Date()
+            else
+                data['timeStamp'] = new Date(data['timeStamp'])
 
             let databases = data.database;
             if (!Array.isArray(databases))
@@ -265,20 +267,21 @@ function object(action, data) {
                     const arrayObj = db.collection(array);
                     const reference = { $storage: data.storageName, $database: database, $array: array }
 
+                    if (!data[type])
+                        data[type] = []
                     if (data[type] && !Array.isArray(data[type]))
                         data[type] = [data[type]]
 
                     let isFilter
-                    if (data.$filter && data.$filter.query)
+                    if (data.$filter)
                         isFilter = true
+                    if (isFilter && !data[type].length)
+                        data[type] = [{}]
 
                     let filter = await createFilter(data, arrayObj);
 
                     let projections = {}, projection = {}, update = {}, options = {}
 
-                    if (isFilter && (!data[type] || !data[type].length))
-                        data[type] = [{}]
-
                     if (action === 'updateObject')
                         createUpdate(update, options, data, true)
 
@@ -294,7 +297,6 @@ function object(action, data) {
                         if (action === 'createObject') {
                             data[type][i] = replaceArray(data[type][i])
                             data[type][i] = dotNotationToObject(data[type][i])
-                            data[type][i]._id = ObjectId(data[type][i]._id)
                             data[type][i]['organization_id'] = data['organization_id'];
                             data[type][i]['created'] = { on: data.timeStamp, by: data.user_id || data.clientId }
                         } else if (action === 'readObject') {
@@ -305,25 +307,47 @@ function object(action, data) {
                             createUpdate(update, options, data[type][i])
                         }
 
-                        if (data[type][i]._id) {
-                            try {
-                                if (action !== 'createObject') {
-                                    query._id = ObjectId(data[type][i]._id)
+                        if (data[type][i]._id || action === 'createObject') {
+                            if (action !== 'createObject') {
+                                try {
+                                    query._id = new ObjectId(data[type][i]._id);
+                                } catch (error) {
+                                    if (action === 'updateObject' && options.upsert) {
+                                        data[type][i]._id = ObjectId()
+                                        query._id = data[type][i]._id;
+                                    } else {
+                                        errorHandler(data, error, database, array)
+                                        continue;
+                                    }
                                 }
+                            }
+
+                            try {
 
                                 dataTransferedOut += getBytes({ query, update, projection, options })
 
                                 let result
                                 if (action === 'createObject') {
-                                    let _id = data[type][i]._id.toString()
+                                    if (data[type][i]._id) {
+                                        try {
+                                            data[type][i]._id = new ObjectId(data[type][i]._id);
+                                        } catch (error) {
+                                            delete data[type][i]._id
+                                        }
+                                    }
+                                    result = await arrayObj.insertOne(data[type][i]);
                                     // TODO: type error occuring when pushing the item pushes but throws an error
-                                    documents.push({ ...data[type][i], ...reference, _id })
+                                    data[type][i]._id = result.insertedId.toString()
+                                    documents.push({ ...data[type][i], ...reference })
                                 } else if (action === 'readObject') {
                                     result = await arrayObj.findOne(query, projection);
                                     result._id = result._id.toString()
                                     documents.push({ ...result, ...reference })
                                 } else if (action === 'updateObject') {
                                     result = await arrayObj.updateOne(query, update, options);
+
+                                    // TODO: handle upsert false and id does not exist
+                                    data[type][i]._id = query._id.toString()
                                     documents.push({ ...data[type][i], ...reference })
                                 } else if (action === 'deleteObject') {
                                     result = await arrayObj.deleteOne(query);
@@ -347,6 +371,7 @@ function object(action, data) {
                                 const cursor = arrayObj.find(query, projection).sort(sort).skip(index).limit(limit);
                                 if (!(await cursor.hasNext()) && action === 'updateObject' && data.upsert)
                                     document = { _id: ObjectId(data[type][i]._id) }
+
                                 while (await cursor.hasNext() || document) {
                                     if (!document)
                                         document = await cursor.next();
@@ -366,32 +391,52 @@ function object(action, data) {
 
                                         let result
                                         if (action === 'updateObject') {
-                                            result = await arrayObj.updateOne({ _id: document._id }, update, options);
+                                            if (options.returnNewDocument) {
+                                                let object = await arrayObj.findOneAndUpdate({ _id: document._id }, update, options);
+                                                for (let key of Object.keys(object)) {
+                                                    if (key === '_id')
+                                                        continue
+                                                    let newArrayKey = options.newArray[key]
+                                                    // TODO: get index based on $operator
+                                                    let index = object[key].length - 1
+                                                    if (index >= 0)
+                                                        data[type][i][newArrayKey.replace('[]', `[${index}]`)] = data[type][i][newArrayKey]
+                                                }
+                                            } else
+                                                result = await arrayObj.updateOne({ _id: document._id }, update, options);
+                                            // TODO: if update.$push or update.$each read document with projection to get index and update the keys [] to include index
                                         } else if (action === 'deleteObject') {
                                             result = await arrayObj.deleteOne({ _id: document._id });
                                         }
 
                                         dataTransferedIn += getBytes(result)
                                         documents.push({ ...data[type][i], ...reference, _id: document._id.toString() })
+                                        data[type].push({ ...data[type][i], ...reference, _id: document._id.toString() })
+
                                     }
                                     document = ''
                                 }
                             } catch (error) {
                                 errorHandler(data, error, database, array)
                             }
-                        }
-                    }
 
-                    if (action === 'createObject') {
-                        try {
-                            dataTransferedOut += getBytes(data[type])
-                            const result = await arrayObj.insertMany(data[type]);
-                            dataTransferedIn += getBytes(result)
-                        } catch (error) {
-                            errorHandler(data, error, database, array)
                         }
                     }
 
+                    // if (action === 'createObject') {
+                    //     try {
+                    //         dataTransferedOut += getBytes(data[type])
+                    //         const result = await arrayObj.insertMany(data[type]);
+                    //         dataTransferedIn += getBytes(result)
+
+                    //         for (let i = 0; i < data[type].length; i++) {
+                    //             data[type][i]._id = data[type][i]._id.toString()
+                    //         }
+                    //     } catch (error) {
+                    //         errorHandler(data, error, database, array)
+                    //     }
+                    // }
+
                 }
             }
 
@@ -418,6 +463,7 @@ function createUpdate(update, options, data, isGlobal) {
     Object.keys(data).forEach(key => {
         if (isGlobal && !key.startsWith('$') || key === '_id')
             return
+        data[key] = isValidDate(data[key])
 
         let operator
         if (key.endsWith(']')) {
@@ -440,7 +486,20 @@ function createUpdate(update, options, data, isGlobal) {
         let originalKey = key
         key = key.replace(/\[(\d+)\]/g, '.$1');
 
-        let operators = ['$rename', '$inc', '$push', '$splice', '$unset', '$delete', '$slice', '$pop']
+        if (originalKey.endsWith('[]')) {
+            if (!options.projection) {
+                options.projection = {}
+                options.arrayKey = {}
+                options.returnNewDocument = true
+            } else {
+                options.projection[key.replace(operator + '.', '')] = 1
+                options.arrayKey[key.replace(operator + '.', '')] = originalKey
+            }
+            if (!key.startsWith('$'))
+                operator = '$push'
+        }
+
+        let operators = ['$rename', '$inc', '$push', '$each', '$splice', '$unset', '$delete', '$slice', '$pop', '$shift', '$addToSet', '$pull', '$currentDate']
         if (!operators.includes(operator) && typeof index !== 'number') {
             if (!isGlobal)
                 update['$set'][key] = data[originalKey]
@@ -467,21 +526,21 @@ function createUpdate(update, options, data, isGlobal) {
             key = arrayKey
             updates[key] = index || 1
         } else if (operator === '$addToSet' || operator === '$pull') {
-            key = arrayKey
             updates[key] = data[originalKey]
-        } else if (operator === '$push' || typeof index === 'number') {
-            if (!Array.isArray(data[originalKey]))
-                updates[key] = [data[originalKey]]
-            else
-                updates[key] = data[originalKey]
+        } else if (operator === '$push' || operator === '$each' || typeof index === 'number') {
+            updates[key] = data[originalKey]
+            if (typeof index === 'number' && index >= 0) {
+                if (operator === '$push')
+                    updates[key] = [data[originalKey]]
 
-            let insert = { $each: updates[key] }
-            if (typeof index === 'number' && index >= 0)
+                let insert = { $each: updates[key] }
                 insert.$postion = index
-
-            updates[key] = insert
+                updates[key] = insert
+            }
         } else if (operator === '$inc') {
             updates[key] = data[originalKey]
+        } else if (operator === '$currentDate') {
+            updates[key] = data[originalKey]
         }
 
         if (!update[operator])
@@ -490,7 +549,7 @@ function createUpdate(update, options, data, isGlobal) {
         if (key === operator)
             update[operator] = { ...update[operator], ...replaceArray(updates[key]) }
         else
-            update[operator][key.replace(operator, '')] = updates[key]
+            update[operator][key.replace(operator + '.', '')] = updates[key]
     })
 }
 
@@ -501,7 +560,6 @@ async function createFilter(data, arrayObj) {
         if (data.$filter.query)
             query = createQuery(data.$filter.query);
 
-
         if (data.$filter.sort) {
             for (let i = 0; i < data.$filter.sort.length; i++) {
                 let direction = data.$filter.sort[i].direction
@@ -545,11 +603,17 @@ function createQuery(queries) {
 
         if (item.key == "_id") {
             if (item.value)
-                item.value = ObjectId(item.value)
+                try {
+                    item.value = ObjectId(item.value)
+                } catch (error) {
+                    continue
+                }
             else
                 continue
         }
 
+        item.value = isValidDate(item.value)
+
         let key = item.key;
         if (!query[key]) {
             query[key] = {};
@@ -631,7 +695,7 @@ function createProjection(data) {
     return projection;
 }
 
-function replaceArray(data) {
+function replaceArray(data = {}) {
     let object = {}
 
     Object.keys(data).forEach((key) => {