@cocreate/indexeddb 1.17.0 → 1.17.2

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [1.17.2](https://github.com/CoCreate-app/CoCreate-indexeddb/compare/v1.17.1...v1.17.2) (2023-11-12)
+
+
+### Bug Fixes
+
+* bump dependencies for latest features ([df1aa3a](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/df1aa3a5053e068f6f47a66d1d388314c202607c))
+* isFIlter condition ([9fcbb15](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/9fcbb158dad0c8fab4bc09c6701ad2d0c868ab03))
+* limit handling ([43fe9c6](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/43fe9c6d2029aa1486488c944c51c9ba342e4ebf))
+* set $filter.index ([ab739a5](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/ab739a5b41fe5a2ab10e799f328650e9f14a46d1))
+
+## [1.17.1](https://github.com/CoCreate-app/CoCreate-indexeddb/compare/v1.17.0...v1.17.1) (2023-11-09)
+
+
+### Bug Fixes
+
+* $storage, $database, $array are arrays ([b6374f8](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/b6374f84e4ff13751cc357bbba8d4c883380083f))
+* meta name typo ([da33128](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/da331289589ea151f78ce25942e18e133f6b87f1))
+* update crud methods ([c74ed56](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/c74ed5688bd9a25f4eb524064b799ad678bdcc57))
+* updated date to ISO format with UTC timezone ([8bcc59a](https://github.com/CoCreate-app/CoCreate-indexeddb/commit/8bcc59a7d715937c6de139dcb12951a686aa1cff))
+
 # [1.17.0](https://github.com/CoCreate-app/CoCreate-indexeddb/compare/v1.16.2...v1.17.0) (2023-11-03)
 
 

package/docs/index.html

@@ -11,10 +11,10 @@
             sizes="32x32"
             href="https://cocreate.app/images/favicon.ico" />
         <meta
-            key="description"
+            name="description"
             content="A simple HTML5 and pure javascript component. Easy configuration using data-attributes and highly styleable." />
         <meta
-            key="keywords"
+            name="keywords"
             content="helper classes, utility classes, css framework, css library, inline style classes" />
         <meta name="robots" content="index,follow" />
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/indexeddb",
-  "version": "1.17.0",
+  "version": "1.17.2",
   "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.26.2"
+    "@cocreate/utils": "^1.27.1"
   }
 }

package/src/index.js

@@ -22,9 +22,8 @@
  * For details, visit <https://cocreate.app/licenses/> or contact us at sales@cocreate.app
  */
 
-import { ObjectId, dotNotationToObject, searchData, sortData, queryData, isValidDate } from '@cocreate/utils'
+import { ObjectId, dotNotationToObject, searchData, sortData, queryData } from '@cocreate/utils'
 
-// let status = true;
 let indexedDbFunction
 
 function init() {
@@ -71,9 +70,7 @@ async function send(data) {
                 await processDatabase(data, newData, type)
         } else {
             if (!data['timeStamp'])
-                data['timeStamp'] = new Date()
-            else
-                data['timeStamp'] = new Date(data['timeStamp'])
+                data['timeStamp'] = new Date().toISOString();
 
             let databases = data.database;
             if (!databases && data.organization_id)
@@ -121,9 +118,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 })
+                            newData.push({ $storage: ['indexeddb'], ...database })
                     } else
-                        newData.push({ $storage: 'indexeddb', ...database })
+                        newData.push({ $storage: ['indexeddb'], ...database })
                 }
 
                 resolve()
