Fixed to handle the colon in non-protocol separation role in the firs…

…t part.
jfromaniello · Jan 11, 2018 · 9212db7 · 9212db7
1 parent be99b10
commit 9212db7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/url-join.js b/lib/url-join.js
@@ -12,16 +12,16 @@
     var resultArray = [];
 
     // If the first part is a plain protocol, we combine it with the next part.
-    if (strArray[0].match(/:\/*$/) && strArray.length > 1) {
+    if (strArray[0].match(/^[^/:]+:\/*$/) && strArray.length > 1) {
       var first = strArray.shift();
       strArray[0] = first + strArray[0];
     }
 
     // There must be two or three slashes in the file protocol, two slashes in anything else.
-    if (strArray[0].match(/file:\/\/\//)) {
-      strArray[0] = strArray[0].replace(/:\/*/, ':///');
+    if (strArray[0].match(/^file:\/\/\//)) {
+      strArray[0] = strArray[0].replace(/^([^/:]+):\/*/, '$1:///');
     } else {
-      strArray[0] = strArray[0].replace(/:\/*/, '://');
+      strArray[0] = strArray[0].replace(/^([^/:]+):\/*/, '$1://');
     }
 
     for (var i = 0; i < strArray.length; i++) {

diff --git a/test/tests.js b/test/tests.js
@@ -98,6 +98,11 @@ describe('url join', function () {
       .should.eql('/test');
   });
 
+  it('should merge a path with colon properly', function(){
+    urljoin('/users/:userId', '/cars/:carId')
+      .should.eql('/users/:userId/cars/:carId');
+  });
+
   it('should merge slashes in protocol correctly', function () {
     urljoin('http://example.org', 'a')
       .should.eql('http://example.org/a');