url: add err.input to ERR_INVALID_FILE_URL_PATH

Otherwise there's no information from the error about what exactly is the invalid URL. PR-URL: #59730 Reviewed-By: Yagiz Nizipli <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>

Author: joyeecheung

doc/api/errors.md

@@ -1996,6 +1996,9 @@ A Node.js API that consumes `file:` URLs (such as certain functions in the
 [`fs`][] module) encountered a file URL with an incompatible path. The exact
 semantics for determining whether a path can be used is platform-dependent.
 
+The thrown error object includes an `input` property that contains the URL object
+of the invalid `file:` URL.
+
 <aid="ERR_INVALID_HANDLE_TYPE"></a>
 
 ### `ERR_INVALID_HANDLE_TYPE`

lib/internal/errors.js

@@ -1476,7 +1476,10 @@ E('ERR_INVALID_FD',
 E('ERR_INVALID_FD_TYPE','Unsupported fd type: %s',TypeError);
 E('ERR_INVALID_FILE_URL_HOST',
 'File URL host must be "localhost" or empty on %s',TypeError);
-E('ERR_INVALID_FILE_URL_PATH','File URL path %s',TypeError);
+E('ERR_INVALID_FILE_URL_PATH',function(reason,input){
+this.input=input;
+return`File URL path ${reason}`;
+},TypeError);
 E('ERR_INVALID_HANDLE_TYPE','This handle type cannot be sent',TypeError);
 E('ERR_INVALID_HTTP_TOKEN','%s must be a valid HTTP token ["%s"]',TypeError,HideStackFramesError);
 E('ERR_INVALID_IP_ADDRESS','Invalid IP address: %s',TypeError);

lib/internal/url.js

@@ -1463,7 +1463,7 @@ function getPathFromURLWin32(url){
 if((pathname[n+1]==='2'&&third===102)||// 2f 2F /
 (pathname[n+1]==='5'&&third===99)){// 5c 5C \
 thrownewERR_INVALID_FILE_URL_PATH(
-'must not include encoded \\ or / characters',
+'must not include encoded \\ or / characters',url,
 );
 }
 }
@@ -1484,7 +1484,7 @@ function getPathFromURLWin32(url){
 constsep=StringPrototypeCharAt(pathname,2);
 if(letter<CHAR_LOWERCASE_A||letter>CHAR_LOWERCASE_Z||// a..z A..Z
 (sep!==':')){
-thrownewERR_INVALID_FILE_URL_PATH('must be absolute');
+thrownewERR_INVALID_FILE_URL_PATH('must be absolute',url);
 }
 returnStringPrototypeSlice(pathname,1);
 }
@@ -1551,7 +1551,7 @@ function getPathBufferFromURLWin32(url){
 
 if(letter<CHAR_LOWERCASE_A||letter>CHAR_LOWERCASE_Z||// a..z A..Z
 (sep!==CHAR_COLON)){
-thrownewERR_INVALID_FILE_URL_PATH('must be absolute');
+thrownewERR_INVALID_FILE_URL_PATH('must be absolute',url);
 }
 
 // Now, we'll just return everything except the first byte of
@@ -1570,6 +1570,7 @@ function getPathFromURLPosix(url){
 if(pathname[n+1]==='2'&&third===102){
 thrownewERR_INVALID_FILE_URL_PATH(
 'must not include encoded / characters',
+url,
 );
 }
 }

test/parallel/test-url-fileurltopath.js

@@ -31,24 +31,6 @@ test('fileURLToPath with host', () =>{
 }
 });
 
-test('fileURLToPath with invalid path',()=>{
-if(isWindows){
-assert.throws(()=>url.fileURLToPath('file:///C:/a%2F/'),{
-code: 'ERR_INVALID_FILE_URL_PATH'
-});
-assert.throws(()=>url.fileURLToPath('file:///C:/a%5C/'),{
-code: 'ERR_INVALID_FILE_URL_PATH'
-});
-assert.throws(()=>url.fileURLToPath('file:///?:/'),{
-code: 'ERR_INVALID_FILE_URL_PATH'
-});
-}else{
-assert.throws(()=>url.fileURLToPath('file:///a%2F/'),{
-code: 'ERR_INVALID_FILE_URL_PATH'
-});
-}
-});
-
 constwindowsTestCases=[
 // Lowercase ascii alpha
 {path: 'C:\\foo',fileURL: 'file:///C:/foo'},

test/parallel/test-url-invalid-file-url-path-input.js

@@ -0,0 +1,25 @@
+'use strict';
+
+// This tests that url.fileURLToPath() throws ERR_INVALID_FILE_URL_PATH
+// for invalid file URL paths along with the input property.
+
+const{ isWindows }=require('../common');
+constassert=require('assert');
+consturl=require('url');
+
+constinputs=[];
+
+if(isWindows){
+inputs.push('file:///C:/a%2F/','file:///C:/a%5C/','file:///?:/');
+}else{
+inputs.push('file:///a%2F/');
+}
+
+for(constinputofinputs){
+assert.throws(()=>url.fileURLToPath(input),(err)=>{
+assert.strictEqual(err.code,'ERR_INVALID_FILE_URL_PATH');
+assert(err.inputinstanceofURL);
+assert.strictEqual(err.input.href,input);
+returntrue;
+});
+}