@@ -274,9 +271,9 @@ async function processArray(data, newData, database, type) {
             if (data.$filter && data.$filter.query) {
                 let isFilter = queryData({ name: objectStoreNames[i] }, data.$filter.query)
                 if (isFilter)
-                    newData.push({ name: objectStoreNames, $storage: 'indexeddb', $database: database })
+                    newData.push({ name: objectStoreNames, $storage: ['indexeddb'], $database: [database] })
             } else
-                newData.push({ name: objectStoreNames[i], $storage: 'indexeddb', $database: database })
+                newData.push({ name: objectStoreNames[i], $storage: ['indexeddb'], $database: [database] })
         }
     } else {
         db.close()
@@ -324,7 +321,7 @@ async function processArray(data, newData, database, type) {
                     }
 
                     if (!error)
-                        newData.push({ name: array, $storage: 'indexeddb', $database: database, array })
+                        newData.push({ name: array, $storage: ['indexeddb'], $database: [database] })
                     else
                         errorHandler(data, error, database)
 
@@ -361,7 +358,7 @@ async function processIndex(data, newData, database, array, type) {
                 if (data.$filter && data.$filter.query)
                     if (!(queryData({ name }, data.$filter.query))) continue
 
-                newData.push({ name, $storage: 'indexeddb', $database: database, $array: array })
+                newData.push({ name, $storage: ['indexeddb'], $database: [database], $array: [array] })
             }
             db.close()
         } else {
@@ -398,10 +395,10 @@ async function processIndex(data, newData, database, array, type) {
                             error = 'new index name already exist'
                     }
                 } else
-                    error = 'index does not exist'
+                    error = 'index does not exist';
 
                 if (!error)
-                    newData.push({ name: index, $storage: 'indexeddb', $database: database, $array: array })
+                    newData.push({ name: index, $storage: ['indexeddb'], $database: [database], $array: [array] })
                 else
                     errorHandler(data, error, database, array)
 
