ropegeo-common 1.9.0 → 1.9.2

package/README.md

@@ -286,7 +286,7 @@ Helper tables use columns **Name**, **Description**, **Import**. Class tables ad
 | --- | --- | --- |
 | `RopeGeoHttpRequest` | Single GET/POST wrapper; parses `Result.fromResponseBody`. | `import { RopeGeoHttpRequest, Method, Service } from 'ropegeo-common/components'` |
 | `RopeGeoCursorPaginationHttpRequest` | Cursor-paginated fetch with `loadMore`. | `import { RopeGeoCursorPaginationHttpRequest } from 'ropegeo-common/components'` |
-| `RopeGeoPaginationHttpRequest` | Page-based fetch; loads all pages and `mergePages` into one value. | `import { RopeGeoPaginationHttpRequest } from 'ropegeo-common/components'` |
+| `RopeGeoPaginationHttpRequest<T>` | Page-based fetch; each page validated with `PaginationResults.fromResponseBody`; concatenates `results` into `data` (`T[]` when complete, otherwise `null` with `errors`). | `import { RopeGeoPaginationHttpRequest } from 'ropegeo-common/components'` |
 
 ---
 

package/dist/components/RopeGeoPaginationHttpRequest.d.ts

@@ -1,5 +1,5 @@
 import type { ReactNode } from "react";
