shelving 1.26.0 → 1.26.1

package/db/Pagination.d.ts

@@ -7,23 +7,15 @@ import { DataQuery } from "./Database.js";
  * - If you don't pass in initial values, it will autoload the first page.
  */
 export declare class Pagination<T extends Data> extends State<ResultsMap<T>> implements Iterable<Entry<T>> {
+    protected _pending: boolean;
     readonly ref: DataQuery<T>;
     readonly limit: number;
-    readonly startLoading: boolean;
-    readonly startDone: boolean;
-    readonly endLoading: boolean;
-    readonly endDone: boolean;
     constructor(ref: DataQuery<T>);
-    /**
-     * Load more results before the start.
-     * - Promise that needs to be handled.
-     */
-    loadStart: () => Promise<void>;
     /**
      * Load more results after the end.
      * - Promise that needs to be handled.
      */
-    loadEnd: () => Promise<void>;
+    more: () => Promise<void>;
     /**
      * Merge more results into this pagination.
      * @return The change in the number of results.

package/db/Pagination.js

@@ -1,4 +1,4 @@
-import { getFirstItem, getLastItem, assertLength, assertNumber, yieldMerged, toMap } from "../util/index.js";
+import { getLastItem, assertLength, assertNumber, yieldMerged, toMap, LOADING } from "../util/index.js";
 import { State } from "../stream/index.js";
 import { ConditionError } from "../index.js";
 /**
@@ -9,56 +9,33 @@ import { ConditionError } from "../index.js";
 export class Pagination extends State {
     constructor(ref) {
         super();
-        this.startLoading = false;
-        this.startDone = false;
-        this.endLoading = false;
-        this.endDone = false;
-        /**
-         * Load more results before the start.
-         * - Promise that needs to be handled.
-         */
-        this.loadStart = async () => {
-            if (this.closed)
-                throw new ConditionError();
-            if (!this.startLoading) {
-                this.startLoading = true;
-                if (!this.loading) {
-                    const firstItem = getFirstItem(this.value);
-                    if (firstItem) {
-                        const next = await this.ref.after(firstItem[0], firstItem[1]).resultsMap;
-                        this.startDone = next.size < this.limit;
-                        this.startLoading = false;
-                        return this.merge(next);
-                    }
-                }
-                const next = await this.ref.resultsMap;
-                this.startDone = next.size < this.limit;
-                this.startLoading = false;
-                return this.next(next);
-            }
-        };
+        this._pending = false; // Prevents double-loading.
         /**
          * Load more results after the end.
          * - Promise that needs to be handled.
          */
-        this.loadEnd = async () => {
+        this.more = async () => {
             if (this.closed)
-                throw new ConditionError();
-            if (!this.endLoading) {
-                this.endLoading = true;
+                throw new ConditionError("Pagination is closed");
+            if (!this._pending) {
+                this._pending = true;
                 if (!this.loading) {
                     const lastItem = getLastItem(this.value);
                     if (lastItem) {
                         const next = await this.ref.after(lastItem[0], lastItem[1]).resultsMap;
-                        this.endDone = next.size < this.limit;
-                        this.endLoading = false;
-                        return this.merge(next);
+                        this.merge(next);
+                        if (next.size < this.limit)
+                            this.complete();
+                        this._pending = false;
+                        return;
                     }
                 }
+                this._value === LOADING;
                 const next = await this.ref.resultsMap;
-                this.endDone = next.size < this.limit;
-                this.endLoading = false;
-                return this.next(next);
+                this.next(next);
+                if (next.size < this.limit)
+                    this.complete();
+                this._pending = false;
             }
         };
         this.ref = ref;

package/package.json

@@ -11,7 +11,7 @@
 		"state-management",
 		"query-builder"
 	],
-	"version": "1.26.0",
+	"version": "1.26.1",
 	"repository": "https://github.com/dhoulb/shelving",
 	"author": "Dave Houlbrooke <dave@shax.com>",
 	"license": "0BSD",