lib: change ERR_INVALID_ARG_VALUE error message

lib/internal/errors.js

@@ -1083,7 +1083,7 @@ E('ERR_INVALID_ARG_VALUE', (name, value, reason = 'is invalid') => {
     inspected = `${inspected.slice(0, 128)}...`;
   }
   const type = name.includes('.') ? 'property' : 'argument';
-  return `The ${type} '${name}' ${reason}. Received ${inspected}`;
+  return `The '${name}' ${type} ${reason}. Received ${inspected}`;
 }, TypeError, RangeError);
 E('ERR_INVALID_ASYNC_ID', 'Invalid %s value: %s', RangeError);
 E('ERR_INVALID_BUFFER_SIZE',

test/es-module/test-esm-dns-promises.mjs

@@ -10,5 +10,5 @@ assert.throws(() => {
 }, {
   code: 'ERR_INVALID_ARG_VALUE',
   name: 'TypeError',
-  message: `The argument 'address' is invalid. Received '${invalidAddress}'`
+  message: `The 'address' argument is invalid. Received '${invalidAddress}'`
 });

test/internet/test-dns-promises-resolve.js

@@ -12,7 +12,7 @@ const dnsPromises = require('dns').promises;
     {
       code: 'ERR_INVALID_ARG_VALUE',
       name: 'TypeError',
-      message: `The argument 'rrtype' is invalid. Received '${rrtype}'`
+      message: `The 'rrtype' argument is invalid. Received '${rrtype}'`
     }
   );
 }

test/parallel/test-assert.js

