stream: refactor use es2020 statement

xtx1130 · juanarbol · commit ffb1c8578414 · 2022-10-11T14:45:24.000-05:00
PR-URL: #44533 Reviewed-By: Robert Nagy <ronagy@icloud.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Erick Wendel <erick.workspace@gmail.com>
diff --git a/lib/internal/streams/destroy.js b/lib/internal/streams/destroy.js
@@ -35,7 +35,7 @@ function destroy(err, cb){
 // With duplex streams we use the writable side for state.
 const s = w || r;
 
- if ((w && w.destroyed) || (r && r.destroyed)){
+ if (w?.destroyed || r?.destroyed){
 if (typeof cb === 'function'){
 cb();
 }
@@ -134,7 +134,7 @@ function emitCloseNT(self){
 r.closeEmitted = true;
 }
 
- if ((w && w.emitClose) || (r && r.emitClose)){
+ if (w?.emitClose || r?.emitClose){
 self.emit('close');
 }
 }
@@ -143,7 +143,7 @@ function emitErrorNT(self, err){
 const r = self._readableState;
 const w = self._writableState;
 
- if ((w && w.errorEmitted) || (r && r.errorEmitted)){
+ if (w?.errorEmitted || r?.errorEmitted){
 return;
 }
 
@@ -198,11 +198,11 @@ function errorOrDestroy(stream, err, sync){
 const r = stream._readableState;
 const w = stream._writableState;
 
- if ((w && w.destroyed) || (r && r.destroyed)){
+ if (w?.destroyed || r?.destroyed){
 return this;
 }
 
- if ((r && r.autoDestroy) || (w && w.autoDestroy))
+ if (r?.autoDestroy || w?.autoDestroy)
 stream.destroy(err);
 else if (err){
 // Avoid V8 leak, https://github.com/nodejs/node/pull/34103#issuecomment-652002364
@@ -306,7 +306,7 @@ function emitConstructNT(stream){
 }
 
 function isRequest(stream){
- return stream && stream.setHeader && typeof stream.abort === 'function';
+ return stream?.setHeader && typeof stream.abort === 'function';
 }
 
 // Normalize destroy for legacy.

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ function destroy(err, cb){`
`35`	`35`	`// With duplex streams we use the writable side for state.`
`36`	`36`	`consts=w\|\|r;`
`37`	`37`
`38`		`-if((w&&w.destroyed)\|\|(r&&r.destroyed)){`
	`38`	`+if(w?.destroyed\|\|r?.destroyed){`
`39`	`39`	`if(typeofcb==='function'){`
`40`	`40`	`cb();`
`41`	`41`	`}`
`@@ -134,7 +134,7 @@ function emitCloseNT(self){`
`134`	`134`	`r.closeEmitted=true;`
`135`	`135`	`}`
`136`	`136`
`137`		`-if((w&&w.emitClose)\|\|(r&&r.emitClose)){`
	`137`	`+if(w?.emitClose\|\|r?.emitClose){`
`138`	`138`	`self.emit('close');`
`139`	`139`	`}`
`140`	`140`	`}`
`@@ -143,7 +143,7 @@ function emitErrorNT(self, err){`
`143`	`143`	`constr=self._readableState;`
`144`	`144`	`constw=self._writableState;`
`145`	`145`
`146`		`-if((w&&w.errorEmitted)\|\|(r&&r.errorEmitted)){`
	`146`	`+if(w?.errorEmitted\|\|r?.errorEmitted){`
`147`	`147`	`return;`
`148`	`148`	`}`
`149`	`149`
`@@ -198,11 +198,11 @@ function errorOrDestroy(stream, err, sync){`
`198`	`198`	`constr=stream._readableState;`
`199`	`199`	`constw=stream._writableState;`
`200`	`200`
`201`		`-if((w&&w.destroyed)\|\|(r&&r.destroyed)){`
	`201`	`+if(w?.destroyed\|\|r?.destroyed){`
`202`	`202`	`returnthis;`
`203`	`203`	`}`
`204`	`204`
`205`		`-if((r&&r.autoDestroy)\|\|(w&&w.autoDestroy))`
	`205`	`+if(r?.autoDestroy\|\|w?.autoDestroy)`
`206`	`206`	`stream.destroy(err);`
`207`	`207`	`elseif(err){`
`208`	`208`	`// Avoid V8 leak, https://github.com/nodejs/node/pull/34103#issuecomment-652002364`
`@@ -306,7 +306,7 @@ function emitConstructNT(stream){`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`functionisRequest(stream){`
`309`		`-returnstream&&stream.setHeader&&typeofstream.abort==='function';`
	`309`	`+returnstream?.setHeader&&typeofstream.abort==='function';`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`// Normalize destroy for legacy.`