Updated tests.

tests/test_FromIterable.js

@@ -2,10 +2,10 @@
 
 const unit = require('heya-unit');
 
-const Chain = require('../index');
+const Chain = require('../src/index');
 const {streamToArray, delay} = require('./helpers');
 
-const {fromIterable} = require('../utils/FromIterable');
+const {fromIterable} = require('../src/utils/FromIterable');
 
 unit.add(module, [
   function test_FromIterable(t) {

tests/test_demo.js

@@ -2,10 +2,11 @@
 
 const unit = require('heya-unit');
 
-const Chain = require('../index');
-const {fromIterable} = require('../utils/FromIterable');
 const {Transform} = require('stream');
 
+const Chain = require('../src/index');
+const {fromIterable} = require('../src/utils/FromIterable');
+
 unit.add(module, [
   function test_demo(t) {
     const async = t.startAsync('test_demo');

tests/test_errors.js

@@ -2,7 +2,7 @@
 
 const unit = require('heya-unit');
 
-const Chain = require('../index');
+const Chain = require('../src/index');
 
 unit.add(module, [
   function test_errorsNoStreams(t) {

tests/test_fold.js

@@ -2,20 +2,27 @@
 
 const unit = require('heya-unit');
 
-const Chain = require('../index');
 const {streamToArray, delay} = require('./helpers');
+const Chain = require('../src/index');
 
-const {fromIterable} = require('../utils/FromIterable');
-const fold = require('../utils/fold');
-const scan = require('../utils/scan');
-const {reduce} = require('../utils/Reduce');
+const {fromIterable} = require('../src/utils/FromIterable');
+const fold = require('../src/utils/fold');
+const scan = require('../src/utils/scan');
+const reduce = require('../src/utils/reduce');
+const {reduceStream} = require('../src/utils/ReduceStream');
+
+const {asStream} = Chain;
 
 unit.add(module, [
   function test_fold(t) {
     const async = t.startAsync('test_fold');
 
     const output = [],
-      chain = new Chain([fromIterable([1, 2, 3]), fold((acc, x) => acc + x, 0), streamToArray(output)]);
+      chain = new Chain([
+        fromIterable([1, 2, 3]),
+        fold((acc, x) => acc + x, 0),
+        streamToArray(output)
+      ]);
 
     chain.on('end', () => {
       eval(t.TEST('t.unify(output, [6])'));
@@ -26,7 +33,14 @@ unit.add(module, [
     const async = t.startAsync('test_foldAsync');
 
     const output = [],
-      chain = new Chain([fromIterable([1, 2, 3]), fold(delay((acc, x) => acc + x), 0), streamToArray(output)]);
+      chain = new Chain([
+        fromIterable([1, 2, 3]),
+        fold(
+          delay((acc, x) => acc + x),
+          0
+        ),
+        streamToArray(output)
+      ]);
 
     chain.on('end', () => {
       eval(t.TEST('t.unify(output, [6])'));
@@ -37,7 +51,11 @@ unit.add(module, [
     const async = t.startAsync('test_foldScan');
 
     const output = [],
-      chain = new Chain([fromIterable([1, 2, 3]), scan((acc, x) => acc + x, 0), streamToArray(output)]);
+      chain = new Chain([
+        fromIterable([1, 2, 3]),
+        scan((acc, x) => acc + x, 0),
+        streamToArray(output)
+      ]);
 
     chain.on('end', () => {
       eval(t.TEST('t.unify(output, [1, 3, 6])'));
@@ -48,7 +66,14 @@ unit.add(module, [
     const async = t.startAsync('test_foldScanAsync');
 
     const output = [],
-      chain = new Chain([fromIterable([1, 2, 3]), scan(delay((acc, x) => acc + x), 0), streamToArray(output)]);
+      chain = new Chain([
+        fromIterable([1, 2, 3]),
+        scan(
+          delay((acc, x) => acc + x),
+          0
+        ),
+        streamToArray(output)
+      ]);
 
     chain.on('end', () => {
       eval(t.TEST('t.unify(output, [1, 3, 6])'));
@@ -58,7 +83,40 @@ unit.add(module, [
   function test_foldReduce(t) {
     const async = t.startAsync('test_foldReduce');
 
-    const r = reduce((acc, x) => acc + x, 0);
+    const output = [],
+      chain = new Chain([
+        fromIterable([1, 2, 3]),
+        fold((acc, x) => acc + x, 0),
+        streamToArray(output)
+      ]);
+
+    chain.on('end', () => {
+      eval(t.TEST('t.unify(output, [6])'));
+      async.done();
+    });
+  },
+  function test_foldReduceAsync(t) {
+    const async = t.startAsync('test_foldReduceAsync');
+
+    const output = [],
+      chain = new Chain([
+        fromIterable([1, 2, 3]),
+        reduce(
+          delay((acc, x) => acc + x),
+          0
+        ),
+        streamToArray(output)
+      ]);
+
+    chain.on('end', () => {
+      eval(t.TEST('t.unify(output, [6])'));
+      async.done();
+    });
+  },
+  function test_foldReduceStream(t) {
+    const async = t.startAsync('test_foldReduceStream');
+
+    const r = reduceStream((acc, x) => acc + x, 0);
 
     fromIterable([1, 2, 3]).pipe(r);
 
@@ -67,10 +125,10 @@ unit.add(module, [
       async.done();
     });
   },
-  function test_foldReduceAsync(t) {
-    const async = t.startAsync('test_foldReduceAsync');
+  function test_foldReduceStreamAsync(t) {
+    const async = t.startAsync('test_foldReduceStreamAsync');
 
-    const r = reduce({reducer: delay((acc, x) => acc + x), initial: 0});
+    const r = reduceStream({reducer: delay((acc, x) => acc + x), initial: 0});
 
     fromIterable([1, 2, 3]).pipe(r);
 

tests/test_gen.js

@@ -2,10 +2,9 @@
 
 const unit = require('heya-unit');
 
-const Chain = require('../index');
 const {streamToArray, delay} = require('./helpers');
-
-const {fromIterable} = require('../utils/FromIterable');
+const Chain = require('../src/index');
+const {fromIterable} = require('../src/utils/FromIterable');
 
 const {none, finalValue, many, gen} = Chain;
 

tests/test_readWrite.js

@@ -2,9 +2,9 @@
 
 const unit = require('heya-unit');
 
-const Chain = require('../index');
 const {streamToArray} = require('./helpers');
-const {fromIterable} = require('../utils/FromIterable');
+const Chain = require('../src/index');
+const {fromIterable} = require('../src/utils/FromIterable');
 
 unit.add(module, [
   function test_readWriteReadable(t) {

tests/test_simple.js

@@ -2,10 +2,10 @@
 
 const unit = require('heya-unit');
 
-const Chain = require('../index');
-const {streamToArray, delay} = require('./helpers');
-const {fromIterable} = require('../utils/FromIterable');
 const {Transform} = require('stream');
+const {streamToArray, delay} = require('./helpers');
+const Chain = require('../src/index');
+const {fromIterable} = require('../src/utils/FromIterable');
 
 unit.add(module, [
   function test_simpleGeneric(t) {

tests/test_skip.js

@@ -2,12 +2,12 @@
 
 const unit = require('heya-unit');
 
-const Chain = require('../index');
 const {streamToArray, delay} = require('./helpers');
+const Chain = require('../src/index');
 
-const {fromIterable} = require('../utils/FromIterable');
-const skip = require('../utils/skip');
-const skipWhile = require('../utils/skipWhile');
+const {fromIterable} = require('../src/utils/FromIterable');
+const skip = require('../src/utils/skip');
+const skipWhile = require('../src/utils/skipWhile');
 
 unit.add(module, [
   function test_skip(t) {

tests/test_take.js

@@ -2,12 +2,13 @@
 
 const unit = require('heya-unit');
 
-const Chain = require('../index');
 const {streamToArray, delay} = require('./helpers');
+const Chain = require('../src/index');
 
-const {fromIterable} = require('../utils/FromIterable');
-const take = require('../utils/take');
-const takeWhile = require('../utils/takeWhile');
+const {fromIterable} = require('../src/utils/FromIterable');
+const take = require('../src/utils/take');
+const takeWhile = require('../src/utils/takeWhile');
+const takeWithSkip = require('../src/utils/takeWithSkip');
 
 unit.add(module, [
   function test_take(t) {
@@ -25,7 +26,7 @@ unit.add(module, [
     const async = t.startAsync('test_takeWithSkip');
 
     const output = [],
-      chain = new Chain([fromIterable([1, 2, 3, 4, 5]), take({n: 2, skip: 2}), streamToArray(output)]);
+      chain = new Chain([fromIterable([1, 2, 3, 4, 5]), takeWithSkip(2, 2), streamToArray(output)]);
 
     chain.on('end', () => {
       eval(t.TEST('t.unify(output, [3, 4])'));

tests/test_transducers.js

@@ -2,10 +2,11 @@
 
 const unit = require('heya-unit');
 
-const Chain = require('../index');
-const gen = require('../gen');
 const {streamToArray} = require('./helpers');
-const {fromIterable} = require('../utils/FromIterable');
+const Chain = require('../src/index');
+const {fromIterable} = require('../src/utils/FromIterable');
+
+const {gen} = Chain;
 
 unit.add(module, [
   function test_transducers(t) {