fix(bindCallback): emit undefined when callback is without arguments

In resulting Observable emit undefined when callback is called without parameters, instead of emitting empty array.
ReactiveX · Feb 6, 2017 · 915a2a8 · 915a2a8
1 parent 6ce4773
commit 915a2a8
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/spec/observables/bindCallback-spec.ts b/spec/observables/bindCallback-spec.ts
@@ -8,6 +8,23 @@ const Observable = Rx.Observable;
 /** @test {bindCallback} */
 describe('Observable.bindCallback', () => {
   describe('when not scheduled', () => {
+    it('should emit undefined from a callback without arguments', () => {
+      function callback(cb) {
+        cb();
+      }
+      const boundCallback = Observable.bindCallback(callback);
+      const results = [];
+
+      boundCallback()
+        .subscribe((x: any) => {
+          results.push(typeof x);
+        }, null, () => {
+          results.push('done');
+        });
+
+      expect(results).to.deep.equal(['undefined', 'done']);
+    });
+
     it('should emit one value from a callback', () => {
       function callback(datum, cb) {
         cb(datum);
@@ -104,6 +121,25 @@ describe('Observable.bindCallback', () => {
   });
 
   describe('when scheduled', () => {
+    it('should emit undefined from a callback without arguments', () => {
+      function callback(cb) {
+        cb();
+      }
+      const boundCallback = Observable.bindCallback(callback, null, rxTestScheduler);
+      const results = [];
+
+      boundCallback()
+        .subscribe((x: any) => {
+          results.push(typeof x);
+        }, null, () => {
+          results.push('done');
+        });
+
+      rxTestScheduler.flush();
+
+      expect(results).to.deep.equal(['undefined', 'done']);
+    });
+
     it('should emit one value from a callback', () => {
       function callback(datum, cb) {
         cb(datum);

diff --git a/src/observable/BoundCallbackObservable.ts b/src/observable/BoundCallbackObservable.ts
@@ -15,6 +15,7 @@ export class BoundCallbackObservable<T> extends Observable<T> {
   subject: AsyncSubject<T>;
 
   /* tslint:disable:max-line-length */
+  static create(callbackFunc: (callback: () => any) => any, selector?: void, scheduler?: IScheduler): () => Observable<void>;
   static create<R>(callbackFunc: (callback: (result: R) => any) => any, selector?: void, scheduler?: IScheduler): () => Observable<R>;
   static create<T, R>(callbackFunc: (v1: T, callback: (result: R) => any) => any, selector?: void, scheduler?: IScheduler): (v1: T) => Observable<R>;
   static create<T, T2, R>(callbackFunc: (v1: T, v2: T2, callback: (result: R) => any) => any, selector?: void, scheduler?: IScheduler): (v1: T, v2: T2) => Observable<R>;
@@ -119,7 +120,7 @@ export class BoundCallbackObservable<T> extends Observable<T> {
               subject.complete();
             }
           } else {
-            subject.next(innerArgs.length === 1 ? innerArgs[0] : innerArgs);
+            subject.next(innerArgs.length <= 1 ? innerArgs[0] : innerArgs);
             subject.complete();
           }
         };
@@ -157,7 +158,7 @@ export class BoundCallbackObservable<T> extends Observable<T> {
             self.add(scheduler.schedule(dispatchNext, 0, { value: result, subject }));
           }
         } else {
-          const value = innerArgs.length === 1 ? innerArgs[0] : innerArgs;
+          const value = innerArgs.length <= 1 ? innerArgs[0] : innerArgs;
           self.add(scheduler.schedule(dispatchNext, 0, { value, subject }));
         }
       };