Skip to content

Commit

Permalink
feat(switchMapTo): add higher-order lettable version of switchMapTo
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonaden committed Sep 7, 2017
1 parent 76d8ffa commit 2640184
Show file tree
Hide file tree
Showing 5 changed files with 199 additions and 105 deletions.
22 changes: 2 additions & 20 deletions src/operator/startWith.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import { IScheduler } from '../Scheduler';
import { Observable } from '../Observable';
import { ArrayObservable } from '../observable/ArrayObservable';
import { ScalarObservable } from '../observable/ScalarObservable';
import { EmptyObservable } from '../observable/EmptyObservable';
import { concat as concatStatic } from '../observable/concat';
import { isScheduler } from '../util/isScheduler';
import { startWith as higherOrder } from '../operators/startWith';

/* tslint:disable:max-line-length */
export function startWith<T>(this: Observable<T>, v1: T, scheduler?: IScheduler): Observable<T>;
Expand All @@ -31,19 +27,5 @@ export function startWith<T>(this: Observable<T>, ...array: Array<T | IScheduler
* @owner Observable
*/
export function startWith<T>(this: Observable<T>, ...array: Array<T | IScheduler>): Observable<T> {
let scheduler = <IScheduler>array[array.length - 1];
if (isScheduler(scheduler)) {
array.pop();
} else {
scheduler = null;
}

const len = array.length;
if (len === 1) {
return concatStatic(new ScalarObservable<T>(<T>array[0], scheduler), <Observable<T>>this);
} else if (len > 1) {
return concatStatic(new ArrayObservable<T>(<T[]>array, scheduler), <Observable<T>>this);
} else {
return concatStatic(new EmptyObservable<T>(scheduler), <Observable<T>>this);
}
return higherOrder(...array)(this);
}
87 changes: 2 additions & 85 deletions src/operator/switchMapTo.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import { Operator } from '../Operator';
import { Observable, ObservableInput } from '../Observable';
import { Subscriber } from '../Subscriber';
import { Subscription } from '../Subscription';
import { OuterSubscriber } from '../OuterSubscriber';
import { InnerSubscriber } from '../InnerSubscriber';
import { subscribeToResult } from '../util/subscribeToResult';
import { switchMapTo as higherOrder } from '../operators/switchMapTo';

/* tslint:disable:max-line-length */
export function switchMapTo<T, R>(this: Observable<T>, observable: ObservableInput<R>): Observable<R>;
Expand Down Expand Up @@ -58,83 +53,5 @@ export function switchMapTo<T, I, R>(this: Observable<T>, innerObservable: Obser
innerValue: I,
outerIndex: number,
innerIndex: number) => R): Observable<I | R> {
return this.lift(new SwitchMapToOperator(innerObservable, resultSelector));
}

class SwitchMapToOperator<T, I, R> implements Operator<T, I> {
constructor(private observable: Observable<I>,
private resultSelector?: (outerValue: T, innerValue: I, outerIndex: number, innerIndex: number) => R) {
}

call(subscriber: Subscriber<I>, source: any): any {
return source.subscribe(new SwitchMapToSubscriber(subscriber, this.observable, this.resultSelector));
}
}

