@livequery/client 1.0.85 → 1.0.93

package/build/Collection.d.ts

@@ -1,5 +1,5 @@
 import { Subject, Observable, ReplaySubject } from 'rxjs';
-import { ErrorInfo, LivequeryBaseEntity, QueryOption, Transporter, UpdatedData } from '@livequery/types';
+import { ErrorInfo, LivequeryBaseEntity, QueryOption, Transporter, UpdatedData, DocumentResponse } from '@livequery/types';
 export type CollectionOption<T extends LivequeryBaseEntity = LivequeryBaseEntity> = {
     transporter: Transporter;
     sync_delay?: number;
@@ -16,12 +16,12 @@ export type SmartQueryItem<T> = T & {
     __trigger: (name: string, payload?: any) => any;
     __ref: string;
 };
-type CollectionStream<T extends LivequeryBaseEntity = LivequeryBaseEntity> = {
+export type CollectionStream<T extends LivequeryBaseEntity = LivequeryBaseEntity> = {
     items: SmartQueryItem<T>[];
     error?: ErrorInfo;
     has_more: boolean;
     loading?: boolean;
-    options: Partial<QueryOption<T>>;
+    filters: Partial<QueryOption<T>>;
 };
 export declare class CollectionObservable<T extends LivequeryBaseEntity = LivequeryBaseEntity> extends Observable<CollectionStream<T>> {
     #private;
@@ -37,23 +37,10 @@ export declare class CollectionObservable<T extends LivequeryBaseEntity = Livequ
     reset(): void;
     fetch_more(): void;
     filter(filters: Partial<QueryOption<T>>): void;
-    add<R = {
-        data: {
-            item: T;
-        };
-    }>(payload: Partial<T>): Promise<R>;
-    update<R = {
-        data: {
-            item: T;
-        };
-    }>({ id: update_payload_id, ...payload }: Partial<T>): Promise<R | undefined>;
-    remove<R = {
-        data: {
-            item: T;
-        };
-    }>(remove_document_id?: string): Promise<void>;
+    add(payload: Partial<T>): Promise<DocumentResponse<T>>;
+    update({ id: update_payload_id, ...payload }: Partial<T>): Promise<DocumentResponse<T> | undefined>;
+    remove(remove_document_id?: string): Promise<void>;
     trigger<R>(name: string, payload?: object, trigger_document_id?: string, query?: {
         [key: string]: string | number | boolean;
     }): Promise<R | undefined>;
 }
-export {};

package/build/Collection.js

@@ -11,7 +11,7 @@ export class CollectionObservable extends Observable {
     value = {
         has_more: false,
         items: [],
-        options: {},
+        filters: {},
         loading: false
     };
     $ = new ReplaySubject(1);
@@ -27,8 +27,9 @@ export class CollectionObservable extends Observable {
         });
         this.ref = ref;
         this.collection_options = collection_options;
+        this.collection_options.filters = this.collection_options.filters || {};
         if (collection_options.filters)
-            this.value.options = collection_options.filters;
+            this.value.filters = collection_options.filters;
         if (ref && (ref.startsWith('/') || ref.endsWith('/')))
             throw 'INVAILD_REF_FORMAT';
         this.#refs = this.#ref_parser(ref);
@@ -78,13 +79,13 @@ export class CollectionObservable extends Observable {
                         || (
                         // Is realtime update that match filters
                         (realtime || from_local) && Object
-                            .keys(this.value.options || {})
+                            .keys(this.value.filters || {})
                             .filter(key => !key.includes('_'))
                             .every(key => {
                             try {
                                 const [field, expression] = key.split(':');
                                 const a = payload[field];
-                                const b = this.value.options?.[field];
+                                const b = this.value.filters?.[field];
                                 if (!expression)
                                     return a == b;
                                 if (expression == 'ne')
@@ -163,7 +164,7 @@ export class CollectionObservable extends Observable {
         }
         actions.update && this.$.next(this.value);
     }
-    fetch_data(options = {}, flush = false) {
+    fetch_data(filters = {}, flush = false) {
         if (!this.ref)
             return;
         if (this.#refs.length == 0)
@@ -182,13 +183,13 @@ export class CollectionObservable extends Observable {
             items: flush ? [] : this.value.items,
             error: undefined,
             loading: true,
-            options
+            filters
         };
         this.$.next(this.value);
         const queries = has_more_data_refs.map(ref => (this
             .collection_options
             .transporter
-            .query(ref, { ...options, _cursor: this.#next_cursor[ref] })));
+            .query(ref, { ...filters, _cursor: this.#next_cursor[ref] })));
         const reload = () => queries.map(q => q.reload());
         const $ = merge(...queries.map((q, index) => q.pipe(map(data => ({ ...data, ref: has_more_data_refs[index] }))))).pipe(bufferTime(500), filter(list => list.length > 0), map(data => this.#sync(data)));
         const subscription = Object.assign($.subscribe(), { reload });
@@ -201,7 +202,7 @@ export class CollectionObservable extends Observable {
         this.fetch_data({}, true);
     }
     fetch_more() {
-        this.fetch_data(this.value?.options);
+        this.fetch_data(this.value?.filters);
     }
     filter(filters) {
         this.fetch_data(filters, true);

package/package.json

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