From 0f9d45b249428b8b354d6bee75fb9bfcaf5e782a Mon Sep 17 00:00:00 2001 From: Ben Lesh Date: Mon, 14 Dec 2015 09:18:40 -0800 Subject: [PATCH] refactor(Rx): move `inspect` operators to KitchenSink Given that one could get the behavior of `inspect` operators with `sample` and some composition, moving `inspect` operators to `KitchenSink` and out of Rx Core. BREAKING CHANGE: `inspect` operators are now in KitchenSink only --- spec/operators/inspect-spec.js | 2 +- spec/operators/inspectTime-spec.js | 2 +- src/CoreOperators.ts | 2 -- src/Rx.KitchenSink.ts | 2 ++ src/Rx.ts | 2 -- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/spec/operators/inspect-spec.js b/spec/operators/inspect-spec.js index 452cd35315..14e0bb308e 100644 --- a/spec/operators/inspect-spec.js +++ b/spec/operators/inspect-spec.js @@ -1,5 +1,5 @@ /* globals describe, it, expect, hot, expectObservable,, expectSubscriptions */ -var Rx = require('../../dist/cjs/Rx'); +var Rx = require('../../dist/cjs/Rx.KitchenSink'); var Observable = Rx.Observable; describe('Observable.prototype.inspect', function () { diff --git a/spec/operators/inspectTime-spec.js b/spec/operators/inspectTime-spec.js index e5be0a65ee..4d72ea5531 100644 --- a/spec/operators/inspectTime-spec.js +++ b/spec/operators/inspectTime-spec.js @@ -1,5 +1,5 @@ /* globals describe, it, expect, expectObservable, expectSubscriptions, cold, hot, rxTestScheduler */ -var Rx = require('../../dist/cjs/Rx'); +var Rx = require('../../dist/cjs/Rx.KitchenSink'); var Observable = Rx.Observable; describe('Observable.prototype.inspectTime', function () { diff --git a/src/CoreOperators.ts b/src/CoreOperators.ts index cee2ce009f..b08c14b552 100644 --- a/src/CoreOperators.ts +++ b/src/CoreOperators.ts @@ -39,8 +39,6 @@ export interface CoreOperators { elementSelector?: (value: T) => R, durationSelector?: (group: GroupedObservable) => Observable) => Observable>; ignoreElements?: () => Observable; - inspect?: (notifier: Observable) => Observable; - inspectTime?: (delay: number, scheduler?: Scheduler) => Observable; last?: (predicate?: (value: T, index: number) => boolean, resultSelector?: (value: T, index: number) => R, defaultValue?: any) => Observable | Observable; diff --git a/src/Rx.KitchenSink.ts b/src/Rx.KitchenSink.ts index 4a99a65488..8e8940f9fa 100644 --- a/src/Rx.KitchenSink.ts +++ b/src/Rx.KitchenSink.ts @@ -11,6 +11,8 @@ export interface KitchenSinkOperators extends CoreOperators { distinctUntilKeyChanged?: (key: string, compare?: (x: any, y: any) => boolean) => Observable; find?: (predicate: (value: T, index: number, source: Observable) => boolean, thisArg?: any) => Observable; findIndex?: (predicate: (value: T, index: number, source: Observable) => boolean, thisArg?: any) => Observable; + inspect?: (notifier: Observable) => Observable; + inspectTime?: (delay: number, scheduler?: IScheduler) => Observable; max?: (comparer?: (x: R, y: T) => R) => Observable; min?: (comparer?: (x: R, y: T) => R) => Observable; timeInterval?: (scheduler?: IScheduler) => Observable; diff --git a/src/Rx.ts b/src/Rx.ts index b72edcfe86..33bebf53a5 100644 --- a/src/Rx.ts +++ b/src/Rx.ts @@ -54,8 +54,6 @@ import './add/operator/finally'; import './add/operator/first'; import './add/operator/groupBy'; import './add/operator/ignoreElements'; -import './add/operator/inspect'; -import './add/operator/inspectTime'; import './add/operator/every'; import './add/operator/last'; import './add/operator/map';