@livequery/client 1.0.39 → 1.0.41

package/build/Collection.d.ts

@@ -7,13 +7,6 @@ export type CollectionOption<T = any> = {
     reload_interval?: number;
     realtime?: boolean;
 };
-type CollectionStream<T> = {
-    items: SmartQueryItem<T>[];
-    error?: ErrorInfo;
-    has_more: boolean;
-    loading?: boolean;
-    options: Partial<QueryOption<T>>;
-};
 export type SmartQueryItem<T> = T & {
     __removing: boolean;
     __updating: boolean;
@@ -21,6 +14,14 @@ export type SmartQueryItem<T> = T & {
     __remove: Function;
     __update: (data: Partial<T>) => any;
     __trigger: (name: string, payload?: any) => any;
+    __collection_ref: string;
+};
+type CollectionStream<T> = {
+    items: SmartQueryItem<T>[];
+    error?: ErrorInfo;
+    has_more: boolean;
+    loading?: boolean;
+    options: Partial<QueryOption<T>>;
 };
 export declare class CollectionObservable<T extends {
     id: string;
@@ -28,12 +29,9 @@ export declare class CollectionObservable<T extends {
     #private;
     private ref;
     private collection_options;
-    private is_collection_ref;
-    private collection_ref;
-    private document_id;
     readonly $changes: Subject<UpdatedData<T>>;
-    set_realtime(realtime: boolean): void;
     constructor(ref: string, collection_options: CollectionOption<T>);
+    set_realtime(realtime: boolean): void;
     private sync;
     private fetch_data;
     reload(): void;

package/build/Collection.js

@@ -30,16 +30,13 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var _CollectionObservable_$state, _CollectionObservable_subscriptions, _CollectionObservable_state, _CollectionObservable_next_cursor, _CollectionObservable_IdMap;
+var _CollectionObservable_instances, _CollectionObservable_$state, _CollectionObservable_subscriptions, _CollectionObservable_state, _CollectionObservable_next_cursor, _CollectionObservable_document_id, _CollectionObservable_IdMap, _CollectionObservable_refs, _CollectionObservable_ref_parser, _CollectionObservable_find_ref_by_id;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CollectionObservable = void 0;
 const rxjs_1 = require("rxjs");
 const get_sort_function_1 = require("./helpers/get_sort_function");
 const operators_1 = require("rxjs/operators");
 class CollectionObservable extends rxjs_1.Observable {
-    set_realtime(realtime) {
-        this.collection_options.realtime = realtime;
-    }
     constructor(ref, collection_options) {
         super(o => {
             __classPrivateFieldSet(this, _CollectionObservable_state, { items: [], options: collection_options.filters, has_more: false }, "f");
@@ -53,46 +50,51 @@ class CollectionObservable extends rxjs_1.Observable {
         });
         this.ref = ref;
         this.collection_options = collection_options;
+        _CollectionObservable_instances.add(this);
+        this.$changes = new rxjs_1.Subject();
         _CollectionObservable_$state.set(this, new rxjs_1.Subject());
         _CollectionObservable_subscriptions.set(this, new Set());
         _CollectionObservable_state.set(this, void 0);
-        _CollectionObservable_next_cursor.set(this, null);
-        this.$changes = new rxjs_1.Subject();
+        _CollectionObservable_next_cursor.set(this, {});
+        _CollectionObservable_document_id.set(this, void 0);
         _CollectionObservable_IdMap.set(this, new Map());
+        _CollectionObservable_refs.set(this, []);
         if (ref.startsWith('/') || ref.endsWith('/'))
             throw 'INVAILD_REF_FORMAT';
         const refs = ref.split('/');
-        this.is_collection_ref = refs.length % 2 == 1;
-        this.collection_ref = refs.slice(0, refs.length - (this.is_collection_ref ? 0 : 1)).join('/');
-        this.document_id = this.is_collection_ref ? null : refs[refs.length - 1];
+        __classPrivateFieldSet(this, _CollectionObservable_document_id, refs.length % 2 == 1 ? null : refs[refs.length - 1], "f");
+        __classPrivateFieldSet(this, _CollectionObservable_refs, __classPrivateFieldGet(this, _CollectionObservable_instances, "m", _CollectionObservable_ref_parser).call(this, ref), "f");
+    }
+    set_realtime(realtime) {
+        this.collection_options.realtime = realtime;
     }
     sync(stream, from_local = false) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const realtime = (_a = this.collection_options.realtime) !== null && _a !== void 0 ? _a : true;
         const actions = { update: false, reindex: false };
-        for (const { data, error } of stream) {
+        for (const { data, error, ref } of stream) {
             // Error & paging
             if (error) {
                 __classPrivateFieldGet(this, _CollectionObservable_state, "f").error = error;
                 actions.update = true;
             }
             if (((_b = data === null || data === void 0 ? void 0 : data.paging) === null || _b === void 0 ? void 0 : _b.n) == 0) {
-                __classPrivateFieldGet(this, _CollectionObservable_state, "f").has_more = (_c = data === null || data === void 0 ? void 0 : data.paging) === null || _c === void 0 ? void 0 : _c.has_more;
-                __classPrivateFieldSet(this, _CollectionObservable_next_cursor, (_d = data === null || data === void 0 ? void 0 : data.paging) === null || _d === void 0 ? void 0 : _d.next_cursor, "f");
+                __classPrivateFieldGet(this, _CollectionObservable_next_cursor, "f")[ref] = (_c = data === null || data === void 0 ? void 0 : data.paging) === null || _c === void 0 ? void 0 : _c.next_cursor;
+                __classPrivateFieldGet(this, _CollectionObservable_state, "f").has_more = Object.values(__classPrivateFieldGet(this, _CollectionObservable_next_cursor, "f")).some(v => v && v != '#');
                 __classPrivateFieldGet(this, _CollectionObservable_state, "f").loading = false;
                 actions.update = true;
             }
             // Sync 
             for (const change of (data === null || data === void 0 ? void 0 : data.changes) || []) {
-                if (!((_e = change === null || change === void 0 ? void 0 : change.data) === null || _e === void 0 ? void 0 : _e.id))
+                if (!((_d = change === null || change === void 0 ? void 0 : change.data) === null || _d === void 0 ? void 0 : _d.id))
                     continue;
                 const { data: payload, type } = change;
                 this.$changes.next(change);
-                const index = (_f = __classPrivateFieldGet(this, _CollectionObservable_IdMap, "f").get(payload.__local_id || payload.id)) !== null && _f !== void 0 ? _f : -1;
+                const index = (_e = __classPrivateFieldGet(this, _CollectionObservable_IdMap, "f").get(payload.id)) !== null && _e !== void 0 ? _e : -1;
                 if (index == -1 && type == 'added') {
                     if (
                     // Is first value from HTTP query
-                    ((_g = data === null || data === void 0 ? void 0 : data.paging) === null || _g === void 0 ? void 0 : _g.n) == 0
+                    ((_f = data === null || data === void 0 ? void 0 : data.paging) === null || _f === void 0 ? void 0 : _f.n) == 0
                         || (
                         // Is realtime update that match filters
                         (realtime || from_local) && Object
@@ -130,7 +132,7 @@ class CollectionObservable extends rxjs_1.Observable {
                             catch (e) { }
                             return false;
                         }))) {
-                        __classPrivateFieldGet(this, _CollectionObservable_state, "f").items.push(Object.assign(Object.assign({}, payload), { __adding: false, __updating: false, __removing: false, __remove: () => this.remove(payload === null || payload === void 0 ? void 0 : payload.id), __trigger: (name, input) => this.trigger(name, input, payload === null || payload === void 0 ? void 0 : payload.id), __update: (input) => this.update(Object.assign(Object.assign({}, input), { id: payload === null || payload === void 0 ? void 0 : payload.id })) }));
+                        __classPrivateFieldGet(this, _CollectionObservable_state, "f").items.push(Object.assign(Object.assign({}, payload), { __adding: false, __updating: false, __removing: false, __remove: () => this.remove(payload === null || payload === void 0 ? void 0 : payload.id), __trigger: (name, input) => this.trigger(name, input, payload === null || payload === void 0 ? void 0 : payload.id), __update: (input) => this.update(Object.assign(Object.assign({}, input), { id: payload === null || payload === void 0 ? void 0 : payload.id })), __collection_ref: change.ref }));
                         actions.reindex = true;
                         actions.update = true;
                     }
@@ -156,7 +158,7 @@ class CollectionObservable extends rxjs_1.Observable {
             }
         }
         if (actions.reindex) {
-            __classPrivateFieldGet(this, _CollectionObservable_state, "f").items = __classPrivateFieldGet(this, _CollectionObservable_state, "f").items.sort((0, get_sort_function_1.get_sort_function)(__classPrivateFieldGet(this, _CollectionObservable_state, "f").items[0], ((_j = (_h = this.collection_options) === null || _h === void 0 ? void 0 : _h.filters) === null || _j === void 0 ? void 0 : _j._order_by) || 'created_at', (_l = (_k = this.collection_options) === null || _k === void 0 ? void 0 : _k.filters) === null || _l === void 0 ? void 0 : _l._sort));
+            __classPrivateFieldGet(this, _CollectionObservable_state, "f").items = __classPrivateFieldGet(this, _CollectionObservable_state, "f").items.sort((0, get_sort_function_1.get_sort_function)(__classPrivateFieldGet(this, _CollectionObservable_state, "f").items[0], ((_h = (_g = this.collection_options) === null || _g === void 0 ? void 0 : _g.filters) === null || _h === void 0 ? void 0 : _h._order_by) || 'created_at', (_k = (_j = this.collection_options) === null || _j === void 0 ? void 0 : _j.filters) === null || _k === void 0 ? void 0 : _k._sort));
             __classPrivateFieldGet(this, _CollectionObservable_IdMap, "f").clear();
             __classPrivateFieldGet(this, _CollectionObservable_state, "f").items.map((item, index) => __classPrivateFieldGet(this, _CollectionObservable_IdMap, "f").set(item.id, index));
         }
@@ -166,17 +168,22 @@ class CollectionObservable extends rxjs_1.Observable {
         if (!this.ref)
             return;
         if (flush) {
+            __classPrivateFieldSet(this, _CollectionObservable_next_cursor, {}, "f");
             __classPrivateFieldGet(this, _CollectionObservable_subscriptions, "f").forEach(s => s.unsubscribe());
             __classPrivateFieldGet(this, _CollectionObservable_subscriptions, "f").clear();
         }
         flush && __classPrivateFieldGet(this, _CollectionObservable_IdMap, "f").clear();
         __classPrivateFieldSet(this, _CollectionObservable_state, Object.assign(Object.assign({}, __classPrivateFieldGet(this, _CollectionObservable_state, "f")), { items: flush ? [] : __classPrivateFieldGet(this, _CollectionObservable_state, "f").items, error: null, loading: true, options }), "f");
         __classPrivateFieldGet(this, _CollectionObservable_$state, "f").next(__classPrivateFieldGet(this, _CollectionObservable_state, "f"));
-        const query = this.collection_options.transporter.query(this.ref, options);
-        const sub = Object.assign(query
-            .pipe((0, operators_1.bufferTime)(this.collection_options.sync_delay || 500), (0, operators_1.filter)(stream => stream.length > 0))
-            .subscribe(data => this.sync(data)), { reload: query.reload });
-        __classPrivateFieldGet(this, _CollectionObservable_subscriptions, "f").add(sub);
+        const has_more_data_refs = __classPrivateFieldGet(this, _CollectionObservable_refs, "f").filter(ref => __classPrivateFieldGet(this, _CollectionObservable_next_cursor, "f")[ref] != '#');
+        const queries = has_more_data_refs.map(ref => (this
+            .collection_options
+            .transporter
+            .query(ref, Object.assign(Object.assign({}, options), { _cursor: __classPrivateFieldGet(this, _CollectionObservable_next_cursor, "f")[ref] }))));
+        const reload = () => queries.map(q => q.reload());
+        const $ = (0, rxjs_1.merge)(...queries.map((q, index) => q.pipe((0, operators_1.map)(data => (Object.assign(Object.assign({}, data), { ref: has_more_data_refs[index] })))))).pipe((0, operators_1.bufferTime)(500), (0, operators_1.filter)(list => list.length > 0), (0, operators_1.map)(data => this.sync(data)));
+        const subscription = Object.assign($.subscribe(), { reload });
+        __classPrivateFieldGet(this, _CollectionObservable_subscriptions, "f").add(subscription);
     }
     reload() {
         __classPrivateFieldGet(this, _CollectionObservable_subscriptions, "f").forEach(s => s.reload());
@@ -187,7 +194,6 @@ class CollectionObservable extends rxjs_1.Observable {
     fetch_more() {
         var _a;
         const options = (_a = __classPrivateFieldGet(this, _CollectionObservable_state, "f")) === null || _a === void 0 ? void 0 : _a.options;
-        __classPrivateFieldGet(this, _CollectionObservable_next_cursor, "f") && (options._cursor = __classPrivateFieldGet(this, _CollectionObservable_next_cursor, "f"));
         this.fetch_data(options);
     }
     filter(filters) {
@@ -195,33 +201,36 @@ class CollectionObservable extends rxjs_1.Observable {
     }
     add(payload) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.collection_options.transporter.add(`${this.collection_ref}`, payload);
+            if (this.ref.includes('.'))
+                throw 'INVAILD_COLLECTION_REF_FOR_ADDING';
+            return yield this.collection_options.transporter.add(`${this.ref}`, payload);
         });
     }
     update(_a) {
         var { id: update_payload_id } = _a, payload = __rest(_a, ["id"]);
         return __awaiter(this, void 0, void 0, function* () {
-            const id = update_payload_id || this.document_id;
+            const { id, ref } = __classPrivateFieldGet(this, _CollectionObservable_instances, "m", _CollectionObservable_find_ref_by_id).call(this, update_payload_id);
             // Trigger local update
             this.sync([{
+                    ref,
                     data: {
                         changes: [{
                                 data: Object.assign(Object.assign({}, payload), { id, __updating: true }),
-                                ref: this.ref,
+                                ref,
                                 type: 'modified'
                             }]
                     }
                 }], true);
-            const ref = `${this.collection_ref}${id ? `/${id}` : ''}`;
             try {
                 return yield this.collection_options.transporter.update(ref, payload);
             }
             catch (e) {
                 this.sync([{
+                        ref,
                         data: {
                             changes: [{
                                     data: { id, __updating: false },
-                                    ref: this.ref,
+                                    ref,
                                     type: 'modified'
                                 }]
                         }
@@ -232,27 +241,28 @@ class CollectionObservable extends rxjs_1.Observable {
     }
     remove(remove_document_id) {
         return __awaiter(this, void 0, void 0, function* () {
-            const id = remove_document_id || this.document_id;
+            const { id, ref } = __classPrivateFieldGet(this, _CollectionObservable_instances, "m", _CollectionObservable_find_ref_by_id).call(this, remove_document_id);
             this.sync([{
+                    ref,
                     data: {
                         changes: [{
                                 data: { id, __removing: true },
-                                ref: this.ref,
+                                ref,
                                 type: 'modified'
                             }]
                     }
                 }], true);
             // Trigger  
-            const ref = `${this.collection_ref}${id ? `/${id}` : ''}`;
             try {
                 return yield this.collection_options.transporter.remove(ref);
             }
             catch (e) {
                 this.sync([{
+                        ref,
                         data: {
                             changes: [{
                                     data: { id, __removing: false },
-                                    ref: this.ref,
+                                    ref,
                                     type: 'modified'
                                 }]
                         }
@@ -263,11 +273,29 @@ class CollectionObservable extends rxjs_1.Observable {
     }
     trigger(name, payload, trigger_document_id) {
         return __awaiter(this, void 0, void 0, function* () {
-            const id = trigger_document_id || this.document_id;
-            const ref = `${this.collection_ref}${id ? `/${id}` : ''}`;
+            const { ref } = __classPrivateFieldGet(this, _CollectionObservable_instances, "m", _CollectionObservable_find_ref_by_id).call(this, trigger_document_id);
             return yield this.collection_options.transporter.trigger(ref, name, {}, payload);
         });
     }
 }
 exports.CollectionObservable = CollectionObservable;
-_CollectionObservable_$state = new WeakMap(), _CollectionObservable_subscriptions = new WeakMap(), _CollectionObservable_state = new WeakMap(), _CollectionObservable_next_cursor = new WeakMap(), _CollectionObservable_IdMap = new WeakMap();
+_CollectionObservable_$state = new WeakMap(), _CollectionObservable_subscriptions = new WeakMap(), _CollectionObservable_state = new WeakMap(), _CollectionObservable_next_cursor = new WeakMap(), _CollectionObservable_document_id = new WeakMap(), _CollectionObservable_IdMap = new WeakMap(), _CollectionObservable_refs = new WeakMap(), _CollectionObservable_instances = new WeakSet(), _CollectionObservable_ref_parser = function _CollectionObservable_ref_parser(path) {
+    const refs_builder = (paths) => {
+        const [a, b, ...c] = paths;
+        if (!b)
+            return paths;
+        const r = a.map(aa => b.map(bb => `${aa}/${bb}`)).flat(2);
+        const d = [r, ...c];
+        return refs_builder(d);
+    };
+    const b = path.split('/').map(l => l.split('.'));
+    return refs_builder(b).flat(2);
+}, _CollectionObservable_find_ref_by_id = function _CollectionObservable_find_ref_by_id(id = __classPrivateFieldGet(this, _CollectionObservable_document_id, "f")) {
+    if (!id)
+        throw 'ID_NOT_FOUND';
+    const collection_ref = __classPrivateFieldGet(this, _CollectionObservable_state, "f").items[__classPrivateFieldGet(this, _CollectionObservable_IdMap, "f").get(id)].__collection_ref;
+    if (!collection_ref)
+        throw 'COLLECTION_REF_NOT_FOUND';
+    const ref = `${collection_ref}${id ? `/${id}` : ''}`;
+    return { ref, id, collection_ref };
+};

package/package.json

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