@dereekb/rxjs 2.1.0 → 3.0.0

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

@@ -2,6 +2,16 @@ import { PageLoadingState } from "../loading";
 import { Destroyable, Filter, Maybe, PageNumber, Page } from "@dereekb/util";
 import { Observable } from "rxjs";
 import { ItemIteratorNextRequest, PageItemIteration } from './iteration';
+export interface ItemPageLimit {
+    /**
+     * Maximum number of pages to load.
+     *
+     * This value should be defined in most cases.
+     *
+     * If not defined, the will be no ending iteration.
+     */
+    maxPageLoadLimit?: Maybe<number>;
+}
 export interface ItemPageIteratorRequest<V, F, C extends ItemPageIterationConfig<F> = ItemPageIterationConfig<F>> extends Page {
     /**
      * The base iterator config.
@@ -50,11 +60,11 @@ export interface ItemPageIteratorDelegate<V, F, C extends ItemPageIterationConfi
     /**
      * Returns an observable of items given the input request.
      *
-     * If the input goes out of bounds, the result should be
+     * If the input goes out of bounds, the result should be an empty array.
      */
     loadItemsForPage: (request: ItemPageIteratorRequest<V, F, C>) => Observable<ItemPageIteratorResult<V>>;
 }
-export interface ItemPageIterationConfig<F = any> extends Filter<F> {
+export interface ItemPageIterationConfig<F = any> extends Filter<F>, ItemPageLimit {
 }
 /**
  * Default number of pages that can be loaded.
@@ -65,8 +75,9 @@ export declare const DEFAULT_ITEM_PAGE_ITERATOR_MAX = 100;
  */
 export declare class ItemPageIterator<V, F, C extends ItemPageIterationConfig<F> = any> {
     readonly delegate: ItemPageIteratorDelegate<V, F, C>;
-    private _maxPageLoadLimit;
-    get maxPageLoadLimit(): number;
+    protected _maxPageLoadLimit: Maybe<number>;
+    get maxPageLoadLimit(): Maybe<number>;
+    set maxPageLoadLimit(maxPageLoadLimit: Maybe<number>);
     constructor(delegate: ItemPageIteratorDelegate<V, F, C>);
     /**
      * Creates a new instance based on the input config.
@@ -83,6 +94,7 @@ export interface ItemPageIterationInstanceState<V> {
     n: number;
     current: Maybe<PageLoadingState<ItemPageIteratorResult<V>>>;
     latestFinished: Maybe<PageLoadingState<ItemPageIteratorResult<V>>>;
+    firstSuccessful: Maybe<PageLoadingState<ItemPageIteratorResult<V>>>;
     lastSuccessful: Maybe<PageLoadingState<ItemPageIteratorResult<V>>>;
 }
 /**
@@ -132,12 +144,16 @@ export declare class ItemPageIterationInstance<V, F, C extends ItemPageIteration
     private readonly _lastFinishedPageResultState$;
     private readonly _lastFinishedPageResult$;
     private readonly _lastFinishedPageResultItem$;
+    /**
+     * The first page results that has finished loading without an error.
+     */
+    readonly firstSuccessfulPageResults$: Observable<PageLoadingState<ItemPageIteratorResult<V>>>;
     /**
      * The latest page results that has finished loading without an error.
      */
     readonly latestSuccessfulPageResults$: Observable<PageLoadingState<ItemPageIteratorResult<V>>>;
-    get maxPageLoadLimit(): number;
-    set maxPageLoadLimit(maxPageLoadLimit: number);
+    get maxPageLoadLimit(): Maybe<number>;
+    set maxPageLoadLimit(maxPageLoadLimit: Maybe<number>);
     nextPage(request?: ItemIteratorNextRequest): Promise<number>;
     readonly currentState$: Observable<PageLoadingState<V>>;
     readonly latestLoadedPage$: Observable<PageNumber>;

package/src/lib/iterator/iterator.page.js

@@ -18,11 +18,13 @@ exports.DEFAULT_ITEM_PAGE_ITERATOR_MAX = 100;
 class ItemPageIterator {
     constructor(delegate) {
         this.delegate = delegate;
-        this._maxPageLoadLimit = exports.DEFAULT_ITEM_PAGE_ITERATOR_MAX;
     }
     get maxPageLoadLimit() {
         return this._maxPageLoadLimit;
     }
+    set maxPageLoadLimit(maxPageLoadLimit) {
+        this._maxPageLoadLimit = maxPageLoadLimit;
+    }
     /**
      * Creates a new instance based on the input config.
      *
@@ -39,13 +41,14 @@ exports.ItemPageIterator = ItemPageIterator;
  */
 class ItemPageIterationInstance {
     constructor(iterator, config) {
+        var _a;
         this.iterator = iterator;
         this.config = config;
         /**
          * Used for triggering loading of more content.
          */
         this._next = new rxjs_2.BehaviorSubject({ n: 0 });
-        this._maxPageLoadLimit = new rxjs_2.BehaviorSubject(this.iterator.maxPageLoadLimit);
+        this._maxPageLoadLimit = new rxjs_2.BehaviorSubject((_a = this.config.maxPageLoadLimit) !== null && _a !== void 0 ? _a : this.iterator.maxPageLoadLimit);
         // MARK: State
         this.state$ = this._next.pipe((0, operators_1.delay)(0), (0, rxjs_2.exhaustMap)((request) => (0, rxjs_2.combineLatest)([this.hasNextAndCanLoadMore$, this._lastFinishedPageResultState$]).pipe((0, rxjs_2.first)(), (0, operators_1.map)(([hasNextAndCanLoadMore, prevResult]) => [itemPageIteratorShouldLoadNextPage(request, hasNextAndCanLoadMore, prevResult), prevResult]), (0, operators_1.mergeMap)(([shouldLoadNextPage, prevResult]) => {
             if (shouldLoadNextPage) {
@@ -82,6 +85,7 @@ class ItemPageIterationInstance {
                 n,
                 current: curr,
                 latestFinished: acc.latestFinished,
+                firstSuccessful: acc.firstSuccessful,
                 lastSuccessful: acc.lastSuccessful
             };
             // If it was a replay of the previous result, change nothing.
@@ -90,6 +94,9 @@ class ItemPageIterationInstance {
                     next.latestFinished = curr;
                     if (!(0, loading_1.loadingStateHasError)(curr)) {
                         next.lastSuccessful = curr;
+                        if (!next.firstSuccessful) {
+                            next.firstSuccessful = curr;
+                        }
                     }
                 }
             }
@@ -97,7 +104,7 @@ class ItemPageIterationInstance {
         }, {
             n: -1,
             current: { page: util_1.FIRST_PAGE },
-            latestFinished: undefined, lastSuccessful: undefined
+            latestFinished: undefined, firstSuccessful: undefined, lastSuccessful: undefined
         }), (0, rxjs_2.shareReplay)(1));
         /**
          * Used to track when a next() value changes, or the current changes.
@@ -135,6 +142,10 @@ class ItemPageIterationInstance {
         this._lastFinishedPageResultState$ = this.latestPageResultState$.pipe((0, operators_1.startWith)(undefined), (0, rxjs_2.shareReplay)(1));
         this._lastFinishedPageResult$ = this._lastFinishedPageResultState$.pipe((0, operators_1.map)(x => x === null || x === void 0 ? void 0 : x.value));
         this._lastFinishedPageResultItem$ = this._lastFinishedPageResult$.pipe((0, operators_1.map)(x => x === null || x === void 0 ? void 0 : x.value));
+        /**
+         * The first page results that has finished loading without an error.
+         */
+        this.firstSuccessfulPageResults$ = this.state$.pipe((0, operators_1.map)(x => x.firstSuccessful), (0, rxjs_1.filterMaybe)(), (0, rxjs_2.shareReplay)(1));
         /**
          * The latest page results that has finished loading without an error.
          */
@@ -150,7 +161,7 @@ class ItemPageIterationInstance {
         /**
          * Whether or not the successfulPageResultsCount has passed the maxPageLoadLimit
          */
-        this.canLoadMore$ = (0, rxjs_2.combineLatest)([this._maxPageLoadLimit, this.numberOfPagesLoaded$.pipe((0, operators_1.startWith)(0))]).pipe((0, operators_1.map)(([maxPageLoadLimit, numberOfPagesLoaded]) => numberOfPagesLoaded < maxPageLoadLimit), (0, operators_1.distinctUntilChanged)(), (0, rxjs_2.shareReplay)(1));
+        this.canLoadMore$ = (0, rxjs_2.combineLatest)([this._maxPageLoadLimit, this.numberOfPagesLoaded$.pipe((0, operators_1.startWith)(0))]).pipe((0, operators_1.map)(([maxPageLoadLimit, numberOfPagesLoaded]) => (0, util_1.isMaybeNot)(maxPageLoadLimit) ? true : (numberOfPagesLoaded < maxPageLoadLimit)), (0, operators_1.distinctUntilChanged)(), (0, rxjs_2.shareReplay)(1));
         /**
          * Observable of whether or not there are items that have finished loading, and if this iterator can load more.
          */
@@ -163,7 +174,8 @@ class ItemPageIterationInstance {
         return this._maxPageLoadLimit.value;
     }
     set maxPageLoadLimit(maxPageLoadLimit) {
-        this._maxPageLoadLimit.next(Math.max(0, Math.ceil(maxPageLoadLimit)));
+        const limit = (0, util_1.isMaybeNot)(maxPageLoadLimit) ? undefined : Math.max(0, Math.ceil(maxPageLoadLimit));
+        this._maxPageLoadLimit.next(limit);
     }
     nextPage(request = {}) {
         return new Promise((resolve, reject) => {

package/src/lib/iterator/iterator.page.js.map

@@ -1 +1 @@
-{"version":3,"file":"iterator.page.js","sourceRoot":"","sources":["../../../../../../packages/rxjs/src/lib/iterator/iterator.page.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"iterator.page.js","sourceRoot":"","sources":["../../../../../../packages/rxjs/src/lib/iterator/iterator.page.ts"],"names":[],"mappings":"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"}

package/src/lib/loading/index.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-(0, tslib_1.__exportStar)(require("./loading.context.state"), exports);
-(0, tslib_1.__exportStar)(require("./loading.context.state.list"), exports);
-(0, tslib_1.__exportStar)(require("./loading.context.state.value"), exports);
-(0, tslib_1.__exportStar)(require("./loading.context.simple"), exports);
-(0, tslib_1.__exportStar)(require("./loading.context"), exports);
-(0, tslib_1.__exportStar)(require("./loading.context.value"), exports);
-(0, tslib_1.__exportStar)(require("./loading.state.list"), exports);
-(0, tslib_1.__exportStar)(require("./loading.state"), exports);
+tslib_1.__exportStar(require("./loading.context.state"), exports);
+tslib_1.__exportStar(require("./loading.context.state.list"), exports);
+tslib_1.__exportStar(require("./loading.context.state.value"), exports);
+tslib_1.__exportStar(require("./loading.context.simple"), exports);
+tslib_1.__exportStar(require("./loading.context"), exports);
+tslib_1.__exportStar(require("./loading.context.value"), exports);
+tslib_1.__exportStar(require("./loading.state.list"), exports);
+tslib_1.__exportStar(require("./loading.state"), exports);
 //# sourceMappingURL=index.js.map

package/src/lib/loading/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/rxjs/src/lib/loading/index.ts"],"names":[],"mappings":";;;AAAA,uEAAwC;AACxC,4EAA6C;AAC7C,6EAA8C;AAC9C,wEAAyC;AACzC,iEAAkC;AAClC,uEAAwC;AACxC,oEAAqC;AACrC,+DAAgC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/rxjs/src/lib/loading/index.ts"],"names":[],"mappings":";;;AAAA,kEAAwC;AACxC,uEAA6C;AAC7C,wEAA8C;AAC9C,mEAAyC;AACzC,4DAAkC;AAClC,kEAAwC;AACxC,+DAAqC;AACrC,0DAAgC"}

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

@@ -137,7 +137,7 @@ export interface MapMultipleLoadingStateResultsConfiguration<T, X, L extends Loa
     mapState?: (input: L) => R;
 }
 export declare function mapMultipleLoadingStateResults<T, X, L extends LoadingState<X>[], R extends LoadingState<T>>(input: L, config: MapMultipleLoadingStateResultsConfiguration<T, X, L, R>): Maybe<R>;
-export declare type MapLoadingStateFn<A, B, L extends LoadingState<A> = LoadingState<A>, O extends LoadingState<B> = LoadingState<B>> = (input: L) => O;
+export declare type MapLoadingStateFn<A, B, L extends LoadingState<A> = LoadingState<A>, O extends LoadingState<B> = LoadingState<B>> = (input: L, value?: B) => O;
 export declare type MapLoadingStateValuesFn<A, B, L extends LoadingState<A> = LoadingState<A>> = (input: A, state: L) => B;
 export interface MapLoadingStateResultsConfiguration<A, B, L extends LoadingState<A> = LoadingState<A>, O extends LoadingState<B> = LoadingState<B>> {
     mapValue?: MapLoadingStateValuesFn<A, B, L>;
@@ -146,3 +146,6 @@ export interface MapLoadingStateResultsConfiguration<A, B, L extends LoadingStat
 export declare function mapLoadingStateResults<A, B, L extends LoadingState<A> = LoadingState<A>, O extends LoadingState<B> = LoadingState<B>>(input: L, config: MapLoadingStateResultsConfiguration<A, B, L, O>): O;
 export declare function mapLoadingStateResults<A, B, L extends PageLoadingState<A> = PageLoadingState<A>, O extends PageLoadingState<B> = PageLoadingState<B>>(input: L, config: MapLoadingStateResultsConfiguration<A, B, L, O>): O;
 export declare function mapLoadingStateResults<A, B, L extends Partial<PageLoadingState<A>> = Partial<PageLoadingState<A>>, O extends Partial<PageLoadingState<B>> = Partial<PageLoadingState<B>>>(input: L, config: MapLoadingStateResultsConfiguration<A, B, L, O>): O;
+export declare type MapLoadingStateValueFunction<O, I, L extends LoadingState<I> = LoadingState<I>> = (state: L) => Maybe<O>;
+export declare type MapLoadingStateValueMapFunction<O, I, L extends LoadingState<I> = LoadingState<I>> = ((item: I) => Maybe<O>) | ((item: I, state: L) => Maybe<O>);
+export declare function mapLoadingStateValueFunction<O, I, L extends LoadingState<I> = LoadingState<I>>(mapFn: MapLoadingStateValueMapFunction<O, I, L>): MapLoadingStateValueFunction<O, I, L>;

package/src/lib/loading/loading.state.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapLoadingStateResults = exports.mapMultipleLoadingStateResults = exports.updatedStateForSetError = exports.updatedStateForSetValue = exports.updatedStateForSetLoading = exports.mergeLoadingStates = exports.combineLoadingStates = exports.loadingStateFromObs = exports.loadingStateHasError = exports.loadingStateHasValue = exports.loadingStateHasFinishedLoading = exports.isErrorLoadingState = exports.isSuccessLoadingState = exports.loadingStateIsLoading = exports.loadingStateIsIdle = exports.allLoadingStatesHaveFinishedLoading = exports.anyLoadingStatesIsLoading = exports.errorPageResult = exports.errorResult = exports.successPageResult = exports.successResult = exports.beginLoading = exports.idleLoadingState = exports.loadingStateType = exports.LoadingStateType = void 0;
+exports.mapLoadingStateValueFunction = exports.mapLoadingStateResults = exports.mapMultipleLoadingStateResults = exports.updatedStateForSetError = exports.updatedStateForSetValue = exports.updatedStateForSetLoading = exports.mergeLoadingStates = exports.combineLoadingStates = exports.loadingStateFromObs = exports.loadingStateHasError = exports.loadingStateHasValue = exports.loadingStateHasFinishedLoading = exports.isErrorLoadingState = exports.isSuccessLoadingState = exports.loadingStateIsLoading = exports.loadingStateIsIdle = exports.allLoadingStatesHaveFinishedLoading = exports.anyLoadingStatesIsLoading = exports.errorPageResult = exports.errorResult = exports.successPageResult = exports.successResult = exports.beginLoading = exports.idleLoadingState = exports.loadingStateType = exports.LoadingStateType = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const util_1 = require("@dereekb/util");
@@ -281,9 +281,19 @@ function mapLoadingStateResults(input, config) {
         result = Object.assign(Object.assign({}, input), { value });
     }
     else {
-        result = mapState(input);
+        result = mapState(input, value);
     }
     return result;
 }
 exports.mapLoadingStateResults = mapLoadingStateResults;
+function mapLoadingStateValueFunction(mapFn) {
+    return (state) => {
+        let result;
+        if (state.value != null) {
+            result = mapFn(state.value, state);
+        }
+        return result;
+    };
+}
+exports.mapLoadingStateValueFunction = mapLoadingStateValueFunction;
 //# sourceMappingURL=loading.state.js.map

package/src/lib/loading/loading.state.js.map

@@ -1 +1 @@
-{"version":3,"file":"loading.state.js","sourceRoot":"","sources":["../../../../../../packages/rxjs/src/lib/loading/loading.state.ts"],"names":[],"mappings":";;;AAAA,+BAAqD;AACrD,8CAA6G;AAC7G,wCAAmK;AAyDnK,gBAAgB;AAChB;;GAEG;AACH,IAAY,gBAiBX;AAjBD,WAAY,gBAAgB;IAC1B;;OAEG;IACH,iCAAa,CAAA;IACb;;OAEG;IACH,uCAAmB,CAAA;IACnB;;OAEG;IACH,uCAAmB,CAAA;IACnB;;OAEG;IACH,mCAAe,CAAA;AACjB,CAAC,EAjBW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAiB3B;AAED;;;;;GAKG;AACH,SAAgB,gBAAgB,CAAC,YAA0B;IACzD,IAAI,YAAY,CAAC,OAAO,EAAE;QACxB,OAAO,gBAAgB,CAAC,OAAO,CAAC;KACjC;SAAM,IAAI,IAAA,mBAAY,EAAC,YAAY,EAAE,OAAO,CAAC,EAAE;QAC9C,OAAO,gBAAgB,CAAC,OAAO,CAAC;KACjC;SAAM,IAAI,IAAA,mBAAY,EAAC,YAAY,EAAE,OAAO,CAAC,EAAE;QAC9C,OAAO,gBAAgB,CAAC,KAAK,CAAC;KAC/B;SAAM;QACL,OAAO,gBAAgB,CAAC,IAAI,CAAC;KAC9B;AACH,CAAC;AAVD,4CAUC;AAED;;GAEG;AACH,SAAgB,gBAAgB;IAC9B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AAC5B,CAAC;AAFD,4CAEC;AAKD,SAAgB,YAAY,CAAI,KAAgC;IAC9D,uCAAY,KAAK,KAAE,OAAO,EAAE,IAAI,IAAG;AACrC,CAAC;AAFD,oCAEC;AAED,SAAgB,aAAa,CAAI,KAAQ;IACvC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AACnC,CAAC;AAFD,sCAEC;AAED,SAAgB,iBAAiB,CAAI,IAAgB,EAAE,KAAQ;IAC7D,uCAAY,aAAa,CAAC,KAAK,CAAC,KAAE,IAAI,IAAG;AAC3C,CAAC;AAFD,8CAEC;AAED,SAAgB,WAAW,CAAU,KAAgD;IACnF,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AACnC,CAAC;AAFD,kCAEC;AAED,SAAgB,eAAe,CAAI,IAAgB,EAAE,KAAgD;IACnG,uCAAY,WAAW,CAAC,KAAK,CAAC,KAAE,IAAI,IAAG;AACzC,CAAC;AAFD,0CAEC;AAED,SAAgB,yBAAyB,CAAC,MAAsB;IAC9D,OAAO,IAAA,2BAAoB,EAAC,MAAM,CAAC,GAAG,CAAC,qBAAqB,CAAC,EAAE,KAAK,CAAC,CAAC;AACxE,CAAC;AAFD,8DAEC;AAED,SAAgB,mCAAmC,CAAC,MAAsB;IACxE,OAAO,IAAA,4BAAqB,EAAC,MAAM,CAAC,GAAG,CAAC,8BAA8B,CAAC,EAAE,IAAI,CAAC,CAAC;AACjF,CAAC;AAFD,kFAEC;AAED,SAAgB,kBAAkB,CAAC,KAA0B;IAC3D,IAAI,KAAK,EAAE;QACT,OAAO,gBAAgB,CAAC,KAAK,CAAC,KAAK,gBAAgB,CAAC,IAAI,CAAC;KAC1D;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAND,gDAMC;AAED,SAAgB,qBAAqB,CAAC,KAA0B;IAC9D,IAAI,KAAK,EAAE;QACT,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAE9B,IAAI,OAAO,KAAK,IAAI,EAAE;YACpB,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;SACxD;KACF;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAZD,sDAYC;AAED,SAAgB,qBAAqB,CAAC,KAA0B;IAC9D,IAAI,KAAK,EAAE;QACT,OAAO,gBAAgB,CAAC,KAAK,CAAC,KAAK,gBAAgB,CAAC,OAAO,CAAC;KAC7D;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAND,sDAMC;AAED,SAAgB,mBAAmB,CAAC,KAA0B;IAC5D,IAAI,KAAK,EAAE;QACT,OAAO,gBAAgB,CAAC,KAAK,CAAC,KAAK,gBAAgB,CAAC,KAAK,CAAC;KAC3D;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAND,kDAMC;AAED,SAAgB,8BAA8B,CAAC,KAA0B;IACvE,IAAI,KAAK,EAAE;QACT,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAE9B,IAAI,OAAO,KAAK,IAAI,EAAE;YACpB,OAAO,KAAK,CAAC;SACd;aAAM;YACL,OAAO,OAAO,KAAK,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;SACjE;KACF;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAZD,wEAYC;AAED;;;;;GAKG;AACH,SAAgB,oBAAoB,CAAC,KAA0B;IAC7D,IAAI,KAAK,EAAE;QACT,OAAO,8BAA8B,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC;KACrE;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAND,oDAMC;AAED;;;;;GAKG;AACH,SAAgB,oBAAoB,CAAC,KAA0B;IAC7D,IAAI,KAAK,EAAE;QACT,OAAO,8BAA8B,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC;KACrE;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAND,oDAMC;AAED;;GAEG;AACH,SAAgB,mBAAmB,CAAI,GAAkB,EAAE,SAAmB;IAC5E,IAAI,SAAS,EAAE;QACb,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAK,GAAE,CAAC,CAAC;KACzB;IAED,OAAO,GAAG,CAAC,IAAI,CACb,IAAA,eAAG,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,EAC7D,IAAA,sBAAU,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,SAAE,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,EACpD,IAAA,iBAAK,EAAC,EAAE,CAAC,EACT,IAAA,qBAAS,EAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAC/B,CAAC;AACJ,CAAC;AAXD,kDAWC;AAKD;;GAEG;AACH,SAAgB,oBAAoB,CAAC,IAAmC,EAAE,IAAmC,EAAE,OAAa;IAC1H,OAAO,IAAA,oBAAa,EAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SAC/B,IAAI,CACH,IAAA,gCAAoB,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAG,CAAC,CAAC,OAAK,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAG,CAAC,CAAC,CAAA,IAAI,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAG,CAAC,CAAC,OAAK,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAG,CAAC,CAAC,CAAA,CAAC,EAAE,qCAAqC;IAC7G,IAAA,eAAG,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,EAClD,IAAA,uBAAW,EAAC,CAAC,CAAC,CAAE,oBAAoB;KACrC,CAAC;AACN,CAAC;AAPD,oDAOC;AAKD;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAAC,CAAoB,EAAE,CAAoB,EAAE,UAAU,CAAC,EAAU,EAAE,EAAU,EAAE,EAAE,CAAC,CAAC,gCAAK,EAAE,GAAK,EAAE,CAAU,CAAA;;IAC5I,MAAM,KAAK,GAAG,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,mCAAI,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,CAAC;IACnC,IAAI,MAAyB,CAAC;IAE9B,IAAI,KAAK,EAAE;QACT,MAAM,GAAG;YACP,uCAAuC;YACvC,OAAO,EAAE,CAAC,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK;YACzE,KAAK;SACN,CAAC;KACH;SAAM;QACL,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,mCAAI,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,CAAC,CAAC;QACzD,IAAI,OAAO,EAAE;YACX,MAAM,GAAG;gBACP,OAAO,EAAE,IAAI;aACd,CAAC;SACH;aAAM;YACL,MAAM,GAAG;gBACP,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC;aACjC,CAAC;SACH;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAzBD,gDAyBC;AAED;;GAEG;AACH,SAAgB,yBAAyB,CAAiD,KAAQ,EAAE,OAAO,GAAG,IAAI;IAChH,uCACK,KAAK,KACR,KAAK,EAAE,SAAS,EAChB,OAAO,EACP,KAAK,EAAE,SAAS,IAChB;AACJ,CAAC;AAPD,8DAOC;AAED;;GAEG;AACH,SAAgB,uBAAuB,CAAiD,KAAQ,EAAE,KAAoB;IACpH,uCACK,KAAK,KACR,KAAK,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,SAAS,EACzB,OAAO,EAAE,KAAK,EACd,KAAK,EAAE,SAAS,IAChB;AACJ,CAAC;AAPD,0DAOC;AAED;;GAEG;AACH,SAAgB,uBAAuB,CAAiD,KAAQ,EAAE,KAAyB;IACzH,uCACK,KAAK,KACR,OAAO,EAAE,KAAK,EACd,KAAK,IACL;AACJ,CAAC;AAND,0DAMC;AASD,SAAgB,8BAA8B,CAC5C,KAAQ,EAAE,MAA+D;IAEzE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IACvC,MAAM,OAAO,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;IACjD,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClE,IAAI,MAAgB,CAAC;IAErB,IAAI,CAAC,KAAK,IAAI,CAAC,OAAO,EAAE;QACtB,IAAI,SAAS,EAAE;YACb,MAAM,KAAK,GAAM,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAQ,CAAC,CAAC;YAC3D,MAAM,GAAG;gBACP,OAAO;gBACP,KAAK;gBACL,KAAK;aACD,CAAC;SACR;aAAM,IAAI,QAAQ,EAAE;YACnB,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;SAC1B;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;SAC5E;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAxBD,wEAwBC;AAaD,SAAgB,sBAAsB,CACpC,KAAQ,EAAE,MAAuD;IAEjE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IACtC,IAAI,KAAK,GAAM,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAY,CAAC;IAEnC,IAAI,KAAK,IAAI,IAAI,IAAI,QAAQ,EAAE;QAC7B,KAAK,GAAG,QAAQ,CAAC,KAAY,EAAE,KAAK,CAAC,CAAC;KACvC;IAED,IAAI,MAAS,CAAC;IAEd,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,GAAG,gCACJ,KAAK,KACR,KAAK,GACC,CAAC;KACV;SAAM;QACL,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;KAC1B;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAtBD,wDAsBC"}
+{"version":3,"file":"loading.state.js","sourceRoot":"","sources":["../../../../../../packages/rxjs/src/lib/loading/loading.state.ts"],"names":[],"mappings":"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"}

package/src/lib/lock.d.ts

@@ -1,11 +1,14 @@
+import { ObservableOrValue } from './rxjs/getter';
 import { Observable, Subscription } from 'rxjs';
+import { Destroyable, Maybe } from '@dereekb/util';
 export declare type LockKey = string;
 export declare type OnLockSetUnlockedFunction = (unlocked: boolean) => void;
+export declare type RemoveLockFunction = () => void;
 export interface OnLockSetUnlockedConfig {
     lockSet: LockSet;
     fn: OnLockSetUnlockedFunction;
-    timeout?: number;
-    delayTime?: number;
+    timeout?: Maybe<number>;
+    delayTime?: Maybe<number>;
 }
 export interface SetLockedConfig {
     /**
@@ -23,15 +26,16 @@ export declare const DEFAULT_LOCK_SET_TIME_LOCK_KEY = "timelock";
 /**
  * Executes the input function when the lockSet is set unlocked, or the timeout is reached.
  */
-export declare function onLockSetNextUnlock({ lockSet, fn, timeout, delayTime }: OnLockSetUnlockedConfig): Subscription;
+export declare function onLockSetNextUnlock({ lockSet, fn, timeout: timeoutTime, delayTime }: OnLockSetUnlockedConfig): Subscription;
 /**
  * Used for preventing an action until all keys are removed.
  *
  * Added Observables do not need to be strictly removed; empty observables are counted as unlocked.
  */
-export declare class LockSet {
+export declare class LockSet implements Destroyable {
     private static LOCK_SET_CHILD_INDEX_STEPPER;
     private _locks;
+    private _parentSub;
     readonly locks$: Observable<Map<string, Observable<boolean>>>;
     /**
      * isLocked$ is true if any observable is emitting true.
@@ -44,13 +48,15 @@ export declare class LockSet {
     setLocked(key: LockKey, config: boolean, duration?: number): void;
     lockForSeconds(seconds: number): void;
     lockForTime(milliseconds: number, key?: LockKey): void;
-    addLock(key: LockKey, obs: Observable<boolean>): void;
+    addLock(key: LockKey, obs: Observable<boolean>): RemoveLockFunction;
+    private _removeObsForKey;
     removeLock(key: LockKey): void;
     onNextUnlock(config: OnLockSetUnlockedFunction | Omit<OnLockSetUnlockedConfig, 'lockSet'>, delayTime?: number): Subscription;
+    setParentLockSet(parent: ObservableOrValue<Maybe<LockSet>>): void;
     /**
-     * Convenience function for watching a child lockset's locked state.
+     * Convenience function for watching a child lockset's locked state and propogating it upward.
      */
-    addChildLockSet(lockSet: LockSet, key?: LockKey): void;
+    addChildLockSet(lockSet: LockSet, key?: LockKey): RemoveLockFunction;
     destroyOnNextUnlock(config?: OnLockSetUnlockedFunction | Omit<OnLockSetUnlockedConfig, 'lockSet'>, delayTime?: number): void;
     destroy(): void;
 }

package/src/lib/lock.js

@@ -1,18 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LockSet = exports.onLockSetNextUnlock = exports.DEFAULT_LOCK_SET_TIME_LOCK_KEY = void 0;
-const operators_1 = require("rxjs/operators");
-const rxjs_1 = require("rxjs");
+const rxjs_1 = require("@dereekb/rxjs");
 const rxjs_2 = require("rxjs");
 const rxjs_3 = require("./rxjs");
 const util_1 = require("@dereekb/util");
 const ms_1 = require("ms");
+const subscription_1 = require("./subscription");
 exports.DEFAULT_LOCK_SET_TIME_LOCK_KEY = 'timelock';
 /**
  * Executes the input function when the lockSet is set unlocked, or the timeout is reached.
  */
-function onLockSetNextUnlock({ lockSet, fn, timeout = (0, ms_1.default)('50s'), delayTime }) {
-    return lockSet.isUnlocked$.pipe((0, operators_1.filter)((x) => x), (0, operators_1.delay)(delayTime !== null && delayTime !== void 0 ? delayTime : 0), (0, operators_1.timeoutWith)(timeout, (0, rxjs_1.of)(false).pipe((0, operators_1.tap)(() => console.warn('LockSet time out. Potential issue detected.')))), (0, operators_1.first)()).subscribe(fn);
+function onLockSetNextUnlock({ lockSet, fn, timeout: timeoutTime = (0, ms_1.default)('50s'), delayTime }) {
+    return lockSet.isUnlocked$.pipe((0, rxjs_2.filter)((x) => x), (0, rxjs_2.delay)(delayTime !== null && delayTime !== void 0 ? delayTime : 0), (0, rxjs_2.timeout)({
+        first: timeoutTime,
+        with: () => (0, rxjs_2.of)(false).pipe((0, rxjs_2.tap)(() => console.warn('LockSet time out. Potential issue detected.')))
+    }), (0, rxjs_2.first)()).subscribe(fn);
 }
 exports.onLockSetNextUnlock = onLockSetNextUnlock;
 /**
@@ -23,13 +26,14 @@ exports.onLockSetNextUnlock = onLockSetNextUnlock;
 class LockSet {
     constructor() {
         this._locks = new rxjs_2.BehaviorSubject(new Map());
+        this._parentSub = new subscription_1.SubscriptionObject();
         this.locks$ = this._locks.asObservable();
         /**
          * isLocked$ is true if any observable is emitting true.
          */
-        this.isLocked$ = this.locks$.pipe((0, operators_1.switchMap)((0, rxjs_3.combineLatestFromMapValuesObsFn)((x) => x)), (0, operators_1.map)((0, util_1.reduceBooleansWithOrFn)(false)), // Empty map is unlocked.
-        (0, operators_1.shareReplay)(1));
-        this.isUnlocked$ = this.isLocked$.pipe((0, operators_1.map)(x => !x));
+        this.isLocked$ = this.locks$.pipe((0, rxjs_2.switchMap)((0, rxjs_3.combineLatestFromMapValuesObsFn)((x) => x)), (0, rxjs_2.map)((0, util_1.reduceBooleansWithOrFn)(false)), // Empty map is unlocked.
+        (0, rxjs_2.shareReplay)(1));
+        this.isUnlocked$ = this.isLocked$.pipe((0, rxjs_2.map)(x => !x));
     }
     get locks() {
         return this._locks.value;
@@ -47,9 +51,9 @@ class LockSet {
             };
         }
         if (lockedConfig.locked) {
-            let obs = (0, rxjs_1.of)(true);
+            let obs = (0, rxjs_2.of)(true);
             if (lockedConfig.duration) {
-                obs = obs.pipe((0, operators_1.timeoutWith)(lockedConfig.duration, (0, rxjs_1.of)(false)));
+                obs = obs.pipe((0, rxjs_2.timeout)({ first: lockedConfig.duration, with: () => (0, rxjs_2.of)(false) }));
             }
             this.addLock(key, obs);
         }
@@ -61,12 +65,20 @@ class LockSet {
         this.lockForTime(seconds * 1000);
     }
     lockForTime(milliseconds, key) {
-        this.addLock(key !== null && key !== void 0 ? key : exports.DEFAULT_LOCK_SET_TIME_LOCK_KEY, (0, rxjs_1.of)(false).pipe((0, operators_1.delay)(milliseconds), (0, operators_1.startWith)(true)));
+        this.addLock(key !== null && key !== void 0 ? key : exports.DEFAULT_LOCK_SET_TIME_LOCK_KEY, (0, rxjs_2.of)(false).pipe((0, rxjs_2.delay)(milliseconds), (0, rxjs_2.startWith)(true)));
     }
     addLock(key, obs) {
-        obs = obs.pipe((0, operators_1.defaultIfEmpty)(false)); // empty observables count as unlocked.
+        obs = obs.pipe((0, rxjs_2.defaultIfEmpty)(false));
+        let removeLock = () => this._removeObsForKey(obs, key);
         this._locks.value.set(key, obs);
-        this._locks.next(this.locks);
+        this._locks.next(this._locks.value);
+        return removeLock;
+    }
+    _removeObsForKey(obs, key) {
+        const current = this._locks.value.get(key);
+        if (current && obs === current) {
+            this.removeLock(key);
+        }
     }
     removeLock(key) {
         if (this._locks.value.delete(key)) {
@@ -76,11 +88,22 @@ class LockSet {
     onNextUnlock(config, delayTime) {
         return onLockSetNextUnlock(Object.assign({ lockSet: this, delayTime }, ((typeof config === 'function') ? { fn: config } : config)));
     }
+    setParentLockSet(parent) {
+        this._parentSub.subscription = (0, rxjs_3.preventComplete)((0, rxjs_1.asObservable)(parent)).pipe((0, rxjs_2.map)((parentLockSet) => {
+            let removeFn;
+            if (parentLockSet) {
+                removeFn = parentLockSet.addChildLockSet(this);
+            }
+            return removeFn;
+        }), (0, rxjs_3.cleanup)((removeLockSet) => {
+            removeLockSet === null || removeLockSet === void 0 ? void 0 : removeLockSet();
+        })).subscribe();
+    }
     /**
-     * Convenience function for watching a child lockset's locked state.
+     * Convenience function for watching a child lockset's locked state and propogating it upward.
      */
     addChildLockSet(lockSet, key = `${LockSet.LOCK_SET_CHILD_INDEX_STEPPER++}`) {
-        this.addLock(key, lockSet.isLocked$);
+        return this.addLock(key, lockSet.isLocked$);
     }
     // Cleanup
     destroyOnNextUnlock(config, delayTime) {
@@ -102,6 +125,7 @@ class LockSet {
     }
     destroy() {
         this._locks.complete();
+        this._parentSub.destroy();
     }
 }
 exports.LockSet = LockSet;

package/src/lib/lock.js.map

@@ -1 +1 @@
-{"version":3,"file":"lock.js","sourceRoot":"","sources":["../../../../../packages/rxjs/src/lib/lock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lock.js","sourceRoot":"","sources":["../../../../../packages/rxjs/src/lib/lock.ts"],"names":[],"mappings":"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"}

package/src/lib/object.js

@@ -8,7 +8,7 @@ const operators_1 = require("rxjs/operators");
  * Equivalent to distinctUntilChanged() using isEqualObject()
  */
 function distinctUntilObjectValuesChanged() {
-    return (0, operators_1.distinctUntilChanged)((a, b) => (0, util_1.areEqualObjectValues)(a, b));
+    return (0, operators_1.distinctUntilChanged)((a, b) => (0, util_1.areEqualPOJOValues)(a, b));
 }
 exports.distinctUntilObjectValuesChanged = distinctUntilObjectValuesChanged;
 function filterIfObjectValuesUnchanged(input) {
@@ -18,7 +18,7 @@ function filterIfObjectValuesUnchanged(input) {
         });
     }
     else {
-        return (0, operators_1.filter)((inputObject) => !(0, util_1.areEqualObjectValues)(input, inputObject));
+        return (0, operators_1.filter)((inputObject) => !(0, util_1.areEqualPOJOValues)(input, inputObject));
     }
 }
 exports.filterIfObjectValuesUnchanged = filterIfObjectValuesUnchanged;

package/src/lib/object.js.map

@@ -1 +1 @@
-{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../../../packages/rxjs/src/lib/object.ts"],"names":[],"mappings":";;;AAAA,wCAAqD;AACrD,+BAA4F;AAC5F,8CAAwE;AAExE;;GAEG;AACH,SAAgB,gCAAgC;IAC9C,OAAO,IAAA,gCAAoB,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAA,2BAAoB,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACpE,CAAC;AAFD,4EAEC;AAOD,SAAgB,6BAA6B,CAAI,KAAwB;IACvE,IAAI,IAAA,mBAAY,EAAC,KAAK,CAAC,EAAE;QACvB,OAAO,IAAA,oBAAQ,EAAmB,CAAC,WAAW,EAAE,EAAE;YAChD,OAAO,KAAK,CAAC,IAAI,CAAC,6BAA6B,CAAC,WAAW,CAAC,CAAC,CAAA;QAC/D,CAAC,CAAC,CAAC;KACJ;SAAM;QACL,OAAO,IAAA,kBAAM,EAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,IAAA,2BAAoB,EAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAA;KAC1E;AACH,CAAC;AARD,sEAQC"}
+{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../../../packages/rxjs/src/lib/object.ts"],"names":[],"mappings":";;;AAAA,wCAAmD;AACnD,+BAA4F;AAC5F,8CAAwE;AAExE;;GAEG;AACH,SAAgB,gCAAgC;IAC9C,OAAO,IAAA,gCAAoB,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAA,yBAAkB,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAClE,CAAC;AAFD,4EAEC;AAOD,SAAgB,6BAA6B,CAAI,KAAwB;IACvE,IAAI,IAAA,mBAAY,EAAC,KAAK,CAAC,EAAE;QACvB,OAAO,IAAA,oBAAQ,EAAmB,CAAC,WAAW,EAAE,EAAE;YAChD,OAAO,KAAK,CAAC,IAAI,CAAC,6BAA6B,CAAC,WAAW,CAAC,CAAC,CAAA;QAC/D,CAAC,CAAC,CAAC;KACJ;SAAM;QACL,OAAO,IAAA,kBAAM,EAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,IAAA,yBAAkB,EAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAA;KACxE;AACH,CAAC;AARD,sEAQC"}

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

@@ -14,8 +14,18 @@ export declare function scanIntoArray<T>(config?: ScanIntoArrayConfig): Operator
 export declare function scanIntoArray<T>(config?: ScanIntoArrayConfig): OperatorFunction<Maybe<T>, T[]>;
 export declare function scanIntoArray<T>(config?: ScanIntoArrayConfig): OperatorFunction<Maybe<T[]>, T[]>;
 export interface ScanBuildArrayConfig<T> {
+    /**
+     *
+     */
     seed?: Maybe<T[]>;
+    /**
+     *
+     */
     accumulatorObs: Observable<Maybe<T>>;
+    /**
+     * Whether or not to flatten array values that are input.
+     */
+    flattenArray?: boolean;
 }
 export declare type ScanBuildArrayConfigFn<S, T> = (seedState: S) => ScanBuildArrayConfig<T>;
 /**
@@ -30,3 +40,10 @@ export declare type ScanBuildArrayConfigFn<S, T> = (seedState: S) => ScanBuildAr
  * @returns
  */
 export declare function scanBuildArray<S, T>(init: ScanBuildArrayConfigFn<S, T>): OperatorFunction<S, T[]>;
+/**
+ * Convenience function with map to forEachWithArray
+ *
+ * @param forEach
+ * @returns
+ */
+export declare function mapForEach<T>(forEach: Maybe<(value: T) => void>): OperatorFunction<T[], T[]>;

package/src/lib/rxjs/array.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scanBuildArray = exports.scanIntoArray = exports.distinctUntilArrayLengthChanges = void 0;
-const operators_1 = require("rxjs/operators");
+exports.mapForEach = exports.scanBuildArray = exports.scanIntoArray = exports.distinctUntilArrayLengthChanges = void 0;
 const rxjs_1 = require("rxjs");
 const util_1 = require("@dereekb/util");
 function distinctUntilArrayLengthChanges(getArray) {
@@ -13,7 +12,7 @@ function distinctUntilArrayLengthChanges(getArray) {
 exports.distinctUntilArrayLengthChanges = distinctUntilArrayLengthChanges;
 function scanIntoArray(config = {}) {
     const { immutable = true } = config;
-    return (0, operators_1.scan)((acc, next) => {
+    return (0, rxjs_1.scan)((acc, next) => {
         if (next != null) {
             if (immutable) {
                 acc = acc.concat(next);
@@ -39,16 +38,31 @@ exports.scanIntoArray = scanIntoArray;
  * @returns
  */
 function scanBuildArray(init) {
-    return (0, operators_1.exhaustMap)((seedState) => {
-        const { seed = [], accumulatorObs } = init(seedState);
-        return accumulatorObs.pipe((0, operators_1.startWith)(undefined), // Start with to not wait for the accumulator to pass a value.
-        (0, operators_1.scan)((acc, next) => {
+    return (0, rxjs_1.exhaustMap)((seedState) => {
+        const { seed = [], accumulatorObs, flattenArray = false } = init(seedState);
+        return accumulatorObs.pipe((0, rxjs_1.startWith)(undefined), // Start with to not wait for the accumulator to pass a value.
+        (0, rxjs_1.scan)((acc, next) => {
             if (next != null) {
-                acc = (0, util_1.mergeArrayOrValueIntoArray)(acc, next);
+                if (flattenArray && Array.isArray(next)) {
+                    (0, util_1.mergeArrayIntoArray)(acc, next);
+                }
+                else {
+                    acc.push(next);
+                }
             }
             return acc;
-        }, seed), distinctUntilArrayLengthChanges(), (0, operators_1.shareReplay)(1));
+        }, seed !== null && seed !== void 0 ? seed : []), distinctUntilArrayLengthChanges(), (0, rxjs_1.shareReplay)(1));
     });
 }
 exports.scanBuildArray = scanBuildArray;
+/**
+ * Convenience function with map to forEachWithArray
+ *
+ * @param forEach
+ * @returns
+ */
+function mapForEach(forEach) {
+    return (forEach) ? (0, rxjs_1.map)(x => (0, util_1.forEachWithArray)(x, forEach)) : (0, rxjs_1.map)(x => x);
+}
+exports.mapForEach = mapForEach;
 //# sourceMappingURL=array.js.map

package/src/lib/rxjs/array.js.map

@@ -1 +1 @@
-{"version":3,"file":"array.js","sourceRoot":"","sources":["../../../../../../packages/rxjs/src/lib/rxjs/array.ts"],"names":[],"mappings":";;;AAAA,8CAA0E;AAC1E,+BAAoG;AACpG,wCAAgF;AAIhF,SAAgB,+BAA+B,CAAI,QAA8B;IAC/E,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,CAAC,KAAQ,EAAE,EAAE,CAAC,KAAqB,CAAA;KAC/C;IAED,OAAO,IAAA,2BAAoB,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,QAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAC7E,CAAC;AAND,0EAMC;AAcD,SAAgB,aAAa,CAAI,SAAkC,EAAE;IACnE,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC;IACpC,OAAO,IAAA,gBAAI,EAAC,CAAC,GAAQ,EAAE,IAA4B,EAAE,EAAE;QACrD,IAAI,IAAI,IAAI,IAAI,EAAE;YAChB,IAAI,SAAS,EAAE;gBACb,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aACxB;iBAAM;gBACL,GAAG,GAAG,IAAA,iCAA0B,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;aAC7C;SACF;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAbD,sCAaC;AAMA,CAAC;AAIF;;;;;;;;;;GAUG;AACH,SAAgB,cAAc,CAAO,IAAkC;IACrE,OAAO,IAAA,sBAAU,EAAC,CAAC,SAAY,EAAE,EAAE;QACjC,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;QAEtD,OAAO,cAAc,CAAC,IAAI,CACxB,IAAA,qBAAS,EAAC,SAAgB,CAAC,EAAE,8DAA8D;QAC3F,IAAA,gBAAI,EAAC,CAAC,GAAe,EAAE,IAA4B,EAAE,EAAE;YACrD,IAAI,IAAI,IAAI,IAAI,EAAE;gBAChB,GAAG,GAAG,IAAA,iCAA0B,EAAC,GAAI,EAAE,IAAK,CAAC,CAAC;aAC/C;YAED,OAAO,GAAI,CAAC;QACd,CAAC,EAAE,IAAK,CAA2C,EACnD,+BAA+B,EAAE,EACjC,IAAA,uBAAW,EAAC,CAAC,CAAC,CACf,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAjBD,wCAiBC"}
+{"version":3,"file":"array.js","sourceRoot":"","sources":["../../../../../../packages/rxjs/src/lib/rxjs/array.ts"],"names":[],"mappings":";;;AAAA,+BAAmJ;AACnJ,wCAAuH;AAIvH,SAAgB,+BAA+B,CAAI,QAA8B;IAC/E,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,CAAC,KAAQ,EAAE,EAAE,CAAC,KAAqB,CAAA;KAC/C;IAED,OAAO,IAAA,2BAAoB,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,QAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAC7E,CAAC;AAND,0EAMC;AAcD,SAAgB,aAAa,CAAI,SAAkC,EAAE;IACnE,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC;IACpC,OAAO,IAAA,WAAI,EAAC,CAAC,GAAQ,EAAE,IAA4B,EAAE,EAAE;QACrD,IAAI,IAAI,IAAI,IAAI,EAAE;YAChB,IAAI,SAAS,EAAE;gBACb,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aACxB;iBAAM;gBACL,GAAG,GAAG,IAAA,iCAA0B,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;aAC7C;SACF;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAbD,sCAaC;AAgBA,CAAC;AAIF;;;;;;;;;;GAUG;AACH,SAAgB,cAAc,CAAO,IAAkC;IACrE,OAAO,IAAA,iBAAU,EAAC,CAAC,SAAY,EAAE,EAAE;QACjC,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,cAAc,EAAE,YAAY,GAAG,KAAK,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;QAE5E,OAAO,cAAc,CAAC,IAAI,CACxB,IAAA,gBAAS,EAAC,SAAgB,CAAC,EAAE,8DAA8D;QAC3F,IAAA,WAAI,EAAC,CAAC,GAAQ,EAAE,IAA4B,EAAE,EAAE;YAE9C,IAAI,IAAI,IAAI,IAAI,EAAE;gBAChB,IAAI,YAAY,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;oBACvC,IAAA,0BAAmB,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;iBAChC;qBAAM;oBACL,GAAG,CAAC,IAAI,CAAC,IAAW,CAAC,CAAC;iBACvB;aACF;YAED,OAAO,GAAI,CAAC;QACd,CAAC,EAAE,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAA2C,EACxD,+BAA+B,EAAE,EACjC,IAAA,kBAAW,EAAC,CAAC,CAAC,CACf,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAtBD,wCAsBC;AAED;;;;;GAKG;AACH,SAAgB,UAAU,CAAI,OAAkC;IAC9D,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAA,UAAG,EAAC,CAAC,CAAC,EAAE,CAAC,IAAA,uBAAgB,EAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,UAAG,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAC1E,CAAC;AAFD,gCAEC"}