diff options
Diffstat (limited to 'tools/node_modules/eslint/node_modules/rxjs/internal/operators/mergeMap.d.ts')
-rw-r--r-- | tools/node_modules/eslint/node_modules/rxjs/internal/operators/mergeMap.d.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/node_modules/eslint/node_modules/rxjs/internal/operators/mergeMap.d.ts b/tools/node_modules/eslint/node_modules/rxjs/internal/operators/mergeMap.d.ts index 1a34c669d0..f2fb80d7c5 100644 --- a/tools/node_modules/eslint/node_modules/rxjs/internal/operators/mergeMap.d.ts +++ b/tools/node_modules/eslint/node_modules/rxjs/internal/operators/mergeMap.d.ts @@ -3,12 +3,12 @@ import { Subscriber } from '../Subscriber'; import { Subscription } from '../Subscription'; import { OuterSubscriber } from '../OuterSubscriber'; import { InnerSubscriber } from '../InnerSubscriber'; -import { ObservableInput, OperatorFunction } from '../types'; -export declare function mergeMap<T, R>(project: (value: T, index: number) => ObservableInput<R>, concurrent?: number): OperatorFunction<T, R>; +import { ObservableInput, OperatorFunction, ObservedValueOf } from '../types'; +export declare function mergeMap<T, O extends ObservableInput<any>>(project: (value: T, index: number) => O, concurrent?: number): OperatorFunction<T, ObservedValueOf<O>>; /** @deprecated resultSelector no longer supported, use inner map instead */ -export declare function mergeMap<T, R>(project: (value: T, index: number) => ObservableInput<R>, resultSelector: undefined, concurrent?: number): OperatorFunction<T, R>; +export declare function mergeMap<T, O extends ObservableInput<any>>(project: (value: T, index: number) => O, resultSelector: undefined, concurrent?: number): OperatorFunction<T, ObservedValueOf<O>>; /** @deprecated resultSelector no longer supported, use inner map instead */ -export declare function mergeMap<T, I, R>(project: (value: T, index: number) => ObservableInput<I>, resultSelector: (outerValue: T, innerValue: I, outerIndex: number, innerIndex: number) => R, concurrent?: number): OperatorFunction<T, R>; +export declare function mergeMap<T, R, O extends ObservableInput<any>>(project: (value: T, index: number) => O, resultSelector: (outerValue: T, innerValue: ObservedValueOf<O>, outerIndex: number, innerIndex: number) => R, concurrent?: number): OperatorFunction<T, R>; export declare class MergeMapOperator<T, R> implements Operator<T, R> { private project; private concurrent; |