From 57e5315990337729b58def95f7cfdf093b43da45 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 22 Jan 2017 14:29:12 -0800 Subject: [PATCH 1/3] url: stop exporting originFor() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/10955 Fixes: https://github.com/nodejs/node/issues/10800 Reviewed-By: James M Snell Reviewed-By: Joyee Cheung Reviewed-By: Michaël Zasso --- lib/internal/url.js | 1 - lib/url.js | 1 - .../test-util-inspect-tuple-origin.js | 37 ------------------- 3 files changed, 39 deletions(-) delete mode 100644 test/parallel/test-util-inspect-tuple-origin.js diff --git a/lib/internal/url.js b/lib/internal/url.js index 679e14d72a9c39..c976e950076eaf 100644 --- a/lib/internal/url.js +++ b/lib/internal/url.js @@ -1046,7 +1046,6 @@ function urlToOptions(url) { exports.URL = URL; exports.URLSearchParams = URLSearchParams; -exports.originFor = originFor; exports.domainToASCII = domainToASCII; exports.domainToUnicode = domainToUnicode; exports.encodeAuth = encodeAuth; diff --git a/lib/url.js b/lib/url.js index 933ffe13b4d9e4..2f05cc6648ab48 100644 --- a/lib/url.js +++ b/lib/url.js @@ -18,7 +18,6 @@ exports.resolveObject = urlResolveObject; exports.format = urlFormat; exports.URL = internalUrl.URL; exports.URLSearchParams = internalUrl.URLSearchParams; -exports.originFor = internalUrl.originFor; exports.domainToASCII = internalUrl.domainToASCII; exports.domainToUnicode = internalUrl.domainToUnicode; diff --git a/test/parallel/test-util-inspect-tuple-origin.js b/test/parallel/test-util-inspect-tuple-origin.js deleted file mode 100644 index 743651098f60db..00000000000000 --- a/test/parallel/test-util-inspect-tuple-origin.js +++ /dev/null @@ -1,37 +0,0 @@ -'use strict'; - -require('../common'); -const assert = require('assert'); -const inspect = require('util').inspect; -const originFor = require('url').originFor; - -assert.strictEqual( - inspect(originFor('http://test.com:8000')), - `TupleOrigin { - scheme: http, - host: test.com, - port: 8000, - domain: null - }` - ); - -assert.strictEqual( - inspect(originFor('http://test.com')), - `TupleOrigin { - scheme: http, - host: test.com, - port: undefined, - domain: null - }` - ); - - -assert.strictEqual( - inspect(originFor('https://test.com')), - `TupleOrigin { - scheme: https, - host: test.com, - port: undefined, - domain: null - }` - ); From 499e75a5a11b9d0df78977e5e7c9322425dfa757 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 19 Jan 2017 17:19:41 -0800 Subject: [PATCH 2/3] url: do not public expose inspect methods on URL PR-URL: https://github.com/nodejs/node/pull/10906 Reviewed-By: James M Snell Reviewed-By: Joyee Cheung --- lib/internal/url.js | 4 ++-- test/parallel/test-whatwg-url-parsing.js | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/internal/url.js b/lib/internal/url.js index c976e950076eaf..9ab469c9ffa570 100644 --- a/lib/internal/url.js +++ b/lib/internal/url.js @@ -77,7 +77,7 @@ class TupleOrigin { return result; } - inspect() { + [util.inspect.custom]() { return `TupleOrigin { scheme: ${this[kScheme]}, host: ${this[kHost]}, @@ -235,7 +235,7 @@ class URL { return (this[context].flags & binding.URL_FLAGS_CANNOT_BE_BASE) !== 0; } - inspect(depth, opts) { + [util.inspect.custom](depth, opts) { const ctx = this[context]; var ret = 'URL {\n'; ret += ` href: ${this.href}\n`; diff --git a/test/parallel/test-whatwg-url-parsing.js b/test/parallel/test-whatwg-url-parsing.js index 9ea6cc74bff5e6..f1fd2ae9051533 100644 --- a/test/parallel/test-whatwg-url-parsing.js +++ b/test/parallel/test-whatwg-url-parsing.js @@ -1,6 +1,7 @@ 'use strict'; const common = require('../common'); +const util = require('util'); if (!common.hasIntl) { // A handful of the tests fail when ICU is not included. @@ -144,8 +145,8 @@ for (const test of allTests) { const url = test.url ? new URL(test.url) : new URL(test.input, test.base); for (const showHidden of [true, false]) { - const res = url.inspect(null, { - showHidden: showHidden + const res = util.inspect(url, { + showHidden }); const lines = res.split('\n'); From b94eec1ab75ed5ece0eaafd2ab960f1f71762caf Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 19 Jan 2017 17:15:45 -0800 Subject: [PATCH 3/3] url: define @@toStringTag as a data property Even though this is not fully Web IDL spec-compliant, it is arguably the best we can do. Following the spec would mean non-trivial performance deterioration (10% when parsing a medium-length URL), while the current getter behavior is not adopted by any implementer, and it causes some spec ambiguity when the getter is called with !(this instanceof URL). This commit adopts Chrome's behavior, and is consistent with ECMAScript-defined classes while providing reasonable behaviors for corner cases as well. Until the Web IDL spec is changed one way or another, this is the way to go. PR-URL: https://github.com/nodejs/node/pull/10906 Reviewed-By: James M Snell Reviewed-By: Joyee Cheung --- lib/internal/url.js | 8 ++++---- test/parallel/test-whatwg-url-properties.js | 4 ++-- test/parallel/test-whatwg-url-tostringtag.js | 7 +++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/internal/url.js b/lib/internal/url.js index 9ab469c9ffa570..84e04ee9d8fa85 100644 --- a/lib/internal/url.js +++ b/lib/internal/url.js @@ -223,10 +223,6 @@ class URL { parse(this, input, base); } - get [Symbol.toStringTag]() { - return this instanceof URL ? 'URL' : 'URLPrototype'; - } - get [special]() { return (this[context].flags & binding.URL_FLAGS_SPECIAL) !== 0; } @@ -314,6 +310,10 @@ Object.defineProperties(URL.prototype, { return ret; } }, + [Symbol.toStringTag]: { + configurable: true, + value: 'URL' + }, href: { enumerable: true, configurable: true, diff --git a/test/parallel/test-whatwg-url-properties.js b/test/parallel/test-whatwg-url-properties.js index 0b5e633677170a..b762659fb6eadc 100644 --- a/test/parallel/test-whatwg-url-properties.js +++ b/test/parallel/test-whatwg-url-properties.js @@ -45,7 +45,7 @@ assert.strictEqual(url.searchParams, oldParams); // [SameObject] // Note: this error message is subject to change in V8 updates assert.throws(() => url.origin = 'http://foo.bar.com:22', new RegExp('TypeError: Cannot set property origin of' + - ' \\[object Object\\] which has only a getter')); + ' \\[object URL\\] which has only a getter')); assert.strictEqual(url.origin, 'http://foo.bar.com:21'); assert.strictEqual(url.toString(), 'http://user:pass@foo.bar.com:21/aaa/zzz?l=25#test'); @@ -121,7 +121,7 @@ assert.strictEqual(url.hash, '#abcd'); // Note: this error message is subject to change in V8 updates assert.throws(() => url.searchParams = '?k=88', new RegExp('TypeError: Cannot set property searchParams of' + - ' \\[object Object\\] which has only a getter')); + ' \\[object URL\\] which has only a getter')); assert.strictEqual(url.searchParams, oldParams); assert.strictEqual(url.toString(), 'https://user2:pass2@foo.bar.org:23/aaa/bbb?k=99#abcd'); diff --git a/test/parallel/test-whatwg-url-tostringtag.js b/test/parallel/test-whatwg-url-tostringtag.js index 9e0927955feaab..55b0a48ce741ac 100644 --- a/test/parallel/test-whatwg-url-tostringtag.js +++ b/test/parallel/test-whatwg-url-tostringtag.js @@ -10,9 +10,12 @@ const sp = url.searchParams; const test = [ [toString.call(url), 'URL'], - [toString.call(Object.getPrototypeOf(url)), 'URLPrototype'], [toString.call(sp), 'URLSearchParams'], - [toString.call(Object.getPrototypeOf(sp)), 'URLSearchParamsPrototype'] + [toString.call(Object.getPrototypeOf(sp)), 'URLSearchParamsPrototype'], + // Web IDL spec says we have to return 'URLPrototype', but it is too + // expensive to implement; therefore, use Chrome's behavior for now, until + // spec is changed. + [toString.call(Object.getPrototypeOf(url)), 'URL'] ]; test.forEach((row) => {