@juantroconisf/lib 8.0.0 → 9.0.0

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { SelectProps, AutocompleteProps } from '@heroui/react';
+import { SelectProps, AutocompleteProps, FormProps } from '@heroui/react';
 import { SingleSelection } from '@react-types/shared';
 import { Schema, InferType } from 'yup';
 
@@ -37,7 +37,22 @@ interface FormOptions<O extends StateType> {
      * Custom property names used as unique identifiers for items in specific arrays.
      * Default is "id".
      */
-    arrayIdentifiers?: Partial<Record<ArrayPaths<O>, string>>;
+    arrayIdentifiers?: {
+        [K in ArrayPaths<O>]?: NestedFieldValue<O, K> extends (infer E)[] ? E extends object ? ScalarKeys<E> : never : never;
+    };
+    /**
+     * Optional submit handler that is called when the form is submitted and validation passes.
+     */
+    onFormSubmit?: FormSubmitHandler<O>;
+    /**
+     * Whether to automatically reset the form after a successful submission.
+     * @default false
+     */
+    resetOnSubmit?: boolean;
+    /**
+     * Keys to preserve when resetting the form.
+     */
+    keepValues?: (keyof O)[];
 }
 type FieldMetadata = {
     isTouched: boolean;
@@ -45,10 +60,9 @@ type FieldMetadata = {
     errorMessage: string;
 };
 type MetadataType = Map<string, FieldMetadata>;
-type SubmitHandler<O extends StateType> = (data: O, e: React.FormEvent) => void;
-interface ResetOptions<O> {
-    preservedStateKeys?: (keyof O)[];
-    preserveTouched?: boolean;
+type FormSubmitHandler<O extends StateType> = (data: O, e: React.FormEvent) => void;
+interface FormResetOptions<O> {
+    keepValues?: (keyof O)[];
 }
 type ValueChangeFunc<O extends StateType, K extends keyof O> = (id: K, value: O[K]) => void;
 type BlurFunc<O extends StateType> = (id: keyof O) => void;
@@ -81,28 +95,25 @@ interface OnMethods<O extends StateType> {
     input<P extends AllPaths<O>>(id: P): ItemInputProps<NestedFieldValue<O, P & string>>;
     /** Registers an array element — adapts to primitive arrays (by index) or object arrays (by ID + field). */
     /** Registers an array element — adapts to primitive arrays (by index). */
-    input<K extends ArrayKeys<O>>(arrayKey: K, index: number): ItemInputProps<any>;
+    input<K extends ArrayPaths<O>>(arrayKey: K, index: number): ItemInputProps<any>;
     /** Registers an object array element's field using composite syntax "array.field". */
-    input<P extends ObjectArrayFieldPaths<O>>(compositePath: P, itemId: ItemIdType<O, GetArrayKeyFromPath<O, P>>): ItemInputProps<any>;
+    input<P extends ObjectArrayFieldPaths<O>>(compositePath: P, itemId: string | number): ItemInputProps<any>;
     /** Registers a scalar or nested object field. */
     select<P extends AllPaths<O>>(id: P): ItemSelectProps;
     /** Registers a complete array field for multi-selection. */
-    select<K extends ArrayKeys<O>>(arrayKey: K): ItemSelectProps;
+    select<K extends ArrayPaths<O>>(arrayKey: K): ItemSelectProps;
     /** Registers an array element — adapts to primitive arrays (by index) or object arrays (by ID + field). */
-    select<K extends ArrayKeys<O>>(arrayKey: K, index: number): ItemSelectProps;
+    select<K extends ArrayPaths<O>>(arrayKey: K, index: number): ItemSelectProps;
     /** Registers an object array element's field using composite syntax "array.field". */
-    select<P extends ObjectArrayFieldPaths<O>>(compositePath: P, itemId: ItemIdType<O, GetArrayKeyFromPath<O, P>>): ItemSelectProps;
+    select<P extends ObjectArrayFieldPaths<O>>(compositePath: P, itemId: string | number): ItemSelectProps;
     /** Registers a scalar or nested object field. */
     autocomplete<P extends AllPaths<O>>(id: P): ItemAutocompleteProps;
     /** Registers an array element — adapts to primitive arrays (by index) or object arrays (by ID + field). */
     /** Registers an array element — adapts to primitive arrays (by index). */
-    autocomplete<K extends ArrayKeys<O>>(arrayKey: K, index: number): ItemAutocompleteProps;
+    autocomplete<K extends ArrayPaths<O>>(arrayKey: K, index: number): ItemAutocompleteProps;
     /** Registers an object array element's field using composite syntax "array.field". */
-    autocomplete<P extends ObjectArrayFieldPaths<O>>(compositePath: P, itemId: ItemIdType<O, GetArrayKeyFromPath<O, P>>): ItemAutocompleteProps;
+    autocomplete<P extends ObjectArrayFieldPaths<O>>(compositePath: P, itemId: string | number): ItemAutocompleteProps;
 }
-type ArrayKeys<O extends StateType> = {
-    [K in keyof O]: O[K] extends any[] ? K : never;
-}[keyof O];
 /**
  * Recursive type to find all paths to arrays in the state.
  */
@@ -120,14 +131,10 @@ type ObjectArrayKeys<O extends StateType> = {
 type ObjectArrayFieldPaths<O extends StateType> = {
     [K in keyof O]: O[K] extends Record<string, any>[] ? `${K & string}.${FieldPaths<ArrayElement<O[K]>>}` : never;
 }[keyof O];
-/**
- * Helper to extract the array key from a path string like "arrayKey.field".
- */
-type GetArrayKeyFromPath<O extends StateType, P extends string> = P extends `${infer K}.${string}` ? K extends keyof O ? O[K] extends any[] ? K : never : never : never;
 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;
-type NestedFieldValue<T, F extends string> = F extends `${infer First}.${infer Rest}` ? First extends keyof T ? NestedFieldValue<T[First], Rest> : any : F extends keyof T ? T[F] : any;
+type NestedFieldValue<T, F extends string> = F extends `${infer First}.${infer Rest}` ? First extends keyof T ? NestedFieldValue<NonNullable<T[First]>, Rest> : NonNullable<T> extends (infer U)[] ? NestedFieldValue<U, F> : any : F extends keyof T ? NonNullable<T[F]> : NonNullable<T> extends (infer U)[] ? F extends keyof U ? NonNullable<U[F]> : any : any;
 type FieldPaths<T> = T extends Record<string, any> ? {
     [K in keyof T & string]: T[K] extends any[] ? K : T[K] extends Record<string, any> ? `${K}.${FieldPaths<T[K]>}` : K;
 }[keyof T & string] : never;
@@ -144,19 +151,19 @@ type AllPaths<O extends StateType> = ScalarKeys<O> | NestedObjectPaths<O>;
  */
 interface HelpersFunc<O extends StateType> {
     /** Adds a new item to an array. */
-    addItem: <K extends ArrayKeys<O>>(arrayKey: K, item: ArrayElement<O[K]>, index?: number) => void;
+    addItem: <K extends ArrayPaths<O>>(arrayKey: K, item: NestedFieldValue<O, K> extends (infer E)[] ? E : never, index?: number) => void;
     /** Removes an item from an array by its index. */
-    removeItem: <K extends ArrayKeys<O>>(arrayKey: K, index: number) => void;
+    removeItem: <K extends ArrayPaths<O>>(arrayKey: K, index: number) => void;
     /** Removes an item from an array by its unique identifier. */
-    removeById: <K extends ArrayKeys<O>>(arrayKey: K, itemId: string | number) => void;
+    removeById: <K extends ArrayPaths<O>>(arrayKey: K, itemId: string | number) => void;
     /** Replaces an item in an array at the given index. */
-    updateItem: <K extends ArrayKeys<O>>(arrayKey: K, index: number, value: ArrayElement<O[K]>) => void;
+    updateItem: <K extends ArrayPaths<O>>(arrayKey: K, index: number, value: NestedFieldValue<O, K> extends (infer E)[] ? E : never) => void;
     /** Moves an item within an array using indices. */
-    moveItem: <K extends ArrayKeys<O>>(arrayKey: K, from: number, to: number) => void;
+    moveItem: <K extends ArrayPaths<O>>(arrayKey: K, from: number, to: number) => void;
     /** Moves an item within an array using unique identifiers. */
-    moveById: <K extends ArrayKeys<O>>(arrayKey: K, fromId: string | number, toId: string | number) => void;
+    moveById: <K extends ArrayPaths<O>>(arrayKey: K, fromId: string | number, toId: string | number) => void;
     /** Gets an item from an array by its unique identifier (O(1) via indexMap). */
-    getItem: <K extends ArrayKeys<O>>(arrayKey: K, itemId: ItemIdType<O, K>) => ArrayElement<O[K]> | undefined;
+    getItem: <K extends ArrayPaths<O>>(arrayKey: K, itemId: string | number) => (NestedFieldValue<O, K> extends (infer E)[] ? E : never) | undefined;
 }
 /**
  * The response object from the useForm hook.
@@ -179,17 +186,23 @@ interface UseFormResponse<O extends StateType> {
     isDirty: boolean;
     /**
      * Resets the form state and metadata.
-     * @param options Configuration for the reset (preserve keys, preserve touched).
+     * @param options Configuration for the reset (e.g., keys to keep).
      */
-    reset: (options?: ResetOptions<O>) => void;
+    onFormReset: (options?: FormResetOptions<O>) => void;
     /**
      * Wraps a form submission handler to automatically validate the form.
      * If validation fails, identifying errors and touching fields.
      * If validation succeeds, calls the provided handler with the current state.
      */
-    onSubmit: (fn: SubmitHandler<O>) => (e: React.FormEvent) => void;
+    onFormSubmit: (fn: FormSubmitHandler<O>) => (e: React.FormEvent) => void;
+    /**
+     * A controlled form component that handles submission and validation.
+     */
+    ControlledForm: React.ComponentType<Omit<FormProps, "onSubmit"> & {
+        onSubmit?: (data: O, e: React.FormEvent<HTMLFormElement>) => void;
+    }>;
 }
 
-declare function useForm<S extends Record<string, ConfigType>>(schema: S, { arrayIdentifiers }?: FormOptions<InferState<S>>): UseFormResponse<InferState<S>>;
+declare function useForm<S extends Record<string, ConfigType>>(schema: S, { arrayIdentifiers, onFormSubmit: onFormSubmitProp, resetOnSubmit, keepValues: keepValuesProp, }?: FormOptions<InferState<S>>): UseFormResponse<InferState<S>>;
 
-export { type BlurFunc, type ConfigType, type FieldMetadata, type FormOptions, type HelpersFunc, type InferState, type MetadataType, type NestedChangeProps, NextUIError, type OnMethods, type StateType, type SubmitHandler, type UseFormResponse, type ValueChangeFunc, useForm };
+export { type BlurFunc, type ConfigType, type FieldMetadata, type FormOptions, type FormSubmitHandler, type HelpersFunc, type InferState, type MetadataType, type NestedChangeProps, NextUIError, type OnMethods, type StateType, type UseFormResponse, type ValueChangeFunc, useForm };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { SelectProps, AutocompleteProps } from '@heroui/react';
+import { SelectProps, AutocompleteProps, FormProps } from '@heroui/react';
 import { SingleSelection } from '@react-types/shared';
 import { Schema, InferType } from 'yup';
 
@@ -37,7 +37,22 @@ interface FormOptions<O extends StateType> {
      * Custom property names used as unique identifiers for items in specific arrays.
      * Default is "id".
      */
-    arrayIdentifiers?: Partial<Record<ArrayPaths<O>, string>>;
+    arrayIdentifiers?: {
+        [K in ArrayPaths<O>]?: NestedFieldValue<O, K> extends (infer E)[] ? E extends object ? ScalarKeys<E> : never : never;
+    };
+    /**
+     * Optional submit handler that is called when the form is submitted and validation passes.
+     */
+    onFormSubmit?: FormSubmitHandler<O>;
+    /**
+     * Whether to automatically reset the form after a successful submission.
+     * @default false
+     */
+    resetOnSubmit?: boolean;
+    /**
+     * Keys to preserve when resetting the form.
+     */
+    keepValues?: (keyof O)[];
 }
 type FieldMetadata = {
     isTouched: boolean;
@@ -45,10 +60,9 @@ type FieldMetadata = {
     errorMessage: string;
 };
 type MetadataType = Map<string, FieldMetadata>;
-type SubmitHandler<O extends StateType> = (data: O, e: React.FormEvent) => void;
-interface ResetOptions<O> {
-    preservedStateKeys?: (keyof O)[];
-    preserveTouched?: boolean;
+type FormSubmitHandler<O extends StateType> = (data: O, e: React.FormEvent) => void;
+interface FormResetOptions<O> {
+    keepValues?: (keyof O)[];
 }
 type ValueChangeFunc<O extends StateType, K extends keyof O> = (id: K, value: O[K]) => void;
 type BlurFunc<O extends StateType> = (id: keyof O) => void;
@@ -81,28 +95,25 @@ interface OnMethods<O extends StateType> {
     input<P extends AllPaths<O>>(id: P): ItemInputProps<NestedFieldValue<O, P & string>>;
     /** Registers an array element — adapts to primitive arrays (by index) or object arrays (by ID + field). */
     /** Registers an array element — adapts to primitive arrays (by index). */
-    input<K extends ArrayKeys<O>>(arrayKey: K, index: number): ItemInputProps<any>;
+    input<K extends ArrayPaths<O>>(arrayKey: K, index: number): ItemInputProps<any>;
     /** Registers an object array element's field using composite syntax "array.field". */
-    input<P extends ObjectArrayFieldPaths<O>>(compositePath: P, itemId: ItemIdType<O, GetArrayKeyFromPath<O, P>>): ItemInputProps<any>;
+    input<P extends ObjectArrayFieldPaths<O>>(compositePath: P, itemId: string | number): ItemInputProps<any>;
     /** Registers a scalar or nested object field. */
     select<P extends AllPaths<O>>(id: P): ItemSelectProps;
     /** Registers a complete array field for multi-selection. */
-    select<K extends ArrayKeys<O>>(arrayKey: K): ItemSelectProps;
+    select<K extends ArrayPaths<O>>(arrayKey: K): ItemSelectProps;
     /** Registers an array element — adapts to primitive arrays (by index) or object arrays (by ID + field). */
-    select<K extends ArrayKeys<O>>(arrayKey: K, index: number): ItemSelectProps;
+    select<K extends ArrayPaths<O>>(arrayKey: K, index: number): ItemSelectProps;
     /** Registers an object array element's field using composite syntax "array.field". */
-    select<P extends ObjectArrayFieldPaths<O>>(compositePath: P, itemId: ItemIdType<O, GetArrayKeyFromPath<O, P>>): ItemSelectProps;
+    select<P extends ObjectArrayFieldPaths<O>>(compositePath: P, itemId: string | number): ItemSelectProps;
     /** Registers a scalar or nested object field. */
     autocomplete<P extends AllPaths<O>>(id: P): ItemAutocompleteProps;
     /** Registers an array element — adapts to primitive arrays (by index) or object arrays (by ID + field). */
     /** Registers an array element — adapts to primitive arrays (by index). */
-    autocomplete<K extends ArrayKeys<O>>(arrayKey: K, index: number): ItemAutocompleteProps;
+    autocomplete<K extends ArrayPaths<O>>(arrayKey: K, index: number): ItemAutocompleteProps;
     /** Registers an object array element's field using composite syntax "array.field". */
-    autocomplete<P extends ObjectArrayFieldPaths<O>>(compositePath: P, itemId: ItemIdType<O, GetArrayKeyFromPath<O, P>>): ItemAutocompleteProps;
+    autocomplete<P extends ObjectArrayFieldPaths<O>>(compositePath: P, itemId: string | number): ItemAutocompleteProps;
 }
-type ArrayKeys<O extends StateType> = {
-    [K in keyof O]: O[K] extends any[] ? K : never;
-}[keyof O];
 /**
  * Recursive type to find all paths to arrays in the state.
  */
@@ -120,14 +131,10 @@ type ObjectArrayKeys<O extends StateType> = {
 type ObjectArrayFieldPaths<O extends StateType> = {
     [K in keyof O]: O[K] extends Record<string, any>[] ? `${K & string}.${FieldPaths<ArrayElement<O[K]>>}` : never;
 }[keyof O];
-/**
- * Helper to extract the array key from a path string like "arrayKey.field".
- */
-type GetArrayKeyFromPath<O extends StateType, P extends string> = P extends `${infer K}.${string}` ? K extends keyof O ? O[K] extends any[] ? K : never : never : never;
 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;
-type NestedFieldValue<T, F extends string> = F extends `${infer First}.${infer Rest}` ? First extends keyof T ? NestedFieldValue<T[First], Rest> : any : F extends keyof T ? T[F] : any;
+type NestedFieldValue<T, F extends string> = F extends `${infer First}.${infer Rest}` ? First extends keyof T ? NestedFieldValue<NonNullable<T[First]>, Rest> : NonNullable<T> extends (infer U)[] ? NestedFieldValue<U, F> : any : F extends keyof T ? NonNullable<T[F]> : NonNullable<T> extends (infer U)[] ? F extends keyof U ? NonNullable<U[F]> : any : any;
 type FieldPaths<T> = T extends Record<string, any> ? {
     [K in keyof T & string]: T[K] extends any[] ? K : T[K] extends Record<string, any> ? `${K}.${FieldPaths<T[K]>}` : K;
 }[keyof T & string] : never;
@@ -144,19 +151,19 @@ type AllPaths<O extends StateType> = ScalarKeys<O> | NestedObjectPaths<O>;
  */
 interface HelpersFunc<O extends StateType> {
     /** Adds a new item to an array. */
-    addItem: <K extends ArrayKeys<O>>(arrayKey: K, item: ArrayElement<O[K]>, index?: number) => void;
+    addItem: <K extends ArrayPaths<O>>(arrayKey: K, item: NestedFieldValue<O, K> extends (infer E)[] ? E : never, index?: number) => void;
     /** Removes an item from an array by its index. */
-    removeItem: <K extends ArrayKeys<O>>(arrayKey: K, index: number) => void;
+    removeItem: <K extends ArrayPaths<O>>(arrayKey: K, index: number) => void;
     /** Removes an item from an array by its unique identifier. */
-    removeById: <K extends ArrayKeys<O>>(arrayKey: K, itemId: string | number) => void;
+    removeById: <K extends ArrayPaths<O>>(arrayKey: K, itemId: string | number) => void;
     /** Replaces an item in an array at the given index. */
-    updateItem: <K extends ArrayKeys<O>>(arrayKey: K, index: number, value: ArrayElement<O[K]>) => void;
+    updateItem: <K extends ArrayPaths<O>>(arrayKey: K, index: number, value: NestedFieldValue<O, K> extends (infer E)[] ? E : never) => void;
     /** Moves an item within an array using indices. */
-    moveItem: <K extends ArrayKeys<O>>(arrayKey: K, from: number, to: number) => void;
+    moveItem: <K extends ArrayPaths<O>>(arrayKey: K, from: number, to: number) => void;
     /** Moves an item within an array using unique identifiers. */
-    moveById: <K extends ArrayKeys<O>>(arrayKey: K, fromId: string | number, toId: string | number) => void;
+    moveById: <K extends ArrayPaths<O>>(arrayKey: K, fromId: string | number, toId: string | number) => void;
     /** Gets an item from an array by its unique identifier (O(1) via indexMap). */
-    getItem: <K extends ArrayKeys<O>>(arrayKey: K, itemId: ItemIdType<O, K>) => ArrayElement<O[K]> | undefined;
+    getItem: <K extends ArrayPaths<O>>(arrayKey: K, itemId: string | number) => (NestedFieldValue<O, K> extends (infer E)[] ? E : never) | undefined;
 }
 /**
  * The response object from the useForm hook.
@@ -179,17 +186,23 @@ interface UseFormResponse<O extends StateType> {
     isDirty: boolean;
     /**
      * Resets the form state and metadata.
-     * @param options Configuration for the reset (preserve keys, preserve touched).
+     * @param options Configuration for the reset (e.g., keys to keep).
      */
-    reset: (options?: ResetOptions<O>) => void;
+    onFormReset: (options?: FormResetOptions<O>) => void;
     /**
      * Wraps a form submission handler to automatically validate the form.
      * If validation fails, identifying errors and touching fields.
      * If validation succeeds, calls the provided handler with the current state.
      */
-    onSubmit: (fn: SubmitHandler<O>) => (e: React.FormEvent) => void;
+    onFormSubmit: (fn: FormSubmitHandler<O>) => (e: React.FormEvent) => void;
+    /**
+     * A controlled form component that handles submission and validation.
+     */
+    ControlledForm: React.ComponentType<Omit<FormProps, "onSubmit"> & {
+        onSubmit?: (data: O, e: React.FormEvent<HTMLFormElement>) => void;
+    }>;
 }
 
-declare function useForm<S extends Record<string, ConfigType>>(schema: S, { arrayIdentifiers }?: FormOptions<InferState<S>>): UseFormResponse<InferState<S>>;
+declare function useForm<S extends Record<string, ConfigType>>(schema: S, { arrayIdentifiers, onFormSubmit: onFormSubmitProp, resetOnSubmit, keepValues: keepValuesProp, }?: FormOptions<InferState<S>>): UseFormResponse<InferState<S>>;
 
-export { type BlurFunc, type ConfigType, type FieldMetadata, type FormOptions, type HelpersFunc, type InferState, type MetadataType, type NestedChangeProps, NextUIError, type OnMethods, type StateType, type SubmitHandler, type UseFormResponse, type ValueChangeFunc, useForm };
+export { type BlurFunc, type ConfigType, type FieldMetadata, type FormOptions, type FormSubmitHandler, type HelpersFunc, type InferState, type MetadataType, type NestedChangeProps, NextUIError, type OnMethods, type StateType, type UseFormResponse, type ValueChangeFunc, useForm };

package/dist/index.js

@@ -49,7 +49,11 @@ function handleNestedChange({
   let current = newValues;
   for (let i = 0; i < propertyDepth.length - 1; i++) {
     const key = propertyDepth[i];
-    current[key] = { ...current[key] };
+    if (Array.isArray(current[key])) {
+      current[key] = [...current[key]];
+    } else {
+      current[key] = { ...current[key] };
+    }
     current = current[key];
   }
   current[propertyDepth[propertyDepth.length - 1]] = value;
@@ -70,7 +74,11 @@ function handleArrayItemChange({
   } else {
     let current = item;
     for (let i = 0; i < fieldDepth.length - 1; i++) {
-      current[fieldDepth[i]] = { ...current[fieldDepth[i]] };
+      if (Array.isArray(current[fieldDepth[i]])) {
+        current[fieldDepth[i]] = [...current[fieldDepth[i]]];
+      } else {
+        current[fieldDepth[i]] = { ...current[fieldDepth[i]] };
+      }
       current = current[fieldDepth[i]];
     }
     current[fieldDepth[fieldDepth.length - 1]] = value;
@@ -91,6 +99,9 @@ function removeCompositeKeysByPrefix(map, prefix) {
   return result;
 }
 
+// src/hooks/useForm.tsx
+var import_react3 = require("@heroui/react");
+
 // src/hooks/useComponentLang.tsx
 var import_yup = require("yup");
 var import_react = require("react");
@@ -249,7 +260,7 @@ function resolveFieldData(args, state, getIndex, getNestedValue2) {
     }
     const arrayKey = arg0;
     const index = arg1;
-    const arr = state[arrayKey];
+    const arr = getNestedValue2(state, arrayKey);
     return {
       type: "primitiveArray" /* PrimitiveArray */,
       compositeKey: `${arrayKey}.@${index}`,
@@ -304,15 +315,21 @@ function resolveFieldData(args, state, getIndex, getNestedValue2) {
 
 // src/hooks/useForm.tsx
 var import_yup2 = require("yup");
+var import_jsx_runtime = require("react/jsx-runtime");
 var DEFAULT_OPTIONS = {};
-function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
+function useForm(schema, {
+  arrayIdentifiers,
+  onFormSubmit: onFormSubmitProp,
+  resetOnSubmit = false,
+  keepValues: keepValuesProp
+} = DEFAULT_OPTIONS) {
   const { initialState, validationSchema } = (0, import_react2.useMemo)(() => {
     const state2 = {};
     const extractedRules = {};
     Object.entries(schema).forEach(([key, value]) => {
       if ((0, import_yup2.isSchema)(value)) {
         try {
-          state2[key] = value.getDefault();
+          state2[key] = value.cast(void 0);
         } catch {
           state2[key] = void 0;
         }
@@ -524,9 +541,12 @@ function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
           });
         }
         if (type === "primitiveArray" /* PrimitiveArray */) {
-          const arr = [...prev[arrayKey]];
-          arr[index] = finalValue;
-          return { ...prev, [arrayKey]: arr };
+          return handleNestedChange({
+            state: prev,
+            id: `${arrayKey}.${index}`,
+            value: finalValue,
+            hasNestedValues: true
+          });
         }
         if (type === "objectArray" /* ObjectArray */) {
           return handleArrayItemChange({
@@ -640,21 +660,31 @@ function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
     () => ({
       addItem: (arrayKey, item, index) => {
         setState((prev) => {
-          const arr = [...prev[arrayKey]];
+          const arr = [...getNestedValue(prev, arrayKey) || []];
           if (index === void 0) arr.push(item);
           else arr.splice(index, 0, item);
-          return { ...prev, [arrayKey]: arr };
+          return handleNestedChange({
+            state: prev,
+            id: arrayKey,
+            value: arr,
+            hasNestedValues: String(arrayKey).includes(".")
+          });
         });
       },
       removeItem: (arrayKey, index) => {
-        const currentArr = stateRef.current[arrayKey];
+        const currentArr = getNestedValue(stateRef.current, arrayKey) || [];
         const item = currentArr[index];
         const idKey = arrayIdentifiers?.[arrayKey] || "id";
         const itemId = item?.[idKey];
         setState((prev) => {
-          const arr = [...prev[arrayKey]];
+          const arr = [...getNestedValue(prev, arrayKey) || []];
           arr.splice(index, 1);
-          return { ...prev, [arrayKey]: arr };
+          return handleNestedChange({
+            state: prev,
+            id: arrayKey,
+            value: arr,
+            hasNestedValues: String(arrayKey).includes(".")
+          });
         });
         if (itemId !== void 0) {
           const prefix = `${String(arrayKey)}.${itemId}.`;
@@ -665,9 +695,14 @@ function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
         const index = getIndex(arrayKey, itemId);
         if (index !== void 0) {
           setState((prev) => {
-            const arr = [...prev[arrayKey]];
+            const arr = [...getNestedValue(prev, arrayKey) || []];
             arr.splice(index, 1);
-            return { ...prev, [arrayKey]: arr };
+            return handleNestedChange({
+              state: prev,
+              id: arrayKey,
+              value: arr,
+              hasNestedValues: String(arrayKey).includes(".")
+            });
           });
           const prefix = `${String(arrayKey)}.${itemId}.`;
           setMetadata((prev) => removeCompositeKeysByPrefix(prev, prefix));
@@ -675,17 +710,27 @@ function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
       },
       updateItem: (arrayKey, index, value) => {
         setState((prev) => {
-          const arr = [...prev[arrayKey]];
+          const arr = [...getNestedValue(prev, arrayKey) || []];
           arr[index] = value;
-          return { ...prev, [arrayKey]: arr };
+          return handleNestedChange({
+            state: prev,
+            id: arrayKey,
+            value: arr,
+            hasNestedValues: String(arrayKey).includes(".")
+          });
         });
       },
       moveItem: (arrayKey, from, to) => {
         setState((prev) => {
-          const arr = [...prev[arrayKey]];
+          const arr = [...getNestedValue(prev, arrayKey) || []];
           const [item] = arr.splice(from, 1);
           arr.splice(to, 0, item);
-          return { ...prev, [arrayKey]: arr };
+          return handleNestedChange({
+            state: prev,
+            id: arrayKey,
+            value: arr,
+            hasNestedValues: String(arrayKey).includes(".")
+          });
         });
       },
       moveById: (arrayKey, fromId, toId) => {
@@ -693,17 +738,22 @@ function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
         const toIndex = getIndex(arrayKey, toId);
         if (fromIndex !== void 0 && toIndex !== void 0) {
           setState((prev) => {
-            const arr = [...prev[arrayKey]];
+            const arr = [...getNestedValue(prev, arrayKey) || []];
             const [item] = arr.splice(fromIndex, 1);
             arr.splice(toIndex, 0, item);
-            return { ...prev, [arrayKey]: arr };
+            return handleNestedChange({
+              state: prev,
+              id: arrayKey,
+              value: arr,
+              hasNestedValues: String(arrayKey).includes(".")
+            });
           });
         }
       },
       getItem: (arrayKey, itemId) => {
         const index = getIndex(arrayKey, itemId);
         if (index === void 0) return void 0;
-        return stateRef.current[arrayKey][index];
+        return getNestedValue(stateRef.current, arrayKey)[index];
       }
     }),
     [getIndex, arrayIdentifiers]
@@ -746,7 +796,7 @@ function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
     },
     [validateField]
   );
-  const onSubmit = (0, import_react2.useCallback)(
+  const onFormSubmit = (0, import_react2.useCallback)(
     (fn) => (e) => {
       e.preventDefault();
       if (validateAll()) return;
@@ -754,6 +804,48 @@ function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
     },
     [validateAll]
   );
+  const onFormSubmitPropRef = (0, import_react2.useRef)(onFormSubmitProp);
+  onFormSubmitPropRef.current = onFormSubmitProp;
+  const resetOnSubmitRef = (0, import_react2.useRef)(resetOnSubmit);
+  resetOnSubmitRef.current = resetOnSubmit;
+  const keepValuesPropRef = (0, import_react2.useRef)(keepValuesProp);
+  keepValuesPropRef.current = keepValuesProp;
+  const handleReset = (0, import_react2.useCallback)(
+    (options) => {
+      const { keepValues } = options || {};
+      if (keepValues && keepValues.length > 0) {
+        const nextState = { ...initialState };
+        keepValues.forEach((k) => {
+          if (stateRef.current[k] !== void 0)
+            nextState[k] = stateRef.current[k];
+        });
+        setState(nextState);
+      } else {
+        setState(initialState);
+      }
+      setMetadata(/* @__PURE__ */ new Map());
+    },
+    [initialState]
+  );
+  const validateAllRef = (0, import_react2.useRef)(validateAll);
+  validateAllRef.current = validateAll;
+  const ControlledForm = (0, import_react2.useMemo)(() => {
+    return (props) => {
+      const { onSubmit, ...rest } = props;
+      const handleSubmit = (e) => {
+        e.preventDefault();
+        if (validateAllRef.current()) {
+          return;
+        }
+        onFormSubmitPropRef.current?.(stateRef.current, e);
+        if (resetOnSubmitRef.current) {
+          handleReset({ keepValues: keepValuesPropRef.current });
+        }
+        onSubmit?.(stateRef.current, e);
+      };
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react3.Form, { onSubmit: handleSubmit, ...rest });
+    };
+  }, []);
   return (0, import_react2.useMemo)(
     () => ({
       state,
@@ -765,37 +857,9 @@ function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
       onFieldBlur: onBlur,
       onSelectionChange: polymorphicOnSelectionChange,
       isDirty: Array.from(metadata.values()).some((m) => m.isTouched),
-      reset: (options) => {
-        const { preservedStateKeys, preserveTouched } = options || {};
-        if (preservedStateKeys && preservedStateKeys.length > 0) {
-          const nextState = { ...initialState };
-          preservedStateKeys.forEach((k) => {
-            if (stateRef.current[k] !== void 0)
-              nextState[k] = stateRef.current[k];
-          });
-          setState(nextState);
-        } else {
-          setState(initialState);
-        }
-        if (preserveTouched) {
-          setMetadata((prev) => {
-            const next = /* @__PURE__ */ new Map();
-            prev.forEach((v, k) => {
-              if (v.isTouched) {
-                next.set(k, {
-                  isTouched: true,
-                  isInvalid: false,
-                  errorMessage: ""
-                });
-              }
-            });
-            return next;
-          });
-        } else {
-          setMetadata(/* @__PURE__ */ new Map());
-        }
-      },
-      onSubmit
+      onFormReset: handleReset,
+      onFormSubmit,
+      ControlledForm
     }),
     [
       state,
@@ -807,7 +871,8 @@ function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
       polymorphicOnValueChange,
       polymorphicOnSelectionChange,
       validateAll,
-      onSubmit,
+      onFormSubmit,
+      ControlledForm,
       initialState
     ]
   );

package/dist/index.mjs

@@ -23,7 +23,11 @@ function handleNestedChange({
   let current = newValues;
   for (let i = 0; i < propertyDepth.length - 1; i++) {
     const key = propertyDepth[i];
-    current[key] = { ...current[key] };
+    if (Array.isArray(current[key])) {
+      current[key] = [...current[key]];
+    } else {
+      current[key] = { ...current[key] };
+    }
     current = current[key];
   }
   current[propertyDepth[propertyDepth.length - 1]] = value;
@@ -44,7 +48,11 @@ function handleArrayItemChange({
   } else {
     let current = item;
     for (let i = 0; i < fieldDepth.length - 1; i++) {
-      current[fieldDepth[i]] = { ...current[fieldDepth[i]] };
+      if (Array.isArray(current[fieldDepth[i]])) {
+        current[fieldDepth[i]] = [...current[fieldDepth[i]]];
+      } else {
+        current[fieldDepth[i]] = { ...current[fieldDepth[i]] };
+      }
       current = current[fieldDepth[i]];
     }
     current[fieldDepth[fieldDepth.length - 1]] = value;
@@ -65,6 +73,9 @@ function removeCompositeKeysByPrefix(map, prefix) {
   return result;
 }
 
+// src/hooks/useForm.tsx
+import { Form } from "@heroui/react";
+
 // src/hooks/useComponentLang.tsx
 import { setLocale } from "yup";
 import { useEffect } from "react";
@@ -223,7 +234,7 @@ function resolveFieldData(args, state, getIndex, getNestedValue2) {
     }
     const arrayKey = arg0;
     const index = arg1;
-    const arr = state[arrayKey];
+    const arr = getNestedValue2(state, arrayKey);
     return {
       type: "primitiveArray" /* PrimitiveArray */,
       compositeKey: `${arrayKey}.@${index}`,
@@ -278,15 +289,21 @@ function resolveFieldData(args, state, getIndex, getNestedValue2) {
 
 // src/hooks/useForm.tsx
 import { isSchema, object, reach } from "yup";
+import { jsx } from "react/jsx-runtime";
 var DEFAULT_OPTIONS = {};
-function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
+function useForm(schema, {
+  arrayIdentifiers,
+  onFormSubmit: onFormSubmitProp,
+  resetOnSubmit = false,
+  keepValues: keepValuesProp
+} = DEFAULT_OPTIONS) {
   const { initialState, validationSchema } = useMemo(() => {
     const state2 = {};
     const extractedRules = {};
     Object.entries(schema).forEach(([key, value]) => {
       if (isSchema(value)) {
         try {
-          state2[key] = value.getDefault();
+          state2[key] = value.cast(void 0);
         } catch {
           state2[key] = void 0;
         }
@@ -498,9 +515,12 @@ function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
           });
         }
         if (type === "primitiveArray" /* PrimitiveArray */) {
-          const arr = [...prev[arrayKey]];
-          arr[index] = finalValue;
-          return { ...prev, [arrayKey]: arr };
+          return handleNestedChange({
+            state: prev,
+            id: `${arrayKey}.${index}`,
+            value: finalValue,
+            hasNestedValues: true
+          });
         }
         if (type === "objectArray" /* ObjectArray */) {
           return handleArrayItemChange({
@@ -614,21 +634,31 @@ function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
     () => ({
       addItem: (arrayKey, item, index) => {
         setState((prev) => {
-          const arr = [...prev[arrayKey]];
+          const arr = [...getNestedValue(prev, arrayKey) || []];
           if (index === void 0) arr.push(item);
           else arr.splice(index, 0, item);
-          return { ...prev, [arrayKey]: arr };
+          return handleNestedChange({
+            state: prev,
+            id: arrayKey,
+            value: arr,
+            hasNestedValues: String(arrayKey).includes(".")
+          });
         });
       },
       removeItem: (arrayKey, index) => {
-        const currentArr = stateRef.current[arrayKey];
+        const currentArr = getNestedValue(stateRef.current, arrayKey) || [];
         const item = currentArr[index];
         const idKey = arrayIdentifiers?.[arrayKey] || "id";
         const itemId = item?.[idKey];
         setState((prev) => {
-          const arr = [...prev[arrayKey]];
+          const arr = [...getNestedValue(prev, arrayKey) || []];
           arr.splice(index, 1);
-          return { ...prev, [arrayKey]: arr };
+          return handleNestedChange({
+            state: prev,
+            id: arrayKey,
+            value: arr,
+            hasNestedValues: String(arrayKey).includes(".")
+          });
         });
         if (itemId !== void 0) {
           const prefix = `${String(arrayKey)}.${itemId}.`;
@@ -639,9 +669,14 @@ function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
         const index = getIndex(arrayKey, itemId);
         if (index !== void 0) {
           setState((prev) => {
-            const arr = [...prev[arrayKey]];
+            const arr = [...getNestedValue(prev, arrayKey) || []];
             arr.splice(index, 1);
-            return { ...prev, [arrayKey]: arr };
+            return handleNestedChange({
+              state: prev,
+              id: arrayKey,
+              value: arr,
+              hasNestedValues: String(arrayKey).includes(".")
+            });
           });
           const prefix = `${String(arrayKey)}.${itemId}.`;
           setMetadata((prev) => removeCompositeKeysByPrefix(prev, prefix));
@@ -649,17 +684,27 @@ function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
       },
       updateItem: (arrayKey, index, value) => {
         setState((prev) => {
-          const arr = [...prev[arrayKey]];
+          const arr = [...getNestedValue(prev, arrayKey) || []];
           arr[index] = value;
-          return { ...prev, [arrayKey]: arr };
+          return handleNestedChange({
+            state: prev,
+            id: arrayKey,
+            value: arr,
+            hasNestedValues: String(arrayKey).includes(".")
+          });
         });
       },
       moveItem: (arrayKey, from, to) => {
         setState((prev) => {
-          const arr = [...prev[arrayKey]];
+          const arr = [...getNestedValue(prev, arrayKey) || []];
           const [item] = arr.splice(from, 1);
           arr.splice(to, 0, item);
-          return { ...prev, [arrayKey]: arr };
+          return handleNestedChange({
+            state: prev,
+            id: arrayKey,
+            value: arr,
+            hasNestedValues: String(arrayKey).includes(".")
+          });
         });
       },
       moveById: (arrayKey, fromId, toId) => {
@@ -667,17 +712,22 @@ function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
         const toIndex = getIndex(arrayKey, toId);
         if (fromIndex !== void 0 && toIndex !== void 0) {
           setState((prev) => {
-            const arr = [...prev[arrayKey]];
+            const arr = [...getNestedValue(prev, arrayKey) || []];
             const [item] = arr.splice(fromIndex, 1);
             arr.splice(toIndex, 0, item);
-            return { ...prev, [arrayKey]: arr };
+            return handleNestedChange({
+              state: prev,
+              id: arrayKey,
+              value: arr,
+              hasNestedValues: String(arrayKey).includes(".")
+            });
           });
         }
       },
       getItem: (arrayKey, itemId) => {
         const index = getIndex(arrayKey, itemId);
         if (index === void 0) return void 0;
-        return stateRef.current[arrayKey][index];
+        return getNestedValue(stateRef.current, arrayKey)[index];
       }
     }),
     [getIndex, arrayIdentifiers]
@@ -720,7 +770,7 @@ function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
     },
     [validateField]
   );
-  const onSubmit = useCallback(
+  const onFormSubmit = useCallback(
     (fn) => (e) => {
       e.preventDefault();
       if (validateAll()) return;
@@ -728,6 +778,48 @@ function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
     },
     [validateAll]
   );
+  const onFormSubmitPropRef = useRef(onFormSubmitProp);
+  onFormSubmitPropRef.current = onFormSubmitProp;
+  const resetOnSubmitRef = useRef(resetOnSubmit);
+  resetOnSubmitRef.current = resetOnSubmit;
+  const keepValuesPropRef = useRef(keepValuesProp);
+  keepValuesPropRef.current = keepValuesProp;
+  const handleReset = useCallback(
+    (options) => {
+      const { keepValues } = options || {};
+      if (keepValues && keepValues.length > 0) {
+        const nextState = { ...initialState };
+        keepValues.forEach((k) => {
+          if (stateRef.current[k] !== void 0)
+            nextState[k] = stateRef.current[k];
+        });
+        setState(nextState);
+      } else {
+        setState(initialState);
+      }
+      setMetadata(/* @__PURE__ */ new Map());
+    },
+    [initialState]
+  );
+  const validateAllRef = useRef(validateAll);
+  validateAllRef.current = validateAll;
+  const ControlledForm = useMemo(() => {
+    return (props) => {
+      const { onSubmit, ...rest } = props;
+      const handleSubmit = (e) => {
+        e.preventDefault();
+        if (validateAllRef.current()) {
+          return;
+        }
+        onFormSubmitPropRef.current?.(stateRef.current, e);
+        if (resetOnSubmitRef.current) {
+          handleReset({ keepValues: keepValuesPropRef.current });
+        }
+        onSubmit?.(stateRef.current, e);
+      };
+      return /* @__PURE__ */ jsx(Form, { onSubmit: handleSubmit, ...rest });
+    };
+  }, []);
   return useMemo(
     () => ({
       state,
@@ -739,37 +831,9 @@ function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
       onFieldBlur: onBlur,
       onSelectionChange: polymorphicOnSelectionChange,
       isDirty: Array.from(metadata.values()).some((m) => m.isTouched),
-      reset: (options) => {
-        const { preservedStateKeys, preserveTouched } = options || {};
-        if (preservedStateKeys && preservedStateKeys.length > 0) {
-          const nextState = { ...initialState };
-          preservedStateKeys.forEach((k) => {
-            if (stateRef.current[k] !== void 0)
-              nextState[k] = stateRef.current[k];
-          });
-          setState(nextState);
-        } else {
-          setState(initialState);
-        }
-        if (preserveTouched) {
-          setMetadata((prev) => {
-            const next = /* @__PURE__ */ new Map();
-            prev.forEach((v, k) => {
-              if (v.isTouched) {
-                next.set(k, {
-                  isTouched: true,
-                  isInvalid: false,
-                  errorMessage: ""
-                });
-              }
-            });
-            return next;
-          });
-        } else {
-          setMetadata(/* @__PURE__ */ new Map());
-        }
-      },
-      onSubmit
+      onFormReset: handleReset,
+      onFormSubmit,
+      ControlledForm
     }),
     [
       state,
@@ -781,7 +845,8 @@ function useForm(schema, { arrayIdentifiers } = DEFAULT_OPTIONS) {
       polymorphicOnValueChange,
       polymorphicOnSelectionChange,
       validateAll,
-      onSubmit,
+      onFormSubmit,
+      ControlledForm,
       initialState
     ]
   );

package/package.json

@@ -1,45 +1,45 @@
-{
-  "name": "@juantroconisf/lib",
-  "version": "8.0.0",
-  "description": "A form validation library for HeroUI.",
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist",
-    "README.md"
-  ],
-  "scripts": {
-    "test": "vitest run",
-    "build": "pnpm test && tsup src/index.ts --format cjs,esm --dts",
-    "lint": "tsc",
-    "prepublishOnly": "pnpm run build"
-  },
-  "author": "Juan T",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/juandiegotroconis/lib/issues"
-  },
-  "typings": "dist/index.d.ts",
-  "homepage": "https://github.com/juandiegotroconis/lib#readme",
-  "devDependencies": {
-    "@heroui/react": "^2.8.5",
-    "@react-types/shared": "^3.32.1",
-    "@testing-library/jest-dom": "^6.9.1",
-    "@testing-library/react": "^16.3.2",
-    "@types/node": "^24.7.1",
-    "@types/react": "^19.2.2",
-    "jsdom": "^28.1.0",
-    "react": "^19.2.0",
-    "tsup": "^8.5.0",
-    "typescript": "^5.9.3",
-    "vitest": "^4.0.18"
-  },
-  "peerDependencies": {
-    "@heroui/react": ">=2.0.0",
-    "react": ">=18.0.0"
-  },
-  "dependencies": {
-    "yup": "^1.7.1"
-  }
-}
+{
+  "name": "@juantroconisf/lib",
+  "version": "9.0.0",
+  "description": "A form validation library for HeroUI.",
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist",
+    "README.md"
+  ],
+  "scripts": {
+    "test": "vitest run",
+    "build": "pnpm test && tsup src/index.ts --format cjs,esm --dts",
+    "lint": "tsc",
+    "prepublishOnly": "pnpm run build"
+  },
+  "author": "Juan T",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/juandiegotroconis/lib/issues"
+  },
+  "typings": "dist/index.d.ts",
+  "homepage": "https://github.com/juandiegotroconis/lib#readme",
+  "devDependencies": {
+    "@heroui/react": "^2.8.5",
+    "@react-types/shared": "^3.32.1",
+    "@testing-library/jest-dom": "^6.9.1",
+    "@testing-library/react": "^16.3.2",
+    "@types/node": "^24.7.1",
+    "@types/react": "^19.2.2",
+    "jsdom": "^28.1.0",
+    "react": "^19.2.0",
+    "tsup": "^8.5.0",
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.18"
+  },
+  "peerDependencies": {
+    "@heroui/react": ">=2.0.0",
+    "react": ">=18.0.0"
+  },
+  "dependencies": {
+    "yup": "^1.7.1"
+  }
+}