Port test-path-relative.

Author: goto-bus-stop

index.js

@@ -188,15 +188,17 @@ var posix = {
     // Trim any leading backslashes
     var fromStart = 1;
     for (; fromStart < from.length; ++fromStart) {
-      if (from.charCodeAt(fromStart) !== 47 /*/*/) break;
+      if (from.charCodeAt(fromStart) !== 47 /*/*/)
+        break;
     }
     var fromEnd = from.length;
     var fromLen = fromEnd - fromStart;
 
     // Trim any leading backslashes
     var toStart = 1;
     for (; toStart < to.length; ++toStart) {
-      if (to.charCodeAt(toStart) !== 47 /*/*/) break;
+      if (to.charCodeAt(toStart) !== 47 /*/*/)
+        break;
     }
     var toEnd = to.length;
     var toLen = toEnd - toStart;
@@ -209,20 +211,20 @@ var posix = {
       if (i === length) {
         if (toLen > length) {
           if (to.charCodeAt(toStart + i) === 47 /*/*/) {
-              // We get here if `from` is the exact base path for `to`.
-              // For example: from='/foo/bar'; to='/foo/bar/baz'
-              return to.slice(toStart + i + 1);
-            } else if (i === 0) {
+            // We get here if `from` is the exact base path for `to`.
+            // For example: from='/foo/bar'; to='/foo/bar/baz'
+            return to.slice(toStart + i + 1);
+          } else if (i === 0) {
             // We get here if `from` is the root
             // For example: from='/'; to='/foo'
             return to.slice(toStart + i);
           }
         } else if (fromLen > length) {
           if (from.charCodeAt(fromStart + i) === 47 /*/*/) {
-              // We get here if `to` is the exact base path for `from`.
-              // For example: from='/foo/bar/baz'; to='/foo/bar'
-              lastCommonSep = i;
-            } else if (i === 0) {
+            // We get here if `to` is the exact base path for `from`.
+            // For example: from='/foo/bar/baz'; to='/foo/bar'
+            lastCommonSep = i;
+          } else if (i === 0) {
             // We get here if `to` is the root.
             // For example: from='/foo'; to='/'
             lastCommonSep = 0;
@@ -232,23 +234,32 @@ var posix = {
       }
       var fromCode = from.charCodeAt(fromStart + i);
       var toCode = to.charCodeAt(toStart + i);
-      if (fromCode !== toCode) break;else if (fromCode === 47 /*/*/) lastCommonSep = i;
+      if (fromCode !== toCode)
+        break;
+      else if (fromCode === 47 /*/*/)
+        lastCommonSep = i;
     }
 
     var out = '';
     // Generate the relative path based on the path difference between `to`
     // and `from`
     for (i = fromStart + lastCommonSep + 1; i <= fromEnd; ++i) {
       if (i === fromEnd || from.charCodeAt(i) === 47 /*/*/) {
-          if (out.length === 0) out += '..';else out += '/..';
-        }
+        if (out.length === 0)
+          out += '..';
+        else
+          out += '/..';
+      }
     }
 
     // Lastly, append the rest of the destination (`to`) path that comes after
     // the common path parts
-    if (out.length > 0) return out + to.slice(toStart + lastCommonSep);else {
+    if (out.length > 0)
+      return out + to.slice(toStart + lastCommonSep);
+    else {
       toStart += lastCommonSep;
-      if (to.charCodeAt(toStart) === 47 /*/*/) ++toStart;
+      if (to.charCodeAt(toStart) === 47 /*/*/)
+        ++toStart;
       return to.slice(toStart);
     }
   },

test/index.js

@@ -1,3 +1,4 @@
 require('./test-path-basename');
 require('./test-path-dirname');
 require('./test-path-extname');
+require('./test-path-relative');

test/test-path-relative.js

@@ -0,0 +1,66 @@
+'use strict';
+var tape = require('tape');
+var path = require('../');
+
+var relativeTests = {
+  win32:
+    // arguments                     result
+    [['c:/blah\\blah', 'd:/games', 'd:\\games'],
+     ['c:/aaaa/bbbb', 'c:/aaaa', '..'],
+     ['c:/aaaa/bbbb', 'c:/cccc', '..\\..\\cccc'],
+     ['c:/aaaa/bbbb', 'c:/aaaa/bbbb', ''],
+     ['c:/aaaa/bbbb', 'c:/aaaa/cccc', '..\\cccc'],
+     ['c:/aaaa/', 'c:/aaaa/cccc', 'cccc'],
+     ['c:/', 'c:\\aaaa\\bbbb', 'aaaa\\bbbb'],
+     ['c:/aaaa/bbbb', 'd:\\', 'd:\\'],
+     ['c:/AaAa/bbbb', 'c:/aaaa/bbbb', ''],
+     ['c:/aaaaa/', 'c:/aaaa/cccc', '..\\aaaa\\cccc'],
+     ['C:\\foo\\bar\\baz\\quux', 'C:\\', '..\\..\\..\\..'],
+     ['C:\\foo\\test', 'C:\\foo\\test\\bar\\package.json', 'bar\\package.json'],
+     ['C:\\foo\\bar\\baz-quux', 'C:\\foo\\bar\\baz', '..\\baz'],
+     ['C:\\foo\\bar\\baz', 'C:\\foo\\bar\\baz-quux', '..\\baz-quux'],
+     ['\\\\foo\\bar', '\\\\foo\\bar\\baz', 'baz'],
+     ['\\\\foo\\bar\\baz', '\\\\foo\\bar', '..'],
+     ['\\\\foo\\bar\\baz-quux', '\\\\foo\\bar\\baz', '..\\baz'],
+     ['\\\\foo\\bar\\baz', '\\\\foo\\bar\\baz-quux', '..\\baz-quux'],
+     ['C:\\baz-quux', 'C:\\baz', '..\\baz'],
+     ['C:\\baz', 'C:\\baz-quux', '..\\baz-quux'],
+     ['\\\\foo\\baz-quux', '\\\\foo\\baz', '..\\baz'],
+     ['\\\\foo\\baz', '\\\\foo\\baz-quux', '..\\baz-quux'],
+     ['C:\\baz', '\\\\foo\\bar\\baz', '\\\\foo\\bar\\baz'],
+     ['\\\\foo\\bar\\baz', 'C:\\baz', 'C:\\baz']
+    ],
+  posix:
+    // arguments          result
+    [['/var/lib', '/var', '..'],
+     ['/var/lib', '/bin', '../../bin'],
+     ['/var/lib', '/var/lib', ''],
+     ['/var/lib', '/var/apache', '../apache'],
+     ['/var/', '/var/lib', 'lib'],
+     ['/', '/var/lib', 'var/lib'],
+     ['/foo/test', '/foo/test/bar/package.json', 'bar/package.json'],
+     ['/Users/a/web/b/test/mails', '/Users/a/web/b', '../..'],
+     ['/foo/bar/baz-quux', '/foo/bar/baz', '../baz'],
+     ['/foo/bar/baz', '/foo/bar/baz-quux', '../baz-quux'],
+     ['/baz-quux', '/baz', '../baz'],
+     ['/baz', '/baz-quux', '../baz-quux']
+    ]
+};
+
+tape('path.posix.relative', function (t) {
+  relativeTests.posix.forEach(function (p) {
+    var expected = p[2];
+    var actual = path.posix.relative(p[0], p[1]);
+    t.strictEqual(actual, expected);
+  });
+  t.end();
+});
+
+tape('path.win32.relative', { skip: true }, function (t) {
+  relativeTests.win32.forEach(function (p) {
+    var expected = p[2];
+    var actual = path.win32.relative(p[0], p[1]);
+    t.strictEqual(actual, expected);
+  });
+  t.end();
+});