-
Notifications
You must be signed in to change notification settings - Fork 29.9k
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.
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
url: more precise URLSearchParams constructor #13026
Conversation
Previously I saw noticeable performance impacts when using a helper function like this, you may want to benchmark it vs. explicitly inlining. |
lib/internal/url.js
Outdated
// Returns true if `val` is of the spec Object type (including functions), but | ||
// false if `val` is of the spec Null type. | ||
function isObject(val) { | ||
return (typeof val === 'object' && val !== null) || typeof val === 'function'; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we do want a helper function..this seems to be equivalent to !util.isPrimitive(val)
?
lib/internal/url.js
Outdated
key = toUSVString(key); | ||
const value = toUSVString(init[key]); | ||
this[searchParams].push(key, value); | ||
for (const key of Reflect.ownKeys(init)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
would likely be faster to use a normal for-n loop here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jasnell Did you mean for-in
? I think that one doesn't give you the property symbols.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I mean..
const keys = Reflect.ownKeys(init);
for (var n = 0; n < keys.length; n++) {
// ...
}
@@ -156,7 +167,8 @@ test(function() { | |||
[ | |||
{ "input": {"+": "%C2"}, "output": [["+", "%C2"]], "name": "object with +" }, | |||
{ "input": {c: "x", a: "?"}, "output": [["c", "x"], ["a", "?"]], "name": "object with two keys" }, | |||
{ "input": [["c", "x"], ["a", "?"]], "output": [["c", "x"], ["a", "?"]], "name": "array with two keys" } | |||
{ "input": [["c", "x"], ["a", "?"]], "output": [["c", "x"], ["a", "?"]], "name": "array with two keys" }, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
long lines here. does this pass lint?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is from WPT so it's wrapped in eslint-disable
66bc147
to
2fefc33
Compare
Unfortunately this is true for this PR as well. Now the checks are specifically inlined. New CI: https://ci.nodejs.org/job/node-test-pull-request/8218/ |
@@ -226,6 +246,8 @@ test(() => { | |||
assert.throws(() => new URLSearchParams([['a', obj]]), /^Error: toString$/); | |||
assert.throws(() => new URLSearchParams(sym), | |||
/^TypeError: Cannot convert a Symbol value to a string$/); | |||
assert.throws(() => new URLSearchParams({ [sym]: 'a' }), | |||
/^TypeError: Cannot convert a Symbol value to a string$/); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
perhaps create the regex once and reuse it?
lib/internal/url.js
Outdated
@@ -817,7 +817,8 @@ class URLSearchParams { | |||
constructor(init = undefined) { | |||
if (init === null || init === undefined) { | |||
this[searchParams] = []; | |||
} else if (typeof init === 'object') { | |||
} else if (typeof init === 'object' && init !== null || | |||
typeof init === 'function') { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure how others feel, but I prefer to use parentheses when I’m mixing logical and and logical or because I can never remember the precedence rules. ;)
2fefc33
to
67d56cc
Compare
PR-URL: #13026 Ref: web-platform-tests/wpt#5813 Reviewed-By: Daijiro Wachi <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: James M Snell <[email protected]>
Landed in 95eef9b |
PR-URL: #13026 Ref: web-platform-tests/wpt#5813 Reviewed-By: Daijiro Wachi <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: James M Snell <[email protected]>
Refs: web-platform-tests/wpt#5813
Checklist
make -j4 test
(UNIX), orvcbuild test
(Windows) passesAffected core subsystem(s)
url