@dereekb/rxjs 12.1.4 → 12.1.6

package/index.cjs.js

@@ -2483,7 +2483,9 @@ function scanBuildArray(init) {
         }
       }
       return acc;
-    }, seed ?? []), distinctUntilArrayLengthChanges(), rxjs.shareReplay(1));
+    }, seed ?? []), distinctUntilArrayLengthChanges(), rxjs.map(x => [...x]),
+    // always create a copy of the accumulated array when emitting
+    rxjs.shareReplay(1));
   });
 }
 // MARK: MapForEach
@@ -4024,16 +4026,19 @@ function itemAccumulator(itemIteration, inputMapItem) {
   const mapItemFunction = inputMapItem ?? (a => a);
   const hasCompletedInitialLoad$ = itemIteration.firstState$.pipe(rxjs.map(() => true), rxjs.startWith(false), rxjs.distinctUntilChanged(), rxjs.shareReplay(1));
   const latestSuccessfulState$ = itemIteration.latestState$.pipe(rxjs.filter(x => !isLoadingStateWithError(x)), rxjs.distinctUntilChanged(), rxjs.shareReplay(1));
-  const allSuccessfulStates$ = latestSuccessfulState$.pipe(scanIntoArray({
+  const _allSuccessfulStates$ = latestSuccessfulState$.pipe(scanIntoArray({
     immutable: false
   }),
   /**
    * Don't wait for the first successful state in order to avoid never returning a value on immediate failures.
    */
   rxjs.startWith([]), distinctUntilArrayLengthChanges(), rxjs.shareReplay(1));
-  const successfulLoadCount$ = allSuccessfulStates$.pipe(rxjs.map(x => x.length), rxjs.shareReplay(1));
+  const allSuccessfulStates$ = _allSuccessfulStates$.pipe(rxjs.map(x => [...x]),
+  // return a copy of the array, and not the scanIntoArray() result that is mutable
+  rxjs.shareReplay(1));
+  const successfulLoadCount$ = _allSuccessfulStates$.pipe(rxjs.map(x => x.length), rxjs.shareReplay(1));
   // MARK: ItemAccumulator
-  const currentAllItemPairs$ = allSuccessfulStates$.pipe(scanBuildArray(allSuccessfulStates => {
+  const currentAllItemPairs$ = _allSuccessfulStates$.pipe(scanBuildArray(allSuccessfulStates => {
     const mapStateToItem = util.mapFunctionOutputPair(mapLoadingStateValueFunction(mapItemFunction));
     /*
     Start with allSuccessfulPageResults$ since it contains all page results since the start of the iterator,
@@ -4054,7 +4059,7 @@ function itemAccumulator(itemIteration, inputMapItem) {
   const currentAllItems$ = currentAllItemPairs$.pipe(rxjs.map(x => x.map(y => y.output)), rxjs.shareReplay(1));
   const allItemPairs$ = hasCompletedInitialLoad$.pipe(switchMapWhileTrue(currentAllItemPairs$), rxjs.shareReplay(1));
   const allItems$ = hasCompletedInitialLoad$.pipe(switchMapWhileTrue(currentAllItems$), rxjs.shareReplay(1));
-  const sub = new SubscriptionObject(allSuccessfulStates$.subscribe());
+  const sub = new SubscriptionObject(_allSuccessfulStates$.subscribe());
   const destroy = () => sub.destroy();
   const result = {
     itemIteration,
@@ -4325,10 +4330,21 @@ class ItemPageIterationInstance {
       } else {
         return rxjs.of(prevResult).pipe();
       }
-    }), rxjs.map(state => ({
-      n: request.n,
-      state
-    })))), rxjs.scan((acc, x) => {
+    }), rxjs.map(inputState => {
+      let state;
+      if (inputState != null) {
+        const end = inputState.value != null ? isItemPageIteratorResultEndResult(inputState.value) : undefined;
+        state = {
+          ...inputState,
+          hasNextPage: util.invertMaybeBoolean(end)
+        };
+      }
+      const result = {
+        n: request.n,
+        state
+      };
+      return result;
+    }))), rxjs.scan((acc, x) => {
       const {
         n,
         state: curr
@@ -4399,7 +4415,7 @@ class ItemPageIterationInstance {
      *
      * Will emit every time the latest page has finished loading.
      */
-    this.hasReachedEndResult$ = this.latestPageResultState$.pipe(rxjs.map(x => isItemPageIteratorResultEndResult(x.value)), rxjs.startWith(false),
+    this.hasReachedEndResult$ = this.latestPageResultState$.pipe(rxjs.map(x => !x.hasNextPage), rxjs.startWith(false),
     // Has not reached the end
     rxjs.shareReplay(1));
     this._currentPageResultState$ = this.currentPageResultState$.pipe(rxjs.startWith(undefined), rxjs.shareReplay(1));
@@ -4524,9 +4540,11 @@ function mapItemPageLoadingStateFromResultPageLoadingState() {
   return rxjs.map(itemPageLoadingStateFromResultPageLoadingState);
 }
 function itemPageLoadingStateFromResultPageLoadingState(input) {
-  return mapLoadingStateResults(input, {
+  const result = mapLoadingStateResults(input, {
     mapValue: result => result.value
   });
+  result.hasNextPage = util.invertMaybeBoolean(input.value?.end);
+  return result;
 }
 
 const DEFAULT_LOCK_SET_TIME_LOCK_KEY = 'timelock';

package/index.esm.js

@@ -1,5 +1,5 @@
 import { isObservable, of, switchMap, map as map$1, combineLatest, filter, skipWhile, EMPTY, delay, startWith, distinctUntilChanged, mergeMap, BehaviorSubject, shareReplay, skip, defaultIfEmpty, first, merge, finalize, firstValueFrom, scan, exhaustMap, identity, throttleTime, timeout, tap, throwError, timer, takeWhile, delayWhen, asyncScheduler, from, catchError } from 'rxjs';
-import { getValueFromGetter, isMaybeSo, filterMaybeArrayValues, areEqualPOJOValues, convertToArray, asGetter, performTaskLoop, isMaybeNot, pushItemOrArrayItemsIntoArray, pushArrayItemsIntoArray, forEachWithArray, asArray, filterAndMapFunction, objectKeysEqualityComparatorFunction, objectKeyEqualityComparatorFunction, asPromise, randomNumberFactory, mapKeysIntersectionObjectToArray, mapsHaveSameKeys, incrementingNumberFactory, filterUniqueFunction, build, cachedGetter, allKeyValueTuples, keyValueMapFactory, multiKeyValueMapFactory, timePeriodCounter, setContainsAllValues, setContainsAnyValue, setContainsNoneOfValue, hasSameValues, compareEqualityWithValueFromItemsFunction, searchStringFilterFunction, valuesAreBothNullishOrEquivalent, objectHasKey, toReadableError, reduceBooleansWithOr, reduceBooleansWithAnd, mergeObjects, safeCompareEquality, hasNonNullValue, limitArray, mapFunctionOutputPair, lastValue, flattenArray, filteredPage, FIRST_PAGE, hasValueOrNotEmpty, getNextPageNumber, reduceBooleansWithOrFn, MS_IN_SECOND } from '@dereekb/util';
+import { getValueFromGetter, isMaybeSo, filterMaybeArrayValues, areEqualPOJOValues, convertToArray, asGetter, performTaskLoop, isMaybeNot, pushItemOrArrayItemsIntoArray, pushArrayItemsIntoArray, forEachWithArray, asArray, filterAndMapFunction, objectKeysEqualityComparatorFunction, objectKeyEqualityComparatorFunction, asPromise, randomNumberFactory, mapKeysIntersectionObjectToArray, mapsHaveSameKeys, incrementingNumberFactory, filterUniqueFunction, build, cachedGetter, allKeyValueTuples, keyValueMapFactory, multiKeyValueMapFactory, timePeriodCounter, setContainsAllValues, setContainsAnyValue, setContainsNoneOfValue, hasSameValues, compareEqualityWithValueFromItemsFunction, searchStringFilterFunction, valuesAreBothNullishOrEquivalent, objectHasKey, toReadableError, reduceBooleansWithOr, reduceBooleansWithAnd, mergeObjects, safeCompareEquality, hasNonNullValue, limitArray, mapFunctionOutputPair, lastValue, flattenArray, filteredPage, invertMaybeBoolean, FIRST_PAGE, hasValueOrNotEmpty, getNextPageNumber, reduceBooleansWithOrFn, MS_IN_SECOND } from '@dereekb/util';
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -2481,7 +2481,9 @@ function scanBuildArray(init) {
         }
       }
       return acc;
-    }, seed ?? []), distinctUntilArrayLengthChanges(), shareReplay(1));
+    }, seed ?? []), distinctUntilArrayLengthChanges(), map$1(x => [...x]),
+    // always create a copy of the accumulated array when emitting
+    shareReplay(1));
   });
 }
 // MARK: MapForEach
@@ -4022,16 +4024,19 @@ function itemAccumulator(itemIteration, inputMapItem) {
   const mapItemFunction = inputMapItem ?? (a => a);
   const hasCompletedInitialLoad$ = itemIteration.firstState$.pipe(map$1(() => true), startWith(false), distinctUntilChanged(), shareReplay(1));
   const latestSuccessfulState$ = itemIteration.latestState$.pipe(filter(x => !isLoadingStateWithError(x)), distinctUntilChanged(), shareReplay(1));
-  const allSuccessfulStates$ = latestSuccessfulState$.pipe(scanIntoArray({
+  const _allSuccessfulStates$ = latestSuccessfulState$.pipe(scanIntoArray({
     immutable: false
   }),
   /**
    * Don't wait for the first successful state in order to avoid never returning a value on immediate failures.
    */
   startWith([]), distinctUntilArrayLengthChanges(), shareReplay(1));
-  const successfulLoadCount$ = allSuccessfulStates$.pipe(map$1(x => x.length), shareReplay(1));
+  const allSuccessfulStates$ = _allSuccessfulStates$.pipe(map$1(x => [...x]),
+  // return a copy of the array, and not the scanIntoArray() result that is mutable
+  shareReplay(1));
+  const successfulLoadCount$ = _allSuccessfulStates$.pipe(map$1(x => x.length), shareReplay(1));
   // MARK: ItemAccumulator
-  const currentAllItemPairs$ = allSuccessfulStates$.pipe(scanBuildArray(allSuccessfulStates => {
+  const currentAllItemPairs$ = _allSuccessfulStates$.pipe(scanBuildArray(allSuccessfulStates => {
     const mapStateToItem = mapFunctionOutputPair(mapLoadingStateValueFunction(mapItemFunction));
     /*
     Start with allSuccessfulPageResults$ since it contains all page results since the start of the iterator,
@@ -4052,7 +4057,7 @@ function itemAccumulator(itemIteration, inputMapItem) {
   const currentAllItems$ = currentAllItemPairs$.pipe(map$1(x => x.map(y => y.output)), shareReplay(1));
   const allItemPairs$ = hasCompletedInitialLoad$.pipe(switchMapWhileTrue(currentAllItemPairs$), shareReplay(1));
   const allItems$ = hasCompletedInitialLoad$.pipe(switchMapWhileTrue(currentAllItems$), shareReplay(1));
-  const sub = new SubscriptionObject(allSuccessfulStates$.subscribe());
+  const sub = new SubscriptionObject(_allSuccessfulStates$.subscribe());
   const destroy = () => sub.destroy();
   const result = {
     itemIteration,
@@ -4323,10 +4328,21 @@ class ItemPageIterationInstance {
       } else {
         return of(prevResult).pipe();
       }
-    }), map$1(state => ({
-      n: request.n,
-      state
-    })))), scan((acc, x) => {
+    }), map$1(inputState => {
+      let state;
+      if (inputState != null) {
+        const end = inputState.value != null ? isItemPageIteratorResultEndResult(inputState.value) : undefined;
+        state = {
+          ...inputState,
+          hasNextPage: invertMaybeBoolean(end)
+        };
+      }
+      const result = {
+        n: request.n,
+        state
+      };
+      return result;
+    }))), scan((acc, x) => {
       const {
         n,
         state: curr
@@ -4397,7 +4413,7 @@ class ItemPageIterationInstance {
      *
      * Will emit every time the latest page has finished loading.
      */
-    this.hasReachedEndResult$ = this.latestPageResultState$.pipe(map$1(x => isItemPageIteratorResultEndResult(x.value)), startWith(false),
+    this.hasReachedEndResult$ = this.latestPageResultState$.pipe(map$1(x => !x.hasNextPage), startWith(false),
     // Has not reached the end
     shareReplay(1));
     this._currentPageResultState$ = this.currentPageResultState$.pipe(startWith(undefined), shareReplay(1));
@@ -4522,9 +4538,11 @@ function mapItemPageLoadingStateFromResultPageLoadingState() {
   return map$1(itemPageLoadingStateFromResultPageLoadingState);
 }
 function itemPageLoadingStateFromResultPageLoadingState(input) {
-  return mapLoadingStateResults(input, {
+  const result = mapLoadingStateResults(input, {
     mapValue: result => result.value
   });
+  result.hasNextPage = invertMaybeBoolean(input.value?.end);
+  return result;
 }
 
 const DEFAULT_LOCK_SET_TIME_LOCK_KEY = 'timelock';

package/package.json

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

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

@@ -1,4 +1,4 @@
-import { type Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 import { type MapFunctionOutputPair, type Destroyable, type IndexRef, type GetterOrValue, type MapFunction, type PromiseOrValue, type Page } from '@dereekb/util';
 import { type ItemIteration, type PageItemIteration } from './iteration';
 import { type LoadingState, type MapLoadingStateValueMapFunction } from '../loading';

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

@@ -10,7 +10,7 @@ export interface ItemPageLimit {
      *
      * If not defined, the will be no ending iteration.
      */
-    maxPageLoadLimit?: Maybe<number>;
+    readonly maxPageLoadLimit?: Maybe<number>;
 }
 export interface ItemPageIteratorRequest<V, F, C extends ItemPageIterationConfig<F> = ItemPageIterationConfig<F>> extends Page {
     /**
@@ -42,11 +42,11 @@ export interface ItemPageIteratorResult<V> {
     /**
      * Error result.
      */
-    error?: Error;
+    readonly error?: Error;
     /**
      * Returned values.
      */
-    value?: V;
+    readonly value?: V;
     /**
      * True if the end has been reached.
      *
@@ -54,7 +54,7 @@ export interface ItemPageIteratorResult<V> {
      *
      * False can be specified to note that despite having no values passed, the end has not yet been reached.
      */
-    end?: boolean;
+    readonly end?: boolean;
 }
 export interface ItemPageIteratorDelegate<V, F, C extends ItemPageIterationConfig<F> = ItemPageIterationConfig<F>> {
     /**

package/src/lib/loading/loading.state.d.ts

@@ -62,6 +62,10 @@ export type ListLoadingState<T = unknown> = LoadingState<T[]>;
  * LoadingState with a Page.
  */
 export interface PageLoadingState<T = unknown> extends LoadingState<T>, Page {
+    /**
+     * Whether or not there is a next page. Null/undefined if unknown.
+     */
+    readonly hasNextPage?: Maybe<boolean>;
 }
 /**
  * PageLoadingState with a filter.
@@ -69,7 +73,7 @@ export interface PageLoadingState<T = unknown> extends LoadingState<T>, Page {
 export interface FilteredPageLoadingState<T, F> extends PageLoadingState<T>, FilteredPage<F> {
 }
 /**
- * LoadingPageState that has an array of the value
+ * LoadingPageState that has an array of the values and
  */
 export type PageListLoadingState<T> = PageLoadingState<T[]>;
 /**

package/src/lib/rxjs/array.d.ts

@@ -3,7 +3,7 @@ import { type Maybe, type ArrayOrValue, type MapFunction } from '@dereekb/util';
 export declare function distinctUntilArrayLengthChanges<A>(getArray: (value: A) => unknown[]): MonoTypeOperatorFunction<A>;
 export declare function distinctUntilArrayLengthChanges<T>(): MonoTypeOperatorFunction<T[]>;
 export interface ScanIntoArrayConfig {
-    immutable?: boolean;
+    readonly immutable?: boolean;
 }
 /**
  * Scans values from the observable into an array.
@@ -17,15 +17,15 @@ export interface ScanBuildArrayConfig<T> {
     /**
      *
      */
-    seed?: Maybe<T[]>;
+    readonly seed?: Maybe<T[]>;
     /**
      *
      */
-    accumulatorObs: Observable<Maybe<ArrayOrValue<T>>>;
+    readonly accumulatorObs: Observable<Maybe<ArrayOrValue<T>>>;
     /**
      * Whether or not to flatten array values that are input.
      */
-    flattenArray?: boolean;
+    readonly flattenArray?: boolean;
 }
 export type ScanBuildArrayConfigFn<S, T> = (seedState: S) => ScanBuildArrayConfig<T>;
 /**
@@ -51,7 +51,7 @@ export interface MapEachAsyncConfig {
     /**
      * Whether or not to map only the first
      */
-    onlyFirst?: boolean;
+    readonly onlyFirst?: boolean;
 }
 /**
  * Operator function that maps each value in the array independently using Observables, then combines the all results.