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.

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

merged 2 commits into from
Apr 23, 2020

Conversation

KeelanM90
Copy link
Contributor

Came across issue #849 this morning. Hopefully this closes #849

@KeelanM90
Copy link
Contributor Author

Please let me know if any updates are needed

src/string.js Outdated
@@ -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!

@KeelanM90 KeelanM90 requested a review from jquense April 22, 2020 20:54
@jquense jquense merged commit 16efe88 into jquense:master Apr 23, 2020
@jquense
Copy link
Owner

jquense commented Apr 23, 2020

thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Error message provided via function not being returned in validation errors when using .matches()
2 participants