Skip to content

Commit af33fb1

Browse files
authored
Merge pull request #228 from tusharmath/feat-combine
Feat combine
2 parents 221793d + 8637913 commit af33fb1

File tree

6 files changed

+37
-28
lines changed

6 files changed

+37
-28
lines changed

API.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
- [fromNodeStream](#fromNodeStream)
2222

2323
- [Operators](#operators)
24+
- [combine](#combine)
2425
- [concat](#concat)
2526
- [concatMap](#concatMap)
2627
- [delay](#delay)
@@ -430,6 +431,13 @@ function concatMap(fn : (i: any) => Observable, source: Observable): Observable
430431
```
431432
Its a special case for [mergeMap](#mergeMap) where the `concurrency` is set to `one`. This ensures unless the previous subscriptions end new ones are not created.
432433

434+
## combine
435+
```ts
436+
function combine(a: Selector, s: Observable[]): Observable
437+
```
438+
Combines multiple streams into one using a selector.
439+
440+
433441
## concat
434442
```ts
435443
function concat(a: Observable, b: Observable): Observable

src/main.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Created by tushar on 17/02/17.
33
*/
44

5+
export {combine} from './operators/Combine'
56
export {concatMap} from './operators/MergeMap'
67
export {concat} from './operators/Concat'
78
export {delay} from './operators/Delay'

src/operators/Reduce.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ export const reduce = curry(function<T, R>(
6363
(seed: TSeed<R>, source: TSource<T>): TResult<R>
6464
}
6565
} & {
66-
<T, R>(reducer: TReducer<T, R>, seed: TSeed<R>): {
67-
(source: TSource<T>): TResult<R>
68-
}
69-
} & {
70-
<T, R>(reducer: TReducer<T, R>): {
71-
(seed: TSeed<R>): {(source: TSource<T>): TResult<R>}
72-
}
66+
<T, R>(reducer: TReducer<T, R>, seed: TSeed<R>): {
67+
(source: TSource<T>): TResult<R>
7368
}
69+
} & {
70+
<T, R>(reducer: TReducer<T, R>): {
71+
(seed: TSeed<R>): {(source: TSource<T>): TResult<R>}
72+
}
73+
}

src/operators/Sample.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ export const sample = curry(function<T>(
106106
(sampler: TSampler, source: TSources): TResult<T>
107107
}
108108
} & {
109-
<T>(selector: TSelector<T>, sampler: TSampler): {
110-
(source: TSources): TResult<T>
111-
}
112-
} & {
113-
<T>(selector: TSelector<T>): {
114-
(sampler: TSampler): {(source: TSources): TResult<T>}
115-
}
109+
<T>(selector: TSelector<T>, sampler: TSampler): {
110+
(source: TSources): TResult<T>
111+
}
112+
} & {
113+
<T>(selector: TSelector<T>): {
114+
(sampler: TSampler): {(source: TSources): TResult<T>}
116115
}
116+
}

src/operators/Scan.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ export const scan = curry(function<T, V>(
5959
(seed: TSeed<R>, source: TSource<T>): TResult<R>
6060
}
6161
} & {
62-
<T, R>(reducer: TReducer<T, R>, seed: TSeed<R>): {
63-
(source: TSource<T>): TResult<R>
64-
}
65-
} & {
66-
<T, R>(reducer: TReducer<T, R>): {
67-
(seed: TSeed<R>): {(source: TSource<T>): TResult<R>}
68-
}
62+
<T, R>(reducer: TReducer<T, R>, seed: TSeed<R>): {
63+
(source: TSource<T>): TResult<R>
6964
}
65+
} & {
66+
<T, R>(reducer: TReducer<T, R>): {
67+
(seed: TSeed<R>): {(source: TSource<T>): TResult<R>}
68+
}
69+
}

src/operators/Slice.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ export const slice = curry(function(
7777
} & {
7878
<T>(start: number): {(count: number, source: IObservable<T>): IObservable<T>}
7979
} & {
80-
<T>(start: number, count: number): {
81-
(source: IObservable<T>): IObservable<T>
82-
}
83-
} & {
84-
<T>(start: number): {
85-
(count: number): {(source: IObservable<T>): IObservable<T>}
86-
}
80+
<T>(start: number, count: number): {
81+
(source: IObservable<T>): IObservable<T>
8782
}
83+
} & {
84+
<T>(start: number): {
85+
(count: number): {(source: IObservable<T>): IObservable<T>}
86+
}
87+
}

0 commit comments

Comments
 (0)