Parser: fix leading slashes logic

Author: codenirvana

CHANGELOG.yaml

@@ -1,4 +1,6 @@
 unreleased:
+  fixed bugs:
+    - Fixed a bug where leading slashes are trimmed incorrectly
   chores:
     - Removed punycode fallback for Electron v3
 

parser/index.js

@@ -158,7 +158,6 @@ function parse (urlString) {
         },
         replacements = new ReplacementTracker(),
         pointer = 0,
-        protocol,
         _length,
         length,
         index,
@@ -202,27 +201,27 @@ function parse (urlString) {
     // @todo support `protocol:host/path` and `protocol:/host/path`
     if ((index = urlString.indexOf(PROTOCOL_SEPARATOR)) !== -1) {
         // extract from the front
-        url.protocol.value = protocol = urlString.slice(0, index);
+        url.protocol.value = urlString.slice(0, index);
         url.protocol.beginIndex = pointer;
         url.protocol.endIndex = pointer + index;
 
         urlString = urlString.slice(index + 3);
         length -= index + 3;
         pointer += index + 3;
-    }
 
-    // special handling for leading slashes e.g, http:///example.com
-    _length = length; // length with leading slashes
+        // special handling for extra slashes in protocol e.g, http:///example.com
+        _length = length; // length with leading slashes
 
-    urlString = urlString.replace(REGEX_LEADING_SLASHES,
-        (protocol && protocol.toLowerCase() === FILE_PROTOCOL) ?
-            // file:////path -> file:///path
-            PATH_SEPARATOR :
-            // protocol:////host/path -> protocol://host/path
-            E);
+        urlString = urlString.replace(REGEX_LEADING_SLASHES,
+            (url.protocol.value.toLowerCase() === FILE_PROTOCOL) ?
+                // file:////path -> file:///path
+                PATH_SEPARATOR :
+                // protocol:////host/path -> protocol://host/path
+                E);
 
-    length = urlString.length; // length without slashes
-    pointer += _length - length; // update pointer
+        length = urlString.length; // length without slashes
+        pointer += _length - length; // update pointer
+    }
 
     // 4. url.path
     if ((index = urlString.indexOf(PATH_SEPARATOR)) !== -1) {

test/unit/parser/parser.test.js

@@ -246,24 +246,6 @@ describe('parser', function () {
             });
         });
 
-        it('should handle leading slashes', function () {
-            expect(parser.parse('//localhost/foo')).to.deep.include({
-                raw: '//localhost/foo',
-                protocol: undefined,
-                host: ['localhost'],
-                path: ['foo']
-            });
-        });
-
-        it('should handle leading backslashes', function () {
-            expect(parser.parse('\\\\localhost\\foo')).to.deep.include({
-                raw: '\\\\localhost\\foo',
-                protocol: undefined,
-                host: ['localhost'],
-                path: ['foo']
-            });
-        });
-
         it('should handle file://host/foo', function () {
             expect(parser.parse('file://host/foo')).to.deep.include({
                 raw: 'file://host/foo',

test/unit/toNodeUrl.test.js

@@ -732,14 +732,6 @@ describe('.toNodeUrl', function () {
                 href: 'https://example.com/foo/bar'
             });
 
-            expect(toNodeUrl('////example.com/foo/bar')).to.include({
-                protocol: 'http:',
-                host: 'example.com',
-                hostname: 'example.com',
-                pathname: '/foo/bar',
-                href: 'http://example.com/foo/bar'
-            });
-
             // eslint-disable-next-line no-useless-escape
             expect(toNodeUrl('https:/\/\/\example.com/foo/bar')).to.include({
                 protocol: 'https:',