/**
* We need this JSDoc comment for affecting ESDoc.
* @ignore
* @extends {Ignored}
*/
class SwitchMapToSubscriber<T, I, R> extends OuterSubscriber<T, I> {
private index: number = 0;
private innerSubscription: Subscription;

constructor(destination: Subscriber<I>,
private inner: Observable<I>,
private resultSelector?: (outerValue: T, innerValue: I, outerIndex: number, innerIndex: number) => R) {
super(destination);
}

protected _next(value: any) {
const innerSubscription = this.innerSubscription;
if (innerSubscription) {
innerSubscription.unsubscribe();
}
this.add(this.innerSubscription = subscribeToResult(this, this.inner, value, this.index++));
}

protected _complete() {
const {innerSubscription} = this;
if (!innerSubscription || innerSubscription.closed) {
super._complete();
}
}

protected _unsubscribe() {
this.innerSubscription = null;
}

notifyComplete(innerSub: Subscription) {
this.remove(innerSub);
this.innerSubscription = null;
if (this.isStopped) {
super._complete();
}
}

notifyNext(outerValue: T, innerValue: I,
outerIndex: number, innerIndex: number,
innerSub: InnerSubscriber<T, I>): void {
const { resultSelector, destination } = this;
if (resultSelector) {
this.tryResultSelector(outerValue, innerValue, outerIndex, innerIndex);
} else {
destination.next(innerValue);
}
}

private tryResultSelector(outerValue: T, innerValue: I,
outerIndex: number, innerIndex: number): void {
const { resultSelector, destination } = this;
let result: R;
try {
result = resultSelector(outerValue, innerValue, outerIndex, innerIndex);
} catch (err) {
destination.error(err);
return;
}

destination.next(result);
}
return higherOrder(innerObservable, resultSelector)(this);
}
2 changes: 2 additions & 0 deletions src/operators/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,11 @@ export { skip } from './skip';
export { skipLast } from './skipLast';
export { skipUntil } from './skipUntil';
export { skipWhile } from './skipWhile';
export { startWith } from './startWith';
export { subscribeOn } from './subscribeOn';
export { switchAll } from './switchAll';
export { switchMap } from './switchMap';
export { switchMapTo } from './switchMapTo';
export { takeLast } from './takeLast';
export { tap } from './tap';
export { timestamp } from './timestamp';
Expand Down
52 changes: 52 additions & 0 deletions src/operators/startWith.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import { IScheduler } from '../Scheduler';
import { Observable } from '../Observable';
import { ArrayObservable } from '../observable/ArrayObservable';
import { ScalarObservable } from '../observable/ScalarObservable';
import { EmptyObservable } from '../observable/EmptyObservable';
import { concat as concatStatic } from '../observable/concat';
import { isScheduler } from '../util/isScheduler';
import { MonoTypeOperatorFunction } from '../interfaces';

/* tslint:disable:max-line-length */
export function startWith<T>(v1: T, scheduler?: IScheduler): MonoTypeOperatorFunction<T>;
export function startWith<T>(v1: T, v2: T, scheduler?: IScheduler): MonoTypeOperatorFunction<T>;
export function startWith<T>(v1: T, v2: T, v3: T, scheduler?: IScheduler): MonoTypeOperatorFunction<T>;
export function startWith<T>(v1: T, v2: T, v3: T, v4: T, scheduler?: IScheduler): MonoTypeOperatorFunction<T>;
export function startWith<T>(v1: T, v2: T, v3: T, v4: T, v5: T, scheduler?: IScheduler): MonoTypeOperatorFunction<T>;
export function startWith<T>(v1: T, v2: T, v3: T, v4: T, v5: T, v6: T, scheduler?: IScheduler): MonoTypeOperatorFunction<T>;
export function startWith<T>(...array: Array<T | IScheduler>): MonoTypeOperatorFunction<T>;
/* tslint:enable:max-line-length */

/**
* Returns an Observable that emits the items you specify as arguments before it begins to emit
* items emitted by the source Observable.
*
* <img src="./img/startWith.png" width="100%">
*
* @param {...T} values - Items you want the modified Observable to emit first.
* @param {Scheduler} [scheduler] - A {@link IScheduler} to use for scheduling
* the emissions of the `next` notifications.
* @return {Observable} An Observable that emits the items in the specified Iterable and then emits the items
* emitted by the source Observable.
* @method startWith
* @owner Observable
*/
export function startWith<T>(...array: Array<T | IScheduler>): MonoTypeOperatorFunction<T> {
return (source: Observable<T>) => {
let scheduler = <IScheduler>array[array.length - 1];
if (isScheduler(scheduler)) {
array.pop();
} else {
scheduler = null;
}

const len = array.length;
if (len === 1) {
return concatStatic(new ScalarObservable<T>(<T>array[0], scheduler), source);
} else if (len > 1) {
return concatStatic(new ArrayObservable<T>(<T[]>array, scheduler), source);
} else {
return concatStatic(new EmptyObservable<T>(scheduler), source);
}
};
}
141 changes: 141 additions & 0 deletions src/operators/switchMapTo.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
import { Operator } from '../Operator';
import { Observable, ObservableInput } from '../Observable';
import { Subscriber } from '../Subscriber';
import { Subscription } from '../Subscription';
import { OuterSubscriber } from '../OuterSubscriber';
import { InnerSubscriber } from '../InnerSubscriber';
import { subscribeToResult } from '../util/subscribeToResult';
import { OperatorFunction } from '../interfaces';

/* tslint:disable:max-line-length */
export function switchMapTo<T, R>(observable: ObservableInput<R>): OperatorFunction<T, R>;
export function switchMapTo<T, I, R>(observable: ObservableInput<I>, resultSelector: (outerValue: T, innerValue: I, outerIndex: number, innerIndex: number) => R): OperatorFunction<T, R>;
/* tslint:enable:max-line-length */

