Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Add path.common(path1/*, ...pathn*/); #6328

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
92 changes: 92 additions & 0 deletions lib/path.js
Expand Up @@ -84,6 +84,16 @@ if (isWindows) {
return '\\\\' + device.replace(/^[\\\/]+/, '').replace(/[\\\/]+/g, '\\'); return '\\\\' + device.replace(/^[\\\/]+/, '').replace(/[\\\/]+/g, '\\');
}; };


var normalizeForCommon = function (path) {
if (!util.isString(path)) {
throw new TypeError('Arguments to path.common must be strings');
}
var isDir = (path[path.length - 1] === '\\');
path = exports.resolve(path);
if (isDir) return path;
return exports.dirname(path);
};

// path.resolve([from ...], to) // path.resolve([from ...], to)
// windows version // windows version
exports.resolve = function() { exports.resolve = function() {
Expand Down Expand Up @@ -300,6 +310,44 @@ if (isWindows) {
return outputParts.join('\\'); return outputParts.join('\\');
}; };


// path.common(path1/*, ...pathn*/)
// windows version
exports.common = function(path/*, ...pathn*/) {
path = normalizeForCommon(path);
var i = 1;
var l = arguments.length;
var pathLength = path.length;
for (; i < l; ++i) {
var other = normalizeForCommon(arguments[i]).toLowerCase();
var end = 0;
var j = 0;
var otherLength = other.length;
while (path[j].toLowerCase() === other[j]) {
if (path[j] === '\\') end = j;
++j;
if (pathLength === j) {
if (otherLength === j) end = j;
else if (other[j] === '\\') end = j;
break;
}
if (otherLength === j) {
if (path[j] === '\\') end = j;
break;
}
}
if (!end) return null;
if (end !== pathLength) {
path = path.slice(0, end);
if (path[path.length - 1] === ':') {
path += '\\';
++end;
}
pathLength = end;
}
}
return path;
};

exports.sep = '\\'; exports.sep = '\\';
exports.delimiter = ';'; exports.delimiter = ';';


Expand All @@ -312,6 +360,15 @@ if (isWindows) {
var splitPath = function(filename) { var splitPath = function(filename) {
return splitPathRe.exec(filename).slice(1); return splitPathRe.exec(filename).slice(1);
}; };
var normalizeForCommon = function (path) {
if (!util.isString(path)) {
throw new TypeError('Arguments to path.common must be strings');
}
var isDir = (path[path.length - 1] === '/');
path = exports.resolve(path);
if (isDir) return path;
return exports.dirname(path);
};


// path.resolve([from ...], to) // path.resolve([from ...], to)
// posix version // posix version
Expand Down Expand Up @@ -438,6 +495,41 @@ if (isWindows) {
return outputParts.join('/'); return outputParts.join('/');
}; };


// path.common(path1/*, ...pathn*/)
// posix version
exports.common = function(path/*, ...pathn*/) {
path = normalizeForCommon(path);
if (path === '/') return '/';
var i = 1;
var l = arguments.length;
var pathLength = path.length;
for (; i < l; ++i) {
var other = normalizeForCommon(arguments[i]);
var end = 0;
var j = 0;
var otherLength = other.length;
while (path[j] === other[j]) {
if (path[j] === '/') end = j;
++j;
if (pathLength === j) {
if (otherLength === j) end = j;
else if (other[j] === '/') end = j;
break;
}
if (otherLength === j) {
if (path[j] === '/') end = j;
break;
}
}
if (end <= 1) return '/';
if (end !== pathLength) {
path = path.slice(0, end);
pathLength = end;
}
}
return path;
};

exports.sep = '/'; exports.sep = '/';
exports.delimiter = ':'; exports.delimiter = ':';
} }
Expand Down
47 changes: 47 additions & 0 deletions test/simple/test-path.js
Expand Up @@ -405,6 +405,53 @@ relativeTests.forEach(function(test) {
}); });
assert.equal(failures.length, 0, failures.join('')); assert.equal(failures.length, 0, failures.join(''));


// path.common tests
if (isWindows) {
// windows
var resolveTests =
// arguments result
[[['C:\\'], 'C:\\'],
[['d:\\'], 'd:\\'],
[['c:\\', 'd:\\'], null],
[['c:\\raz\\dwa\\'], 'c:\\raz\\dwa'],
[['C:\\raZ\\dwa'], 'C:\\raZ'],
[['c:\\raz\\dwa', 'c:\\trzy\\cztery'], 'c:\\'],
[['c:\\raz\\dwa', 'c:\\raz\\trzy'], 'c:\\raz'],
[['c:\\raZ\\dwa', 'c:\\rAz\\trzy'], 'c:\\raZ'],
[['c:\\raz\\dwa', 'c:\\raz\\dwa\\trzy', 'c:\\raz\\cztery'], 'c:\\raz'],
[['C:\\raz\\dwa\\piec', 'c:\\raz\\dwa\\trzy', 'c:\\raz\\dwa\\cztery'],
'C:\\raz\\dwa'],
[['C:\\raz\\dwa\\piec', 'c:\\raz\\dwa\\trzy', 'c:\\raz\\dwa\\'],
'C:\\raz\\dwa'],
[['c:\\raz\\dwa\\piec', 'c:\\raz\\dwa\\trzy', 'c:\\raz\\dwa'],
'c:\\raz'],
[['c:\\raz\\dwa\\trzy', 'c:\\raz\\dwatrzy'], 'c:\\raz']];
} else {
// Posix
var resolveTests =
// arguments result
[[['/'], '/'],
[['/raz/dwa/'], '/raz/dwa'],
[['/raz/dwa'], '/raz'],
[['/raz/dwa', '/trzy/cztery'], '/'],
[['/raz/dwa', '/raz/trzy'], '/raz'],
[['/raz/dwa', '/raz/dwa/trzy', '/raz/cztery'], '/raz'],
[['/raz/dwa/piec', '/raz/dwa/trzy', '/raz/dwa/cztery'], '/raz/dwa'],
[['/raz/dwa/piec', '/raz/dwa/trzy', '/raz/dwa/'], '/raz/dwa'],
[['/raz/dwa/piec', '/raz/dwa/trzy', '/raz/dwa'], '/raz'],
[['/raz/dwa/trzy', '/raz/dwatrzy'], '/raz']];
}
var failures = [];
resolveTests.forEach(function(test) {
var actual = path.common.apply(path, test[0]);
var expected = test[1];
var message = 'path.common(' + test[0].map(JSON.stringify).join(',') + ')' +
'\n expect=' + JSON.stringify(expected) +
'\n actual=' + JSON.stringify(actual);
if (actual !== expected) failures.push('\n' + message);
});
assert.equal(failures.length, 0, failures.join(''));

// path.sep tests // path.sep tests
if (isWindows) { if (isWindows) {
// windows // windows
Expand Down