@livequery/client 2.0.22 → 2.0.24

package/build/Collection.d.ts

@@ -15,6 +15,7 @@ export type SmartQueryItem<T> = T & {
     __adding: boolean;
     __trigger: <R extends {}>(name: string, payload?: any, query?: any) => Promise<Response<R>>;
     __ref: string;
+    toJson: () => T;
 };
 export type CollectionStream<T extends LivequeryBaseEntity = LivequeryBaseEntity> = {
     items: SmartQueryItem<T>[];

package/build/Collection.js

@@ -42,25 +42,23 @@ export class CollectionObservable extends BehaviorSubject {
     set_realtime(realtime) {
         this.collection_options.realtime = realtime;
     }
-    #sync(stream, from_local = false, direction) {
+    #sync(stream, from, direction) {
+        if (from == 'realtime' && this.collection_options.realtime == false)
+            return;
         const state = this.getValue();
-        const realtime = this.collection_options.realtime ?? true;
-        const actions = { update: false, reindex: false };
+        const actions = { reindex: false };
         for (const { data, error, code, message, } of stream) {
-            if (!from_local) {
+            if (from == 'request') {
                 state.loading = false;
-                actions.update = true;
             }
             // Error & paging
             if (error) {
                 state.error = true;
                 state.code = code;
                 state.message = message;
-                actions.update = true;
             }
             if (data?.summary) {
                 state.summary = data.summary;
-                actions.update = true;
             }
             // Sync 
             for (const change of data?.changes || []) {
@@ -72,35 +70,32 @@ export class CollectionObservable extends BehaviorSubject {
                 if (index == -1 && type == 'added') {
                     if (
                     // Is first value from HTTP query
-                    true
+                    from == 'request'
                         || (
                         // Is realtime update that match filters
-                        (realtime || from_local) && Object
+                        from == 'realtime' && Object
                             .keys(state.options || {})
                             .filter(key => !key.includes('_'))
                             .every(key => {
+                            const [field, expression] = key.split(':');
+                            const a = payload[field];
+                            const b = state.options?.[field];
+                            const map = {
+                                'default': () => a == b,
+                                eq: () => a == b,
+                                ne: () => a != b,
+                                lt: () => typeof a == 'number' && typeof b == 'number' && a < b,
+                                lte: () => typeof a == 'number' && typeof b == 'number' && a <= b,
+                                gt: () => typeof a == 'number' && typeof b == 'number' && a > b,
+                                gte: () => typeof a == 'number' && typeof b == 'number' && a >= b,
+                                in: () => Array.isArray(a) && a?.includes(b),
+                                like: () => typeof a == 'string' && a.includes(`${b}`),
+                                between: () => typeof a == 'number' && Array.isArray(b) && typeof b[0] == 'number' && b[0] <= a && typeof b[1] == 'number' && a <= b[1]
+                            };
                             try {
-                                const [field, expression] = key.split(':');
-                                const a = payload[field];
-                                const b = state.options?.[field];
-                                if (!expression)
-                                    return a == b;
-                                if (expression == 'ne')
-                                    return a != b;
-                                if (expression == 'lt')
-                                    return typeof a == 'number' && typeof b == 'number' && a < b;
-                                if (expression == 'lte')
-                                    return typeof a == 'number' && typeof b == 'number' && a <= b;
-                                if (expression == 'gt')
-                                    return typeof a == 'number' && typeof b == 'number' && a > b;
-                                if (expression == 'gte')
-                                    return typeof a == 'number' && typeof b == 'number' && a >= b;
-                                if (expression == 'in' || expression == 'like')
-                                    return Array.isArray(a) && a?.includes(b);
-                                if (expression == 'between') {
-                                    const [x, y] = b;
-                                    return x <= a && a <= y;
-                                }
+                                const fn = map[expression || 'default'];
+                                if (fn)
+                                    return fn();
                             }
                             catch (e) { }
                             return false;
@@ -114,16 +109,15 @@ export class CollectionObservable extends BehaviorSubject {
                             __remove: () => this.remove(payload?.id),
                             __trigger: (name, input = undefined, query) => this.trigger(name, input, payload?.id, query),
                             __update: (input) => this.update({ ...input, id: payload?.id }),
-                            __ref: change.ref
+                            __ref: change.ref,
+                            toJson: () => payload
                         };
                         direction == 'forward' ? state.items.push(item) : state.items.unshift(item);
                         actions.reindex = true;
-                        actions.update = true;
                     }
                 }
-                if (index >= 0 && (realtime || from_local)) {
+                if (index >= 0) {
                     if (type == 'added' || type == 'modified') {
-                        actions.update = true;
                         const sort_key_value_updated = this.#sorters.some(({ key }) => {
                             const value = payload[key];
                             if (typeof value == 'string' || typeof value == 'number')
@@ -141,7 +135,6 @@ export class CollectionObservable extends BehaviorSubject {
                         };
                     }
                     if (type == 'removed') {
-                        actions.update = true;
                         state.items.splice(index, 1);
                         for (const [document_id, i] of this.#IdMap) {
                             i == index && this.#IdMap.delete(document_id);
@@ -205,23 +198,30 @@ export class CollectionObservable extends BehaviorSubject {
                 }
             };
         }
-        actions.update && this.next(state);
+        this.next(state);
     }
     fetch_data(options = {}, loading, flush = false) {
+        if (flush) {
+            this.#pages.clear();
+            this.#queries.forEach(s => s.unsubscribe());
+            this.#queries.clear();
+            this.#IdMap.clear();
+        }
         if (!this.ref)
             return;
         if (this.#refs.length == 0)
             return;
-        if (this.getValue().loading)
+        if (this.getValue().loading && !flush)
             return;
-        this.collection_options.options = options;
-        this.#sorters = Object.keys(options).filter(k => k.endsWith(':sort')).map(k => {
-            const key = k.split(':sort')[0];
-            const order = options[k] == 1 ? 1 : -1;
-            return { key, order };
+        const remain_data_refs = this.#refs.filter(ref => {
+            const paging = this.#pages.get(ref);
+            if (!paging)
+                return true;
+            return loading == 'forward' ? paging.has?.next : paging.has?.prev;
         });
-        this.#sorters.every(a => a.key != 'id') && this.#sorters.push({ key: 'id', order: -1 });
-        const state = {
+        if (remain_data_refs.length == 0)
+            return;
+        this.next({
             ...this.getValue(),
             items: flush ? [] : this.getValue().items,
             loading,
@@ -229,23 +229,14 @@ export class CollectionObservable extends BehaviorSubject {
                 ...this.getValue().options || {},
                 ...options
             }
-        };
-        if (flush) {
-            this.#pages.clear();
-            this.#queries.forEach(s => s.unsubscribe());
-            this.#queries.clear();
-            this.#IdMap.clear();
-        }
-        const remain_data_refs = this.#refs.filter(ref => {
-            const paging = this.#pages.get(ref);
-            if (!paging)
-                return true;
-            return loading == 'forward' ? paging.has?.next : paging.has?.prev;
         });
-        const no_more_data = !flush && (remain_data_refs.length == 0 || this.getValue().loading);
-        if (no_more_data)
-            return;
-        this.next(state);
+        this.collection_options.options = options;
+        this.#sorters = Object.keys(options).filter(k => k.endsWith(':sort')).map(k => {
+            const key = k.split(':sort')[0];
+            const order = options[k] == 1 ? 1 : -1;
+            return { key, order };
+        });
+        this.#sorters.every(a => a.key != 'id') && this.#sorters.push({ key: 'id', order: -1 });
         const queries = remain_data_refs.map((ref, index) => {
             const cursor = this.#pages.get(ref)?.cursor;
             const opts = {
@@ -261,8 +252,8 @@ export class CollectionObservable extends BehaviorSubject {
                 ref
             })), share());
         });
-        const first_values = merge(...queries.map(q => q.pipe(filter(r => !!r.data?.paging || !!r.error), first()))).pipe(toArray(), tap(list => this.#sync(list, false, loading))).subscribe();
-        const subscription = merge(...queries.map(q => q.pipe(skip(1)))).pipe(bufferTime(this.collection_options?.sync_delay || 500), filter(list => list.length > 0), map(data => this.#sync(data, false, loading)), finalize(() => first_values.unsubscribe())).subscribe();
+        const first_values = merge(...queries.map(q => q.pipe(filter(r => !!r.data?.paging || !!r.error), first()))).pipe(toArray(), tap(list => this.#sync(list, 'request', loading))).subscribe();
+        const subscription = merge(...queries.map(q => q.pipe(skip(1)))).pipe(bufferTime(this.collection_options?.sync_delay || 500), filter(list => list.length > 0), map(data => this.#sync(data, 'realtime', loading)), finalize(() => first_values.unsubscribe())).subscribe();
         this.#queries.add(subscription);
     }
     reset() {
@@ -281,17 +272,18 @@ export class CollectionObservable extends BehaviorSubject {
     }
     #find_ref_by_id(id) {
         if (!id || !this.ref)
-            return { ref: this.ref, collection_ref: this.ref };
+            return { ref: this.ref, collection_ref: this.ref, doc: null };
         const index = this.#IdMap.get(id);
         if (index == undefined)
             return {};
-        const origin_ref = this.getValue().items[index].__ref;
+        const doc = this.getValue().items[index];
+        const origin_ref = doc.__ref;
         if (!origin_ref)
             throw 'COLLECTION_REF_NOT_FOUND';
         const refs = origin_ref.split('/');
         const collection_ref = refs.slice(0, refs.length - (refs.length % 2 == 1 ? 0 : 1)).join('/');
         const ref = `${collection_ref}/${id}`;
-        return { ref, id, collection_ref, index };
+        return { ref, id, collection_ref, index, doc };
     }
     async add(payload) {
         const r = await this.collection_options.transporter.add(`${this.ref}`, payload);
@@ -301,7 +293,7 @@ export class CollectionObservable extends BehaviorSubject {
         return r;
     }
     async update({ id: update_payload_id, ...payload }) {
-        const { id, ref } = this.#find_ref_by_id(update_payload_id);
+        const { id, ref, doc } = this.#find_ref_by_id(update_payload_id);
         if (!ref)
             return;
         // Trigger local update
@@ -314,7 +306,7 @@ export class CollectionObservable extends BehaviorSubject {
                             type: 'modified'
                         }]
                 }
-            }], true);
+            }], 'local');
         try {
             return await this.collection_options.transporter.update(ref, payload);
         }
@@ -323,12 +315,12 @@ export class CollectionObservable extends BehaviorSubject {
                     ref,
                     data: {
                         changes: [{
-                                data: { id, __updating: false },
+                                data: { ...doc || {}, id, __updating: false },
                                 ref,
                                 type: 'modified'
                             }]
                     }
-                }], true);
+                }], 'local');
             throw e;
         }
     }
@@ -345,7 +337,7 @@ export class CollectionObservable extends BehaviorSubject {
                             type: 'modified'
                         }]
                 }
-            }], true);
+            }], 'local');
         // Trigger  
         try {
             return await this.collection_options.transporter.remove(ref);
@@ -360,7 +352,7 @@ export class CollectionObservable extends BehaviorSubject {
                                 type: 'modified'
                             }]
                     }
-                }], true);
+                }], 'local');
             throw e;
         }
     }

package/package.json

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