chore(distinctUntilKeyChanged): nail down key's typing with keyof T

ReactiveX · Aug 3, 2018 · 9b4d649 · 9b4d649
1 parent 8ce9879
commit 9b4d649
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/compat/operator/distinctUntilKeyChanged.ts b/compat/operator/distinctUntilKeyChanged.ts
@@ -3,8 +3,8 @@ import { Observable } from 'rxjs';
 import { distinctUntilKeyChanged as higherOrder } from 'rxjs/operators';
 
 /* tslint:disable:max-line-length */
-export function distinctUntilKeyChanged<T>(this: Observable<T>, key: string): Observable<T>;
-export function distinctUntilKeyChanged<T, K>(this: Observable<T>, key: string, compare: (x: K, y: K) => boolean): Observable<T>;
+export function distinctUntilKeyChanged<T>(this: Observable<T>, key: keyof T): Observable<T>;
+export function distinctUntilKeyChanged<T, K>(this: Observable<T>, key: keyof T, compare: (x: K, y: K) => boolean): Observable<T>;
 /* tslint:enable:max-line-length */
 
 /**
@@ -64,6 +64,6 @@ export function distinctUntilKeyChanged<T, K>(this: Observable<T>, key: string,
  * @method distinctUntilKeyChanged
  * @owner Observable
  */
-export function distinctUntilKeyChanged<T, K>(this: Observable<T>, key: string, compare?: (x: K, y: K) => boolean): Observable<T> {
+export function distinctUntilKeyChanged<T, K>(this: Observable<T>, key: keyof T, compare?: (x: K, y: K) => boolean): Observable<T> {
   return higherOrder<T, K>(key, compare)(this);
 }
diff --git a/src/internal/operators/distinctUntilKeyChanged.ts b/src/internal/operators/distinctUntilKeyChanged.ts
@@ -2,8 +2,8 @@ import { distinctUntilChanged } from './distinctUntilChanged';
 import { MonoTypeOperatorFunction } from '../types';
 
 /* tslint:disable:max-line-length */
-export function distinctUntilKeyChanged<T>(key: string): MonoTypeOperatorFunction<T>;
-export function distinctUntilKeyChanged<T, K>(key: string, compare: (x: K, y: K) => boolean): MonoTypeOperatorFunction<T>;
+export function distinctUntilKeyChanged<T>(key: keyof T): MonoTypeOperatorFunction<T>;
+export function distinctUntilKeyChanged<T, K>(key: keyof T, compare: (x: K, y: K) => boolean): MonoTypeOperatorFunction<T>;
 /* tslint:enable:max-line-length */
 
 /**
@@ -70,6 +70,6 @@ export function distinctUntilKeyChanged<T, K>(key: string, compare: (x: K, y: K)
  * @method distinctUntilKeyChanged
  * @owner Observable
  */
-export function distinctUntilKeyChanged<T, K>(key: string, compare?: (x: K, y: K) => boolean): MonoTypeOperatorFunction<T> {
-  return distinctUntilChanged((x: T, y: T) => compare ? compare(x[key], y[key]) : x[key] === y[key]);
+export function distinctUntilKeyChanged<T, K>(key: keyof T, compare?: (x: K, y: K) => boolean): MonoTypeOperatorFunction<T> {
+  return distinctUntilChanged((x: T, y: T) => compare ? compare(x[key] as any, y[key] as any) : x[key] === y[key]);
 }