Replace URL parser with real URL

Fixes mozilla#275

Author: tromey

dist/source-map.debug.js

@@ -731,12 +731,12 @@ BasicSourceMapConsumer.prototype.sourceContentFor =
       // behave like it would if they were running a local HTTP server. See
       // https://bugzilla.mozilla.org/show_bug.cgi?id=885597.
       var fileUriAbsPath = relativeSource.replace(/^file:\/\//, "");
-      if (url.scheme == "file"
+      if (url.protocol == "file:"
           && this._sources.has(fileUriAbsPath)) {
         return this.sourcesContent[this._sources.indexOf(fileUriAbsPath)]
       }
 
-      if ((!url.path || url.path == "/")
+      if ((!url.pathname || url.pathname == "/")
           && this._sources.has("/" + relativeSource)) {
         return this.sourcesContent[this._sources.indexOf("/" + relativeSource)];
       }

dist/source-map.js

@@ -5,6 +5,7 @@
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
+
 /**
  * This is a helper function for getting values from parameter/options
  * objects.
@@ -26,21 +27,15 @@ function getArg(aArgs, aName, aDefaultValue) {
 }
 exports.getArg = getArg;
 
-var urlRegexp = /^(?:([\w+\-.]+):)?\/\/(?:(\w+:\w+)@)?([\w.-]*)(?::(\d+))?(.*)$/;
 var dataUrlRegexp = /^data:.+\,.+$/;
+var URLConstructor = (typeof URL == 'function') ? URL : require('url').URL
 
 function urlParse(aUrl) {
-  var match = aUrl.match(urlRegexp);
-  if (!match) {
+  try {
+    return new URLConstructor(aUrl);
+  } catch (e) {
     return null;
   }
-  return {
-    scheme: match[1],
-    auth: match[2],
-    host: match[3],
-    port: match[4],
-    path: match[5]
-  };
 }
 exports.urlParse = urlParse;
 
@@ -66,6 +61,43 @@ function urlGenerate(aParsedUrl) {
 }
 exports.urlGenerate = urlGenerate;
 
+const MAX_CACHED_INPUTS = 32;
+
+/**
+ * Takes some function `f(input) -> result` and returns a memoized version of
+ * `f`.
+ *
+ * We keep at most `MAX_CACHED_INPUTS` memoized results of `f` alive. The
+ * memoization is a dumb-simple, linear least-recently-used cache.
+ */
+function lruMemoize(f) {
+  const cache = [];
+
+  return function (input) {
+    for (var i = 0; i < cache.length; i++) {
+      if (cache[i].input === input) {
+        var temp = cache[0];
+        cache[0] = cache[i];
+        cache[i] = temp;
+        return cache[0].result;
+      }
+    }
+
+    var result = f(input);
+
+    cache.unshift({
+      input,
+      result,
+    });
+
+    if (cache.length > MAX_CACHED_INPUTS) {
+      cache.pop();
+    }
+
+    return result;
+  };
+}
+
 /**
  * Normalizes a path, or the path portion of a URL:
  *
@@ -81,10 +113,10 @@ function normalize(aPath) {
   var path = aPath;
   var url = urlParse(aPath);
   if (url) {
-    if (!url.path) {
+    if (!url.pathname) {
       return aPath;
     }
-    path = url.path;
+    path = url.pathname;
   }
   var isAbsolute = exports.isAbsolute(path);
 
@@ -115,8 +147,8 @@ function normalize(aPath) {
   }
 
   if (url) {
-    url.path = path;
-    return urlGenerate(url);
+    url.pathname = path;
+    return url.toString();
   }
   return path;
 }
@@ -148,41 +180,41 @@ function join(aRoot, aPath) {
   var aPathUrl = urlParse(aPath);
   var aRootUrl = urlParse(aRoot);
   if (aRootUrl) {
-    aRoot = aRootUrl.path || '/';
+    aRoot = aRootUrl.pathname || '/';
   }
 
   // `join(foo, '//www.example.org')`
-  if (aPathUrl && !aPathUrl.scheme) {
+  if (aPathUrl && !aPathUrl.protocol) {
     if (aRootUrl) {
-      aPathUrl.scheme = aRootUrl.scheme;
+      aPathUrl.protocol = aRootUrl.protocol;
     }
-    return urlGenerate(aPathUrl);
+    return aPathUrl.toString();
   }
 
   if (aPathUrl || aPath.match(dataUrlRegexp)) {
     return aPath;
   }
 
   // `join('http://', 'www.example.com')`
-  if (aRootUrl && !aRootUrl.host && !aRootUrl.path) {
+  if (aRootUrl && !aRootUrl.host && !aRootUrl.pathname) {
     aRootUrl.host = aPath;
-    return urlGenerate(aRootUrl);
+    return aRootUrl.toString();
   }
 
   var joined = aPath.charAt(0) === '/'
     ? aPath
     : normalize(aRoot.replace(/\/+$/, '') + '/' + aPath);
 
   if (aRootUrl) {
-    aRootUrl.path = joined;
-    return urlGenerate(aRootUrl);
+    aRootUrl.pathname = joined;
+    return aRootUrl.toString();
   }
   return joined;
 }
 exports.join = join;
 
 exports.isAbsolute = function (aPath) {
-  return aPath.charAt(0) === '/' || urlRegexp.test(aPath);
+  return aPath.charAt(0) === '/' || !!urlParse(aPath);
 };
 
 /**
@@ -461,8 +493,6 @@ function computeSourceURL(sourceRoot, sourceURL, sourceMapURL) {
   // can implement the source URL resolution algorithm as outlined in
   // the spec.  This block is basically the equivalent of:
   //    new URL(sourceURL, sourceMapURL).toString()
-  // ... except it avoids using URL, which wasn't available in the
-  // older releases of node still supported by this library.
   //
   // The spec says:
   //   If the sources are not absolute URLs after prepending of the
@@ -473,14 +503,14 @@ function computeSourceURL(sourceRoot, sourceURL, sourceMapURL) {
     if (!parsed) {
       throw new Error("sourceMapURL could not be parsed");
     }
-    if (parsed.path) {
+    if (parsed.pathname) {
       // Strip the last path component, but keep the "/".
-      var index = parsed.path.lastIndexOf('/');
+      var index = parsed.pathname.lastIndexOf('/');
       if (index >= 0) {
-        parsed.path = parsed.path.substring(0, index + 1);
+        parsed.pathname = parsed.pathname.substring(0, index + 1);
       }
     }
-    sourceURL = join(urlGenerate(parsed), sourceURL);
+    sourceURL = join(parsed.toString(), sourceURL);
   }
 
   return normalize(sourceURL);

dist/source-map.min.js

@@ -8,20 +8,22 @@
 var libUtil = require('../lib/util');
 
 exports['test urls'] = function (assert) {
-  var assertUrl = function (url) {
-    assert.equal(url, libUtil.urlGenerate(libUtil.urlParse(url)));
+  var assertUrl = function (url, expect) {
+    expect = expect || url;
+    assert.equal(expect, libUtil.urlParse(url).toString());
   };
-  assertUrl('http://');
-  assertUrl('http://www.example.com');
-  assertUrl('http://user:[email protected]');
-  assertUrl('http://www.example.com:80');
+  assertUrl('http://www.example.com', 'http://www.example.com/');
+  assertUrl('http://user:[email protected]', 'http://user:[email protected]/');
+  assertUrl('http://www.example.com:80', 'http://www.example.com/');
   assertUrl('http://www.example.com/');
   assertUrl('http://www.example.com/foo/bar');
   assertUrl('http://www.example.com/foo/bar/');
-  assertUrl('http://user:[email protected]:80/foo/bar/');
+  assertUrl('http://user:[email protected]:80/foo/bar/',
+            'http://user:[email protected]/foo/bar/');
+
+  // From https://bugzilla.mozilla.org/show_bug.cgi?id=1451274
+  assertUrl('data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi9Vc2Vycy9rdWQvUHJvamVjdHMvX2NvbnRleHRlL2xvaXMtd2ViYXBwL3NyYy9zdHlsZXMvc2VsZWN0aW9uLmNzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtFQUNFLHVDQUF1QztFQUN2QyxlQUFlO0NBQ2hCOztBQUVEO0VBQ0UsdUNBQXVDO0VBQ3ZDLGVBQWU7Q0FDaEIiLCJmaWxlIjoic2VsZWN0aW9uLmNzcyIsInNvdXJjZXNDb250ZW50IjpbIjo6LW1vei1zZWxlY3Rpb24ge1xuICBiYWNrZ3JvdW5kLWNvbG9yOiB2YXIoLS1jb2xvci0tYWN0aW9uKTtcbiAgY29sb3I6ICNmZmZmZmY7XG59XG5cbjo6c2VsZWN0aW9uIHtcbiAgYmFja2dyb3VuZC1jb2xvcjogdmFyKC0tY29sb3ItLWFjdGlvbik7XG4gIGNvbG9yOiAjZmZmZmZmO1xufVxuIl0sInNvdXJjZVJvb3QiOiIifQ==');
 
-  assertUrl('//');
-  assertUrl('//www.example.com');
   assertUrl('file:///www.example.com');
 
   assert.equal(libUtil.urlParse(''), null);
@@ -31,19 +33,19 @@ exports['test urls'] = function (assert) {
   assert.equal(libUtil.urlParse('a/b'), null);
   assert.equal(libUtil.urlParse('a//b'), null);
   assert.equal(libUtil.urlParse('/a'), null);
-  assert.equal(libUtil.urlParse('data:foo,bar'), null);
+  assertUrl('data:foo,bar');
 
   var parsed = libUtil.urlParse('http://x-y.com/bar');
-  assert.equal(parsed.scheme, 'http');
+  assert.equal(parsed.protocol, 'http:');
   assert.equal(parsed.host, 'x-y.com');
-  assert.equal(parsed.path, '/bar');
+  assert.equal(parsed.pathname, '/bar');
 
   var webpackURL = 'webpack:///webpack/bootstrap 67e184f9679733298d44'
   parsed = libUtil.urlParse(webpackURL);
-  assert.equal(parsed.scheme, 'webpack');
+  assert.equal(parsed.protocol, 'webpack:');
   assert.equal(parsed.host, '');
-  assert.equal(parsed.path, '/webpack/bootstrap 67e184f9679733298d44');
-  assert.equal(webpackURL, libUtil.urlGenerate(parsed));
+  assert.equal(parsed.pathname, '/webpack/bootstrap%2067e184f9679733298d44');
+  assert.equal(webpackURL, parsed.toString().replace(/%20/, " "));
 };
 
 exports['test normalize()'] = function (assert) {
@@ -73,12 +75,12 @@ exports['test normalize()'] = function (assert) {
   assert.equal(libUtil.normalize('a/././.'), 'a');
 
   assert.equal(libUtil.normalize('/a/b//c////d/////'), '/a/b/c/d/');
-  assert.equal(libUtil.normalize('///a/b//c////d/////'), '///a/b/c/d/');
+  assert.equal(libUtil.normalize('///a/b//c////d/////'), '/a/b/c/d/');
   assert.equal(libUtil.normalize('a/b//c////d'), 'a/b/c/d');
 
   assert.equal(libUtil.normalize('.///.././../a/b//./..'), '../../a')
 
-  assert.equal(libUtil.normalize('http://www.example.com'), 'http://www.example.com');
+  assert.equal(libUtil.normalize('http://www.example.com'), 'http://www.example.com/');
   assert.equal(libUtil.normalize('http://www.example.com/'), 'http://www.example.com/');
   assert.equal(libUtil.normalize('http://www.example.com/./..//a/b/c/.././d//'), 'http://www.example.com/a/b/d/');
 };
@@ -167,8 +169,8 @@ exports['test join()'] = function (assert) {
   assert.equal(libUtil.join('http://foo.org/', '.'), 'http://foo.org/');
   assert.equal(libUtil.join('http://foo.org//', ''), 'http://foo.org/');
   assert.equal(libUtil.join('http://foo.org//', '.'), 'http://foo.org/');
-  assert.equal(libUtil.join('//www.example.com', ''), '//www.example.com/');
-  assert.equal(libUtil.join('//www.example.com', '.'), '//www.example.com/');
+  assert.equal(libUtil.join('//www.example.com', ''), '/www.example.com');
+  assert.equal(libUtil.join('//www.example.com', '.'), '/www.example.com');
 
 
   assert.equal(libUtil.join('http://foo.org/a', 'b'), 'http://foo.org/a/b');
@@ -177,7 +179,6 @@ exports['test join()'] = function (assert) {
   assert.equal(libUtil.join('http://foo.org/a', 'b/'), 'http://foo.org/a/b/');
   assert.equal(libUtil.join('http://foo.org/a', 'b//'), 'http://foo.org/a/b/');
   assert.equal(libUtil.join('http://foo.org/a/', '/b'), 'http://foo.org/b');
-  assert.equal(libUtil.join('http://foo.org/a//', '//b'), 'http://b');
 
   assert.equal(libUtil.join('http://foo.org/a', '..'), 'http://foo.org/');
   assert.equal(libUtil.join('http://foo.org/a', '../b'), 'http://foo.org/b');
@@ -199,11 +200,10 @@ exports['test join()'] = function (assert) {
   assert.equal(libUtil.join('http://foo.org//', '/a'), 'http://foo.org/a');
 
 
-  assert.equal(libUtil.join('http://', 'www.example.com'), 'http://www.example.com');
+  assert.equal(libUtil.join('http://', 'www.example.com'), 'http://www.example.com/');
   assert.equal(libUtil.join('file:///', 'www.example.com'), 'file:///www.example.com');
   assert.equal(libUtil.join('http://', 'ftp://example.com'), 'ftp://example.com');
 
-  assert.equal(libUtil.join('http://www.example.com', '//foo.org/bar'), 'http://foo.org/bar');
   assert.equal(libUtil.join('//www.example.com', '//foo.org/bar'), '//foo.org/bar');
 };