@juantroconisf/lib 5.2.0 → 6.0.0

package/dist/index.d.mts

@@ -81,8 +81,8 @@ interface FormOptions<O extends StateType> {
      */
     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> {
@@ -130,6 +130,10 @@ interface OnMethods<O extends StateType> {
 type ArrayKeys<O extends StateType> = {
     [K in keyof O]: O[K] extends any[] ? K : never;
 }[keyof O];
+/** Keys whose values are arrays of objects (not primitives). */
+type ObjectArrayKeys<O extends StateType> = {
+    [K in keyof O]: O[K] extends Record<string, any>[] ? K : never;
+}[keyof O];
 type ArrayElement<T> = T extends (infer E)[] ? E : never;
 /** Resolves the type of the identifier field for an array element (defaults to "id"). */
 type ItemIdType<O extends StateType, K extends keyof O> = "id" extends keyof ArrayElement<O[K]> ? ArrayElement<O[K]>["id"] : string | number;
@@ -170,12 +174,15 @@ interface HelpersFunc<O extends StateType> {
  */
 interface UseFormResponse<O extends StateType> {
     onBlur: BlurFunc<O>;
-    onValueChange: ValueChangeFunc<O, keyof O>;
+    /** Updates an object array element's field by ID. */
+    onValueChange<K extends ObjectArrayKeys<O>, F extends keyof ArrayElement<O[K]> & string>(arrayKey: K, itemId: ItemIdType<O, K>, field: F, value: ArrayElement<O[K]>[F]): void;
+    /** Updates a scalar or nested object field. */
+    onValueChange<P extends AllPaths<O>>(id: P, value: NestedFieldValue<O, P & string>): void;
     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. */

package/dist/index.d.ts

@@ -81,8 +81,8 @@ interface FormOptions<O extends StateType> {
      */
     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> {
@@ -130,6 +130,10 @@ interface OnMethods<O extends StateType> {
 type ArrayKeys<O extends StateType> = {
     [K in keyof O]: O[K] extends any[] ? K : never;
 }[keyof O];
+/** Keys whose values are arrays of objects (not primitives). */
+type ObjectArrayKeys<O extends StateType> = {
+    [K in keyof O]: O[K] extends Record<string, any>[] ? K : never;
+}[keyof O];
 type ArrayElement<T> = T extends (infer E)[] ? E : never;
 /** Resolves the type of the identifier field for an array element (defaults to "id"). */
 type ItemIdType<O extends StateType, K extends keyof O> = "id" extends keyof ArrayElement<O[K]> ? ArrayElement<O[K]>["id"] : string | number;
@@ -170,12 +174,15 @@ interface HelpersFunc<O extends StateType> {
  */
 interface UseFormResponse<O extends StateType> {
     onBlur: BlurFunc<O>;
-    onValueChange: ValueChangeFunc<O, keyof O>;
+    /** Updates an object array element's field by ID. */
+    onValueChange<K extends ObjectArrayKeys<O>, F extends keyof ArrayElement<O[K]> & string>(arrayKey: K, itemId: ItemIdType<O, K>, field: F, value: ArrayElement<O[K]>[F]): void;
+    /** Updates a scalar or nested object field. */
+    onValueChange<P extends AllPaths<O>>(id: P, value: NestedFieldValue<O, P & string>): void;
     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. */

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}$/
@@ -233,14 +226,7 @@ function useForm(initialState, {
   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();
+  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,38 +252,71 @@ function useForm(initialState, {
     },
     [indexMap]
   );
-  const validateInput = (id, value) => setErrors(
-    (prev) => handleNestedChange({
-      state: prev,
-      id,
-      value: performValidations(value, rules?.[id], messages?.[id])
-    })
-  );
+  const validateInput = (compositeKey, value, ruleKey) => {
+    const error = performValidations(
+      value,
+      rules?.[ruleKey],
+      messages?.[ruleKey]
+    );
+    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
-      })
-    );
-  }, onValueChange = (id, value) => {
-    setState((prev) => handleNestedChange({ state: prev, id, value }));
-    validateInput(id, value);
-  }, onSelectionChange = (id, value) => {
+    validateInput(String(id), state[id], 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(String(id), value, id);
+      return;
+    }
+    if (args.length === 3) {
+      const [arrayKey, index, value] = args;
+      setState((prev) => {
+        const arr = [...prev[arrayKey]];
+        arr[index] = value;
+        return { ...prev, [arrayKey]: arr };
+      });
+      return;
+    }
+    if (args.length === 4) {
+      const [arrayKey, itemId, field, value] = args;
+      const index = getIndex(String(arrayKey), itemId);
+      if (index === void 0) return;
+      setState(
+        (prev) => handleArrayItemChange({ state: prev, arrayKey, index, field, value })
+      );
+      validateItemInput(arrayKey, itemId, field, value);
+      return;
+    }
+    if (args.length === 5) {
+      const [parentKey, parentId, field, index, value] = args;
+      const parentIndex = getIndex(String(parentKey), parentId);
+      if (parentIndex === void 0) return;
+      setState((prev) => {
+        const parentArr = [...prev[parentKey]];
+        const item = { ...parentArr[parentIndex] };
+        const nestedArr = [...getNestedValue(item, field) || []];
+        nestedArr[index] = value;
+        const updatedItem = setNestedValue(item, field, nestedArr);
+        parentArr[parentIndex] = updatedItem;
+        return { ...prev, [parentKey]: parentArr };
+      });
+      return;
+    }
+  }), onSelectionChange = (id, value) => {
     const fixedValue = typeof value === "string" || value === null ? value : Array.from(value);
     setState(
       (prev) => handleNestedChange({
@@ -306,7 +325,7 @@ function useForm(initialState, {
         value: fixedValue
       })
     );
-    validateInput(id, fixedValue);
+    validateInput(String(id), fixedValue, id);
   };
   const getItemCompositeKey = (arrayKey, itemId, field) => `${arrayKey}.${itemId}.${field}`;
   const getPrimitiveCompositeKey = (arrayKey, index) => `${arrayKey}.@${index}`;
@@ -319,22 +338,24 @@ function useForm(initialState, {
     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)
-    }));
+    setErrors(
+      (prev) => new Map(prev).set(
+        compositeKey,
+        performValidations(value, fieldRules, fieldMessages)
+      )
+    );
   };
   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);
@@ -343,8 +364,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);
@@ -374,16 +395,18 @@ function useForm(initialState, {
   };
   const validateNestedInput = (dotPath, value) => {
     const topKey = dotPath.split(".")[0];
-    setNestedErrors((prev) => ({
-      ...prev,
-      [dotPath]: performValidations(value, rules?.[topKey], messages?.[topKey])
-    }));
+    setErrors(
+      (prev) => new Map(prev).set(
+        dotPath,
+        performValidations(value, rules?.[topKey], messages?.[topKey])
+      )
+    );
   };
   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));
@@ -428,12 +451,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) => {
@@ -441,6 +460,7 @@ function useForm(initialState, {
               arr3[index2] = v;
               return { ...prev, [arrayKey2]: arr3 };
             });
+            validateItemInput(arrayKey2, `@${index2}`, "", v);
           },
           value: value2
         };
@@ -461,8 +481,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;
@@ -474,6 +494,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
         };
