-
Notifications
You must be signed in to change notification settings - Fork 30.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
url: return backslashes from fileURLToPath on Windows #25349
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -63,7 +63,7 @@ if (common.isWindows) { | |
code: 'ERR_INVALID_ARG_VALUE', | ||
type: TypeError, | ||
message: 'The argument \'path\' must be a string or Uint8Array without ' + | ||
'null bytes. Received \'c:/tmp/\\u0000test\'' | ||
'null bytes. Received \'c:\\\\tmp\\\\\\u0000test\'' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Updated this test after I noticed the error. The reason for multiple backslashes is that ERR_INVALID_ARG_VALUE calls |
||
} | ||
); | ||
} else { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,152 @@ | ||
'use strict'; | ||
const { isWindows } = require('../common'); | ||
const assert = require('assert'); | ||
const url = require('url'); | ||
|
||
function testInvalidArgs(...args) { | ||
for (const arg of args) { | ||
assert.throws(() => url.fileURLToPath(arg), { | ||
code: 'ERR_INVALID_ARG_TYPE' | ||
}); | ||
} | ||
} | ||
|
||
// Input must be string or URL | ||
testInvalidArgs(null, undefined, 1, {}, true); | ||
|
||
// Input must be a file URL | ||
assert.throws(() => url.fileURLToPath('https://a/b/c'), { | ||
code: 'ERR_INVALID_URL_SCHEME' | ||
}); | ||
|
||
{ | ||
const withHost = new URL('file://host/a'); | ||
|
||
if (isWindows) { | ||
assert.strictEqual(url.fileURLToPath(withHost), '\\\\host\\a'); | ||
} else { | ||
assert.throws(() => url.fileURLToPath(withHost), { | ||
code: 'ERR_INVALID_FILE_URL_HOST' | ||
}); | ||
} | ||
} | ||
|
||
{ | ||
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' | ||
}); | ||
} | ||
} | ||
|
||
{ | ||
let testCases; | ||
if (isWindows) { | ||
testCases = [ | ||
// lowercase ascii alpha | ||
{ path: 'C:\\foo', fileURL: 'file:///C:/foo' }, | ||
// uppercase ascii alpha | ||
{ path: 'C:\\FOO', fileURL: 'file:///C:/FOO' }, | ||
// dir | ||
{ path: 'C:\\dir\\foo', fileURL: 'file:///C:/dir/foo' }, | ||
// trailing separator | ||
{ path: 'C:\\dir\\', fileURL: 'file:///C:/dir/' }, | ||
// dot | ||
{ path: 'C:\\foo.mjs', fileURL: 'file:///C:/foo.mjs' }, | ||
// space | ||
{ path: 'C:\\foo bar', fileURL: 'file:///C:/foo%20bar' }, | ||
// question mark | ||
{ path: 'C:\\foo?bar', fileURL: 'file:///C:/foo%3Fbar' }, | ||
// number sign | ||
{ path: 'C:\\foo#bar', fileURL: 'file:///C:/foo%23bar' }, | ||
// ampersand | ||
{ path: 'C:\\foo&bar', fileURL: 'file:///C:/foo&bar' }, | ||
// equals | ||
{ path: 'C:\\foo=bar', fileURL: 'file:///C:/foo=bar' }, | ||
// colon | ||
{ path: 'C:\\foo:bar', fileURL: 'file:///C:/foo:bar' }, | ||
// semicolon | ||
{ path: 'C:\\foo;bar', fileURL: 'file:///C:/foo;bar' }, | ||
// percent | ||
{ path: 'C:\\foo%bar', fileURL: 'file:///C:/foo%25bar' }, | ||
// backslash | ||
{ path: 'C:\\foo\\bar', fileURL: 'file:///C:/foo/bar' }, | ||
// backspace | ||
{ path: 'C:\\foo\bbar', fileURL: 'file:///C:/foo%08bar' }, | ||
// tab | ||
{ path: 'C:\\foo\tbar', fileURL: 'file:///C:/foo%09bar' }, | ||
// newline | ||
{ path: 'C:\\foo\nbar', fileURL: 'file:///C:/foo%0Abar' }, | ||
// carriage return | ||
{ path: 'C:\\foo\rbar', fileURL: 'file:///C:/foo%0Dbar' }, | ||
// latin1 | ||
{ path: 'C:\\fóóbàr', fileURL: 'file:///C:/f%C3%B3%C3%B3b%C3%A0r' }, | ||
// euro sign (BMP code point) | ||
{ path: 'C:\\€', fileURL: 'file:///C:/%E2%82%AC' }, | ||
// rocket emoji (non-BMP code point) | ||
{ path: 'C:\\🚀', fileURL: 'file:///C:/%F0%9F%9A%80' } | ||
]; | ||
} else { | ||
testCases = [ | ||
// lowercase ascii alpha | ||
{ path: '/foo', fileURL: 'file:///foo' }, | ||
// uppercase ascii alpha | ||
{ path: '/FOO', fileURL: 'file:///FOO' }, | ||
// dir | ||
{ path: '/dir/foo', fileURL: 'file:///dir/foo' }, | ||
// trailing separator | ||
{ path: '/dir/', fileURL: 'file:///dir/' }, | ||
// dot | ||
{ path: '/foo.mjs', fileURL: 'file:///foo.mjs' }, | ||
// space | ||
{ path: '/foo bar', fileURL: 'file:///foo%20bar' }, | ||
// question mark | ||
{ path: '/foo?bar', fileURL: 'file:///foo%3Fbar' }, | ||
// number sign | ||
{ path: '/foo#bar', fileURL: 'file:///foo%23bar' }, | ||
// ampersand | ||
{ path: '/foo&bar', fileURL: 'file:///foo&bar' }, | ||
// equals | ||
{ path: '/foo=bar', fileURL: 'file:///foo=bar' }, | ||
// colon | ||
{ path: '/foo:bar', fileURL: 'file:///foo:bar' }, | ||
// semicolon | ||
{ path: '/foo;bar', fileURL: 'file:///foo;bar' }, | ||
// percent | ||
{ path: '/foo%bar', fileURL: 'file:///foo%25bar' }, | ||
// backslash | ||
{ path: '/foo\\bar', fileURL: 'file:///foo%5Cbar' }, | ||
// backspace | ||
{ path: '/foo\bbar', fileURL: 'file:///foo%08bar' }, | ||
// tab | ||
{ path: '/foo\tbar', fileURL: 'file:///foo%09bar' }, | ||
// newline | ||
{ path: '/foo\nbar', fileURL: 'file:///foo%0Abar' }, | ||
// carriage return | ||
{ path: '/foo\rbar', fileURL: 'file:///foo%0Dbar' }, | ||
// latin1 | ||
{ path: '/fóóbàr', fileURL: 'file:///f%C3%B3%C3%B3b%C3%A0r' }, | ||
// euro sign (BMP code point) | ||
{ path: '/€', fileURL: 'file:///%E2%82%AC' }, | ||
// rocket emoji (non-BMP code point) | ||
{ path: '/🚀', fileURL: 'file:///%F0%9F%9A%80' }, | ||
]; | ||
} | ||
|
||
for (const { path, fileURL } of testCases) { | ||
const fromString = url.fileURLToPath(fileURL); | ||
assert.strictEqual(fromString, path); | ||
const fromURL = url.fileURLToPath(new URL(fileURL)); | ||
assert.strictEqual(fromURL, path); | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you think it makes anything more readable here or elsewhere, you can use
path.win32.sep
and/orpath.posix.sep
and/orpath.sep
. (No strong opinion from me on whether or not they should be used here. Just pointing 'em out in case you didn't know about 'em.)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure I have a strong opinion either.