@cocreate/indexeddb 1.17.2 → 1.18.0

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [1.18.0](https://github.com/CoCreate-app/CoCreate-indexeddb/compare/v1.17.2...v1.18.0) (2023-11-16)
+
+
+### Bug Fixes
+
+* set $filter.startingIndex ([18888cf](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/18888cf2cbfd8e8264a26f5274f2fb781c779308))
+
+
+### Features
+
+* cursor.advance(index) ([699d83f](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/699d83ffb4f5630fdbfa73b73b337fd0f08290a4))
+* cursorUpdate ([5873caf](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/5873caf4d7fdc6da860e7c2ed01fb7d75f28143f))
+
 ## [1.17.2](https://github.com/CoCreate-app/CoCreate-indexeddb/compare/v1.17.1...v1.17.2) (2023-11-12)
 
 

package/package.json

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

package/src/index.js

@@ -555,14 +555,11 @@ async function processObject(data, newData, database, array, type) {
                             limit = data[type][i].$filter.limit
                     }
 
-                    if (limit)
-                        limit = (index || 0) + limit;
-
                 } else if (data.method == 'object.delete' || data.method == 'object.update' && !range && !upsert && !isFilter) {
                     continue
                 }
 
-                await openCursor(objectStore, range, direction, data, newData, isFilter, limit, database, array, upsert, type, i, globalOperators, reference);
+                await openCursor(objectStore, range, direction, data, newData, isFilter, index, limit, database, array, upsert, type, i, globalOperators, reference);
 
                 if (index)
                     newData = newData.slice(index)
@@ -581,11 +578,11 @@ async function processObject(data, newData, database, array, type) {
     }
 }
 
-function openCursor(objectStore, range, direction, data, newData, isFilter, limit, database, array, upsert, type, i, globalOperators, reference) {
+function openCursor(objectStore, range, direction, data, newData, isFilter, index, limit, database, array, upsert, type, i, globalOperators, reference) {
     return new Promise(async (resolve, reject) => {
         const request = objectStore.openCursor(range || null, direction);// next, prev
 
-        let hasUpdated, matchedLength = 0
+        let hasUpdated, matchedLength = 0, hasSkipped
         request.onsuccess = async () => {
             let cursor = request.result
 
@@ -622,47 +619,48 @@ function openCursor(objectStore, range, direction, data, newData, isFilter, limi
                 }
                 resolve();
             } 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 (index && !hasSkipped) {
+                    cursor.advance(index);
+                    hasSkipped = true;
+                } else {
+                    let isMatch = true
+                    if (isFilter)
+                        isMatch = filter(objectStore, data, data[type][i], cursor.value)
+
+                    if (isMatch !== false) {
+                        let result = cursor.value
+
+                        if (data.method == 'object.update') {
+                            let update = createUpdate(cursor.value, data[type][i], globalOperators)
+                            if (update)
+                                result = await cursorUpdate(cursor, update)
+                            // result = cursor.update(update)
+                            hasUpdated = true
+                            // 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 == 'object.delete') {
+                            result = cursor.value
+                            cursor.delete()
+                        }
 
-                    if (data.method == 'object.update') {
-                        let update = createUpdate(cursor.value, data[type][i], globalOperators)
-                        if (update)
-                            result = await put(objectStore, update)
-                        hasUpdated = true
-                        // 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 == 'object.delete') {
-                        result = cursor.value
-                        cursor.delete()
+                        if (data[type][i]._id)
+                            data[type][i] = { ...reference, ...result }
+                        else {
+                            let object = data[type].find(obj => obj._id && obj._id === result._id)
+                            if (object)
+                                object = { ...reference, ...object, ...result }
+                            else
+                                newData.push({ ...reference, ...result })
+                        }
                     }
 
-                    if (data[type][i]._id)
-                        data[type][i] = { ...reference, ...result }
-                    else {
-                        let object = data[type].find(obj => obj._id && obj._id === result._id)
-                        if (object)
-                            object = { ...reference, ...object, ...result }
-                        else
-                            newData.push({ ...reference, ...result })
+                    if (!limit || limit && (limit > newData.length + matchedLength)) {
+                        cursor.continue();
+                    } else {
+                        resolve();
                     }
-
-                    matchedLength++
-                }
-
-                if (!limit || limit && (limit > newData.length || limit > matchedLength)) {
-                    cursor.continue();
-                } else if (cursor.close) {
-                    cursor.close()
-                    resolve();
-                } else {
-                    resolve();
                 }
 
             } else {
@@ -712,6 +710,14 @@ function deleteObject(objectStore, object) {
     });
 }
 
+function cursorUpdate(cursor, update) {
+    return new Promise((resolve, reject) => {
+        const request = cursor.update(update)
+        request.onsuccess = () => resolve(request.source.value);
+        request.onerror = () => reject(request.error);
+    });
+}
+
 
 function filter(objectStore, data, object, result) {
     let isMatch = true;
@@ -781,7 +787,7 @@ function dotNotationToObjectUpdate(data, object = {}) {
             let newObject = object
             let oldObject = new Object(newObject)
             let keys = key.replace(/\[(\d+)\]/g, '.$1').split('.');
-
+            let value = data[key]
             if (keys[0].startsWith('$'))
                 var operator = keys.shift()
 
@@ -861,6 +867,8 @@ function createData(data, newData, type) {
     if (data.$filter) {
         if (data.$filter.sort)
             data[type] = sortData(data[type], data.$filter.sort)
+
+        data.$filter.startingIndex = data.$filter.index
         data.$filter.index += data[type].length
     }