stream: refactor getHighWaterMark in state.js

danbev · MylesBorins · commit ed5f253cfadf · 2018-05-22T14:13:28.000-04:00
This commit aims to reduce some code duplication in state.js PR-URL: #20415 Reviewed-By: Anatoli Papirovski <apapirovski@mac.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
diff --git a/lib/internal/streams/state.js b/lib/internal/streams/state.js
@@ -2,19 +2,19 @@
 
 const { ERR_INVALID_OPT_VALUE } = require('internal/errors').codes;
 
+function highWaterMarkFrom(options, isDuplex, duplexKey) {
+ return options.highWaterMark != null ? options.highWaterMark :
+ isDuplex ? options[duplexKey] : null;
+}
+
 function getHighWaterMark(state, options, duplexKey, isDuplex) {
- let hwm = options.highWaterMark;
+ const hwm = highWaterMarkFrom(options, isDuplex, duplexKey);
 if (hwm != null) {
- if (typeof hwm !== 'number' || !(hwm >= 0))
- throw new ERR_INVALID_OPT_VALUE('highWaterMark', hwm);
- return Math.floor(hwm);
- } else if (isDuplex) {
- hwm = options[duplexKey];
- if (hwm != null) {
- if (typeof hwm !== 'number' || !(hwm >= 0))
- throw new ERR_INVALID_OPT_VALUE(duplexKey, hwm);
- return Math.floor(hwm);
+ if (!Number.isInteger(hwm) || hwm < 0) {
+ const name = isDuplex ? duplexKey : 'highWaterMark';
+ throw new ERR_INVALID_OPT_VALUE(name, hwm);
 }
+ return Math.floor(hwm);
 }
 
 // Default value

-Original file line number
+Diff line change
 const{ERR_INVALID_OPT_VALUE}=require('internal/errors').codes;
 +functionhighWaterMarkFrom(options,isDuplex,duplexKey){
 +returnoptions.highWaterMark!=null ? options.highWaterMark :
 +isDuplex ? options[duplexKey] : null;
 +}
++
 functiongetHighWaterMark(state,options,duplexKey,isDuplex){
 -lethwm=options.highWaterMark;
 +consthwm=highWaterMarkFrom(options,isDuplex,duplexKey);
 if(hwm!=null){
 -if(typeofhwm!=='number'||!(hwm>=0))
 -thrownewERR_INVALID_OPT_VALUE('highWaterMark',hwm);
 -returnMath.floor(hwm);
 -}elseif(isDuplex){
 -hwm=options[duplexKey];
 -if(hwm!=null){
 -if(typeofhwm!=='number'||!(hwm>=0))
 -thrownewERR_INVALID_OPT_VALUE(duplexKey,hwm);
 -returnMath.floor(hwm);
 +if(!Number.isInteger(hwm)||hwm<0){
 +constname=isDuplex ? duplexKey : 'highWaterMark';
 +thrownewERR_INVALID_OPT_VALUE(name,hwm);
+}
 +returnMath.floor(hwm);
+}
 // Default value