live-cache 0.2.1 → 0.2.2

package/dist/index.umd.js

@@ -529,14 +529,17 @@
         abort() {
             if (this.abortController) {
                 this.abortController.abort();
+                this.abortController = null;
             }
-            this.abortController = new AbortController();
         }
         updateTotal(total) {
             this.total = total;
         }
-        updatePageSize(pageSize) {
-            this.pageSize = pageSize;
+        updatePage(page) {
+            this.page = page;
+        }
+        updateLimit(limit) {
+            this.limit = limit;
         }
         /**
          * Fetch the complete dataset for this controller.
@@ -544,11 +547,23 @@
          * Subclasses must implement this. Return `[rows, total]` where `total` is the
          * total number of rows available on the backend (useful for pagination).
          */
-        fetchAll() {
+        fetch(where) {
             return __awaiter(this, void 0, void 0, function* () {
                 throw Error("Not Implemented");
             });
         }
+        nextPage(where) {
+            return __awaiter(this, void 0, void 0, function* () {
+                this.updatePage(this.page + 1);
+                yield this.update(where);
+            });
+        }
+        previousPage(where) {
+            return __awaiter(this, void 0, void 0, function* () {
+                this.updatePage(this.page - 1);
+                yield this.update(where);
+            });
+        }
         /**
          * Initialise (hydrate) the controller's collection.
          *
@@ -559,37 +574,41 @@
          *
          * A successful initialise ends with `commit()` so subscribers receive the latest snapshot.
          */
-        initialise() {
+        initialise(where) {
             return __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                if (this.loading)
-                    return;
+                this.abortController = new AbortController();
                 // If the collection is not empty, return.
-                let data = this.collection.find().map((doc) => doc.toData());
+                let data = this.collection.find(where).map((doc) => doc.toData());
                 if (data.length !== 0) {
-                    return;
-                }
-                // If the collection is empty, check the storage manager.
-                data = (_a = (yield this.storageManager.get(this.name))) !== null && _a !== void 0 ? _a : [];
-                if (data.length !== 0) {
-                    this.updateTotal(this.collection.find().length);
-                    this.collection.insertMany(data);
+                    this.updateTotal(data.length);
                     yield this.commit();
                     return;
                 }
+                const fromStorage = yield this.storageManager.get(this.name);
+                if (fromStorage && fromStorage.length !== 0) {
+                    const __collection = new Collection(this.name);
+                    __collection.insertMany(fromStorage);
+                    const __data = __collection.find(where).map(x => x.toData());
+                    if (__data.length !== 0) {
+                        this.collection.insertMany(__data);
+                        this.updateTotal(__data.length);
+                        yield this.commit();
+                        return;
+                    }
+                }
                 // If the storage manager is empty, fetch the data from the server.
                 try {
                     this.loading = true;
-                    const [_data, total] = yield this.fetchAll();
+                    const [_data, total] = yield this.fetch(where);
                     this.collection.insertMany(_data);
                     this.updateTotal(total);
-                    yield this.commit();
                 }
                 catch (error) {
                     this.error = error;
                 }
                 finally {
                     this.loading = false;
+                    yield this.commit();
                 }
             });
         }
@@ -606,7 +625,7 @@
          * unsubscribe();
          * ```
          */
-        publish(onChange) {
+        subscribe(onChange) {
             this.subscribers.add(onChange);
             return () => this.subscribers.delete(onChange);
         }
@@ -615,12 +634,12 @@
          *
          * This is intentionally private: consumers should use `commit()` which computes the snapshot.
          */
-        subscribe(model) {
+        publish(models) {
             return __awaiter(this, void 0, void 0, function* () {
                 // Persist the full cache snapshot for hydration.
                 yield this.storageManager.set(this.name, this.collection.find().map((doc) => doc.toModel()));
                 this.subscribers.forEach((sub) => {
-                    sub(model);
+                    sub(models);
                 });
             });
         }
@@ -634,7 +653,7 @@
         commit() {
             return __awaiter(this, void 0, void 0, function* () {
                 const models = this.collection.find().map((doc) => doc.toModel());
-                yield this.subscribe(models);
+                yield this.publish(models);
             });
         }
         /**
@@ -642,8 +661,13 @@
          *
          * Subclasses typically use this inside `invalidate()`.
          */
-        refetch() {
-            return this.initialise();
+        update(where) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const [response, total] = yield this.fetch(where);
+                this.collection.insertMany(response);
+                this.updateTotal(total);
+                yield this.commit();
+            });
         }
         /**
          * Invalidate the cache for this controller.
@@ -667,10 +691,11 @@
             void this.storageManager.delete(this.name);
             this.collection.clear();
             this.updateTotal(0);
-            this.updatePageSize(-1);
+            this.updatePage(0);
+            this.updateLimit(10);
             this.error = null;
             this.loading = false;
-            void this.subscribe([]);
+            void this.publish([]);
         }
         /**
          * Create a controller.
@@ -679,22 +704,22 @@
          * @param storageManager - where snapshots are persisted (defaults to no-op)
          * @param pageSize - optional pagination hint (userland)
          */
-        constructor(name, { storageManager = new DefaultStorageManager("live-cache:"), pageSize = -1, invalidator = new DefaultInvalidator(), initialiseOnMount = true, }) {
+        constructor(name, { storageManager = new DefaultStorageManager("live-cache:"), pageSize = 10, invalidator = new DefaultInvalidator(), }) {
             this.subscribers = new Set();
             this.loading = false;
             this.error = null;
             this.total = -1;
-            this.pageSize = -1;
+            this.page = 0;
+            this.limit = 10;
             this.abortController = null;
+            this.initialised = false;
             this.name = name;
             this.collection = new Collection(name);
             this.storageManager = storageManager;
-            this.pageSize = pageSize;
+            this.page = 0;
+            this.limit = pageSize;
             this.invalidator = invalidator;
             this.invalidator.bind(this.invalidate.bind(this));
-            if (initialiseOnMount) {
-                this.initialise();
-            }
         }
     }
 
@@ -947,12 +972,12 @@
         /**
          * Initialise a controller once per store, even if multiple callers request it.
          */
-        initialiseOnce(name) {
+        initialiseOnce(name, where) {
             const controller = this.get(name);
             const existing = this.initialisePromises.get(controller);
             if (existing)
                 return existing;
-            const promise = controller.initialise().finally(() => {
+            const promise = controller.initialise(where).finally(() => {
                 if (this.initialisePromises.get(controller) === promise) {
                     this.initialisePromises.delete(controller);
                 }
@@ -1302,7 +1327,7 @@
      */
     function useController(name, where, options) {
         var _a, _b, _c, _d;
-        const initialise = (_a = options === null || options === void 0 ? void 0 : options.initialise) !== null && _a !== void 0 ? _a : true;
+        (_a = options === null || options === void 0 ? void 0 : options.initialise) !== null && _a !== void 0 ? _a : true;
         const optionalStore = options === null || options === void 0 ? void 0 : options.store;
         const abortOnUnmount = (_b = options === null || options === void 0 ? void 0 : options.abortOnUnmount) !== null && _b !== void 0 ? _b : true;
         const withInvalidation = (_c = options === null || options === void 0 ? void 0 : options.withInvalidation) !== null && _c !== void 0 ? _c : true;
@@ -1324,13 +1349,12 @@
             };
             // Prime state immediately.
             callback();
-            const cleanup = controller.publish(callback);
+            const cleanup = controller.subscribe(callback);
             if (withInvalidation) {
                 controller.invalidator.registerInvalidation();
             }
-            if (initialise) {
-                void store.initialiseOnce(name);
-            }
+            void store.initialiseOnce(name, where);
+            // controller.initialise(where);
             return () => {
                 if (abortOnUnmount) {
                     controller.abort();
@@ -1338,7 +1362,7 @@
                 cleanup();
                 controller.invalidator.unregisterInvalidation();
             };
-        }, [controller, where, initialise, abortOnUnmount, withInvalidation]);
+        }, [controller, where, abortOnUnmount, withInvalidation]);
         return { controller, data, loading, error };
     }
 
@@ -1361,7 +1385,7 @@
                 setData(join(from, where, select));
             };
             callback();
-            const cleanup = from.map((c) => c.publish(callback));
+            const cleanup = from.map((c) => c.subscribe(callback));
             return () => {
                 cleanup.forEach((c) => c());
             };