Skip to content

Commit

Permalink
stream: never flatten on toArray
Browse files Browse the repository at this point in the history
  • Loading branch information
benjamingr committed Jan 20, 2022
1 parent 5a407d6 commit 7caff58
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
4 changes: 0 additions & 4 deletions lib/internal/streams/operators.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
'use strict';

const { AbortController } = require('internal/abort_controller');
const { Buffer } = require('buffer');

const {
codes: {
Expand Down Expand Up @@ -185,9 +184,6 @@ async function toArray(options) {
}
ArrayPrototypePush(result, val);
}
if (!this.readableObjectMode) {
return Buffer.concat(result);
}
return result;
}
module.exports.streamReturningOperators = {
Expand Down
12 changes: 7 additions & 5 deletions test/parallel/test-stream-toArray.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,16 @@ const assert = require('assert');
}

{
// Works on a non-object-mode stream and flattens it
// Works on a non-object-mode stream
(async () => {
const firstBuffer = Buffer.from([1, 2, 3]);
const secondBuffer = Buffer.from([4, 5, 6]);
const stream = Readable.from(
[Buffer.from([1, 2, 3]), Buffer.from([4, 5, 6])]
, { objectMode: false });
[firstBuffer, secondBuffer],
{ objectMode: false });
const result = await stream.toArray();
assert.strictEqual(Buffer.isBuffer(result), true);
assert.deepStrictEqual(Array.from(result), [1, 2, 3, 4, 5, 6]);
assert.strictEqual(Array.isArray(result), true);
assert.deepStrictEqual(result, [firstBuffer, secondBuffer]);
})().then(common.mustCall());
}

Expand Down

0 comments on commit 7caff58

Please sign in to comment.