style(reader): Fix lint issues

Author: Walker

lib/reader.js

@@ -1,11 +1,13 @@
-const { Readable, PassThrough, Transform, Stream } = require('stream');
-const { stringify, parse } = require('JSONStream');
+'use strict';
+
+const { Readable, PassThrough, Stream } = require('stream');
+const { parse } = require('JSONStream');
 const mergeStream = require('merge-stream');
 const { dedupe, sort, setOrder } = require('./util');
 const assert = require('assert');
 
 module.exports = class Reader extends Readable {
-    constructor(streams) {
+    constructor (streams) {
         super();
 
         assert(
@@ -20,13 +22,10 @@ module.exports = class Reader extends Readable {
 
         assert(
             streams.every(stream => stream instanceof Stream),
-            `Expected any/all arguments given to Reader constructor to be subclasses of Stream.`
+            'Expected any/all arguments given to Reader constructor to be subclasses of Stream.'
         );
 
-        assert(
-            streams.length,
-            `Expected at least one stream to be provided to new Reader(). Got none.`
-        );
+        assert(streams.length, 'Expected at least one stream to be provided to new Reader(). Got none.');
 
         const merged = mergeStream();
 
@@ -74,7 +73,7 @@ module.exports = class Reader extends Readable {
         });
     }
 
-    _read(size) {
+    _read () {
         return this.data.resume();
     }
 };

lib/util.js

@@ -1,28 +1,32 @@
+'use strict';
+
 const { Transform } = require('stream');
 
-function compareByOrder(a, b) {
-    if (a.order === b.order) return 0;
+function compareByOrder (a, b) {
+    if (a.order === b.order) {
+        return 0;
+    }
     return a.order > b.order ? 1 : -1;
 }
 
 class Dedupe extends Transform {
-    constructor() {
+    constructor () {
         super({
-            objectMode: true
+            objectMode: true,
         });
 
         this.rows = new Map();
     }
 
-    _transform(chunk, enc, callback) {
+    _transform (chunk, enc, callback) {
         if (chunk && chunk.id) {
             this.rows.set(chunk.id, chunk);
         }
 
         callback();
     }
 
-    _flush(callback) {
+    _flush (callback) {
         Array.from(this.rows.values())
             .sort(compareByOrder)
             .forEach(row => this.push(row));
@@ -31,37 +35,37 @@ class Dedupe extends Transform {
 }
 
 class SetOrder extends Transform {
-    constructor(index) {
+    constructor (index) {
         super({
-            objectMode: true
+            objectMode: true,
         });
 
         this.index = index;
     }
 
-    _transform(chunk, enc, callback) {
+    _transform (chunk, enc, callback) {
         chunk.order = this.index;
         callback(null, chunk);
     }
 }
 
 class Sort extends Transform {
-    constructor() {
+    constructor () {
         super({
-            objectMode: true
+            objectMode: true,
         });
 
         this.rows = new Map();
     }
 
-    _transform(chunk, enc, callback) {
+    _transform (chunk, enc, callback) {
         if (chunk && chunk.order != null) {
             this.rows.set(chunk.order, chunk);
         }
         callback();
     }
 
-    _flush(callback) {
+    _flush (callback) {
         Array.from(this.rows.values())
             .sort(compareByOrder)
             .forEach(row => this.push(row));
@@ -70,14 +74,14 @@ class Sort extends Transform {
 }
 
 module.exports = {
-    dedupe() {
+    dedupe () {
         return new Dedupe();
     },
-    setOrder(index) {
+    setOrder (index) {
         return new SetOrder(index);
     },
-    sort() {
+    sort () {
         return new Sort();
     },
-    compareByOrder
+    compareByOrder,
 };

package-lock.json

@@ -1,10 +1,14 @@
+'use strict';
+
+/* global test, expect */
+
 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');
 
-function createSlowStream(sink, filePath, timeout = 1000) {
+function createSlowStream (sink, filePath, timeout = 1000) {
     const myStream = new PassThrough();
 
     process.nextTick(() => myStream.emit('file found', filePath));
@@ -19,7 +23,7 @@ function createSlowStream(sink, filePath, timeout = 1000) {
 test('new Reader(stream) single feedStream', done => {
     expect.assertions(1);
     const sink = new SinkFs({
-        path: path.join(__dirname, './test-assets')
+        path: path.join(__dirname, './test-assets'),
     });
     const feedStream = sink.reader('a.json');
 
@@ -38,7 +42,7 @@ test('new Reader(stream) single feedStream', done => {
 test('new Reader([stream1, stream2]) mulitple feedStreams merged', done => {
     expect.assertions(4);
     const sink = new SinkFs({
-        path: path.join(__dirname, './test-assets')
+        path: path.join(__dirname, './test-assets'),
     });
     const feedStream1 = sink.reader('a.json');
     const feedStream2 = sink.reader('b.json');
@@ -61,15 +65,15 @@ test('new Reader([stream1, stream2]) mulitple feedStreams merged', done => {
 test('Dedupe of identical hashes occurs', done => {
     expect.assertions(1);
     const sink = new SinkFs({
-        path: path.join(__dirname, './test-assets')
+        path: path.join(__dirname, './test-assets'),
     });
     const feedStream1 = sink.reader('a.json');
     const feedStream2 = sink.reader('d.json');
 
     const reader = new Reader([feedStream1, feedStream2]);
 
     reader.on('pipeline ready', () => {
-        let bundle = [];
+        const bundle = [];
         reader.on('data', data => bundle.push(data.toString()));
         reader.on('end', () => {
             expect(bundle.length).toBe(1);
@@ -81,7 +85,7 @@ test('Dedupe of identical hashes occurs', done => {
 test('Event: file found', done => {
     expect.assertions(1);
     const sink = new SinkFs({
-        path: path.join(__dirname, './test-assets')
+        path: path.join(__dirname, './test-assets'),
     });
     const feedStream = sink.reader('a.json');
     const reader = new Reader(feedStream);
@@ -97,7 +101,7 @@ test('Event: file found', done => {
 test('Event: file not found single stream', done => {
     expect.assertions(1);
     const sink = new SinkFs({
-        path: path.join(__dirname, './test-assets')
+        path: path.join(__dirname, './test-assets'),
     });
     const feedStream = sink.reader('does-not-exist.json');
     const reader = new Reader(feedStream);
@@ -114,7 +118,7 @@ test('Event: file not found single stream', done => {
 test('Event: file not found multiple streams', done => {
     expect.assertions(2);
     const sink = new SinkFs({
-        path: path.join(__dirname, './test-assets')
+        path: path.join(__dirname, './test-assets'),
     });
     const feedStream1 = sink.reader('a.json');
     const feedStream2 = sink.reader('does-not-exist.json');
@@ -135,7 +139,7 @@ test('Event: file not found multiple streams', done => {
 test('Event: parse error', done => {
     expect.assertions(1);
     const sink = new SinkFs({
-        path: path.join(__dirname, './test-assets')
+        path: path.join(__dirname, './test-assets'),
     });
     const feedStream = sink.reader('invalid-json.json');
     const reader = new Reader(feedStream);
@@ -180,14 +184,14 @@ test('SortAndDedupe() rows without id value dropped', done => {
     const values = [{ id: 'asd' }, { x: '' }, { id: 'sdf' }];
     const stream = new Readable({
         objectMode: true,
-        read() {
+        read () {
             if (values.length === 0) {
                 this.push(null);
                 return;
             }
             const value = values.shift();
             this.push(value);
-        }
+        },
     });
     const buffer = [];
     stream
@@ -202,27 +206,20 @@ test('SortAndDedupe() rows without id value dropped', done => {
 test('new Reader([s1,s2,s3,s4]) ensure dedupe and correct css concat order', done => {
     expect.assertions(3);
     const sink = new SinkFs({
-        path: path.join(__dirname, './test-assets')
+        path: path.join(__dirname, './test-assets'),
     });
     const feedStream1 = sink.reader('a.json');
     const feedStream2 = sink.reader('b.json');
     const feedStream3 = sink.reader('c.json');
     const feedStream4 = sink.reader('d.json');
 
-    const reader = new Reader([
-        feedStream1,
-        feedStream2,
-        feedStream3,
-        feedStream4
-    ]);
+    const reader = new Reader([feedStream1, feedStream2, feedStream3, feedStream4]);
 
     reader.on('pipeline ready', () => {
-        let bundle = [];
+        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[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');
             done();
@@ -233,28 +230,21 @@ test('new Reader([s1,s2,s3,s4]) ensure dedupe and correct css concat order', don
 test('new Reader([s1,s2,s3,s4]) operates correctly under slow speed conditions', done => {
     expect.assertions(3);
     const sink = new SinkFs({
-        path: path.join(__dirname, './test-assets')
+        path: path.join(__dirname, './test-assets'),
     });
 
     const feedStream1 = createSlowStream(sink, 'a.json', 800);
     const feedStream2 = sink.reader('b.json');
     const feedStream3 = createSlowStream(sink, 'c.json', 500);
     const feedStream4 = createSlowStream(sink, 'd.json', 100);
 
-    const reader = new Reader([
-        feedStream1,
-        feedStream2,
-        feedStream3,
-        feedStream4
-    ]);
+    const reader = new Reader([feedStream1, feedStream2, feedStream3, feedStream4]);
 
     reader.on('pipeline ready', () => {
-        let bundle = [];
+        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[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');
             done();
@@ -269,21 +259,16 @@ test('compareByOrder(a, b) a and b are the same', () => {
 
 test('sort() transform operating on stream items without order property', done => {
     expect.assertions(1);
-    const items = [
-        { order: 1 },
-        { order: null },
-        { order: undefined },
-        { noOrder: 'hi' }
-    ];
+    const items = [{ order: 1 }, { order: null }, { order: undefined }, { noOrder: 'hi' }];
     const stream = new Readable({
         objectMode: true,
-        read() {
+        read () {
             if (!items.length) {
                 this.push(null);
                 return;
             }
             this.push(items.shift());
-        }
+        },
     });
 
     const buffer = [];