@aglyn/aglyn 1.0.0-beta.146 → 1.0.0-beta.147

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aglyn/aglyn",
-  "version": "1.0.0-beta.146",
+  "version": "1.0.0-beta.147",
   "license": "Apache-2.0",
   "homepage": "https://aglyn.com",
   "repository": {
@@ -33,15 +33,15 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@aglyn/shared-data-enums": "1.0.0-beta.146",
-    "@aglyn/shared-data-mdi": "1.0.0-beta.146",
-    "@aglyn/shared-data-types": "1.0.0-beta.146",
-    "@aglyn/shared-util-email": "1.0.0-beta.146",
-    "@aglyn/shared-util-http": "1.0.0-beta.146",
-    "@aglyn/shared-util-logger": "1.0.0-beta.146",
-    "@aglyn/shared-util-timestamp": "1.0.0-beta.146",
-    "@aglyn/shared-util-tools": "1.0.0-beta.146",
-    "@aglyn/shared-util-vendor": "1.0.0-beta.146",
+    "@aglyn/shared-data-enums": "1.0.0-beta.147",
+    "@aglyn/shared-data-mdi": "1.0.0-beta.147",
+    "@aglyn/shared-data-types": "1.0.0-beta.147",
+    "@aglyn/shared-util-email": "1.0.0-beta.147",
+    "@aglyn/shared-util-http": "1.0.0-beta.147",
+    "@aglyn/shared-util-logger": "1.0.0-beta.147",
+    "@aglyn/shared-util-timestamp": "1.0.0-beta.147",
+    "@aglyn/shared-util-tools": "1.0.0-beta.147",
+    "@aglyn/shared-util-vendor": "1.0.0-beta.147",
     "@data-driven-forms/react-form-renderer": "^4.2.0",
     "@msgpack/msgpack": "^3.1.3",
     "@types/unist": "^3.0.3",

package/src/lib/app-utils/collection-entries.d.ts

@@ -140,6 +140,38 @@ export declare const COLLECTION_LIST_PAGE_SIZE = 10;
  * empty collection still has a page 1 (AGL-620).
  */
 export declare function collectionTotalPages(total: number, perPage: number): number;
+/**
+ * The slice of a listing's entries that the page named by `pagination`
+ * actually shows (AGL-3213).
+ *
+ * The loader hands the WHOLE narrowed set down to compose, because
+ * {@link expandCollectionEntries} does its own windowing off the block's
+ * props — a Collection entries block may carry its own `perPage`, its own
+ * pinned `page`, a `firstPageOnly` switch and its own filters, none of which
+ * this function can see. Slicing before compose would double-window and empty
+ * every page after the first.
+ *
+ * Everything the loader serializes into page PROPS is downstream of compose,
+ * and there the full set is not merely wasted bytes — it is a false
+ * statement. The `ItemList` JSON-LD numbers its items
+ * `(page - 1) * perPage + index + 1` on the premise that `entries` is the
+ * window; handed all one hundred, `/changelog/page/7` published
+ * `numberOfItems: 100` and positions 61 through 160, most of them past the
+ * end of the collection. The legacy fallback renderer read it the same way
+ * and rendered the whole list on every page.
+ *
+ * So: the loader keeps the full set until compose has had it, and narrows
+ * HERE on the way into props, where `pagination` is the route's own answer to
+ * which page this is.
+ *
+ * An unpaginated listing (an entry route, the RSS feed) passes no pagination
+ * and gets its entries back untouched.
+ */
+export declare function collectionEntriesPageWindow<T>(entries: readonly T[], pagination: {
+    page?: number;
+    perPage?: number;
+    windowStart?: number;
+} | null | undefined): T[];
 /** Default/most related posts a Related posts block renders (AGL-582). */
 export declare const COLLECTION_RELATED_DEFAULT_LIMIT = 3;
 export declare const COLLECTION_RELATED_MAX = 12;
@@ -334,6 +366,17 @@ export interface CollectionEntriesSource {
      * wins: that is a deliberately pinned window, not a paginated list.
      */
     page?: number;
+    /**
+     * The absolute index `entries[0]` holds in the collection's own order
+     * (AGL-3213). Zero everywhere except a listing page past the cached read's
+     * bound, which is served by a window read for that page alone.
+     *
+     * Without it a windowed source is silently empty: every consumer here
+     * slices `[(page - 1) * perPage, …)` on the premise that `entries` starts
+     * at the beginning of the collection, so page 11 of a windowed ten-entry
+     * source slices from 100 and renders nothing.
+     */
+    windowStart?: number;
 }
 /**
  * Display name of an entry's category (AGL-582): the `categoryId` lookup

package/src/lib/app-utils/collection-entries.js

@@ -133,6 +133,48 @@ export const COLLECTION_CATEGORY_ROUTE_SEGMENT = 'category';
     if (perPage <= 0) return 1;
     return Math.max(1, Math.ceil(total / perPage));
 }
+/**
+ * The slice of a listing's entries that the page named by `pagination`
+ * actually shows (AGL-3213).
+ *
+ * The loader hands the WHOLE narrowed set down to compose, because
+ * {@link expandCollectionEntries} does its own windowing off the block's
+ * props — a Collection entries block may carry its own `perPage`, its own
+ * pinned `page`, a `firstPageOnly` switch and its own filters, none of which
+ * this function can see. Slicing before compose would double-window and empty
+ * every page after the first.
+ *
+ * Everything the loader serializes into page PROPS is downstream of compose,
+ * and there the full set is not merely wasted bytes — it is a false
+ * statement. The `ItemList` JSON-LD numbers its items
+ * `(page - 1) * perPage + index + 1` on the premise that `entries` is the
+ * window; handed all one hundred, `/changelog/page/7` published
+ * `numberOfItems: 100` and positions 61 through 160, most of them past the
+ * end of the collection. The legacy fallback renderer read it the same way
+ * and rendered the whole list on every page.
+ *
+ * So: the loader keeps the full set until compose has had it, and narrows
+ * HERE on the way into props, where `pagination` is the route's own answer to
+ * which page this is.
+ *
+ * An unpaginated listing (an entry route, the RSS feed) passes no pagination
+ * and gets its entries back untouched.
+ */ export function collectionEntriesPageWindow(entries, pagination) {
+    const perPage = Number(pagination == null ? void 0 : pagination.perPage);
+    if (!Number.isFinite(perPage) || perPage <= 0) return [
+        ...entries
+    ];
+    const pageRaw = Number(pagination == null ? void 0 : pagination.page);
+    const page = Number.isFinite(pageRaw) && pageRaw >= 1 ? Math.floor(pageRaw) : 1;
+    // `windowStart` is where `entries` begins in the collection's own order
+    // (AGL-3213). A listing past the cached read's bound is served by a window
+    // read for that page alone, and slicing it from the page's absolute offset
+    // would return nothing.
+    const startRaw = Number(pagination == null ? void 0 : pagination.windowStart);
+    const windowStart = Number.isFinite(startRaw) && startRaw > 0 ? Math.floor(startRaw) : 0;
+    const start = Math.max(0, (page - 1) * Math.floor(perPage) - windowStart);
+    return entries.slice(start, start + Math.floor(perPage));
+}
 /** Default/most related posts a Related posts block renders (AGL-582). */ export const COLLECTION_RELATED_DEFAULT_LIMIT = 3;
 export const COLLECTION_RELATED_MAX = 12;
 /** Most categories a collection's taxonomy holds (AGL-582). */ export const COLLECTION_CATEGORIES_MAX = 50;
@@ -779,7 +821,12 @@ const POSITIVE_INTEGER = /^[1-9]\d*$/;
         // counting it, because the count cannot see a read that came back full
         // and was then thinned by the liveness gate.
         const sourceCapped = collectionSourceIsBounded(source);
-        const windowed = suppressedBeyondFirstPage ? [] : perPage ? filtered.slice((page - 1) * perPage, (page - 1) * perPage + perPage) : filtered.slice(0, limit);
+        // Where this source's first entry sits in the collection (AGL-3213):
+        // zero for a whole read, and the page's own offset for a windowed one.
+        const windowStartRaw = Number(source.windowStart);
+        const windowStart = Number.isFinite(windowStartRaw) && windowStartRaw > 0 ? Math.floor(windowStartRaw) : 0;
+        const pageStart = perPage ? Math.max(0, (page - 1) * perPage - windowStart) : 0;
+        const windowed = suppressedBeyondFirstPage ? [] : perPage ? filtered.slice(pageStart, pageStart + perPage) : filtered.slice(0, limit);
         const childIds = [];
         windowed.forEach((entry, index)=>{
             const prefix = `${COLLECTION_ENTRIES_NODE_ID_PREFIX}${containerId}__${index}__`;