@live-change/db 0.9.62 → 0.9.64

package/lib/ChangeStream.js

@@ -16,6 +16,9 @@ class ChangeStream {
   object(id) {
     throw new Error("abstract method - not implemented")
   }
+  async count(range = {}) {
+    throw new Error("abstract method - not implemented")
+  }
   async to(output) {
     return this.onChange(async (obj, oldObj, id, timestamp) => {
       if(obj || oldObj) await output.change(obj, oldObj, id, timestamp)
@@ -113,6 +116,26 @@ class ChangeStream {
     pipe.observerPromise = Promise.all([observerPromise, otherObserverPromise])
     return pipe
   }
+  groupExisting(objectToRange) {
+    const pipe = new ChangeStreamPipe()
+    const observerPromise = this.onChange(async (obj, oldObj, id, timestamp) => {
+      const existingObj = obj || oldObj
+      let range = await objectToRange(existingObj)
+      if(!range) return
+      if(typeof range === 'string') {
+        range = { gte: range, lte: range + '\xFF\xFF\xFF\xFF' }
+      }
+      const count = await this.count(range)
+      if(count) {
+        await pipe.change(existingObj, null, id, timestamp)        
+      } else {
+        await pipe.change(null, existingObj, id, timestamp)
+      }
+    })
+    pipe.master = this
+    pipe.observerPromise = observerPromise
+    return pipe
+  }
 }
 
 class ChangeStreamPipe extends ChangeStream {

package/lib/Index.js

@@ -50,7 +50,9 @@ class ObjectReader extends ChangeStream {
   async objectGet(id) {
     return await (await this.tableReader.table).objectGet(id)
   }
-
+  async count(range = {}) {
+    return await (await this.tableReader.table).countGet(rangeIntersection(unitRange(this.id), range))
+  }
   dispose() {}
 }
 
@@ -92,6 +94,9 @@ class RangeReader extends ChangeStream {
   object(id) {
     return new ObjectReader(this.tableReader, id)
   }
+  async count(range = {}) {
+    return await (await this.tableReader.table).countGet(rangeIntersection(this.range, range))
+  }
 }
 
 class TableReader extends ChangeStream {
@@ -181,6 +186,9 @@ class TableReader extends ChangeStream {
   async objectGet(id) {
     return await (await this.table).objectGet(id)
   }
+  async count(range = {}) {
+    return await (await this.table).count(rangeIntersection(this.range, range))
+  }
   object(id) {
     let reader = this.objectReaders.get(id)
     if(!reader) {

package/lib/queryGet.js

@@ -28,6 +28,9 @@ class ObjectReader extends ChangeStream {
   range(range) {
     return new RangeReader(this.#table, rangeIntersection(unitRange(this.#id), range))
   }
+  async count(range = {}) {
+    return await this.#table.countGet(rangeIntersection(unitRange(this.#id), range))
+  }
 }
 
 class RangeReader extends ChangeStream {
@@ -61,8 +64,11 @@ class RangeReader extends ChangeStream {
   object(id) {
     return new ObjectReader(this.#table, id, this.#time)
   }
-  objectGet(id) {
-    return this.#table.objectGet(id)
+  async objectGet(id) {
+    return await (await this.#table).objectGet(id)
+  }
+  async count(range = {}) {
+    return await this.#table.countGet(rangeIntersection(this.#range, range))
   }
 }
 
@@ -92,7 +98,7 @@ class TableReader extends ChangeStream {
     return results
   }
   unobserve(obs) {}
-  rangeGet(range) {
+  async rangeGet(range) {
     return new RangeReader(this.#table, range, this.#time)
   }
   range(range) {
@@ -101,14 +107,11 @@ class TableReader extends ChangeStream {
   object(id) {
     return new ObjectReader(this.#table, id, this.#time)
   }
-  objectGet(id) {
-    return this.#table.objectGet(id)
-  }
-  async get(range = {}) {
-    return (await this.#table).rangeGet(range)
+  async objectGet(id) {
+    return await (await this.#table).objectGet(id)
   }
   async count(range = {}) {
-    return (await this.#table).countGet(range)
+    return await (await this.#table).countGet(range)
   }
 }
 

package/lib/queryObservable.js

@@ -144,6 +144,9 @@ class ObjectReader extends Reader {
   object(id) {
     return this.#tableReader.object(id)
   }
+  async count(range = {}) {
+    return await this.#table.count(rangeIntersection(unitRange(this.#id), range))
+  }
 }
 
 class RangeReader extends Reader {
@@ -175,6 +178,9 @@ class RangeReader extends Reader {
   object(id) {
     return this.#tableReader.object(id)
   }
+  async count(range = {}) {
+    return await this.#table.count(rangeIntersection(this.#range, range))
+  }
 }
 
 class TableReader extends Reader {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/db",
-  "version": "0.9.62",
+  "version": "0.9.64",
   "description": "Database with observable data for live queries",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   "type": "module",
   "homepage": "https://github.com/live-change/live-change-stack",
   "devDependencies": {
-    "@live-change/db-store-level": "^0.9.62",
-    "@live-change/db-store-lmdb": "^0.9.62",
+    "@live-change/db-store-level": "^0.9.64",
+    "@live-change/db-store-lmdb": "^0.9.64",
     "minimist": ">=1.2.3",
     "next-tick": "^1.1.0",
     "rimraf": "^5.0.5",
@@ -32,9 +32,9 @@
     "websocket-extensions": ">=0.1.4"
   },
   "dependencies": {
-    "@live-change/dao": "^0.9.62",
+    "@live-change/dao": "^0.9.64",
     "get-random-values": "^1.2.2",
     "node-interval-tree": "^1.3.3"
   },
-  "gitHead": "b1b605b7f1fa4fc3de4720afbb401e2cfff080cf"
+  "gitHead": "902581d1d78ac5ee8c2c2ed7ccd9f8a8df6df2b0"
 }