@@ -1082,7 +1082,7 @@ assert.throws(
 assert.throws(
   () => assert.throws(() => { throw new Error(); }, {}),
   {
-    message: "The argument 'error' may not be an empty object. Received {}",
+    message: "The 'error' argument may not be an empty object. Received {}",
     code: 'ERR_INVALID_ARG_VALUE'
   }
 );

test/parallel/test-buffer-no-negative-allocation.js

@@ -7,7 +7,7 @@ const { SlowBuffer } = require('buffer');
 const msg = {
   code: 'ERR_INVALID_ARG_VALUE',
   name: 'RangeError',
-  message: /^The argument 'size' is invalid\. Received [^"]*$/
+  message: /^The 'size' argument is invalid\. Received [^"]*$/
 };
 
 // Test that negative Buffer length inputs throw errors.

test/parallel/test-buffer-over-max-length.js

@@ -9,7 +9,7 @@ const kMaxLength = buffer.kMaxLength;
 const bufferMaxSizeMsg = {
   code: 'ERR_INVALID_ARG_VALUE',
   name: 'RangeError',
-  message: /^The argument 'size' is invalid\. Received [^"]*$/
+  message: /^The 'size' argument is invalid\. Received [^"]*$/
 };
 
 assert.throws(() => Buffer((-1 >>> 0) + 1), bufferMaxSizeMsg);

test/parallel/test-buffer-slow.js

@@ -54,7 +54,7 @@ assert.throws(() => SlowBuffer(true), bufferInvalidTypeMsg);
 const bufferMaxSizeMsg = {
   code: 'ERR_INVALID_ARG_VALUE',
   name: 'RangeError',
-  message: /^The argument 'size' is invalid\. Received [^"]*$/
+  message: /^The 'size' argument is invalid\. Received [^"]*$/
 };
 assert.throws(() => SlowBuffer(NaN), bufferMaxSizeMsg);
 assert.throws(() => SlowBuffer(Infinity), bufferMaxSizeMsg);

test/parallel/test-buffer-tostring-rangeerror.js

@@ -12,7 +12,7 @@ const len = 1422561062959;
 const message = {
   code: 'ERR_INVALID_ARG_VALUE',
   name: 'RangeError',
-  message: /^The argument 'size' is invalid\. Received [^"]*$/
+  message: /^The 'size' argument is invalid\. Received [^"]*$/
 };
 assert.throws(() => Buffer(len).toString('utf8'), message);
 assert.throws(() => SlowBuffer(len).toString('utf8'), message);

test/parallel/test-c-ares.js

@@ -70,7 +70,7 @@ dns.lookup('::1', common.mustCall((error, result, addressType) => {
   const err = {
     code: 'ERR_INVALID_ARG_VALUE',
     name: 'TypeError',
-    message: `The argument 'rrtype' is invalid. Received '${val}'`,
+    message: `The 'rrtype' argument is invalid. Received '${val}'`,
   };
 
   assert.throws(

test/parallel/test-child-process-advanced-serialization.js

@@ -11,7 +11,7 @@ if (process.argv[2] !== 'child') {
       child_process.spawn(process.execPath, [], { serialization: value });
     }, {
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.serialization' " +
+      message: "The 'options.serialization' property " +
         "must be one of: undefined, 'json', 'advanced'. " +
         `Received ${inspect(value)}`
     });

test/parallel/test-console-tty-colors.js

@@ -67,7 +67,7 @@ check(false, false, false);
         });
       },
       {
-        message: `The argument 'colorMode' is invalid. Received ${received}`,
+        message: `The 'colorMode' argument is invalid. Received ${received}`,
         code: 'ERR_INVALID_ARG_VALUE'
       }
     );

test/parallel/test-crypto-authenticated.js

@@ -330,7 +330,7 @@ for (const test of TEST_CASES) {
     }, {
       name: 'TypeError',
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.authTagLength' is invalid. " +
+      message: "The 'options.authTagLength' property is invalid. " +
                `Received ${inspect(authTagLength)}`
     });
 
@@ -344,7 +344,7 @@ for (const test of TEST_CASES) {
     }, {
       name: 'TypeError',
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.authTagLength' is invalid. " +
+      message: "The 'options.authTagLength' property is invalid. " +
         `Received ${inspect(authTagLength)}`
     });
 
@@ -354,7 +354,7 @@ for (const test of TEST_CASES) {
       }, {
         name: 'TypeError',
         code: 'ERR_INVALID_ARG_VALUE',
-        message: "The property 'options.authTagLength' is invalid. " +
+        message: "The 'options.authTagLength' property is invalid. " +
           `Received ${inspect(authTagLength)}`
       });
 
@@ -363,7 +363,7 @@ for (const test of TEST_CASES) {
       }, {
         name: 'TypeError',
         code: 'ERR_INVALID_ARG_VALUE',
-        message: "The property 'options.authTagLength' is invalid. " +
+        message: "The 'options.authTagLength' property is invalid. " +
           `Received ${inspect(authTagLength)}`
       });
     }
@@ -454,7 +454,7 @@ for (const test of TEST_CASES) {
     }, {
       name: 'TypeError',
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.plaintextLength' is invalid. " +
+      message: "The 'options.plaintextLength' property is invalid. " +
         `Received ${inspect(plaintextLength)}`
     });
   }

test/parallel/test-crypto-dh-stateless.js

@@ -92,13 +92,13 @@ const bobPublicKey = crypto.createPublicKey({
 assert.throws(() => crypto.diffieHellman({ privateKey: alicePrivateKey }), {
   name: 'TypeError',
   code: 'ERR_INVALID_ARG_VALUE',
-  message: "The property 'options.publicKey' is invalid. Received undefined"
+  message: "The 'options.publicKey' property is invalid. Received undefined"
 });
 
 assert.throws(() => crypto.diffieHellman({ publicKey: alicePublicKey }), {
   name: 'TypeError',
   code: 'ERR_INVALID_ARG_VALUE',
-  message: "The property 'options.privateKey' is invalid. Received undefined"
+  message: "The 'options.privateKey' property is invalid. Received undefined"
 });
 
 const privateKey = Buffer.from(

test/parallel/test-crypto-key-objects.js

@@ -49,7 +49,7 @@ const privateDsa = fixtures.readKey('dsa_private_encrypted_1025.pem',
   assert.throws(() => new KeyObject(TYPE), {
     name: 'TypeError',
     code: 'ERR_INVALID_ARG_VALUE',
-    message: `The argument 'type' is invalid. Received '${TYPE}'`
+    message: `The 'type' argument is invalid. Received '${TYPE}'`
   });
 }
 
@@ -224,7 +224,7 @@ const privateDsa = fixtures.readKey('dsa_private_encrypted_1025.pem',
     createPrivateKey({ key: Buffer.alloc(0), format: 'der', type: 'spki' });
   }, {
     code: 'ERR_INVALID_ARG_VALUE',
-    message: "The property 'options.type' is invalid. Received 'spki'"
+    message: "The 'options.type' property is invalid. Received 'spki'"
   });
 
   // Unlike SPKI, PKCS#1 is a valid encoding for private keys (and public keys),
@@ -472,6 +472,6 @@ const privateDsa = fixtures.readKey('dsa_private_encrypted_1025.pem',
   }, {
     name: 'TypeError',
     code: 'ERR_INVALID_ARG_VALUE',
-    message: "The property 'options.cipher' is invalid. Received undefined"
+    message: "The 'options.cipher' property is invalid. Received undefined"
   });
 }

test/parallel/test-crypto-keygen.js

@@ -559,7 +559,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
   }), {
     name: 'TypeError',
     code: 'ERR_INVALID_ARG_VALUE',
-    message: "The property 'options.paramEncoding' is invalid. " +
+    message: "The 'options.paramEncoding' property is invalid. " +
       "Received 'otherEncoding'"
   });
 }
