@rolster/react-forms 18.2.9 → 18.3.0

package/dist/esm/form-array/form-array.hook.js

@@ -1,34 +1,31 @@
-import { createFormArrayProps } from '@rolster/helpers-forms';
-import { arrayIsValid, controlsToState, groupAllChecked, groupPartialChecked } from '@rolster/helpers-forms/helpers';
-import { useEffect, useState } from 'react';
-import { RolsterArrayControl } from './form-array-control.hook';
+import { createFormArrayOptions } from '@rolster/forms/arguments';
+import { arrayIsValid, controlsToState, groupAllChecked, groupPartialChecked } from '@rolster/forms/helpers';
+import { useEffect, useRef, useState } from 'react';
 import { RolsterArrayGroup } from './form-array-group.hook';
-export function cloneFormArrayControl(control, changes) {
-    return new RolsterArrayControl({ ...control, ...changes });
-}
-export function cloneFormArrayGroup(group, changes) {
-    return new RolsterArrayGroup({ ...group, ...changes });
-}
-export function cloneFormControlForArrayGroup(group, control, changes) {
-    const newControl = cloneFormArrayControl(control, changes);
-    const { uuid } = newControl;
-    const controls = Object.entries(group.controls).reduce((controls, [key, control]) => {
-        controls[key] = control.uuid === uuid ? newControl : control;
-        return controls;
-    }, {});
-    return new RolsterArrayGroup({ ...group, controls });
-}
-export function useFormArray(arrayProps, arrayValidators) {
-    const props = createFormArrayProps(arrayProps, arrayValidators);
-    const [currentState] = useState(props.groups);
-    const [state, setState] = useState([]);
-    const [validators, setValidators] = useState(props.validators);
-    const [controls, setControls] = useState([]);
-    const [groups, setGroups] = useState(props.groups || []);
+export function useFormArray(options, arrayValidators) {
+    const arrayOptions = createFormArrayOptions(options, arrayValidators);
+    const { validators } = arrayOptions;
+    const groups = arrayOptions.groups || [];
+    const [arrayState, setArrayState] = useState({
+        controls: groups.map(({ controls }) => controls),
+        groups,
+        state: groups.map(({ controls }) => controlsToState(controls)),
+        validators
+    });
+    const currentState = useRef(groups);
     useEffect(() => {
-        setControls(groups.map(({ controls }) => controls));
-        setState(groups.map(({ controls }) => controlsToState(controls)));
-    }, [groups]);
+        const subscriber = (options) => {
+            setArrayState((state) => ({
+                ...state,
+                groups: arrayState.groups.map((group) => group.uuid === options.uuid
+                    ? new RolsterArrayGroup(options)
+                    : group)
+            }));
+        };
+        arrayState.groups.forEach((group) => {
+            group.subscribe(subscriber);
+        });
+    }, [arrayState]);
     const errors = validators ? arrayIsValid({ groups, validators }) : [];
     const error = errors[0];
     const valid = errors.length === 0 && groupAllChecked(groups, 'valid');
