refactor: use isYupValidator util fn

logaretm · Jul 18, 2020 · 9a4279d · 9a4279d
1 parent bc6c51c
commit 9a4279d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/packages/core/src/utils/assertions.ts b/packages/core/src/utils/assertions.ts
@@ -11,3 +11,9 @@ export function isLocator(value: unknown): value is Locator {
 export function isHTMLTag(tag: string) {
   return ['input', 'textarea', 'select'].includes(tag);
 }
+
+type YupValidator = { validate: (value: any) => Promise<void | boolean> };
+
+export function isYupValidator(value: unknown): value is YupValidator {
+  return value && isCallable((value as any).validate);
+}
diff --git a/packages/core/src/utils/rules.ts b/packages/core/src/utils/rules.ts
@@ -1,5 +1,5 @@
 import { Locator, GenericValidateFunction } from '../types';
-import { isLocator } from './assertions';
+import { isLocator, isYupValidator } from './assertions';
 import { isCallable, isObject } from '../../../shared';
 
 /**
@@ -20,7 +20,7 @@ export function normalizeRules(rules: any): GenericValidateFunction | Record<str
   }
 
   // If its a single validate function or a yup fn, leave as is.
-  if (isCallable(rules) || isCallable(rules && rules.validate)) {
+  if (isCallable(rules) || isYupValidator(rules)) {
     return rules;
   }
 

diff --git a/packages/core/src/validate.ts b/packages/core/src/validate.ts
@@ -1,5 +1,5 @@
 import { resolveRule } from './defineRule';
-import { isLocator, normalizeRules } from './utils';
+import { isLocator, normalizeRules, isYupValidator } from './utils';
 import { getConfig } from './config';
 import { ValidationResult, GenericValidateFunction } from './types';
 import { isCallable, FieldContext } from '../../shared';
@@ -71,8 +71,8 @@ async function _validate(field: FieldValidationContext, value: any) {
     };
   }
 
-  if (isCallable(field.rules?.validate)) {
-    return validateWithYup(field, value);
+  if (isYupValidator(field.rules)) {
+    return validateFieldWithYup(field, value);
   }
 
   const errors: ReturnType<typeof _generateFieldError>[] = [];
@@ -105,7 +105,7 @@ async function _validate(field: FieldValidationContext, value: any) {
 /**
  * Handles yup validation
  */
-async function validateWithYup(field: FieldValidationContext, value: any) {
+async function validateFieldWithYup(field: FieldValidationContext, value: any) {
   const result = await field.rules
     .validate(value)
     .then(() => true)