Skip to content

streams: implement min option for ReadableStreamBYOBReader.read(view) #50888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nodejs-github-bot merged 11 commits into from
Jan 4, 2024
Merged

streams: implement min option for ReadableStreamBYOBReader.read(view) #50888

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
43935ab
test: update streams wpt
MattiasBuelens Nov 22, 2023
a81db63
streams: throw if source/sink/transformer is null
MattiasBuelens Nov 23, 2023
c841ef7
streams: fix incorrectly handled edge case
MattiasBuelens Nov 23, 2023
4573229
streams: implement min option for ReadableStreamBYOBReader.read(view)
MattiasBuelens Nov 23, 2023
bd2ba12
streams: validate object parameters
MattiasBuelens Dec 16, 2023
00cec58
doc: add min option for ReadableStreamBYOBReader.read(view)
MattiasBuelens Dec 31, 2023
1be91a6
doc: fix return type of read() methods in webstreams
MattiasBuelens Dec 31, 2023
4accbf1
test: fix argument validation tests for webstreams
MattiasBuelens Jan 2, 2024
87d5f95
streams: use null proto for default source/sink/transformer
MattiasBuelens Jan 2, 2024
31476c7
streams: add async to ReadableStreamBYOBReader.read()
MattiasBuelens Jan 2, 2024
d36f440
streams: fix typo in docs
MattiasBuelens Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
streams: add async to ReadableStreamBYOBReader.read()
  • Loading branch information
@MattiasBuelens
MattiasBuelens committed Jan 2, 2024
commit 31476c75d5a78a02f65a10db3fe567e18b491e40
43 changes: 19 additions & 24 deletions lib/internal/webstreams/readablestream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,19 +941,19 @@ class ReadableStreamBYOBReader {
* done : boolean,
* }>}
*/
read(view, options = kEmptyObject) {
async read(view, options = kEmptyObject) {
if (!isReadableStreamBYOBReader(this))
return PromiseReject(new ERR_INVALID_THIS('ReadableStreamBYOBReader'));
throw new ERR_INVALID_THIS('ReadableStreamBYOBReader');
if (!isArrayBufferView(view)) {
return PromiseReject(
new ERR_INVALID_ARG_TYPE(
'view',
[
'Buffer',
'TypedArray',
'DataView',
],
view));
throw new ERR_INVALID_ARG_TYPE(
'view',
[
'Buffer',
'TypedArray',
'DataView',
],
view,
);
}
validateObject(options, 'options', kValidateObjectAllowObjectsAndNull);

Expand All @@ -962,35 +962,30 @@ class ReadableStreamBYOBReader {
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);

if (viewByteLength === 0 || viewBufferByteLength === 0) {
return PromiseReject(
new ERR_INVALID_STATE.TypeError(
'View or Viewed ArrayBuffer is zero-length or detached',
),
);
throw new ERR_INVALID_STATE.TypeError(
'View or Viewed ArrayBuffer is zero-length or detached');
}

// Supposed to assert here that the view's buffer is not
// detached, but there's no API available to use to check that.

const min = options?.min ?? 1;
if (typeof min !== 'number')
return PromiseReject(new ERR_INVALID_ARG_TYPE('options.min', 'number', min));
throw new ERR_INVALID_ARG_TYPE('options.min', 'number', min);
if (!NumberIsInteger(min))
return PromiseReject(new ERR_INVALID_ARG_VALUE('options.min', min, 'must be an integer'));
throw new ERR_INVALID_ARG_VALUE('options.min', min, 'must be an integer');
if (min <= 0)
return PromiseReject(new ERR_INVALID_ARG_VALUE('options.min', min, 'must be greater than 0'));
throw new ERR_INVALID_ARG_VALUE('options.min', min, 'must be greater than 0');
if (!isDataView(view)) {
if (min > TypedArrayPrototypeGetLength(view)) {
return PromiseReject(new ERR_OUT_OF_RANGE('options.min', '<= view.length', min));
throw new ERR_OUT_OF_RANGE('options.min', '<= view.length', min);
}
} else if (min > viewByteLength) {
return PromiseReject(new ERR_OUT_OF_RANGE('options.min', '<= view.byteLength', min));
throw new ERR_OUT_OF_RANGE('options.min', '<= view.byteLength', min);
}

if (this[kState].stream === undefined) {
return PromiseReject(
new ERR_INVALID_STATE.TypeError(
'The reader is not attached to a stream'));
throw new ERR_INVALID_STATE.TypeError('The reader is not attached to a stream');
}
const readIntoRequest = new ReadIntoRequest();
readableStreamBYOBReaderRead(this, view, min, readIntoRequest);
Expand Down