Address comments

nodejs · TimothyGu · Apr 21, 2017 · Apr 21, 2017 · Apr 25, 2017 · Apr 25, 2017
commit b43cdee7acf9f6f10d761d3f41c90b49df4bef8d
diff --git a/doc/api/errors.md b/doc/api/errors.md
@@ -602,10 +602,7 @@ semantics for determining whether a path can be used is platform-dependent.
 ### ERR_INVALID_THIS
 
 The `'ERR_INVALID_THIS'` error code is used generically to identify that a
-Node.js API function is called with an incompatible `this` value. Its use is
-currently limited to the [WHATWG URL API][] to satisfy specification
-requirements, but may be expanded to other areas of the Node.js API in the
-future.
+Node.js API function is called with an incompatible `this` value.
 
 Example:
 
@@ -623,9 +620,9 @@ urlSearchParams.has.call(buf, 'foo');
 
 An error with code `'ERR_INVALID_TUPLE'` is thrown when an element in the
 `iterable` provided to the [WHATWG][WHATWG URL API] [`URLSearchParams`
-constructor][`new URLSearchParams(iterable)`] does not represent a name/value
-tuple -- that is, if an element is not iterable, or does not consist of exactly
-two elements.
+constructor][`new URLSearchParams(iterable)`] does not represent a `[name,
+value]` tuple – that is, if an element is not iterable, or does not consist of
+exactly two elements.
 
 <a id="ERR_INVALID_URL"></a>
 ### ERR_INVALID_URL

diff --git a/lib/internal/errors.js b/lib/internal/errors.js
@@ -83,12 +83,11 @@ E('ERR_ARG_NOT_ITERABLE', '%s must be iterable');
 E('ERR_ASSERTION', (msg) => msg);
 E('ERR_INVALID_ARG_TYPE', invalidArgType);
 E('ERR_INVALID_CALLBACK', 'callback must be a function');
-E('ERR_INVALID_FILE_URL_HOST', 'File URL host must %s');
-E('ERR_INVALID_FILE_URL_PATH', 'File URL path must %s');
-E('ERR_INVALID_THIS', 'Value of this must be of type %s');
+E('ERR_INVALID_FILE_URL_HOST', 'File URL host %s');
+E('ERR_INVALID_FILE_URL_PATH', 'File URL path %s');
+E('ERR_INVALID_THIS', 'Value of "this" must be of type %s');
 E('ERR_INVALID_TUPLE', '%s must be an iterable %s tuple');
-E('ERR_INVALID_URL',
-  (input) => `Invalid URL${input !== undefined ? `: ${input}` : ''}`);
+E('ERR_INVALID_URL', 'Invalid URL: %s');
 E('ERR_INVALID_URL_SCHEME',
   (expected) => `The URL must be ${oneOf(expected, 'scheme')}`);
 E('ERR_MISSING_ARGS', missingArgs);

diff --git a/lib/internal/url.js b/lib/internal/url.js
@@ -821,7 +821,7 @@ class URLSearchParams {
           if (typeof pair !== 'object' ||
               typeof pair[Symbol.iterator] !== 'function') {
             throw new errors.TypeError('ERR_INVALID_TUPLE', 'Each query pair',
-                                       'name/value');
+                                       '[name, value]');
           }
           pairs.push(Array.from(pair));
         }
@@ -830,7 +830,7 @@ class URLSearchParams {
         for (const pair of pairs) {
           if (pair.length !== 2) {
             throw new errors.TypeError('ERR_INVALID_TUPLE', 'Each query pair',
-                                       'name/value');
+                                       '[name, value]');
           }
           const key = toUSVString(pair[0]);
           const value = toUSVString(pair[1]);
@@ -1302,8 +1302,9 @@ function getPathFromURLWin32(url) {
       var third = pathname.codePointAt(n + 2) | 0x20;
       if ((pathname[n + 1] === '2' && third === 102) || // 2f 2F /
           (pathname[n + 1] === '5' && third === 99)) {  // 5c 5C \
-        return new errors.TypeError('ERR_INVALID_FILE_URL_PATH',
-                                    'not include encoded \\ or / characters');
+        return new errors.TypeError(
+          'ERR_INVALID_FILE_URL_PATH',
+          'must not include encoded \\ or / characters');
       }
     }
   }