@@ -415,8 +412,13 @@ async function processObject(data, newData, database, array, type) {
     let db = await processDatabase({ method: 'database.get', database })
 
     try {
+        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
 
         let arrayExist = db.objectStoreNames.contains(array)
@@ -432,10 +434,6 @@ async function processObject(data, newData, database, array, type) {
         if (!array || !db)
             throw new Error({ error: "This is an error message.", db, array });
 
-        if (!data[type])
-            data[type] = []
-        if (data[type] && !Array.isArray(data[type]))
-            data[type] = [data[type]]
 
         if ((isFilter && !data[type].length) || data.isFilter)
             data[type] = [{ isFilter: 'isEmptyObjectFilter' }];
@@ -452,6 +450,8 @@ async function processObject(data, newData, database, array, type) {
         let upsert = data.upsert
 
         for (let i = 0; i < data[type].length; i++) {
+            const reference = { $storage: ['indexeddb'], $database: [database], $array: [array] }
+
             delete data[type][i].$storage
             delete data[type][i].$database
             delete data[type][i].$array
@@ -467,9 +467,7 @@ async function processObject(data, newData, database, array, type) {
                 // TODO: user_id || clientId shohould be retrieved from CoCreate
                 data[type][i]['created'] = { on: data.timeStamp, by: data.user_id || data.clientId }
                 data[type][i] = await add(objectStore, data[type][i])
-                data[type][i].$storage = 'indexeddb'
-                data[type][i].$database = database
-                data[type][i].$array = array
+                data[type][i] = { ...reference, ...data[type][i] }
 
             } else {
                 if (data[type][i].$filter)
@@ -482,7 +480,8 @@ async function processObject(data, newData, database, array, type) {
                     if (data[type][i].$upsert)
                         upsert = data[type][i].$upsert
                     // TODO: user_id || clientId shohould be retrieved from CoCreate
-                    data[type][i]['modified'] = { on: data.timeStamp, by: data.user_id || data.clientId }
+                    if (!data[type][i].modified)
+                        data[type][i].modified = { on: data.timeStamp, by: data.user_id || data.clientId }
                 }
 
                 let index = 0, limit, range, direction
@@ -563,7 +562,7 @@ async function processObject(data, newData, database, array, type) {
                     continue
                 }
 
-                await openCursor(objectStore, range, direction, data, newData, isFilter, limit, database, array, upsert, type, i, globalOperators);
+                await openCursor(objectStore, range, direction, data, newData, isFilter, limit, database, array, upsert, type, i, globalOperators, reference);
 
                 if (index)
                     newData = newData.slice(index)
@@ -582,7 +581,7 @@ async function processObject(data, newData, database, array, type) {
     }
 }
 
-function openCursor(objectStore, range, direction, data, newData, isFilter, limit, database, array, upsert, type, i, globalOperators) {
+function openCursor(objectStore, range, direction, data, newData, isFilter, limit, database, array, upsert, type, i, globalOperators, reference) {
     return new Promise(async (resolve, reject) => {
         const request = objectStore.openCursor(range || null, direction);// next, prev
 
@@ -616,9 +615,7 @@ function openCursor(objectStore, range, direction, data, newData, isFilter, limi
                         if (update)
                             data[type][i] = await put(objectStore, update)
                     }
-                    data[type][i].$storage = 'indexeddb'
-                    data[type][i].$database = database
-                    data[type][i].$array = array
+                    data[type][i] = { ...reference, ...data[type][i] }
 
                     matchedLength++
 
@@ -647,19 +644,19 @@ function openCursor(objectStore, range, direction, data, newData, isFilter, limi
                     }
 
                     if (data[type][i]._id)
-                        data[type][i] = { $storage: 'indexeddb', $database: database, $array: array, ...result }
+                        data[type][i] = { ...reference, ...result }
                     else {
                         let object = data[type].find(obj => obj._id && obj._id === result._id)
                         if (object)
-                            object = { $storage: 'indexeddb', $database: database, $array: array, ...object, ...result }
+                            object = { ...reference, ...object, ...result }
                         else
-                            newData.push({ $storage: 'indexeddb', $database: database, $array: array, ...result })
+                            newData.push({ ...reference, ...result })
                     }
 
                     matchedLength++
                 }
 
-                if (!limit || limit && (limit < newData.length || limit < matchedLength)) {
+                if (!limit || limit && (limit > newData.length || limit > matchedLength)) {
                     cursor.continue();
                 } else if (cursor.close) {
                     cursor.close()
@@ -781,7 +778,6 @@ function createUpdate(update, data, globalOpertors) {
 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('.');
@@ -862,9 +858,11 @@ function createData(data, newData, type) {
 
     data[type].push(...newData)
 
-    if (data.$filter && data.$filter.sort)
-        data[type] = sortData(data[type], data.$filter.sort)
-
+    if (data.$filter) {
+        if (data.$filter.sort)
+            data[type] = sortData(data[type], data.$filter.sort)
+        data.$filter.index += data[type].length
+    }
 
     return data
 }

package/test/collections.js

@@ -4,7 +4,7 @@ async function testArrays() {
         return;
     } else {
 
-        let createObject = await CoCreate.indexeddb.process({
+        let createObject = await Coindex.createeddb.process({
             method: 'array.create',
             database: ['testDatabase', 'testDatabase1', 'testDatabase2'],
             array: ['testArray', 'testArray1', 'testArray2']
@@ -12,13 +12,13 @@ async function testArrays() {
         })
         console.log('createObject', createObject)
 
-        let readObject = await CoCreate.indexeddb.process({
+        let readObject = await Coindex.createeddb.process({
             method: 'array.read',
             database: ['testDatabase', 'testDatabase1', 'testDatabase2'],
         })
         console.log('readObject', readObject)
 
-        let updateObject = await CoCreate.indexeddb.process({
+        let updateObject = await Coindex.createeddb.process({
             method: 'array.update',
             database: ['testDatabase', 'testDatabase1', 'testDatabase2'],
             array: { testArray: 'testArrayA' }
@@ -26,7 +26,7 @@ async function testArrays() {
         console.log('updateObject', updateObject)
 
 
-        let deleteObject = await CoCreate.indexeddb.process({
+        let deleteObject = await Coindex.createeddb.process({
             method: 'array.delete',
             database: ['testDatabase', 'testDatabase1', 'testDatabase2'],
             array: ['testArrayA', 'testArray1', 'testArray2']

package/test/databases.js

@@ -3,26 +3,26 @@ async function testDatabases() {
         console.log("This browser doesn't support IndexedDB.");
         return;
     } else {
-        let createDatabase = await CoCreate.indexeddb.process({
+        let createDatabase = await Coindex.createeddb.process({
             method: 'database.create',
             database: 'testDB',
         })
         console.log('createDatabase', createDatabase)
 
-        let readDatabase = await CoCreate.indexeddb.process({
+        let readDatabase = await Coindex.createeddb.process({
             method: 'database.read',
             database: 'testDB',
         })
         console.log('readDatabase', readDatabase)
 
-        let updateDatabase = await CoCreate.indexeddb.process({
+        let updateDatabase = await Coindex.createeddb.process({
             method: 'database.update',
             database: { testDB: 'testDatabase1' }
         })
         console.log('updateDatabase', updateDatabase)
 
 
-        let deleteDatabase = await CoCreate.indexeddb.process({
+        let deleteDatabase = await Coindex.createeddb.process({
             method: 'database.delete',
             database: ['testDB', 'testDB1', 'testDB2'],
         })

package/test/documents.js

@@ -4,7 +4,7 @@ async function testDocuments() {
         return;
     } else {
 
-        let createObject = await CoCreate.indexeddb.process({
+        let createObject = await Coindex.createeddb.process({
             method: 'object.create',
             database: ['testDatabase', 'testDatabase1', 'testDatabase2'],
             array: ['testArray', 'testArray1', 'testArray2'],
@@ -18,7 +18,7 @@ async function testDocuments() {
         console.log('createObject', createObject)
         let _id = createObject.object[0]._id
 
-        let readObject = await CoCreate.indexeddb.process({
+        let readObject = await Coindex.createeddb.process({
             method: 'object.read',
             database: ['testDatabase', 'testDatabase1', 'testDatabase2'],
             array: ['testArray', 'testArray1', 'testArray2'],
@@ -29,7 +29,7 @@ async function testDocuments() {
         })
         console.log('readObject', readObject)
 
-        let updateObject = await CoCreate.indexeddb.process({
+        let updateObject = await Coindex.createeddb.process({
             method: 'object.update',
             database: ['testDatabase', 'testDatabase1', 'testDatabase2'],
             array: ['testArray', 'testArray1', 'testArray2'],
@@ -43,7 +43,7 @@ async function testDocuments() {
         console.log('updateObject', updateObject)
 
 
-        let deleteObject = await CoCreate.indexeddb.process({
+        let deleteObject = await Coindex.createeddb.process({
             method: 'object.delete',
             database: ['testDatabase', 'testDatabase1', 'testDatabase2'],
             array: ['testArray', 'testArray1', 'testArray2'],
@@ -60,7 +60,7 @@ async function testDocuments() {
         })
         console.log('deleteObject', deleteObject)
 
-        // let deleteDatabase = await CoCreate.indexeddb.deleteDatabase({
+        // let deleteDatabase = await Coindex.createeddb.deleteDatabase({
         //     database: ['testDatabase', 'testDatabase1', 'testDatabase2'],
         // })
         // console.log('deleteDatabase', deleteDatabase)

package/test/indexes.js

@@ -3,7 +3,7 @@ async function testIndexes() {
         console.log("This browser doesn't support IndexedDB.");
         return;
     } else {
-        let createIndexes = await CoCreate.indexeddb.createIndex({
+        let createIndexes = await Coindex.createeddb.createIndex({
             database: ['testDB', 'testDB1', 'testDB2'],
             array: ['testCollection', 'testCollection1', 'testCollection2'],
             index: 'testIndexes'
@@ -11,20 +11,20 @@ async function testIndexes() {
         })
         console.log('createIndexes', createIndexes)
 
-        let readIndexes = await CoCreate.indexeddb.readIndex({
+        let readIndexes = await Coindex.createeddb.readIndex({
             database: ['testDB', 'testDB1', 'testDB2'],
             array: ['testCollection', 'testCollection1', 'testCollection2']
         })
         console.log('readIndexes', readIndexes)
 
-        let updateIndexes = await CoCreate.indexeddb.updateIndex({
+        let updateIndexes = await Coindex.createeddb.updateIndex({
             database: ['testDB', 'testDB1', 'testDB2'],
             array: ['testCollection', 'testCollection1', 'testCollection2'],
             index: { testIndexes: 'testIndexes1' }
         })
         console.log('updateIndexes', updateIndexes)
 
-        let deleteIndexes = await CoCreate.indexeddb.deleteIndex({
+        let deleteIndexes = await Coindex.createeddb.deleteIndex({
             database: ['testDB', 'testDB1', 'testDB2'],
             array: ['testCollection', 'testCollection1', 'testCollection2'],
             index: 'testIndexes1'