@livequery/client 2.0.4 → 2.0.6

package/build/Collection.d.ts

@@ -1,4 +1,4 @@
-import { Subject, Observable, BehaviorSubject } from 'rxjs';
+import { Subject, BehaviorSubject } from 'rxjs';
 import { LivequeryBaseEntity, QueryOption, Transporter, UpdatedData, Paging, Response } from '@livequery/types';
 export type LoadingIndicator = false | 'backward' | 'forward' | 'both';
 export type CollectionOption<T extends LivequeryBaseEntity = LivequeryBaseEntity> = {
@@ -25,12 +25,12 @@ export type CollectionStream<T extends LivequeryBaseEntity = LivequeryBaseEntity
     code?: string;
     message?: string;
 };
-export declare class CollectionObservable<T extends LivequeryBaseEntity = LivequeryBaseEntity> extends Observable<CollectionStream<T>> {
+export declare class CollectionObservable<T extends LivequeryBaseEntity = LivequeryBaseEntity> extends BehaviorSubject<CollectionStream<T>> {
     #private;
     private ref;
     private collection_options;
     readonly $changes: Subject<UpdatedData<T>>;
-    $: BehaviorSubject<CollectionStream<T>>;
+    unsubscribe(): void;
     constructor(ref: string | false | null | '' | undefined, collection_options: CollectionOption<T>);
     set_realtime(realtime: boolean): void;
     private fetch_data;

package/build/Collection.js

@@ -1,6 +1,6 @@
-import { Subject, Observable, merge, BehaviorSubject } from 'rxjs';
+import { Subject, merge, BehaviorSubject } from 'rxjs';
 import { bufferTime, filter, finalize, first, map, share, skip, tap, toArray } from 'rxjs/operators';
-export class CollectionObservable extends Observable {
+export class CollectionObservable extends BehaviorSubject {
     ref;
     collection_options;
     $changes = new Subject();
@@ -9,20 +9,22 @@ export class CollectionObservable extends Observable {
     #sorters = new Array;
     #IdMap = new Map();
     #refs = [];
-    $;
+    // $: BehaviorSubject<CollectionStream<T>> = new BehaviorSubject<CollectionStream<T>>({
+    //   items: [] as SmartQueryItem<T>[],
+    //   loading: false,
+    //   options: {},
+    //   paging: {}
+    // }) 
+    unsubscribe() {
+        super.unsubscribe();
+        this.#queries.forEach(s => s.unsubscribe());
+    }
     constructor(ref, collection_options) {
-        super(o => {
-            this.$ = new BehaviorSubject({
-                items: [],
-                loading: false,
-                options: collection_options.options || {},
-                paging: {}
-            });
-            const linker = this.$.subscribe(o);
-            return () => {
-                linker.unsubscribe();
-                this.#queries.forEach(s => s.unsubscribe());
-            };
+        super({
+            items: [],
+            loading: false,
+            paging: {},
+            options: collection_options.options || {}
         });
         this.ref = ref;
         this.collection_options = collection_options;
@@ -47,7 +49,7 @@ export class CollectionObservable extends Observable {
         this.collection_options.realtime = realtime;
     }
     #sync(stream, from_local = false, direction) {
-        const state = this.$.getValue();
+        const state = this.getValue();
         const realtime = this.collection_options.realtime ?? true;
         const actions = { update: false, reindex: false };
         for (const { data, error, code, message } of stream) {
@@ -204,14 +206,14 @@ export class CollectionObservable extends Observable {
                 }
             };
         }
-        actions.update && this.$.next(state);
+        actions.update && this.next(state);
     }
     fetch_data(options = {}, loading, flush = false) {
         if (!this.ref)
             return;
         if (this.#refs.length == 0)
             return;
-        if (this.$.getValue().loading)
+        if (this.getValue().loading)
             return;
         this.collection_options.options = options;
         this.#sorters = Object.keys(options).filter(k => k.endsWith(':sort')).map(k => {
@@ -221,11 +223,11 @@ export class CollectionObservable extends Observable {
         });
         this.#sorters.every(a => a.key != 'id') && this.#sorters.push({ key: 'id', order: -1 });
         const state = {
-            ...this.$.getValue(),
-            items: flush ? [] : this.$.getValue().items,
+            ...this.getValue(),
+            items: flush ? [] : this.getValue().items,
             loading,
             options: {
-                ...this.$.getValue().options || {},
+                ...this.getValue().options || {},
                 ...options
             }
         };
@@ -241,10 +243,10 @@ export class CollectionObservable extends Observable {
                 return true;
             return loading == 'forward' ? paging.has.next : paging.has.prev;
         });
-        const no_more_data = !flush && (remain_data_refs.length == 0 || this.$.getValue().loading);
+        const no_more_data = !flush && (remain_data_refs.length == 0 || this.getValue().loading);
         if (no_more_data)
             return;
-        this.$.next(state);
+        this.next(state);
         const queries = remain_data_refs.map((ref, index) => {
             const cursor = this.#pages.get(ref)?.cursor;
             const opts = {
@@ -268,11 +270,11 @@ export class CollectionObservable extends Observable {
         this.fetch_data({}, 'both', true);
     }
     fetch_more() {
-        const { options } = this.$.getValue();
+        const { options } = this.getValue();
         this.fetch_data(options, 'forward');
     }
     fetch_prev() {
-        const { options } = this.$.getValue();
+        const { options } = this.getValue();
         this.fetch_data(options, 'backward');
     }
     // public fetch_around_cursor(cursor: string) {
@@ -288,7 +290,7 @@ export class CollectionObservable extends Observable {
         const index = this.#IdMap.get(id);
         if (index == undefined)
             return {};
-        const origin_ref = this.$.getValue().items[index].__ref;
+        const origin_ref = this.getValue().items[index].__ref;
         if (!origin_ref)
             throw 'COLLECTION_REF_NOT_FOUND';
         const refs = origin_ref.split('/');

package/package.json

@@ -4,7 +4,7 @@
   "repository": {
     "url": "https://github.com/livequery/client"
   },
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",