@cocreate/indexeddb 1.13.5 → 1.14.1

package/.github/workflows/automated.yml

@@ -41,30 +41,4 @@ jobs:
     outputs:
       new_release_published: "${{ steps.semantic.outputs.new_release_published }}"
       new_release_version: "${{ steps.semantic.outputs.new_release_version }}"
-  upload:
-    runs-on: ubuntu-latest
-    needs: release
-    if: needs.release.outputs.new_release_published == 'true'
-    env:
-      VERSION: "${{ needs.release.outputs.new_release_version }}"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
-      - name: Set npm registry auth
-        run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
-      - name: Install dependencies
-        run: yarn install
-      - name: Build
-        run: yarn build
-      - name: Set Environment Variables
-        run: |
-          echo "organization_id=${{ secrets.COCREATE_ORGANIZATION_ID }}" >> $GITHUB_ENV
-          echo "key=${{ secrets.COCREATE_KEY }}" >> $GITHUB_ENV
-          echo "host=${{ secrets.COCREATE_HOST }}" >> $GITHUB_ENV
-      - name: CoCreate Upload
-        run: coc upload
 

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [1.14.1](https://github.com/CoCreate-app/CoCreate-indexeddb/compare/v1.14.0...v1.14.1) (2023-10-09)
+
+
+### Bug Fixes
+
+* bump cocreate dependency versions ([147ab07](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/147ab073cb7a86a5246c73657f9423e8ccdcd9cd))
+
+# [1.14.0](https://github.com/CoCreate-app/CoCreate-indexeddb/compare/v1.13.5...v1.14.0) (2023-10-09)
+
+
+### Bug Fixes
+
+* cursor() iteration bug ([394d1e9](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/394d1e98d56f94b1495aad44a78718d56199b728))
+* data.request and data.timeStamp conditions ([bf28152](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/bf28152bf181ea0ad4552a5d829f5b0c0d87396c))
+
+
+### Features
+
+* $each operator adds each item to an array ([b085764](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/b08576473b25534333d768930d97834fda885ff4))
+* isValidDate imported from utils to check key values for date strings and convert to object ([a822f9b](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/a822f9b97bbb11ab87b0ae47dcd543877b6c1cb4))
+* support update operators similar to mongodb ([dc7bd71](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/dc7bd71c57bcae8ad1760b01ebfe406aec3f8800))
+
 ## [1.13.5](https://github.com/CoCreate-app/CoCreate-indexeddb/compare/v1.13.4...v1.13.5) (2023-09-18)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/indexeddb",
-  "version": "1.13.5",
+  "version": "1.14.1",
   "description": "A simple indexeddb component in vanilla javascript. Easily configured using HTML5 data-attributes and/or JavaScript API.",
   "keywords": [
     "indexeddb",
@@ -58,6 +58,6 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/utils": "^1.24.1"
+    "@cocreate/utils": "^1.25.0"
   }
 }

package/src/index.js

@@ -15,15 +15,18 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  ********************************************************************************/
 
-// Commercial Licensing Information:
-// For commercial use of this software without the copyleft provisions of the AGPLv3,
-// you must obtain a commercial license from CoCreate LLC.
-// For details, visit <https://cocreate.app/licenses/> or contact us at sales@cocreate.app.
+/**
+ * Commercial Licensing Information:
+ * For commercial use of this software without the copyleft provisions of the AGPLv3,
+ * you must obtain a commercial license from CoCreate LLC.
+ * For details, visit <https://cocreate.app/licenses/> or contact us at sales@cocreate.app
+ */
 
-import { ObjectId, dotNotationToObject, searchData, sortData, queryData } from '@cocreate/utils'
+import { ObjectId, dotNotationToObject, searchData, sortData, queryData, isValidDate } from '@cocreate/utils'
 
 // let status = true;
 let indexedDbFunction