-import { type PaginationParams, PaginationResults } from "../classes";
+import { type PaginationParams } from "../classes";
 import { Method, Service } from "./RopeGeoHttpRequest";
 export type RopeGeoPaginationHttpRequestProps<T = unknown> = {
     service: Service;
@@ -8,20 +8,29 @@ export type RopeGeoPaginationHttpRequestProps<T = unknown> = {
     pathParams?: Record<string, string>;
     queryParams: PaginationParams;
     /**
-     * Combines all successful page responses into one value. Not called until every page has been fetched.
+     * Max concurrent page requests after page 1 completes (page 1 is always alone so `total` is known).
+     * Clamped to at least 1.
+     * @default 10
      */
-    mergePages: (pages: PaginationResults[]) => T;
+    batchSize?: number;
     children: (args: {
         loading: boolean;
         received: number;
         total: number | null;
-        data: T | null;
+        /**
+         * Concatenated `results` from every page after each body was parsed with
+         * {@link PaginationResults.fromResponseBody}. `null` if any page fails HTTP, JSON parse, or validation.
+         */
+        data: T[] | null;
+        /** Set when `data` is `null` after a terminal failure; cleared only when all pages succeed. */
         errors: Error | null;
     }) => ReactNode;
 };
 /**
- * Fetches page 1, 2, … until all items for {@link queryParams} are loaded (same `limit` and filters,
- * advancing `page` via {@link PaginationParams.withPage}). The initial `page` on `queryParams` is ignored.
+ * Fetches page 1, then remaining pages in parallel batches of {@link batchSize}.
+ * The initial `page` on `queryParams` is ignored. Each body is parsed with
+ * {@link PaginationResults.fromResponseBody}. Final `data` is pages concatenated in page order.
+ * In-flight requests use one {@link AbortController}: unmount or any failure aborts the rest.
  */
-export declare function RopeGeoPaginationHttpRequest<T = unknown>({ service, method, path, pathParams, queryParams, mergePages, children, }: RopeGeoPaginationHttpRequestProps<T>): import("react/jsx-runtime").JSX.Element;
+export declare function RopeGeoPaginationHttpRequest<T = unknown>({ service, method, path, pathParams, queryParams, batchSize, children, }: RopeGeoPaginationHttpRequestProps<T>): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=RopeGeoPaginationHttpRequest.d.ts.map

package/dist/components/RopeGeoPaginationHttpRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RopeGeoPaginationHttpRequest.d.ts","sourceRoot":"","sources":["../../src/components/RopeGeoPaginationHttpRequest.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,EACL,KAAK,gBAAgB,EACrB,iBAAiB,EAClB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,OAAO,EAAoB,MAAM,sBAAsB,CAAC;AAsCzE,MAAM,MAAM,iCAAiC,CAAC,CAAC,GAAG,OAAO,IAAI;IAC3D,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,CAAC,OAAO,MAAM,CAAC,CAAC,MAAM,OAAO,MAAM,CAAC,CAAC;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,WAAW,EAAE,gBAAgB,CAAC;IAC9B;;OAEG;IACH,UAAU,EAAE,CAAC,KAAK,EAAE,iBAAiB,EAAE,KAAK,CAAC,CAAC;IAC9C,QAAQ,EAAE,CAAC,IAAI,EAAE;QACf,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC;QACf,MAAM,EAAE,KAAK,GAAG,IAAI,CAAC;KACtB,KAAK,SAAS,CAAC;CACjB,CAAC;AAEF;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,CAAC,GAAG,OAAO,EAAE,EACxD,OAAO,EACP,MAAmB,EACnB,IAAI,EACJ,UAAU,EACV,WAAW,EACX,UAAU,EACV,QAAQ,GACT,EAAE,iCAAiC,CAAC,CAAC,CAAC,2CAyItC"}
+{"version":3,"file":"RopeGeoPaginationHttpRequest.d.ts","sourceRoot":"","sources":["../../src/components/RopeGeoPaginationHttpRequest.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,EACL,KAAK,gBAAgB,EAEtB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,OAAO,EAAoB,MAAM,sBAAsB,CAAC;AAoEzE,MAAM,MAAM,iCAAiC,CAAC,CAAC,GAAG,OAAO,IAAI;IAC3D,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,CAAC,OAAO,MAAM,CAAC,CAAC,MAAM,OAAO,MAAM,CAAC,CAAC;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,WAAW,EAAE,gBAAgB,CAAC;IAC9B;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,CAAC,IAAI,EAAE;QACf,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB;;;WAGG;QACH,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC;QACjB,+FAA+F;QAC/F,MAAM,EAAE,KAAK,GAAG,IAAI,CAAC;KACtB,KAAK,SAAS,CAAC;CACjB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,CAAC,GAAG,OAAO,EAAE,EACxD,OAAO,EACP,MAAmB,EACnB,IAAI,EACJ,UAAU,EACV,WAAW,EACX,SAAc,EACd,QAAQ,GACT,EAAE,iCAAiC,CAAC,CAAC,CAAC,2CA4KtC"}

package/dist/components/RopeGeoPaginationHttpRequest.js

@@ -29,11 +29,41 @@ function getResponseBody(raw) {
     }
     return raw;
 }
+function isAbortError(e) {
+    if (e instanceof DOMException && e.name === "AbortError")
+        return true;
+    if (e instanceof Error && e.name === "AbortError")
+        return true;
+    return false;
+}
+function sumReceived(pagesByNum) {
+    let sum = 0;
+    for (const p of pagesByNum.values()) {
+        sum += p.results.length;
+    }
+    return sum;
+}
+/**
+ * Concatenates each page's `results` in ascending page order. Call only after every page was built via
+ * {@link PaginationResults.fromResponseBody}.
+ */
+function concatPaginationResultItemsSorted(pagesByNum) {
+    const keys = [...pagesByNum.keys()].sort((a, b) => a - b);
+    const out = [];
+    for (const k of keys) {
+        const p = pagesByNum.get(k);
+        if (p != null)
+            out.push(...p.results);
+    }
+    return out;
+}
 /**
- * Fetches page 1, 2, … until all items for {@link queryParams} are loaded (same `limit` and filters,
- * advancing `page` via {@link PaginationParams.withPage}). The initial `page` on `queryParams` is ignored.
+ * Fetches page 1, then remaining pages in parallel batches of {@link batchSize}.
+ * The initial `page` on `queryParams` is ignored. Each body is parsed with
+ * {@link PaginationResults.fromResponseBody}. Final `data` is pages concatenated in page order.
+ * In-flight requests use one {@link AbortController}: unmount or any failure aborts the rest.
  */
-function RopeGeoPaginationHttpRequest({ service, method = RopeGeoHttpRequest_1.Method.GET, path, pathParams, queryParams, mergePages, children, }) {
+function RopeGeoPaginationHttpRequest({ service, method = RopeGeoHttpRequest_1.Method.GET, path, pathParams, queryParams, batchSize = 10, children, }) {
     const [loading, setLoading] = (0, react_1.useState)(true);
     const [received, setReceived] = (0, react_1.useState)(0);
     const [total, setTotal] = (0, react_1.useState)(null);
@@ -41,8 +71,11 @@ function RopeGeoPaginationHttpRequest({ service, method = RopeGeoHttpRequest_1.M
     const [errors, setErrors] = (0, react_1.useState)(null);
     const pathParamsKey = JSON.stringify(pathParams ?? null);
     const queryParamsKey = queryParams.toQueryString();
+    const effectiveBatch = Math.max(1, Math.floor(batchSize));
     (0, react_1.useEffect)(() => {
         let cancelled = false;
+        const abortController = new AbortController();
+        const { signal } = abortController;
         setLoading(true);
         setReceived(0);
         setTotal(null);
@@ -50,87 +83,107 @@ function RopeGeoPaginationHttpRequest({ service, method = RopeGeoHttpRequest_1.M
         setErrors(null);
         const baseUrl = RopeGeoHttpRequest_1.SERVICE_BASE_URL[service];
         const resolvedPath = resolvePath(path, pathParams);
-        const init = {
+        const baseInit = {
             method,
             headers: { "Content-Type": "application/json" },
+            signal,
         };
         (async () => {
-            const pages = [];
-            let pageNum = 1;
-            let receivedCount = 0;
-            let totalCount = null;
+            const pagesByNum = new Map();
+            const limit = queryParams.limit;
+            const fetchPage = async (pageNum) => {
+                const params = queryParams.withPage(pageNum);
+                const queryString = params.toQueryString();
+                const fullPath = queryString
+                    ? `${resolvedPath}?${queryString}`
+                    : resolvedPath;
+                const url = new URL(fullPath, baseUrl).toString();
+                const res = await fetch(url, baseInit);
+                const text = await res.text();
+                if (!res.ok) {
+                    abortController.abort();
+                    throw new Error(`HTTP ${res.status}: ${text || res.statusText}`);
+                }
+                if (text.length === 0) {
+                    abortController.abort();
+                    throw new Error("Empty response body");
+                }
+                let raw;
+                try {
+                    raw = JSON.parse(text);
+                }
+                catch (parseError) {
+                    abortController.abort();
+                    console.error("[RopeGeoPaginationHttpRequest] Invalid JSON response", {
+                        url,
+                        status: res.status,
+                        responseText: text.slice(0, 500),
+                        parseError: parseError instanceof Error
+                            ? parseError.message
+                            : String(parseError),
+                    });
+                    throw new Error("Invalid JSON response");
+                }
+                try {
+                    return classes_1.PaginationResults.fromResponseBody(getResponseBody(raw));
+                }
+                catch (e) {
+                    abortController.abort();
+                    const msg = e instanceof Error ? e.message : String(e);
+                    throw new Error(msg);
+                }
+            };
             try {
-                while (true) {
-                    const params = queryParams.withPage(pageNum);
-                    const queryString = params.toQueryString();
-                    const fullPath = queryString
-                        ? `${resolvedPath}?${queryString}`
-                        : resolvedPath;
-                    const url = new URL(fullPath, baseUrl).toString();
-                    const res = await fetch(url, init);
-                    const text = await res.text();
+                const first = await fetchPage(1);
+                if (cancelled)
+                    return;
+                pagesByNum.set(1, first);
+                const totalCount = first.total;
+                let receivedCount = first.results.length;
+                setReceived(receivedCount);
+                setTotal(totalCount);
+                const doneByTotal = totalCount !== null && receivedCount >= totalCount;
+                const doneByShortPage = first.results.length < limit;
+                if (doneByTotal || doneByShortPage) {
                     if (cancelled)
                         return;
-                    if (!res.ok) {
-                        setErrors(new Error(`HTTP ${res.status}: ${text || res.statusText}`));
-                        setData(null);
-                        return;
-                    }
-                    if (text.length === 0) {
-                        setErrors(new Error("Empty response body"));
-                        setData(null);
-                        return;
-                    }
-                    let raw;
-                    try {
-                        raw = JSON.parse(text);
-                    }
-                    catch (parseError) {
-                        console.error("[RopeGeoPaginationHttpRequest] Invalid JSON response", {
-                            url,
-                            status: res.status,
-                            responseText: text.slice(0, 500),
-                            parseError: parseError instanceof Error
-                                ? parseError.message
-                                : String(parseError),
-                        });
-                        setErrors(new Error("Invalid JSON response"));
-                        setData(null);
-                        return;
-                    }
-                    let parsed;
-                    try {
-                        parsed = classes_1.PaginationResults.fromResponseBody(getResponseBody(raw));
-                    }
-                    catch (e) {
-                        const msg = e instanceof Error ? e.message : String(e);
-                        setErrors(new Error(msg));
-                        setData(null);
+                    setData(concatPaginationResultItemsSorted(pagesByNum));
+                    setErrors(null);
+                    return;
+                }
+                const lastPage = Math.max(1, Math.ceil(totalCount / limit));
+                const toFetch = [];
+                for (let p = 2; p <= lastPage; p++) {
+                    toFetch.push(p);
+                }
+                for (let i = 0; i < toFetch.length; i += effectiveBatch) {
+                    if (cancelled)
                         return;
-                    }
+                    if (sumReceived(pagesByNum) >= totalCount)
+                        break;
+                    const chunk = toFetch.slice(i, i + effectiveBatch);
+                    const batchResults = await Promise.all(chunk.map(async (pageNum) => {
+                        const parsed = await fetchPage(pageNum);
+                        return { pageNum, parsed };
+                    }));
                     if (cancelled)
                         return;
-                    pages.push(parsed);
-                    receivedCount += parsed.results.length;
-                    if (totalCount === null) {
-                        totalCount = parsed.total;
+                    for (const { pageNum, parsed } of batchResults) {
+                        pagesByNum.set(pageNum, parsed);
                     }
+                    receivedCount = sumReceived(pagesByNum);
                     setReceived(receivedCount);
                     setTotal(totalCount);
-                    const doneByTotal = totalCount !== null && receivedCount >= totalCount;
-                    const doneByShortPage = parsed.results.length < queryParams.limit;
-                    if (doneByTotal || doneByShortPage) {
+                    if (receivedCount >= totalCount)
                         break;
-                    }
-                    pageNum += 1;
                 }
                 if (cancelled)
                     return;
-                setData(mergePages(pages));
+                setData(concatPaginationResultItemsSorted(pagesByNum));
                 setErrors(null);
             }
             catch (err) {
-                if (cancelled)
+                if (cancelled || isAbortError(err))
                     return;
                 console.error("[RopeGeoPaginationHttpRequest] Request failed", {
                     error: err instanceof Error ? err.message : String(err),
@@ -145,8 +198,17 @@ function RopeGeoPaginationHttpRequest({ service, method = RopeGeoHttpRequest_1.M
         })();
         return () => {
             cancelled = true;
+            abortController.abort();
         };
-    }, [service, method, path, pathParamsKey, queryParamsKey, mergePages, queryParams]);
+    }, [
+        service,
+        method,
+        path,
+        pathParamsKey,
+        queryParamsKey,
+        queryParams,
+        effectiveBatch,
+    ]);
     return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: children({
             loading,
             received,

package/dist/helpers/httpRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpRequest.d.ts","sourceRoot":"","sources":["../../src/helpers/httpRequest.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAiDH;;;;;;;;GAQG;AACH,wBAAsB,WAAW,CAC7B,GAAG,EAAE,MAAM,GAAG,GAAG,EACjB,UAAU,SAAI,EACd,WAAW,CAAC,EAAE,WAAW,EACzB,IAAI,CAAC,EAAE,WAAW,EAClB,QAAQ,CAAC,EAAE,OAAO,GACnB,OAAO,CAAC,QAAQ,CAAC,CAiEnB;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"httpRequest.d.ts","sourceRoot":"","sources":["../../src/helpers/httpRequest.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAiDH;;;;;;;;GAQG;AACH,wBAAsB,WAAW,CAC7B,GAAG,EAAE,MAAM,GAAG,GAAG,EACjB,UAAU,SAAI,EACd,WAAW,CAAC,EAAE,WAAW,EACzB,IAAI,CAAC,EAAE,WAAW,EAClB,QAAQ,CAAC,EAAE,OAAO,GACnB,OAAO,CAAC,QAAQ,CAAC,CAoEnB;AAED,eAAe,WAAW,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ropegeo-common",
-    "version": "1.9.0",
+    "version": "1.9.2",
     "description": "Shared domain classes and helpers for RopeGeo and WebScraper",
     "license": "ISC",
     "repository": {
@@ -43,11 +43,15 @@
         "@aws-sdk/client-cloudfront": "^3.971.0",
         "@aws-sdk/client-s3": "^3.971.0",
         "@aws-sdk/client-sqs": "^3.971.0",
+        "@testing-library/react": "^16.3.2",
         "@types/jest": "^29.5.14",
         "@types/node": "^22.10.0",
         "@types/react": "^19.0.0",
+        "@types/react-dom": "^19.2.3",
         "jest": "^30.2.0",
+        "jest-environment-jsdom": "^30.3.0",
         "react": "^19.1.0",
+        "react-dom": "^19.2.4",
         "ts-jest": "^29.2.5",
         "typescript": "^5.9.3",
         "undici": "^7.11.0"
@@ -55,4 +59,4 @@
     "files": [
         "dist"
     ]
-}
+}