@dereekb/rxjs 10.0.21 → 10.0.22

package/index.cjs.js

@@ -3193,7 +3193,13 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
  * @returns
  */
 function iterationHasNextAndCanLoadMore(iteration) {
-  return rxjs.combineLatest([iteration.hasNext$, iteration.canLoadMore$]).pipe(rxjs.map(util.reduceBooleansWithAndFn(true)), rxjs.shareReplay(1));
+  return iteration.canLoadMore$.pipe(rxjs.switchMap(canLoadMore => {
+    if (canLoadMore) {
+      return iteration.hasNext$;
+    } else {
+      return rxjs.of(false);
+    }
+  }), rxjs.shareReplay(1));
 }
 /**
  * Automatically calls next up to the current maxPageLoadLimit configured on the iterator.
@@ -3238,7 +3244,9 @@ function iteratorNextPageUntilPage(iteration, page) {
       next: firstLatestPage => {
         const promise = util.performTaskLoop({
           initValue: firstLatestPage,
-          checkContinue: latestPage => checkPageLimit(latestPage),
+          checkContinue: latestPage => __awaiter(this, void 0, void 0, function* () {
+            return rxjs.firstValueFrom(iterationHasNextAndCanLoadMore(iteration)).then(canLoadMore => canLoadMore && checkPageLimit(latestPage));
+          }),
           next: () => __awaiter(this, void 0, void 0, function* () {
             return yield iteration.nextPage();
           })
@@ -4796,34 +4804,43 @@ function itemAccumulatorNextPageUntilResultsCount(config) {
     countResultsFunction: countResults
   } = config;
   const getMaxResultsLimit = util.asGetter(maxResultsLimit);
+  const canLoadMoreObs = iterationHasNextAndCanLoadMore(accumulator.itemIteration).pipe(timeoutStartWith(false, 100),
+  // TODO: This can fail to emit anything if the iterator has been destroyed
+  rxjs.shareReplay(1));
   function checkResultsLimit() {
     return __awaiter(this, void 0, void 0, function* () {
-      const allItems = yield rxjs.firstValueFrom(accumulator.allItems$);
+      const allItems = yield rxjs.firstValueFrom(accumulator.currentAllItems$);
+      const canLoadMore = yield rxjs.firstValueFrom(canLoadMoreObs);
       const currentCount = yield countResults(allItems);
       const maxResultsLimit = getMaxResultsLimit();
+      const shouldContinue = canLoadMore && currentCount < maxResultsLimit;
       return {
-        shouldContinue: currentCount < maxResultsLimit,
+        shouldContinue,
         currentCount
       };
     });
   }
   return new Promise((resolve, reject) => {
-    accumulator.allItems$.pipe(rxjs.first(), rxjs.switchMap(allItems => rxjs.from(util.asPromise(countResults(allItems))))).subscribe({
+    accumulator.currentAllItems$.pipe(rxjs.first(), rxjs.switchMap(allItems => rxjs.from(util.asPromise(countResults(allItems))))).subscribe({
       next: currentResultsCount => __awaiter(this, void 0, void 0, function* () {
-        const page = yield util.performTaskLoop({
+        util.performTaskLoop({
           initValue: currentResultsCount,
-          checkContinue: () => __awaiter(this, void 0, void 0, function* () {
+          checkContinue: (x, i) => __awaiter(this, void 0, void 0, function* () {
             const result = yield checkResultsLimit();
             currentResultsCount = result.currentCount;
             return result.shouldContinue;
           }),
           next: () => __awaiter(this, void 0, void 0, function* () {
-            return yield accumulator.itemIteration.nextPage();
+            return accumulator.itemIteration.nextPage();
           })
-        });
-        resolve({
-          page,
-          resultsCount: currentResultsCount
+        }).then(page => {
+          resolve({
+            page,
+            resultsCount: currentResultsCount
+          });
+        }).catch(error => {
+          reject(error);
+          throw error;
         });
       }),
       error: error => {
@@ -5109,12 +5126,12 @@ class ItemPageIterationInstance {
     this.latestSuccessfulPageResults$ = this.state$.pipe(rxjs.map(x => x.lastSuccessful), filterMaybe(), rxjs.shareReplay(1));
     this.currentState$ = this.currentPageResultState$.pipe(mapItemPageLoadingStateFromResultPageLoadingState(), rxjs.shareReplay(1));
     this.latestLoadedPage$ = this.latestPageResultState$.pipe(rxjs.map(x => x.page), rxjs.distinctUntilChanged(), rxjs.shareReplay(1));
-    this.numberOfPagesLoaded$ = this.latestLoadedPage$.pipe(rxjs.map(x => x + 1), rxjs.shareReplay(1));
+    this.numberOfPagesLoaded$ = this.latestLoadedPage$.pipe(rxjs.map(x => x + 1), rxjs.defaultIfEmpty(0), rxjs.shareReplay(1));
     // MARK: ItemIteration
     /**
      * Whether or not there are more results to load.
      */
