From 73ad9db6c5c3d608f6c987a848fcd79bee2db1ee Mon Sep 17 00:00:00 2001 From: SindreXie Date: Tue, 6 Sep 2022 15:58:31 +0800 Subject: [PATCH] stream: refactor use es2020 statement PR-URL: https://github.com/nodejs/node/pull/44533 Reviewed-By: Robert Nagy Reviewed-By: Matteo Collina Reviewed-By: Erick Wendel --- lib/internal/streams/destroy.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/internal/streams/destroy.js b/lib/internal/streams/destroy.js index 5c352135dc3012..09cc5590fad4fc 100644 --- a/lib/internal/streams/destroy.js +++ b/lib/internal/streams/destroy.js @@ -42,7 +42,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(); } @@ -128,7 +128,7 @@ function emitCloseNT(self) { r.closeEmitted = true; } - if ((w && w.emitClose) || (r && r.emitClose)) { + if (w?.emitClose || r?.emitClose) { self.emit('close'); } } @@ -137,7 +137,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; } @@ -192,11 +192,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 @@ -283,7 +283,7 @@ function emitConstructNT(stream) { } function isRequest(stream) { - return stream && stream.setHeader && typeof stream.abort === 'function'; + return stream?.setHeader && typeof stream.abort === 'function'; } function emitCloseLegacy(stream) {