From 47748b568ef0d3876fade8807ef3f29fb32352ff Mon Sep 17 00:00:00 2001
From: cupcakearmy <nicco.borgioli@gmail.com>
Date: Sat, 28 Sep 2019 19:00:49 +0200
Subject: [PATCH] added arrays of validators

---
 examples/errorsAndValidation.tsx | 21 +++++++++-
 lib/index.ts                     | 69 ++++++++++++++++++++++----------
 test/test.tsx                    | 12 ++++--
 3 files changed, 76 insertions(+), 26 deletions(-)

diff --git a/examples/errorsAndValidation.tsx b/examples/errorsAndValidation.tsx
index 476ebf6..28b76c4 100644
--- a/examples/errorsAndValidation.tsx
+++ b/examples/errorsAndValidation.tsx
@@ -7,10 +7,24 @@ const Index: React.FC = () => {
 
 	const { auto, form, errors } = useForm({
 		username: '',
+		email: '',
 		password: ''
 	}, {
 		username: value => value.length > 3,
-		password: /[\d]{1,}/
+		email: {
+			validator: /@/,
+			message: 'Must contain an @',
+		},
+		password: [
+			{
+				validator: /[A-Z]/,
+				message: 'Must contain an uppercase letter'
+			},
+			{
+				validator: /[\d]/,
+				message: 'Must contain a digit'
+			},
+		]
 	})
 
 	return (
@@ -21,8 +35,11 @@ const Index: React.FC = () => {
 			<input {...auto('username')} placeholder="Username" />
 			{errors.username && 'Must be longer than 3'}
 
+			<input {...auto('email')} placeholder="EMail" />
+			{errors.email}
+
 			<input {...auto('password')} placeholder="Password" type="password" />
-			{errors.password && 'Must contain a number'}
+			{errors.password}
 
 		</form>
 	)
diff --git a/lib/index.ts b/lib/index.ts
index 6f2a977..60de332 100644
--- a/lib/index.ts
+++ b/lib/index.ts
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React, { useState, useEffect } from 'react'
 
 
 
@@ -20,13 +20,26 @@ export type useFormValidatorObject = {
 
 export type useFormValidator = useFormValidatorMethod | useFormValidatorObject
 
+export type useFormValidatorParameter = useFormValidator | useFormValidator[]
+
 export const HTMLInputExtractor: useFormExtractor = (e: React.FormEvent<HTMLInputElement>) => e.currentTarget.value
 export const HTMLCheckboxExtractor: useFormExtractor = (e: React.FormEvent<HTMLInputElement>) => e.currentTarget.checked
 
-export const useForm = <T, U extends { [key in keyof T]: useFormValidator }, E extends { [key in keyof U]?: string }>(init: T, validators: Partial<U> = {}, options: useFormOptions = {}) => {
+function isFormValidatorObject(validator: useFormValidatorMethod | useFormValidatorObject): validator is useFormValidatorObject {
+	return validator.constructor.name === 'Object'
+}
+
+const defaultErrorMessage = (key: any) => `Error in ${key}`
+
+export const useForm = <T, U extends { [key in keyof T]: useFormValidatorParameter }, E extends { [key in keyof U]?: string }>(init: T, validators: Partial<U> = {}, options: useFormOptions = {}) => {
 	const [form, setForm] = useState<T>(init)
 
 	const [errors, setErrors] = useState<Partial<E>>({})
+	const [isValid, setIsValid] = useState(true);
+
+	useEffect(() => {
+		setIsValid(!Object.values(errors).reduce((acc, cur) => acc || cur !== undefined, false))
+	}, [errors])
 
 	const _set = (key: keyof T, value: any) => {
 		setForm({
@@ -35,34 +48,48 @@ export const useForm = <T, U extends { [key in keyof T]: useFormValidator }, E e
 		})
 	}
 
-	const _validateAll = async (value: any, validator: useFormValidatorMethod): Promise<boolean> => {
-		if (validator.constructor.name === 'Function' || validator.constructor.name === 'AsyncFunction')
+	const _validateAll = async (value: any, object: useFormValidator): Promise<boolean> => {
+		const validator = isFormValidatorObject(object) ? object.validator : object
+
+		if (validator.constructor.name === 'Function')
 			return (validator as useFormValidatorFunction)(value)
+		else if (validator.constructor.name === 'AsyncFunction')
+			return await (validator as useFormValidatorFunction)(value)
 		else if (validator.constructor.name === 'RegExp')
 			return (validator as RegExp).test(value)
 		else return false
 	}
 
-	const _getValidatorMessage = (key: keyof T): string => {
-		// @ts-ignore
-		if (validators[key] && validators[key].message) return validators[key].message
-		else return `Error in: ${key}`
-	}
-
 	const _validate = (key: keyof T, value: any) => {
-		const validator: useFormValidator | undefined = validators[key]
+		const validator: useFormValidatorParameter | undefined = validators[key]
 		if (!validator) return
 
-		// @ts-ignore
-		_validateAll(value, validator.constructor.name === 'Object' ? (validator as useFormValidatorObject).validator : validator)
-			.then((valid: boolean) => {
-				setErrors({
-					...errors,
-					[key]: valid
-						? undefined
-						: _getValidatorMessage(key),
+		if (Array.isArray(validator)) {
+			Promise.all(validator.map(v => _validateAll(value, v)))
+				.then(result => {
+					const index = result.indexOf(false)
+					setErrors({
+						...errors,
+						[key]: index === -1
+							? undefined
+							: isFormValidatorObject(validator[index]) && (validator[index] as useFormValidatorObject).message
+								? (validator[index] as useFormValidatorObject).message
+								: defaultErrorMessage(key)
+					})
 				})
-			})
+		} else {
+			_validateAll(value, validator)
+				.then(valid => {
+					setErrors({
+						...errors,
+						[key]: valid
+							? undefined
+							: isFormValidatorObject(validator) && validator.message
+								? validator.message
+								: defaultErrorMessage(key)
+					})
+				})
+		}
 	}
 
 	const update = (key: keyof T, extractor = options.extractor) => (value: any) => {
@@ -76,5 +103,5 @@ export const useForm = <T, U extends { [key in keyof T]: useFormValidator }, E e
 		[opts.setter || options.setter || 'value']: form[key] as any,
 	})
 
-	return { form, update, auto, errors }
+	return { form, update, auto, errors, isValid }
 }
\ No newline at end of file
diff --git a/test/test.tsx b/test/test.tsx
index 9e8a1ee..ab7862c 100644
--- a/test/test.tsx
+++ b/test/test.tsx
@@ -10,13 +10,19 @@ const TextError: React.FC<{ error?: string }> = ({ error }) => !error
 
 const Index: React.FC = () => {
 
-  const { auto, form, errors } = useForm({
+  const { auto, form, errors, isValid } = useForm({
     username: '',
     password: '',
     type: 'formhero',
     awesome: true,
   }, {
-    username: /^test/,
+    username: [
+      /^test/,
+      {
+        validator: async () => { return true },
+        message: 'Digits please',
+      }
+    ],
     password: {
       validator: /^.{3,}$/,
       message: 'To short',
@@ -26,7 +32,7 @@ const Index: React.FC = () => {
 
   const _submit = (e: React.FormEvent) => {
     e.preventDefault()
-    console.log(form, errors)
+    console.log(form, errors, isValid)
   }
 
   return (