stream: avoid function call where possible

Trott · BethGriggs · commit 92263223940c · 2022-01-24T17:35:35.000Z
Instead of assigning a boolean, move the function call that assigns a value to the boolean to the only place that boolean is checked. This avoids the function call in cases where it is not needed. Refs: #41488 (review) PR-URL: #41534 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
diff --git a/lib/internal/streams/utils.js b/lib/internal/streams/utils.js
@@ -118,17 +118,19 @@ function isReadableFinished(stream, strict){
 
 function isReadable(stream){
 if (stream && stream[kIsReadable] != null) return stream[kIsReadable];
- const r = isReadableNodeStream(stream);
 if (typeof stream?.readable !== 'boolean') return null;
 if (isDestroyed(stream)) return false;
- return r && stream.readable && !isReadableFinished(stream);
+ return isReadableNodeStream(stream) &&
+ stream.readable &&
+ !isReadableFinished(stream);
 }
 
 function isWritable(stream){
- const r = isWritableNodeStream(stream);
 if (typeof stream?.writable !== 'boolean') return null;
 if (isDestroyed(stream)) return false;
- return r && stream.writable && !isWritableEnded(stream);
+ return isWritableNodeStream(stream) &&
+ stream.writable &&
+ !isWritableEnded(stream);
 }
 
 function isFinished(stream, opts){

-Original file line number
+Diff line change
 functionisReadable(stream){
 if(stream&&stream[kIsReadable]!=null)returnstream[kIsReadable];
 -constr=isReadableNodeStream(stream);
 if(typeofstream?.readable!=='boolean')returnnull;
 if(isDestroyed(stream))returnfalse;
 -returnr&&stream.readable&&!isReadableFinished(stream);
 +returnisReadableNodeStream(stream)&&
 +stream.readable&&
 +!isReadableFinished(stream);
+}
 functionisWritable(stream){
 -constr=isWritableNodeStream(stream);
 if(typeofstream?.writable!=='boolean')returnnull;
 if(isDestroyed(stream))returnfalse;
 -returnr&&stream.writable&&!isWritableEnded(stream);
 +returnisWritableNodeStream(stream)&&
 +stream.writable&&
 +!isWritableEnded(stream);
+}
 functionisFinished(stream,opts){