fix(bindCallback): input function context can now be properly set via…

… output function (#2319)

Set context of input function to context of output function, so
that it is possible to control context at call time and underlying observable is
not available in input function

spec/observables/bindCallback-spec.ts

@@ -25,6 +25,24 @@ describe('Observable.bindCallback', () => {
  expect(results).to.deep.equal([42, 'done']);
  });
 
+ it('should set callback function context to context of returned function', () => {
+ function callback(cb) {
+ cb(this.datum);
+ }
+
+ const boundCallback = Observable.bindCallback(callback);
+ const results = [];
+
+ boundCallback.apply({datum: 5})
+ .subscribe(
+ (x: number) => results.push(x),
+ null,
+ () => results.push('done')
+ );
+
+ expect(results).to.deep.equal([5, 'done']);
+ });
+
  it('should emit one value chosen by a selector', () => {
  function callback(datum, cb) {
  cb(datum);
@@ -105,6 +123,26 @@ describe('Observable.bindCallback', () => {
  expect(results).to.deep.equal([42, 'done']);
  });
 
+ it('should set callback function context to context of returned function', () => {
+ function callback(cb) {
+ cb(this.datum);
+ }
+
+ const boundCallback = Observable.bindCallback(callback, null, rxTestScheduler);
+ const results = [];
+
+ boundCallback.apply({datum: 5})
+ .subscribe(
+ (x: number) => results.push(x),
+ null,
+ () => results.push('done')
+ );
+
+ rxTestScheduler.flush();
+
+ expect(results).to.deep.equal([5, 'done']);
+ });
+
  it('should error if callback throws', () => {
  const expected = new Error('haha no callback for you');
  function callback(datum, cb) {

src/observable/BoundCallbackObservable.ts

@@ -43,17 +43,30 @@ export class BoundCallbackObservable<T> extends Observable<T> {
  * `bindCallback` is not an operator because its input and output are not
  * Observables. The input is a function `func` with some parameters, but the
  * last parameter must be a callback function that `func` calls when it is
- * done. The output of `bindCallback` is a function that takes the same
+ * done.
+ *
+ * The output of `bindCallback` is a function that takes the same
  * parameters as `func`, except the last one (the callback). When the output
  * function is called with arguments, it will return an Observable where the
  * results will be delivered to.
  *
+ * If `func` depends on some context (`this` property), that context will be set
+ * to the same context that returned function has at call time. In particular, if `func`
+ * is usually called as method of some object, in order to preserve proper behaviour,
+ * it is recommended to set context of output function to that object as well,
+ * provided `func` is not already bound.
+ *
  * @example <caption>Convert jQuery's getJSON to an Observable API</caption>
  * // Suppose we have jQuery.getJSON('/my/url', callback)
  * var getJSONAsObservable = Rx.Observable.bindCallback(jQuery.getJSON);
  * var result = getJSONAsObservable('/my/url');
  * result.subscribe(x => console.log(x), e => console.error(e));
  *
+ * @example <caption>Use bindCallback on object method</caption>
+ * const boundMethod = Rx.Observable.bindCallback(someObject.methodWithCallback);
+ * boundMethod.call(someObject) // make sure methodWithCallback has access to someObject
+ * .subscribe(subscriber);
+ *
  * @see {@link bindNodeCallback}
  * @see {@link from}
  * @see {@link fromPromise}
@@ -72,14 +85,15 @@ export class BoundCallbackObservable<T> extends Observable<T> {
  static create<T>(func: Function,
  selector: Function | void = undefined,
  scheduler?: IScheduler): (...args: any[]) => Observable<T> {
- return (...args: any[]): Observable<T> => {
- return new BoundCallbackObservable<T>(func, <any>selector, args, scheduler);
+ return function(this: any, ...args: any[]): Observable<T> {
+ return new BoundCallbackObservable<T>(func, <any>selector, args, this, scheduler);
  };
  }
 
  constructor(private callbackFunc: Function,
  private selector: Function,
  private args: any[],
+ private context: any,
  private scheduler: IScheduler) {
  super();
  }
@@ -112,20 +126,20 @@ export class BoundCallbackObservable<T> extends Observable<T> {
  // use named function instance to avoid closure.
  (<any>handler).source = this;
 
- const result = tryCatch(callbackFunc).apply(this, args.concat(handler));
+ const result = tryCatch(callbackFunc).apply(this.context, args.concat(handler));
  if (result === errorObject) {
  subject.error(errorObject.e);
  }
  }
  return subject.subscribe(subscriber);
  } else {
- return scheduler.schedule(BoundCallbackObservable.dispatch, 0, { source: this, subscriber });
+ return scheduler.schedule(BoundCallbackObservable.dispatch, 0, { source: this, subscriber, context: this.context });
  }
  }
 
- static dispatch<T>(state: { source: BoundCallbackObservable<T>, subscriber: Subscriber<T> }) {
+ static dispatch<T>(state: { source: BoundCallbackObservable<T>, subscriber: Subscriber<T>, context: any }) {
  const self = (<Subscription><any>this);
- const { source, subscriber } = state;
+ const { source, subscriber, context } = state;
  const { callbackFunc, args, scheduler } = source;
  let subject = source.subject;
 
@@ -150,7 +164,7 @@ export class BoundCallbackObservable<T> extends Observable<T> {
  // use named function to pass values in without closure
  (<any>handler).source = source;
 
- const result = tryCatch(callbackFunc).apply(this, args.concat(handler));
+ const result = tryCatch(callbackFunc).apply(context, args.concat(handler));
  if (result === errorObject) {
  subject.error(errorObject.e);
  }