From 55c5b074ea29396484e8fe17cc01632f8e163e31 Mon Sep 17 00:00:00 2001
From: Tushar Mathur <tusharmath@gmail.com>
Date: Sat, 9 Sep 2017 20:52:31 +0530
Subject: [PATCH] feat(forEach): forEach can also take in an observer

---
 src/lib/ForEach.ts   | 37 +++++++++++++++++++++----------------
 test/test.ForEach.ts | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 16 deletions(-)
 create mode 100644 test/test.ForEach.ts

diff --git a/src/lib/ForEach.ts b/src/lib/ForEach.ts
index e2f1bfa..e5bd26d 100644
--- a/src/lib/ForEach.ts
+++ b/src/lib/ForEach.ts
@@ -2,30 +2,35 @@
  * Created by tushar.mathur on 01/11/16.
  */
 import {IObservable} from './Observable'
+import {IObserver} from './Observer'
 import {createScheduler} from './Scheduler'
 import {ISubscription} from './Subscription'
 import {curry} from './Utils'
 
-export type TOnNext<T> = {(value: T): void}
+export type TOnNext<T> = {(value: T): void} | IObserver<T>
 export type TSource<T> = IObservable<T>
 export type TResult = ISubscription
 
+const error = (err: Error) => {
+  throw err
+}
+const complete = () => void 0
+
+export type ForEachType = {
+  <T>(onNext: TOnNext<T>, source: TSource<T>): TResult
+  <T>(onNext: TOnNext<T>): {(source: TSource<T>): TResult}
+}
+
 export const forEach = curry(function<T>(
-  onNext: TOnNext<T>,
+  next: TOnNext<T>,
   observable: TSource<T>
 ) {
-  return observable.subscribe(
-    {
-      next(value: T) {
-        onNext(value)
-      },
-      complete() {},
-      error(err: Error) {
-        throw err
+  const observer = typeof next === 'function'
+    ? {
+        next: next,
+        complete: complete,
+        error: error
       }
-    },
-    createScheduler()
-  )
-}) as {<T>(onNext: TOnNext<T>, source: TSource<T>): TResult} & {
-  <T>(onNext: TOnNext<T>): {(source: TSource<T>): TResult}
-}
+    : next
+  return observable.subscribe(observer, createScheduler())
+}) as ForEachType
diff --git a/test/test.ForEach.ts b/test/test.ForEach.ts
new file mode 100644
index 0000000..cb33116
--- /dev/null
+++ b/test/test.ForEach.ts
@@ -0,0 +1,34 @@
+/**
+ * Created by tushar on 09/09/17.
+ */
+
+import * as assert from 'assert'
+import {forEach} from '../src/lib/ForEach'
+import {fromMarble} from '../src/testing/Marble'
+import {TestScheduler} from '../src/testing/TestScheduler'
+
+describe('forEach()', () => {
+  it('should take a function as the default next', () => {
+    const sh = TestScheduler.of()
+    const $ = sh.Cold('-1234')
+    const actual: number[] = []
+    forEach((i: number) => actual.push(i), $)
+    const expected = ['1', '2', '3', '4']
+    sh.advanceBy(300)
+    assert.deepEqual(actual, expected)
+  })
+
+  it('should take an observer', () => {
+    const sh = TestScheduler.of()
+    const $ = sh.Cold('-1234|')
+    const testObserver = sh.Observer()
+
+    forEach(testObserver, $)
+    sh.advanceBy(300)
+
+    const actual = testObserver.results
+    const expected = fromMarble('-1234|')
+
+    assert.deepEqual(actual, expected)
+  })
+})