Skip to content

Commit 3ee5f31

Browse files
aduh95aduh95
authored
stream: refactor unnecessary optional chaining away
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com> PR-URL: #64253 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent a006c5d commit 3ee5f31

3 files changed

Lines changed: 32 additions & 32 deletions

File tree

‎lib/internal/webstreams/readablestream.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -848,15 +848,15 @@ class DefaultReadRequest {
848848
}
849849

850850
[kChunk](value) {
851-
this[kState].resolve?.({ done: false, value });
851+
this[kState].resolve({ done: false, value });
852852
}
853853

854854
[kClose]() {
855-
this[kState].resolve?.({ done: true, value: undefined });
855+
this[kState].resolve({ done: true, value: undefined });
856856
}
857857

858858
[kError](error) {
859-
this[kState].reject?.(error);
859+
this[kState].reject(error);
860860
}
861861

862862
get promise() { return this[kState].promise; }
@@ -868,15 +868,15 @@ class ReadIntoRequest {
868868
}
869869

870870
[kChunk](value) {
871-
this[kState].resolve?.({ done: false, value });
871+
this[kState].resolve({ done: false, value });
872872
}
873873

874874
[kClose](value) {
875-
this[kState].resolve?.({ done: true, value });
875+
this[kState].resolve({ done: true, value });
876876
}
877877

878878
[kError](error) {
879-
this[kState].reject?.(error);
879+
this[kState].reject(error);
880880
}
881881

