@live-change/db 0.5.12 → 0.5.13

package/lib/Index.js

@@ -19,6 +19,14 @@ class ObjectReader extends ChangeStream {
   }
   onChange(cb) {
     this.callbacks.push(cb)
+    return {
+      dispose() {
+        const callbackIndex = this.callbacks.indexOf(cb)
+        if(callbackIndex == -1) throw new Error('Observer double dispose')
+        this.callbacks.splice(callbackIndex, 1)
+        /// TODO: dispose or ignore reader somehow if no callbacks
+      }
+    }
   }
   async change(obj, oldObj, id, timestamp) {
     for(const callback of this.callbacks) await callback(obj, oldObj, id, timestamp)
@@ -40,6 +48,14 @@ class RangeReader extends ChangeStream {
   }
   async onChange(cb) {
     this.callbacks.push(cb)
+    return {
+      dispose() {
+        const callbackIndex = this.callbacks.indexOf(cb)
+        if(callbackIndex == -1) throw new Error('Observer double dispose')
+        this.callbacks.splice(callbackIndex, 1)
+        /// TODO: dispose or ignore reader somehow if no callbacks
+      }
+    }
   }
   async change(obj, oldObj, id, timestamp) {
     for(const callback of this.callbacks) await callback(obj, oldObj, id, timestamp)
@@ -47,7 +63,6 @@ class RangeReader extends ChangeStream {
   async get() {
     return await (await this.tableReader.table).rangeGet(this.range)
   }
-  dispose() {}
 }
 
 class TableReader extends ChangeStream {
@@ -515,4 +530,4 @@ class Index extends Table {
   }
 }
 
-module.exports = Index
+module.exports = Index

package/lib/queryObservable.js

@@ -87,6 +87,12 @@ class Reader extends ChangeStream {
     this.#observers.push(observer)
     ;(await this.#observable).observe(observer)
     await observer.readPromise()
+    observer.dispose = async function() {
+      const observerIndex = this.#observers.indexOf(observer)
+      if(observerIndex == -1) throw new Error('Observer double dispose')
+      this.#observers.splice(observerIndex, 1)
+      ;(await this.#observable).unobserve(observer)
+    }
     return observer
   }
   async unobserve(observer) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/db",
-  "version": "0.5.12",
+  "version": "0.5.13",
   "description": "Database with observable data for live queries",
   "main": "index.js",
   "scripts": {
@@ -21,8 +21,8 @@
   },
   "homepage": "https://github.com/live-change/live-change-db",
   "devDependencies": {
-    "@live-change/db-store-level": "^0.5.12",
-    "@live-change/db-store-lmdb": "^0.5.12",
+    "@live-change/db-store-level": "^0.5.13",
+    "@live-change/db-store-lmdb": "^0.5.13",
     "minimist": ">=1.2.3",
     "rimraf": "^3.0.2",
     "sockjs": "^0.3.24",
@@ -30,9 +30,9 @@
     "websocket-extensions": ">=0.1.4"
   },
   "dependencies": {
-    "@live-change/dao": "0.4.12",
+    "@live-change/dao": "0.4.13",
     "get-random-values": "^1.2.2",
     "node-interval-tree": "^1.3.3"
   },
-  "gitHead": "44818a97308060f773c3a766d2765431ab5928fa"
+  "gitHead": "e75a92ac01b8422076b660cf0dd5d8f4a80fe13c"
 }