fs: use validateBoolean() in rm/rmdir validation

lib/internal/fs/utils.js

@@ -35,6 +35,7 @@ const {
 const { once } = require('internal/util');
 const { toPathIfFileURL } = require('internal/url');
 const {
+  validateBoolean,
   validateInt32,
   validateUint32
 } = require('internal/validators');
@@ -674,15 +675,11 @@ const defaultRmdirOptions = {
 const validateRmOptions = hideStackFrames((path, options, callback) => {
   try {
     options = validateRmdirOptions(options, defaultRmOptions);
+    validateBoolean(options.force, 'options.force');
   } catch (err) {
     return callback(err);
   }
 
-  if (typeof options.force !== 'boolean')
-    return callback(
-      new ERR_INVALID_ARG_TYPE('force', 'boolean', options.force)
-    );
-
   lazyLoadFs().stat(path, (err, stats) => {
     if (err) {
       if (options.force && err.code === 'ENOENT') {
@@ -706,9 +703,7 @@ const validateRmOptions = hideStackFrames((path, options, callback) => {
 
 const validateRmOptionsSync = hideStackFrames((path, options) => {
   options = validateRmdirOptions(options, defaultRmOptions);
-
-  if (typeof options.force !== 'boolean')
-    throw new ERR_INVALID_ARG_TYPE('force', 'boolean', options.force);
+  validateBoolean(options.force, 'options.force');
 
   try {
     const stats = lazyLoadFs().statSync(path);
@@ -742,11 +737,9 @@ const validateRmdirOptions = hideStackFrames(
 
     options = { ...defaults, ...options };
 
-    if (typeof options.recursive !== 'boolean')
-      throw new ERR_INVALID_ARG_TYPE('recursive', 'boolean', options.recursive);
-
-    validateInt32(options.retryDelay, 'retryDelay', 0);
-    validateUint32(options.maxRetries, 'maxRetries');
+    validateBoolean(options.recursive, 'options.recursive');
+    validateInt32(options.retryDelay, 'options.retryDelay', 0);
+    validateUint32(options.maxRetries, 'options.maxRetries');
 
     return options;
   });

test/parallel/test-fs-rm.js

@@ -251,7 +251,7 @@ function removeAsync(dir) {
     }, {
       code: 'ERR_INVALID_ARG_TYPE',
       name: 'TypeError',
-      message: /^The "recursive" argument must be of type boolean\./
+      message: /^The "options\.recursive" property must be of type boolean\./
     });
   });
 
@@ -261,7 +261,7 @@ function removeAsync(dir) {
     }, {
       code: 'ERR_INVALID_ARG_TYPE',
       name: 'TypeError',
-      message: /^The "force" argument must be of type boolean\./
+      message: /^The "options\.force" property must be of type boolean\./
     });
   });
 
@@ -270,14 +270,14 @@ function removeAsync(dir) {
   }, {
     code: 'ERR_OUT_OF_RANGE',
     name: 'RangeError',
-    message: /^The value of "retryDelay" is out of range\./
+    message: /^The value of "options\.retryDelay" is out of range\./
   });
 
   assert.throws(() => {
     validateRmOptionsSync(filePath, { maxRetries: -1 });
   }, {
     code: 'ERR_OUT_OF_RANGE',
     name: 'RangeError',
-    message: /^The value of "maxRetries" is out of range\./
+    message: /^The value of "options\.maxRetries" is out of range\./
   });
 }

test/parallel/test-fs-rmdir-recursive.js

@@ -191,7 +191,7 @@ function removeAsync(dir) {
     }, {
       code: 'ERR_INVALID_ARG_TYPE',
       name: 'TypeError',
-      message: /^The "recursive" argument must be of type boolean\./
+      message: /^The "options\.recursive" property must be of type boolean\./
     });
   });
 
@@ -200,14 +200,14 @@ function removeAsync(dir) {
   }, {
     code: 'ERR_OUT_OF_RANGE',
     name: 'RangeError',
-    message: /^The value of "retryDelay" is out of range\./
+    message: /^The value of "options\.retryDelay" is out of range\./
   });
 
   assert.throws(() => {
     validateRmdirOptions({ maxRetries: -1 });
   }, {
     code: 'ERR_OUT_OF_RANGE',
     name: 'RangeError',
-    message: /^The value of "maxRetries" is out of range\./
+    message: /^The value of "options\.maxRetries" is out of range\./
   });
 }