Merge pull request #1936 from saneyuki/filter-typing

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

Author: kwonoj

src/operator/filter.ts

@@ -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> {

src/operator/find.ts

@@ -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> {

src/operator/first.ts

@@ -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>;
 }

src/operator/last.ts

@@ -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>;
 }