@live-change/db 0.9.61 → 0.9.62

package/lib/ChangeStream.js

@@ -4,21 +4,44 @@ class ChangeStream {
   onChange() {
     throw new Error("abstract method - not implemented")
   }
-  to(output) {
-    return this.onChange((obj, oldObj, id, timestamp) => output.change(obj, oldObj, id, timestamp))
+  async rangeGet(range) {
+    throw new Error("abstract method - not implemented")
+  }
+  range(range) {
+    throw new Error("abstract method - not implemented")
+  }
+  async objectGet(id) {
+    throw new Error("abstract method - not implemented")
   }
+  object(id) {
+    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)
+    })
+    await this.observerPromise
+  }  
   filter(func) {
     const pipe = new ChangeStreamPipe()
-    const observerPromise = this.onChange((obj, oldObj, id, timestamp) =>
-        pipe.change(obj && func(obj) ? obj : null, oldObj && func(oldObj) ? oldObj : null, id, timestamp))
+    const observerPromise = this.onChange(async (obj, oldObj, id, timestamp) => {
+      const newObj = obj && await func(obj)
+      const newOldObj = oldObj && await func(oldObj)
+      if(!(newObj || newOldObj)) return
+      pipe.change(newObj, newOldObj, id, timestamp)
+    })
     pipe.master = this
     pipe.observerPromise = observerPromise
     return pipe
   }
   map(func) {
     const pipe = new ChangeStreamPipe()
-    const observerPromise = this.onChange((obj, oldObj, id, timestamp) =>
-        pipe.change(obj && func(obj), oldObj && func(oldObj), id, timestamp))
+    const observerPromise = this.onChange(async (obj, oldObj, id, timestamp) => {
+      const newObj = obj && await func(obj)
+      const newOldObj = oldObj && await func(oldObj)
+      if(!(newObj || newOldObj)) return
+      pipe.change(newObj, newOldObj, id, timestamp)
+    })
     pipe.master = this
     pipe.observerPromise = observerPromise
     return pipe
@@ -42,6 +65,54 @@ class ChangeStream {
     pipe.observerPromise = observerPromise
     return pipe
   }
+  async readInBuckets(bucketCallback, bucketSize = 128) {
+    let position = ''
+    let readed = 0
+    do {
+      const bucket = await this.rangeGet({ gt: position, limit: bucketSize })
+      readed = bucket.length
+      if(!bucket.length) break
+      position = bucket[bucket.length - 1].id
+      await bucketCallback(bucket)
+    } while(readed === bucketSize)
+  }
+  cross(other, selfToRange, otherToRange, bucketSize = 128) { 
+    const pipe = new ChangeStreamPipe()
+    const observerPromise = this.onChange(async (obj, oldObj, id, timestamp) => {     
+      const otherRange = await selfToRange(obj || oldObj)
+      if(!otherRange) return // ignore
+      if(typeof otherRange === 'string') { // single id
+        const otherObj = await other.objectGet(otherRange)
+        await pipe.change([obj, otherObj], [oldObj, otherObj], [id, otherRange], timestamp)
+        return
+      }
+      await other.range(otherRange).readInBuckets(async bucket => {
+        for(const otherObj of bucket) {
+          const otherId = otherObj.id
+          await pipe.change([obj, otherObj], [oldObj, otherObj], [id, otherId], timestamp)
+        }
+      }, bucketSize)
+    })
+    const otherObserverPromise = other.onChange(async (otherObj, oldOtherObj, id, timestamp) => {
+      const selfRange = await otherToRange(otherObj || oldOtherObj)      
+      if(!selfRange) return // ignore
+      const otherId = id
+      if(typeof selfRange === 'string') { // single id
+        const obj = await this.objectGet(selfRange)
+        await pipe.change([obj, otherObj], [obj, oldOtherObj], [selfRange, otherId], timestamp)
+        return
+      }
+      await this.range(selfRange).readInBuckets(async bucket => {
+        for(const obj of bucket) {
+          const id = obj.id
+          await pipe.change([obj, otherObj], [obj, oldOtherObj], [id, otherId], timestamp)
+        }
+      }, bucketSize)    
+    })
+    pipe.master = this
+    pipe.observerPromise = Promise.all([observerPromise, otherObserverPromise])
+    return pipe
+  }
 }
 
 class ChangeStreamPipe extends ChangeStream {

package/lib/Index.js

@@ -6,6 +6,7 @@ import queryGet from './queryGet.js'
 import profileLog from './profileLog.js'
 import nextTick from 'next-tick'
 import { ChangeStream } from './ChangeStream.js'
+import { rangeIntersection } from './utils.js'
 
 
 import Debug from 'debug'
@@ -37,6 +38,19 @@ class ObjectReader extends ChangeStream {
   async get() {
     return await (await this.tableReader.table).objectGet(this.id)
   }
+  async rangeGet(range) {
+    return await (await this.tableReader.table).rangeGet(rangeIntersection(unitRange(this.id), range))
+  }
+  range(range) {
+    return new RangeReader(this.tableReader, unitRange(this.id))
+  }
+  object(id) {  
+    return new ObjectReader(this.tableReader, id)
+  }
+  async objectGet(id) {
+    return await (await this.tableReader.table).objectGet(id)
+  }
+
   dispose() {}
 }
 
@@ -63,9 +77,21 @@ class RangeReader extends ChangeStream {
   async change(obj, oldObj, id, timestamp) {
     for(const callback of this.callbacks) await callback(obj, oldObj, id, timestamp)
   }
+  async rangeGet(range) {
+    return await (await this.tableReader.table).rangeGet(rangeIntersection(this.range, range))
+  }
+  range(range) {
+    return new RangeReader(this.tableReader, rangeIntersection(this.range, range))
+  }
   async get() {
     return await (await this.tableReader.table).rangeGet(this.range)
   }
+  async objectGet(id) {
+    return await (await this.tableReader.table).objectGet(id)
+  }
+  object(id) {
+    return new ObjectReader(this.tableReader, id)
+  }
 }
 
 class TableReader extends ChangeStream {
@@ -138,6 +164,9 @@ class TableReader extends ChangeStream {
     for(const callback of this.callbacks) await callback(obj, oldObj, id, timestamp)
     if(profileOp) await profileLog.end(profileOp)
   }
+  async rangeGet(range) {
+    return await this.table.rangeGet(range)
+  }
   range(range) {
     const key = JSON.stringify(range)
     let reader = this.rangeReaders.get(key)
@@ -149,6 +178,9 @@ class TableReader extends ChangeStream {
     return reader
     return new RangeReader(this, range)
   }
+  async objectGet(id) {
+    return await (await this.table).objectGet(id)
+  }
   object(id) {
     let reader = this.objectReaders.get(id)
     if(!reader) {

package/lib/queryGet.js

@@ -1,6 +1,6 @@
 import { TableWriter, LogWriter } from './queryUpdate.js'
 import { ChangeStream } from './ChangeStream.js'
-
+import { unitRange, rangeIntersection } from './utils.js'
 const maxGetLimit = 256
 
 class ObjectReader extends ChangeStream {
@@ -22,6 +22,12 @@ class ObjectReader extends ChangeStream {
   async get() {
     return await (await this.#table).objectGet(this.#id)
   }
+  async rangeGet(range) {
+    return await (await this.#table).rangeGet(rangeIntersection(unitRange(this.#id), range))
+  }
+  range(range) {
+    return new RangeReader(this.#table, rangeIntersection(unitRange(this.#id), range))
+  }
 }
 
 class RangeReader extends ChangeStream {
@@ -45,6 +51,19 @@ class RangeReader extends ChangeStream {
   async get() {
     return await (await this.#table).rangeGet(this.#range)
   }
+
+  async rangeGet(range) {
+    return await (await this.#table).rangeGet(rangeIntersection(this.#range, range))
+  }
+  range(range) {
+    return new RangeReader(this.#table, rangeIntersection(this.#range, range), this.#time)
+  }
+  object(id) {
+    return new ObjectReader(this.#table, id, this.#time)
+  }
+  objectGet(id) {
+    return this.#table.objectGet(id)
+  }
 }
 
 class TableReader extends ChangeStream {
@@ -73,6 +92,9 @@ class TableReader extends ChangeStream {
     return results
   }
   unobserve(obs) {}
+  rangeGet(range) {
+    return new RangeReader(this.#table, range, this.#time)
+  }
   range(range) {
     return new RangeReader(this.#table, range, this.#time)
   }

package/lib/queryObservable.js

@@ -31,7 +31,7 @@ class ObjectObserver {
   }
   readPromise() {
     return this.#valuePromise
-  }
+  }  
 }
 
 class RangeObserver {
@@ -119,11 +119,12 @@ class Reader extends ChangeStream {
 class ObjectReader extends Reader {
   #table = null
   #id = null
-
-  constructor(queryReader, table, id) {
+  #tableReader = null
+  constructor(queryReader, table, id, tableReader) {
     super(queryReader)
     this.#table = table
     this.#id = id
+    this.#tableReader = tableReader
   }
   observableFactory() {
     return this.#table.objectObservable(this.#id)
@@ -132,19 +133,29 @@ class ObjectReader extends Reader {
     return this.startObserver((r) => new ObjectObserver(r, cb))
   }
   get() {
-    //console.log("OBJ GET", this.#table.name, this.#id)
     return this.#table.objectGet(this.#id)
   }
+  async rangeGet(range) {
+    return this.#tableReader.rangeGet(rangeIntersection(unitRange(this.#id), range))
+  }
+  async objectGet(id) {
+    return this.#table.objectGet(id)
+  }
+  object(id) {
+    return this.#tableReader.object(id)
+  }
 }
 
 class RangeReader extends Reader {
   #table = null
   #range = null
+  #tableReader = null 
 
-  constructor(queryReader, table, range) {
+  constructor(queryReader, table, range, tableReader) {
     super(queryReader)
     this.#table = table
     this.#range = range
+    this.#tableReader = tableReader
   }
   async observableFactory() {
     return await (await this.#table).rangeObservable(this.#range)
@@ -155,6 +166,15 @@ class RangeReader extends Reader {
   async get() {
     return await (await this.#table).rangeGet(this.#range)
   }
+  async rangeGet(range) {
+    return await this.#tableReader.rangeGet(rangeIntersection(this.#range, range))
+  }
+  async objectGet(id) {
+    return await this.#table.objectGet(id)
+  }
+  object(id) {
+    return this.#tableReader.object(id)
+  }
 }
 
 class TableReader extends Reader {
@@ -172,16 +192,19 @@ class TableReader extends Reader {
   onChange(cb) {
     return this.startObserver((r) => new RangeObserver(r, cb))
   }
+  async rangeGet(range) {
+    return await this.#table.rangeGet(range)
+  }
   range(range) {
     return this._queryReader.getExistingReaderOrCreate(this.#prefix+':'+JSON.stringify(range),
-        () => new RangeReader(this._queryReader, this.#table, range))
+        () => new RangeReader(this._queryReader, this.#table, range, this))
   }
   object(id) {
     return this._queryReader.getExistingReaderOrCreate(this.#prefix+'#'+id,
-        () => new ObjectReader(this._queryReader, this.#table, id))
+        () => new ObjectReader(this._queryReader, this.#table, id, this))
   }
-  objectGet(id) {
-    return this.#table.objectGet(id)
+  async objectGet(id) {
+    return await this.#table.objectGet(id)
   }
   async get(range = {}) {
     return await (await this.#table).rangeGet(range)

package/lib/utils.js

@@ -0,0 +1,41 @@
+export function min(a, b) {
+  if(a === undefined) return b
+  if(b === undefined) return a
+  return a < b ? a : b
+}
+
+export function max(a, b) {
+  if(a === undefined) return b
+  if(b === undefined) return a
+  return a > b ? a : b
+}
+
+export function rangeIntersection(range1, range2) {
+  return {
+    reverse: range2.reverse,
+    gt: max(range1.gt, range2.gt),
+    lt: min(range1.lt, range2.lt),
+    gte: max(range1.gte, range2.gte),
+    lte: min(range1.lte, range2.lte),
+    limit: range2.limit
+  }
+}
+
+export function rangeUnion(range1, range2) {
+  return {
+    reverse: range1.reverse,
+    gt: min(range1.gt, range2.gt),
+    lt: max(range1.lt, range2.lt),
+    gte: min(range1.gte, range2.gte),
+    lte: max(range1.lte, range2.lte),
+    limit: range1.limit + range2.limit
+  }
+}
+
+export function unitRange(id) {
+  return {
+    gte: id,
+    lt: id,
+    limit: 1
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/db",
-  "version": "0.9.61",
+  "version": "0.9.62",
   "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.61",
-    "@live-change/db-store-lmdb": "^0.9.61",
+    "@live-change/db-store-level": "^0.9.62",
+    "@live-change/db-store-lmdb": "^0.9.62",
     "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.61",
+    "@live-change/dao": "^0.9.62",
     "get-random-values": "^1.2.2",
     "node-interval-tree": "^1.3.3"
   },
-  "gitHead": "f750f29f912b9a76b5ffa2bdf5c46954cc7e7a67"
+  "gitHead": "b1b605b7f1fa4fc3de4720afbb401e2cfff080cf"
 }