@cocreate/indexeddb 1.3.11 → 1.4.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [1.4.0](https://github.com/CoCreate-app/CoCreate-indexeddb/compare/v1.3.12...v1.4.0) (2022-11-27)
+
+
+### Features
+
+* if sort is applied creates index on object store before opening cursor ([ce667c5](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/ce667c59582cd34c4ed2d89e597cb240452c4497))
+
+## [1.3.12](https://github.com/CoCreate-app/CoCreate-indexeddb/compare/v1.3.11...v1.3.12) (2022-11-26)
+
+
+### Bug Fixes
+
+* delete db, database and collection from doc before storing in indexeddb ([642bca1](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/642bca11d98fb89b6f3c2750286971309b1417bc))
+
 ## [1.3.11](https://github.com/CoCreate-app/CoCreate-indexeddb/compare/v1.3.10...v1.3.11) (2022-11-26)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/indexeddb",
-  "version": "1.3.11",
+  "version": "1.4.0",
   "description": "A simple indexeddb component in vanilla javascript. Easily configured using HTML5 data-attributes and/or JavaScript API.",
   "keywords": [
     "indexeddb",
@@ -61,8 +61,8 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/docs": "^1.4.5",
-    "@cocreate/hosting": "^1.6.4",
-    "@cocreate/utils": "^1.12.0"
+    "@cocreate/docs": "^1.4.6",
+    "@cocreate/hosting": "^1.6.5",
+    "@cocreate/utils": "^1.12.1"
   }
 }

package/src/index.js

@@ -424,7 +424,7 @@ const index = (action, data) => {
                         let indexNames = Array.from(objectStore.indexNames)
     
                         if (action == 'readIndex') {
-                            for (let index of Array.from(indexNames)) {
+                            for (let index of indexNames) {
                                 indexArray.push({name: index, db: 'indexeddb', database, collection})
                             }
                             collectionsLength -= 1
@@ -704,6 +704,10 @@ function runDocs({action, data, objectStore, documents, filterDocs, database, co
         if (docsLength > 0) {
             for (let doc of docs) {
                 // ToDo deDuplcate document_id per collection
+                delete doc.db
+                delete doc.database
+                delete doc.collection
+                
                 if (action == 'updateDocument' || action == 'deleteDocument') {
                     if (doc._id) {
                         doc['organization_id'] = data.organization_id
@@ -856,43 +860,51 @@ const readDocuments = (data, database, collection) => {
             try {
                 let transaction = db.transaction([collection], "readonly");
                 let objectStore = transaction.objectStore(collection);
-                let results = [];
-                // let index = objectStore.index(filter.name);
-                // let request = index.openCursor(IDBKeyRange.upperBound(filter.value));
-                let request = objectStore.openCursor();
-                // transaction.oncomplete = resolve(results);
-
-                request.onsuccess = function() {
-                    let isFilter;
-                    // if (data['organization_id']) {
-					// 	data['filter']['query']['organization_id'] = data['organization_id'];
-					// }
-
-                    let cursor = request.result;
-                    if (cursor) {
-                        let value = cursor.value;
-                        if (data.filter && data.filter.query)
-                            isFilter = queryData(value, data.filter.query);
-                        if (isFilter !== false)
-                            results.push(value)
-                        cursor.continue();
-                    } else {
-                        let docs = results
-                        if (data.filter) {
-                            if (data.filter.search)
-                            docs = searchData(docs, data.filter)
-                        }
 
-                        resolve(docs)
+                let count = objectStore.count();
+                count.onsuccess = function() {
+                    data.filter.count = count.result
+                }
+
+                if (data.filter && data.filter.sort && data.filter.sort[0] && data.filter.sort[0].name) {
+                    let sortType = data.filter.sort[0].type
+                    if (sortType == -1)
+                        sortType = 'prev'
+                    else
+                        sortType = 'next'
+
+                    let indexNames = Array.from(objectStore.indexNames)
+                    let indexName = data.filter.sort[0].name
+                    let indexExist = indexNames.includes(indexName)
+                    if (!indexExist) {
+                        db.close()
+                        getDatabase({database, upgrade: true}).then((db2) => {
+                            let transaction = db2.transaction;
+                            let objectStore = transaction.objectStore(collection);
+                            objectStore.createIndex(indexName, indexName, {unique: false})
+                            const indexStore = objectStore.index(indexName);
+
+                            readDocs(data, database, collection, indexStore, sortType).then((results) => {
+                                db2.close()
+                                resolve(results)
+                            })
+                        })
+                    } else {
+                        const indexStore = objectStore.index(indexName);
+                        readDocs(data, database, collection, indexStore, sortType).then((results) => {
+                            db.close()
+                            resolve(results)
+                        })
                     }
-                };
-                
-                request.onerror = function() {
-                    errorHandler(data, request.error, database, collection)
-                    resolve([])
-                };
+                } else {
+                    readDocs(data, database, collection, objectStore).then((results) => {
+                        db.close()
+                        resolve(results)
+                    })      
+                }
             } catch (err) {
                 errorHandler(data, err, database)
+                db.close()
                 resolve([])
                 return 
             }
@@ -906,6 +918,48 @@ const readDocuments = (data, database, collection) => {
     })
 }
 
+async function readDocs(data, database, collection, objectStore, sortType) {
+    return new Promise((resolve, reject) => {
+                
+        let results = [];
+        let index = data.filter.startIndex || 0
+        let limit = data.filter.limit
+        if (limit)
+            limit = index + limit;
+
+        const request = objectStore.openCursor(null, sortType);
+        request.onsuccess = function() {
+            let cursor = request.result;
+            if (cursor) {
+                let isFilter = true;
+                let value = cursor.value;
+                if (data.filter && data.filter.query)
+                    isFilter = queryData(value, data.filter.query);
+                if (isFilter && data.filter.search)
+                    isFilter = searchData(value, data.filter.search);
+                if (isFilter !== false)
+                    results.push(value)
+                if (limit && limit == results.length) {
+                    results = results.slice(index, limit)
+                    resolve(results)
+                } else
+                    cursor.continue();
+            } else {
+                if (index)
+                    results = results.slice(index)
+                resolve(results)
+            }
+        }
+        
+        request.onerror = function() {
+            errorHandler(data, request.error, database, collection)
+            db.close()
+            resolve([])
+        };
+
+    });
+}
+
 async function generateDB(data) {
 	const organization_id = data.organization_id;
 	const apiKey = data.apiKey;