/**
* Projects each source value to the same Observable which is flattened multiple
* times with {@link switch} in the output Observable.
*
* <span class="informal">It's like {@link switchMap}, but maps each value
* always to the same inner Observable.</span>
*
* <img src="./img/switchMapTo.png" width="100%">
*
* Maps each source value to the given Observable `innerObservable` regardless
* of the source value, and then flattens those resulting Observables into one
* single Observable, which is the output Observable. The output Observables
* emits values only from the most recently emitted instance of
* `innerObservable`.
*
* @example <caption>Rerun an interval Observable on every click event</caption>
* var clicks = Rx.Observable.fromEvent(document, 'click');
* var result = clicks.switchMapTo(Rx.Observable.interval(1000));
* result.subscribe(x => console.log(x));
*
* @see {@link concatMapTo}
* @see {@link switch}
* @see {@link switchMap}
* @see {@link mergeMapTo}
*
* @param {ObservableInput} innerObservable An Observable to replace each value from
* the source Observable.
* @param {function(outerValue: T, innerValue: I, outerIndex: number, innerIndex: number): any} [resultSelector]
* A function to produce the value on the output Observable based on the values
* and the indices of the source (outer) emission and the inner Observable
* emission. The arguments passed to this function are:
* - `outerValue`: the value that came from the source
* - `innerValue`: the value that came from the projected Observable
* - `outerIndex`: the "index" of the value that came from the source
* - `innerIndex`: the "index" of the value from the projected Observable
* @return {Observable} An Observable that emits items from the given
* `innerObservable` (and optionally transformed through `resultSelector`) every
* time a value is emitted on the source Observable, and taking only the values
* from the most recently projected inner Observable.
* @method switchMapTo
* @owner Observable
*/
export function switchMapTo<T, I, R>(innerObservable: Observable<I>,
resultSelector?: (outerValue: T,
innerValue: I,
outerIndex: number,
innerIndex: number) => R): OperatorFunction<T, I | R> {
return (source: Observable<T>) => source.lift(new SwitchMapToOperator(innerObservable, resultSelector));
}

class SwitchMapToOperator<T, I, R> implements Operator<T, I> {
constructor(private observable: Observable<I>,
private resultSelector?: (outerValue: T, innerValue: I, outerIndex: number, innerIndex: number) => R) {
}

call(subscriber: Subscriber<I>, source: any): any {
return source.subscribe(new SwitchMapToSubscriber(subscriber, this.observable, this.resultSelector));
}
}

/**
* We need this JSDoc comment for affecting ESDoc.
* @ignore
* @extends {Ignored}
*/
class SwitchMapToSubscriber<T, I, R> extends OuterSubscriber<T, I> {
private index: number = 0;
private innerSubscription: Subscription;

constructor(destination: Subscriber<I>,
private inner: Observable<I>,
private resultSelector?: (outerValue: T, innerValue: I, outerIndex: number, innerIndex: number) => R) {
super(destination);
}

protected _next(value: any) {
const innerSubscription = this.innerSubscription;
if (innerSubscription) {
innerSubscription.unsubscribe();
}
this.add(this.innerSubscription = subscribeToResult(this, this.inner, value, this.index++));
}

protected _complete() {
const {innerSubscription} = this;
if (!innerSubscription || innerSubscription.closed) {
super._complete();
}
}

protected _unsubscribe() {
this.innerSubscription = null;
}

notifyComplete(innerSub: Subscription) {
this.remove(innerSub);
this.innerSubscription = null;
if (this.isStopped) {
super._complete();
}
}

notifyNext(outerValue: T, innerValue: I,
outerIndex: number, innerIndex: number,
innerSub: InnerSubscriber<T, I>): void {
const { resultSelector, destination } = this;
if (resultSelector) {
this.tryResultSelector(outerValue, innerValue, outerIndex, innerIndex);
} else {
destination.next(innerValue);
}
}

private tryResultSelector(outerValue: T, innerValue: I,
outerIndex: number, innerIndex: number): void {
const { resultSelector, destination } = this;
let result: R;
try {
result = resultSelector(outerValue, innerValue, outerIndex, innerIndex);
} catch (err) {
destination.error(err);
return;
}

destination.next(result);
}
}

0 comments on commit 2640184

Please sign in to comment.