Skip to content
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.

Sign up for GitHub

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

path: fix posix.relative() on Windows #37747

Merged
merged 1 commit into from
Apr 3, 2021
Merged

path: fix posix.relative() on Windows #37747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion lib/path.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,15 @@

const {
FunctionPrototypeBind,
RegExp,
StringPrototypeCharCodeAt,
StringPrototypeIndexOf,
StringPrototypeLastIndexOf,
StringPrototypeReplace,
StringPrototypeSlice,
StringPrototypeToLowerCase,
} = primordials;

const {
CHAR_UPPERCASE_A,
CHAR_LOWERCASE_A,
Expand Down Expand Up @@ -1014,7 +1018,17 @@ const posix = {
let resolvedAbsolute = false;

for (let i = args.length - 1; i >= -1 && !resolvedAbsolute; i--) {
const path = i >= 0 ? args[i] : process.cwd();
let path;
if (i >= 0) {
path = args[i];
} else {
const _ = StringPrototypeReplace(
process.cwd(),
new RegExp(`\\${module.exports.sep}`, 'g'),
posix.sep
);
path = StringPrototypeSlice(_, StringPrototypeIndexOf(_, posix.sep));
}

validateString(path, 'path');

Expand Down
14 changes: 0 additions & 14 deletions test/known_issues/known_issues.status
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,18 @@ test-vm-timeout-escape-queuemicrotask: SKIP
[$system==win32]

[$system==linux]
# Windows-specific test
test-path-posix-relative-on-windows: SKIP

[$system==macos]
# Windows-specific test
test-path-posix-relative-on-windows: SKIP

[$system==solaris]
# Windows-specific test
test-path-posix-relative-on-windows: SKIP

[$system==freebsd]
# Windows-specific test
test-path-posix-relative-on-windows: SKIP

[$system==aix]
# Windows-specific test
test-path-posix-relative-on-windows: SKIP

[$arch==arm]
# The Raspberry Pis are too slow to run this test.
# See https://github.com/nodejs/build/issues/2227#issuecomment-608334574
test-crypto-authenticated-stream: SKIP
# Windows-specific test
test-path-posix-relative-on-windows: SKIP

[$system==ibmi]
# Windows-specific test
test-path-posix-relative-on-windows: SKIP
0 ...es/test-path-posix-relative-on-windows.js → ...el/test-path-posix-relative-on-windows.js
View file
Open in desktop
File renamed without changes.
12 changes: 10 additions & 2 deletions test/parallel/test-path-resolve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ const failures = [];
const slashRE = /\//g;
const backslashRE = /\\/g;

const posixyCwd = common.isWindows ?
(() => {
const _ = process.cwd()
.replaceAll(path.sep, path.posix.sep);
return _.slice(_.indexOf(path.posix.sep));
})() :
process.cwd();

const resolveTests = [
[ path.win32.resolve,
// Arguments result
Expand All @@ -31,8 +39,8 @@ const resolveTests = [
// Arguments result
[[['/var/lib', '../', 'file/'], '/var/file'],
[['/var/lib', '/../', 'file/'], '/file'],
[['a/b/c/', '../../..'], process.cwd()],
[['.'], process.cwd()],
[['a/b/c/', '../../..'], posixyCwd],
[['.'], posixyCwd],
[['/some/dir', '.', '/absolute/'], '/absolute'],
[['/foo/tmp.3/', '../tmp.3/cycles/root.js'], '/foo/tmp.3/cycles/root.js'],
],
Expand Down