url: avoid instanceof for WHATWG URL

mscdex · evanlucas · commit b50a84a2599e · 2017-05-01T11:16:06.000-05:00
PR-URL: #12507 Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/benchmark/url/url-searchparams-read.js b/benchmark/url/url-searchparams-read.js
@@ -5,7 +5,7 @@ const { URLSearchParams } = require('url');
 const bench = common.createBenchmark(main, {
   method: ['get', 'getAll', 'has'],
   param: ['one', 'two', 'three', 'nonexistent'],
-  n: [1e6]
+  n: [2e7]
 });
 
 const str = 'one=single&two=first&three=first&two=2nd&three=2nd&three=3rd';
diff --git a/benchmark/url/whatwg-url-properties.js b/benchmark/url/whatwg-url-properties.js
@@ -8,7 +8,7 @@ const bench = common.createBenchmark(main, {
   prop: ['href', 'origin', 'protocol',
          'username', 'password', 'host', 'hostname', 'port',
          'pathname', 'search', 'searchParams', 'hash'],
-  n: [1e4]
+  n: [3e5]
 });
 
 function setAndGet(n, url, prop, alternative) {
diff --git a/lib/internal/url.js b/lib/internal/url.js
@@ -239,8 +239,10 @@ class URL {
   constructor(input, base) {
     // toUSVString is not needed.
     input = `${input}`;
-    if (base !== undefined && !(base instanceof URL))
+    if (base !== undefined &&
+        (!base[searchParams] || !base[searchParams][searchParams])) {
       base = new URL(base);
+    }
     parse(this, input, base);
   }
 
@@ -885,7 +887,7 @@ class URLSearchParams {
   }
 
   [util.inspect.custom](recurseTimes, ctx) {
-    if (!this || !(this instanceof URLSearchParams)) {
+    if (!this || !this[searchParams] || this[searchParams][searchParams]) {
       throw new TypeError('Value of `this` is not a URLSearchParams');
     }
 
@@ -947,7 +949,7 @@ function merge(out, start, mid, end, lBuffer, rBuffer) {
 
 defineIDLClass(URLSearchParams.prototype, 'URLSearchParams', {
   append(name, value) {
-    if (!this || !(this instanceof URLSearchParams)) {
+    if (!this || !this[searchParams] || this[searchParams][searchParams]) {
       throw new TypeError('Value of `this` is not a URLSearchParams');
     }
     if (arguments.length < 2) {
@@ -961,7 +963,7 @@ defineIDLClass(URLSearchParams.prototype, 'URLSearchParams', {
   },
 
   delete(name) {
-    if (!this || !(this instanceof URLSearchParams)) {
+    if (!this || !this[searchParams] || this[searchParams][searchParams]) {
       throw new TypeError('Value of `this` is not a URLSearchParams');
     }
     if (arguments.length < 1) {
@@ -982,7 +984,7 @@ defineIDLClass(URLSearchParams.prototype, 'URLSearchParams', {
   },
 
   get(name) {
-    if (!this || !(this instanceof URLSearchParams)) {
+    if (!this || !this[searchParams] || this[searchParams][searchParams]) {
       throw new TypeError('Value of `this` is not a URLSearchParams');
     }
     if (arguments.length < 1) {
@@ -1000,7 +1002,7 @@ defineIDLClass(URLSearchParams.prototype, 'URLSearchParams', {
   },
 
   getAll(name) {
-    if (!this || !(this instanceof URLSearchParams)) {
+    if (!this || !this[searchParams] || this[searchParams][searchParams]) {
       throw new TypeError('Value of `this` is not a URLSearchParams');
     }
     if (arguments.length < 1) {
@@ -1019,7 +1021,7 @@ defineIDLClass(URLSearchParams.prototype, 'URLSearchParams', {
   },
 
   has(name) {
-    if (!this || !(this instanceof URLSearchParams)) {
+    if (!this || !this[searchParams] || this[searchParams][searchParams]) {
       throw new TypeError('Value of `this` is not a URLSearchParams');
     }
     if (arguments.length < 1) {
@@ -1037,7 +1039,7 @@ defineIDLClass(URLSearchParams.prototype, 'URLSearchParams', {
   },
 
   set(name, value) {
-    if (!this || !(this instanceof URLSearchParams)) {
+    if (!this || !this[searchParams] || this[searchParams][searchParams]) {
       throw new TypeError('Value of `this` is not a URLSearchParams');
     }
     if (arguments.length < 2) {
@@ -1125,15 +1127,15 @@ defineIDLClass(URLSearchParams.prototype, 'URLSearchParams', {
   // Define entries here rather than [Symbol.iterator] as the function name
   // must be set to `entries`.
   entries() {
-    if (!this || !(this instanceof URLSearchParams)) {
+    if (!this || !this[searchParams] || this[searchParams][searchParams]) {
       throw new TypeError('Value of `this` is not a URLSearchParams');
     }
 
     return createSearchParamsIterator(this, 'key+value');
   },
 
   forEach(callback, thisArg = undefined) {
-    if (!this || !(this instanceof URLSearchParams)) {
+    if (!this || !this[searchParams] || this[searchParams][searchParams]) {
       throw new TypeError('Value of `this` is not a URLSearchParams');
     }
     if (typeof callback !== 'function') {
@@ -1155,15 +1157,15 @@ defineIDLClass(URLSearchParams.prototype, 'URLSearchParams', {
 
   // https://heycam.github.io/webidl/#es-iterable
   keys() {
-    if (!this || !(this instanceof URLSearchParams)) {
+    if (!this || !this[searchParams] || this[searchParams][searchParams]) {
       throw new TypeError('Value of `this` is not a URLSearchParams');
     }
 
     return createSearchParamsIterator(this, 'key');
   },
 
   values() {
-    if (!this || !(this instanceof URLSearchParams)) {
+    if (!this || !this[searchParams] || this[searchParams][searchParams]) {
       throw new TypeError('Value of `this` is not a URLSearchParams');
     }
 
@@ -1173,7 +1175,7 @@ defineIDLClass(URLSearchParams.prototype, 'URLSearchParams', {
   // https://heycam.github.io/webidl/#es-stringifier
   // https://url.spec.whatwg.org/#urlsearchparams-stringification-behavior
   toString() {
-    if (!this || !(this instanceof URLSearchParams)) {
+    if (!this || !this[searchParams] || this[searchParams][searchParams]) {
       throw new TypeError('Value of `this` is not a URLSearchParams');
     }
 
@@ -1275,8 +1277,10 @@ defineIDLClass(URLSearchParamsIteratorPrototype, 'URLSearchParamsIterator', {
 });
 
 function originFor(url, base) {
-  if (!(url instanceof URL))
+  if (url != undefined &&
+      (!url[searchParams] || !url[searchParams][searchParams])) {
     url = new URL(url, base);
+  }
   var origin;
   const protocol = url.protocol;
   switch (protocol) {
@@ -1399,8 +1403,10 @@ function getPathFromURLPosix(url) {
 }
 
 function getPathFromURL(path) {
-  if (!(path instanceof URL))
+  if (path == undefined || !path[searchParams] ||
+      !path[searchParams][searchParams]) {
     return path;
+  }
   if (path.protocol !== 'file:')
     return new TypeError('Only `file:` URLs are supported');
   return isWindows ? getPathFromURLWin32(path) : getPathFromURLPosix(path);
