Skip to content

lib, path: support file:/// urls in path functions #52497

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

Closed
avivkeller wants to merge 7 commits into from
Closed

lib, path: support file:/// urls in path functions #52497

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2429ae0
lib, path: support file:/// urls in path functions
avivkeller Apr 12, 2024
b8a5931
Update test-path-makelong.js
avivkeller Apr 12, 2024
1747da0
Update test-path-isabsolute.js
avivkeller Apr 12, 2024
2f2fa2e
doc: add changes to YAML
avivkeller Apr 12, 2024
2528cb7
doc: fix changes order
avivkeller Apr 12, 2024
7a62d41
fix: lazy load path
himself65 Apr 14, 2024
18f0be4
Update test/parallel/test-path-dirname.js
avivkeller Apr 14, 2024
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
Prev Previous commit
Next Next commit
fix: lazy load path
  • Loading branch information
@himself65
himself65 committed Apr 14, 2024
commit 7a62d4105e7ee48b0646e5878f5248e09a01e8f8
13 changes: 10 additions & 3 deletions lib/internal/url.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,20 @@ const {
CHAR_PERCENT,
CHAR_PLUS,
} = require('internal/constants');
const path = require('path');

const {
validateFunction,
} = require('internal/validators');

const querystring = require('querystring');

let lazyLoadPath;

function lazyLoadPathSync() {
lazyLoadPath ??= require('path');
return lazyLoadPath;
}

const { platform } = process;
const isWindows = platform === 'win32';

Expand Down Expand Up @@ -1529,13 +1535,14 @@ function pathToFileURL(filepath) {
RegExpPrototypeSymbolReplace(backslashRegEx, StringPrototypeSlice(filepath, hostnameEndIndex), '/'));
return outURL;
}
let resolved = path.resolve(filepath);
const { resolve, sep } = lazyLoadPathSync();
let resolved = resolve(filepath);
// path.resolve strips trailing slashes so we must add them back
const filePathLast = StringPrototypeCharCodeAt(filepath,
filepath.length - 1);
if ((filePathLast === CHAR_FORWARD_SLASH ||
(isWindows && filePathLast === CHAR_BACKWARD_SLASH)) &&
resolved[resolved.length - 1] !== path.sep)
resolved[resolved.length - 1] !== sep)
resolved += '/';

// Call encodePathChars first to avoid encoding % again for ? and #.
Expand Down