FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

stream: consolidate non-op algorithm callbacks · nodejs/node@4d29742 · GitHub

/ node Public

Commit 4d29742

Browse files
mcollina
authored and
aduh95
committed
stream: consolidate non-op algorithm callbacks
The start, pull, and write non-op algorithms are all raw callbacks with an identical empty body now, so a single shared nonOpCallback replaces nonOpStart, nonOpPull, and nonOpWrite. Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #65138 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent f7e0c81 commit 4d29742

3 files changed

Lines changed: 19 additions & 25 deletions

File tree

‎lib/internal/webstreams/readablestream.js‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,8 @@ const {
116116
kType,
117117
lazyTransfer,
118118
materializeQueue,
119+
nonOpCallback,
119120
nonOpCancel,
120-
nonOpPull,
121-
nonOpStart,
122121
rejectedHandledRecord,
123122
resetQueue,
124123
resolvedRecord,
@@ -1447,7 +1446,7 @@ function readableStreamFromIterable(iterable) {
14471446
if (iterator === null || (typeof iterator !== 'object' && typeof iterator !== 'function')) {
14481447
throw new ERR_INVALID_STATE.TypeError('The iterator method must return an object');
14491448
}
1450-
const startAlgorithm = nonOpStart;
1449+
const startAlgorithm = nonOpCallback;
14511450

14521451
async function pullAlgorithm() {
14531452
const iterResult = await iterator.next();
@@ -1929,9 +1928,9 @@ function readableStreamDefaultTee(stream, cloneForBranch2) {
19291928
}
19301929

19311930
branch1 =
1932-
createReadableStream(nonOpStart, pullAlgorithm, cancel1Algorithm);
1931+
createReadableStream(nonOpCallback, pullAlgorithm, cancel1Algorithm);
19331932
branch2 =
1934-
createReadableStream(nonOpStart, pullAlgorithm, cancel2Algorithm);
1933+
createReadableStream(nonOpCallback, pullAlgorithm, cancel2Algorithm);
19351934

19361935
PromisePrototypeThen(
19371936
readerClosedPromise(reader).promise,
@@ -2217,9 +2216,9 @@ function readableByteStreamTee(stream) {
22172216
}
22182217

22192218
branch1 =
2220-
createReadableByteStream(nonOpStart, pull1Algorithm, cancel1Algorithm);
2219+
createReadableByteStream(nonOpCallback, pull1Algorithm, cancel1Algorithm);
22212220
branch2 =
2222-
createReadableByteStream(nonOpStart, pull2Algorithm, cancel2Algorithm);
2221+
createReadableByteStream(nonOpCallback, pull2Algorithm, cancel2Algorithm);
22232222

22242223
forwardReaderError(reader);
22252224

@@ -2862,10 +2861,10 @@ function setupReadableStreamDefaultControllerFromSource(
28622861
const cancel = source?.cancel;
28632862
const startAlgorithm = start ?
28642863
FunctionPrototypeBind(start, source, controller) :
2865-
nonOpStart;
2864+
nonOpCallback;
28662865
const pullAlgorithm = pull ?
28672866
createRawCallback1Param('source.pull', pull, source) :
2868-
nonOpPull;
2867+
nonOpCallback;
28692868
const cancelAlgorithm = cancel ?
28702869
createPromiseCallback1Param('source.cancel', cancel, source) :
28712870
nonOpCancel;
@@ -3743,10 +3742,10 @@ function setupReadableByteStreamControllerFromSource(
37433742
const autoAllocateChunkSize = source?.autoAllocateChunkSize;
37443743
const startAlgorithm = start ?
37453744
FunctionPrototypeBind(start, source, controller) :
3746-
nonOpStart;
3745+
nonOpCallback;
37473746
const pullAlgorithm = pull ?
37483747
createRawCallback1Param('source.pull', pull, source) :
3749-
nonOpPull;
3748+
nonOpCallback;
37503749
const cancelAlgorithm = cancel ?
37513750
createPromiseCallback1Param('source.cancel', cancel, source) :
37523751
nonOpCancel;

‎lib/internal/webstreams/util.js‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -418,17 +418,14 @@ function setPromiseHandled(promise) {
418418

419419
async function nonOpFlush() {}
420420

421-
function nonOpStart() {}
422-
423-
// nonOpPull and nonOpWrite are raw callbacks (see createRawCallback*):
424-
// their non-thenable return takes the allocation-free fast path in
421+
// Shared non-op for the start/pull/write algorithm callbacks, which all
422+
// follow the raw-callback contract (see createRawCallback*): the
423+
// non-thenable return takes the allocation-free fast path in
425424
// thenAlgorithmResult().
426-
function nonOpPull() {}
425+
function nonOpCallback() {}
427426

428427
async function nonOpCancel() {}
429428

430-
function nonOpWrite() {}
431-
432429
let transfer;
433430
function lazyTransfer() {
434431
if (transfer === undefined)
@@ -465,11 +462,10 @@ module.exports = {
465462
kType,
466463
lazyTransfer,
467464
materializeQueue,
465+
nonOpCallback,
468466
nonOpCancel,
469467
nonOpFlush,
470-
nonOpPull,
471-
nonOpStart,
472-
nonOpWrite,
468+
473469
peekQueueValue,
474470
rejectedHandledRecord,
475471
resetQueue,

‎lib/internal/webstreams/writablestream.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,8 @@ const {
7070
kState,
7171
kType,
7272
lazyTransfer,
73+
nonOpCallback,
7374
nonOpCancel,
74-
nonOpStart,
75-
nonOpWrite,
7675
peekQueueValue,
7776
rejectedHandledRecord,
7877
resetQueue,
@@ -1336,10 +1335,10 @@ function setupWritableStreamDefaultControllerFromSink(
13361335
const abort = sink?.abort;
13371336
const startAlgorithm = start ?
13381337
FunctionPrototypeBind(start, sink, controller) :
1339-
nonOpStart;
1338+
nonOpCallback;
13401339
const writeAlgorithm = write ?
13411340
createRawCallback2Params('sink.write', write, sink) :
1342-
nonOpWrite;
1341+
nonOpCallback;
13431342
const closeAlgorithm = close ?
13441343
createPromiseCallbackNoParams('sink.close', close, sink) :
13451344
nonOpCancel;

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL