Skip to content

Commit b1a7ae3

Browse files
aduh95aduh95
committed
stream: refactor unnecessary optional chaining away
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 7828395 commit b1a7ae3

4 files changed

Lines changed: 33 additions & 33 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/transformstream.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ function transformStreamUnblockWrite(stream) {
432432
function transformStreamSetBackpressure(stream, backpressure) {
433433
assert(stream[kState].backpressure !== backpressure);
434434
if (stream[kState].backpressureChange.promise !== undefined)
435-
stream[kState].backpressureChange.resolve?.();
435+
stream[kState].backpressureChange.resolve();
436436
stream[kState].backpressureChange = PromiseWithResolvers();
437437
stream[kState].backpressure = backpressure;
438438
}

‎lib/internal/webstreams/writablestream.js‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ function writableStreamClose(stream) {
744744
stream[kState].closeRequest = PromiseWithResolvers();
745745
const { promise } = stream[kState].closeRequest;
746746
if (writer !== undefined && backpressure && state === 'writable')
747-
writer[kState].ready?.resolve?.();
747+
writer[kState].ready?.resolve();
748748
writableStreamDefaultControllerClose(controller);
749749
return promise;
750750
}
@@ -761,7 +761,7 @@ function writableStreamUpdateBackpressure(stream, backpressure) {
761761
// dropping the cache lets the next observation derive it.
762762
writer[kState].ready = undefined;
763763
} else {
764-
writer[kState].ready?.resolve?.();
764+
writer[kState].ready?.resolve();
765765
}
766766
}
767767
stream[kState].backpressure = backpressure;
@@ -790,14 +790,14 @@ function writableStreamRejectCloseAndClosedPromiseIfNeeded(stream) {
790790
assert(stream[kState].state === 'errored');
791791
if (stream[kState].closeRequest.promise !== undefined) {
792792
assert(stream[kState].inFlightCloseRequest.promise === undefined);
793-
stream[kState].closeRequest.reject?.(stream[kState].storedError);
793+
stream[kState].closeRequest.reject(stream[kState].storedError);
794794
stream[kState].closeRequest = kNilRequest;
795795
}
796796

797797
const closedPromiseCache = stream[kState].closedPromise;
798798
if (closedPromiseCache !== undefined) {
799799
setPromiseHandled(closedPromiseCache.promise);
800-
closedPromiseCache.reject?.(stream[kState].storedError);
800+
closedPromiseCache.reject(stream[kState].storedError);
801801
}
802802

803803
const {
@@ -807,7 +807,7 @@ function writableStreamRejectCloseAndClosedPromiseIfNeeded(stream) {
807807
const closeCache = writer[kState].close;
808808
if (closeCache !== undefined) {
809809
setPromiseHandled(closeCache.promise);
810-
closeCache.reject?.(stream[kState].storedError);
810+
closeCache.reject(stream[kState].storedError);
811811
}
812812
}
813813
}
@@ -840,7 +840,7 @@ function writableStreamHasOperationMarkedInFlight(stream) {
840840

841841
function writableStreamFinishInFlightWriteWithError(stream, error) {
842842
assert(stream[kState].inFlightWriteRequest.promise !== undefined);
843-
stream[kState].inFlightWriteRequest.reject?.(error);
843+
stream[kState].inFlightWriteRequest.reject(error);
844844
stream[kState].inFlightWriteRequest = kNilRequest;
845845
assert(stream[kState].state === 'writable' ||
846846
stream[kState].state === 'erroring');
@@ -849,38 +849,38 @@ function writableStreamFinishInFlightWriteWithError(stream, error) {
849849

850850
function writableStreamFinishInFlightWrite(stream) {
851851
assert(stream[kState].inFlightWriteRequest.promise !== undefined);
852-
stream[kState].inFlightWriteRequest.resolve?.();
852+
stream[kState].inFlightWriteRequest.resolve();
853853
stream[kState].inFlightWriteRequest = kNilRequest;
854854
}
855855

856856
function writableStreamFinishInFlightCloseWithError(stream, error) {
857857
assert(stream[kState].inFlightCloseRequest.promise !== undefined);
858-
stream[kState].inFlightCloseRequest.reject?.(error);
858+
stream[kState].inFlightCloseRequest.reject(error);
859859
stream[kState].inFlightCloseRequest = kNilRequest;
860860
assert(stream[kState].state === 'writable' ||
861861
stream[kState].state === 'erroring');
862862
if (stream[kState].pendingAbortRequest.abort.promise !== undefined) {
863-
stream[kState].pendingAbortRequest.abort.reject?.(error);
863+
stream[kState].pendingAbortRequest.abort.reject(error);
864864
stream[kState].pendingAbortRequest = kNilPendingAbortRequest;
865865
}
866866
writableStreamDealWithRejection(stream, error);
867867
}
868868

869869
function writableStreamFinishInFlightClose(stream) {
870870
assert(stream[kState].inFlightCloseRequest.promise !== undefined);
871-
stream[kState].inFlightCloseRequest.resolve?.();
871+
stream[kState].inFlightCloseRequest.resolve();
872872
stream[kState].inFlightCloseRequest = kNilRequest;
873873
if (stream[kState].state === 'erroring') {
874874
stream[kState].storedError = undefined;
875875
if (stream[kState].pendingAbortRequest.abort.promise !== undefined) {
876-
stream[kState].pendingAbortRequest.abort.resolve?.();
876+
stream[kState].pendingAbortRequest.abort.resolve();
877877
stream[kState].pendingAbortRequest = kNilPendingAbortRequest;
878878
}
879879
}
880880
stream[kState].state = 'closed';
881881
if (stream[kState].writer !== undefined)
882-
stream[kState].writer[kState].close?.resolve?.();
883-
stream[kState].closedPromise?.resolve?.();
882+
stream[kState].writer[kState].close?.resolve();
883+
stream[kState].closedPromise?.resolve();
884884
assert(stream[kState].pendingAbortRequest.abort.promise === undefined);
885885
assert(stream[kState].storedError === undefined);
886886
}
@@ -892,7 +892,7 @@ function writableStreamFinishErroring(stream) {
892892
stream[kState].controller[kError]();
893893
const storedError = stream[kState].storedError;
894894
for (let n = 0; n < stream[kState].writeRequests.length; n++)
895-
stream[kState].writeRequests[n].reject?.(storedError);
895+
stream[kState].writeRequests[n].reject(storedError);
896896
stream[kState].writeRequests = [];
897897

898898
if (stream[kState].pendingAbortRequest.abort.promise === undefined) {
@@ -903,18 +903,18 @@ function writableStreamFinishErroring(stream) {
903903
const abortRequest = stream[kState].pendingAbortRequest;
904904
stream[kState].pendingAbortRequest = kNilPendingAbortRequest;
905905
if (abortRequest.wasAlreadyErroring) {
906-
abortRequest.abort.reject?.(storedError);
906+
abortRequest.abort.reject(storedError);
907907
writableStreamRejectCloseAndClosedPromiseIfNeeded(stream);
908908
return;
909909
}
910910
PromisePrototypeThen(
911911
stream[kState].controller[kAbort](abortRequest.reason),
912912
() => {
913-
abortRequest.abort.resolve?.();
913+
abortRequest.abort.resolve();
914914
writableStreamRejectCloseAndClosedPromiseIfNeeded(stream);
915915
},
916916
(error) => {
917-
abortRequest.abort.reject?.(error);
917+
abortRequest.abort.reject(error);
918918
writableStreamRejectCloseAndClosedPromiseIfNeeded(stream);
919919
});
920920
}
@@ -1019,7 +1019,7 @@ function writableStreamDefaultWriterGetDesiredSize(writer) {
10191019
function writableStreamDefaultWriterEnsureReadyPromiseRejected(writer, error) {
10201020
const ready = writer[kState].ready;
10211021
if (ready !== undefined && isPromisePending(ready.promise)) {
1022-
ready.reject?.(error);
1022+
ready.reject(error);
10231023
setPromiseHandled(ready.promise);
10241024
} else {
10251025
// The spec replaces [[readyPromise]] with a promise rejected with the
@@ -1032,7 +1032,7 @@ function writableStreamDefaultWriterEnsureReadyPromiseRejected(writer, error) {
10321032
function writableStreamDefaultWriterEnsureClosedPromiseRejected(writer, error) {
10331033
const close = writer[kState].close;
10341034
if (close !== undefined && isPromisePending(close.promise)) {
1035-
close.reject?.(error);
1035+
close.reject(error);
10361036
setPromiseHandled(close.promise);
10371037
} else {
10381038
// See writableStreamDefaultWriterEnsureReadyPromiseRejected.

0 commit comments

Comments
 (0)