@juantroconisf/lib 5.3.0 → 6.1.0

package/dist/index.d.mts

@@ -43,46 +43,27 @@ type ValidatorErrorMessage = {
  * @template O The state type.
  * @template K The key of the array in the state.
  */
-type ArrayRules<O extends StateType, K extends keyof O = keyof O> = {
-    [F in FieldPaths<ArrayElement<O[K]>>]?: ValidatorParams | ((item: ArrayElement<O[K]>, index: number) => ValidatorParams);
-};
-/**
- * Custom error messages for individual fields in an array item.
- * @template O The state type.
- * @template K The key of the array in the state.
- */
-type ArrayMessages<O extends StateType, K extends keyof O = keyof O> = {
-    [F in FieldPaths<ArrayElement<O[K]>>]?: ValidatorErrorMessage;
-};
+type ValidatorRule<item = any> = ValidatorParams | ((item: item, ...args: any[]) => ValidatorParams);
+type RulePath<T> = T extends object ? {
+    [K in keyof T & string]: NonNullable<T[K]> extends (infer E)[] ? K | (E extends object ? `${K}.${RulePath<E>}` : never) : NonNullable<T[K]> extends object ? NonNullable<T[K]> extends Date ? K : K | `${K}.${RulePath<NonNullable<T[K]>>}` : K;
+}[keyof T & string] : never;
 /**
  * Options for the useForm hook.
  * @template O The state type.
  */
 interface FormOptions<O extends StateType> {
     /** Validation rules for top-level fields. */
-    rules?: {
-        [key in keyof O]?: ValidatorParams;
-    };
+    rules?: Partial<Record<RulePath<O>, ValidatorRule>>;
     /** Custom error messages for top-level fields. */
-    messages?: {
-        [key in keyof O]?: ValidatorErrorMessage;
-    };
-    /** Validation rules for items within arrays. */
-    arrayRules?: {
-        [K in ArrayKeys<O>]?: ArrayRules<O, K>;
-    };
-    /** Custom error messages for items within arrays. */
-    arrayMessages?: {
-        [K in ArrayKeys<O>]?: ArrayMessages<O, K>;
-    };
+    messages?: Partial<Record<RulePath<O>, ValidatorErrorMessage>>;
     /**
      * Custom property names used as unique identifiers for items in specific arrays.
      * Default is "id".
      */
     arrayIdentifiers?: Partial<Record<ArrayKeys<O>, string>>;
 }
-type TouchedType<O extends StateType> = Record<keyof O, boolean>;
-type ErrorsType<O extends StateType> = Record<keyof O, NextUIError>;
+type TouchedType = Map<string, boolean>;
+type ErrorsType = Map<string, NextUIError>;
 type ValueChangeFunc<O extends StateType, K extends keyof O> = (id: K, value: O[K]) => void;
 type BlurFunc<O extends StateType> = (id: keyof O) => void;
 interface ComponentInputProps<O extends StateType> {
@@ -181,8 +162,8 @@ interface UseFormResponse<O extends StateType> {
     onSelectionChange: ValueChangeFunc<O, keyof O>;
     state: O;
     setState: React.Dispatch<React.SetStateAction<O>>;
-    touched: TouchedType<O>;
-    errors: ErrorsType<O>;
+    touched: TouchedType;
+    errors: ErrorsType;
     /** Main object to bind form elements to the state. */
     on: OnMethods<O>;
     /** Array manipulation helpers. */
@@ -196,6 +177,6 @@ interface UseFormResponse<O extends StateType> {
     resetTouched: (preservedKeys?: (keyof O)[]) => void;
 }
 
-declare function useForm<O extends StateType>(initialState: O, { rules, messages, arrayRules, arrayMessages, arrayIdentifiers, }?: FormOptions<O>): UseFormResponse<O>;
+declare function useForm<O extends StateType>(initialState: O, { rules, messages, arrayIdentifiers }?: FormOptions<O>): UseFormResponse<O>;
 
-export { type ArrayMessages, type ArrayRules, type BlurFunc, type ErrorsType, type FormOptions, type HelpersFunc, type NestedChangeProps, NextUIError, type OnMethods, type StateType, type TouchedType, type UXProps, type UseFormResponse, type Validator, type ValidatorErrorMessage, type ValidatorParams, type ValidatorTypes, type ValueChangeFunc, useForm };
+export { type BlurFunc, type ErrorsType, type FormOptions, type HelpersFunc, type NestedChangeProps, NextUIError, type OnMethods, type StateType, type TouchedType, type UXProps, type UseFormResponse, type Validator, type ValidatorErrorMessage, type ValidatorParams, type ValidatorRule, type ValidatorTypes, type ValueChangeFunc, useForm };

package/dist/index.d.ts

@@ -43,46 +43,27 @@ type ValidatorErrorMessage = {
  * @template O The state type.
  * @template K The key of the array in the state.
  */
-type ArrayRules<O extends StateType, K extends keyof O = keyof O> = {
-    [F in FieldPaths<ArrayElement<O[K]>>]?: ValidatorParams | ((item: ArrayElement<O[K]>, index: number) => ValidatorParams);
-};
-/**
- * Custom error messages for individual fields in an array item.
- * @template O The state type.
- * @template K The key of the array in the state.
- */
-type ArrayMessages<O extends StateType, K extends keyof O = keyof O> = {
-    [F in FieldPaths<ArrayElement<O[K]>>]?: ValidatorErrorMessage;
-};
+type ValidatorRule<item = any> = ValidatorParams | ((item: item, ...args: any[]) => ValidatorParams);
+type RulePath<T> = T extends object ? {
+    [K in keyof T & string]: NonNullable<T[K]> extends (infer E)[] ? K | (E extends object ? `${K}.${RulePath<E>}` : never) : NonNullable<T[K]> extends object ? NonNullable<T[K]> extends Date ? K : K | `${K}.${RulePath<NonNullable<T[K]>>}` : K;
+}[keyof T & string] : never;
 /**
  * Options for the useForm hook.
  * @template O The state type.
  */
 interface FormOptions<O extends StateType> {
     /** Validation rules for top-level fields. */
-    rules?: {
-        [key in keyof O]?: ValidatorParams;
-    };
+    rules?: Partial<Record<RulePath<O>, ValidatorRule>>;
     /** Custom error messages for top-level fields. */
-    messages?: {
-        [key in keyof O]?: ValidatorErrorMessage;
-    };
-    /** Validation rules for items within arrays. */
-    arrayRules?: {
-        [K in ArrayKeys<O>]?: ArrayRules<O, K>;
-    };
-    /** Custom error messages for items within arrays. */
-    arrayMessages?: {
-        [K in ArrayKeys<O>]?: ArrayMessages<O, K>;
-    };
+    messages?: Partial<Record<RulePath<O>, ValidatorErrorMessage>>;
     /**
      * Custom property names used as unique identifiers for items in specific arrays.
      * Default is "id".
      */
     arrayIdentifiers?: Partial<Record<ArrayKeys<O>, string>>;
 }
-type TouchedType<O extends StateType> = Record<keyof O, boolean>;
-type ErrorsType<O extends StateType> = Record<keyof O, NextUIError>;
+type TouchedType = Map<string, boolean>;
+type ErrorsType = Map<string, NextUIError>;
 type ValueChangeFunc<O extends StateType, K extends keyof O> = (id: K, value: O[K]) => void;
 type BlurFunc<O extends StateType> = (id: keyof O) => void;
 interface ComponentInputProps<O extends StateType> {
@@ -181,8 +162,8 @@ interface UseFormResponse<O extends StateType> {
     onSelectionChange: ValueChangeFunc<O, keyof O>;
     state: O;
     setState: React.Dispatch<React.SetStateAction<O>>;
-    touched: TouchedType<O>;
-    errors: ErrorsType<O>;
+    touched: TouchedType;
+    errors: ErrorsType;
     /** Main object to bind form elements to the state. */
     on: OnMethods<O>;
     /** Array manipulation helpers. */
@@ -196,6 +177,6 @@ interface UseFormResponse<O extends StateType> {
     resetTouched: (preservedKeys?: (keyof O)[]) => void;
 }
 
-declare function useForm<O extends StateType>(initialState: O, { rules, messages, arrayRules, arrayMessages, arrayIdentifiers, }?: FormOptions<O>): UseFormResponse<O>;
+declare function useForm<O extends StateType>(initialState: O, { rules, messages, arrayIdentifiers }?: FormOptions<O>): UseFormResponse<O>;
 
-export { type ArrayMessages, type ArrayRules, type BlurFunc, type ErrorsType, type FormOptions, type HelpersFunc, type NestedChangeProps, NextUIError, type OnMethods, type StateType, type TouchedType, type UXProps, type UseFormResponse, type Validator, type ValidatorErrorMessage, type ValidatorParams, type ValidatorTypes, type ValueChangeFunc, useForm };
+export { type BlurFunc, type ErrorsType, type FormOptions, type HelpersFunc, type NestedChangeProps, NextUIError, type OnMethods, type StateType, type TouchedType, type UXProps, type UseFormResponse, type Validator, type ValidatorErrorMessage, type ValidatorParams, type ValidatorRule, type ValidatorTypes, type ValueChangeFunc, useForm };

package/dist/index.js

@@ -82,10 +82,10 @@ function getNestedValue(obj, path) {
   return path.split(".").reduce((acc, key) => acc?.[key], obj);
 }
 function removeCompositeKeysByPrefix(map2, prefix) {
-  const result = {};
-  for (const [key, value] of Object.entries(map2)) {
-    if (!key.startsWith(prefix)) {
-      result[key] = value;
+  const result = new Map(map2);
+  for (const key of map2.keys()) {
+    if (key.startsWith(prefix)) {
+      result.delete(key);
     }
   }
   return result;
@@ -101,13 +101,6 @@ function setNestedValue(state, dotPath, value) {
   current[keys[keys.length - 1]] = value;
   return copy;
 }
-var allToValue = (obj, value) => Object.keys(obj).reduce(
-  (acc, key) => {
-    acc[key] = value;
-    return acc;
-  },
-  {}
-);
 var regex = {
   email: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
   password: /^(?!.*\s)(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[~`!@#$%^&*()--+={}[\]|:;"'<>,.?/_₹]).{8,24}$/
@@ -226,21 +219,8 @@ function useValidate() {
 }
 
 // src/hooks/useForm.tsx
-function useForm(initialState, {
-  rules,
-  messages,
-  arrayRules,
-  arrayMessages,
-  arrayIdentifiers
-} = {}) {
-  const initial = {
-    touched: allToValue(initialState, false),
-    errors: allToValue(initialState, {
-      isInvalid: false,
-      errorMessage: ""
-    })
-  };
-  const [state, setState] = (0, import_react.useState)(initialState), [touched, setTouched] = (0, import_react.useState)(initial.touched), [errors2, setErrors] = (0, import_react.useState)(initial.errors), [itemTouched, setItemTouched] = (0, import_react.useState)({}), [itemErrors, setItemErrors] = (0, import_react.useState)({}), [nestedTouched, setNestedTouched] = (0, import_react.useState)({}), [nestedErrors, setNestedErrors] = (0, import_react.useState)({}), { performValidations } = useValidate();
+function useForm(initialState, { rules, messages, arrayIdentifiers } = {}) {
+  const [state, setState] = (0, import_react.useState)(initialState), [touched, setTouched] = (0, import_react.useState)(/* @__PURE__ */ new Map()), [errors2, setErrors] = (0, import_react.useState)(/* @__PURE__ */ new Map()), { performValidations } = useValidate();
   const indexMap = (0, import_react.useMemo)(() => {
     const map2 = /* @__PURE__ */ new Map();
     for (const key in state) {
@@ -266,39 +246,43 @@ function useForm(initialState, {
     },
     [indexMap]
   );
-  const validateInput = (id, value) => setErrors(
-    (prev) => handleNestedChange({
-      state: prev,
-      id,
-      value: performValidations(value, rules?.[id], messages?.[id])
-    })
-  );
+  const getRule = (path) => {
+    if (rules?.[path]) return rules[path];
+    const genericPath = path.replace(/\.\d+\./g, ".").replace(/\.\d+$/, "");
+    return rules?.[genericPath];
+  };
+  const getMessage = (path) => {
+    if (messages?.[path]) return messages[path];
+    const genericPath = path.replace(/\.\d+\./g, ".").replace(/\.\d+$/, "");
+    return messages?.[genericPath];
+  };
+  const validateInput = (compositeKey, value, ruleKey) => {
+    const ruleDef = getRule(ruleKey);
+    const rule = typeof ruleDef === "function" ? ruleDef(value, state) : ruleDef;
+    const message = getMessage(ruleKey);
+    const error = performValidations(value, rule, message);
+    setErrors((prev) => new Map(prev).set(compositeKey, error));
+  };
   const getUXProps = (0, import_react.useCallback)(
-    (id) => {
-      const inputError = errors2[id] || nestedErrors[id];
-      const isTouched = touched[id] || nestedTouched[id];
+    (compositeKey) => {
+      const inputError = errors2.get(compositeKey);
+      const isTouched = touched.get(compositeKey);
       return {
         isInvalid: Boolean(isTouched && inputError?.isInvalid),
         errorMessage: isTouched ? inputError?.errorMessage || "" : ""
       };
     },
-    [errors2, touched, nestedErrors, nestedTouched]
+    [errors2, touched]
   );
   const onBlur = (id) => {
-    validateInput(id, state[id]);
-    if (touched[id]) return;
-    setTouched(
-      (prev) => handleNestedChange({
-        state: prev,
-        id,
-        value: true
-      })
-    );
+    validateInput(String(id), state[id], String(id));
+    if (touched.get(String(id))) return;
+    setTouched((prev) => new Map(prev).set(String(id), true));
   }, onValueChange = ((...args) => {
     if (args.length === 2) {
       const [id, value] = args;
       setState((prev) => handleNestedChange({ state: prev, id, value }));
-      validateInput(id, value);
+      validateInput(String(id), value, String(id));
       return;
     }
     if (args.length === 3) {
@@ -344,7 +328,7 @@ function useForm(initialState, {
         value: fixedValue
       })
     );
-    validateInput(id, fixedValue);
+    validateInput(String(id), fixedValue, String(id));
   };
   const getItemCompositeKey = (arrayKey, itemId, field) => `${arrayKey}.${itemId}.${field}`;
   const getPrimitiveCompositeKey = (arrayKey, index) => `${arrayKey}.@${index}`;
@@ -352,27 +336,33 @@ function useForm(initialState, {
   const validateItemInput = (arrayKey, itemId, field, value) => {
     const index = getIndex(String(arrayKey), itemId);
     if (index === void 0) return;
-    const arrayRuleDef = arrayRules?.[arrayKey]?.[field];
     const item = state[arrayKey][index];
-    const fieldRules = typeof arrayRuleDef === "function" ? arrayRuleDef(item, index) : arrayRuleDef;
-    const fieldMessages = arrayMessages?.[arrayKey]?.[field];
     const compositeKey = getItemCompositeKey(String(arrayKey), itemId, field);
-    setItemErrors((prev) => ({
-      ...prev,
-      [compositeKey]: performValidations(value, fieldRules, fieldMessages)
-    }));
+    let genericField = field.replace(/\.@\d+/, "");
+    if (genericField === "")
+      genericField = String(arrayKey);
+    else genericField = `${String(arrayKey)}.${genericField}`;
+    let effectivePath = `${String(arrayKey)}.${field}`;
+    if (field === "") effectivePath = String(arrayKey);
+    effectivePath = effectivePath.replace(/\.@\d+/g, "").replace(/\.@\d+$/, "");
+    const ruleDef = getRule(effectivePath);
+    const rule = typeof ruleDef === "function" ? ruleDef(value, state, item, index) : ruleDef;
+    const message = getMessage(effectivePath);
+    setErrors(
+      (prev) => new Map(prev).set(compositeKey, performValidations(value, rule, message))
+    );
   };
   const getItemUXProps = (0, import_react.useCallback)(
     (arrayKey, itemId, field) => {
       const compositeKey = getItemCompositeKey(arrayKey, itemId, field);
-      const inputError = itemErrors[compositeKey];
-      const isTouched = itemTouched[compositeKey];
+      const inputError = errors2.get(compositeKey);
+      const isTouched = touched.get(compositeKey);
       return {
         isInvalid: Boolean(isTouched && inputError?.isInvalid),
         errorMessage: isTouched ? inputError?.errorMessage || "" : ""
       };
     },
-    [itemErrors, itemTouched]
+    [errors2, touched]
   );
   const onItemBlur = (arrayKey, itemId, field) => {
     const index = getIndex(String(arrayKey), itemId);
@@ -381,8 +371,8 @@ function useForm(initialState, {
     const value = getNestedValue(arr[index], field);
     validateItemInput(arrayKey, itemId, field, value);
     const compositeKey = getItemCompositeKey(String(arrayKey), itemId, field);
-    if (itemTouched[compositeKey]) return;
-    setItemTouched((prev) => ({ ...prev, [compositeKey]: true }));
+    if (touched.get(compositeKey)) return;
+    setTouched((prev) => new Map(prev).set(compositeKey, true));
   };
   const onItemValueChange = (arrayKey, itemId, field, value) => {
     const index = getIndex(String(arrayKey), itemId);
@@ -411,17 +401,18 @@ function useForm(initialState, {
     validateItemInput(arrayKey, itemId, field, fixedValue);
   };
   const validateNestedInput = (dotPath, value) => {
-    const topKey = dotPath.split(".")[0];
-    setNestedErrors((prev) => ({
-      ...prev,
-      [dotPath]: performValidations(value, rules?.[topKey], messages?.[topKey])
-    }));
+    const ruleDef = getRule(dotPath);
+    const rule = typeof ruleDef === "function" ? ruleDef(value, state) : ruleDef;
+    const message = getMessage(dotPath);
+    setErrors(
+      (prev) => new Map(prev).set(dotPath, performValidations(value, rule, message))
+    );
   };
   const onNestedBlur = (dotPath) => {
     const value = getNestedValue(state, dotPath);
     validateNestedInput(dotPath, value);
-    if (nestedTouched[dotPath]) return;
-    setNestedTouched((prev) => ({ ...prev, [dotPath]: true }));
+    if (touched.get(dotPath)) return;
+    setTouched((prev) => new Map(prev).set(dotPath, true));
   };
   const onNestedValueChange = (dotPath, value) => {
     setState((prev) => setNestedValue(prev, dotPath, value));
@@ -466,12 +457,8 @@ function useForm(initialState, {
           ...getItemUXProps(String(arrayKey2), `@${index2}`, ""),
           id: compositeKey2,
           onBlur: () => {
-            const compositeKey3 = getPrimitiveCompositeKey(
-              String(arrayKey2),
-              index2
-            );
-            if (itemTouched[compositeKey3]) return;
-            setItemTouched((prev) => ({ ...prev, [compositeKey3]: true }));
+            if (touched.get(compositeKey2)) return;
+            setTouched((prev) => new Map(prev).set(compositeKey2, true));
           },
           onValueChange: (v) => {
             setState((prev) => {
@@ -479,6 +466,7 @@ function useForm(initialState, {
               arr3[index2] = v;
               return { ...prev, [arrayKey2]: arr3 };
             });
+            validateItemInput(arrayKey2, `@${index2}`, "", v);
           },
           value: value2
         };
@@ -499,8 +487,8 @@ function useForm(initialState, {
           ...getItemUXProps(String(parentKey), parentId, `${field2}.@${index2}`),
           id: compositeKey2,
           onBlur: () => {
-            if (itemTouched[compositeKey2]) return;
-            setItemTouched((prev) => ({ ...prev, [compositeKey2]: true }));
+            if (touched.get(compositeKey2)) return;
+            setTouched((prev) => new Map(prev).set(compositeKey2, true));
           },
           onValueChange: (v) => {
             if (parentIndex === void 0) return;
@@ -512,6 +500,8 @@ function useForm(initialState, {
               parentArr[parentIndex] = setNestedValue(item, field2, nestedArr2);
               return { ...prev, [parentKey]: parentArr };
             });
+            const fieldPath = `${field2}.@${index2}`;
+            validateItemInput(parentKey, parentId, fieldPath, v);
           },
           value: value2
         };
@@ -566,8 +556,8 @@ function useForm(initialState, {
           ...getItemUXProps(String(arrayKey2), `@${index2}`, ""),
           id: compositeKey2,
           onBlur: () => {
-            if (itemTouched[compositeKey2]) return;
-            setItemTouched((prev) => ({ ...prev, [compositeKey2]: true }));
+            if (touched.get(compositeKey2)) return;
+            setTouched((prev) => new Map(prev).set(compositeKey2, true));
           },
           onSelectionChange: (v) => {
             const fixedValue = typeof v === "string" || v === null ? v : Array.from(v)[0] || null;
@@ -576,6 +566,7 @@ function useForm(initialState, {
               arr3[index2] = fixedValue;
               return { ...prev, [arrayKey2]: arr3 };
             });
+            validateItemInput(arrayKey2, `@${index2}`, "", fixedValue);
           },
           selectedKeys: value2 === null ? [] : [value2]
         };
@@ -596,8 +587,8 @@ function useForm(initialState, {
           ...getItemUXProps(String(parentKey), parentId, `${field2}.@${index2}`),
           id: compositeKey2,
           onBlur: () => {
-            if (itemTouched[compositeKey2]) return;
-            setItemTouched((prev) => ({ ...prev, [compositeKey2]: true }));
+            if (touched.get(compositeKey2)) return;
+            setTouched((prev) => new Map(prev).set(compositeKey2, true));
           },
           onSelectionChange: (v) => {
             if (parentIndex === void 0) return;
@@ -610,6 +601,8 @@ function useForm(initialState, {
               parentArr[parentIndex] = setNestedValue(item, field2, nestedArr2);
               return { ...prev, [parentKey]: parentArr };
             });
+            const fieldPath = `${field2}.@${index2}`;
+            validateItemInput(parentKey, parentId, fieldPath, fixedValue);
           },
           selectedKeys: value2 === null ? [] : [value2]
         };
@@ -659,15 +652,17 @@ function useForm(initialState, {
           ...getItemUXProps(String(arrayKey2), `@${index2}`, ""),
           id: compositeKey2,
           onBlur: () => {
-            if (itemTouched[compositeKey2]) return;
-            setItemTouched((prev) => ({ ...prev, [compositeKey2]: true }));
+            if (touched.get(compositeKey2)) return;
+            setTouched((prev) => new Map(prev).set(compositeKey2, true));
           },
           onSelectionChange: (v) => {
+            const fixedValue = typeof v === "string" || v === null ? v : String(v);
             setState((prev) => {
               const arr3 = [...prev[arrayKey2]];
-              arr3[index2] = typeof v === "string" || v === null ? v : String(v);
+              arr3[index2] = fixedValue;
               return { ...prev, [arrayKey2]: arr3 };
             });
+            validateItemInput(arrayKey2, `@${index2}`, "", fixedValue);
           },
           selectedKey: value2
         };
@@ -688,19 +683,22 @@ function useForm(initialState, {
           ...getItemUXProps(String(parentKey), parentId, `${field2}.@${index2}`),
           id: compositeKey2,
           onBlur: () => {
-            if (itemTouched[compositeKey2]) return;
-            setItemTouched((prev) => ({ ...prev, [compositeKey2]: true }));
+            if (touched.get(compositeKey2)) return;
+            setTouched((prev) => new Map(prev).set(compositeKey2, true));
           },
           onSelectionChange: (v) => {
             if (parentIndex === void 0) return;
+            const fixedValue = typeof v === "string" || v === null ? v : String(v);
             setState((prev) => {
               const parentArr = [...prev[parentKey]];
               const item = { ...parentArr[parentIndex] };
               const nestedArr2 = [...getNestedValue(item, field2) || []];
-              nestedArr2[index2] = typeof v === "string" || v === null ? v : String(v);
+              nestedArr2[index2] = fixedValue;
               parentArr[parentIndex] = setNestedValue(item, field2, nestedArr2);
               return { ...prev, [parentKey]: parentArr };
             });
+            const fieldPath = `${field2}.@${index2}`;
+            validateItemInput(parentKey, parentId, fieldPath, fixedValue);
           },
           selectedKey: value2
         };
@@ -751,8 +749,8 @@ function useForm(initialState, {
         });
         if (itemId !== void 0) {
           const prefix = `${String(arrayKey)}.${itemId}.`;
-          setItemTouched((prev) => removeCompositeKeysByPrefix(prev, prefix));
-          setItemErrors((prev) => removeCompositeKeysByPrefix(prev, prefix));
+          setTouched((prev) => removeCompositeKeysByPrefix(prev, prefix));
+          setErrors((prev) => removeCompositeKeysByPrefix(prev, prefix));
         }
       },
       removeById: (arrayKey, itemId) => {
@@ -762,8 +760,8 @@ function useForm(initialState, {
           arr.splice(index, 1);
           setState((prev) => ({ ...prev, [arrayKey]: arr }));
           const prefix = `${String(arrayKey)}.${itemId}.`;
-          setItemTouched((prev) => removeCompositeKeysByPrefix(prev, prefix));
-          setItemErrors((prev) => removeCompositeKeysByPrefix(prev, prefix));
+          setTouched((prev) => removeCompositeKeysByPrefix(prev, prefix));
+          setErrors((prev) => removeCompositeKeysByPrefix(prev, prefix));
         }
       },
       moveItem: (arrayKey, from, to) => {
@@ -803,35 +801,12 @@ function useForm(initialState, {
     },
     isDirty: JSON.stringify(state) !== JSON.stringify(initialState),
     hasInvalidValues: () => {
-      setTouched((prev) => allToValue(prev, true));
-      setItemTouched(
-        (prev) => Object.keys(prev).reduce(
-          (acc, key) => ({ ...acc, [key]: true }),
-          {}
-        )
-      );
-      setNestedTouched(
-        (prev) => Object.keys(prev).reduce(
-          (acc, key) => ({ ...acc, [key]: true }),
-          {}
-        )
-      );
-      const topLevelInvalid = JSON.stringify(errors2).includes(":true");
-      const itemLevelInvalid = Object.values(itemErrors).some(
-        (e) => e?.isInvalid
-      );
-      const nestedLevelInvalid = Object.values(nestedErrors).some(
-        (e) => e?.isInvalid
-      );
-      return topLevelInvalid || itemLevelInvalid || nestedLevelInvalid;
+      const isInvalid = Array.from(errors2.values()).some((e) => e?.isInvalid);
+      return isInvalid;
     },
     resetForm: (preservedKeys) => {
-      setTouched(initial.touched);
-      setErrors(initial.errors);
-      setItemTouched({});
-      setItemErrors({});
-      setNestedTouched({});
-      setNestedErrors({});
+      setTouched(/* @__PURE__ */ new Map());
+      setErrors(/* @__PURE__ */ new Map());
       setState(
         (prev) => preservedKeys === void 0 ? initialState : preservedKeys.reduce(
           (acc, key) => ({
@@ -843,16 +818,13 @@ function useForm(initialState, {
       );
     },
     resetTouched: (preservedKeys) => {
-      setItemTouched({});
-      setNestedTouched({});
       setTouched(
-        (prev) => preservedKeys === void 0 ? initialState : preservedKeys.reduce(
-          (acc, key) => ({
-            ...acc,
-            [key]: prev[key]
-          }),
-          initial.touched
-        )
+        (prev) => preservedKeys === void 0 ? /* @__PURE__ */ new Map() : preservedKeys.reduce((acc, key) => {
+          if (prev.has(String(key))) {
+            acc.set(String(key), prev.get(String(key)));
+          }
+          return acc;
+        }, /* @__PURE__ */ new Map())
       );
     }
   };

package/dist/index.mjs

@@ -63,10 +63,10 @@ function getNestedValue(obj, path) {
   return path.split(".").reduce((acc, key) => acc?.[key], obj);
 }
 function removeCompositeKeysByPrefix(map2, prefix) {
-  const result = {};
-  for (const [key, value] of Object.entries(map2)) {
-    if (!key.startsWith(prefix)) {
-      result[key] = value;
+  const result = new Map(map2);
+  for (const key of map2.keys()) {
+    if (key.startsWith(prefix)) {
+      result.delete(key);
     }
   }
   return result;
@@ -82,13 +82,6 @@ function setNestedValue(state, dotPath, value) {
   current[keys[keys.length - 1]] = value;
   return copy;
 }
-var allToValue = (obj, value) => Object.keys(obj).reduce(
-  (acc, key) => {
-    acc[key] = value;
-    return acc;
-  },
-  {}
-);
 var regex = {
   email: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
   password: /^(?!.*\s)(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[~`!@#$%^&*()--+={}[\]|:;"'<>,.?/_₹]).{8,24}$/
@@ -207,21 +200,8 @@ function useValidate() {
 }
 
 // src/hooks/useForm.tsx
-function useForm(initialState, {
-  rules,
-  messages,
-  arrayRules,
-  arrayMessages,
-  arrayIdentifiers
-} = {}) {
-  const initial = {
-    touched: allToValue(initialState, false),
-    errors: allToValue(initialState, {
-      isInvalid: false,
-      errorMessage: ""
-    })
-  };
-  const [state, setState] = useState(initialState), [touched, setTouched] = useState(initial.touched), [errors2, setErrors] = useState(initial.errors), [itemTouched, setItemTouched] = useState({}), [itemErrors, setItemErrors] = useState({}), [nestedTouched, setNestedTouched] = useState({}), [nestedErrors, setNestedErrors] = useState({}), { performValidations } = useValidate();
+function useForm(initialState, { rules, messages, arrayIdentifiers } = {}) {
+  const [state, setState] = useState(initialState), [touched, setTouched] = useState(/* @__PURE__ */ new Map()), [errors2, setErrors] = useState(/* @__PURE__ */ new Map()), { performValidations } = useValidate();
   const indexMap = useMemo(() => {
     const map2 = /* @__PURE__ */ new Map();
     for (const key in state) {
@@ -247,39 +227,43 @@ function useForm(initialState, {
     },
     [indexMap]
   );
-  const validateInput = (id, value) => setErrors(
-    (prev) => handleNestedChange({
-      state: prev,
-      id,
-      value: performValidations(value, rules?.[id], messages?.[id])
-    })
-  );
+  const getRule = (path) => {
+    if (rules?.[path]) return rules[path];
+    const genericPath = path.replace(/\.\d+\./g, ".").replace(/\.\d+$/, "");
+    return rules?.[genericPath];
+  };
+  const getMessage = (path) => {
+    if (messages?.[path]) return messages[path];
+    const genericPath = path.replace(/\.\d+\./g, ".").replace(/\.\d+$/, "");
+    return messages?.[genericPath];
+  };
+  const validateInput = (compositeKey, value, ruleKey) => {
+    const ruleDef = getRule(ruleKey);
+    const rule = typeof ruleDef === "function" ? ruleDef(value, state) : ruleDef;
+    const message = getMessage(ruleKey);
+    const error = performValidations(value, rule, message);
+    setErrors((prev) => new Map(prev).set(compositeKey, error));
+  };
   const getUXProps = useCallback(
-    (id) => {
-      const inputError = errors2[id] || nestedErrors[id];
-      const isTouched = touched[id] || nestedTouched[id];
+    (compositeKey) => {
+      const inputError = errors2.get(compositeKey);
+      const isTouched = touched.get(compositeKey);
       return {
         isInvalid: Boolean(isTouched && inputError?.isInvalid),
         errorMessage: isTouched ? inputError?.errorMessage || "" : ""
       };
     },
-    [errors2, touched, nestedErrors, nestedTouched]
+    [errors2, touched]
   );
   const onBlur = (id) => {
-    validateInput(id, state[id]);
-    if (touched[id]) return;
-    setTouched(
-      (prev) => handleNestedChange({
-        state: prev,
-        id,
-        value: true
-      })
-    );
+    validateInput(String(id), state[id], String(id));
+    if (touched.get(String(id))) return;
+    setTouched((prev) => new Map(prev).set(String(id), true));
   }, onValueChange = ((...args) => {
     if (args.length === 2) {
       const [id, value] = args;
       setState((prev) => handleNestedChange({ state: prev, id, value }));
-      validateInput(id, value);
+      validateInput(String(id), value, String(id));
       return;
     }
     if (args.length === 3) {
@@ -325,7 +309,7 @@ function useForm(initialState, {
         value: fixedValue
       })
     );
-    validateInput(id, fixedValue);
+    validateInput(String(id), fixedValue, String(id));
   };
   const getItemCompositeKey = (arrayKey, itemId, field) => `${arrayKey}.${itemId}.${field}`;
   const getPrimitiveCompositeKey = (arrayKey, index) => `${arrayKey}.@${index}`;
@@ -333,27 +317,33 @@ function useForm(initialState, {
   const validateItemInput = (arrayKey, itemId, field, value) => {
     const index = getIndex(String(arrayKey), itemId);
     if (index === void 0) return;
-    const arrayRuleDef = arrayRules?.[arrayKey]?.[field];
     const item = state[arrayKey][index];
-    const fieldRules = typeof arrayRuleDef === "function" ? arrayRuleDef(item, index) : arrayRuleDef;
-    const fieldMessages = arrayMessages?.[arrayKey]?.[field];
     const compositeKey = getItemCompositeKey(String(arrayKey), itemId, field);
-    setItemErrors((prev) => ({
-      ...prev,
-      [compositeKey]: performValidations(value, fieldRules, fieldMessages)
-    }));
+    let genericField = field.replace(/\.@\d+/, "");
+    if (genericField === "")
+      genericField = String(arrayKey);
+    else genericField = `${String(arrayKey)}.${genericField}`;
+    let effectivePath = `${String(arrayKey)}.${field}`;
+    if (field === "") effectivePath = String(arrayKey);
+    effectivePath = effectivePath.replace(/\.@\d+/g, "").replace(/\.@\d+$/, "");
+    const ruleDef = getRule(effectivePath);
+    const rule = typeof ruleDef === "function" ? ruleDef(value, state, item, index) : ruleDef;
+    const message = getMessage(effectivePath);
+    setErrors(
+      (prev) => new Map(prev).set(compositeKey, performValidations(value, rule, message))
+    );
   };
   const getItemUXProps = useCallback(
     (arrayKey, itemId, field) => {
       const compositeKey = getItemCompositeKey(arrayKey, itemId, field);
-      const inputError = itemErrors[compositeKey];
-      const isTouched = itemTouched[compositeKey];
+      const inputError = errors2.get(compositeKey);
+      const isTouched = touched.get(compositeKey);
       return {
         isInvalid: Boolean(isTouched && inputError?.isInvalid),
         errorMessage: isTouched ? inputError?.errorMessage || "" : ""
       };
     },
-    [itemErrors, itemTouched]
+    [errors2, touched]
   );
   const onItemBlur = (arrayKey, itemId, field) => {
     const index = getIndex(String(arrayKey), itemId);
@@ -362,8 +352,8 @@ function useForm(initialState, {
     const value = getNestedValue(arr[index], field);
     validateItemInput(arrayKey, itemId, field, value);
     const compositeKey = getItemCompositeKey(String(arrayKey), itemId, field);
-    if (itemTouched[compositeKey]) return;
-    setItemTouched((prev) => ({ ...prev, [compositeKey]: true }));
+    if (touched.get(compositeKey)) return;
+    setTouched((prev) => new Map(prev).set(compositeKey, true));
   };
   const onItemValueChange = (arrayKey, itemId, field, value) => {
     const index = getIndex(String(arrayKey), itemId);
@@ -392,17 +382,18 @@ function useForm(initialState, {
     validateItemInput(arrayKey, itemId, field, fixedValue);
   };
   const validateNestedInput = (dotPath, value) => {
-    const topKey = dotPath.split(".")[0];
-    setNestedErrors((prev) => ({
-      ...prev,
-      [dotPath]: performValidations(value, rules?.[topKey], messages?.[topKey])
-    }));
+    const ruleDef = getRule(dotPath);
+    const rule = typeof ruleDef === "function" ? ruleDef(value, state) : ruleDef;
+    const message = getMessage(dotPath);
+    setErrors(
+      (prev) => new Map(prev).set(dotPath, performValidations(value, rule, message))
+    );
   };
   const onNestedBlur = (dotPath) => {
     const value = getNestedValue(state, dotPath);
     validateNestedInput(dotPath, value);
-    if (nestedTouched[dotPath]) return;
-    setNestedTouched((prev) => ({ ...prev, [dotPath]: true }));
+    if (touched.get(dotPath)) return;
+    setTouched((prev) => new Map(prev).set(dotPath, true));
   };
   const onNestedValueChange = (dotPath, value) => {
     setState((prev) => setNestedValue(prev, dotPath, value));
@@ -447,12 +438,8 @@ function useForm(initialState, {
           ...getItemUXProps(String(arrayKey2), `@${index2}`, ""),
           id: compositeKey2,
           onBlur: () => {
-            const compositeKey3 = getPrimitiveCompositeKey(
-              String(arrayKey2),
-              index2
-            );
-            if (itemTouched[compositeKey3]) return;
-            setItemTouched((prev) => ({ ...prev, [compositeKey3]: true }));
+            if (touched.get(compositeKey2)) return;
+            setTouched((prev) => new Map(prev).set(compositeKey2, true));
           },
           onValueChange: (v) => {
             setState((prev) => {
@@ -460,6 +447,7 @@ function useForm(initialState, {
               arr3[index2] = v;
               return { ...prev, [arrayKey2]: arr3 };
             });
+            validateItemInput(arrayKey2, `@${index2}`, "", v);
           },
           value: value2
         };
@@ -480,8 +468,8 @@ function useForm(initialState, {
           ...getItemUXProps(String(parentKey), parentId, `${field2}.@${index2}`),
           id: compositeKey2,
           onBlur: () => {
-            if (itemTouched[compositeKey2]) return;
-            setItemTouched((prev) => ({ ...prev, [compositeKey2]: true }));
+            if (touched.get(compositeKey2)) return;
+            setTouched((prev) => new Map(prev).set(compositeKey2, true));
           },
           onValueChange: (v) => {
             if (parentIndex === void 0) return;
@@ -493,6 +481,8 @@ function useForm(initialState, {
               parentArr[parentIndex] = setNestedValue(item, field2, nestedArr2);
               return { ...prev, [parentKey]: parentArr };
             });
+            const fieldPath = `${field2}.@${index2}`;
+            validateItemInput(parentKey, parentId, fieldPath, v);
           },
           value: value2
         };
@@ -547,8 +537,8 @@ function useForm(initialState, {
           ...getItemUXProps(String(arrayKey2), `@${index2}`, ""),
           id: compositeKey2,
           onBlur: () => {
-            if (itemTouched[compositeKey2]) return;
-            setItemTouched((prev) => ({ ...prev, [compositeKey2]: true }));
+            if (touched.get(compositeKey2)) return;
+            setTouched((prev) => new Map(prev).set(compositeKey2, true));
           },
           onSelectionChange: (v) => {
             const fixedValue = typeof v === "string" || v === null ? v : Array.from(v)[0] || null;
@@ -557,6 +547,7 @@ function useForm(initialState, {
               arr3[index2] = fixedValue;
               return { ...prev, [arrayKey2]: arr3 };
             });
+            validateItemInput(arrayKey2, `@${index2}`, "", fixedValue);
           },
           selectedKeys: value2 === null ? [] : [value2]
         };
@@ -577,8 +568,8 @@ function useForm(initialState, {
           ...getItemUXProps(String(parentKey), parentId, `${field2}.@${index2}`),
           id: compositeKey2,
           onBlur: () => {
-            if (itemTouched[compositeKey2]) return;
-            setItemTouched((prev) => ({ ...prev, [compositeKey2]: true }));
+            if (touched.get(compositeKey2)) return;
+            setTouched((prev) => new Map(prev).set(compositeKey2, true));
           },
           onSelectionChange: (v) => {
             if (parentIndex === void 0) return;
@@ -591,6 +582,8 @@ function useForm(initialState, {
               parentArr[parentIndex] = setNestedValue(item, field2, nestedArr2);
               return { ...prev, [parentKey]: parentArr };
             });
+            const fieldPath = `${field2}.@${index2}`;
+            validateItemInput(parentKey, parentId, fieldPath, fixedValue);
           },
           selectedKeys: value2 === null ? [] : [value2]
         };
@@ -640,15 +633,17 @@ function useForm(initialState, {
           ...getItemUXProps(String(arrayKey2), `@${index2}`, ""),
           id: compositeKey2,
           onBlur: () => {
-            if (itemTouched[compositeKey2]) return;
-            setItemTouched((prev) => ({ ...prev, [compositeKey2]: true }));
+            if (touched.get(compositeKey2)) return;
+            setTouched((prev) => new Map(prev).set(compositeKey2, true));
           },
           onSelectionChange: (v) => {
+            const fixedValue = typeof v === "string" || v === null ? v : String(v);
             setState((prev) => {
               const arr3 = [...prev[arrayKey2]];
-              arr3[index2] = typeof v === "string" || v === null ? v : String(v);
+              arr3[index2] = fixedValue;
               return { ...prev, [arrayKey2]: arr3 };
             });
+            validateItemInput(arrayKey2, `@${index2}`, "", fixedValue);
           },
           selectedKey: value2
         };
@@ -669,19 +664,22 @@ function useForm(initialState, {
           ...getItemUXProps(String(parentKey), parentId, `${field2}.@${index2}`),
           id: compositeKey2,
           onBlur: () => {
-            if (itemTouched[compositeKey2]) return;
-            setItemTouched((prev) => ({ ...prev, [compositeKey2]: true }));
+            if (touched.get(compositeKey2)) return;
+            setTouched((prev) => new Map(prev).set(compositeKey2, true));
           },
           onSelectionChange: (v) => {
             if (parentIndex === void 0) return;
+            const fixedValue = typeof v === "string" || v === null ? v : String(v);
             setState((prev) => {
               const parentArr = [...prev[parentKey]];
               const item = { ...parentArr[parentIndex] };
               const nestedArr2 = [...getNestedValue(item, field2) || []];
-              nestedArr2[index2] = typeof v === "string" || v === null ? v : String(v);
+              nestedArr2[index2] = fixedValue;
               parentArr[parentIndex] = setNestedValue(item, field2, nestedArr2);
               return { ...prev, [parentKey]: parentArr };
             });
+            const fieldPath = `${field2}.@${index2}`;
+            validateItemInput(parentKey, parentId, fieldPath, fixedValue);
           },
           selectedKey: value2
         };
@@ -732,8 +730,8 @@ function useForm(initialState, {
         });
         if (itemId !== void 0) {
           const prefix = `${String(arrayKey)}.${itemId}.`;
-          setItemTouched((prev) => removeCompositeKeysByPrefix(prev, prefix));
-          setItemErrors((prev) => removeCompositeKeysByPrefix(prev, prefix));
+          setTouched((prev) => removeCompositeKeysByPrefix(prev, prefix));
+          setErrors((prev) => removeCompositeKeysByPrefix(prev, prefix));
         }
       },
       removeById: (arrayKey, itemId) => {
@@ -743,8 +741,8 @@ function useForm(initialState, {
           arr.splice(index, 1);
           setState((prev) => ({ ...prev, [arrayKey]: arr }));
           const prefix = `${String(arrayKey)}.${itemId}.`;
-          setItemTouched((prev) => removeCompositeKeysByPrefix(prev, prefix));
-          setItemErrors((prev) => removeCompositeKeysByPrefix(prev, prefix));
+          setTouched((prev) => removeCompositeKeysByPrefix(prev, prefix));
+          setErrors((prev) => removeCompositeKeysByPrefix(prev, prefix));
         }
       },
       moveItem: (arrayKey, from, to) => {
@@ -784,35 +782,12 @@ function useForm(initialState, {
     },
     isDirty: JSON.stringify(state) !== JSON.stringify(initialState),
     hasInvalidValues: () => {
-      setTouched((prev) => allToValue(prev, true));
-      setItemTouched(
-        (prev) => Object.keys(prev).reduce(
-          (acc, key) => ({ ...acc, [key]: true }),
-          {}
-        )
-      );
-      setNestedTouched(
-        (prev) => Object.keys(prev).reduce(
-          (acc, key) => ({ ...acc, [key]: true }),
-          {}
-        )
-      );
-      const topLevelInvalid = JSON.stringify(errors2).includes(":true");
-      const itemLevelInvalid = Object.values(itemErrors).some(
-        (e) => e?.isInvalid
-      );
-      const nestedLevelInvalid = Object.values(nestedErrors).some(
-        (e) => e?.isInvalid
-      );
-      return topLevelInvalid || itemLevelInvalid || nestedLevelInvalid;
+      const isInvalid = Array.from(errors2.values()).some((e) => e?.isInvalid);
+      return isInvalid;
     },
     resetForm: (preservedKeys) => {
-      setTouched(initial.touched);
-      setErrors(initial.errors);
-      setItemTouched({});
-      setItemErrors({});
-      setNestedTouched({});
-      setNestedErrors({});
+      setTouched(/* @__PURE__ */ new Map());
+      setErrors(/* @__PURE__ */ new Map());
       setState(
         (prev) => preservedKeys === void 0 ? initialState : preservedKeys.reduce(
           (acc, key) => ({
@@ -824,16 +799,13 @@ function useForm(initialState, {
       );
     },
     resetTouched: (preservedKeys) => {
-      setItemTouched({});
-      setNestedTouched({});
       setTouched(
-        (prev) => preservedKeys === void 0 ? initialState : preservedKeys.reduce(
-          (acc, key) => ({
-            ...acc,
-            [key]: prev[key]
-          }),
-          initial.touched
-        )
+        (prev) => preservedKeys === void 0 ? /* @__PURE__ */ new Map() : preservedKeys.reduce((acc, key) => {
+          if (prev.has(String(key))) {
+            acc.set(String(key), prev.get(String(key)));
+          }
+          return acc;
+        }, /* @__PURE__ */ new Map())
       );
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juantroconisf/lib",
-  "version": "5.3.0",
+  "version": "6.1.0",
   "description": "A form validation library for HeroUI.",
   "main": "dist/index.js",
   "module": "dist/index.mjs",