Move stream options code to shared file [refactor]

overlookmotel · Oct 5, 2019 · 790e8c6 · 790e8c6
1 parent 5cf77c5
commit 790e8c6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 18 deletions.
diff --git a/lib/readable.js b/lib/readable.js
@@ -9,7 +9,7 @@
 const {Readable} = require('stream');
 
 // Imports
-const {bufferFromIterator, getBytesOption} = require('./shared'),
+const {bufferFromIterator, getStreamOptions, getBytesOption} = require('./shared'),
 	{ITERATOR, BYTES, MAX_SIZE, OVERFLOW, READING} = require('./symbols');
 
 // Exports
@@ -27,16 +27,8 @@ const {bufferFromIterator, getBytesOption} = require('./shared'),
 module.exports = class GeneratorReadStream extends Readable {
 	constructor(gen, options) {
 		// Call super constructor
-		const streamOptions = {};
-		if (!options) {
-			options = {};
-		} else {
-			for (const opt of ['highWaterMark', 'encoding']) {
-				if (options[opt] != null) streamOptions[opt] = options[opt];
-			}
-		}
-
-		super(streamOptions);
+		if (!options) options = {};
+		super(getStreamOptions(options));
 
 		// Save options
 		this[BYTES] = getBytesOption(options);

diff --git a/lib/shared.js b/lib/shared.js
@@ -9,6 +9,7 @@
 
 module.exports = {
 	bufferFromIterator,
+	getStreamOptions,
 	getBytesOption
 };
 
@@ -76,6 +77,14 @@ function bufferFromIterator(iterator, size, bytes, overflow) {
 	return {buffer, overflow, ended: false};
 }
 
+function getStreamOptions(options) {
+	const streamOptions = {};
+	for (const opt of ['highWaterMark', 'encoding']) {
+		if (options[opt] != null) streamOptions[opt] = options[opt];
+	}
+	return streamOptions;
+}
+
 function getBytesOption(options) {
 	const {bytes} = options;
 	if (bytes == null) return 1;

diff --git a/lib/writable.js b/lib/writable.js
@@ -9,7 +9,7 @@
 const {Writable} = require('stream');
 
 // Imports
-const {bufferFromIterator, getBytesOption} = require('./shared'),
+const {bufferFromIterator, getStreamOptions, getBytesOption} = require('./shared'),
 	{ITERATOR, BYTES, OVERFLOW, CALLBACK, BYTES_READ, ERRORED} = require('./symbols');
 
 // Exports
@@ -21,20 +21,15 @@ const {bufferFromIterator, getBytesOption} = require('./shared'),
 module.exports = class GeneratorWriteStream extends Writable {
 	constructor(gen, options, cb) {
 		// Conform options
-		const streamOptions = {};
 		if (typeof options === 'function') {
 			cb = options;
 			options = {};
 		} else if (!options) {
 			options = {};
-		} else {
-			for (const opt of ['highWaterMark', 'emitClose']) {
-				if (options[opt] != null) streamOptions[opt] = options[opt];
-			}
 		}
 
 		// Call super constructor
-		super(streamOptions);
+		super(getStreamOptions(options));
 
 		// Get bytes option
 		this[BYTES] = getBytesOption(options);