@livequery/client 1.0.48 → 1.0.50

package/build/Collection.js

@@ -162,15 +162,18 @@ class CollectionObservable extends rxjs_1.Observable {
         actions.update && __classPrivateFieldGet(this, _CollectionObservable_$state, "f").next(__classPrivateFieldGet(this, _CollectionObservable_state, "f"));
     }
     fetch_data(options = {}, flush = false) {
-        const has_more_data_refs = __classPrivateFieldGet(this, _CollectionObservable_refs, "f").filter(ref => __classPrivateFieldGet(this, _CollectionObservable_next_cursor, "f")[ref] === undefined || (__classPrivateFieldGet(this, _CollectionObservable_next_cursor, "f")[ref] && __classPrivateFieldGet(this, _CollectionObservable_next_cursor, "f")[ref] != '#'));
-        if (!this.ref || __classPrivateFieldGet(this, _CollectionObservable_state, "f").loading || has_more_data_refs.length == 0)
+        if (__classPrivateFieldGet(this, _CollectionObservable_refs, "f").length == 0)
             return;
         if (flush) {
             __classPrivateFieldSet(this, _CollectionObservable_next_cursor, {}, "f");
             __classPrivateFieldGet(this, _CollectionObservable_subscriptions, "f").forEach(s => s.unsubscribe());
             __classPrivateFieldGet(this, _CollectionObservable_subscriptions, "f").clear();
+            __classPrivateFieldGet(this, _CollectionObservable_IdMap, "f").clear();
         }
-        flush && __classPrivateFieldGet(this, _CollectionObservable_IdMap, "f").clear();
+        const has_more_data_refs = __classPrivateFieldGet(this, _CollectionObservable_refs, "f").filter(ref => __classPrivateFieldGet(this, _CollectionObservable_next_cursor, "f")[ref] === undefined || (__classPrivateFieldGet(this, _CollectionObservable_next_cursor, "f")[ref] && __classPrivateFieldGet(this, _CollectionObservable_next_cursor, "f")[ref] != '#'));
+        // Load more but no more data || loading 
+        if (!flush && (has_more_data_refs.length == 0 || __classPrivateFieldGet(this, _CollectionObservable_state, "f").loading))
+            return;
         __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 queries = has_more_data_refs.map(ref => (this
@@ -276,6 +279,8 @@ class CollectionObservable extends rxjs_1.Observable {
 }
 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_refs = new WeakMap(), _CollectionObservable_instances = new WeakSet(), _CollectionObservable_ref_parser = function _CollectionObservable_ref_parser(path) {
+    if (!path)
+        return [];
     const refs_builder = (paths) => {
         const [a, b, ...c] = paths;
         if (!b)

package/package.json

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