1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

path: refactor for less indentation

Browse Source 
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 2019-01-27 16:03:16 +01:00
parent e68b0d6fb3
commit 7cbe29eb4d
No known key found for this signature in database
GPG Key ID: F07496B3EB3C1762
1 changed files with 145 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
lib/path.js
View File

@ -270,7 +270,11 @@ const win32 = {
const code = path.charCodeAt(0); const code = path.charCodeAt(0);
// Try to match a root // 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)) { if (isPathSeparator(code)) {
// Possible UNC root // Possible UNC root
@ -280,40 +284,36 @@ const win32 = {
if (isPathSeparator(path.charCodeAt(1))) { if (isPathSeparator(path.charCodeAt(1))) {
// Matched double path separator at beginning // Matched double path separator at beginning
var j = 2; let j = 2;
var last = j; let last = j;
// Match 1 or more non-path separators // Match 1 or more non-path separators
for (; j < len; ++j) { while (j < len && !isPathSeparator(path.charCodeAt(j))) {
if (isPathSeparator(path.charCodeAt(j))) j++;
break;
} }
if (j < len && j !== last) { if (j < len && j !== last) {
const firstPart = path.slice(last, j); const firstPart = path.slice(last, j);
// Matched! // Matched!
last = j; last = j;
// Match 1 or more path separators // Match 1 or more path separators
for (; j < len; ++j) { while (j < len && isPathSeparator(path.charCodeAt(j))) {
if (!isPathSeparator(path.charCodeAt(j))) j++;
break;
} }
if (j < len && j !== last) { if (j < len && j !== last) {
// Matched! // Matched!
last = j; last = j;
// Match 1 or more non-path separators // Match 1 or more non-path separators
for (; j < len; ++j) { while (j < len && !isPathSeparator(path.charCodeAt(j))) {
if (isPathSeparator(path.charCodeAt(j))) j++;
break;
} }
if (j === len) { if (j === len) {
// We matched a UNC root only // We matched a UNC root only
// Return the normalized version of the UNC root since there // Return the normalized version of the UNC root since there
// is nothing left to process // is nothing left to process
return `\\\\${firstPart}\\${path.slice(last)}\\`;
return '\\\\' + firstPart + '\\' + path.slice(last) + '\\'; }
} else if (j !== last) { if (j !== last) {
// We matched a UNC root with leftovers // We matched a UNC root with leftovers
device = `\\\\${firstPart}\\${path.slice(last, j)}`;
device = '\\\\' + firstPart + '\\' + path.slice(last, j);
rootEnd = j; rootEnd = j;
} }
} }
@ -321,27 +321,17 @@ const win32 = {
} else { } else {
rootEnd = 1; rootEnd = 1;
} }
} else if (isWindowsDeviceRoot(code)) { } else if (isWindowsDeviceRoot(code) && path.charCodeAt(1) === CHAR_COLON) {
// Possible device root // Possible device root
if (path.charCodeAt(1) === CHAR_COLON) {
device = path.slice(0, 2); device = path.slice(0, 2);
rootEnd = 2; rootEnd = 2;
if (len > 2) { if (len > 2 && isPathSeparator(path.charCodeAt(2))) {
if (isPathSeparator(path.charCodeAt(2))) {
// Treat separator following drive name as an absolute path // Treat separator following drive name as an absolute path
// indicator // indicator
isAbsolute = true; isAbsolute = true;
rootEnd = 3; rootEnd = 3;
} }
} }
}
}
} else if (isPathSeparator(code)) {
// `path` contains just a path separator, exit early to avoid unnecessary
// work
return '\\';
}
let tail = rootEnd < len ? let tail = rootEnd < len ?
normalizeString(path.slice(rootEnd), !isAbsolute, '\\', isPathSeparator) : normalizeString(path.slice(rootEnd), !isAbsolute, '\\', isPathSeparator) :
@ -592,14 +582,17 @@ const win32 = {
const len = path.length; const len = path.length;
if (len === 0) if (len === 0)
return '.'; return '.';
var rootEnd = -1; let rootEnd = -1;
var end = -1; let offset = 0;
var matchedSlash = true;
var offset = 0;
const code = path.charCodeAt(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 // Try to match a root
if (len > 1) {
if (isPathSeparator(code)) { if (isPathSeparator(code)) {
// Possible UNC root // Possible UNC root
@ -607,28 +600,25 @@ const win32 = {
if (isPathSeparator(path.charCodeAt(1))) { if (isPathSeparator(path.charCodeAt(1))) {
// Matched double path separator at beginning // Matched double path separator at beginning
var j = 2; let j = 2;
var last = j; let last = j;
// Match 1 or more non-path separators // Match 1 or more non-path separators
for (; j < len; ++j) { while (j < len && !isPathSeparator(path.charCodeAt(j))) {
if (isPathSeparator(path.charCodeAt(j))) j++;
break;
} }
if (j < len && j !== last) { if (j < len && j !== last) {
// Matched! // Matched!
last = j; last = j;
// Match 1 or more path separators // Match 1 or more path separators
for (; j < len; ++j) { while (j < len && isPathSeparator(path.charCodeAt(j))) {
if (!isPathSeparator(path.charCodeAt(j))) j++;
break;
} }
if (j < len && j !== last) { if (j < len && j !== last) {
// Matched! // Matched!
last = j; last = j;
// Match 1 or more non-path separators // Match 1 or more non-path separators
for (; j < len; ++j) { while (j < len && !isPathSeparator(path.charCodeAt(j))) {
if (isPathSeparator(path.charCodeAt(j))) j++;
break;
} }
if (j === len) { if (j === len) {
// We matched a UNC root only // We matched a UNC root only
@ -644,23 +634,14 @@ const win32 = {
} }
} }
} }
} else if (isWindowsDeviceRoot(code)) {
// Possible device root // Possible device root
} else if (isWindowsDeviceRoot(code) && path.charCodeAt(1) === CHAR_COLON) {
if (path.charCodeAt(1) === CHAR_COLON) { rootEnd = len > 2 && isPathSeparator(path.charCodeAt(2)) ? 3 : 2;
rootEnd = offset = 2; offset = rootEnd;
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;
} }
let end = -1;
let matchedSlash = true;
for (var i = len - 1; i >= offset; --i) { for (var i = len - 1; i >= offset; --i) {
if (isPathSeparator(path.charCodeAt(i))) { if (isPathSeparator(path.charCodeAt(i))) {
if (!matchedSlash) { if (!matchedSlash) {
@ -843,55 +824,61 @@ const win32 = {
var rootEnd = 0; var rootEnd = 0;
let code = path.charCodeAt(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 // Try to match a root
if (len > 1) {
if (isPathSeparator(code)) { if (isPathSeparator(code)) {
// Possible UNC root // Possible UNC root
rootEnd = 1; rootEnd = 1;
if (isPathSeparator(path.charCodeAt(1))) { if (isPathSeparator(path.charCodeAt(1))) {
// Matched double path separator at beginning // Matched double path separator at beginning
var j = 2; let j = 2;
var last = j; let last = j;
// Match 1 or more non-path separators // Match 1 or more non-path separators
for (; j < len; ++j) { while (j < len && !isPathSeparator(path.charCodeAt(j))) {
if (isPathSeparator(path.charCodeAt(j))) j++;
break;
} }
if (j < len && j !== last) { if (j < len && j !== last) {
// Matched! // Matched!
last = j; last = j;
// Match 1 or more path separators // Match 1 or more path separators
for (; j < len; ++j) { while (j < len && isPathSeparator(path.charCodeAt(j))) {
if (!isPathSeparator(path.charCodeAt(j))) j++;
break;
} }
if (j < len && j !== last) { if (j < len && j !== last) {
// Matched! // Matched!
last = j; last = j;
// Match 1 or more non-path separators // Match 1 or more non-path separators
for (; j < len; ++j) { while (j < len && !isPathSeparator(path.charCodeAt(j))) {
if (isPathSeparator(path.charCodeAt(j))) j++;
break;
} }
if (j === len) { if (j === len) {
// We matched a UNC root only // We matched a UNC root only
rootEnd = j; rootEnd = j;
} else if (j !== last) { } else if (j !== last) {
// We matched a UNC root with leftovers // We matched a UNC root with leftovers
rootEnd = j + 1; rootEnd = j + 1;
} }
} }
} }
} }
} else if (isWindowsDeviceRoot(code)) { } else if (isWindowsDeviceRoot(code) && path.charCodeAt(1) === CHAR_COLON) {
// Possible device root // Possible device root
if (len <= 2) {
if (path.charCodeAt(1) === CHAR_COLON) { // `path` contains just a drive root, exit early to avoid
// unnecessary work
ret.root = ret.dir = path;
return ret;
}
rootEnd = 2; rootEnd = 2;
if (len > 2) {
if (isPathSeparator(path.charCodeAt(2))) { if (isPathSeparator(path.charCodeAt(2))) {
if (len === 3) { if (len === 3) {
// `path` contains just a drive root, exit early to avoid // `path` contains just a drive root, exit early to avoid
@ -901,21 +888,7 @@ const win32 = {
} }
rootEnd = 3; 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) if (rootEnd > 0)
ret.root = path.slice(0, rootEnd); ret.root = path.slice(0, rootEnd);