Merge pull request #3161 from jayphelps/errors

fix(Observable): Another attempt at fixing error rethrows in v5

spec/Observable-spec.ts

@@ -59,6 +59,20 @@ describe('Observable', () => {
  }).to.throw();
  });
 
+ it('should rethrow if sink has syncErrorThrowable = false', () => {
+ const observable = new Observable(observer => {
+ observer.next(1);
+ });
+
+ const sink = Subscriber.create(() => {
+ throw 'error!';
+ });
+
+ expect(() => {
+ observable.subscribe(sink);
+ }).to.throw('error!');
+ });
+
  describe('forEach', () => {
  it('should iterate and return a Promise', (done: MochaDone) => {
  const expected = [1, 2, 3];

src/Observable.ts

@@ -199,7 +199,7 @@ export class Observable<T> implements Subscribable<T> {
  if (operator) {
  operator.call(sink, this.source);
  } else {
- sink.add(this.source ? this._subscribe(sink) : this._trySubscribe(sink));
+ sink.add(this.source || !sink.syncErrorThrowable ? this._subscribe(sink) : this._trySubscribe(sink));
  }
 
  if (sink.syncErrorThrowable) {

src/Subscriber.ts

@@ -68,6 +68,7 @@ export class Subscriber<T> extends Subscription implements Observer<T> {
  }
  if (typeof destinationOrNext === 'object') {
  if (destinationOrNext instanceof Subscriber) {
+ this.syncErrorThrowable = destinationOrNext.syncErrorThrowable;
  this.destination = (<Subscriber<any>> destinationOrNext);
  (<any> this.destination).add(this);
  } else {