@@ -606,7 +606,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
   assert.throws(() => generateKeyPairSync('rsa2', {}), {
     name: 'TypeError',
     code: 'ERR_INVALID_ARG_VALUE',
-    message: "The argument 'type' must be a supported key type. Received 'rsa2'"
+    message: "The 'type' argument must be a supported key type. Received 'rsa2'"
   });
 }
 
@@ -686,7 +686,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
     }), {
       name: 'TypeError',
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.publicKeyEncoding' is invalid. " +
+      message: "The 'options.publicKeyEncoding' property is invalid. " +
         `Received ${inspect(enc)}`
     });
   }
@@ -706,7 +706,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
     }), {
       name: 'TypeError',
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.publicKeyEncoding.type' is invalid. " +
+      message: "The 'options.publicKeyEncoding.type' property is invalid. " +
         `Received ${inspect(type)}`
     });
   }
@@ -726,7 +726,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
     }), {
       name: 'TypeError',
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.publicKeyEncoding.format' is invalid. " +
+      message: "The 'options.publicKeyEncoding.format' property is invalid. " +
         `Received ${inspect(format)}`
     });
   }
@@ -743,7 +743,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
     }), {
       name: 'TypeError',
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.privateKeyEncoding' is invalid. " +
+      message: "The 'options.privateKeyEncoding' property is invalid. " +
         `Received ${inspect(enc)}`
     });
   }
@@ -763,7 +763,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
     }), {
       name: 'TypeError',
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.privateKeyEncoding.type' is invalid. " +
+      message: "The 'options.privateKeyEncoding.type' property is invalid. " +
         `Received ${inspect(type)}`
     });
   }
@@ -783,7 +783,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
     }), {
       name: 'TypeError',
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.privateKeyEncoding.format' is invalid. " +
+      message: "The 'options.privateKeyEncoding.format' property is invalid. " +
         `Received ${inspect(format)}`
     });
   }
@@ -804,7 +804,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
     }), {
       name: 'TypeError',
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.privateKeyEncoding.cipher' is invalid. " +
+      message: "The 'options.privateKeyEncoding.cipher' property is invalid. " +
         `Received ${inspect(cipher)}`
     });
   }
@@ -845,7 +845,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
     }), {
       name: 'TypeError',
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.privateKeyEncoding.passphrase' " +
+      message: "The 'options.privateKeyEncoding.passphrase' property " +
         `is invalid. Received ${inspect(passphrase)}`
     });
   }
@@ -872,7 +872,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
     }), {
       name: 'TypeError',
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.modulusLength' is invalid. " +
+      message: "The 'options.modulusLength' property is invalid. " +
         `Received ${inspect(modulusLength)}`
     });
   }