-    this.hasNext$ = this.hasReachedEndResult$.pipe(rxjs.map(x => !x), rxjs.shareReplay(1));
+    this.hasNext$ = this.hasReachedEndResult$.pipe(rxjs.map(x => !x), rxjs.defaultIfEmpty(false), rxjs.shareReplay(1));
     /**
      * Whether or not the successfulPageResultsCount has passed the maxPageLoadLimit
      */
@@ -5136,18 +5153,24 @@ class ItemPageIterationInstance {
     this._maxPageLoadLimit.next(limit);
   }
   nextPage(request = {}) {
-    return new Promise((resolve, reject) => {
-      this._nextFinished$.pipe(rxjs.exhaustMap(() => this.latestPageResultState$), rxjs.first()).subscribe({
+    return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+      this._nextFinished$.pipe(rxjs.exhaustMap(() => this.latestPageResultState$), rxjs.defaultIfEmpty({
+        error: undefined,
+        page: -1
+      }), rxjs.first()).subscribe({
         next: latestState => {
           if (latestState.error) {
             reject(latestState.error);
           } else {
             resolve(latestState.page);
           }
+        },
+        error: error => {
+          reject(error);
         }
       });
       this.next(request);
-    });
+    }));
   }
   next(request = {}) {
     this._pushNext(request);

package/index.esm.js

@@ -1,5 +1,5 @@
-import { isObservable, of, switchMap, map, filter, skipWhile, EMPTY, combineLatest, delay, startWith, distinctUntilChanged, mergeMap, BehaviorSubject, shareReplay, skip, first, merge, finalize, scan, exhaustMap, identity, throttleTime, timeout, tap, throwError, timer, takeWhile, delayWhen, asyncScheduler, from, catchError, firstValueFrom, defaultIfEmpty } from 'rxjs';
-import { getValueFromGetter, isMaybeSo, areEqualPOJOValues, convertToArray, reduceBooleansWithAndFn, asGetter, performTaskLoop, isMaybeNot, pushItemOrArrayItemsIntoArray, pushArrayItemsIntoArray, forEachWithArray, asArray, filterAndMapFunction, objectKeysEqualityComparatorFunction, objectKeyEqualityComparatorFunction, asPromise, randomNumberFactory, mapKeysIntersectionObjectToArray, mapsHaveSameKeys, incrementingNumberFactory, filterUniqueFunction, build, cachedGetter, allKeyValueTuples, keyValueMapFactory, multiKeyValueMapFactory, setContainsAllValues, setContainsAnyValue, setContainsNoneOfValue, hasSameValues, compareEqualityWithValueFromItemsFunction, searchStringFilterFunction, objectHasKey, toReadableError, reduceBooleansWithOr, reduceBooleansWithAnd, valuesAreBothNullishOrEquivalent, filterMaybeValues, mergeObjects, safeCompareEquality, limitArray, hasNonNullValue, mapFunctionOutputPair, lastValue, flattenArray, filteredPage, FIRST_PAGE, hasValueOrNotEmpty, getNextPageNumber, reduceBooleansWithOrFn } from '@dereekb/util';
+import { isObservable, of, switchMap, map, filter, skipWhile, EMPTY, combineLatest, delay, startWith, distinctUntilChanged, mergeMap, BehaviorSubject, shareReplay, skip, first, merge, finalize, firstValueFrom, scan, exhaustMap, identity, throttleTime, timeout, tap, throwError, timer, takeWhile, delayWhen, asyncScheduler, from, catchError, defaultIfEmpty } from 'rxjs';
+import { getValueFromGetter, isMaybeSo, areEqualPOJOValues, convertToArray, asGetter, performTaskLoop, isMaybeNot, pushItemOrArrayItemsIntoArray, pushArrayItemsIntoArray, forEachWithArray, asArray, filterAndMapFunction, objectKeysEqualityComparatorFunction, objectKeyEqualityComparatorFunction, asPromise, randomNumberFactory, mapKeysIntersectionObjectToArray, mapsHaveSameKeys, incrementingNumberFactory, filterUniqueFunction, build, cachedGetter, allKeyValueTuples, keyValueMapFactory, multiKeyValueMapFactory, setContainsAllValues, setContainsAnyValue, setContainsNoneOfValue, hasSameValues, compareEqualityWithValueFromItemsFunction, searchStringFilterFunction, objectHasKey, toReadableError, reduceBooleansWithOr, reduceBooleansWithAnd, valuesAreBothNullishOrEquivalent, filterMaybeValues, mergeObjects, safeCompareEquality, limitArray, hasNonNullValue, mapFunctionOutputPair, lastValue, flattenArray, filteredPage, FIRST_PAGE, hasValueOrNotEmpty, getNextPageNumber, reduceBooleansWithOrFn } from '@dereekb/util';
 import ms from 'ms';
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -3283,7 +3283,13 @@ $$1({ target: 'Promise', stat: true, forced: FORCED_PROMISE_CONSTRUCTOR }, {
  * @returns
  */
 function iterationHasNextAndCanLoadMore(iteration) {
-  return combineLatest([iteration.hasNext$, iteration.canLoadMore$]).pipe(map(reduceBooleansWithAndFn(true)), shareReplay(1));
+  return iteration.canLoadMore$.pipe(switchMap(canLoadMore => {
+    if (canLoadMore) {
+      return iteration.hasNext$;
+    } else {
+      return of(false);
+    }
+  }), shareReplay(1));
 }
 
 /**
@@ -3330,7 +3336,7 @@ function iteratorNextPageUntilPage(iteration, page) {
       next: firstLatestPage => {
         const promise = performTaskLoop({
           initValue: firstLatestPage,
-          checkContinue: latestPage => checkPageLimit(latestPage),
+          checkContinue: async latestPage => firstValueFrom(iterationHasNextAndCanLoadMore(iteration)).then(canLoadMore => canLoadMore && checkPageLimit(latestPage)),
           next: async () => await iteration.nextPage()
         });
         resolve(promise);
@@ -5120,30 +5126,39 @@ function itemAccumulatorNextPageUntilResultsCount(config) {
     countResultsFunction: countResults
   } = config;
   const getMaxResultsLimit = asGetter(maxResultsLimit);
+  const canLoadMoreObs = iterationHasNextAndCanLoadMore(accumulator.itemIteration).pipe(timeoutStartWith(false, 100),
+  // TODO: This can fail to emit anything if the iterator has been destroyed
+  shareReplay(1));
   async function checkResultsLimit() {
-    const allItems = await firstValueFrom(accumulator.allItems$);
+    const allItems = await firstValueFrom(accumulator.currentAllItems$);
+    const canLoadMore = await firstValueFrom(canLoadMoreObs);
     const currentCount = await countResults(allItems);
     const maxResultsLimit = getMaxResultsLimit();
+    const shouldContinue = canLoadMore && currentCount < maxResultsLimit;
     return {
-      shouldContinue: currentCount < maxResultsLimit,
+      shouldContinue,
       currentCount
     };
   }
   return new Promise((resolve, reject) => {
-    accumulator.allItems$.pipe(first(), switchMap(allItems => from(asPromise(countResults(allItems))))).subscribe({
+    accumulator.currentAllItems$.pipe(first(), switchMap(allItems => from(asPromise(countResults(allItems))))).subscribe({
       next: async currentResultsCount => {
-        const page = await performTaskLoop({
+        performTaskLoop({
           initValue: currentResultsCount,
-          checkContinue: async () => {
+          checkContinue: async (x, i) => {
             const result = await checkResultsLimit();
             currentResultsCount = result.currentCount;
             return result.shouldContinue;
           },
-          next: async () => await accumulator.itemIteration.nextPage()
-        });
-        resolve({
-          page,
-          resultsCount: currentResultsCount
+          next: async () => accumulator.itemIteration.nextPage()
+        }).then(page => {
+          resolve({
+            page,
+            resultsCount: currentResultsCount
+          });
+        }).catch(error => {
+          reject(error);
+          throw error;
         });
       },
       error: error => {
@@ -5450,12 +5465,12 @@ class ItemPageIterationInstance {
     this.latestSuccessfulPageResults$ = this.state$.pipe(map(x => x.lastSuccessful), filterMaybe(), shareReplay(1));
     this.currentState$ = this.currentPageResultState$.pipe(mapItemPageLoadingStateFromResultPageLoadingState(), shareReplay(1));
     this.latestLoadedPage$ = this.latestPageResultState$.pipe(map(x => x.page), distinctUntilChanged(), shareReplay(1));
-    this.numberOfPagesLoaded$ = this.latestLoadedPage$.pipe(map(x => x + 1), shareReplay(1));
+    this.numberOfPagesLoaded$ = this.latestLoadedPage$.pipe(map(x => x + 1), defaultIfEmpty(0), shareReplay(1));
     // MARK: ItemIteration
     /**
      * Whether or not there are more results to load.
      */
-    this.hasNext$ = this.hasReachedEndResult$.pipe(map(x => !x), shareReplay(1));
+    this.hasNext$ = this.hasReachedEndResult$.pipe(map(x => !x), defaultIfEmpty(false), shareReplay(1));
     /**
      * Whether or not the successfulPageResultsCount has passed the maxPageLoadLimit
      */
@@ -5477,17 +5492,24 @@ class ItemPageIterationInstance {
     this._maxPageLoadLimit.next(limit);
   }
   nextPage(request = {}) {
-    return new Promise((resolve, reject) => {
-      this._nextFinished$.pipe(exhaustMap(() => this.latestPageResultState$), first()).subscribe({
+    var _this = this;
+    return new Promise(async function (resolve, reject) {
+      _this._nextFinished$.pipe(exhaustMap(() => _this.latestPageResultState$), defaultIfEmpty({
+        error: undefined,
+        page: -1
+      }), first()).subscribe({
         next: latestState => {
           if (latestState.error) {
             reject(latestState.error);
           } else {
             resolve(latestState.page);
           }
+        },
+        error: error => {
+          reject(error);
         }
       });
-      this.next(request);
+      _this.next(request);
     });
   }
   next(request = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/rxjs",
-  "version": "10.0.21",
+  "version": "10.0.22",
   "exports": {
     ".": {
       "types": "./src/index.d.ts",

package/src/lib/iterator/iteration.next.d.ts

@@ -1,6 +1,6 @@
 import { type Observable } from 'rxjs';
 import { type ItemIteration, type PageItemIteration } from './iteration';
-import { type Maybe, type GetterOrValue } from '@dereekb/util';
+import { type Maybe, type GetterOrValue, type PageNumber } from '@dereekb/util';
 /**
  * Creates an observable from the input iteration that checks both the hasNext$ and canLoadMore$ states.
  *
@@ -29,4 +29,4 @@ export declare function iteratorNextPageUntilMaxPageLoadLimit(iterator: PageItem
  * @param page
  * @returns
  */
-export declare function iteratorNextPageUntilPage(iteration: PageItemIteration, page: GetterOrValue<number>): Promise<number>;
+export declare function iteratorNextPageUntilPage(iteration: PageItemIteration, page: GetterOrValue<number>): Promise<PageNumber>;