Commit ac5e5d5

Browse files
committed
stream: refactor unnecessary optional chaining away
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com> PR-URL: #64253 Backport-PR-URL: #64675 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 cb298cf commit ac5e5d5

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
@@ -844,15 +844,15 @@ class DefaultReadRequest {
844844
}
845845

846846
[kChunk](value){
847-
this[kState].resolve?.({ value,done: false});
847+
this[kState].resolve({ value,done: false});
848848
}
849849

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

854854
[kError](error){
855-
this[kState].reject?.(error);
855+
this[kState].reject(error);
856856
}
857857

858858
getpromise(){returnthis[kState].promise;}
@@ -864,15 +864,15 @@ class ReadIntoRequest {
864864
}
865865

866866
[kChunk](value){
867-
this[kState].resolve?.({ value,done: false});
867+
this[kState].resolve({ value,done: false});
868868
}
869869

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

874874
[kError](error){
875-
this[kState].reject?.(error);
875+
this[kState].reject(error);
876876
}
877877

878878
getpromise(){returnthis[kState].promise;}
@@ -2165,15 +2165,15 @@ function readableStreamCancel(stream, reason) {
21652165
functionreadableStreamClose(stream){
21662166
assert(stream[kState].state==='readable');
21672167
stream[kState].state='closed';
2168-
stream[kState].closedPromise?.resolve?.();
2168+
stream[kState].closedPromise?.resolve();
21692169
const{
21702170
reader,
21712171
}=stream[kState];
21722172

21732173
if(reader===undefined)
21742174
return;
21752175

2176-
reader[kState].close?.resolve?.();
2176+
reader[kState].close?.resolve();
21772177

21782178
if(readableStreamHasDefaultReader(stream)){
21792179
for(letn=0;n<reader[kState].readRequests.length;n++)
@@ -2189,7 +2189,7 @@ function readableStreamError(stream, error) {
21892189
constclosedPromiseCache=stream[kState].closedPromise;
21902190
if(closedPromiseCache!==undefined){
21912191
setPromiseHandled(closedPromiseCache.promise);
2192-
closedPromiseCache.reject?.(error);
2192+
closedPromiseCache.reject(error);
21932193
}
21942194

21952195
const{
@@ -2202,7 +2202,7 @@ function readableStreamError(stream, error) {
22022202
constcloseCache=reader[kState].close;
22032203
if(closeCache!==undefined){
22042204
setPromiseHandled(closeCache.promise);
2205-
closeCache.reject?.(error);
2205+
closeCache.reject(error);
22062206
}
22072207

22082208
if(readableStreamHasDefaultReader(stream)){
@@ -2396,7 +2396,7 @@ function readableStreamReaderGenericRelease(reader) {
23962396
constcloseCache=reader[kState].close;
23972397
if(stream[kState].state==='readable'){
23982398
if(closeCache!==undefined){
2399-
closeCache.reject?.(lazyReadableReleasedError());
2399+
closeCache.reject(lazyReadableReleasedError());
24002400
setPromiseHandled(closeCache.promise);
24012401
}
24022402
}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
returnpromise;
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
constclosedPromiseCache=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
constcloseCache=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
functionwritableStreamFinishInFlightWriteWithError(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
functionwritableStreamFinishInFlightWrite(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
functionwritableStreamFinishInFlightCloseWithError(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
functionwritableStreamFinishInFlightClose(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
conststoredError=stream[kState].storedError;
903903
for(letn=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
constabortRequest=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
functionwritableStreamDefaultWriterEnsureReadyPromiseRejected(writer,error){
10251025
constready=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
functionwritableStreamDefaultWriterEnsureClosedPromiseRejected(writer,error){
10381038
constclose=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Commit ac5e5d5

Browse files
committed
stream: refactor unnecessary optional chaining away
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com> PR-URL: #64253 Backport-PR-URL: #64675 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 cb298cf commit ac5e5d5

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
@@ -844,15 +844,15 @@ class DefaultReadRequest {
844844
}
845845

846846
[kChunk](value){
847-
this[kState].resolve?.({ value,done: false});
847+
this[kState].resolve({ value,done: false});
848848
}
849849

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

854854
[kError](error){
855-
this[kState].reject?.(error);
855+
this[kState].reject(error);
856856
}
857857

858858
getpromise(){returnthis[kState].promise;}
@@ -864,15 +864,15 @@ class ReadIntoRequest {
864864
}
865865

866866
[kChunk](value){
867-
this[kState].resolve?.({ value,done: false});
867+
this[kState].resolve({ value,done: false});
868868
}
869869

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

874874
[kError](error){
875-
this[kState].reject?.(error);
875+
this[kState].reject(error);
876876
}
877877

878878
getpromise(){returnthis[kState].promise;}
@@ -2165,15 +2165,15 @@ function readableStreamCancel(stream, reason) {
21652165
functionreadableStreamClose(stream){
21662166
assert(stream[kState].state==='readable');
21672167
stream[kState].state='closed';
2168-
stream[kState].closedPromise?.resolve?.();
2168+
stream[kState].closedPromise?.resolve();
21692169
const{
21702170
reader,
21712171
}=stream[kState];
21722172

21732173
if(reader===undefined)
21742174
return;
21752175

2176-
reader[kState].close?.resolve?.();
2176+
reader[kState].close?.resolve();
21772177

21782178
if(readableStreamHasDefaultReader(stream)){
21792179
for(letn=0;n<reader[kState].readRequests.length;n++)
@@ -2189,7 +2189,7 @@ function readableStreamError(stream, error) {
21892189
constclosedPromiseCache=stream[kState].closedPromise;
21902190
if(closedPromiseCache!==undefined){
21912191
setPromiseHandled(closedPromiseCache.promise);
2192-
closedPromiseCache.reject?.(error);
2192+
closedPromiseCache.reject(error);
21932193
}
21942194

21952195
const{
@@ -2202,7 +2202,7 @@ function readableStreamError(stream, error) {
22022202
constcloseCache=reader[kState].close;
22032203
if(closeCache!==undefined){
22042204
setPromiseHandled(closeCache.promise);
2205-
closeCache.reject?.(error);
2205+
closeCache.reject(error);
22062206
}
22072207

22082208
if(readableStreamHasDefaultReader(stream)){
@@ -2396,7 +2396,7 @@ function readableStreamReaderGenericRelease(reader) {
23962396
constcloseCache=reader[kState].close;
23972397
if(stream[kState].state==='readable'){
23982398
if(closeCache!==undefined){
2399-
closeCache.reject?.(lazyReadableReleasedError());
2399+
closeCache.reject(lazyReadableReleasedError());
24002400
setPromiseHandled(closeCache.promise);
24012401
}
24022402
}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
returnpromise;
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
constclosedPromiseCache=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
constcloseCache=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
functionwritableStreamFinishInFlightWriteWithError(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
functionwritableStreamFinishInFlightWrite(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
functionwritableStreamFinishInFlightCloseWithError(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
functionwritableStreamFinishInFlightClose(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
conststoredError=stream[kState].storedError;
903903
for(letn=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
constabortRequest=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
functionwritableStreamDefaultWriterEnsureReadyPromiseRejected(writer,error){
10251025
constready=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
functionwritableStreamDefaultWriterEnsureClosedPromiseRejected(writer,error){
10381038
constclose=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit ac5e5d5

Browse files
committed
stream: refactor unnecessary optional chaining away
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com> PR-URL: #64253 Backport-PR-URL: #64675 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 cb298cf commit ac5e5d5

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
@@ -844,15 +844,15 @@ class DefaultReadRequest {
844844
}
845845

846846
[kChunk](value){
847-
this[kState].resolve?.({ value,done: false});
847+
this[kState].resolve({ value,done: false});
848848
}
849849

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

854854
[kError](error){
855-
this[kState].reject?.(error);
855+
this[kState].reject(error);
856856
}
857857

858858
getpromise(){returnthis[kState].promise;}
@@ -864,15 +864,15 @@ class ReadIntoRequest {
864864
}
865865

866866
[kChunk](value){
867-
this[kState].resolve?.({ value,done: false});
867+
this[kState].resolve({ value,done: false});
868868
}
869869

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

874874
[kError](error){
875-
this[kState].reject?.(error);
875+
this[kState].reject(error);
876876
}
877877

878878
getpromise(){returnthis[kState].promise;}
@@ -2165,15 +2165,15 @@ function readableStreamCancel(stream, reason) {
21652165
functionreadableStreamClose(stream){
21662166
assert(stream[kState].state==='readable');
21672167
stream[kState].state='closed';
2168-
stream[kState].closedPromise?.resolve?.();
2168+
stream[kState].closedPromise?.resolve();
21692169
const{
21702170
reader,
21712171
}=stream[kState];
21722172

21732173
if(reader===undefined)
21742174
return;
21752175

2176-
reader[kState].close?.resolve?.();
2176+
reader[kState].close?.resolve();
21772177

21782178
if(readableStreamHasDefaultReader(stream)){
21792179
for(letn=0;n<reader[kState].readRequests.length;n++)
@@ -2189,7 +2189,7 @@ function readableStreamError(stream, error) {
21892189
constclosedPromiseCache=stream[kState].closedPromise;
21902190
if(closedPromiseCache!==undefined){
21912191
setPromiseHandled(closedPromiseCache.promise);
2192-
closedPromiseCache.reject?.(error);
2192+
closedPromiseCache.reject(error);
21932193
}
21942194

21952195
const{
@@ -2202,7 +2202,7 @@ function readableStreamError(stream, error) {
22022202
constcloseCache=reader[kState].close;
22032203
if(closeCache!==undefined){
22042204
setPromiseHandled(closeCache.promise);
2205-
closeCache.reject?.(error);
2205+
closeCache.reject(error);
22062206
}
22072207

22082208
if(readableStreamHasDefaultReader(stream)){
@@ -2396,7 +2396,7 @@ function readableStreamReaderGenericRelease(reader) {
23962396
constcloseCache=reader[kState].close;
23972397
if(stream[kState].state==='readable'){
23982398
if(closeCache!==undefined){
2399-
closeCache.reject?.(lazyReadableReleasedError());
2399+
closeCache.reject(lazyReadableReleasedError());
24002400
setPromiseHandled(closeCache.promise);
24012401
}
24022402
}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
returnpromise;
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
constclosedPromiseCache=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
constcloseCache=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
functionwritableStreamFinishInFlightWriteWithError(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
functionwritableStreamFinishInFlightWrite(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
functionwritableStreamFinishInFlightCloseWithError(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
functionwritableStreamFinishInFlightClose(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
conststoredError=stream[kState].storedError;
903903
for(letn=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
constabortRequest=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
functionwritableStreamDefaultWriterEnsureReadyPromiseRejected(writer,error){
10251025
constready=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
functionwritableStreamDefaultWriterEnsureClosedPromiseRejected(writer,error){
10381038
constclose=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit ac5e5d5

Browse files
committed
stream: refactor unnecessary optional chaining away
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com> PR-URL: #64253 Backport-PR-URL: #64675 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 cb298cf commit ac5e5d5

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
@@ -844,15 +844,15 @@ class DefaultReadRequest {
844844
}
845845

846846
[kChunk](value){
847-
this[kState].resolve?.({ value,done: false});
847+
this[kState].resolve({ value,done: false});
848848
}
849849

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

854854
[kError](error){
855-
this[kState].reject?.(error);
855+
this[kState].reject(error);
856856
}
857857

858858
getpromise(){returnthis[kState].promise;}
@@ -864,15 +864,15 @@ class ReadIntoRequest {
864864
}
865865

866866
[kChunk](value){
867-
this[kState].resolve?.({ value,done: false});
867+
this[kState].resolve({ value,done: false});
868868
}
869869

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

874874
[kError](error){
875-
this[kState].reject?.(error);
875+
this[kState].reject(error);
876876
}
877877

878878
getpromise(){returnthis[kState].promise;}
@@ -2165,15 +2165,15 @@ function readableStreamCancel(stream, reason) {
21652165
functionreadableStreamClose(stream){
21662166
assert(stream[kState].state==='readable');
21672167
stream[kState].state='closed';
2168-
stream[kState].closedPromise?.resolve?.();
2168+
stream[kState].closedPromise?.resolve();
21692169
const{
21702170
reader,
21712171
}=stream[kState];
21722172

21732173
if(reader===undefined)
21742174
return;
21752175

2176-
reader[kState].close?.resolve?.();
2176+
reader[kState].close?.resolve();
21772177

21782178
if(readableStreamHasDefaultReader(stream)){
21792179
for(letn=0;n<reader[kState].readRequests.length;n++)
@@ -2189,7 +2189,7 @@ function readableStreamError(stream, error) {
21892189
constclosedPromiseCache=stream[kState].closedPromise;
21902190
if(closedPromiseCache!==undefined){
21912191
setPromiseHandled(closedPromiseCache.promise);
2192-
closedPromiseCache.reject?.(error);
2192+
closedPromiseCache.reject(error);
21932193
}
21942194

21952195
const{
@@ -2202,7 +2202,7 @@ function readableStreamError(stream, error) {
22022202
constcloseCache=reader[kState].close;
22032203
if(closeCache!==undefined){
22042204
setPromiseHandled(closeCache.promise);
2205-
closeCache.reject?.(error);
2205+
closeCache.reject(error);
22062206
}
22072207

22082208
if(readableStreamHasDefaultReader(stream)){
@@ -2396,7 +2396,7 @@ function readableStreamReaderGenericRelease(reader) {
23962396
constcloseCache=reader[kState].close;
23972397
if(stream[kState].state==='readable'){
23982398
if(closeCache!==undefined){
2399-
closeCache.reject?.(lazyReadableReleasedError());
2399+
closeCache.reject(lazyReadableReleasedError());
24002400
setPromiseHandled(closeCache.promise);
24012401
}
24022402
}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
returnpromise;
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
constclosedPromiseCache=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
constcloseCache=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
functionwritableStreamFinishInFlightWriteWithError(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
functionwritableStreamFinishInFlightWrite(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
functionwritableStreamFinishInFlightCloseWithError(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
functionwritableStreamFinishInFlightClose(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
conststoredError=stream[kState].storedError;
903903
for(letn=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
constabortRequest=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
functionwritableStreamDefaultWriterEnsureReadyPromiseRejected(writer,error){
10251025
constready=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
functionwritableStreamDefaultWriterEnsureClosedPromiseRejected(writer,error){
10381038
constclose=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Commit ac5e5d5

Browse files
committed
stream: refactor unnecessary optional chaining away
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com> PR-URL: #64253 Backport-PR-URL: #64675 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 cb298cf commit ac5e5d5

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
@@ -844,15 +844,15 @@ class DefaultReadRequest {
844844
}
845845

846846
[kChunk](value){
847-
this[kState].resolve?.({ value,done: false});
847+
this[kState].resolve({ value,done: false});
848848
}
849849

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

854854
[kError](error){
855-
this[kState].reject?.(error);
855+
this[kState].reject(error);
856856
}
857857

858858
getpromise(){returnthis[kState].promise;}
@@ -864,15 +864,15 @@ class ReadIntoRequest {
864864
}
865865

866866
[kChunk](value){
867-
this[kState].resolve?.({ value,done: false});
867+
this[kState].resolve({ value,done: false});
868868
}
869869

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

874874
[kError](error){
875-
this[kState].reject?.(error);
875+
this[kState].reject(error);
876876
}
877877

878878
getpromise(){returnthis[kState].promise;}
@@ -2165,15 +2165,15 @@ function readableStreamCancel(stream, reason) {
21652165
functionreadableStreamClose(stream){
21662166
assert(stream[kState].state==='readable');
21672167
stream[kState].state='closed';
2168-
stream[kState].closedPromise?.resolve?.();
2168+
stream[kState].closedPromise?.resolve();
21692169
const{
21702170
reader,
21712171
}=stream[kState];
21722172

21732173
if(reader===undefined)
21742174
return;
21752175

2176-
reader[kState].close?.resolve?.();
2176+
reader[kState].close?.resolve();
21772177

21782178
if(readableStreamHasDefaultReader(stream)){
21792179
for(letn=0;n<reader[kState].readRequests.length;n++)
@@ -2189,7 +2189,7 @@ function readableStreamError(stream, error) {
21892189
constclosedPromiseCache=stream[kState].closedPromise;
21902190
if(closedPromiseCache!==undefined){
21912191
setPromiseHandled(closedPromiseCache.promise);
2192-
closedPromiseCache.reject?.(error);
2192+
closedPromiseCache.reject(error);
21932193
}
21942194

21952195
const{
@@ -2202,7 +2202,7 @@ function readableStreamError(stream, error) {
22022202
constcloseCache=reader[kState].close;
22032203
if(closeCache!==undefined){
22042204
setPromiseHandled(closeCache.promise);
2205-
closeCache.reject?.(error);
2205+
closeCache.reject(error);
22062206
}
22072207

22082208
if(readableStreamHasDefaultReader(stream)){
@@ -2396,7 +2396,7 @@ function readableStreamReaderGenericRelease(reader) {
23962396
constcloseCache=reader[kState].close;
23972397
if(stream[kState].state==='readable'){
23982398
if(closeCache!==undefined){
2399-
closeCache.reject?.(lazyReadableReleasedError());
2399+
closeCache.reject(lazyReadableReleasedError());
24002400
setPromiseHandled(closeCache.promise);
24012401
}
24022402
}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
returnpromise;
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
constclosedPromiseCache=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
constcloseCache=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
functionwritableStreamFinishInFlightWriteWithError(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
functionwritableStreamFinishInFlightWrite(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
functionwritableStreamFinishInFlightCloseWithError(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
functionwritableStreamFinishInFlightClose(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
conststoredError=stream[kState].storedError;
903903
for(letn=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
constabortRequest=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
functionwritableStreamDefaultWriterEnsureReadyPromiseRejected(writer,error){
10251025
constready=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
functionwritableStreamDefaultWriterEnsureClosedPromiseRejected(writer,error){
10381038
constclose=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit ac5e5d5

Browse files
committed
stream: refactor unnecessary optional chaining away
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com> PR-URL: #64253 Backport-PR-URL: #64675 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 cb298cf commit ac5e5d5

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
@@ -844,15 +844,15 @@ class DefaultReadRequest {
844844
}
845845

846846
[kChunk](value){
847-
this[kState].resolve?.({ value,done: false});
847+
this[kState].resolve({ value,done: false});
848848
}
849849

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

854854
[kError](error){
855-
this[kState].reject?.(error);
855+
this[kState].reject(error);
856856
}
857857

858858
getpromise(){returnthis[kState].promise;}
@@ -864,15 +864,15 @@ class ReadIntoRequest {
864864
}
865865

866866
[kChunk](value){
867-
this[kState].resolve?.({ value,done: false});
867+
this[kState].resolve({ value,done: false});
868868
}
869869

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

874874
[kError](error){
875-
this[kState].reject?.(error);
875+
this[kState].reject(error);
876876
}
877877

878878
getpromise(){returnthis[kState].promise;}
@@ -2165,15 +2165,15 @@ function readableStreamCancel(stream, reason) {
21652165
functionreadableStreamClose(stream){
21662166
assert(stream[kState].state==='readable');
21672167
stream[kState].state='closed';
2168-
stream[kState].closedPromise?.resolve?.();
2168+
stream[kState].closedPromise?.resolve();
21692169
const{
21702170
reader,
21712171
}=stream[kState];
21722172

21732173
if(reader===undefined)
21742174
return;
21752175

2176-
reader[kState].close?.resolve?.();
2176+
reader[kState].close?.resolve();
21772177

21782178
if(readableStreamHasDefaultReader(stream)){
21792179
for(letn=0;n<reader[kState].readRequests.length;n++)
@@ -2189,7 +2189,7 @@ function readableStreamError(stream, error) {
21892189
constclosedPromiseCache=stream[kState].closedPromise;
21902190
if(closedPromiseCache!==undefined){
21912191
setPromiseHandled(closedPromiseCache.promise);
2192-
closedPromiseCache.reject?.(error);
2192+
closedPromiseCache.reject(error);
21932193
}
21942194

21952195
const{
@@ -2202,7 +2202,7 @@ function readableStreamError(stream, error) {
22022202
constcloseCache=reader[kState].close;
22032203
if(closeCache!==undefined){
22042204
setPromiseHandled(closeCache.promise);
2205-
closeCache.reject?.(error);
2205+
closeCache.reject(error);
22062206
}
22072207

22082208
if(readableStreamHasDefaultReader(stream)){
@@ -2396,7 +2396,7 @@ function readableStreamReaderGenericRelease(reader) {
23962396
constcloseCache=reader[kState].close;
23972397
if(stream[kState].state==='readable'){
23982398
if(closeCache!==undefined){
2399-
closeCache.reject?.(lazyReadableReleasedError());
2399+
closeCache.reject(lazyReadableReleasedError());
24002400
setPromiseHandled(closeCache.promise);
24012401
}
24022402
}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
returnpromise;
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
constclosedPromiseCache=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
constcloseCache=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
functionwritableStreamFinishInFlightWriteWithError(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
functionwritableStreamFinishInFlightWrite(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
functionwritableStreamFinishInFlightCloseWithError(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
functionwritableStreamFinishInFlightClose(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
conststoredError=stream[kState].storedError;
903903
for(letn=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
constabortRequest=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
functionwritableStreamDefaultWriterEnsureReadyPromiseRejected(writer,error){
10251025
constready=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
functionwritableStreamDefaultWriterEnsureClosedPromiseRejected(writer,error){
10381038
constclose=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit ac5e5d5

Browse files
committed
stream: refactor unnecessary optional chaining away
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com> PR-URL: #64253 Backport-PR-URL: #64675 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 cb298cf commit ac5e5d5

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
@@ -844,15 +844,15 @@ class DefaultReadRequest {
844844
}
845845

846846
[kChunk](value){
847-
this[kState].resolve?.({ value,done: false});
847+
this[kState].resolve({ value,done: false});
848848
}
849849

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

854854
[kError](error){
855-
this[kState].reject?.(error);
855+
this[kState].reject(error);
856856
}
857857

858858
getpromise(){returnthis[kState].promise;}
@@ -864,15 +864,15 @@ class ReadIntoRequest {
864864
}
865865

866866
[kChunk](value){
867-
this[kState].resolve?.({ value,done: false});
867+
this[kState].resolve({ value,done: false});
868868
}
869869

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

874874
[kError](error){
875-
this[kState].reject?.(error);
875+
this[kState].reject(error);
876876
}
877877

878878
getpromise(){returnthis[kState].promise;}
@@ -2165,15 +2165,15 @@ function readableStreamCancel(stream, reason) {
21652165
functionreadableStreamClose(stream){
21662166
assert(stream[kState].state==='readable');
21672167
stream[kState].state='closed';
2168-
stream[kState].closedPromise?.resolve?.();
2168+
stream[kState].closedPromise?.resolve();
21692169
const{
21702170
reader,
21712171
}=stream[kState];
21722172

21732173
if(reader===undefined)
21742174
return;
21752175

2176-
reader[kState].close?.resolve?.();
2176+
reader[kState].close?.resolve();
21772177

21782178
if(readableStreamHasDefaultReader(stream)){
21792179
for(letn=0;n<reader[kState].readRequests.length;n++)
@@ -2189,7 +2189,7 @@ function readableStreamError(stream, error) {
21892189
constclosedPromiseCache=stream[kState].closedPromise;
21902190
if(closedPromiseCache!==undefined){
21912191
setPromiseHandled(closedPromiseCache.promise);
2192-
closedPromiseCache.reject?.(error);
2192+
closedPromiseCache.reject(error);
21932193
}
21942194

21952195
const{
@@ -2202,7 +2202,7 @@ function readableStreamError(stream, error) {
22022202
constcloseCache=reader[kState].close;
22032203
if(closeCache!==undefined){
22042204
setPromiseHandled(closeCache.promise);
2205-
closeCache.reject?.(error);
2205+
closeCache.reject(error);
22062206
}
22072207

22082208
if(readableStreamHasDefaultReader(stream)){
@@ -2396,7 +2396,7 @@ function readableStreamReaderGenericRelease(reader) {
23962396
constcloseCache=reader[kState].close;
23972397
if(stream[kState].state==='readable'){
23982398
if(closeCache!==undefined){
2399-
closeCache.reject?.(lazyReadableReleasedError());
2399+
closeCache.reject(lazyReadableReleasedError());
24002400
setPromiseHandled(closeCache.promise);
24012401
}
24022402
}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
returnpromise;
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
constclosedPromiseCache=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
constcloseCache=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
functionwritableStreamFinishInFlightWriteWithError(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
functionwritableStreamFinishInFlightWrite(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
functionwritableStreamFinishInFlightCloseWithError(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
functionwritableStreamFinishInFlightClose(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
conststoredError=stream[kState].storedError;
903903
for(letn=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
constabortRequest=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
functionwritableStreamDefaultWriterEnsureReadyPromiseRejected(writer,error){
10251025
constready=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
functionwritableStreamDefaultWriterEnsureClosedPromiseRejected(writer,error){
10381038
constclose=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Commit ac5e5d5

Browse files
committed
stream: refactor unnecessary optional chaining away
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com> PR-URL: #64253 Backport-PR-URL: #64675 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 cb298cf commit ac5e5d5

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
@@ -844,15 +844,15 @@ class DefaultReadRequest {
844844
}
845845

846846
[kChunk](value){
847-
this[kState].resolve?.({ value,done: false});
847+
this[kState].resolve({ value,done: false});
848848
}
849849

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

854854
[kError](error){
855-
this[kState].reject?.(error);
855+
this[kState].reject(error);
856856
}
857857

858858
getpromise(){returnthis[kState].promise;}
@@ -864,15 +864,15 @@ class ReadIntoRequest {
864864
}
865865

866866
[kChunk](value){
867-
this[kState].resolve?.({ value,done: false});
867+
this[kState].resolve({ value,done: false});
868868
}
869869

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

874874
[kError](error){
875-
this[kState].reject?.(error);
875+
this[kState].reject(error);
876876
}
877877

878878
getpromise(){returnthis[kState].promise;}
@@ -2165,15 +2165,15 @@ function readableStreamCancel(stream, reason) {
21652165
functionreadableStreamClose(stream){
21662166
assert(stream[kState].state==='readable');
21672167
stream[kState].state='closed';
2168-
stream[kState].closedPromise?.resolve?.();
2168+
stream[kState].closedPromise?.resolve();
21692169
const{
21702170
reader,
21712171
}=stream[kState];
21722172

21732173
if(reader===undefined)
21742174
return;
21752175

2176-
reader[kState].close?.resolve?.();
2176+
reader[kState].close?.resolve();
21772177

21782178
if(readableStreamHasDefaultReader(stream)){
21792179
for(letn=0;n<reader[kState].readRequests.length;n++)
@@ -2189,7 +2189,7 @@ function readableStreamError(stream, error) {
21892189
constclosedPromiseCache=stream[kState].closedPromise;
21902190
if(closedPromiseCache!==undefined){
21912191
setPromiseHandled(closedPromiseCache.promise);
2192-
closedPromiseCache.reject?.(error);
2192+
closedPromiseCache.reject(error);
21932193
}
21942194

21952195
const{
@@ -2202,7 +2202,7 @@ function readableStreamError(stream, error) {
22022202
constcloseCache=reader[kState].close;
22032203
if(closeCache!==undefined){
22042204
setPromiseHandled(closeCache.promise);
2205-
closeCache.reject?.(error);
2205+
closeCache.reject(error);
22062206
}
22072207

22082208
if(readableStreamHasDefaultReader(stream)){
@@ -2396,7 +2396,7 @@ function readableStreamReaderGenericRelease(reader) {
23962396
constcloseCache=reader[kState].close;
23972397
if(stream[kState].state==='readable'){
23982398
if(closeCache!==undefined){
2399-
closeCache.reject?.(lazyReadableReleasedError());
2399+
closeCache.reject(lazyReadableReleasedError());
24002400
setPromiseHandled(closeCache.promise);
24012401
}
24022402
}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
returnpromise;
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
constclosedPromiseCache=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
constcloseCache=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
functionwritableStreamFinishInFlightWriteWithError(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
functionwritableStreamFinishInFlightWrite(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
functionwritableStreamFinishInFlightCloseWithError(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
functionwritableStreamFinishInFlightClose(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
conststoredError=stream[kState].storedError;
903903
for(letn=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
constabortRequest=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
functionwritableStreamDefaultWriterEnsureReadyPromiseRejected(writer,error){
10251025
constready=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
functionwritableStreamDefaultWriterEnsureClosedPromiseRejected(writer,error){
10381038
constclose=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)