path: replace var with let in lib/path.js

peze · targos · commit 2f2a8aa3737d · 2019-12-01T11:11:40.000+01:00
PR-URL: #30260 Refs: nodejs/code-and-learn#97 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>
diff --git a/lib/path.js b/lib/path.js
@@ -55,7 +55,7 @@ function normalizeString(path, allowAboveRoot, separator, isPathSeparator) {
 let lastSlash = -1;
 let dots = 0;
 let code = 0;
- for (var i = 0; i <= path.length; ++i) {
+ for (let i = 0; i <= path.length; ++i) {
 if (i < path.length)
 code = path.charCodeAt(i);
 else if (isPathSeparator(code))
@@ -132,7 +132,7 @@ const win32 = {
 let resolvedTail = '';
 let resolvedAbsolute = false;
 
- for (var i = args.length - 1; i >= -1; i--) {
+ for (let i = args.length - 1; i >= -1; i--) {
 let path;
 if (i >= 0) {
 path = args[i];
@@ -370,7 +370,7 @@ const win32 = {
 
 let joined;
 let firstPart;
- for (var i = 0; i < args.length; ++i) {
+ for (let i = 0; i < args.length; ++i) {
 const arg = args[i];
 validateString(arg, 'path');
 if (arg.length > 0) {
@@ -644,7 +644,7 @@ const win32 = {
 
 let end = -1;
 let matchedSlash = true;
- for (var i = len - 1; i >= offset; --i) {
+ for (let i = len - 1; i >= offset; --i) {
 if (isPathSeparator(path.charCodeAt(i))) {
 if (!matchedSlash) {
 end = i;
@@ -669,10 +669,9 @@ const win32 = {
 if (ext !== undefined)
 validateString(ext, 'ext');
 validateString(path, 'path');
- var start = 0;
- var end = -1;
- var matchedSlash = true;
- var i;
+ let start = 0;
+ let end = -1;
+ let matchedSlash = true;
 
 // Check for a drive letter prefix so as not to mistake the following
 // path separator as an extra separator at the end of the path that can be
@@ -686,9 +685,9 @@ const win32 = {
 if (ext !== undefined && ext.length > 0 && ext.length <= path.length) {
 if (ext === path)
 return '';
- var extIdx = ext.length - 1;
- var firstNonSlashEnd = -1;
- for (i = path.length - 1; i >= start; --i) {
+ let extIdx = ext.length - 1;
+ let firstNonSlashEnd = -1;
+ for (let i = path.length - 1; i >= start; --i) {
 const code = path.charCodeAt(i);
 if (isPathSeparator(code)) {
 // If we reached a path separator that was not part of a set of path
@@ -728,7 +727,7 @@ const win32 = {
 end = path.length;
 return path.slice(start, end);
 }
- for (i = path.length - 1; i >= start; --i) {
+ for (let i = path.length - 1; i >= start; --i) {
 if (isPathSeparator(path.charCodeAt(i))) {
 // If we reached a path separator that was not part of a set of path
 // separators at the end of the string, stop now
@@ -751,14 +750,14 @@ const win32 = {
 
 extname(path) {
 validateString(path, 'path');
- var start = 0;
- var startDot = -1;
- var startPart = 0;
- var end = -1;
- var matchedSlash = true;
+ let start = 0;
+ let startDot = -1;
+ let startPart = 0;
+ let end = -1;
+ let matchedSlash = true;
 // Track the state of characters (if any) we see before our first dot and
 // after any path separator we find
- var preDotState = 0;
+ let preDotState = 0;
 
 // Check for a drive letter prefix so as not to mistake the following
 // path separator as an extra separator at the end of the path that can be
@@ -770,7 +769,7 @@ const win32 = {
 start = startPart = 2;
 }
 
- for (var i = path.length - 1; i >= start; --i) {
+ for (let i = path.length - 1; i >= start; --i) {
 const code = path.charCodeAt(i);
 if (isPathSeparator(code)) {
 // If we reached a path separator that was not part of a set of path
@@ -823,7 +822,7 @@ const win32 = {
 return ret;
 
 const len = path.length;
- var rootEnd = 0;
+ let rootEnd = 0;
 let code = path.charCodeAt(0);
 
 if (len === 1) {
@@ -895,15 +894,15 @@ const win32 = {
 if (rootEnd > 0)
 ret.root = path.slice(0, rootEnd);
 
- var startDot = -1;
- var startPart = rootEnd;
- var end = -1;
- var matchedSlash = true;
- var i = path.length - 1;
+ let startDot = -1;
+ let startPart = rootEnd;
+ let end = -1;
+ let matchedSlash = true;
+ let i = path.length - 1;
 
 // Track the state of characters (if any) we see before our first dot and
 // after any path separator we find
- var preDotState = 0;
+ let preDotState = 0;
 
 // Get non-dir info
 for (; i >= rootEnd; --i) {
@@ -975,7 +974,7 @@ const posix = {
 let resolvedPath = '';
 let resolvedAbsolute = false;
 
- for (var i = args.length - 1; i >= -1 && !resolvedAbsolute; i--) {
+ for (let i = args.length - 1; i >= -1 && !resolvedAbsolute; i--) {
 const path = i >= 0 ? args[i] : process.cwd();
 
 validateString(path, 'path');
@@ -1035,7 +1034,7 @@ const posix = {
 if (args.length === 0)
 return '.';
 let joined;
- for (var i = 0; i < args.length; ++i) {
+ for (let i = 0; i < args.length; ++i) {
 const arg = args[i];
 validateString(arg, 'path');
 if (arg.length > 0) {
@@ -1130,9 +1129,9 @@ const posix = {
 if (path.length === 0)
 return '.';
 const hasRoot = path.charCodeAt(0) === CHAR_FORWARD_SLASH;
- var end = -1;
- var matchedSlash = true;
- for (var i = path.length - 1; i >= 1; --i) {
+ let end = -1;
+ let matchedSlash = true;
+ for (let i = path.length - 1; i >= 1; --i) {
 if (path.charCodeAt(i) === CHAR_FORWARD_SLASH) {
 if (!matchedSlash) {
 end = i;
@@ -1156,17 +1155,16 @@ const posix = {
 validateString(ext, 'ext');
 validateString(path, 'path');
 
- var start = 0;
- var end = -1;
- var matchedSlash = true;
- var i;
+ let start = 0;
+ let end = -1;
+ let matchedSlash = true;
 
 if (ext !== undefined && ext.length > 0 && ext.length <= path.length) {
 if (ext === path)
 return '';
- var extIdx = ext.length - 1;
- var firstNonSlashEnd = -1;
- for (i = path.length - 1; i >= 0; --i) {
+ let extIdx = ext.length - 1;
+ let firstNonSlashEnd = -1;
+ for (let i = path.length - 1; i >= 0; --i) {
 const code = path.charCodeAt(i);
 if (code === CHAR_FORWARD_SLASH) {
 // If we reached a path separator that was not part of a set of path
@@ -1206,7 +1204,7 @@ const posix = {
 end = path.length;
 return path.slice(start, end);
 }
- for (i = path.length - 1; i >= 0; --i) {
+ for (let i = path.length - 1; i >= 0; --i) {
 if (path.charCodeAt(i) === CHAR_FORWARD_SLASH) {
 // If we reached a path separator that was not part of a set of path
 // separators at the end of the string, stop now
@@ -1229,14 +1227,14 @@ const posix = {
 
 extname(path) {
 validateString(path, 'path');
- var startDot = -1;
- var startPart = 0;
- var end = -1;
- var matchedSlash = true;
+ let startDot = -1;
+ let startPart = 0;
+ let end = -1;
+ let matchedSlash = true;
 // Track the state of characters (if any) we see before our first dot and
 // after any path separator we find
- var preDotState = 0;
- for (var i = path.length - 1; i >= 0; --i) {
+ let preDotState = 0;
+ for (let i = path.length - 1; i >= 0; --i) {
 const code = path.charCodeAt(i);
 if (code === CHAR_FORWARD_SLASH) {
 // If we reached a path separator that was not part of a set of path
@@ -1288,22 +1286,22 @@ const posix = {
 if (path.length === 0)
 return ret;
 const isAbsolute = path.charCodeAt(0) === CHAR_FORWARD_SLASH;
- var start;
+ let start;
 if (isAbsolute) {
 ret.root = '/';
 start = 1;
 } else {
 start = 0;
 }
- var startDot = -1;
- var startPart = 0;
- var end = -1;
- var matchedSlash = true;
- var i = path.length - 1;
+ let startDot = -1;
+ let startPart = 0;
+ let end = -1;
+ let matchedSlash = true;
+ let i = path.length - 1;
 
 // Track the state of characters (if any) we see before our first dot and
 // after any path separator we find
- var preDotState = 0;
+ let preDotState = 0;
 
 // Get non-dir info
 for (; i >= start; --i) {

-Original file line number
+Diff line change
 letlastSlash=-1;
 letdots=0;
 letcode=0;
 -for(vari=0;i<=path.length;++i){
 +for(leti=0;i<=path.length;++i){
 if(i<path.length)
 code=path.charCodeAt(i);
 elseif(isPathSeparator(code))
 letresolvedTail='';
 letresolvedAbsolute=false;
 -for(vari=args.length-1;i>=-1;i--){
 +for(leti=args.length-1;i>=-1;i--){
 letpath;
 if(i>=0){
 path=args[i];
 letjoined;
 letfirstPart;
 -for(vari=0;i<args.length;++i){
 +for(leti=0;i<args.length;++i){
 constarg=args[i];
 validateString(arg,'path');
 if(arg.length>0){
 letend=-1;
 letmatchedSlash=true;
 -for(vari=len-1;i>=offset;--i){
 +for(leti=len-1;i>=offset;--i){
 if(isPathSeparator(path.charCodeAt(i))){
 if(!matchedSlash){
 end=i;
 if(ext!==undefined)
 validateString(ext,'ext');
 validateString(path,'path');
 -varstart=0;
 -varend=-1;
 -varmatchedSlash=true;
 -vari;
 +letstart=0;
 +letend=-1;
 +letmatchedSlash=true;
 // Check for a drive letter prefix so as not to mistake the following
 // path separator as an extra separator at the end of the path that can be
 if(ext!==undefined&&ext.length>0&&ext.length<=path.length){
 if(ext===path)
 return'';
 -varextIdx=ext.length-1;
 -varfirstNonSlashEnd=-1;
 -for(i=path.length-1;i>=start;--i){
 +letextIdx=ext.length-1;
 +letfirstNonSlashEnd=-1;
 +for(leti=path.length-1;i>=start;--i){
 constcode=path.charCodeAt(i);
 if(isPathSeparator(code)){
 // If we reached a path separator that was not part of a set of path
 end=path.length;
 returnpath.slice(start,end);
+}
 -for(i=path.length-1;i>=start;--i){
 +for(leti=path.length-1;i>=start;--i){
 if(isPathSeparator(path.charCodeAt(i))){
 // If we reached a path separator that was not part of a set of path
 // separators at the end of the string, stop now
 extname(path){
 validateString(path,'path');
 -varstart=0;
 -varstartDot=-1;
 -varstartPart=0;
 -varend=-1;
 -varmatchedSlash=true;
 +letstart=0;
 +letstartDot=-1;
 +letstartPart=0;
 +letend=-1;
 +letmatchedSlash=true;
 // Track the state of characters (if any) we see before our first dot and
 // after any path separator we find
 -varpreDotState=0;
 +letpreDotState=0;
 // Check for a drive letter prefix so as not to mistake the following
 // path separator as an extra separator at the end of the path that can be
 start=startPart=2;
+}
 -for(vari=path.length-1;i>=start;--i){
 +for(leti=path.length-1;i>=start;--i){
 constcode=path.charCodeAt(i);
 if(isPathSeparator(code)){
 // If we reached a path separator that was not part of a set of path
 returnret;
 constlen=path.length;
 -varrootEnd=0;
 +letrootEnd=0;
 letcode=path.charCodeAt(0);
 if(len===1){
 if(rootEnd>0)
 ret.root=path.slice(0,rootEnd);
 -varstartDot=-1;
 -varstartPart=rootEnd;
 -varend=-1;
 -varmatchedSlash=true;
 -vari=path.length-1;
 +letstartDot=-1;
 +letstartPart=rootEnd;
 +letend=-1;
 +letmatchedSlash=true;
 +leti=path.length-1;
 // Track the state of characters (if any) we see before our first dot and
 // after any path separator we find
 -varpreDotState=0;
 +letpreDotState=0;
 // Get non-dir info
 for(;i>=rootEnd;--i){
 letresolvedPath='';
 letresolvedAbsolute=false;
 -for(vari=args.length-1;i>=-1&&!resolvedAbsolute;i--){
 +for(leti=args.length-1;i>=-1&&!resolvedAbsolute;i--){
 constpath=i>=0 ? args[i] : process.cwd();
 validateString(path,'path');
 if(args.length===0)
 return'.';
 letjoined;
 -for(vari=0;i<args.length;++i){
 +for(leti=0;i<args.length;++i){
 constarg=args[i];
 validateString(arg,'path');
 if(arg.length>0){
 if(path.length===0)
 return'.';
 consthasRoot=path.charCodeAt(0)===CHAR_FORWARD_SLASH;
 -varend=-1;
 -varmatchedSlash=true;
 -for(vari=path.length-1;i>=1;--i){
 +letend=-1;
 +letmatchedSlash=true;
 +for(leti=path.length-1;i>=1;--i){
 if(path.charCodeAt(i)===CHAR_FORWARD_SLASH){
 if(!matchedSlash){
 end=i;
 validateString(ext,'ext');
 validateString(path,'path');
 -varstart=0;
 -varend=-1;
 -varmatchedSlash=true;
 -vari;
 +letstart=0;
 +letend=-1;
 +letmatchedSlash=true;
 if(ext!==undefined&&ext.length>0&&ext.length<=path.length){
 if(ext===path)
 return'';
 -varextIdx=ext.length-1;
 -varfirstNonSlashEnd=-1;
 -for(i=path.length-1;i>=0;--i){
 +letextIdx=ext.length-1;
 +letfirstNonSlashEnd=-1;
 +for(leti=path.length-1;i>=0;--i){
 constcode=path.charCodeAt(i);
 if(code===CHAR_FORWARD_SLASH){
 // If we reached a path separator that was not part of a set of path
 end=path.length;
 returnpath.slice(start,end);
+}
 -for(i=path.length-1;i>=0;--i){
 +for(leti=path.length-1;i>=0;--i){
 if(path.charCodeAt(i)===CHAR_FORWARD_SLASH){
 // If we reached a path separator that was not part of a set of path
 // separators at the end of the string, stop now
 extname(path){
 validateString(path,'path');
 -varstartDot=-1;
 -varstartPart=0;
 -varend=-1;
 -varmatchedSlash=true;
 +letstartDot=-1;
 +letstartPart=0;
 +letend=-1;
 +letmatchedSlash=true;
 // Track the state of characters (if any) we see before our first dot and
 // after any path separator we find
 -varpreDotState=0;
 -for(vari=path.length-1;i>=0;--i){
 +letpreDotState=0;
 +for(leti=path.length-1;i>=0;--i){
 constcode=path.charCodeAt(i);
 if(code===CHAR_FORWARD_SLASH){
 // If we reached a path separator that was not part of a set of path
 if(path.length===0)
 returnret;
 constisAbsolute=path.charCodeAt(0)===CHAR_FORWARD_SLASH;
 -varstart;
 +letstart;
 if(isAbsolute){
 ret.root='/';
 start=1;
 }else{
 start=0;
+}
 -varstartDot=-1;
 -varstartPart=0;
 -varend=-1;
 -varmatchedSlash=true;
 -vari=path.length-1;
 +letstartDot=-1;
 +letstartPart=0;
 +letend=-1;
 +letmatchedSlash=true;
 +leti=path.length-1;
 // Track the state of characters (if any) we see before our first dot and
 // after any path separator we find
 -varpreDotState=0;
 +letpreDotState=0;
 // Get non-dir info
 for(;i>=start;--i){