Skip to content

refactor(catchError): add type overloads for functions that do not re… #3421

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.

Sign up for GitHub

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

Merged
benlesh merged 1 commit into from
Mar 9, 2018
Merged

refactor(catchError): add type overloads for functions that do not re… #3421

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/internal/operators/catchError.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,19 @@ import { Observable } from '../Observable';

import { OuterSubscriber } from '../OuterSubscriber';
import { subscribeToResult } from '../util/subscribeToResult';
import { ObservableInput, OperatorFunction } from '../types';
import { ObservableInput, OperatorFunction, MonoTypeOperatorFunction } from '../types';

export function catchError<T>(
selector: (err: any, caught: Observable<T>) => never
): MonoTypeOperatorFunction<T>;

export function catchError<T>(
selector: (err: any, caught: Observable<T>) => ObservableInput<T>
): MonoTypeOperatorFunction<T>;

export function catchError<T, R>(
selector: (err: any, caught: Observable<T>) => ObservableInput<R>
): OperatorFunction<T, R>;

/**
* Catches errors on the observable to be handled by returning a new observable or throwing an error.
Expand Down Expand Up @@ -63,7 +75,7 @@ import { ObservableInput, OperatorFunction } from '../types';
* catch `selector` function.
* @name catchError
*/
export function catchError<T, R>(selector: (err: any, caught: Observable<T>) => ObservableInput<R>): OperatorFunction<T, T | R> {
export function catchError<T, R>(selector: (err: any, caught: Observable<T>) => ObservableInput<R>|never): OperatorFunction<T, T | R> {
return function catchErrorOperatorFunction(source: Observable<T>): Observable<T | R> {
const operator = new CatchOperator(selector);
const caught = source.lift(operator);
Expand Down