path: fix win32 volume-relative paths

`path.resolve()` and `path.join()` are left alone in this commit due to the lack of clear semantics. Backport-PR-URL: #14787 PR-URL: #14440Fixes: #14405 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>

Author: TimothyGu

lib/path.js

@@ -885,14 +885,28 @@ const win32 ={
 
 extname: functionextname(path){
 assertPath(path);
+varstart=0;
 varstartDot=-1;
 varstartPart=0;
 varend=-1;
 varmatchedSlash=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){
+
+// 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
+// disregarded
+if(path.length>=2){
+constcode=path.charCodeAt(0);
+if(path.charCodeAt(1)===58/*:*/&&
+((code>=65/*A*/&&code<=90/*Z*/)||
+(code>=97/*a*/&&code<=122/*z*/))){
+start=startPart=2;
+}
+}
+
+for(vari=path.length-1;i>=start;--i){
 constcode=path.charCodeAt(i);
 if(code===47/*/*/||code===92/*\*/){
 // If we reached a path separator that was not part of a set of path
@@ -956,15 +970,12 @@ const win32 ={
 varlen=path.length;
 varrootEnd=0;
 varcode=path.charCodeAt(0);
-varisAbsolute=false;
 
 // Try to match a root
 if(len>1){
 if(code===47/*/*/||code===92/*\*/){
 // Possible UNC root
 
-isAbsolute=true;
-
 code=path.charCodeAt(1);
 rootEnd=1;
 if(code===47/*/*/||code===92/*\*/){
@@ -1023,7 +1034,6 @@ const win32 ={
 ret.root=ret.dir=path.slice(0,3);
 returnret;
 }
-isAbsolute=true;
 rootEnd=3;
 }
 }else{
@@ -1045,7 +1055,7 @@ const win32 ={
 ret.root=path.slice(0,rootEnd);
 
 varstartDot=-1;
-varstartPart=0;
+varstartPart=rootEnd;
 varend=-1;
 varmatchedSlash=true;
 vari=path.length-1;
@@ -1094,26 +1104,21 @@ const win32 ={
 startDot===end-1&&
 startDot===startPart+1)){
 if(end!==-1){
-if(startPart===0&&isAbsolute)
-ret.base=ret.name=path.slice(rootEnd,end);
-else
-ret.base=ret.name=path.slice(startPart,end);
+ret.base=ret.name=path.slice(startPart,end);
 }
 }else{
-if(startPart===0&&isAbsolute){
-ret.name=path.slice(rootEnd,startDot);
-ret.base=path.slice(rootEnd,end);
-}else{
-ret.name=path.slice(startPart,startDot);
-ret.base=path.slice(startPart,end);
-}
+ret.name=path.slice(startPart,startDot);
+ret.base=path.slice(startPart,end);
 ret.ext=path.slice(startDot,end);
 }
 
-if(startPart>0)
+// If the directory is the root, use the entire root as the `dir` including
+// the trailing slash if any (`C:\abc` -> `C:\`). Otherwise, strip out the
+// trailing slash (`C:\abc\def` -> `C:\abc`).
+if(startPart>0&&startPart!==rootEnd)
 ret.dir=path.slice(0,startPart-1);
-elseif(isAbsolute)
-ret.dir=path.slice(0,rootEnd);
+else
+ret.dir=ret.root;
 
 returnret;
 },

test/parallel/test-path-parse-format.js

@@ -4,28 +4,33 @@ const assert = require('assert');
 constpath=require('path');
 
 constwinPaths=[
-'C:\\path\\dir\\index.html',
-'C:\\another_path\\DIR\\1\\2\\33\\\\index',
-'another_path\\DIR with spaces\\1\\2\\33\\index',
-'\\foo\\C:',
-'file',
-'.\\file',
-'C:\\',
-'C:',
-'\\',
-'',
+// [path, root]
+['C:\\path\\dir\\index.html','C:\\'],
+['C:\\another_path\\DIR\\1\\2\\33\\\\index','C:\\'],
+['another_path\\DIR with spaces\\1\\2\\33\\index',''],
+['\\','\\'],
+['\\foo\\C:','\\'],
+['file',''],
+['file:stream',''],
+['.\\file',''],
+['C:','C:'],
+['C:.','C:'],
+['C:..','C:'],
+['C:abc','C:'],
+['C:\\','C:\\'],
+['C:\\abc','C:\\'],
+['',''],
 
 // unc
-'\\\\server\\share\\file_path',
-'\\\\server two\\shared folder\\file path.zip',
-'\\\\teela\\admin$\\system32',
-'\\\\?\\UNC\\server\\share'
+['\\\\server\\share\\file_path','\\\\server\\share\\'],
+['\\\\server two\\shared folder\\file path.zip',
+'\\\\server two\\shared folder\\'],
+['\\\\teela\\admin$\\system32','\\\\teela\\admin$\\'],
+['\\\\?\\UNC\\server\\share','\\\\?\\UNC\\']
 ];
 
 constwinSpecialCaseParseTests=[
 ['/foo/bar',{root: '/'}],
-['C:',{root: 'C:',dir: 'C:',base: ''}],
-['C:\\',{root: 'C:\\',dir: 'C:\\',base: ''}]
 ];
 
 constwinSpecialCaseFormatTests=[
@@ -39,26 +44,27 @@ const winSpecialCaseFormatTests = [
 ];
 
 constunixPaths=[
-'/home/user/dir/file.txt',
-'/home/user/a dir/another File.zip',
-'/home/user/a dir//another&File.',
-'/home/user/a$$$dir//another File.zip',
-'user/dir/another File.zip',
-'file',
-'.\\file',
-'./file',
-'C:\\foo',
-'/',
-'',
-'.',
-'..',
-'/foo',
-'/foo.',
-'/foo.bar',
-'/.',
-'/.foo',
-'/.foo.bar',
-'/foo/bar.baz',
+// [path, root]
+['/home/user/dir/file.txt','/'],
+['/home/user/a dir/another File.zip','/'],
+['/home/user/a dir//another&File.','/'],
+['/home/user/a$$$dir//another File.zip','/'],
+['user/dir/another File.zip',''],
+['file',''],
+['.\\file',''],
+['./file',''],
+['C:\\foo',''],
+['/','/'],
+['',''],
+['.',''],
+['..',''],
+['/foo','/'],
+['/foo.','/'],
+['/foo.bar','/'],
+['/.','/'],
+['/.foo','/'],
+['/.foo.bar','/'],
+['/foo/bar.baz','/']
 ];
 
 constunixSpecialCaseFormatTests=[
@@ -169,14 +175,16 @@ function checkErrors(path){
 }
 
 functioncheckParseFormat(path,paths){
-paths.forEach(function(element){
+paths.forEach(function([element,root]){
 constoutput=path.parse(element);
 assert.strictEqual(typeofoutput.root,'string');
 assert.strictEqual(typeofoutput.dir,'string');
 assert.strictEqual(typeofoutput.base,'string');
 assert.strictEqual(typeofoutput.ext,'string');
 assert.strictEqual(typeofoutput.name,'string');
 assert.strictEqual(path.format(output),element);
+assert.strictEqual(output.root,root);
+assert(output.dir.startsWith(output.root));
 assert.strictEqual(output.dir,output.dir ? path.dirname(element) : '');
 assert.strictEqual(output.base,path.basename(element));
 assert.strictEqual(output.ext,path.extname(element));

test/parallel/test-path.js

@@ -51,6 +51,16 @@ assert.strictEqual(path.win32.basename('aaa\\bbb', 'bbb'), 'bbb');
 assert.strictEqual(path.win32.basename('aaa\\bbb\\\\\\\\','bbb'),'bbb');
 assert.strictEqual(path.win32.basename('aaa\\bbb','bb'),'b');
 assert.strictEqual(path.win32.basename('aaa\\bbb','b'),'bb');
+assert.strictEqual(path.win32.basename('C:'),'');
+assert.strictEqual(path.win32.basename('C:.'),'.');
+assert.strictEqual(path.win32.basename('C:\\'),'');
+assert.strictEqual(path.win32.basename('C:\\dir\\base.ext'),'base.ext');
+assert.strictEqual(path.win32.basename('C:\\basename.ext'),'basename.ext');
+assert.strictEqual(path.win32.basename('C:basename.ext'),'basename.ext');
+assert.strictEqual(path.win32.basename('C:basename.ext\\'),'basename.ext');
+assert.strictEqual(path.win32.basename('C:basename.ext\\\\'),'basename.ext');
+assert.strictEqual(path.win32.basename('C:foo'),'foo');
+assert.strictEqual(path.win32.basename('file:stream'),'file:stream');
 
 // On unix a backslash is just treated as any other character.
 assert.strictEqual(path.posix.basename('\\dir\\basename.ext'),
@@ -99,6 +109,8 @@ assert.strictEqual(path.win32.dirname('c:foo\\'), 'c:');
 assert.strictEqual(path.win32.dirname('c:foo\\bar'),'c:foo');
 assert.strictEqual(path.win32.dirname('c:foo\\bar\\'),'c:foo');
 assert.strictEqual(path.win32.dirname('c:foo\\bar\\baz'),'c:foo\\bar');
+assert.strictEqual(path.win32.dirname('file:stream'),'.');
+assert.strictEqual(path.win32.dirname('dir\\file:stream'),'dir');
 assert.strictEqual(path.win32.dirname('\\\\unc\\share'),
 '\\\\unc\\share');
 assert.strictEqual(path.win32.dirname('\\\\unc\\share\\foo'),
@@ -166,6 +178,7 @@ assert.strictEqual(path.win32.dirname('foo'), '.');
 ['file./','.'],
 ['file.//','.'],
 ].forEach((test)=>{
+constexpected=test[1];
 [path.posix.extname,path.win32.extname].forEach((extname)=>{
 letinput=test[0];
 letos;
@@ -176,12 +189,19 @@ assert.strictEqual(path.win32.dirname('foo'), '.');
 os='posix';
 }
 constactual=extname(input);
-constexpected=test[1];
 constmessage=`path.${os}.extname(${JSON.stringify(input)})\n expect=${
 JSON.stringify(expected)}\n actual=${JSON.stringify(actual)}`;
 if(actual!==expected)
 failures.push(`\n${message}`);
 });
+{
+constinput=`C:${test[0].replace(slashRE,'\\')}`;
+constactual=path.win32.extname(input);
+constmessage=`path.win32.extname(${JSON.stringify(input)})\n expect=${
+JSON.stringify(expected)}\n actual=${JSON.stringify(actual)}`;
+if(actual!==expected)
+failures.push(`\n${message}`);
+}
 });
 assert.strictEqual(failures.length,0,failures.join(''));
 
@@ -385,6 +405,12 @@ assert.strictEqual(path.win32.normalize('a//b//.'), 'a\\b');
 assert.strictEqual(path.win32.normalize('//server/share/dir/file.ext'),
 '\\\\server\\share\\dir\\file.ext');
 assert.strictEqual(path.win32.normalize('/a/b/c/../../../x/y/z'),'\\x\\y\\z');
+assert.strictEqual(path.win32.normalize('C:'),'C:.');
+assert.strictEqual(path.win32.normalize('C:..\\abc'),'C:..\\abc');
+assert.strictEqual(path.win32.normalize('C:..\\..\\abc\\..\\def'),
+'C:..\\..\\def');
+assert.strictEqual(path.win32.normalize('C:\\.'),'C:\\');
+assert.strictEqual(path.win32.normalize('file:stream'),'file:stream');
 
 assert.strictEqual(path.posix.normalize('./fixtures///b/../b/c.js'),
 'fixtures/b/c.js');