Skip to content

url: use util's getConstructorOf #12526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
TimothyGu wants to merge 2 commits into from
Closed

url: use util's getConstructorOf #12526

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5dad81
util: move getConstructorOf() to internal
TimothyGu Apr 20, 2017
0f495ff
url: use internal/util's getConstructorOf
TimothyGu Apr 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
url: use internal/util's getConstructorOf
  • Loading branch information
@TimothyGu
TimothyGu committed Apr 20, 2017
commit 0f495ff1674bb939877279007d86d04108a9149a
14 changes: 2 additions & 12 deletions lib/internal/url.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const {
hexTable,
isHexTable
} = require('internal/querystring');
const { getConstructorOf } = require('internal/util');
const binding = process.binding('url');
const context = Symbol('context');
const cannotBeBase = Symbol('cannot-be-base');
Expand Down Expand Up @@ -184,17 +185,6 @@ function onParseHashComplete(flags, protocol, username, password,
}
}

function getEligibleConstructor(obj) {
while (obj !== null) {
if (Object.prototype.hasOwnProperty.call(obj, 'constructor') &&
typeof obj.constructor === 'function') {
return obj.constructor;
}
obj = Object.getPrototypeOf(obj);
}
return null;
}

class URL {
constructor(input, base) {
// toUSVString is not needed.
Expand Down Expand Up @@ -225,7 +215,7 @@ class URL {
if (typeof depth === 'number' && depth < 0)
return opts.stylize('[Object]', 'special');

const ctor = getEligibleConstructor(this);
const ctor = getConstructorOf(this);

const obj = Object.create({
constructor: ctor === null ? URL : ctor
Expand Down