Merge pull request #80 from tjinauyeung/fix-validation-schema-array-values

fix(arrays in validation schema): ensure initialised $errors matches shape of initialValues

Author: tiaanduplessis

lib/create-form.js

@@ -17,7 +17,10 @@ export const createForm = (config) => {
 
   const getInitial = {
     values: () => util.cloneDeep(initialValues),
-    errors: () => validationSchema ? util.getErrorsFromSchema(validationSchema.fields) : util.assignDeep(initialValues, NO_ERROR),
+    errors: () =>
+      validationSchema
+        ? util.getErrorsFromSchema(initialValues, validationSchema.fields)
+        : util.assignDeep(initialValues, NO_ERROR),
     touched: () => util.assignDeep(initialValues, !IS_TOUCHED),
   };
 
@@ -136,8 +139,8 @@ export const createForm = (config) => {
               if (yupErrors && yupErrors.inner) {
                 const updatedErrors = getInitial.errors();
 
-                yupErrors.inner.forEach(error =>
-                  util.set(updatedErrors, error.path, error.message)
+                yupErrors.inner.forEach((error) =>
+                  util.set(updatedErrors, error.path, error.message),
                 );
 
                 errors.set(updatedErrors);

lib/util.js

@@ -35,14 +35,37 @@ function getValues(object) {
   return result;
 }
 
-function getErrorsFromSchema(schema, errors = {}) {
+// TODO: refactor this so as not to rely directly on yup's API
+// This should use dependency injection, with a default callback which may assume
+// yup as the validation schema
+function getErrorsFromSchema(initialValues, schema, errors = {}) {
   for (const key in schema) {
-    if(schema[key].type === 'object' && !isEmpty(schema[key].fields)) {
-      errors[key] = getErrorsFromSchema(schema[key].fields, Object.assign({}, errors));
-    }
+    switch (true) {
+      case schema[key].type === 'object' && !isEmpty(schema[key].fields): {
+        errors[key] = getErrorsFromSchema(
+          initialValues[key],
+          schema[key].fields,
+          Object.assign({}, errors[key]),
+        );
+        break;
+      }
 
-    else {
-      errors[key] = '';
+      case schema[key].type === 'array': {
+        const values =
+          initialValues && initialValues[key] ? initialValues[key] : [];
+        errors[key] = values.map((value) =>
+          getErrorsFromSchema(
+            value,
+            schema[key].innerType.fields,
+            Object.assign({}, errors[key]),
+          ),
+        );
+        break;
+      }
+
+      default: {
+        errors[key] = '';
+      }
     }
   }