Skip to content

url: update url module to use module.exports = {} pattern #12717

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
jasnell wants to merge 2 commits into from
Closed

url: update url module to use module.exports = {} pattern #12717

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8320c33
url: move to module.exports = {} pattern
jasnell Apr 28, 2017
123e699
url: refactor binding imports in internal/url
jasnell Apr 28, 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
Next Next commit
url: move to module.exports = {} pattern
  • Loading branch information
@jasnell
jasnell committed Apr 29, 2017
commit 8320c33b9e2e044c53d4366f00764263b512e8b9
37 changes: 26 additions & 11 deletions lib/url.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@

const { toASCII } = process.binding('config').hasIntl ?
process.binding('icu') : require('punycode');

const { hexTable } = require('internal/querystring');
const internalUrl = require('internal/url');
exports.parse = urlParse;
exports.resolve = urlResolve;
exports.resolveObject = urlResolveObject;
exports.format = urlFormat;
exports.URL = internalUrl.URL;
exports.URLSearchParams = internalUrl.URLSearchParams;
exports.domainToASCII = internalUrl.domainToASCII;
exports.domainToUnicode = internalUrl.domainToUnicode;

// WHATWG URL implementation provided by internal/url
const {
URL,
URLSearchParams,
domainToASCII,
domainToUnicode,
formatSymbol
} = require('internal/url');

exports.Url = Url;
// Original url.parse() API

function Url() {
this.protocol = null;
Expand Down Expand Up @@ -559,7 +559,7 @@ function urlFormat(obj, options) {
throw new TypeError('Parameter "urlObj" must be an object, not ' +
(obj === null ? 'null' : typeof obj));
} else if (!(obj instanceof Url)) {
var format = obj[internalUrl.formatSymbol];
var format = obj[formatSymbol];
return format ?
format.call(obj, options) :
Url.prototype.format.call(obj);
Expand Down Expand Up @@ -1030,3 +1030,18 @@ function encodeAuth(str) {
return out + str.slice(lastPos);
return out;
}

module.exports = {
// Original API
Url,
parse: urlParse,
resolve: urlResolve,
resolveObject: urlResolveObject,
format: urlFormat,

// WHATWG API
URL,
URLSearchParams,
domainToASCII,
domainToUnicode
};