@@ -885,7 +885,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
     }), {
       name: 'TypeError',
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.publicExponent' is invalid. " +
+      message: "The 'options.publicExponent' property is invalid. " +
         `Received ${inspect(publicExponent)}`
     });
   }
@@ -900,7 +900,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
     }), {
       name: 'TypeError',
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.modulusLength' is invalid. " +
+      message: "The 'options.modulusLength' property is invalid. " +
         `Received ${inspect(modulusLength)}`
     });
   }
@@ -913,7 +913,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
     }), {
       name: 'TypeError',
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.divisorLength' is invalid. " +
+      message: "The 'options.divisorLength' property is invalid. " +
         `Received ${inspect(divisorLength)}`
     });
   }
@@ -944,7 +944,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
     }, {
       name: 'TypeError',
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.namedCurve' is invalid. " +
+      message: "The 'options.namedCurve' property is invalid. " +
         `Received ${inspect(namedCurve)}`
     });
   }
@@ -1066,7 +1066,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
     }, {
       name: 'TypeError',
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.publicKeyEncoding.type' is invalid. " +
+      message: "The 'options.publicKeyEncoding.type' property is invalid. " +
         `Received ${inspect(type)}`
     });
   }
@@ -1081,7 +1081,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
     }, {
       name: 'TypeError',
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.hash' is invalid. " +
+      message: "The 'options.hash' property is invalid. " +
         `Received ${inspect(hashValue)}`
     });
   }
@@ -1097,7 +1097,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
     }, {
       name: 'TypeError',
       code: 'ERR_INVALID_ARG_VALUE',
-      message: "The property 'options.privateKeyEncoding.type' is invalid. " +
+      message: "The 'options.privateKeyEncoding.type' property is invalid. " +
         `Received ${inspect(type)}`
     });
   }
@@ -1197,7 +1197,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
       {
         name: 'TypeError',
         code: 'ERR_INVALID_ARG_VALUE',
-        message: "The property 'options.mgf1Hash' is invalid. " +
+        message: "The 'options.mgf1Hash' property is invalid. " +
           `Received ${inspect(mgf1Hash)}`
 
       }

test/parallel/test-crypto-sign-verify.js

@@ -76,7 +76,7 @@ assert.throws(
   {
     code: 'ERR_INVALID_ARG_VALUE',
     name: 'TypeError',
-    message: "The property 'options.padding' is invalid. Received null",
+    message: "The 'options.padding' property is invalid. Received null",
   });
 
 assert.throws(
@@ -87,7 +87,7 @@ assert.throws(
   {
     code: 'ERR_INVALID_ARG_VALUE',
     name: 'TypeError',
-    message: "The property 'options.saltLength' is invalid. Received null",
+    message: "The 'options.saltLength' property is invalid. Received null",
   });
 
 // Test signing and verifying

test/parallel/test-crypto.js

@@ -164,7 +164,7 @@ testImmutability(crypto.getCurves);
 const encodingError = {
   code: 'ERR_INVALID_ARG_VALUE',
   name: 'TypeError',
-  message: "The argument 'encoding' is invalid for data of length 1." +
+  message: "The 'encoding' argument is invalid for data of length 1." +
            " Received 'hex'",
 };
 

test/parallel/test-dns-lookup.js

@@ -54,7 +54,7 @@ assert.throws(() => {
   const err = {
     code: 'ERR_INVALID_ARG_VALUE',
     name: 'TypeError',
-    message: "The argument 'hints' is invalid. Received 100"
+    message: "The 'hints' argument is invalid. Received 100"
   };
   const options = {
     hints: 100,
@@ -72,7 +72,7 @@ assert.throws(() => {
   const err = {
     code: 'ERR_INVALID_ARG_VALUE',
     name: 'TypeError',
-    message: "The argument 'family' must be one of: 0, 4, 6. Received 20"
+    message: "The 'family' argument must be one of: 0, 4, 6. Received 20"
   };
   const options = {
     hints: 0,