fs: refactor to use validateInteger

deokjinkim · RafaelGSS · commit 22a66cff6697 · 2023-01-05T13:11:42.000-03:00
PR-URL: #46008 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
diff --git a/lib/internal/fs/utils.js b/lib/internal/fs/utils.js
@@ -10,7 +10,6 @@ const {
   FunctionPrototypeCall,
   Number,
   NumberIsFinite,
-  NumberIsInteger,
   MathMin,
   MathRound,
   ObjectIs,
@@ -862,14 +861,8 @@ const getValidMode = hideStackFrames((mode, type) => {
   if (mode == null) {
     return def;
   }
-  if (NumberIsInteger(mode) && mode >= min && mode <= max) {
-    return mode;
-  }
-  if (typeof mode !== 'number') {
-    throw new ERR_INVALID_ARG_TYPE('mode', 'integer', mode);
-  }
-  throw new ERR_OUT_OF_RANGE(
-    'mode', `an integer >= ${min} && <= ${max}`, mode);
+  validateInteger(mode, 'mode', min, max);
+  return mode;
 });
 
 const validateStringAfterArrayBufferView = hideStackFrames((buffer, name) => {
diff --git a/test/parallel/test-fs-access.js b/test/parallel/test-fs-access.js
@@ -170,14 +170,12 @@ fs.accessSync(readWriteFile, mode);
     () => fs.access(readWriteFile, mode, common.mustNotCall()),
     {
       code: 'ERR_INVALID_ARG_TYPE',
-      message: /"mode" argument.+integer/
     }
   );
   assert.throws(
     () => fs.accessSync(readWriteFile, mode),
     {
       code: 'ERR_INVALID_ARG_TYPE',
-      message: /"mode" argument.+integer/
     }
   );
 });
@@ -194,14 +192,12 @@ fs.accessSync(readWriteFile, mode);
     () => fs.access(readWriteFile, mode, common.mustNotCall()),
     {
       code: 'ERR_OUT_OF_RANGE',
-      message: /"mode".+It must be an integer >= 0 && <= 7/
     }
   );
   assert.throws(
     () => fs.accessSync(readWriteFile, mode),
     {
       code: 'ERR_OUT_OF_RANGE',
-      message: /"mode".+It must be an integer >= 0 && <= 7/
     }
   );
 });
