Skip to content

Commit

Permalink
feat(window): add higher-order lettable version of window
Browse files Browse the repository at this point in the history
  • Loading branch information
benlesh committed Jun 26, 2017
1 parent 81ec389 commit 9f6373e
Show file tree
Hide file tree
Showing 3 changed files with 126 additions and 80 deletions.
83 changes: 3 additions & 80 deletions src/operator/window.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import { Operator } from '../Operator';
import { Subscriber } from '../Subscriber';
import { Observable } from '../Observable';
import { Subject } from '../Subject';

import { OuterSubscriber } from '../OuterSubscriber';
import { InnerSubscriber } from '../InnerSubscriber';
import { subscribeToResult } from '../util/subscribeToResult';
import { Observable } from '../Observable';
import { window as higherOrder } from '../operators';

/**
* Branch out the source Observable values as a nested Observable whenever
Expand Down Expand Up @@ -44,77 +39,5 @@ import { subscribeToResult } from '../util/subscribeToResult';
* @owner Observable
*/
export function window<T>(this: Observable<T>, windowBoundaries: Observable<any>): Observable<Observable<T>> {
return this.lift(new WindowOperator<T>(windowBoundaries));
}

class WindowOperator<T> implements Operator<T, Observable<T>> {

constructor(private windowBoundaries: Observable<any>) {
}

call(subscriber: Subscriber<Observable<T>>, source: any): any {
const windowSubscriber = new WindowSubscriber(subscriber);
const sourceSubscription = source.subscribe(windowSubscriber);
if (!sourceSubscription.closed) {
windowSubscriber.add(subscribeToResult(windowSubscriber, this.windowBoundaries));
}
return sourceSubscription;
}
}

/**
* We need this JSDoc comment for affecting ESDoc.
* @ignore
* @extends {Ignored}
*/
class WindowSubscriber<T> extends OuterSubscriber<T, any> {

private window: Subject<T> = new Subject<T>();

constructor(destination: Subscriber<Observable<T>>) {
super(destination);
destination.next(this.window);
}

notifyNext(outerValue: T, innerValue: any,
outerIndex: number, innerIndex: number,
innerSub: InnerSubscriber<T, any>): void {
this.openWindow();
}

notifyError(error: any, innerSub: InnerSubscriber<T, any>): void {
this._error(error);
}

notifyComplete(innerSub: InnerSubscriber<T, any>): void {
this._complete();
}

protected _next(value: T): void {
this.window.next(value);
}

protected _error(err: any): void {
this.window.error(err);
this.destination.error(err);
}

protected _complete(): void {
this.window.complete();
this.destination.complete();
}

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

private openWindow(): void {
const prevWindow = this.window;
if (prevWindow) {
prevWindow.complete();
}
const destination = this.destination;
const newWindow = this.window = new Subject<T>();
destination.next(newWindow);
}
return higherOrder(windowBoundaries)(this);
}
1 change: 1 addition & 0 deletions src/operators/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ export { switchAll } from './switchAll';
export { switchMap } from './switchMap';
export { takeLast } from './takeLast';
export { tap } from './tap';
export { window } from './window';
export { windowToggle } from './windowToggle';
122 changes: 122 additions & 0 deletions src/operators/window.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
import { Observable } from '../Observable';
import { OperatorFunction } from '../interfaces';
import { Subject } from '../Subject';
import { Subscriber } from '../Subscriber';
import { OuterSubscriber } from '../OuterSubscriber';
import { InnerSubscriber } from '../InnerSubscriber';
import { subscribeToResult } from '../util/subscribeToResult';
import { Operator } from '../Operator';

/**
* Branch out the source Observable values as a nested Observable whenever
* `windowBoundaries` emits.
*
* <span class="informal">It's like {@link buffer}, but emits a nested Observable
* instead of an array.</span>
*
* <img src="./img/window.png" width="100%">
*
* Returns an Observable that emits windows of items it collects from the source
* Observable. The output Observable emits connected, non-overlapping
* windows. It emits the current window and opens a new one whenever the
* Observable `windowBoundaries` emits an item. Because each window is an
* Observable, the output is a higher-order Observable.
*
* @example <caption>In every window of 1 second each, emit at most 2 click events</caption>
* var clicks = Rx.Observable.fromEvent(document, 'click');
* var interval = Rx.Observable.interval(1000);
* var result = clicks.window(interval)
* .map(win => win.take(2)) // each window has at most 2 emissions
* .mergeAll(); // flatten the Observable-of-Observables
* result.subscribe(x => console.log(x));
*
* @see {@link windowCount}
* @see {@link windowTime}
* @see {@link windowToggle}
* @see {@link windowWhen}
* @see {@link buffer}
*
* @param {Observable<any>} windowBoundaries An Observable that completes the
* previous window and starts a new window.
* @return {Observable<Observable<T>>} An Observable of windows, which are
* Observables emitting values of the source Observable.
* @method window
* @owner Observable
*/
export function window<T>(windowBoundaries: Observable<any>): OperatorFunction<T, Observable<T>> {
return function windowOperatorFunction(source: Observable<T>) {
return source.lift(new WindowOperator(windowBoundaries));
};
}

class WindowOperator<T> implements Operator<T, Observable<T>> {

constructor(private windowBoundaries: Observable<any>) {
}

call(subscriber: Subscriber<Observable<T>>, source: any): any {
const windowSubscriber = new WindowSubscriber(subscriber);
const sourceSubscription = source.subscribe(windowSubscriber);
if (!sourceSubscription.closed) {
windowSubscriber.add(subscribeToResult(windowSubscriber, this.windowBoundaries));
}
return sourceSubscription;
}
}

/**
* We need this JSDoc comment for affecting ESDoc.
* @ignore
* @extends {Ignored}
*/
class WindowSubscriber<T> extends OuterSubscriber<T, any> {

private window: Subject<T> = new Subject<T>();

constructor(destination: Subscriber<Observable<T>>) {
super(destination);
destination.next(this.window);
}

notifyNext(outerValue: T, innerValue: any,
outerIndex: number, innerIndex: number,
innerSub: InnerSubscriber<T, any>): void {
this.openWindow();
}

notifyError(error: any, innerSub: InnerSubscriber<T, any>): void {
this._error(error);
}

notifyComplete(innerSub: InnerSubscriber<T, any>): void {
this._complete();
}

protected _next(value: T): void {
this.window.next(value);
}

protected _error(err: any): void {
this.window.error(err);
this.destination.error(err);
}

protected _complete(): void {
this.window.complete();
this.destination.complete();
}

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

private openWindow(): void {
const prevWindow = this.window;
if (prevWindow) {
prevWindow.complete();
}
const destination = this.destination;
const newWindow = this.window = new Subject<T>();
destination.next(newWindow);
}
}

0 comments on commit 9f6373e

Please sign in to comment.