fix(pairwise): make it recursion-proof (#4743)

thorn0 · benlesh · commit 21ab2615d9b0 · 2019-05-09T17:52:39.000-06:00
diff --git a/spec/operators/pairwise-spec.ts b/spec/operators/pairwise-spec.ts
@@ -1,5 +1,7 @@
 import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing';
-import { pairwise } from 'rxjs/operators';
+import { pairwise, take } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+import { expect } from 'chai';
 
 declare function asDiagram(arg: string): Function;
 
@@ -103,4 +105,25 @@ describe('pairwise operator', () => {
     expectObservable(source).toBe(expected);
     expectSubscriptions(e1.subscriptions).toBe(e1subs);
   });
+
+  it('should be recursively re-enterable', () => {
+    const results = new Array<[string, string]>();
+
+    const subject = new Subject<string>();
+
+    subject
+      .pipe(
+        pairwise(),
+        take(3)
+      )
+      .subscribe(pair => {
+        results.push(pair);
+        subject.next('c');
+      });
+
+    subject.next('a');
+    subject.next('b');
+
+    expect(results).to.deep.equal([['a', 'b'], ['b', 'c'], ['c', 'c']]);
+  });
 });
diff --git a/src/internal/operators/pairwise.ts b/src/internal/operators/pairwise.ts
@@ -70,12 +70,18 @@ class PairwiseSubscriber<T> extends Subscriber<T> {
   }
 
   _next(value: T): void {
+    let pair: [T, T] | undefined;
+
     if (this.hasPrev) {
-      this.destination.next([this.prev, value]);
+      pair = [this.prev, value];
     } else {
       this.hasPrev = true;
     }
 
     this.prev = value;
+
+    if (pair) {
+      this.destination.next(pair);
+    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -70,12 +70,18 @@ class PairwiseSubscriber<T> extends Subscriber<T> {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`_next(value: T): void {`
	`73`	`+ let pair: [T, T] \| undefined;`
	`74`	`+`
`73`	`75`	`if (this.hasPrev) {`
`74`		`- this.destination.next([this.prev, value]);`
	`76`	`+ pair = [this.prev, value];`
`75`	`77`	`} else {`
`76`	`78`	`this.hasPrev = true;`
`77`	`79`	`}`
`78`	`80`
`79`	`81`	`this.prev = value;`
	`82`	`+`
	`83`	`+ if (pair) {`
	`84`	`+ this.destination.next(pair);`
	`85`	`+ }`
`80`	`86`	`}`
`81`	`87`	`}`