diff --git a/test/parallel/test-fs-copyfile.js b/test/parallel/test-fs-copyfile.js
@@ -156,8 +156,6 @@ assert.throws(() => {
 }, {
   code: 'ERR_OUT_OF_RANGE',
   name: 'RangeError',
-  message: 'The value of "mode" is out of range. It must be an integer ' +
-           '>= 0 && <= 7. Received 8'
 });
 
 assert.throws(() => {
diff --git a/test/parallel/test-fs-error-messages.js b/test/parallel/test-fs-error-messages.js
@@ -662,8 +662,7 @@ if (!common.isAIX) {
 // Check copyFile with invalid modes.
 {
   const validateError = {
-    message: /"mode".+must be an integer >= 0 && <= 7\. Received -1/,
-    code: 'ERR_OUT_OF_RANGE'
+    code: 'ERR_OUT_OF_RANGE',
   };
 
   assert.throws(
diff --git a/test/parallel/test-fs-promises-file-handle-sync.js b/test/parallel/test-fs-promises-file-handle-sync.js
@@ -14,7 +14,6 @@ async function validate() {
     copyFile(fixtures.path('baz.js'), dest, 'r'),
     {
       code: 'ERR_INVALID_ARG_TYPE',
-      message: /mode.*integer.*string/
     }
   );
   await copyFile(fixtures.path('baz.js'), dest);
diff --git a/test/parallel/test-fs-promises.js b/test/parallel/test-fs-promises.js
@@ -64,15 +64,13 @@ assert.strictEqual(
     access(__filename, 8),
     {
       code: 'ERR_OUT_OF_RANGE',
-      message: /"mode".*must be an integer >= 0 && <= 7\. Received 8$/
     }
   );
 
   assert.rejects(
     access(__filename, { [Symbol.toPrimitive]() { return 5; } }),
     {
       code: 'ERR_INVALID_ARG_TYPE',
-      message: /"mode" argument.+integer\. Received an instance of Object$/
     }
   );
 }

Original file line number	Diff line number	Diff line change
`@@ -170,14 +170,12 @@ fs.accessSync(readWriteFile, mode);`
`170`	`170`	`() => fs.access(readWriteFile, mode, common.mustNotCall()),`
`171`	`171`	`{`
`172`	`172`	`code: 'ERR_INVALID_ARG_TYPE',`
`173`		`- message: /"mode" argument.+integer/`
`174`	`173`	`}`
`175`	`174`	`);`
`176`	`175`	`assert.throws(`
`177`	`176`	`() => fs.accessSync(readWriteFile, mode),`
`178`	`177`	`{`
`179`	`178`	`code: 'ERR_INVALID_ARG_TYPE',`
`180`		`- message: /"mode" argument.+integer/`
`181`	`179`	`}`
`182`	`180`	`);`
`183`	`181`	`});`
`@@ -194,14 +192,12 @@ fs.accessSync(readWriteFile, mode);`
`194`	`192`	`() => fs.access(readWriteFile, mode, common.mustNotCall()),`
`195`	`193`	`{`
`196`	`194`	`code: 'ERR_OUT_OF_RANGE',`
`197`		`- message: /"mode".+It must be an integer >= 0 && <= 7/`
`198`	`195`	`}`
`199`	`196`	`);`
`200`	`197`	`assert.throws(`
`201`	`198`	`() => fs.accessSync(readWriteFile, mode),`
`202`	`199`	`{`
`203`	`200`	`code: 'ERR_OUT_OF_RANGE',`
`204`		`- message: /"mode".+It must be an integer >= 0 && <= 7/`
`205`	`201`	`}`
`206`	`202`	`);`
`207`	`203`	`});`
Original file line number	Diff line number	Diff line change
`@@ -662,8 +662,7 @@ if (!common.isAIX) {`
`662`	`662`	`// Check copyFile with invalid modes.`
`663`	`663`	`{`
`664`	`664`	`const validateError = {`
`665`		`- message: /"mode".+must be an integer >= 0 && <= 7\. Received -1/,`
`666`		`- code: 'ERR_OUT_OF_RANGE'`
	`665`	`+ code: 'ERR_OUT_OF_RANGE',`
`667`	`666`	`};`
`668`	`667`
`669`	`668`	`assert.throws(`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ async function validate() {`
`14`	`14`	`copyFile(fixtures.path('baz.js'), dest, 'r'),`
`15`	`15`	`{`
`16`	`16`	`code: 'ERR_INVALID_ARG_TYPE',`
`17`		`- message: /mode.integer.string/`
`18`	`17`	`}`
`19`	`18`	`);`
`20`	`19`	`await copyFile(fixtures.path('baz.js'), dest);`
Original file line number	Diff line number	Diff line change
`@@ -64,15 +64,13 @@ assert.strictEqual(`
`64`	`64`	`access(__filename, 8),`
`65`	`65`	`{`
`66`	`66`	`code: 'ERR_OUT_OF_RANGE',`
`67`		`- message: /"mode".*must be an integer >= 0 && <= 7\. Received 8$/`
`68`	`67`	`}`
`69`	`68`	`);`
`70`	`69`
`71`	`70`	`assert.rejects(`
`72`	`71`	`access(__filename, { [Symbol.toPrimitive]() { return 5; } }),`
`73`	`72`	`{`
`74`	`73`	`code: 'ERR_INVALID_ARG_TYPE',`
`75`		`- message: /"mode" argument.+integer\. Received an instance of Object$/`
`76`	`74`	`}`
`77`	`75`	`);`
`78`	`76`	`}`