@live-change/db-store-indexeddb 0.5.25 → 0.6.1

package/lib/Store.js

@@ -222,11 +222,12 @@ class RangeObservable extends ReactiveDao.ObservableList {
 }
 
 class Store {
-  constructor(dbName) {
+  constructor(dbName, storeName) {
     if(!dbName) throw new Error("dbName argument is required")
+    if(!storeName) throw new Error("storeName argument is required")
 
     this.dbName = dbName
-    this.storeName = 'lc-data'
+    this.storeName = storeName
 
     this.finished = false
 
@@ -240,7 +241,7 @@ class Store {
   }
 
   async openDb() {
-    this.dbPromise = idb.openDB('lc-db-' + this.dbName, 1, {
+    this.dbPromise = idb.openDB(`lc-db-${this.dbName}-${this.storeName}`, 1, {
       upgrade: (db) => {
         const store = db.createObjectStore(this.storeName, { keyPath: 'id' })
       },
@@ -278,6 +279,11 @@ class Store {
     ;(await this.dbPromise).close()
   }
 
+  async deleteDb() {
+    if(!this.finished) await this.close()
+    await idb.deleteDB('lc-db-' + this.dbName)
+  }
+
   async handleChannelMessage(message) {
     switch(message.type) {
       case 'put' : {
@@ -322,6 +328,7 @@ class Store {
 
   async rangeGet(range) {
     if(!range) throw new Error("range not defined")
+    console.log("RANGE GET!")
 
     const txn = this.db.transaction(this.storeName, 'readonly')
     let data = []
@@ -471,7 +478,7 @@ class Store {
       rangeObservable.putObject(object, oldObject)
     }
     this.channel.postMessage({ type: "put", object, oldObject })
-    return object
+    return oldObject
   }
 
   async delete(id) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/db-store-indexeddb",
-  "version": "0.5.25",
+  "version": "0.6.1",
   "description": "Database with observable data for live queries",
   "main": "index.js",
   "scripts": {
@@ -26,9 +26,9 @@
     "tape": "^5.3.2"
   },
   "dependencies": {
-    "@live-change/dao": "^0.5.10",
+    "@live-change/dao": "0.5.14",
     "@live-change/interval-tree": "^1.0.12",
     "broadcast-channel": "^4.2.0"
   },
-  "gitHead": "dac1ac23bd1a4e1ba83e674d5493ab6c832f4462"
+  "gitHead": "f458425c609deeb9d1f38c15a3aa37759629a67e"
 }

package/tests/broadcast-object-changes.js

@@ -12,10 +12,10 @@ test("store broadcast object changes", t => {
 
   t.test("create stores", async t => {
     t.plan(2)
-    readStore = new Store('test-broadcast-object-changes')
+    readStore = new Store('test-broadcast-object-changes', 'test')
     await readStore.open()
     t.pass('read store created')
-    writeStore = new Store('test-broadcast-object-changes')
+    writeStore = new Store('test-broadcast-object-changes', 'test')
     await writeStore.open()
     t.pass('write store created')
   })
@@ -40,12 +40,18 @@ test("store broadcast object changes", t => {
     }
   }
 
-  t.test('observe object A', async t => {
+  t.test('observe object A', t => {
     t.plan(3)
     objectObservable = readStore.objectObservable('A')
     objectObservable.observe(objectObserver)
-    let value = await getNextValue()
-    t.deepEqual(value, null, 'found null')
+
+    let value
+
+    t.test('get value', async t => {
+      t.plan(1)
+      value = await getNextValue()
+      t.deepEqual(value, null, 'found null')
+    })
 
     t.test("add object A", async t => {
       t.plan(1)
@@ -71,4 +77,4 @@ test("store broadcast object changes", t => {
     t.end()
   })
 
-})
+})

package/tests/broadcast-range-changes.js

@@ -12,10 +12,10 @@ test("store broadcast range changes", t => {
 
   t.test("create stores", async t => {
     t.plan(2)
-    readStore = new Store('test-broadcast-object-changes')
+    readStore = new Store('test-broadcast-object-changes', 'test')
     await readStore.open()
     t.pass('read store created')
-    writeStore = new Store('test-broadcast-object-changes')
+    writeStore = new Store('test-broadcast-object-changes', 'test')
     await writeStore.open()
     t.pass('write store created')
   })
@@ -46,12 +46,18 @@ test("store broadcast range changes", t => {
     }
   }
 
-  t.test("observe range [a,z]", async t => {
+  t.test("observe range [a,z]", t => {
     t.plan(6)
     rangeObservable = readStore.rangeObservable({ gte: 'a', lte: 'z' })
     rangeObservable.observe(rangeObserver)
-    let values = await getNextValue()
-    t.deepEqual(values, [ { v: 1, id: 'a' }, { v: 3, id: 'c' } ], 'range value' )
+
+    let values
+
+    t.test("get values", async t => {
+      t.plan(1)
+      values = await getNextValue()
+      t.deepEqual(values, [{v: 1, id: 'a'}, {v: 3, id: 'c'}], 'range value')
+    })
 
     t.test("remove object 'a' from observed range", async t => {
       t.plan(1)
@@ -88,12 +94,18 @@ test("store broadcast range changes", t => {
     })
   })
 
-  t.test("observe range (a,d)", async t => {
+  t.test("observe range (a,d)", t => {
     t.plan(6)
-    rangeObservable = writeStore.rangeObservable({ gt: 'a', lt: 'd' })
+    rangeObservable = readStore.rangeObservable({ gt: 'a', lt: 'd' })
     rangeObservable.observe(rangeObserver)
-    let values = await getNextValue()
-    t.deepEqual(values, [ { v: 5, id: 'b' }, { v: 3, id: 'c' } ], 'range value' )
+
+    let values
+
+    t.test("get values", async t => {
+      t.plan(1)
+      values = await getNextValue()
+      t.deepEqual(values, [{v: 5, id: 'b'}, {v: 3, id: 'c'}], 'range value')
+    })
 
     t.test("remove object 'd' outside observed range", async t => {
       t.plan(1)
@@ -103,20 +115,20 @@ test("store broadcast range changes", t => {
 
     t.test("remove object 'a' outside observed range", async t => {
       t.plan(1)
-      await store.delete('a')
+      await writeStore.delete('a')
       t.pass('deleted')
     })
 
     t.test("add object 'ab' to observed range", async t => {
       t.plan(1)
-      await store.put({ id: 'ab', v: 7 })
+      await writeStore.put({ id: 'ab', v: 7 })
       let values = await getNextValue()
       t.deepEqual(values, [ { v: 7, id: 'ab' }, { v: 5, id: 'b' }, { v: 3, id: 'c' } ], 'range value' )
     })
 
     t.test("remove object 'ab' from observed range", async t => {
       t.plan(1)
-      await store.delete('ab')
+      await writeStore.delete('ab')
       let values = await getNextValue()
       t.deepEqual(values, [ { v: 5, id: 'b' }, { v: 3, id: 'c' } ], 'range value' )
     })
@@ -129,7 +141,8 @@ test("store broadcast range changes", t => {
   })
 
   t.test("close database", async t => {
-    await store.close()
+    await readStore.close()
+    await writeStore.close()
     t.pass('closed')
     t.end()
   })

package/tests/limited-range-observable.js

@@ -11,7 +11,7 @@ test("store limited range observable", t => {
 
   t.test("create store", async t => {
     t.plan(1)
-    store = new Store('test-limited-range-observable')
+    store = new Store('test-limited-range-observable', 'test')
     await store.open()
     t.pass('store created')
   })
@@ -46,12 +46,18 @@ test("store limited range observable", t => {
     if(nextValueResolve) nextValueResolve(rangeObservable.list)
   }
 
-  t.test("observe range [b_0,b_9]", async t => {
+  t.test("observe range [b_0,b_9]", t => {
     t.plan(7)
     rangeObservable = store.rangeObservable({ gte: 'b_0', lte: 'b_9', limit: 5 })
     rangeObservable.observe(rangeObserver)
-    let values = await getNextValue()
-    t.deepEqual(values, objects.slice(0, 5), 'range value' )
+
+    let values
+
+    t.test("get values", async t => {
+      t.plan(1)
+      values = await getNextValue()
+      t.deepEqual(values, objects.slice(0,5), 'range value')
+    })
 
     t.test("remove object 'b_3' from observed range", async t => {
       t.plan(1)
@@ -104,13 +110,19 @@ test("store limited range observable", t => {
     })
   })
 
-  t.test("observe range (b_0,b_5)", async t => {
+  t.test("observe range (b_0,b_5)", t => {
     t.plan(7)
     gotNextValue = false
     rangeObservable = store.rangeObservable({ gt: 'b_0', lt: 'b_5', limit: 3 })
     rangeObservable.observe(rangeObserver)
-    let values = await getNextValue()
-    t.deepEqual(values, objects.slice(1,4) , 'range value' )
+
+    let values
+
+    t.test("get values", async t => {
+      t.plan(1)
+      values = await getNextValue()
+      t.deepEqual(values, objects.slice(1,4), 'range value')
+    })
 
     t.test("remove object 'b_0' outside observed range", async t => {
       t.plan(1)

package/tests/limited-reverse-range-observable.js

@@ -11,7 +11,7 @@ test("store limited reverse range observable", t => {
 
   t.test("create store", async t => {
     t.plan(1)
-    store = new Store('test-limited-reverse-range-observable')
+    store = new Store('test-limited-reverse-range-observable', 'test')
     await store.open()
     t.pass('store created')
   })
@@ -46,12 +46,18 @@ test("store limited reverse range observable", t => {
     if(nextValueResolve) nextValueResolve(rangeObservable.list)
   }
 
-  t.test("observe reverse range [b_9,b_0]", async t => {
+  t.test("observe reverse range [b_9,b_0]", t => {
     t.plan(7)
     rangeObservable = store.rangeObservable({ gte: 'b_0', lte: 'b_9', limit: 5, reverse: true })
     rangeObservable.observe(rangeObserver)
-    let values = await getNextValue()
-    t.deepEqual(values, objects.slice(0, 5), 'range value' )
+
+    let values
+
+    t.test("get values", async t => {
+      t.plan(1)
+      values = await getNextValue()
+      t.deepEqual(values, objects.slice(0,5), 'range value')
+    })
 
     t.test("remove object 'b_6' from observed range", async t => {
       t.plan(1)
@@ -104,13 +110,18 @@ test("store limited reverse range observable", t => {
     })
   })
 
-  t.test("observe reverse range (b_5,b_0)", async t => {
+  t.test("observe reverse range (b_5,b_0)", t => {
     t.plan(7)
     gotNextValue = false
     rangeObservable = store.rangeObservable({ gt: 'b_0', lt: 'b_5', limit: 3, reverse: true })
     rangeObservable.observe(rangeObserver)
-    let values = await getNextValue()
-    t.deepEqual(values, objects.slice(6,9) , 'range value' )
+
+    let values
+    t.test("get values", async t => {
+      t.plan(1)
+      values = await getNextValue()
+      t.deepEqual(values, objects.slice(6,9), 'range value')
+    })
 
     t.test("remove object 'b_5' outside observed range", async t => {
       t.plan(1)

package/tests/object-observable.js

@@ -11,7 +11,7 @@ test("store object observable", t => {
 
   t.test("create store", async t => {
     t.plan(1)
-    store = new Store('test-object-observable')
+    store = new Store('test-object-observable', 'test')
     await store.open()
     t.pass('store created')
   })
@@ -33,12 +33,16 @@ test("store object observable", t => {
     if(nextValueResolve) nextValueResolve(value)
   }
 
-  t.test('observe object A', async t => {
+  t.test('observe object A', t => {
     t.plan(3)
     objectObservable = store.objectObservable('A')
     objectObservable.observe(objectObserver)
-    let value = await getNextValue()
-    t.deepEqual(value, null, 'found null')
+
+    t.test('get value', async t => {
+      t.plan(1)
+      let value = await getNextValue()
+      t.deepEqual(value, null, 'found null')
+    })
 
     t.test("add object A", async t => {
       t.plan(1)
@@ -61,4 +65,4 @@ test("store object observable", t => {
     t.end()
   })
 
-})
+})

package/tests/range-observable.js

@@ -11,7 +11,7 @@ test("store range observable", t => {
 
   t.test("create store", async t => {
     t.plan(1)
-    store = new Store('test-range-observable')
+    store = new Store('test-range-observable', 'test')
     await store.open()
     t.pass('store created')
   })
@@ -39,12 +39,16 @@ test("store range observable", t => {
     if(nextValueResolve) nextValueResolve(rangeObservable.list)
   }
 
-  t.test("observe range [a,z]", async t => {
+  t.test("observe range [a,z]", t => {
     t.plan(6)
     rangeObservable = store.rangeObservable({ gte: 'a', lte: 'z' })
     rangeObservable.observe(rangeObserver)
-    let values = await getNextValue()
-    t.deepEqual(values, [ { v: 1, id: 'a' }, { v: 3, id: 'c' } ], 'range value' )
+    let values
+    t.test("get values", async t => {
+      t.plan(1)
+      values = await getNextValue()
+      t.deepEqual(values, [{v: 1, id: 'a'}, {v: 3, id: 'c'}], 'range value')
+    })
 
     t.test("remove object 'a' from observed range", async t => {
       t.plan(1)
@@ -81,12 +85,18 @@ test("store range observable", t => {
     })
   })
 
-  t.test("observe range (a,d)", async t => {
+  t.test("observe range (a,d)", t => {
     t.plan(6)
     rangeObservable = store.rangeObservable({ gt: 'a', lt: 'd' })
     rangeObservable.observe(rangeObserver)
-    let values = await getNextValue()
-    t.deepEqual(values, [ { v: 5, id: 'b' }, { v: 3, id: 'c' } ], 'range value' )
+
+    let values
+
+    t.test("get values", async t => {
+      t.plan(1)
+      values = await getNextValue()
+      t.deepEqual(values, [ { v: 5, id: 'b' }, { v: 3, id: 'c' } ], 'range value' )
+    })
 
     t.test("remove object 'd' outside observed range", async t => {
       t.plan(1)

package/tests/reverse-range-observable.js

@@ -11,7 +11,7 @@ test("store reverse range observable", t => {
 
   t.test("create store", async t => {
     t.plan(1)
-    store = new Store('test-reverse-range-observable')
+    store = new Store('test-reverse-range-observable', 'test')
     await store.open()
     t.pass('store created')
   })
@@ -39,12 +39,17 @@ test("store reverse range observable", t => {
     if(nextValueResolve) nextValueResolve(rangeObservable.list)
   }
 
-  t.test("observe reverse range [z,a]", async t => {
+  t.test("observe reverse range [z,a]", t => {
     t.plan(6)
     rangeObservable = store.rangeObservable({ gte: 'a', lte: 'z', reverse: true })
     rangeObservable.observe(rangeObserver)
-    let values = await getNextValue()
-    t.deepEqual(values, [ { v: 3, id: 'c' }, { v: 1, id: 'a' } ], 'range value' )
+    let values
+
+    t.test("get values", async t => {
+      t.plan(1)
+      values = await getNextValue()
+      t.deepEqual(values, [{v: 3, id: 'c'}, {v: 1, id: 'a'}], 'range value')
+    })
 
     t.test("remove object 'a' from observed range", async t => {
       t.plan(1)
@@ -81,12 +86,16 @@ test("store reverse range observable", t => {
     })
   })
 
-  t.test("observe reverse range (d, a)", async t => {
+  t.test("observe reverse range (d, a)", t => {
     t.plan(6)
     rangeObservable = store.rangeObservable({ gt: 'a', lt: 'd', reverse: true })
     rangeObservable.observe(rangeObserver)
-    let values = await getNextValue()
-    t.deepEqual(values, [ { v: 3, id: 'c' }, { v: 5, id: 'b' } ], 'range value' )
+    let values
+    t.test("get values", async t => {
+      t.plan(1)
+      values = await getNextValue()
+      t.deepEqual(values, [ { v: 3, id: 'c' }, { v: 5, id: 'b' } ], 'range value' )
+    })
 
     t.test("remove object 'd' outside observed range", async t => {
       t.plan(1)

package/tests/store-non-reactive.js

@@ -4,19 +4,19 @@ require('fake-indexeddb/auto.js')
 const idb = require('idb')
 const Store = require('../lib/Store.js')
 
-test("store non-reactive properties", async t => {
+test("store non-reactive properties", t => {
   t.plan(3)
 
   let store
-
   t.test("create store", async t => {
     t.plan(1)
-    store = new Store('test-non-reactive')
+    store = new Store('test-non-reactive', 'test')
+    await new Promise(resolve => setTimeout(resolve, 1000))
     await store.open()
     t.pass('store created')
   })
 
-  t.test("non reactive operations", async t => {
+  t.test("non reactive operations", t => {
     t.plan(15)
 
     t.test("put value", async t => {

package/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/db-store-indexeddb.iml" filepath="$PROJECT_DIR$/db-store-indexeddb.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

package/db-store-indexeddb.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>