url resolution tweaks

Author: guybedford

Diff for: core/resolve.js

@@ -6,11 +6,9 @@ import { isNode } from './common.js';
 function throwResolveError (relUrl, parentUrl) {
   throw new RangeError('Unable to resolve "' + relUrl + '" to ' + parentUrl);
 }
-var protocolRegEx = /^[^/]+:/;
 export function resolveIfNotPlain (relUrl, parentUrl) {
   relUrl = relUrl.trim();
-  if (parentUrl)
-    var parentProtocol = parentUrl.match(protocolRegEx);
+  var parentProtocol = parentUrl && parentUrl.substr(0, parentUrl.indexOf(':') + 1);
 
   var firstChar = relUrl[0];
   var secondChar = relUrl[1];
@@ -19,12 +17,13 @@ export function resolveIfNotPlain (relUrl, parentUrl) {
   if (firstChar === '/' && secondChar === '/') {
     if (!parentProtocol)
       throwResolveError(relUrl, parentUrl);
-    return parentProtocol[0] + relUrl;
+    return parentProtocol + relUrl;
   }
   // relative-url
-  else if (firstChar === '.' && (secondChar === '/' || secondChar === '.' && (relUrl[2] === '/' || relUrl.length === 2) || relUrl.length === 1)
-      || firstChar === '/') {
-    var parentIsPlain = !parentProtocol || parentUrl[parentProtocol[0].length] !== '/';
+  else if (firstChar === '.' && (secondChar === '/' || secondChar === '.' && (relUrl[2] === '/' || relUrl.length === 2 && (relUrl += '/')) ||
+      relUrl.length === 1  && (relUrl += '/')) ||
+      firstChar === '/') {
+    var parentIsPlain = !parentProtocol || parentUrl[parentProtocol.length] !== '/';
 
     // read pathname from parent if a URL
     // pathname taken to be part after leading "/"
@@ -35,10 +34,10 @@ export function resolveIfNotPlain (relUrl, parentUrl) {
         throwResolveError(relUrl, parentUrl);
       pathname = parentUrl;
     }
-    else if (parentUrl[parentProtocol[0].length + 1] === '/') {
+    else if (parentUrl[parentProtocol.length + 1] === '/') {
       // resolving to a :// so we need to read out the auth and host
-      if (parentProtocol[0] !== 'file:') {
-        pathname = parentUrl.substr(parentProtocol[0].length + 2);
+      if (parentProtocol !== 'file:') {
+        pathname = parentUrl.substr(parentProtocol.length + 2);
         pathname = pathname.substr(pathname.indexOf('/') + 1);
       }
       else {
@@ -47,7 +46,7 @@ export function resolveIfNotPlain (relUrl, parentUrl) {
     }
     else {
       // resolving to :/ so pathname is the /... part
-      pathname = parentUrl.substr(parentProtocol[0].length + 1);
+      pathname = parentUrl.substr(parentProtocol.length + 1);
     }
 
     if (firstChar === '/') {
@@ -63,27 +62,27 @@ export function resolveIfNotPlain (relUrl, parentUrl) {
     var segmented = pathname.substr(0, pathname.lastIndexOf('/') + 1) + relUrl;
 
     var output = [];
-    var segmentIndex = undefined;
+    var segmentIndex = -1;
 
     for (var i = 0; i < segmented.length; i++) {
       // busy reading a segment - only terminate on '/'
-      if (segmentIndex !== undefined) {
+      if (segmentIndex !== -1) {
         if (segmented[i] === '/') {
-          output.push(segmented.substr(segmentIndex, i - segmentIndex + 1));
-          segmentIndex = undefined;
+          output.push(segmented.substring(segmentIndex, i + 1));
+          segmentIndex = -1;
         }
         continue;
       }
 
       // new segment - check if it is relative
       if (segmented[i] === '.') {
         // ../ segment
-        if (segmented[i + 1] === '.' && (segmented[i + 2] === '/' || i === segmented.length - 2)) {
+        if (segmented[i + 1] === '.' && segmented[i + 2] === '/') {
           output.pop();
           i += 2;
         }
         // ./ segment
-        else if (segmented[i + 1] === '/' || i === segmented.length - 1) {
+        else if (segmented[i + 1] === '/') {
           i += 1;
         }
         else {
@@ -106,8 +105,8 @@ export function resolveIfNotPlain (relUrl, parentUrl) {
       segmentIndex = i;
     }
     // finish reading out the last segment
-    if (segmentIndex !== undefined)
-      output.push(segmented.substr(segmentIndex, segmented.length - segmentIndex));
+    if (segmentIndex !== -1)
+      output.push(segmented.substr(segmentIndex));
 
     return parentUrl.substr(0, parentUrl.length - pathname.length) + output.join('');
   }

Diff for: test/1-url-resolution.js

@@ -5,6 +5,9 @@ describe('Simple normalization tests', function() {
   it('Should trim whitespace from URLs', function () {
     assert.equal(resolveIfNotPlain(' c:\\some\\path ', 'file:///c:/adsf/asdf'), 'file:///c:/some/path');
   });
+  it('Should resolve relative with protocol', function () {
+    assert.equal(resolveIfNotPlain('./x:y', 'https://x.com/y'), 'https://x.com/x:y');
+  });
   it('Should resolve windows paths as file:/// URLs', function() {
     assert.equal(resolveIfNotPlain('c:\\some\\path', 'file:///c:/adsf/asdf'), 'file:///c:/some/path');
   });