Skip to content
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

Allow passing of function to .matches() options/message param #850

Merged
merged 2 commits into from
Apr 23, 2020
Merged

Allow passing of function to .matches() options/message param #850

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b5780a
Allow passing of function to .matches()
KeelanM90 Apr 21, 2020
22d3fe0
No strict type checking
KeelanM90 Apr 22, 2020
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
1 change: 1 addition & 0 deletions src/string.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ inherits(StringSchema, MixedSchema, {

if (options) {
if (typeof options === 'string') message = options;
if (typeof options === 'function') message = options;
Copy link
Owner

Choose a reason for hiding this comment

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

I think this whole inner branch can be rewritten as

if (typeof options === 'object') {
  ({ excludeEmptyString, message, name } = options);
} else {
  message = options
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the review, I had defaulted to checking it was a function as there was type checking for strings. The docs do show the supported types so it's really down to user error if they pass an incompatible type

Copy link
Owner

Choose a reason for hiding this comment

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

in practice, messages can be any type! The string check seems like a bug

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Perfect, have pushed the update, thanks again!

if (typeof options === 'object') {
({ excludeEmptyString, message, name } = options);
}
Expand Down