Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(effects): accept ObservableInput as concatLatestFrom argument #3838

22 changes: 8 additions & 14 deletions modules/effects/src/concat_latest_from.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Observable, ObservedValueOf, of, OperatorFunction, pipe } from 'rxjs';
import { concatMap, withLatestFrom } from 'rxjs/operators';
import { Observable, ObservableInput, ObservedValueOf, OperatorFunction, concatMap, forkJoin } from 'rxjs';

// The array overload is needed first because we want to maintain the proper order in the resulting tuple
export function concatLatestFrom<T extends Observable<unknown>[], V>(
Expand Down Expand Up @@ -38,24 +37,19 @@ export function concatLatestFrom<T extends Observable<unknown>, V>(
* ```
*/
export function concatLatestFrom<
T extends Observable<unknown>[] | Observable<unknown>,
T extends ObservableInput<unknown>[] | ObservableInput<unknown>,
V,
R = [
V,
...(T extends Observable<unknown>[]
...(T extends ObservableInput<unknown>[]
? { [i in keyof T]: ObservedValueOf<T[i]> }
: [ObservedValueOf<T>])
]
>(observablesFactory: (value: V) => T): OperatorFunction<V, R> {
return pipe(
concatMap((value) => {
const observables = observablesFactory(value);
const observablesAsArray = Array.isArray(observables)
? observables
: [observables];
return of(value).pipe(
withLatestFrom(...observablesAsArray)
) as unknown as Observable<R>;
})
return concatMap(
(value) =>
forkJoin(observablesFactory(value)).pipe(
map((others: unknown[]) => [value, ...others])
) as Observable<R>
);
}