vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

s/sync/merge

Browse source
This commit is contained in:
Leo Horie 2016-07-15 00:35:18 -04:00
parent 5f90bde20f
commit a2680b30a4
3 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
util/stream.js
View file

@ -174,12 +174,10 @@ function reject(e) {
return stream
}
function sync (streams) {
function merge(streams) {
return combine(function () {
return Array.prototype.slice
.call(arguments, 0, arguments.length-1)
.map(function (s) { return s() })
return streams.map(function (s) {return s()})
}, streams)
}
module.exports = {stream: createStream, sync: sync, combine: combine, reject: reject, HALT: HALT}
module.exports = {stream: createStream, merge: merge, combine: combine, reject: reject, HALT: HALT}

10
util/tests/test-stream.js
View file

@ -166,20 +166,20 @@ o.spec("stream", function() {
o(b()).equals(undefined)
})
})
o.spec("sync", function() {
o.spec("merge", function() {
o("transforms an array of streams to an array of values", function() {
var all = Stream.sync([
var all = Stream.merge([
Stream.stream(10),
Stream.stream("20"),
Stream.stream({ value: 30 }),
Stream.stream({value: 30}),
])
o(all()).deepEquals([10, "20", { value: 30 }])
o(all()).deepEquals([10, "20", {value: 30}])
})
o("remains pending until all streams are active", function() {
var straggler = Stream.stream()
var all = Stream.sync([
var all = Stream.merge([
Stream.stream(10),
Stream.stream("20"),
straggler,