From 894aaa204011681676f5e6e021695a66c1588297 Mon Sep 17 00:00:00 2001
From: Matteo Collina <hello@matteocollina.com>
Date: Sun, 27 Oct 2019 01:09:03 +0200
Subject: [PATCH] stream: extract Readable.from in its own file

See: https://github.com/nodejs/readable-stream/pull/420

PR-URL: https://github.com/nodejs/node/pull/30140
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
---
 lib/_stream_readable.js      | 39 ++++--------------------------
 lib/internal/streams/from.js | 46 ++++++++++++++++++++++++++++++++++++
 node.gyp                     |  1 +
 3 files changed, 51 insertions(+), 35 deletions(-)
 create mode 100644 lib/internal/streams/from.js

diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
index 88193cd3b76219..52bc5019103ea2 100644
--- a/lib/_stream_readable.js
+++ b/lib/_stream_readable.js
@@ -42,6 +42,7 @@ const {
 // Lazy loaded to improve the startup performance.
 let StringDecoder;
 let createReadableStreamAsyncIterator;
+let from;
 
 util.inherits(Readable, Stream);
 
@@ -1154,40 +1155,8 @@ function endReadableNT(state, stream) {
 }
 
 Readable.from = function(iterable, opts) {
-  let iterator;
-  if (iterable && iterable[Symbol.asyncIterator])
-    iterator = iterable[Symbol.asyncIterator]();
-  else if (iterable && iterable[Symbol.iterator])
-    iterator = iterable[Symbol.iterator]();
-  else
-    throw new ERR_INVALID_ARG_TYPE('iterable', ['Iterable'], iterable);
-
-  const readable = new Readable({
-    objectMode: true,
-    ...opts
-  });
-  // Reading boolean to protect against _read
-  // being called before last iteration completion.
-  let reading = false;
-  readable._read = function() {
-    if (!reading) {
-      reading = true;
-      next();
-    }
-  };
-  async function next() {
-    try {
-      const { value, done } = await iterator.next();
-      if (done) {
-        readable.push(null);
-      } else if (readable.push(await value)) {
-        next();
-      } else {
-        reading = false;
-      }
-    } catch (err) {
-      readable.destroy(err);
-    }
+  if (from === undefined) {
+    from = require('internal/streams/from');
   }
-  return readable;
+  return from(Readable, iterable, opts);
 };
diff --git a/lib/internal/streams/from.js b/lib/internal/streams/from.js
new file mode 100644
index 00000000000000..e809f2658d5a9a
--- /dev/null
+++ b/lib/internal/streams/from.js
@@ -0,0 +1,46 @@
+'use strict';
+
+const {
+  ERR_INVALID_ARG_TYPE
+} = require('internal/errors').codes;
+
+function from(Readable, iterable, opts) {
+  let iterator;
+  if (iterable && iterable[Symbol.asyncIterator])
+    iterator = iterable[Symbol.asyncIterator]();
+  else if (iterable && iterable[Symbol.iterator])
+    iterator = iterable[Symbol.iterator]();
+  else
+    throw new ERR_INVALID_ARG_TYPE('iterable', ['Iterable'], iterable);
+
+  const readable = new Readable({
+    objectMode: true,
+    ...opts
+  });
+  // Reading boolean to protect against _read
+  // being called before last iteration completion.
+  let reading = false;
+  readable._read = function() {
+    if (!reading) {
+      reading = true;
+      next();
+    }
+  };
+  async function next() {
+    try {
+      const { value, done } = await iterator.next();
+      if (done) {
+        readable.push(null);
+      } else if (readable.push(await value)) {
+        next();
+      } else {
+        reading = false;
+      }
+    } catch (err) {
+      readable.destroy(err);
+    }
+  }
+  return readable;
+}
+
+module.exports = from;
diff --git a/node.gyp b/node.gyp
index e50a284b3011f0..dd60ea4a937691 100644
--- a/node.gyp
+++ b/node.gyp
@@ -178,6 +178,7 @@
       'lib/internal/streams/async_iterator.js',
       'lib/internal/streams/buffer_list.js',
       'lib/internal/streams/duplexpair.js',
+      'lib/internal/streams/from.js',
       'lib/internal/streams/legacy.js',
       'lib/internal/streams/destroy.js',
       'lib/internal/streams/state.js',