From 1b7f509f1e34875b9e438d884b433dcf9ffa4b4b Mon Sep 17 00:00:00 2001
From: Robert Nagy <ronagy@icloud.com>
Date: Mon, 2 Aug 2021 12:37:40 +0200
Subject: [PATCH] fixup: bodyMixin

---
 lib/internal/streams/readable.js | 105 +++++++++++++++++--------------
 tmp.js                           |  35 +++++++++++
 2 files changed, 92 insertions(+), 48 deletions(-)
 create mode 100644 tmp.js

diff --git a/lib/internal/streams/readable.js b/lib/internal/streams/readable.js
index b1a12708a1fed2..72f382b2a8a93a 100644
--- a/lib/internal/streams/readable.js
+++ b/lib/internal/streams/readable.js
@@ -1138,26 +1138,6 @@ Readable.prototype.iterator = function(options) {
   return streamToAsyncIterator(this, options);
 };
 
-// https://fetch.spec.whatwg.org/#dom-body-text
-Readable.prototype.text = function text() {
-  return consume(this, kTextType);
-};
-
-// https://fetch.spec.whatwg.org/#dom-body-json
-Readable.prototype.json = function json() {
-  return consume(this, kJSONType);
-};
-
-// https://fetch.spec.whatwg.org/#dom-body-blob
-Readable.prototype.blob = function blob() {
-  return consume(this, kBlobType);
-};
-
-// https://fetch.spec.whatwg.org/#dom-body-arraybuffer
-Readable.prototype.arrayBuffer = function arrayBuffer() {
-  return consume(this, kArrayBufferType);
-};
-
 function streamToAsyncIterator(stream, options) {
   if (typeof stream.read !== 'function') {
     // v1 stream
@@ -1325,34 +1305,6 @@ ObjectDefineProperties(Readable.prototype, {
     get() {
       return this._readableState ? this._readableState.endEmitted : false;
     }
-  },
-
-  // https://fetch.spec.whatwg.org/#dom-body-bodyused
-  bodyUsed: {
-    get() {
-      return isDisturbed(this);
-    }
-  },
-
-  // https://fetch.spec.whatwg.org/#dom-body-body
-  body: {
-    get() {
-      // Compat
-      if (this[kHasBody]) {
-        return this[kBody];
-      }
-
-      if (this[kConsume] && this[kConsume].type === kWebStreamType) {
-        return this[kConsume].stream;
-      }
-
-      return consume(this, kWebStreamType);
-    },
-    // Compat
-    set(value) {
-      this[kBody] = value;
-      this[kHasBody] = true;
-    }
   }
 });
 
@@ -1696,6 +1648,63 @@ function endWritableNT(state, stream) {
   }
 }
 
+function bodyMixin(readable) {
+  // https://fetch.spec.whatwg.org/#dom-body-text
+  readable.text = function text() {
+    return consume(this, kTextType);
+  };
+
+  // https://fetch.spec.whatwg.org/#dom-body-json
+  readable.json = function json() {
+    return consume(this, kJSONType);
+  };
+
+  // https://fetch.spec.whatwg.org/#dom-body-blob
+  readable.blob = function blob() {
+    return consume(this, kBlobType);
+  };
+
+  // https://fetch.spec.whatwg.org/#dom-body-arraybuffer
+  readable.arrayBuffer = function arrayBuffer() {
+    return consume(this, kArrayBufferType);
+  };
+
+
+  ObjectDefineProperties(readable, {
+    // https://fetch.spec.whatwg.org/#dom-body-bodyused
+    bodyUsed: {
+      get() {
+        return isDisturbed(this);
+      }
+    },
+
+    // https://fetch.spec.whatwg.org/#dom-body-body
+    body: {
+      get() {
+        // Compat
+        if (this[kHasBody]) {
+          return this[kBody];
+        }
+
+        if (this[kConsume] && this[kConsume].type === kWebStreamType) {
+          return this[kConsume].stream;
+        }
+
+        return consume(this, kWebStreamType);
+      },
+      // Compat
+      set(value) {
+        this[kBody] = value;
+        this[kHasBody] = true;
+      }
+    }
+  });
+
+  return readable;
+}
+
+Readable.bodyMixin = bodyMixin;
+
 Readable.from = function(iterable, opts) {
   return from(Readable, iterable, opts);
 };
diff --git a/tmp.js b/tmp.js
new file mode 100644
index 00000000000000..f0aff4f3b1057c
--- /dev/null
+++ b/tmp.js
@@ -0,0 +1,35 @@
+'use strict';
+const {
+  Transform,
+  Writable,
+  pipeline,
+} = require('stream');
+const assert = require('assert');
+
+function createTransformStream(tf, context) {
+  return new Transform({
+    readableObjectMode: true,
+    writableObjectMode: true,
+
+    transform(chunk, encoding, done) {
+      tf(chunk, context, done);
+    }
+  });
+}
+
+const write = new Writable({
+  write(data, enc, cb) {
+    cb();
+  }
+});
+
+const ts = createTransformStream((chunk, _, done) => {
+  return done(new Error('Artificial error'));
+});
+
+pipeline(ts, write, (err) => {
+  assert.ok(err, 'should have an error');
+  console.log(err);
+});
+
+ts.write('test');