refactor(reader): Fixes based on PR feedback

Author: Walker

lib/reader.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { Readable, PassThrough, Stream } = require('stream');
+const { Readable, PassThrough, Stream } = require('readable-stream');
 const { parse } = require('JSONStream');
 const mergeStream = require('merge-stream');
 const { dedupe, sort, setOrder } = require('./util');

lib/util.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { Transform } = require('stream');
+const { Transform } = require('readable-stream');
 
 function compareByOrder (a, b) {
     if (a.order === b.order) {

package-lock.json

@@ -29,7 +29,8 @@
         "JSONStream": "^1.3.1",
         "asset-pipe-common": "1.0.0-beta.6",
         "asset-pipe-sink-fs": "^1.0.0-beta.9",
-        "merge-stream": "^1.0.1"
+        "merge-stream": "^1.0.1",
+        "readable-stream": "^2.3.3"
     },
     "devDependencies": {
         "eslint": "^4.1.1",

package.json

@@ -6,7 +6,7 @@ const Reader = require('../');
 const SinkFs = require('asset-pipe-sink-fs');
 const path = require('path');
 const { sort, dedupe, compareByOrder } = require('../lib/util');
-const { Readable, PassThrough } = require('stream');
+const { Readable, PassThrough } = require('readable-stream');
 
 function createSlowStream (sink, filePath, timeout = 1000) {
     const myStream = new PassThrough();
@@ -76,7 +76,7 @@ test('Dedupe of identical hashes occurs', done => {
         const bundle = [];
         reader.on('data', data => bundle.push(data.toString()));
         reader.on('end', () => {
-            expect(bundle.length).toBe(1);
+            expect(bundle).toHaveLength(1);
             done();
         });
     });
@@ -216,13 +216,13 @@ test('SortAndDedupe() rows without id value dropped', done => {
         .pipe(dedupe())
         .on('data', data => buffer.push(data))
         .on('end', () => {
-            expect(buffer.length).toBe(2);
+            expect(buffer).toHaveLength(2);
             done();
         });
 });
 
 test('new Reader([s1,s2,s3,s4]) ensure dedupe and correct css concat order', done => {
-    expect.assertions(3);
+    expect.assertions(1);
     const sink = new SinkFs({
         path: path.join(__dirname, './test-assets'),
     });
@@ -237,16 +237,18 @@ test('new Reader([s1,s2,s3,s4]) ensure dedupe and correct css concat order', don
         const bundle = [];
         reader.on('data', data => bundle.push(data.toString()));
         reader.on('end', () => {
-            expect(bundle[0]).toBe('/* my-module-3/main.css */\n\n/* my-module-3/dep.css */\n\n/* dep/main.css */\n');
-            expect(bundle[1]).toBe('/* my-module-2/main.css */\n');
-            expect(bundle[2]).toBe('/* my-module-1/main.css */\n');
+            expect(bundle).toEqual([
+                '/* my-module-3/main.css */\n\n/* my-module-3/dep.css */\n\n/* dep/main.css */\n',
+                '/* my-module-2/main.css */\n',
+                '/* my-module-1/main.css */\n',
+            ]);
             done();
         });
     });
 });
 
 test('new Reader([s1,s2,s3,s4]) operates correctly under slow speed conditions', done => {
-    expect.assertions(3);
+    expect.assertions(1);
     const sink = new SinkFs({
         path: path.join(__dirname, './test-assets'),
     });
@@ -262,9 +264,11 @@ test('new Reader([s1,s2,s3,s4]) operates correctly under slow speed conditions',
         const bundle = [];
         reader.on('data', data => bundle.push(data.toString()));
         reader.on('end', () => {
-            expect(bundle[0]).toBe('/* my-module-3/main.css */\n\n/* my-module-3/dep.css */\n\n/* dep/main.css */\n');
-            expect(bundle[1]).toBe('/* my-module-2/main.css */\n');
-            expect(bundle[2]).toBe('/* my-module-1/main.css */\n');
+            expect(bundle).toEqual([
+                '/* my-module-3/main.css */\n\n/* my-module-3/dep.css */\n\n/* dep/main.css */\n',
+                '/* my-module-2/main.css */\n',
+                '/* my-module-1/main.css */\n',
+            ]);
             done();
         });
     });
@@ -294,7 +298,7 @@ test('sort() transform operating on stream items without order property', done =
         .pipe(sort())
         .on('data', data => buffer.push(data))
         .on('end', () => {
-            expect(buffer.length).toBe(1);
+            expect(buffer).toHaveLength(1);
             done();
         });
 });