Skip to content

url: replace "magic" numbers by constants #19300

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
daynin wants to merge 1 commit into from
+15 −5
Closed

url: replace "magic" numbers by constants #19300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions lib/internal/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ module.exports = {
CHAR_CIRCUMFLEX_ACCENT: 94, /* ^ */
CHAR_GRAVE_ACCENT: 96, /* ` */
CHAR_AT: 64, /* @ */
CHAR_AMPERSAND: 38, /* & */
CHAR_EQUAL: 61, /* = */

// Digits
CHAR_0: 48, /* 0 */
Expand Down
18 changes: 13 additions & 5 deletions lib/internal/url.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@ const {
ERR_INVALID_URL_SCHEME,
ERR_MISSING_ARGS
} = require('internal/errors').codes;
const {
CHAR_PERCENT,
CHAR_PLUS,
CHAR_AMPERSAND,
CHAR_EQUAL,
CHAR_LOWERCASE_A,
CHAR_LOWERCASE_Z,
Copy link
Member

@gireeshpunathil gireeshpunathil Mar 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is the trailing comma required?

Copy link
Contributor Author

@daynin daynin Mar 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gireeshpunathil no, it's not required, but allowed. I can delete it (should I?), but I think it's a better way to work with multiline "lists"

Copy link
Member

@gibfahn gibfahn Mar 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer the trailing comma but others don't, I don't think we have consensus, so I'd say do whatever you prefer @daynin .

} = require('internal/constants');
const querystring = require('querystring');

const { platform } = process;
Expand Down Expand Up @@ -712,7 +720,7 @@ function parseParams(qs) {
const code = qs.charCodeAt(i);

// Try matching key/value pair separator
if (code === 38/* & */) {
if (code === CHAR_AMPERSAND) {
if (pairStart === i) {
// We saw an empty substring between pair separators
lastPos = pairStart = i + 1;
Expand All @@ -738,7 +746,7 @@ function parseParams(qs) {
}

// Try matching key/value separator (e.g. '=') if we haven't already
if (!seenSep && code === 61/* = */) {
if (!seenSep && code === CHAR_EQUAL) {
// Key/value separator match!
if (lastPos < i)
buf += qs.slice(lastPos, i);
Expand All @@ -755,15 +763,15 @@ function parseParams(qs) {
}

// Handle + and percent decoding.
if (code === 43/* + */) {
if (code === CHAR_PLUS) {
if (lastPos < i)
buf += qs.slice(lastPos, i);
buf += ' ';
lastPos = i + 1;
} else if (!encoded) {
// Try to match an (valid) encoded byte (once) to minimize unnecessary
// calls to string decoding functions
if (code === 37/* % */) {
if (code === CHAR_PERCENT) {
encodeCheck = 1;
} else if (encodeCheck > 0) {
// eslint-disable-next-line no-extra-boolean-cast
Expand Down Expand Up @@ -1357,7 +1365,7 @@ function getPathFromURLWin32(url) {
// Otherwise, it's a local path that requires a drive letter
var letter = pathname.codePointAt(1) | 0x20;
var sep = pathname[2];
if (letter < 97 || letter > 122 || // a..z A..Z
if (letter < CHAR_LOWERCASE_A || letter > CHAR_LOWERCASE_Z || // a..z A..Z
(sep !== ':')) {
throw new ERR_INVALID_FILE_URL_PATH('must be absolute');
}
Expand Down