882882
get promise() { return this[kState].promise; }
@@ -2169,15 +2169,15 @@ function readableStreamCancel(stream, reason) {
21692169
function readableStreamClose(stream) {
21702170
assert(stream[kState].state === 'readable');
21712171
stream[kState].state = 'closed';
2172-
stream[kState].closedPromise?.resolve?.();
2172+
stream[kState].closedPromise?.resolve();
21732173
const {
21742174
reader,
21752175
} = stream[kState];
21762176

21772177
if (reader === undefined)
21782178
return;
21792179

2180-
reader[kState].close?.resolve?.();
2180+
reader[kState].close?.resolve();
21812181

21822182
if (readableStreamHasDefaultReader(stream)) {
21832183
for (let n = 0; n < reader[kState].readRequests.length; n++)
@@ -2193,7 +2193,7 @@ function readableStreamError(stream, error) {
21932193
const closedPromiseCache = stream[kState].closedPromise;
21942194
if (closedPromiseCache !== undefined) {
21952195
setPromiseHandled(closedPromiseCache.promise);
2196-
closedPromiseCache.reject?.(error);
2196+
closedPromiseCache.reject(error);
21972197
}
21982198

21992199
const {
@@ -2206,7 +2206,7 @@ function readableStreamError(stream, error) {
22062206
const closeCache = reader[kState].close;
22072207
if (closeCache !== undefined) {
22082208
setPromiseHandled(closeCache.promise);
2209-
closeCache.reject?.(error);
2209+
closeCache.reject(error);
22102210
}
22112211

22122212
if (readableStreamHasDefaultReader(stream)) {
@@ -2400,7 +2400,7 @@ function readableStreamReaderGenericRelease(reader) {
24002400
const closeCache = reader[kState].close;
24012401
if (stream[kState].state === 'readable') {
24022402
if (closeCache !== undefined) {
2403-
closeCache.reject?.(lazyReadableReleasedError());
2403+
closeCache.reject(lazyReadableReleasedError());
24042404
setPromiseHandled(closeCache.promise);
24052405
}
24062406
} else {

‎lib/internal/webstreams/transfer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,15 +192,15 @@ class CrossRealmTransformWritableSink {
192192
switch (type) {
193193
case 'pull':
194194
if (this[kState].backpressurePromise !== undefined)
195-
this[kState].backpressurePromise.resolve?.();
195+
this[kState].backpressurePromise.resolve();
196196
this[kState].backpressurePromise = undefined;
197197
break;
198198
case 'error':
199199
writableStreamDefaultControllerErrorIfNeeded(
200200
this[kState].controller,
201201
value);
202202
if (this[kState].backpressurePromise !== undefined)
203-
this[kState].backpressurePromise.resolve?.();
203+
this[kState].backpressurePromise.resolve();
204204
this[kState].backpressurePromise = undefined;
205205
break;
206206
}

‎lib/internal/webstreams/writablestream.js‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ function writableStreamClose(stream) {
749749
stream[kState].closeQueuedOrInFlight = true;
750750
const { promise } = stream[kState].closeRequest;
751751
if (writer !== undefined && backpressure && state === 'writable')
752-
writer[kState].ready?.resolve?.();
752+
writer[kState].ready?.resolve();
753753
writableStreamDefaultControllerClose(controller);
754754
return promise;
755755
}
@@ -767,7 +767,7 @@ function writableStreamUpdateBackpressure(stream, backpressure) {
767767
// dropping the cache lets the next observation derive it.
768768
writer[kState].ready = undefined;
769769
} else {
770-
writer[kState].ready?.resolve?.();
770+
writer[kState].ready?.resolve();
771771
}
772772
}
773773
streamState.backpressure = backpressure;
@@ -796,15 +796,15 @@ function writableStreamRejectCloseAndClosedPromiseIfNeeded(stream) {
796796
assert(stream[kState].state === 'errored');
797797
if (stream[kState].closeRequest.promise !== undefined) {
798798
assert(stream[kState].inFlightCloseRequest.promise === undefined);
799-
stream[kState].closeRequest.reject?.(stream[kState].storedError);
799+
stream[kState].closeRequest.reject(stream[kState].storedError);
800800
stream[kState].closeRequest = kNilRequest;
801801
stream[kState].closeQueuedOrInFlight = false;
802802
}
803803

804804
const closedPromiseCache = stream[kState].closedPromise;
805805
if (closedPromiseCache !== undefined) {
806806
setPromiseHandled(closedPromiseCache.promise);
807-
closedPromiseCache.reject?.(stream[kState].storedError);
807+
closedPromiseCache.reject(stream[kState].storedError);
808808
}
809809

810810
const {
@@ -814,7 +814,7 @@ function writableStreamRejectCloseAndClosedPromiseIfNeeded(stream) {
814814
const closeCache = writer[kState].close;
815815
if (closeCache !== undefined) {
816816
setPromiseHandled(closeCache.promise);
817-
closeCache.reject?.(stream[kState].storedError);
817+
closeCache.reject(stream[kState].storedError);
818818
}
819819
}
820820
}
@@ -847,7 +847,7 @@ function writableStreamHasOperationMarkedInFlight(stream) {
847847

848848
function writableStreamFinishInFlightWriteWithError(stream, error) {
849849
assert(stream[kState].inFlightWriteRequest.promise !== undefined);
850-
stream[kState].inFlightWriteRequest.reject?.(error);
850+
stream[kState].inFlightWriteRequest.reject(error);
851851
stream[kState].inFlightWriteRequest = kNilRequest;
852852
assert(stream[kState].state === 'writable' ||
853853
stream[kState].state === 'erroring');
@@ -856,40 +856,40 @@ function writableStreamFinishInFlightWriteWithError(stream, error) {
856856

857857
function writableStreamFinishInFlightWrite(stream) {
858858
assert(stream[kState].inFlightWriteRequest.promise !== undefined);
859-
stream[kState].inFlightWriteRequest.resolve?.();
859+
stream[kState].inFlightWriteRequest.resolve();
860860
stream[kState].inFlightWriteRequest = kNilRequest;
861861
}
862862

863863
function writableStreamFinishInFlightCloseWithError(stream, error) {
864864
assert(stream[kState].inFlightCloseRequest.promise !== undefined);
865-
stream[kState].inFlightCloseRequest.reject?.(error);
865+
stream[kState].inFlightCloseRequest.reject(error);
866866
stream[kState].inFlightCloseRequest = kNilRequest;
867867
stream[kState].closeQueuedOrInFlight = false;
868868
assert(stream[kState].state === 'writable' ||
869869
stream[kState].state === 'erroring');
870870
if (stream[kState].pendingAbortRequest.abort.promise !== undefined) {
871-
stream[kState].pendingAbortRequest.abort.reject?.(error);
871+
stream[kState].pendingAbortRequest.abort.reject(error);
872872
stream[kState].pendingAbortRequest = kNilPendingAbortRequest;
873873
}
874874
writableStreamDealWithRejection(stream, error);
875875
}
876876

877877
function writableStreamFinishInFlightClose(stream) {
878878
assert(stream[kState].inFlightCloseRequest.promise !== undefined);
879-
stream[kState].inFlightCloseRequest.resolve?.();
879+
stream[kState].inFlightCloseRequest.resolve();
880880
stream[kState].inFlightCloseRequest = kNilRequest;
881881
stream[kState].closeQueuedOrInFlight = false;
882882
if (stream[kState].state === 'erroring') {
883883
stream[kState].storedError = undefined;
884884
if (stream[kState].pendingAbortRequest.abort.promise !== undefined) {
885-
stream[kState].pendingAbortRequest.abort.resolve?.();
885+
stream[kState].pendingAbortRequest.abort.resolve();
886886
stream[kState].pendingAbortRequest = kNilPendingAbortRequest;
887887
}
888888
}
889889
stream[kState].state = 'closed';
890890
if (stream[kState].writer !== undefined)
891-
stream[kState].writer[kState].close?.resolve?.();
892-
stream[kState].closedPromise?.resolve?.();
891+
stream[kState].writer[kState].close?.resolve();
892+
stream[kState].closedPromise?.resolve();
893893
assert(stream[kState].pendingAbortRequest.abort.promise === undefined);
894894
assert(stream[kState].storedError === undefined);
895895
}
@@ -901,7 +901,7 @@ function writableStreamFinishErroring(stream) {
901901
stream[kState].controller[kError]();
902902
const storedError = stream[kState].storedError;
903903
for (let n = 0; n < stream[kState].writeRequests.length; n++)
904-
stream[kState].writeRequests[n].reject?.(storedError);
904+
stream[kState].writeRequests[n].reject(storedError);
905905
stream[kState].writeRequests = [];
906906

907907
if (stream[kState].pendingAbortRequest.abort.promise === undefined) {
@@ -912,18 +912,18 @@ function writableStreamFinishErroring(stream) {
912912
const abortRequest = stream[kState].pendingAbortRequest;
913913
stream[kState].pendingAbortRequest = kNilPendingAbortRequest;
914914
if (abortRequest.wasAlreadyErroring) {
915-
abortRequest.abort.reject?.(storedError);
915+
abortRequest.abort.reject(storedError);
916916
writableStreamRejectCloseAndClosedPromiseIfNeeded(stream);
917917
return;
918918
}
919919
PromisePrototypeThen(
920920
stream[kState].controller[kAbort](abortRequest.reason),
921921
() => {
922-
abortRequest.abort.resolve?.();
922+
abortRequest.abort.resolve();
923923
writableStreamRejectCloseAndClosedPromiseIfNeeded(stream);
924924
},
925925
(error) => {
926-
abortRequest.abort.reject?.(error);
926+
abortRequest.abort.reject(error);
927927
writableStreamRejectCloseAndClosedPromiseIfNeeded(stream);
928928
});
929929
}
@@ -1024,7 +1024,7 @@ function writableStreamDefaultWriterGetDesiredSize(writer) {
10241024
function writableStreamDefaultWriterEnsureReadyPromiseRejected(writer, error) {
10251025
const ready = writer[kState].ready;
10261026
if (ready !== undefined && isPromisePending(ready.promise)) {
1027-
ready.reject?.(error);
1027+
ready.reject(error);
10281028
setPromiseHandled(ready.promise);
10291029
} else {
10301030
// The spec replaces [[readyPromise]] with a promise rejected with the
@@ -1037,7 +1037,7 @@ function writableStreamDefaultWriterEnsureReadyPromiseRejected(writer, error) {
10371037
function writableStreamDefaultWriterEnsureClosedPromiseRejected(writer, error) {
10381038
const close = writer[kState].close;
10391039
if (close !== undefined && isPromisePending(close.promise)) {
1040-
close.reject?.(error);
1040+
close.reject(error);
10411041
setPromiseHandled(close.promise);
10421042
} else {
10431043
// See writableStreamDefaultWriterEnsureReadyPromiseRejected.

0 commit comments

Comments
 (0)