Refactor form validation logic and rename utility functions for clarity

Author: agjs

src/index.ts

@@ -36,7 +36,6 @@ const useAJVForm = <T extends Record<string, any>>(
     [options?.debug],
   );
 
-  // Precompute field dependencies
   const fieldDependencies = useMemo(() => {
     const dependencies: Record<string, string[]> = {};
     if (schema.allOf) {
@@ -92,6 +91,7 @@ const useAJVForm = <T extends Record<string, any>>(
       : getErrors(errors, options?.userDefinedMessages, logger, schema);
 
     const error = fieldErrors[fieldName as string] || '';
+
     setState((prevState) => ({
       ...prevState,
       [fieldName]: {
@@ -121,8 +121,8 @@ const useAJVForm = <T extends Record<string, any>>(
     }, {} as T);
 
     logger.log('Validating entire form:', { data });
-    const isValid = AJVValidate(data);
 
+    const isValid = AJVValidate(data);
     if (!isValid && AJVValidate.errors) {
       logger.error('Form validation failed with errors:', AJVValidate.errors);
 
@@ -131,6 +131,7 @@ const useAJVForm = <T extends Record<string, any>>(
         options?.userDefinedMessages,
         logger,
       );
+
       setState((prevState) =>
         Object.keys(prevState).reduce((updatedState, fieldName) => {
           return {
@@ -146,7 +147,6 @@ const useAJVForm = <T extends Record<string, any>>(
       return { isValid: false, data: null };
     }
 
-    // Clear errors if valid
     setState((prevState) =>
       Object.keys(prevState).reduce((updatedState, fieldName) => {
         return {
@@ -163,24 +163,14 @@ const useAJVForm = <T extends Record<string, any>>(
     return { isValid: true, data };
   };
 
-  const isDirty = useMemo(() => {
-    return Object.keys(state).some(
-      (key) => state[key].value !== initialStateRef.current[key].value,
-    );
-  }, [state]);
-
-  const isValid = useMemo(
-    () => Object.keys(state).every((key) => !state[key].error),
-    [state],
-  );
-
   const setErrors = (errors: ErrorObject[]) => {
     const newErrors = getErrors(
       errors,
       options?.userDefinedMessages,
       logger,
       schema,
     );
+
     setState((prevState) =>
       Object.keys(newErrors).reduce((updatedState, fieldName) => {
         return {
@@ -194,6 +184,17 @@ const useAJVForm = <T extends Record<string, any>>(
     );
   };
 
+  const isDirty = useMemo(() => {
+    return Object.keys(state).some(
+      (key) => state[key].value !== initialStateRef.current[key].value,
+    );
+  }, [state]);
+
+  const isValid = useMemo(
+    () => Object.keys(state).every((key) => !state[key].error),
+    [state],
+  );
+
   useEffect(() => {
     if (
       !debouncedField ||

src/utils/index.ts

@@ -187,7 +187,7 @@ export const addUserDefinedKeywords = (
  * @param {FormField<T>[keyof T]} value - The new value for the field.
  * @returns {IState<T>} - The updated form state.
  */
-const updateFieldValue = <T extends Record<string, any>>(
+const setFieldValue = <T extends Record<string, any>>(
   state: IState<T>,
   fieldName: keyof T,
   value: any,
@@ -211,7 +211,7 @@ const updateFieldValue = <T extends Record<string, any>>(
  * @param {SchemaObject | JSONSchemaType<T>} schema - The schema defining the dependencies and validation rules.
  * @returns {boolean} - Whether the dependent field should be required.
  */
-const evaluateFieldDependency = <T>(
+const getIsRequired = <T>(
   fieldName: keyof T,
   parentFieldName: keyof T,
   parentValue: any,
@@ -238,7 +238,7 @@ const evaluateFieldDependency = <T>(
  * @param {SchemaObject | JSONSchemaType<T>} schema - The schema defining the dependencies and validation rules.
  * @returns {IState<T>} - The updated form state.
  */
-const updateDynamicRequiredFields = <T>(
+const getIsRequiredDynamically = <T>(
   state: IState<T>,
   parentFieldName: keyof T,
   parentValue: any,
@@ -251,7 +251,7 @@ const updateDynamicRequiredFields = <T>(
     (updatedState, childFieldName) => {
       const fieldName = childFieldName as keyof T;
 
-      const isRequired = evaluateFieldDependency(
+      const isRequired = getIsRequired(
         fieldName,
         parentFieldName,
         parentValue,
@@ -290,13 +290,9 @@ export const getFormState = <T extends Record<string, any>>(
     const fieldName = key as keyof T;
     const value = getValue(form[fieldName]);
 
-    const stateWithUpdatedFieldValue = updateFieldValue(
-      updatedState,
-      fieldName,
-      value,
-    );
+    const stateWithUpdatedFieldValue = setFieldValue(updatedState, fieldName, value);
 
-    return updateDynamicRequiredFields(
+    return getIsRequiredDynamically(
       stateWithUpdatedFieldValue,
       fieldName,
       value,