Skip to content

feat(filter): Observable<T>.filter() can take a type guard as the predicate function #1936

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

Merged
merged 4 commits into from
Sep 16, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/operator/filter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export function filter<T>(predicate: (value: T, index: number) => boolean,

export interface FilterSignature<T> {
(predicate: (value: T, index: number) => boolean, thisArg?: any): Observable<T>;
<S extends T>(predicate: (value: T, index: number) => value is S, thisArg?: any): Observable<S>;
}

class FilterOperator<T> implements Operator<T, T> {
Expand Down
1 change: 1 addition & 0 deletions src/operator/find.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export function find<T>(predicate: (value: T, index: number, source: Observable<

export interface FindSignature<T> {
(predicate: (value: T, index: number, source: Observable<T>) => boolean, thisArg?: any): Observable<T>;
<S extends T>(predicate: (value: T, index: number, source: Observable<T>) => value is S, thisArg?: any): Observable<S>;
}

export class FindValueOperator<T> implements Operator<T, T> {
Expand Down
6 changes: 6 additions & 0 deletions src/operator/first.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,15 @@ export function first<T, R>(predicate?: (value: T, index: number, source: Observ
return this.lift(new FirstOperator(predicate, resultSelector, defaultValue, this));
}

// We can cast `T -> R` in it if we pass the result selector.
// Therefore we don't provide the signature which takes both a type guard function
// as the predicate and the result selector.
// (see #1936)
export interface FirstSignature<T> {
(predicate?: (value: T, index: number, source: Observable<T>) => boolean): Observable<T>;
<S extends T>(predicate?: (value: T, index: number, source: Observable<T>) => value is S): Observable<S>;
(predicate: (value: T, index: number, source: Observable<T>) => boolean, resultSelector: void, defaultValue?: T): Observable<T>;
<S extends T>(predicate: (value: T, index: number, source: Observable<T>) => value is S, resultSelector: void, defaultValue?: S): Observable<S>;
<R>(predicate?: (value: T, index: number, source: Observable<T>) => boolean, resultSelector?: (value: T, index: number) => R,
defaultValue?: R): Observable<R>;
}
Expand Down
6 changes: 6 additions & 0 deletions src/operator/last.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,15 @@ export function last<T, R>(predicate?: (value: T, index: number, source: Observa
return this.lift(new LastOperator(predicate, resultSelector, defaultValue, this));
}

// We can cast `T -> R` in it if we pass the result selector.
// Therefore we don't provide the signature which takes both a type guard function
// as the predicate and the result selector.
// (see #1936)
export interface LastSignature<T> {
(predicate?: (value: T, index: number, source: Observable<T>) => boolean): Observable<T>;
<S extends T>(predicate?: (value: T, index: number, source: Observable<T>) => value is S): Observable<S>;
(predicate: (value: T, index: number, source: Observable<T>) => boolean, resultSelector: void, defaultValue?: T): Observable<T>;
<S extends T>(predicate: (value: T, index: number, source: Observable<T>) => value is S, resultSelector: void, defaultValue?: S): Observable<S>;
<R>(predicate?: (value: T, index: number, source: Observable<T>) => boolean, resultSelector?: (value: T, index: number) => R,
defaultValue?: R): Observable<R>;
}
Expand Down