-
Notifications
You must be signed in to change notification settings - Fork 529
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
added descriptive error messages for URL parser #2016
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -48,38 +48,38 @@ function parseURL (url) { | |||||
url = new URL(url) | ||||||
|
||||||
if (!/^https?:/.test(url.origin || url.protocol)) { | ||||||
throw new InvalidArgumentError('invalid protocol') | ||||||
throw new InvalidArgumentError('Invalid URL protocol: the URL must start with `http:` or `https:`.') | ||||||
} | ||||||
|
||||||
return url | ||||||
} | ||||||
|
||||||
if (!url || typeof url !== 'object') { | ||||||
throw new InvalidArgumentError('invalid url') | ||||||
throw new InvalidArgumentError('Invalid URL argument: The URL argument must be a non-null object.') | ||||||
} | ||||||
|
||||||
if (url.port != null && url.port !== '' && !Number.isFinite(parseInt(url.port))) { | ||||||
throw new InvalidArgumentError('invalid port') | ||||||
throw new InvalidArgumentError('Invalid Port: port must be a valid integer or a string representation of an integer.') | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
} | ||||||
|
||||||
if (url.path != null && typeof url.path !== 'string') { | ||||||
throw new InvalidArgumentError('invalid path') | ||||||
throw new InvalidArgumentError('Invalid URL path: the path must be a string or null/undefined.') | ||||||
} | ||||||
|
||||||
if (url.pathname != null && typeof url.pathname !== 'string') { | ||||||
throw new InvalidArgumentError('invalid pathname') | ||||||
throw new InvalidArgumentError('Invalid URL pathname: the pathname must be a string or null/undefined.') | ||||||
} | ||||||
|
||||||
if (url.hostname != null && typeof url.hostname !== 'string') { | ||||||
throw new InvalidArgumentError('invalid hostname') | ||||||
throw new InvalidArgumentError('Invalid URL hostname: the hostname must be a string or null/undefined.') | ||||||
} | ||||||
|
||||||
if (url.origin != null && typeof url.origin !== 'string') { | ||||||
throw new InvalidArgumentError('invalid origin') | ||||||
throw new InvalidArgumentError('Invalid URL origin: the origin must be a string or null/undefined.') | ||||||
} | ||||||
|
||||||
if (!/^https?:/.test(url.origin || url.protocol)) { | ||||||
throw new InvalidArgumentError('invalid protocol') | ||||||
throw new InvalidArgumentError('Invalid URL protocol: the URL must start with `http:` or `https:`.') | ||||||
} | ||||||
|
||||||
if (!(url instanceof URL)) { | ||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.