errors: improve ERR_INVALID_ARG_TYPE

The error message might be misleading if an object property was the issue and not the argument itself. Fix this by checking if a argument or a property is passed to the handler function. PR-URL: #13730 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Timothy Gu <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
nodejs · Jun 22, 2017 · 3e17884 · 3e17884
1 parent 2a46e57
commit 3e17884
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
@@ -192,7 +192,8 @@ E('ERR_V8BREAKITERATOR', 'full ICU data not installed. ' +
 function invalidArgType(name, expected, actual) {
   const assert = lazyAssert();
   assert(name, 'name is required');
-  var msg = `The "${name}" argument must be ${oneOf(expected, 'type')}`;
+  const type = name.includes('.') ? 'property' : 'argument';
+  var msg = `The "${name}" ${type} must be ${oneOf(expected, 'type')}`;
   if (arguments.length >= 3) {
     msg += `. Received type ${actual !== null ? typeof actual : 'null'}`;
   }

diff --git a/test/parallel/test-process-cpuUsage.js b/test/parallel/test-process-cpuUsage.js
@@ -34,13 +34,13 @@ for (let i = 0; i < 10; i++) {
 const invalidUserArgument = common.expectsError({
   code: 'ERR_INVALID_ARG_TYPE',
   type: TypeError,
-  message: 'The "preValue.user" argument must be of type Number'
+  message: 'The "preValue.user" property must be of type Number'
 });
 
 const invalidSystemArgument = common.expectsError({
   code: 'ERR_INVALID_ARG_TYPE',
   type: TypeError,
-  message: 'The "preValue.system" argument must be of type Number'
+  message: 'The "preValue.system" property must be of type Number'
 });
 
 

diff --git a/test/parallel/test-util-inherits.js b/test/parallel/test-util-inherits.js
@@ -85,7 +85,7 @@ assert.throws(function() {
 }, common.expectsError({
     code: 'ERR_INVALID_ARG_TYPE',
     type: TypeError,
-    message: 'The "superCtor.prototype" argument must be of type function'
+    message: 'The "superCtor.prototype" property must be of type function'
 })
 );
 assert.throws(function() {