path: refactor for less indentation
This moves the `if (len === 1)` case to the top of the function. That way it is possible to reduce the indentation level due to returning early in that case. On top of that the following was done: 1) For clarity refactored for loops which were meant to count up a variable into a while loop. 2) Used template strings instead of string concat. 3) Consolidating nested if statements. 4) Using tenary expressions if applicable when assigning variables to reduce the code overhead. PR-URL: https://github.com/nodejs/node/pull/25278 Reviewed-By: Michaël Zasso <targos@protonmail.com>
This commit is contained in:
Ruben Bridgewater
parent
e68b0d6fb3
commit
7cbe29eb4d
155
lib/path.js
155
lib/path.js
@ -270,7 +270,11 @@ const win32 = {
|
||||
const code = path.charCodeAt(0);
|
||||
|
||||
// Try to match a root
|
||||
if (len > 1) {
|
||||
if (len === 1) {
|
||||
// `path` contains just a single char, exit early to avoid
|
||||
// unnecessary work
|
||||
return isPosixPathSeparator(code) ? '\\' : path;
|
||||
}
|
||||
if (isPathSeparator(code)) {
|
||||
// Possible UNC root
|
||||
|
||||
@ -280,40 +284,36 @@ const win32 = {
|
||||
|
||||
if (isPathSeparator(path.charCodeAt(1))) {
|
||||
// Matched double path separator at beginning
|
||||
var j = 2;
|
||||
var last = j;
|
||||
let j = 2;
|
||||
let last = j;
|
||||
// Match 1 or more non-path separators
|
||||
for (; j < len; ++j) {
|
||||
if (isPathSeparator(path.charCodeAt(j)))
|
||||
break;
|
||||
while (j < len && !isPathSeparator(path.charCodeAt(j))) {
|
||||
j++;
|
||||
}
|
||||
if (j < len && j !== last) {
|
||||
const firstPart = path.slice(last, j);
|
||||
// Matched!
|
||||
last = j;
|
||||
// Match 1 or more path separators
|
||||
for (; j < len; ++j) {
|
||||
if (!isPathSeparator(path.charCodeAt(j)))
|
||||
break;
|
||||
while (j < len && isPathSeparator(path.charCodeAt(j))) {
|
||||
j++;
|
||||
}
|
||||
if (j < len && j !== last) {
|
||||
// Matched!
|
||||
last = j;
|
||||
// Match 1 or more non-path separators
|
||||
for (; j < len; ++j) {
|
||||
if (isPathSeparator(path.charCodeAt(j)))
|
||||
break;
|
||||
while (j < len && !isPathSeparator(path.charCodeAt(j))) {
|
||||
j++;
|
||||
}
|
||||
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 + '\\' + path.slice(last) + '\\';
|
||||
} else if (j !== last) {
|
||||
return `\\\\${firstPart}\\${path.slice(last)}\\`;
|
||||
}
|
||||
if (j !== last) {
|
||||
// We matched a UNC root with leftovers
|
||||
|
||||
device = '\\\\' + firstPart + '\\' + path.slice(last, j);
|
||||
device = `\\\\${firstPart}\\${path.slice(last, j)}`;
|
||||
rootEnd = j;
|
||||
}
|
||||
}
|
||||
@ -321,27 +321,17 @@ const win32 = {
|
||||
} else {
|
||||
rootEnd = 1;
|
||||
}
|
||||
} else if (isWindowsDeviceRoot(code)) {
|
||||
} else if (isWindowsDeviceRoot(code) && path.charCodeAt(1) === CHAR_COLON) {
|
||||
// Possible device root
|
||||
|
||||
if (path.charCodeAt(1) === CHAR_COLON) {
|
||||
device = path.slice(0, 2);
|
||||
rootEnd = 2;
|
||||
if (len > 2) {
|
||||
if (isPathSeparator(path.charCodeAt(2))) {
|
||||
if (len > 2 && isPathSeparator(path.charCodeAt(2))) {
|
||||
// Treat separator following drive name as an absolute path
|
||||
// indicator
|
||||
isAbsolute = true;
|
||||
rootEnd = 3;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (isPathSeparator(code)) {
|
||||
// `path` contains just a path separator, exit early to avoid unnecessary
|
||||
// work
|
||||
return '\\';
|
||||
}
|
||||
|
||||
let tail = rootEnd < len ?
|
||||
normalizeString(path.slice(rootEnd), !isAbsolute, '\\', isPathSeparator) :
|
||||
@ -592,14 +582,17 @@ const win32 = {
|
||||
const len = path.length;
|
||||
if (len === 0)
|
||||
return '.';
|
||||
var rootEnd = -1;
|
||||
var end = -1;
|
||||
var matchedSlash = true;
|
||||
var offset = 0;
|
||||
let rootEnd = -1;
|
||||
let offset = 0;
|
||||
const code = path.charCodeAt(0);
|
||||
|
||||
if (len === 1) {
|
||||
// `path` contains just a path separator, exit early to avoid
|
||||
// unnecessary work or a dot.
|
||||
return isPathSeparator(code) ? path : '.';
|
||||
}
|
||||
|
||||
// Try to match a root
|
||||
if (len > 1) {
|
||||
if (isPathSeparator(code)) {
|
||||
// Possible UNC root
|
||||
|
||||
@ -607,28 +600,25 @@ const win32 = {
|
||||
|
||||
if (isPathSeparator(path.charCodeAt(1))) {
|
||||
// Matched double path separator at beginning
|
||||
var j = 2;
|
||||
var last = j;
|
||||
let j = 2;
|
||||
let last = j;
|
||||
// Match 1 or more non-path separators
|
||||
for (; j < len; ++j) {
|
||||
if (isPathSeparator(path.charCodeAt(j)))
|
||||
break;
|
||||
while (j < len && !isPathSeparator(path.charCodeAt(j))) {
|
||||
j++;
|
||||
}
|
||||
if (j < len && j !== last) {
|
||||
// Matched!
|
||||
last = j;
|
||||
// Match 1 or more path separators
|
||||
for (; j < len; ++j) {
|
||||
if (!isPathSeparator(path.charCodeAt(j)))
|
||||
break;
|
||||
while (j < len && isPathSeparator(path.charCodeAt(j))) {
|
||||
j++;
|
||||
}
|
||||
if (j < len && j !== last) {
|
||||
// Matched!
|
||||
last = j;
|
||||
// Match 1 or more non-path separators
|
||||
for (; j < len; ++j) {
|
||||
if (isPathSeparator(path.charCodeAt(j)))
|
||||
break;
|
||||
while (j < len && !isPathSeparator(path.charCodeAt(j))) {
|
||||
j++;
|
||||
}
|
||||
if (j === len) {
|
||||
// We matched a UNC root only
|
||||
@ -644,23 +634,14 @@ const win32 = {
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (isWindowsDeviceRoot(code)) {
|
||||
// Possible device root
|
||||
|
||||
if (path.charCodeAt(1) === CHAR_COLON) {
|
||||
rootEnd = offset = 2;
|
||||
if (len > 2) {
|
||||
if (isPathSeparator(path.charCodeAt(2)))
|
||||
rootEnd = offset = 3;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (isPathSeparator(code)) {
|
||||
// `path` contains just a path separator, exit early to avoid
|
||||
// unnecessary work
|
||||
return path;
|
||||
} else if (isWindowsDeviceRoot(code) && path.charCodeAt(1) === CHAR_COLON) {
|
||||
rootEnd = len > 2 && isPathSeparator(path.charCodeAt(2)) ? 3 : 2;
|
||||
offset = rootEnd;
|
||||
}
|
||||
|
||||
let end = -1;
|
||||
let matchedSlash = true;
|
||||
for (var i = len - 1; i >= offset; --i) {
|
||||
if (isPathSeparator(path.charCodeAt(i))) {
|
||||
if (!matchedSlash) {
|
||||
@ -843,55 +824,61 @@ const win32 = {
|
||||
var rootEnd = 0;
|
||||
let code = path.charCodeAt(0);
|
||||
|
||||
if (len === 1) {
|
||||
if (isPathSeparator(code)) {
|
||||
// `path` contains just a path separator, exit early to avoid
|
||||
// unnecessary work
|
||||
ret.root = ret.dir = path;
|
||||
return ret;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
// Try to match a root
|
||||
if (len > 1) {
|
||||
if (isPathSeparator(code)) {
|
||||
// Possible UNC root
|
||||
|
||||
rootEnd = 1;
|
||||
if (isPathSeparator(path.charCodeAt(1))) {
|
||||
// Matched double path separator at beginning
|
||||
var j = 2;
|
||||
var last = j;
|
||||
let j = 2;
|
||||
let last = j;
|
||||
// Match 1 or more non-path separators
|
||||
for (; j < len; ++j) {
|
||||
if (isPathSeparator(path.charCodeAt(j)))
|
||||
break;
|
||||
while (j < len && !isPathSeparator(path.charCodeAt(j))) {
|
||||
j++;
|
||||
}
|
||||
if (j < len && j !== last) {
|
||||
// Matched!
|
||||
last = j;
|
||||
// Match 1 or more path separators
|
||||
for (; j < len; ++j) {
|
||||
if (!isPathSeparator(path.charCodeAt(j)))
|
||||
break;
|
||||
while (j < len && isPathSeparator(path.charCodeAt(j))) {
|
||||
j++;
|
||||
}
|
||||
if (j < len && j !== last) {
|
||||
// Matched!
|
||||
last = j;
|
||||
// Match 1 or more non-path separators
|
||||
for (; j < len; ++j) {
|
||||
if (isPathSeparator(path.charCodeAt(j)))
|
||||
break;
|
||||
while (j < len && !isPathSeparator(path.charCodeAt(j))) {
|
||||
j++;
|
||||
}
|
||||
if (j === len) {
|
||||
// We matched a UNC root only
|
||||
|
||||
rootEnd = j;
|
||||
} else if (j !== last) {
|
||||
// We matched a UNC root with leftovers
|
||||
|
||||
rootEnd = j + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (isWindowsDeviceRoot(code)) {
|
||||
} else if (isWindowsDeviceRoot(code) && path.charCodeAt(1) === CHAR_COLON) {
|
||||
// Possible device root
|
||||
|
||||
if (path.charCodeAt(1) === CHAR_COLON) {
|
||||
if (len <= 2) {
|
||||
// `path` contains just a drive root, exit early to avoid
|
||||
// unnecessary work
|
||||
ret.root = ret.dir = path;
|
||||
return ret;
|
||||
}
|
||||
rootEnd = 2;
|
||||
if (len > 2) {
|
||||
if (isPathSeparator(path.charCodeAt(2))) {
|
||||
if (len === 3) {
|
||||
// `path` contains just a drive root, exit early to avoid
|
||||
@ -901,21 +888,7 @@ const win32 = {
|
||||
}
|
||||
rootEnd = 3;
|
||||
}
|
||||
} else {
|
||||
// `path` contains just a drive root, exit early to avoid
|
||||
// unnecessary work
|
||||
ret.root = ret.dir = path;
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (isPathSeparator(code)) {
|
||||
// `path` contains just a path separator, exit early to avoid
|
||||
// unnecessary work
|
||||
ret.root = ret.dir = path;
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (rootEnd > 0)
|
||||
ret.root = path.slice(0, rootEnd);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user