@dereekb/util 12.0.6 → 12.1.1

package/fetch/index.cjs.js

@@ -5939,9 +5939,11 @@ function fetchPageFactory(config) {
       return async () => {
         const result = await fetch(input);
         const {
-          cursor,
+          cursor: readCursor,
+          nextPageCursor,
           hasNext: readHasNext
         } = await readFetchPageResultInfo(result);
+        const cursor = readCursor != null ? readCursor : previous == null ? void 0 : previous.cursor;
         const hasNext = readHasNext !== false;
         const page = previous ? previous.page + 1 : util.FIRST_PAGE;
         const isAtMaxPage = page >= maxPage;
@@ -5953,6 +5955,7 @@ function fetchPageFactory(config) {
           hasNext,
           isAtMaxPage,
           cursor,
+          nextPageCursor,
           fetchNext: util.cachedGetter(async () => {
             // assert max page
             if (isAtMaxPage) {
@@ -6228,6 +6231,20 @@ function makeUrlSearchParams(input, options) {
   }
   return searchParams;
 }
+/**
+ * Merges an array of MakeUrlSearchParamsOptions into a single MakeUrlSearchParamsOptions value.
+ */
+function mergeMakeUrlSearchParamsOptions(options) {
+  const omitKeys = new Set();
+  util.useIterableOrValue(options, x => {
+    if ((x == null ? void 0 : x.omitKeys) != null) {
+      util.useIterableOrValue(x.omitKeys, key => omitKeys.add(key));
+    }
+  });
+  return {
+    omitKeys: omitKeys.size > 0 ? Array.from(omitKeys) : undefined
+  };
+}
 
 var defineProperty = objectDefineProperty.f;
 
@@ -6753,6 +6770,7 @@ exports.iterateFetchPages = iterateFetchPages;
 exports.iterateFetchPagesByEachItem = iterateFetchPagesByEachItem;
 exports.iterateFetchPagesByItems = iterateFetchPagesByItems;
 exports.makeUrlSearchParams = makeUrlSearchParams;
+exports.mergeMakeUrlSearchParamsOptions = mergeMakeUrlSearchParamsOptions;
 exports.mergeRequestHeaders = mergeRequestHeaders;
 exports.mergeRequestInits = mergeRequestInits;
 exports.nodeFetchService = nodeFetchService;

package/fetch/index.esm.js

@@ -5937,9 +5937,11 @@ function fetchPageFactory(config) {
       return async () => {
         const result = await fetch(input);
         const {
-          cursor,
+          cursor: readCursor,
+          nextPageCursor,
           hasNext: readHasNext
         } = await readFetchPageResultInfo(result);
+        const cursor = readCursor != null ? readCursor : previous == null ? void 0 : previous.cursor;
         const hasNext = readHasNext !== false;
         const page = previous ? previous.page + 1 : FIRST_PAGE;
         const isAtMaxPage = page >= maxPage;
@@ -5951,6 +5953,7 @@ function fetchPageFactory(config) {
           hasNext,
           isAtMaxPage,
           cursor,
+          nextPageCursor,
           fetchNext: cachedGetter(async () => {
             // assert max page
             if (isAtMaxPage) {
@@ -6226,6 +6229,20 @@ function makeUrlSearchParams(input, options) {
   }
   return searchParams;
 }
+/**
+ * Merges an array of MakeUrlSearchParamsOptions into a single MakeUrlSearchParamsOptions value.
+ */
+function mergeMakeUrlSearchParamsOptions(options) {
+  const omitKeys = new Set();
+  useIterableOrValue(options, x => {
+    if ((x == null ? void 0 : x.omitKeys) != null) {
+      useIterableOrValue(x.omitKeys, key => omitKeys.add(key));
+    }
+  });
+  return {
+    omitKeys: omitKeys.size > 0 ? Array.from(omitKeys) : undefined
+  };
+}
 
 var defineProperty = objectDefineProperty.f;
 
@@ -6720,4 +6737,4 @@ const fetchApiFetchService = fetchService({
  */
 const nodeFetchService = fetchApiFetchService;
 
-export { DEFAULT_FETCH_HANDLER, DEFAULT_FETCH_REQUEST_FACTORY, FETCH_PAGE_FACTORY_DEFAULT_MAX_PAGE, FetchPageLimitReachedError, FetchPageNoNextPageError, FetchRequestFactoryError, FetchResponseError, FetchTimeoutError, JsonResponseParseError, configureFetch, fetchApiFetchService, fetchJsonBodyString, fetchJsonFunction, fetchJsonRequestInit, fetchJsonRequestInitFunction, fetchOk, fetchPageFactory, fetchRequestFactory, fetchService, fetchTimeout, fetchURL, fetchURLQueryKeyValueStringTuples, fetchURLSearchParamsObjectToURLSearchParams, headersToHeadersTuple, isFetchRequest, isURL, isURLSearchParams, iterateFetchPages, iterateFetchPagesByEachItem, iterateFetchPagesByItems, makeUrlSearchParams, mergeRequestHeaders, mergeRequestInits, nodeFetchService, queryParamsToSearchParams, rateLimitedFetchHandler, requireOkResponse, returnNullHandleFetchJsonParseErrorFunction, throwJsonResponseParseErrorFunction };
+export { DEFAULT_FETCH_HANDLER, DEFAULT_FETCH_REQUEST_FACTORY, FETCH_PAGE_FACTORY_DEFAULT_MAX_PAGE, FetchPageLimitReachedError, FetchPageNoNextPageError, FetchRequestFactoryError, FetchResponseError, FetchTimeoutError, JsonResponseParseError, configureFetch, fetchApiFetchService, fetchJsonBodyString, fetchJsonFunction, fetchJsonRequestInit, fetchJsonRequestInitFunction, fetchOk, fetchPageFactory, fetchRequestFactory, fetchService, fetchTimeout, fetchURL, fetchURLQueryKeyValueStringTuples, fetchURLSearchParamsObjectToURLSearchParams, headersToHeadersTuple, isFetchRequest, isURL, isURLSearchParams, iterateFetchPages, iterateFetchPagesByEachItem, iterateFetchPagesByItems, makeUrlSearchParams, mergeMakeUrlSearchParamsOptions, mergeRequestHeaders, mergeRequestInits, nodeFetchService, queryParamsToSearchParams, rateLimitedFetchHandler, requireOkResponse, returnNullHandleFetchJsonParseErrorFunction, throwJsonResponseParseErrorFunction };

package/fetch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/util/fetch",
-  "version": "12.0.6",
+  "version": "12.1.1",
   ".": {
     "types": "./src/index.d.ts",
     "node": {

package/fetch/src/lib/fetch.page.d.ts

@@ -34,6 +34,10 @@ export interface FetchPageResultInfo extends Page {
      * Cursor for this page, if applicable.
      */
     readonly cursor?: Maybe<FetchPageCursor>;
+    /**
+     * Cursor for the next page, if applicable.
+     */
+    readonly nextPageCursor?: Maybe<FetchPageCursor>;
     /**
      * Whether or not there are more results to fetch.
      *

package/fetch/src/lib/fetch.url.d.ts

@@ -1,4 +1,4 @@
-import { type Maybe, type ArrayOrValue, type IterableOrValue, type ObjectKey, type FilterKeyValueTuplesInput } from '@dereekb/util';
+import { type Maybe, type ArrayOrValue, type IterableOrValue, type ObjectKey } from '@dereekb/util';
 /**
  * Options for makeUrlSearchParams()
  */
@@ -7,10 +7,6 @@ export interface MakeUrlSearchParamsOptions {
      * Optional iterable of keys to remove from the search params.
      */
     readonly omitKeys?: Maybe<IterableOrValue<ObjectKey>>;
-    /**
-     * Optional filter for merging the objects together.
-     */
-    readonly mergeFilter?: FilterKeyValueTuplesInput;
 }
 /**
  * Creates URLSearchParams from the input objects. The input objects are merged together.
@@ -20,3 +16,7 @@ export interface MakeUrlSearchParamsOptions {
  * @returns
  */
 export declare function makeUrlSearchParams(input: Maybe<ArrayOrValue<Maybe<object | Record<string, string | number>>>>, options?: Maybe<MakeUrlSearchParamsOptions>): URLSearchParams;
+/**
+ * Merges an array of MakeUrlSearchParamsOptions into a single MakeUrlSearchParamsOptions value.
+ */
+export declare function mergeMakeUrlSearchParamsOptions(options: ArrayOrValue<Maybe<MakeUrlSearchParamsOptions>>): MakeUrlSearchParamsOptions;