Skip to content

Commit 326e967

Browse files
TimothyGutargos
authored andcommitted
url: export URLSearchParams
Fixes: #10761
1 parent 4f8582e commit 326e967

11 files changed

+24
-57
lines changed

lib/internal/url.js

+1
Original file line numberDiff line numberDiff line change
@@ -1045,6 +1045,7 @@ function urlToOptions(url) {
10451045
}
10461046

10471047
exports.URL = URL;
1048+
exports.URLSearchParams = URLSearchParams;
10481049
exports.originFor = originFor;
10491050
exports.domainToASCII = domainToASCII;
10501051
exports.domainToUnicode = domainToUnicode;

lib/url.js

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ exports.resolve = urlResolve;
1717
exports.resolveObject = urlResolveObject;
1818
exports.format = urlFormat;
1919
exports.URL = internalUrl.URL;
20+
exports.URLSearchParams = internalUrl.URLSearchParams;
2021
exports.originFor = internalUrl.originFor;
2122
exports.domainToASCII = internalUrl.domainToASCII;
2223
exports.domainToUnicode = internalUrl.domainToUnicode;

test/parallel/test-whatwg-url-searchparams-append.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22

33
require('../common');
44
const assert = require('assert');
5-
const URL = require('url').URL;
5+
const URLSearchParams = require('url').URLSearchParams;
66

7-
const m = new URL('http://example.org');
8-
let params = m.searchParams;
9-
10-
// Until we export URLSearchParams
11-
const URLSearchParams = params.constructor;
7+
let params;
128

139
// Append same name
1410
params = new URLSearchParams();

test/parallel/test-whatwg-url-searchparams-constructor.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22

33
require('../common');
44
const assert = require('assert');
5-
const URL = require('url').URL;
5+
const URLSearchParams = require('url').URLSearchParams;
66

7-
const m = new URL('http://example.org');
8-
let params = m.searchParams;
9-
10-
// Until we export URLSearchParams
11-
const URLSearchParams = params.constructor;
7+
let params;
128

139
// Basic URLSearchParams construction
1410
params = new URLSearchParams();

test/parallel/test-whatwg-url-searchparams-delete.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22

33
require('../common');
44
const assert = require('assert');
5-
const URL = require('url').URL;
5+
const url = require('url');
6+
const URL = url.URL;
7+
const URLSearchParams = url.URLSearchParams;
68

7-
const m = new URL('http://example.org');
8-
let params = m.searchParams;
9-
10-
// Until we export URLSearchParams
11-
const URLSearchParams = params.constructor;
9+
let params;
1210

1311
// Delete basics
1412
params = new URLSearchParams('a=b&c=d');

test/parallel/test-whatwg-url-searchparams-foreach.js

+4-8
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@
22

33
require('../common');
44
const assert = require('assert');
5-
const URL = require('url').URL;
6-
7-
const m = new URL('http://example.org');
8-
let params = m.searchParams;
9-
10-
// Until we export URLSearchParams
11-
const URLSearchParams = params.constructor;
5+
const url = require('url');
6+
const URL = url.URL;
7+
const URLSearchParams = url.URLSearchParams;
128

139
let a, b, i;
1410

1511
// ForEach Check
16-
params = new URLSearchParams('a=1&b=2&c=3');
12+
const params = new URLSearchParams('a=1&b=2&c=3');
1713
const keys = [];
1814
const values = [];
1915
params.forEach(function(value, key) {

test/parallel/test-whatwg-url-searchparams-get.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22

33
require('../common');
44
const assert = require('assert');
5-
const URL = require('url').URL;
5+
const URLSearchParams = require('url').URLSearchParams;
66

7-
const m = new URL('http://example.org');
8-
let params = m.searchParams;
9-
10-
// Until we export URLSearchParams
11-
const URLSearchParams = params.constructor;
7+
let params;
128

139
// Get basics
1410
params = new URLSearchParams('a=b&c=d');

test/parallel/test-whatwg-url-searchparams-getall.js

+2-7
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@
22

33
require('../common');
44
const assert = require('assert');
5-
const URL = require('url').URL;
6-
7-
const m = new URL('http://example.org');
8-
let params = m.searchParams;
9-
10-
// Until we export URLSearchParams
11-
const URLSearchParams = params.constructor;
5+
const URLSearchParams = require('url').URLSearchParams;
126

7+
let params;
138
let matches;
149

1510
// getAll() basics

test/parallel/test-whatwg-url-searchparams-has.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22

33
require('../common');
44
const assert = require('assert');
5-
const URL = require('url').URL;
5+
const URLSearchParams = require('url').URLSearchParams;
66

7-
const m = new URL('http://example.org');
8-
let params = m.searchParams;
9-
10-
// Until we export URLSearchParams
11-
const URLSearchParams = params.constructor;
7+
let params;
128

139
// Has basics
1410
params = new URLSearchParams('a=b&c=d');

test/parallel/test-whatwg-url-searchparams-set.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22

33
require('../common');
44
const assert = require('assert');
5-
const URL = require('url').URL;
5+
const URLSearchParams = require('url').URLSearchParams;
66

7-
const m = new URL('http://example.org');
8-
let params = m.searchParams;
9-
10-
// Until we export URLSearchParams
11-
const URLSearchParams = params.constructor;
7+
let params;
128

139
// Set basics
1410
params = new URLSearchParams('a=b&c=d');

test/parallel/test-whatwg-url-searchparams-stringifier.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22

33
require('../common');
44
const assert = require('assert');
5-
const URL = require('url').URL;
5+
const URLSearchParams = require('url').URLSearchParams;
66

7-
const m = new URL('http://example.org');
8-
let params = m.searchParams;
9-
10-
// Until we export URLSearchParams
11-
const URLSearchParams = params.constructor;
7+
let params;
128

139
// Serialize space
1410
// querystring does not currently handle spaces intelligently

0 commit comments

Comments
 (0)