path: fix bugs and inconsistencies #54224
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
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 |
|---|---|---|
|
|
@@ -186,6 +186,7 @@ const win32 = { | |
| let resolvedDevice = ''; | ||
| let resolvedTail = ''; | ||
| let resolvedAbsolute = false; | ||
| let slashCheck = false; | ||
|
|
||
| for (let i = args.length - 1; i >= -1; i--) { | ||
| let path; | ||
|
|
@@ -217,6 +218,10 @@ const win32 = { | |
| } | ||
| } | ||
|
|
||
| if (i === args.length - 1 && | ||
| isPathSeparator(StringPrototypeCharCodeAt(path, path.length - 1))) { | ||
| slashCheck = true; | ||
| } | ||
| const len = path.length; | ||
| let rootEnd = 0; | ||
| let device = ''; | ||
|
|
@@ -264,10 +269,16 @@ const win32 = { | |
| j++; | ||
| } | ||
| if (j === len || j !== last) { | ||
| if (firstPart !== '.' && firstPart !== '?') { | ||
| // We matched a UNC root | ||
| device = | ||
| `\\\\${firstPart}\\${StringPrototypeSlice(path, last, j)}`; | ||
| rootEnd = j; | ||
| } else { | ||
| // We matched a device root (e.g. \\\\.\\PHYSICALDRIVE0) | ||
|
There was a problem hiding this comment. I think it should also handle There was a problem hiding this comment. Thanks for the review. Fixed. There was a problem hiding this comment. There are other inconsistencies: path.resolve('\\\\?\\c:/') // \\?\c:
path.toNamespacedPath('c:/') // \\?\c:\
path.normalize('\\\\.\\foo') // \\.\foo\
path.resolve('\\\\.\\foo\\') // \\.\fooThere was a problem hiding this comment. OK, I'll try to fix these inconsistencies. I have a question. path.resolve("C:\\") // C:\\
path.resolve("//server/share") // \\\\server\\share\\But, I think it should be: path.resolve("C:\\") // C:
path.resolve("//server/share") // \\\\server\\shareIf I change these ones, path.resolve("//server/share/folder") // \\\\server\\share\\folder
path.resolve("//server/share") // \\\\server\\share\\What do you think? There was a problem hiding this comment. I think it should respect the original input. If there is a trailing slash, keep it, otherwise do not add it. There was a problem hiding this comment. AFAIK There was a problem hiding this comment. My latest commit fixes the inconsistencies in |
||
| device = `\\\\${firstPart}`; | ||
| rootEnd = 4; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -319,9 +330,21 @@ const win32 = { | |
| resolvedTail = normalizeString(resolvedTail, !resolvedAbsolute, '\\', | ||
| isPathSeparator); | ||
|
|
||
| if (!resolvedAbsolute) { | ||
| return `${resolvedDevice}${resolvedTail}` || '.'; | ||
| } | ||
|
|
||
| if (resolvedTail.length === 0) { | ||
| return slashCheck ? `${resolvedDevice}\\` : resolvedDevice; | ||
| } | ||
|
|
||
| if (slashCheck) { | ||
| return resolvedTail === '\\' ? | ||
| `${resolvedDevice}\\` : | ||
| `${resolvedDevice}\\${resolvedTail}\\`; | ||
| } | ||
|
|
||
| return `${resolvedDevice}\\${resolvedTail}`; | ||
| }, | ||
|
|
||
| /** | ||
|
|
@@ -377,17 +400,22 @@ const win32 = { | |
| !isPathSeparator(StringPrototypeCharCodeAt(path, j))) { | ||
| j++; | ||
| } | ||
| if (j === len || j !== last) { | ||
| if (firstPart === '.' || firstPart === '?') { | ||
| // We matched a device root (e.g. \\\\.\\PHYSICALDRIVE0) | ||
| device = `\\\\${firstPart}`; | ||
| rootEnd = 4; | ||
| } else if (j === len) { | ||
| // We matched a UNC root only | ||
| // Return the normalized version of the UNC root since there | ||
| // is nothing left to process | ||
| return `\\\\${firstPart}\\${StringPrototypeSlice(path, last)}\\`; | ||
| } else { | ||
| // We matched a UNC root with leftovers | ||
| device = | ||
| `\\\\${firstPart}\\${StringPrototypeSlice(path, last, j)}`; | ||
| rootEnd = j; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -1122,6 +1150,7 @@ const posix = { | |
| resolve(...args) { | ||
| let resolvedPath = ''; | ||
| let resolvedAbsolute = false; | ||
| let slashCheck = false; | ||
|
|
||
|
|
||
| for (let i = args.length - 1; i >= -1 && !resolvedAbsolute; i--) { | ||
| const path = i >= 0 ? args[i] : posixCwd(); | ||
|
|
@@ -1131,8 +1160,17 @@ const posix = { | |
| if (path.length === 0) { | ||
| continue; | ||
| } | ||
| if (i === args.length - 1 && | ||
| isPosixPathSeparator(StringPrototypeCharCodeAt(path, | ||
| path.length - 1))) { | ||
| slashCheck = true; | ||
| } | ||
|
|
||
| if (resolvedPath.length !== 0) { | ||
| resolvedPath = `${path}/${resolvedPath}`; | ||
| } else { | ||
| resolvedPath = path; | ||
| } | ||
| resolvedAbsolute = | ||
| StringPrototypeCharCodeAt(path, 0) === CHAR_FORWARD_SLASH; | ||
| } | ||
|
|
@@ -1144,10 +1182,20 @@ const posix = { | |
| resolvedPath = normalizeString(resolvedPath, !resolvedAbsolute, '/', | ||
| isPosixPathSeparator); | ||
|
|
||
| if (!resolvedAbsolute) { | ||
| if (resolvedPath.length === 0) { | ||
| return '.'; | ||
| } | ||
| if (slashCheck) { | ||
| return `${resolvedPath}/`; | ||
| } | ||
| return resolvedPath; | ||
| } | ||
|
|
||
| if (resolvedPath.length === 0 || resolvedPath === '/') { | ||
| return '/'; | ||
| } | ||
| return slashCheck ? `/${resolvedPath}/` : `/${resolvedPath}`; | ||
| }, | ||
|
|
||
| /** | ||
|
|
@@ -1231,11 +1279,35 @@ const posix = { | |
| if (from === to) | ||
| return ''; | ||
|
|
||
| // Trim any leading slashes | ||
| let fromStart = 0; | ||
| while (fromStart < from.length && | ||
| StringPrototypeCharCodeAt(from, fromStart) === CHAR_FORWARD_SLASH) { | ||
| fromStart++; | ||
| } | ||
| // Trim trailing slashes | ||
| let fromEnd = from.length; | ||
| while ( | ||
| fromEnd - 1 > fromStart && | ||
| StringPrototypeCharCodeAt(from, fromEnd - 1) === CHAR_FORWARD_SLASH | ||
| ) { | ||
| fromEnd--; | ||
| } | ||
| const fromLen = fromEnd - fromStart; | ||
|
|
||
| // Trim any leading slashes | ||
| let toStart = 0; | ||
| while (toStart < to.length && | ||
| StringPrototypeCharCodeAt(to, toStart) === CHAR_FORWARD_SLASH) { | ||
| toStart++; | ||
| } | ||
| // Trim trailing slashes | ||
| let toEnd = to.length; | ||
| while (toEnd - 1 > toStart && | ||
| StringPrototypeCharCodeAt(to, toEnd - 1) === CHAR_FORWARD_SLASH) { | ||
| toEnd--; | ||
| } | ||
| const toLen = toEnd - toStart; | ||
|
|
||
| // Compare paths to find the longest common path from root | ||
| const length = (fromLen < toLen ? fromLen : toLen); | ||
|
|
||
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
Oops, something went wrong.
Oops, something went wrong.
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.
I believe it is possible to simplify the code by changing this to a string that we always append to the output and that is either an empty string or the slash.