From abb7c4a824c747b9337f93f500d8f30fa4372c54 Mon Sep 17 00:00:00 2001 From: Raz Luvaton <16746759+rluvaton@users.noreply.github.com> Date: Wed, 5 Apr 2023 03:28:17 +0300 Subject: [PATCH] stream: preserve object mode in compose fix #46829 --- lib/internal/streams/compose.js | 2 +- test/parallel/test-stream-compose.js | 74 ++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/lib/internal/streams/compose.js b/lib/internal/streams/compose.js index 16dc10ad69643e..22f010b9834385 100644 --- a/lib/internal/streams/compose.js +++ b/lib/internal/streams/compose.js @@ -115,7 +115,7 @@ module.exports = function compose(...streams) { d = new Duplex({ // TODO (ronag): highWaterMark? writableObjectMode: !!head?.writableObjectMode, - readableObjectMode: !!tail?.writableObjectMode, + readableObjectMode: !!tail?.readableObjectMode, writable, readable, }); diff --git a/test/parallel/test-stream-compose.js b/test/parallel/test-stream-compose.js index f132ae6bb043f2..cba7f9519d87eb 100644 --- a/test/parallel/test-stream-compose.js +++ b/test/parallel/test-stream-compose.js @@ -420,3 +420,77 @@ const assert = require('assert'); assert.strictEqual(buf, 'HELLOWORLD'); })); } + +{ + // In the new stream than should use the writeable of the first stream and readable of the last stream + // #46829 + (async () => { + const newStream = compose( + new PassThrough({ + // reading FROM you in object mode or not + readableObjectMode: false, + + // writing TO you in object mode or not + writableObjectMode: false, + }), + new Transform({ + // reading FROM you in object mode or not + readableObjectMode: true, + + // writing TO you in object mode or not + writableObjectMode: false, + transform: (chunk, encoding, callback) => { + callback(null, { + value: chunk.toString() + }); + } + }) + ); + + assert.strictEqual(newStream.writableObjectMode, false); + assert.strictEqual(newStream.readableObjectMode, true); + + newStream.write('Steve Rogers'); + newStream.write('On your left'); + + newStream.end(); + + assert.deepStrictEqual(await newStream.toArray(), [{ value: 'Steve Rogers' }, { value: 'On your left' }]); + })().then(common.mustCall()); +} + +{ + // In the new stream than should use the writeable of the first stream and readable of the last stream + // #46829 + (async () => { + const newStream = compose( + new PassThrough({ + // reading FROM you in object mode or not + readableObjectMode: true, + + // writing TO you in object mode or not + writableObjectMode: true, + }), + new Transform({ + // reading FROM you in object mode or not + readableObjectMode: false, + + // writing TO you in object mode or not + writableObjectMode: true, + transform: (chunk, encoding, callback) => { + callback(null, chunk.value); + } + }) + ); + + assert.strictEqual(newStream.writableObjectMode, true); + assert.strictEqual(newStream.readableObjectMode, false); + + newStream.write({ value: 'Steve Rogers' }); + newStream.write({ value: 'On your left' }); + + newStream.end(); + + assert.deepStrictEqual(await newStream.toArray(), [Buffer.from('Steve RogersOn your left')]); + })().then(common.mustCall()); +}