@live-change/dao-vue3 0.1.21 → 0.1.22

package/lib/RangeBuckets.js

@@ -19,7 +19,11 @@ class Bucket {
     this.data = computed(() => {
       const ldv = this.liveData.value
       if(!ldv) return []
-      const source = unref(ldv)
+      let source = unref(ldv)
+      if(this.range.reverse) {
+        source = source.slice()
+        source.reverse()
+      }
       if(this.hardClose) {
         return source
       }
@@ -46,16 +50,6 @@ class Bucket {
     this.dataPromise = live(this.api(), this.path, fun => onDispose.push(fun))
     this.dataPromise.then(data => {
       this.liveData.value = data
-      // if(this.hardClose) {
-      //   this.data.value = this.liveData.value
-      //   return
-      // }
-      // return this.data.value = computed(() => source.filter(element => (
-      //   (!this.range.gt  || element.id >  this.range.gt ) &&
-      //   (!this.range.gte || element.id >= this.range.gte) &&
-      //   (!this.range.lt  || element.id <  this.range.lt ) &&
-      //   (!this.range.lte || element.id <= this.range.lte)
-      // )))
     })
     return this.dataPromise
   }
@@ -77,14 +71,14 @@ class Bucket {
     const data = unref(await this.dataPromise)
     if(!this.data) throw new Error("can't close - bucket not loaded!")
     if(this.data.length < this.bucketSize) throw new Error("can't close - bucket not full")
-    this.range.gte = data[0].id
+    this.range.gte = data[this.range.reverse ? data.length - 1 : 0].id
     if(this.hardClose) await this.load()
   }
 
   async closeBottom() {
     const data = unref(await this.dataPromise)
     if(data.length < this.bucketSize) throw new Error("can't close - bucket not full")
-    this.range.lte = data[data.length - 1].id
+    this.range.lte = data[this.range.reverse ? 0 : data.length - 1].id
     if(this.hardClose) await this.load()
   }
 
@@ -140,17 +134,20 @@ class RangeBuckets {
   }
 
   async wait() {
-    console.log("WAIT FOR BUCKETS", this.buckets.length)
+    //console.log("WAIT FOR BUCKETS", this.buckets.length)
     await Promise.all(this.buckets.map(bucket => bucket.promise)).then(loaded => this)
   }
 
   async loadTop() {
+    //console.log("LOAD TOP!", this.isTopLoadPossible())
     if(this.buckets.length == 0) return this.loadFirstBucket()
     const firstBucket = this.buckets[0]
     await firstBucket.promise
     if(!this.isTopLoadPossible()) return
-    if(firstBucket != this.buckets[0]) return this.buckets[0].promise
-    let range = { limit: this.bucketSize }
+    if(firstBucket != this.buckets[0]) {
+      return this.buckets[0].promise
+    }
+    let range = { limit: this.bucketSize, reverse: true }
     if(!firstBucket.isTopClosed()) {
       if(firstBucket.canClose()) {
         await firstBucket.closeTop()
@@ -175,11 +172,14 @@ class RangeBuckets {
   }
 
   async loadBottom() {
+    //console.log("LOAD BOTTOM!", this.isBottomLoadPossible())
     if(this.buckets.length == 0) return this.loadFirstBucket()
     const lastBucket = this.buckets[this.buckets.length - 1]
     await lastBucket.promise
     if(!this.isBottomLoadPossible()) return
-    if(lastBucket != this.buckets[this.buckets.length - 1]) return this.buckets[this.buckets.length - 1].promise
+    if(lastBucket != this.buckets[this.buckets.length - 1]) {
+      return this.buckets[this.buckets.length - 1].promise
+    }
     let range = { limit: this.bucketSize }
     if(!lastBucket.isBottomClosed()) {
       if(lastBucket.canClose()) {
@@ -205,14 +205,17 @@ class RangeBuckets {
 
   dropTop() {
     if(this.buckets.length == 0) throw new Error('impossible to drop from empty')
+    //console.log("DROP TOP!")
     const droppedBucket = this.buckets[0]
-    const height = droppedBucket.domElements.reduce((acc, el) => acc + el?.offsetHeight, 0)
+    const height = droppedBucket.domElements.reduce((acc, el) => acc + (el?.offsetHeight || 0), 0)
+    //console.log("DOM ELEMENTS", droppedBucket.domElements.map(el => el?.offsetHeight || 0), height)
     this.buckets.shift()
     droppedBucket.dispose()
     return height
   }
 
   dropBottom() {
+    //console.log("DROP BOTTOM!")
     if(this.buckets.length == 0) throw new Error('impossible to drop from empty')
     const droppedBucket = this.buckets[this.buckets.length - 1]
     const height = droppedBucket.domElements.reduce((acc, el) => acc + el?.offsetHeight, 0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/dao-vue3",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "author": {
     "email": "m8@em8.pl",
     "name": "Michał Łaszczewski",