@@ -1322,7 +1323,8 @@ function getPathFromURLWin32(url) {
     var sep = pathname[2];
     if (letter < 97 || letter > 122 ||   // a..z A..Z
         (sep !== ':')) {
-      return new errors.TypeError('ERR_INVALID_FILE_URL_PATH', 'be absolute');
+      return new errors.TypeError('ERR_INVALID_FILE_URL_PATH',
+                                  'must be absolute');
     }
     return pathname.slice(1);
   }
@@ -1331,15 +1333,15 @@ function getPathFromURLWin32(url) {
 function getPathFromURLPosix(url) {
   if (url.hostname !== '') {
     return new errors.TypeError('ERR_INVALID_FILE_URL_HOST',
-                                `be "localhost" or empty on ${platform}`);
+                                `must be "localhost" or empty on ${platform}`);
   }
   var pathname = url.pathname;
   for (var n = 0; n < pathname.length; n++) {
     if (pathname[n] === '%') {
       var third = pathname.codePointAt(n + 2) | 0x20;
       if (pathname[n + 1] === '2' && third === 102) {
         return new errors.TypeError('ERR_INVALID_FILE_URL_PATH',
-                                    'not include encoded / characters');
+                                    'must not include encoded / characters');
       }
     }
   }

diff --git a/test/parallel/test-whatwg-url-searchparams-append.js b/test/parallel/test-whatwg-url-searchparams-append.js
@@ -56,7 +56,7 @@ test(function() {
   }, common.expectsError({
     code: 'ERR_INVALID_THIS',
     type: TypeError,
-    message: 'Value of this must be of type URLSearchParams'
+    message: 'Value of "this" must be of type URLSearchParams'
   }));
   assert.throws(() => {
     params.append('a');

diff --git a/test/parallel/test-whatwg-url-searchparams-constructor.js b/test/parallel/test-whatwg-url-searchparams-constructor.js
@@ -196,7 +196,7 @@ test(() => {
   const tupleError = common.expectsError({
     code: 'ERR_INVALID_TUPLE',
     type: TypeError,
-    message: 'Each query pair must be an iterable name/value tuple'
+    message: 'Each query pair must be an iterable [name, value] tuple'
   });
 
   let params;

diff --git a/test/parallel/test-whatwg-url-searchparams-delete.js b/test/parallel/test-whatwg-url-searchparams-delete.js
@@ -50,7 +50,7 @@ test(function() {
   }, common.expectsError({
     code: 'ERR_INVALID_THIS',
     type: TypeError,
-    message: 'Value of this must be of type URLSearchParams'
+    message: 'Value of "this" must be of type URLSearchParams'
   }));
   assert.throws(() => {
     params.delete();

diff --git a/test/parallel/test-whatwg-url-searchparams-entries.js b/test/parallel/test-whatwg-url-searchparams-entries.js
@@ -31,12 +31,12 @@ assert.throws(() => {
 }, common.expectsError({
   code: 'ERR_INVALID_THIS',
   type: TypeError,
-  message: 'Value of this must be of type URLSearchParamsIterator'
+  message: 'Value of "this" must be of type URLSearchParamsIterator'
 }));
 assert.throws(() => {
   params.entries.call(undefined);
 }, common.expectsError({
   code: 'ERR_INVALID_THIS',
   type: TypeError,
-  message: 'Value of this must be of type URLSearchParams'
+  message: 'Value of "this" must be of type URLSearchParams'
 }));
diff --git a/test/parallel/test-whatwg-url-searchparams-foreach.js b/test/parallel/test-whatwg-url-searchparams-foreach.js
@@ -53,6 +53,6 @@ test(function() {
   }, common.expectsError({
     code: 'ERR_INVALID_THIS',
     type: TypeError,
-    message: 'Value of this must be of type URLSearchParams'
+    message: 'Value of "this" must be of type URLSearchParams'
   }));
 }
diff --git a/test/parallel/test-whatwg-url-searchparams-get.js b/test/parallel/test-whatwg-url-searchparams-get.js
@@ -41,7 +41,7 @@ test(function() {
   }, common.expectsError({
     code: 'ERR_INVALID_THIS',
     type: TypeError,
-    message: 'Value of this must be of type URLSearchParams'
+    message: 'Value of "this" must be of type URLSearchParams'
   }));
   assert.throws(() => {
     params.get();

diff --git a/test/parallel/test-whatwg-url-searchparams-getall.js b/test/parallel/test-whatwg-url-searchparams-getall.js
@@ -45,7 +45,7 @@ test(function() {
   }, common.expectsError({
     code: 'ERR_INVALID_THIS',
     type: TypeError,
-    message: 'Value of this must be of type URLSearchParams'
+    message: 'Value of "this" must be of type URLSearchParams'
   }));
   assert.throws(() => {
     params.getAll();

diff --git a/test/parallel/test-whatwg-url-searchparams-has.js b/test/parallel/test-whatwg-url-searchparams-has.js
@@ -44,7 +44,7 @@ test(function() {
   }, common.expectsError({
     code: 'ERR_INVALID_THIS',
     type: TypeError,
-    message: 'Value of this must be of type URLSearchParams'
+    message: 'Value of "this" must be of type URLSearchParams'
   }));
   assert.throws(() => {
     params.has();

diff --git a/test/parallel/test-whatwg-url-searchparams-keys.js b/test/parallel/test-whatwg-url-searchparams-keys.js
@@ -32,12 +32,12 @@ assert.throws(() => {
 }, common.expectsError({
   code: 'ERR_INVALID_THIS',
   type: TypeError,
-  message: 'Value of this must be of type URLSearchParamsIterator'
+  message: 'Value of "this" must be of type URLSearchParamsIterator'
 }));
 assert.throws(() => {
   params.keys.call(undefined);
 }, common.expectsError({
   code: 'ERR_INVALID_THIS',
   type: TypeError,
-  message: 'Value of this must be of type URLSearchParams'
+  message: 'Value of "this" must be of type URLSearchParams'
 }));
diff --git a/test/parallel/test-whatwg-url-searchparams-set.js b/test/parallel/test-whatwg-url-searchparams-set.js
@@ -42,7 +42,7 @@ test(function() {
   }, common.expectsError({
     code: 'ERR_INVALID_THIS',
     type: TypeError,
-    message: 'Value of this must be of type URLSearchParams'
+    message: 'Value of "this" must be of type URLSearchParams'
   }));
   assert.throws(() => {
     params.set('a');

diff --git a/test/parallel/test-whatwg-url-searchparams-stringifier.js b/test/parallel/test-whatwg-url-searchparams-stringifier.js
@@ -130,6 +130,6 @@ test(function() {
   }, common.expectsError({
     code: 'ERR_INVALID_THIS',
     type: TypeError,
-    message: 'Value of this must be of type URLSearchParams'
+    message: 'Value of "this" must be of type URLSearchParams'
   }));
 }
diff --git a/test/parallel/test-whatwg-url-searchparams-values.js b/test/parallel/test-whatwg-url-searchparams-values.js
@@ -32,12 +32,12 @@ assert.throws(() => {
 }, common.expectsError({
   code: 'ERR_INVALID_THIS',
   type: TypeError,
-  message: 'Value of this must be of type URLSearchParamsIterator'
+  message: 'Value of "this" must be of type URLSearchParamsIterator'
 }));
 assert.throws(() => {
   params.values.call(undefined);
 }, common.expectsError({
   code: 'ERR_INVALID_THIS',
   type: TypeError,
-  message: 'Value of this must be of type URLSearchParams'
+  message: 'Value of "this" must be of type URLSearchParams'
 }));