@@ -528,8 +550,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;
@@ -538,6 +560,7 @@ function useForm(initialState, {
               arr3[index2] = fixedValue;
               return { ...prev, [arrayKey2]: arr3 };
             });
+            validateItemInput(arrayKey2, `@${index2}`, "", fixedValue);
           },
           selectedKeys: value2 === null ? [] : [value2]
         };
@@ -558,8 +581,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;
@@ -572,6 +595,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]
         };
@@ -621,15 +646,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
         };
@@ -650,19 +677,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
         };
@@ -713,8 +743,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) => {
@@ -724,8 +754,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) => {
@@ -765,35 +795,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) => ({
@@ -805,16 +812,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}$/
@@ -214,14 +207,7 @@ function useForm(initialState, {
   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();
+  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,38 +233,71 @@ function useForm(initialState, {
     },
     [indexMap]
   );
-  const validateInput = (id, value) => setErrors(
-    (prev) => handleNestedChange({
-      state: prev,
-      id,
-      value: performValidations(value, rules?.[id], messages?.[id])
-    })
-  );
+  const validateInput = (compositeKey, value, ruleKey) => {
+    const error = performValidations(
+      value,
+      rules?.[ruleKey],
+      messages?.[ruleKey]
+    );
+    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
-      })
-    );
-  }, onValueChange = (id, value) => {
-    setState((prev) => handleNestedChange({ state: prev, id, value }));
-    validateInput(id, value);
-  }, onSelectionChange = (id, value) => {
+    validateInput(String(id), state[id], 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(String(id), value, id);
+      return;
+    }
+    if (args.length === 3) {
+      const [arrayKey, index, value] = args;
+      setState((prev) => {
+        const arr = [...prev[arrayKey]];
+        arr[index] = value;
+        return { ...prev, [arrayKey]: arr };
+      });
+      return;
+    }
+    if (args.length === 4) {
+      const [arrayKey, itemId, field, value] = args;
+      const index = getIndex(String(arrayKey), itemId);
+      if (index === void 0) return;
+      setState(
+        (prev) => handleArrayItemChange({ state: prev, arrayKey, index, field, value })
+      );
+      validateItemInput(arrayKey, itemId, field, value);
+      return;
+    }
+    if (args.length === 5) {
+      const [parentKey, parentId, field, index, value] = args;
+      const parentIndex = getIndex(String(parentKey), parentId);
+      if (parentIndex === void 0) return;
+      setState((prev) => {
+        const parentArr = [...prev[parentKey]];
+        const item = { ...parentArr[parentIndex] };
+        const nestedArr = [...getNestedValue(item, field) || []];
+        nestedArr[index] = value;
+        const updatedItem = setNestedValue(item, field, nestedArr);
+        parentArr[parentIndex] = updatedItem;
+        return { ...prev, [parentKey]: parentArr };
+      });
+      return;
+    }
+  }), onSelectionChange = (id, value) => {
     const fixedValue = typeof value === "string" || value === null ? value : Array.from(value);
     setState(
       (prev) => handleNestedChange({
@@ -287,7 +306,7 @@ function useForm(initialState, {
         value: fixedValue
       })
     );
-    validateInput(id, fixedValue);
+    validateInput(String(id), fixedValue, id);
   };
   const getItemCompositeKey = (arrayKey, itemId, field) => `${arrayKey}.${itemId}.${field}`;
   const getPrimitiveCompositeKey = (arrayKey, index) => `${arrayKey}.@${index}`;
@@ -300,22 +319,24 @@ function useForm(initialState, {
     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)
-    }));
+    setErrors(
+      (prev) => new Map(prev).set(
+        compositeKey,
+        performValidations(value, fieldRules, fieldMessages)
+      )
+    );
   };
   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);