@@ -36,60 +33,53 @@ export function useFormArray(arrayProps, arrayValidators) {
     const toucheds = groupAllChecked(groups, 'touched');
     const dirties = groupAllChecked(groups, 'dirty');
     const dirty = groupPartialChecked(groups, 'dirty');
+    function setGroups(groups) {
+        setArrayState((currentState) => ({
+            ...currentState,
+            groups,
+            controls: groups.map(({ controls }) => controls),
+            state: groups.map(({ controls }) => controlsToState(controls))
+        }));
+    }
     function push(group) {
-        setGroups([...groups, group]);
+        setGroups([...arrayState.groups, group]);
     }
-    function merge(newGroups) {
-        setGroups([...groups, ...newGroups]);
+    function merge(groups) {
+        setGroups([...arrayState.groups, ...groups]);
     }
     function set(groups) {
         setGroups(groups);
     }
-    function refreshControl(control, changes) {
-        if (control.group) {
-            const group = cloneFormControlForArrayGroup(control.group, control, changes);
-            setGroups(groups.map((currentGroup) => currentGroup.uuid === group.uuid ? group : currentGroup));
-        }
-    }
-    function refreshGroup(group, changes) {
-        const newGroup = cloneFormArrayGroup(group, changes);
-        const { uuid } = newGroup;
-        setGroups(groups.map((currentGroup) => currentGroup.uuid === uuid ? newGroup : currentGroup));
-    }
-    function remove(group) {
-        setGroups(groups.filter(({ uuid }) => group.uuid !== uuid));
+    function remove({ uuid }) {
+        setGroups(arrayState.groups.filter((group) => group.uuid !== uuid));
     }
     function reset() {
-        setGroups(currentState || []);
+        setGroups(currentState.current);
     }
-    const formArray = {
-        controls,
+    function setValidators(validators) {
+        setArrayState((state) => ({ ...state, validators }));
+    }
+    return {
+        ...arrayState,
         dirty,
         dirties,
         error,
         errors,
-        groups,
         invalid: !valid,
         merge,
         pristine: !dirty,
         pristines: !dirties,
         push,
-        refreshControl,
-        refreshGroup,
         remove,
         reset,
         set,
         setValidators,
-        state,
         touched,
         toucheds,
         untouched: !touched,
         untoucheds: !toucheds,
         valid,
-        value: state,
         wrong: touched && !valid
     };
-    groups.forEach((group) => (group.parent = formArray));
-    return formArray;
 }
 //# sourceMappingURL=form-array.hook.js.map

package/dist/esm/form-array/form-array.hook.js.map

@@ -1 +1 @@
-{"version":3,"file":"form-array.hook.js","sourceRoot":"","sources":["../../../src/form-array/form-array.hook.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"form-array.hook.js","sourceRoot":"","sources":["../../../src/form-array/form-array.hook.ts"],"names":[],"mappings":"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"}

package/dist/esm/form-array/index.d.ts

@@ -1,3 +1,3 @@
-export { useFormArrayControl, useInputArrayControl } from './form-array-control.hook';
+export { useReactArrayControl, useFormArrayControl, useInputArrayControl } from './form-array-control.hook';
 export { useFormArrayGroup } from './form-array-group.hook';
-export { cloneFormArrayControl, cloneFormArrayGroup, cloneFormControlForArrayGroup, useFormArray } from './form-array.hook';
+export { useFormArray } from './form-array.hook';

package/dist/esm/form-array/index.js

@@ -1,4 +1,4 @@
-export { useFormArrayControl, useInputArrayControl } from './form-array-control.hook';
+export { useReactArrayControl, useFormArrayControl, useInputArrayControl } from './form-array-control.hook';
 export { useFormArrayGroup } from './form-array-group.hook';
-export { cloneFormArrayControl, cloneFormArrayGroup, cloneFormControlForArrayGroup, useFormArray } from './form-array.hook';
+export { useFormArray } from './form-array.hook';
 //# sourceMappingURL=index.js.map

package/dist/esm/form-array/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/form-array/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,6BAA6B,EAC7B,YAAY,EACb,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/form-array/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC"}

package/dist/esm/form-control.hook.d.ts

@@ -1,16 +1,21 @@
-import { FormControlProps, FormState } from '@rolster/helpers-forms';
+import { FormControlOptions } from '@rolster/forms';
 import { ValidatorFn } from '@rolster/validators';
 import { ReactFormControl, ReactHtmlControl, ReactInputControl } from './types';
-interface ReactControlProps<T = any> extends FormControlProps<T> {
+interface ReactControlOptions<T = any> extends FormControlOptions<T> {
     touched?: boolean;
 }
-export declare function useReactControl<E extends HTMLElement, T = any>(): ReactFormControl<E, T>;
-export declare function useReactControl<E extends HTMLElement, T = any>(props: ReactControlProps<T>): ReactFormControl<E, T>;
-export declare function useReactControl<E extends HTMLElement, T = any>(state: FormState<T>, validators?: ValidatorFn<T>[]): ReactFormControl<E, T>;
-export declare function useFormControl<T = any>(): ReactHtmlControl<T>;
-export declare function useFormControl<T = any>(props: ReactControlProps<T>): ReactHtmlControl<T>;
-export declare function useFormControl<T = any>(state: FormState<T>, validators?: ValidatorFn<T>[]): ReactHtmlControl<T>;
-export declare function useInputControl<T = any>(): ReactInputControl<T>;
-export declare function useInputControl<T = any>(props: ReactControlProps<T>): ReactInputControl<T>;
-export declare function useInputControl<T = any>(state: FormState<T>, validators?: ValidatorFn<T>[]): ReactInputControl<T>;
+type ReactStateOptions<T> = Omit<ReactControlOptions<T>, 'validators'>;
+type ReactValidatorsOptions<T> = Omit<ReactControlOptions<T>, 'state'>;
+export declare function useReactControl<E extends HTMLElement, T>(): ReactFormControl<E, T | undefined>;
+export declare function useReactControl<E extends HTMLElement, T>(options: ReactStateOptions<T>): ReactFormControl<E, T>;
+export declare function useReactControl<E extends HTMLElement, T>(options: ReactValidatorsOptions<T>): ReactFormControl<E, T | undefined>;
+export declare function useReactControl<E extends HTMLElement, T>(state: T, validators?: ValidatorFn<T>[]): ReactFormControl<E, T>;
+export declare function useFormControl<T>(): ReactHtmlControl<T | undefined>;
+export declare function useFormControl<T>(options: ReactStateOptions<T>): ReactHtmlControl<T>;
+export declare function useFormControl<T>(options: ReactValidatorsOptions<T>): ReactHtmlControl<T | undefined>;
+export declare function useFormControl<T>(state: T, validators?: ValidatorFn<T>[]): ReactHtmlControl<T>;
+export declare function useInputControl<T>(): ReactInputControl<T | undefined>;
+export declare function useInputControl<T>(options: ReactStateOptions<T>): ReactInputControl<T>;
+export declare function useInputControl<T>(options: ReactValidatorsOptions<T>): ReactInputControl<T | undefined>;
+export declare function useInputControl<T>(state: T, validators?: ValidatorFn<T>[]): ReactInputControl<T>;
 export {};

package/dist/esm/form-control.hook.js

@@ -1,95 +1,86 @@
-import { createFormControlProps } from '@rolster/helpers-forms';
-import { controlIsValid } from '@rolster/helpers-forms/helpers';
-import { useEffect, useRef, useState } from 'react';
-import { BehaviorSubject } from 'rxjs';
-function useControl(controlProps, controlValidators) {
-    const props = createFormControlProps(controlProps, controlValidators);
-    const [state, setCurrentState] = useState(props.state);
-    const [value, setValue] = useState(props.state);
-    const [touched, setTouched] = useState(props.touched || false);
-    const [dirty, setDirty] = useState(false);
-    const [focused, setFocused] = useState(false);
-    const [disabled, setDisabled] = useState(false);
-    const [initialValue] = useState(props.state);
-    const [validators, setValidators] = useState(props.validators);
-    const [subscribers] = useState(new BehaviorSubject(props.state));
+import { createFormControlOptions } from '@rolster/forms/arguments';
+import { controlIsValid } from '@rolster/forms/helpers';
+import { useRef, useState } from 'react';
+function useControl(controlOptions, controlValidators) {
+    const { state, touched, validators } = createFormControlOptions(controlOptions, controlValidators);
+    const [controlState, setControlState] = useState({
+        dirty: false,
+        disabled: false,
+        focused: false,
+        state: state,
+        touched: !!touched,
+        validators: validators
+    });
+    const initialState = useRef(state);
     const elementRef = useRef(null);
-    const errors = (() => validators ? controlIsValid({ state, validators }) : [])();
-    const error = (() => errors[0])();
-    const valid = (() => errors.length === 0)();
-    useEffect(() => {
-        if (state !== null && state !== undefined) {
-            setValue(state);
-        }
-        subscribers.next(state);
-    }, [state]);
+    const errors = validators ? controlIsValid({ state, validators }) : [];
+    const valid = errors.length === 0;
     function focus() {
-        setFocused(true);
+        setControlState((state) => ({ ...state, focused: true }));
     }
     function blur() {
-        setFocused(false);
+        setControlState((state) => ({ ...state, focused: false }));
     }
     function disable() {
-        setDisabled(true);
+        setControlState((state) => ({ ...state, disabled: true }));
     }
     function enable() {
-        setDisabled(false);
+        setControlState((state) => ({ ...state, disabled: false }));
     }
     function touch() {
-        setTouched(true);
+        setControlState((state) => ({ ...state, touched: true }));
     }
     function untouch() {
-        setTouched(false);
+        setControlState((state) => ({ ...state, touched: false }));
     }
     function setState(state) {
-        setDirty(true);
-        setCurrentState(state);
+        setControlState((currentState) => ({
+            ...currentState,
+            dirty: true,
+            state
+        }));
     }
-    function reset() {
-        setTouched(false);
-        setDirty(false);
-        setCurrentState(initialValue);
+    function setValidators(validators) {
+        setControlState((state) => ({ ...state, validators }));
     }
-    function subscribe(subscriber) {
-        const subscription = subscribers.subscribe(subscriber);
-        return () => subscription.unsubscribe();
+    function reset() {
+        setControlState((currentState) => ({
+            ...currentState,
+            dirty: false,
+            state: initialState.current,
+            touched: false
+        }));
     }
     return {
+        ...controlState,
         blur,
-        dirty,
         disable,
-        disabled,
         elementRef,
         enable,
-        enabled: !disabled,
-        error,
+        enabled: !controlState.disabled,
+        error: errors[0],
         errors,
         focus,
-        focused,
         invalid: !valid,
-        pristine: !dirty,
+        pristine: !controlState.dirty,
         reset,
         setState,
         setValidators,
-        state,
-        subscribe,
         touch,
-        touched,
-        unfocused: !focused,
+        unfocused: !controlState.focused,
         untouch,
-        untouched: !touched,
+        untouched: !controlState.touched,
         valid,
-        value,
-        wrong: touched && !valid
+        wrong: controlState.touched && !valid
     };
 }
-export function useReactControl(controlProps, controlValidators) {
-    return useControl(controlProps, controlValidators);
+export function useReactControl(options, validators) {
+    return useControl(options, validators);
 }
-export function useFormControl(controlProps, controlValidators) {
-    return useControl(controlProps, controlValidators);
+export function useFormControl(options, validators) {
+    return useControl(options, validators);
 }
-export function useInputControl(controlProps, controlValidators) {
-    return useControl(controlProps, controlValidators);
+export function useInputControl(options, validators) {
+    return useControl(options, validators);
 }
 //# sourceMappingURL=form-control.hook.js.map

package/dist/esm/form-control.hook.js.map

@@ -1 +1 @@
-{"version":3,"file":"form-control.hook.js","sourceRoot":"","sources":["../../src/form-control.hook.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"form-control.hook.js","sourceRoot":"","sources":["../../src/form-control.hook.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAgBzC,SAAS,UAAU,CACjB,cAA2C,EAC3C,iBAAoC;IAEpC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,wBAAwB,CAG7D,cAAc,EAAE,iBAAiB,CAAC,CAAC;IAErC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAkB;QAChE,KAAK,EAAE,KAAK;QACZ,QAAQ,EAAE,KAAK;QACf,OAAO,EAAE,KAAK;QACd,KAAK,EAAE,KAAK;QACZ,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,UAAU,EAAE,UAAU;KACvB,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,MAAM,CAAI,KAAK,CAAC,CAAC;IACtC,MAAM,UAAU,GAAG,MAAM,CAAI,IAAI,CAAC,CAAC;IAEnC,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACvE,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;IAElC,SAAS,KAAK;QACZ,eAAe,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,SAAS,IAAI;QACX,eAAe,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,SAAS,OAAO;QACd,eAAe,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,SAAS,MAAM;QACb,eAAe,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,SAAS,KAAK;QACZ,eAAe,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,SAAS,OAAO;QACd,eAAe,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,SAAS,QAAQ,CAAC,KAAQ;QACxB,eAAe,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YACjC,GAAG,YAAY;YACf,KAAK,EAAE,IAAI;YACX,KAAK;SACN,CAAC,CAAC,CAAC;IACN,CAAC;IAED,SAAS,aAAa,CAAC,UAA6B;QAClD,eAAe,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,SAAS,KAAK;QACZ,eAAe,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YACjC,GAAG,YAAY;YACf,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,YAAY,CAAC,OAAO;YAC3B,OAAO,EAAE,KAAK;SACf,CAAC,CAAC,CAAC;IACN,CAAC;IAED,OAAO;QACL,GAAG,YAAY;QACf,IAAI;QACJ,OAAO;QACP,UAAU;QACV,MAAM;QACN,OAAO,EAAE,CAAC,YAAY,CAAC,QAAQ;QAC/B,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;QAChB,MAAM;QACN,KAAK;QACL,OAAO,EAAE,CAAC,KAAK;QACf,QAAQ,EAAE,CAAC,YAAY,CAAC,KAAK;QAC7B,KAAK;QACL,QAAQ;QACR,aAAa;QACb,KAAK;QACL,SAAS,EAAE,CAAC,YAAY,CAAC,OAAO;QAChC,OAAO;QACP,SAAS,EAAE,CAAC,YAAY,CAAC,OAAO;QAChC,KAAK;QACL,KAAK,EAAE,YAAY,CAAC,OAAO,IAAI,CAAC,KAAK;KACtC,CAAC;AACJ,CAAC;AAmBD,MAAM,UAAU,eAAe,CAC7B,OAAoC,EACpC,UAA6B;IAE7B,OAAO,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;AACzC,CAAC;AAaD,MAAM,UAAU,cAAc,CAC5B,OAAoC,EACpC,UAA6B;IAE7B,OAAO,UAAU,CAAc,OAAO,EAAE,UAAU,CAAC,CAAC;AACtD,CAAC;AAaD,MAAM,UAAU,eAAe,CAC7B,OAAoC,EACpC,UAA6B;IAE7B,OAAO,UAAU,CAAmB,OAAO,EAAE,UAAU,CAAC,CAAC;AAC3D,CAAC"}

package/dist/esm/form-group.hook.d.ts

@@ -1,4 +1,4 @@
-import { FormGroupProps, ValidatorGroupFn } from '@rolster/helpers-forms';
+import { FormGroupOptions, ValidatorGroupFn } from '@rolster/forms';
 import { ReactControls, ReactGroup } from './types';
-export declare function useFormGroup<T extends ReactControls>(props: FormGroupProps<T>): ReactGroup<T>;
-export declare function useFormGroup<T extends ReactControls>(controls: T, validators?: ValidatorGroupFn<T>[]): ReactGroup<T>;
+export declare function useFormGroup<C extends ReactControls>(options: FormGroupOptions<C>): ReactGroup<C>;
+export declare function useFormGroup<C extends ReactControls>(controls: C, validators?: ValidatorGroupFn<C>[]): ReactGroup<C>;

package/dist/esm/form-group.hook.js

@@ -1,20 +1,21 @@
-import { createFormGroupProps } from '@rolster/helpers-forms';
-import { controlsAllChecked, controlsPartialChecked, controlsToState, controlsToValue, groupIsValid } from '@rolster/helpers-forms/helpers';
+import { createFormGroupOptions } from '@rolster/forms/arguments';
+import { controlsAllChecked, controlsPartialChecked, controlsToState, groupIsValid } from '@rolster/forms/helpers';
 import { useState } from 'react';
-export function useFormGroup(groupProps, groupValidators) {
-    const props = createFormGroupProps(groupProps, groupValidators);
-    const [validators, setValidators] = useState(props.validators);
-    const { controls } = props;
-    const errors = (() => validators ? groupIsValid({ controls, validators }) : [])();
-    const valid = (() => errors.length === 0 && controlsAllChecked(controls, 'valid'))();
-    const touched = (() => controlsPartialChecked(controls, 'touched'))();
-    const toucheds = (() => controlsAllChecked(controls, 'touched'))();
-    const dirty = (() => controlsPartialChecked(controls, 'dirty'))();
-    const dirties = (() => controlsAllChecked(controls, 'dirty'))();
-    const state = (() => controlsToState(controls))();
-    const value = (() => controlsToValue(controls))();
+export function useFormGroup(options, groupValidators) {
+    const groupOptions = createFormGroupOptions(options, groupValidators);
+    const [validators, setValidators] = useState(groupOptions.validators);
+    const { controls } = groupOptions;
+    const errors = validators ? groupIsValid({ controls, validators }) : [];
+    const valid = errors.length === 0 && controlsAllChecked(controls, 'valid');
+    const state = controlsToState(controls);
+    const dirty = controlsPartialChecked(controls, 'dirty');
+    const dirties = controlsAllChecked(controls, 'dirty');
+    const touched = controlsPartialChecked(controls, 'touched');
+    const toucheds = controlsAllChecked(controls, 'touched');
     function reset() {
-        Object.values(controls).forEach((control) => control.reset());
+        Object.values(controls).forEach((control) => {
+            control.reset();
+        });
     }
     return {
         controls,
@@ -26,14 +27,13 @@ export function useFormGroup(groupProps, groupValidators) {
         pristine: !dirty,
         pristines: !dirties,
         reset,
-        state,
         setValidators,
+        state,
         touched,
         toucheds,
         untouched: !touched,
         untoucheds: !toucheds,
         valid,
-        value,
         wrong: touched && !valid
     };
 }

package/dist/esm/form-group.hook.js.map

@@ -1 +1 @@
-{"version":3,"file":"form-group.hook.js","sourceRoot":"","sources":["../../src/form-group.hook.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,eAAe,EACf,eAAe,EACf,YAAY,EACb,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAUjC,MAAM,UAAU,YAAY,CAC1B,UAAiC,EACjC,eAAuC;IAEvC,MAAM,KAAK,GAAG,oBAAoB,CAChC,UAAU,EACV,eAAe,CAChB,CAAC;IAEF,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAE/D,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAE3B,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,CACnB,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IAE9D,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,CAClB,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC;IAElE,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,CAAC,sBAAsB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC;IACtE,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC;IACnE,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,CAAC,sBAAsB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC;IAClE,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC;IAEhE,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;IAClD,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;IAElD,SAAS,KAAK;QACZ,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,OAAO;QACL,QAAQ;QACR,KAAK;QACL,OAAO;QACP,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;QAChB,MAAM;QACN,OAAO,EAAE,CAAC,KAAK;QACf,QAAQ,EAAE,CAAC,KAAK;QAChB,SAAS,EAAE,CAAC,OAAO;QACnB,KAAK;QACL,KAAK;QACL,aAAa;QACb,OAAO;QACP,QAAQ;QACR,SAAS,EAAE,CAAC,OAAO;QACnB,UAAU,EAAE,CAAC,QAAQ;QACrB,KAAK;QACL,KAAK;QACL,KAAK,EAAE,OAAO,IAAI,CAAC,KAAK;KACzB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"form-group.hook.js","sourceRoot":"","sources":["../../src/form-group.hook.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,eAAe,EACf,YAAY,EACb,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAUjC,MAAM,UAAU,YAAY,CAC1B,OAAgC,EAChC,eAAuC;IAEvC,MAAM,YAAY,GAAG,sBAAsB,CACzC,OAAO,EACP,eAAe,CAChB,CAAC;IAEF,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IAEtE,MAAM,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC;IAElC,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACxE,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC3E,MAAM,KAAK,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,sBAAsB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACtD,MAAM,OAAO,GAAG,sBAAsB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,kBAAkB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAEzD,SAAS,KAAK;QACZ,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC1C,OAAO,CAAC,KAAK,EAAE,CAAC;QAClB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,QAAQ;QACR,KAAK;QACL,OAAO;QACP,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;QAChB,MAAM;QACN,OAAO,EAAE,CAAC,KAAK;QACf,QAAQ,EAAE,CAAC,KAAK;QAChB,SAAS,EAAE,CAAC,OAAO;QACnB,KAAK;QACL,aAAa;QACb,KAAK;QACL,OAAO;QACP,QAAQ;QACR,SAAS,EAAE,CAAC,OAAO;QACnB,UAAU,EAAE,CAAC,QAAQ;QACrB,KAAK;QACL,KAAK,EAAE,OAAO,IAAI,CAAC,KAAK;KACzB,CAAC;AACJ,CAAC"}

package/dist/esm/form-ref.hook.d.ts

@@ -1,17 +1,17 @@
-import { FormControlProps, FormState } from '@rolster/helpers-forms';
+import { FormControlOptions } from '@rolster/forms';
 import { ValidatorFn } from '@rolster/validators';
 import { ReactInputControl } from './types';
-interface ReactRefProps<T = any> extends FormControlProps<T> {
-    setValue: (inputControl: ReactInputControl<T>, value: string) => void;
+interface ReactRefOptions<T = any> extends FormControlOptions<T> {
+    setValue: (control: ReactInputControl<T>, value: string) => void;
     touched?: boolean;
 }
-type InputRefProps<T = any> = Omit<ReactRefProps<T>, 'setValue'>;
-type TextRefProps = InputRefProps<string>;
-type NumberRefProps = InputRefProps<number>;
+type InputRefOptions<T = any> = Omit<ReactRefOptions<T>, 'setValue'>;
+type TextRefOptions = InputRefOptions<string>;
+type NumberRefOptions = InputRefOptions<number>;
 export declare function useTextRefControl(): ReactInputControl<string>;
-export declare function useTextRefControl(props: TextRefProps): ReactInputControl<string>;
-export declare function useTextRefControl(state: FormState<string>, validators?: ValidatorFn<string>[]): ReactInputControl<string>;
+export declare function useTextRefControl(options: TextRefOptions): ReactInputControl<string>;
+export declare function useTextRefControl(state: string, validators?: ValidatorFn<string>[]): ReactInputControl<string>;
 export declare function useNumberRefControl(): ReactInputControl<number>;
-export declare function useNumberRefControl(props: NumberRefProps): ReactInputControl<number>;
-export declare function useNumberRefControl(state: FormState<number>, validators?: ValidatorFn<number>[]): ReactInputControl<number>;
+export declare function useNumberRefControl(options: NumberRefOptions): ReactInputControl<number>;
+export declare function useNumberRefControl(state: number, validators?: ValidatorFn<number>[]): ReactInputControl<number>;
 export {};

package/dist/esm/form-ref.hook.js

@@ -1,36 +1,40 @@
-import { createFormControlProps } from '@rolster/helpers-forms';
+import { createFormControlOptions } from '@rolster/forms/arguments';
 import { useEffect } from 'react';
 import { useInputControl } from './form-control.hook';
-function useInputRefControl(props) {
-    const { setValue, state, validators } = props;
-    const inputControl = useInputControl(state, validators);
+function useInputRefControl(options) {
+    const { setValue, state, validators } = options;
+    const control = useInputControl(state, validators);
     useEffect(() => {
-        const { elementRef } = inputControl;
+        const { elementRef } = control;
         elementRef?.current?.addEventListener('focus', () => {
-            inputControl.focus();
+            control.focus();
         });
         elementRef?.current?.addEventListener('blur', () => {
-            inputControl.blur();
-            if (!inputControl.touched) {
-                inputControl.touch();
+            control.blur();
+            if (!control.touched) {
+                control.touch();
             }
         });
         elementRef?.current?.addEventListener('change', ({ target }) => {
-            setValue(inputControl, target.value);
+            setValue(control, target.value);
         });
     }, []);
-    return inputControl;
+    return control;
 }
-export function useTextRefControl(controlProps, controlValidators) {
+export function useTextRefControl(options, validators) {
     return useInputRefControl({
-        ...createFormControlProps(controlProps, controlValidators),
-        setValue: (inputControl, value) => inputControl.setState(value)
+        ...createFormControlOptions(options, validators),
+        setValue: (control, value) => {
+            control.setState(value);
+        }
     });
 }
-export function useNumberRefControl(controlProps, controlValidators) {
+export function useNumberRefControl(options, validators) {
     return useInputRefControl({
-        ...createFormControlProps(controlProps, controlValidators),
-        setValue: (inputControl, value) => inputControl.setState(+value)
+        ...createFormControlOptions(options, validators),
+        setValue: (control, value) => {
+            control.setState(+value);
+        }
     });
 }
 //# sourceMappingURL=form-ref.hook.js.map

package/dist/esm/form-ref.hook.js.map

@@ -1 +1 @@
-{"version":3,"file":"form-ref.hook.js","sourceRoot":"","sources":["../../src/form-ref.hook.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,sBAAsB,EACvB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAatD,SAAS,kBAAkB,CAAU,KAAuB;IAC1D,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IAE9C,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAExD,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC;QAEpC,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;YAClD,YAAY,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC,CAAC,CAAC;QAEH,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE;YACjD,YAAY,CAAC,IAAI,EAAE,CAAC;YAEpB,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;gBACzB,YAAY,CAAC,KAAK,EAAE,CAAC;aACtB;QACH,CAAC,CAAC,CAAC;QAEH,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;YAC7D,QAAQ,CAAC,YAAY,EAAG,MAA2B,CAAC,KAAK,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,YAAY,CAAC;AACtB,CAAC;AAUD,MAAM,UAAU,iBAAiB,CAC/B,YAA+C,EAC/C,iBAAyC;IAEzC,OAAO,kBAAkB,CAAC;QACxB,GAAG,sBAAsB,CACvB,YAAY,EACZ,iBAAiB,CAClB;QACD,QAAQ,EAAE,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC;KAChE,CAAC,CAAC;AACL,CAAC;AAUD,MAAM,UAAU,mBAAmB,CACjC,YAAiD,EACjD,iBAAyC;IAEzC,OAAO,kBAAkB,CAAC;QACxB,GAAG,sBAAsB,CACvB,YAAY,EACZ,iBAAiB,CAClB;QACD,QAAQ,EAAE,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC;KACjE,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"form-ref.hook.js","sourceRoot":"","sources":["../../src/form-ref.hook.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAYtD,SAAS,kBAAkB,CAAU,OAA2B;IAC9D,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAEhD,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAEnD,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QAE/B,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;YAClD,OAAO,CAAC,KAAK,EAAE,CAAC;QAClB,CAAC,CAAC,CAAC;QAEH,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE;YACjD,OAAO,CAAC,IAAI,EAAE,CAAC;YAEf,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;gBACpB,OAAO,CAAC,KAAK,EAAE,CAAC;aACjB;QACH,CAAC,CAAC,CAAC;QAEH,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;YAC7D,QAAQ,CAAC,OAAO,EAAG,MAA2B,CAAC,KAAK,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,OAAO,CAAC;AACjB,CAAC;AAUD,MAAM,UAAU,iBAAiB,CAC/B,OAAiC,EACjC,UAAkC;IAElC,OAAO,kBAAkB,CAAC;QACxB,GAAG,wBAAwB,CACzB,OAAO,EACP,UAAU,CACX;QACD,QAAQ,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;YAC3B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAUD,MAAM,UAAU,mBAAmB,CACjC,OAAmC,EACnC,UAAkC;IAElC,OAAO,kBAAkB,CAAC;QACxB,GAAG,wBAAwB,CACzB,OAAO,EACP,UAAU,CACX;QACD,QAAQ,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;YAC3B,OAAO,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}

package/dist/esm/index.d.ts

@@ -1,5 +1,4 @@
-export { cloneFormArrayControl, cloneFormArrayGroup, cloneFormControlForArrayGroup, useFormArray, useFormArrayControl, useFormArrayGroup, useInputArrayControl } from './form-array';
+export { useFormArray, useFormArrayControl, useFormArrayGroup, useInputArrayControl, useReactArrayControl } from './form-array';
 export { useFormControl, useInputControl, useReactControl } from './form-control.hook';
 export { useFormGroup } from './form-group.hook';
-export { useNumberRefControl, useTextRefControl } from './form-ref.hook';
-export { ReactArrayControl, ReactArrayControls, ReactArrayGroup, ReactArrayHtmlControl, ReactArrayInputControl, ReactControl, ReactControls, ReactFormArray, ReactFormControl, ReactGroup, ReactHtmlControl, ReactInputControl } from './types';
+export * from './types';

package/dist/esm/index.js

@@ -1,5 +1,5 @@
-export { cloneFormArrayControl, cloneFormArrayGroup, cloneFormControlForArrayGroup, useFormArray, useFormArrayControl, useFormArrayGroup, useInputArrayControl } from './form-array';
+export { useFormArray, useFormArrayControl, useFormArrayGroup, useInputArrayControl, useReactArrayControl } from './form-array';
 export { useFormControl, useInputControl, useReactControl } from './form-control.hook';
 export { useFormGroup } from './form-group.hook';
-export { useNumberRefControl, useTextRefControl } from './form-ref.hook';
+export * from './types';
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,6BAA6B,EAC7B,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,cAAc,EACd,eAAe,EACf,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EACjB,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,cAAc,EACd,eAAe,EACf,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,cAAc,SAAS,CAAC"}