+
 function init() {
     // Check for support.
     if (!('indexedDB' in window)) {
@@ -73,9 +76,13 @@ async function send(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 (!databases && data.organization_id)
+                databases = [data.organization_id]
             if (!Array.isArray(databases))
                 databases = [databases]
 
@@ -112,8 +119,8 @@ const processDatabase = (data, newData, type) => {
         if (data.request)
             data[type] = data.request
 
-        if (!data['timeStamp'])
-            data['timeStamp'] = new Date().toISOString()
+        // if (!data['timeStamp'])
+        data['timeStamp'] = new Date(data['timeStamp'])
 
         if (data.method == 'read.database') {
             indexedDB.databases().then((databases) => {
@@ -121,9 +128,9 @@ const processDatabase = (data, newData, type) => {
                     if (data.$filter && data.$filter.query) {
                         let isFilter = queryData(database, data.$filter.query)
                         if (isFilter)
-                            newData.push({ $storage: 'indexeddb', $database: database })
+                            newData.push({ $storage: 'indexeddb', ...database })
                     } else
-                        newData.push({ $storage: 'indexeddb', $database: database })
+                        newData.push({ $storage: 'indexeddb', ...database })
                 }
 
                 resolve()
@@ -435,20 +442,30 @@ async function processObject(data, newData, database, array, type) {
     if (!array || !db)
         throw new Error({ error: "This is an error message.", db, array });
 
-    let transactionType = "readwrite"
+    let transactionType = "readwrite" //test
     if (data.method == 'read.object')
         transactionType = "readonly"
 
     let transaction = db.transaction([array], transactionType);
     let objectStore = transaction.objectStore(array);
-
+    if (!data[type])
+        data[type] = []
     if (data[type] && !Array.isArray(data[type]))
         data[type] = [data[type]]
 
-    if (isFilter && (!data[type] || !data[type].length))
+    if (isFilter && !data[type].length)
         data[type] = [{}]
 
+    let globalOperators = getGlobalOperators(data)
     let upsert = data.upsert
+
+    if (data.$filter) {
+        let count = objectStore.count();
+        count.onsuccess = function () {
+            data.$filter.count = count.result
+        }
+    }
+
     try {
 
         for (let i = 0; i < data[type].length; i++) {
@@ -457,6 +474,9 @@ async function processObject(data, newData, database, array, type) {
             delete data[type][i].$array
 
             if (data.method == 'create.object') {
+                if (data.organization_id)
+                    data[type][i]['organization_id'] = data.organization_id
+
                 if (!data[type][i]._id)
                     data[type][i]['_id'] = ObjectId()
                 data[type][i] = dotNotationToObject(data[type][i])
@@ -467,15 +487,15 @@ async function processObject(data, newData, database, array, type) {
             } else {
                 if (data[type][i].$filter)
                     isFilter = true
-                if (data.organization_id)
-                    data[type][i]['organization_id'] = data.organization_id
+                // if (data.organization_id)
+                //     data[type][i]['organization_id'] = data.organization_id
 
                 if (data.method == 'update.object') {
+                    if (data.organization_id)
+                        data[type][i]['organization_id'] = data.organization_id
+
                     if (data[type][i].$upsert)
                         upsert = data[type][i].$upsert
-
-                    if (!data[type][i]._id && upsert)
-                        data[type][i]._id = ObjectId()
                     data[type][i]['modified'] = { on: data.timeStamp, by: data.user_id || data.clientId }
                 }
 
@@ -483,10 +503,10 @@ async function processObject(data, newData, database, array, type) {
                 if (data[type][i]._id)
                     range = IDBKeyRange.only(data[type][i]._id);
                 else if (isFilter) {
-                    if (data.$filter || object.$filter) {
+                    if (data.object.$filter) {
                         let count = objectStore.count();
                         count.onsuccess = function () {
-                            data.$filter.count = count.result
+                            data.object.$filter.count = count.result
                         }
                     }
 
@@ -529,52 +549,212 @@ async function processObject(data, newData, database, array, type) {
                         if (data.$filter.limit)
                             limit = data.$filter.limit
                         if (limit)
-                            limit = index + limit;
+                            limit = (index || 0) + limit;
                     }
                 }
 
-                let cursor = await openCursor(objectStore, range, direction)
-                if (cursor) {
-                    let isMatch = true
-
-                    if (isFilter)
-                        isMatch = filter(objectStore, data[type][i], cursor.value)
-
-                    if (isMatch !== false) {
-                        let result
-                        if (data.method == 'create.object') {
-                            result = await add(objectStore, data[type][i])
-                        } else if (data.method == 'read.object') {
-                            result = await get(objectStore, data[type][i])
-                        } else if (data.method == 'update.object') {
-                            data[type][i] = dotNotationToObject(data[type][i], cursor.value)
-                            data[type][i] = createUpdate(data, data[type][i])
-                            result = await put(objectStore, data[type][i])
-                        } else if (data.method == 'delete.object') {
-                            result = await deleteObject(objectStore, data[type][i])
-                        }
+                await openCursor(objectStore, range, direction, data, newData, isFilter, limit, database, array, upsert, type, i, globalOperators);
 
-                        newData.push({ $storage: 'indexeddb', $database: database, $array: array, ...result })
-                    }
-
-                    limit && limit == newData.length ? '' : cursor.continue();
-
-                } else if (index)
+                if (index)
                     newData = newData.slice(index)
+
             }
+
         }
     } catch (error) {
+        console.log(error)
         errorHandler(data, error, database, array)
     }
 
     db.close()
 }
 
-function openCursor(objectStore, range, direction) {
+function getGlobalOperators(data, object = {}) {
+    for (let operator of Object.keys(data)) {
+        if (!operator.startsWith('$'))
+            return
+        for (let key of Object.keys(data[operator]))
+            object[operator + '.' + key] = data[operator][key]
+    }
+
+    return object
+}
+
+function createUpdate(update, data, globalOpertors) {
+    let operatorKeys = {}
+    if (globalOpertors)
+        operatorKeys = { ...globalOpertors }
+
+    Object.keys(data).forEach(key => {
+        if (key === '_id')
+            return
+
+        if (key.startsWith('$')) {
+            if (!key.includes('.'))
+                for (let oldkey of Object.keys(data[key]))
+                    operatorKeys[key + '.' + oldkey] = data[key][oldkey]
+            else
+                operatorKeys[key] = data[key]
+        } else if (typeof data[key] === 'string' && data[key].startsWith('$')) {
+            operatorKeys[data[key] + '.' + key] = data[key]
+        } else if (key.endsWith(']')) {
+            const regex = /^(.*(?:\[\d+\].*?)?)\[(.*?)\](?:\[\])?$/;
+            const match = key.match(regex);
+            if (match[2] === '')
+                operatorKeys['$push.' + match[1]] = data[key]
+            else {
+                let index = parseInt(match[2], 10);
+                if (index === NaN)
+                    operatorKeys[match[2] + '.' + match[1]] = data[key]
+                else
+                    operatorKeys[key] = data[key]
+            }
+        } else if (key.includes('.')) {
+            operatorKeys[key] = data[key]
+        } else if (data[key] === undefined) {
+            delete update[key]
+        } else
+            update[key] = data[key]
+
+    })
+
+    return dotNotationToObjectUpdate(operatorKeys, update)
+}
+
+function dotNotationToObjectUpdate(data, object = {}) {
+    try {
+        for (const key of Object.keys(data)) {
+            let value = isValidDate(data[key])
+            let newObject = object
+            let oldObject = new Object(newObject)
+            let keys = key.replace(/\[(\d+)\]/g, '.$1').split('.');
+
+            if (keys[0].startsWith('$'))
+                var operator = keys.shift()
+
+            let length = keys.length - 1
+            for (let i = 0; i < keys.length; i++) {
+                if (/^\d+$/.test(keys[i]))
+                    keys[i] = parseInt(keys[i]);
+
+                if (length == i) {
+                    if (operator) {
+                        let operators = ['$rename', '$inc', '$push', '$each', '$splice', '$unset', '$delete', '$slice', '$pop', '$shift', '$addToSet', '$pull']
+                        if (!operators.includes(operator))
+                            continue
+                        if (operator === '$rename') {
+                            newObject[value] = newObject[keys[i]]
+                            delete newObject[keys[i]]
+                        } else if (operator === '$delete' || operator === '$unset' || operator === '$slice') {
+                            if (typeof keys[i] === 'number')
+                                newObject.slice(keys[i], 1);
+                            else
+                                delete newObject[keys[i]]
+                        } else if (operator === '$shift') {
+                            newObject[keys[i]].shift();
+                        } else if (operator === '$pop') {
+                            newObject[keys[i]].pop();
+                        } else if (operator === '$addToSet' || operator === '$pull') {
+                            // find matching items and update or delete
+                            key = arrayKey
+                            updates[key] = data[originalKey]
+                        } else if (operator === '$push' || operator === '$splice') {
+                            if (typeof keys[i] === 'number' && newObject.length >= keys[i])
+                                newObject.splice(keys[i], 0, value);
+                            else
+                                newObject[keys[i]].push(value);
+                        } else if (operator === '$each') {
+                            if (!Array.isArray(value))
+                                value = [value]
+                            if (typeof keys[i] === 'number')
+                                newObject.splice(keys[i], 0, ...value);
+                            else
+                                newObject[keys[i]].push(...value);
+                        } else if (operator === '$inc') {
+                            newObject[keys[i]] += value
+                        }
+                    } else if (value === undefined) {
+                        if (typeof keys[i] === 'number')
+                            newObject.slice(keys[i], 1);
+                        else
+                            delete newObject[keys[i]]
+                    } else
+                        newObject[keys[i]] = value;
+                } else {
+                    newObject[keys[i]] = oldObject[keys[i]] || {};
+                    newObject = newObject[keys[i]]
+                    oldObject = oldObject[keys[i]]
+                }
+            }
+        }
+        return object
+    } catch (error) {
+        console.log("Error converting dot notation to object", error);
+        return false;
+    }
+}
+
+function openCursor(objectStore, range, direction, data, newData, isFilter, limit, database, array, upsert, type, i, globalOperators) {
     return new Promise(async (resolve, reject) => {
-        const request = objectStore.openCursor(range, direction);// next, prev
-        request.onsuccess = () => resolve(request.result);
-        request.onerror = () => reject(request.error)
+        const request = objectStore.openCursor(range || null, direction);// next, prev
+
+        request.onsuccess = async () => {
+            let cursor = request.result
+
+            if (!cursor && data.method === 'update.object' && upsert) {
+                let isMatch = true
+                if (isFilter)
+                    isMatch = filter(objectStore, data[type][i], data[type][i])
+
+                if (isMatch !== false) {
+                    try {
+                        data[type][i]._id = ObjectId(data[type][i]._id);
+                    } catch (error) {
+                        data[type][i]._id = ObjectId()
+                    }
+
+                    let result = await put(objectStore, data[type][i])
+                    newData.push({ $storage: 'indexeddb', $database: database, $array: array, ...result })
+                }
+            } else if (cursor) {
+                let isMatch = true
+
+                if (isFilter)
+                    isMatch = filter(objectStore, data, data[type][i], cursor.value)
+
+                if (isMatch !== false) {
+                    let result = cursor.value
+                    if (data.method == 'create.object') {
+                        result = await add(objectStore, data[type][i])
+                    } else if (data.method == 'update.object') {
+                        let update = createUpdate(cursor.value, data[type][i], globalOperators)
+                        if (update)
+                            result = await put(objectStore, update)
+                        // set dotnotation for keys with $operators for items that end in [] to be used by socket.id
+                        // TODO: if update.$<operator>.someKey[] requires the index of inerted item added to the field name. update.$<operator>.someKey[<index>] 
+                        // TODO: if $addToSet get field name and item if it does not exist. 
+                        // TODO: if $pull get field name and find if item exist and delete.
+                    } else if (data.method == 'delete.object') {
+                        result = cursor.value
+                        cursor.delete()
+                    }
+
+                    newData.push({ $storage: 'indexeddb', $database: database, $array: array, ...result })
+                }
+
+                if (!limit || limit && limit < newData.length) {
+                    cursor.continue();
+                } else {
+                    cursor.close()
+                }
+            } else {
+                resolve();
+            }
+        }
+
+        request.onerror = () => {
+            reject(request.error)
+        }
     });
 }
 
@@ -611,25 +791,7 @@ function deleteObject(objectStore, object) {
 }
 
 
-function createUpdate(data, object) {
-    if (data.updateName) {
-        for (let key of Object.keys(data.updateName)) {
-            let val = object[key]
-            delete object[key]
-            object[data.updateName[key]] = val
-        }
-    }
-
-    if (data.deleteName) {
-        for (let key of Object.keys(data.deleteName)) {
-            delete object[key]
-        }
-
-    }
-    return object
-}
-
-function filter(data, object, result) {
+function filter(objectStore, data, object, result) {
     let isMatch = true;
 
     if (data.$filter || object.$filter) {
@@ -689,4 +851,4 @@ function errorHandler(data, error, database, array) {
 
 init();
 
-export default { send }
+export default { send, ObjectId }

package/test/index.html

@@ -15,8 +15,9 @@
 
     <body>
         <!-- <script src="../../../CoCreateJS/dist/CoCreate.js"></script> -->
-        <script src="https://CoCreate.app/dist/CoCreate.js"></script>
-        <!-- <script src="../dist/CoCreate-indexeddb.js"></script> -->
+        <script src="https://cocreate.app/dist/CoCreate.js"></script>
+        <!-- <script src="../../../CoCreateJS/dist/indexeddb-chunk.js"></script> -->
+        <script src="./operators.js"></script>
         <script src="./databases.js"></script>
         <script src="./arrays.js"></script>
         <script src="./indexes.js"></script>

package/test/operators.js

@@ -0,0 +1,105 @@
+function createUpdate(update, data, globalOpertors) {
+    let operatorKeys = {}
+    if (globalOpertors)
+        operatorKeys = { ...globalOpertors }
+
+    Object.keys(data).forEach(key => {
+        if (key === '_id')
+            return
+
+        if (key.startsWith('$')) {
+            if (!key.includes('.'))
+                for (let oldkey of Object.keys(data[key]))
+                    operatorKeys[key + '.' + oldkey] = data[key][oldkey]
+            else
+                operatorKeys[key] = data[key]
+        } else if (typeof data[key] === 'string' && data[key].startsWith('$')) {
+            operatorKeys[data[key] + '.' + key] = data[key]
+        } else if (key.endsWith(']')) {
+            const regex = /^(.*(?:\[\d+\].*?)?)\[(.*?)\](?:\[\])?$/;
+            const match = key.match(regex);
+            if (match[2] === '')
+                operatorKeys['$push.' + match[1]] = data[key]
+            else {
+                let index = parseInt(match[2], 10);
+                if (index === NaN)
+                    operatorKeys[match[2] + '.' + match[1]] = data[key]
+                else
+                    operatorKeys[key] = data[key]
+            }
+        } else if (key.includes('.')) {
+            operatorKeys[key] = data[key]
+        } else if (data[key] === undefined) {
+            delete update[key]
+        } else
+            update[key] = data[key]
+
+    })
+
+    return dotNotationToObjectUpdate(operatorKeys, update)
+}
+
+function dotNotationToObjectUpdate(data, object = {}) {
+    try {
+        for (const key of Object.keys(data)) {
+            let value = data[key]
+            let newObject = object
+            let oldObject = new Object(newObject)
+            let keys = key.replace(/\[(\d+)\]/g, '.$1').split('.');
+
+            if (keys[0].startsWith('$'))
+                var operator = keys.shift()
+
+            let length = keys.length - 1
+            for (let i = 0; i < keys.length; i++) {
+                if (/^\d+$/.test(keys[i]))
+                    keys[i] = parseInt(keys[i]);
+
+                if (length == i) {
+                    // TODO: operator updates
+                    if (operator) {
+                        if (operator === '$rename') {
+                            newObject[value] = newObject[keys[i]]
+                            delete newObject[keys[i]]
+                        } else if (operator === '$delete' || operator === '$unset' || operator === '$slice') {
+                            if (typeof keys[i] === 'number')
+                                newObject.slice(keys[i], 1);
+                            else
+                                delete newObject[keys[i]]
+                        } else if (operator === '$shift') {
+                            newObject[keys[i]].shift();
+                        } else if (operator === '$pop') {
+                            newObject[keys[i]].pop();
+                        } else if (operator === '$addToSet' || operator === '$pull') {
+                            // find matching items and update or delete
+                            key = arrayKey
+                            updates[key] = data[originalKey]
+                        } else if (operator === '$push' || operator === '$splice') {
+                            // TODO: support pushing an array as values
+                            if (typeof keys[i] === 'number' && newObject.length >= keys[i])
+                                newObject.splice(keys[i], 0, value);
+                            else
+                                newObject[keys[i]].push(value);
+                        } else if (operator === '$inc') {
+                            newObject[keys[i]] += value
+                        }
+                    } else if (value === undefined) {
+                        if (typeof keys[i] === 'number')
+                            newObject.slice(keys[i], 1);
+                        else
+                            delete newObject[keys[i]]
+                    } else
+                        newObject[keys[i]] = value;
+                } else {
+                    newObject[keys[i]] = oldObject[keys[i]] || {};
+                    newObject = newObject[keys[i]]
+                    oldObject = oldObject[keys[i]]
+                }
+            }
+        }
+        return object
+    } catch (error) {
+        console.log("Error converting dot notation to object", error);
+        return false;
+    }
+}