@@ -324,8 +345,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);
@@ -355,16 +376,18 @@ function useForm(initialState, {
   };
   const validateNestedInput = (dotPath, value) => {
     const topKey = dotPath.split(".")[0];
-    setNestedErrors((prev) => ({
-      ...prev,
-      [dotPath]: performValidations(value, rules?.[topKey], messages?.[topKey])
-    }));
+    setErrors(
+      (prev) => new Map(prev).set(
+        dotPath,
+        performValidations(value, rules?.[topKey], messages?.[topKey])
+      )
+    );
   };
   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));
@@ -409,12 +432,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) => {
@@ -422,6 +441,7 @@ function useForm(initialState, {
               arr3[index2] = v;
               return { ...prev, [arrayKey2]: arr3 };
             });
+            validateItemInput(arrayKey2, `@${index2}`, "", v);
           },
           value: value2
         };
@@ -442,8 +462,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;
@@ -455,6 +475,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
         };
@@ -509,8 +531,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;
@@ -519,6 +541,7 @@ function useForm(initialState, {
               arr3[index2] = fixedValue;
               return { ...prev, [arrayKey2]: arr3 };
             });
+            validateItemInput(arrayKey2, `@${index2}`, "", fixedValue);
           },
           selectedKeys: value2 === null ? [] : [value2]
         };
@@ -539,8 +562,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;
@@ -553,6 +576,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]
         };
@@ -602,15 +627,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
         };
@@ -631,19 +658,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
         };
@@ -694,8 +724,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) => {
@@ -705,8 +735,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) => {
@@ -746,35 +776,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) => ({
@@ -786,16 +793,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.2.0",
+  "version": "6.0.0",
   "description": "A form validation library for HeroUI.",
   "main": "dist/index.js",
   "module": "dist/index.mjs",