@juantroconisf/lib 6.0.0 → 6.1.0

package/dist/index.d.mts

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

package/dist/index.d.ts

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

package/dist/index.js

@@ -219,13 +219,7 @@ function useValidate() {
 }
 
 // src/hooks/useForm.tsx
-function useForm(initialState, {
-  rules,
-  messages,
-  arrayRules,
-  arrayMessages,
-  arrayIdentifiers
-} = {}) {
+function useForm(initialState, { rules, messages, arrayIdentifiers } = {}) {
   const [state, setState] = (0, import_react.useState)(initialState), [touched, setTouched] = (0, import_react.useState)(/* @__PURE__ */ new Map()), [errors2, setErrors] = (0, import_react.useState)(/* @__PURE__ */ new Map()), { performValidations } = useValidate();
   const indexMap = (0, import_react.useMemo)(() => {
     const map2 = /* @__PURE__ */ new Map();
@@ -252,12 +246,21 @@ function useForm(initialState, {
     },
     [indexMap]
   );
+  const getRule = (path) => {
+    if (rules?.[path]) return rules[path];
+    const genericPath = path.replace(/\.\d+\./g, ".").replace(/\.\d+$/, "");
+    return rules?.[genericPath];
+  };
+  const getMessage = (path) => {
+    if (messages?.[path]) return messages[path];
+    const genericPath = path.replace(/\.\d+\./g, ".").replace(/\.\d+$/, "");
+    return messages?.[genericPath];
+  };
   const validateInput = (compositeKey, value, ruleKey) => {
-    const error = performValidations(
-      value,
-      rules?.[ruleKey],
-      messages?.[ruleKey]
-    );
+    const ruleDef = getRule(ruleKey);
+    const rule = typeof ruleDef === "function" ? ruleDef(value, state) : ruleDef;
+    const message = getMessage(ruleKey);
+    const error = performValidations(value, rule, message);
     setErrors((prev) => new Map(prev).set(compositeKey, error));
   };
   const getUXProps = (0, import_react.useCallback)(
@@ -272,14 +275,14 @@ function useForm(initialState, {
     [errors2, touched]
   );
   const onBlur = (id) => {
-    validateInput(String(id), state[id], id);
+    validateInput(String(id), state[id], String(id));
     if (touched.get(String(id))) return;
     setTouched((prev) => new Map(prev).set(String(id), true));
   }, onValueChange = ((...args) => {
     if (args.length === 2) {
       const [id, value] = args;
       setState((prev) => handleNestedChange({ state: prev, id, value }));
-      validateInput(String(id), value, id);
+      validateInput(String(id), value, String(id));
       return;
     }
     if (args.length === 3) {
@@ -325,7 +328,7 @@ function useForm(initialState, {
         value: fixedValue
       })
     );
-    validateInput(String(id), fixedValue, id);
+    validateInput(String(id), fixedValue, String(id));
   };
   const getItemCompositeKey = (arrayKey, itemId, field) => `${arrayKey}.${itemId}.${field}`;
   const getPrimitiveCompositeKey = (arrayKey, index) => `${arrayKey}.@${index}`;
@@ -333,16 +336,20 @@ function useForm(initialState, {
   const validateItemInput = (arrayKey, itemId, field, value) => {
     const index = getIndex(String(arrayKey), itemId);
     if (index === void 0) return;
-    const arrayRuleDef = arrayRules?.[arrayKey]?.[field];
     const item = state[arrayKey][index];
-    const fieldRules = typeof arrayRuleDef === "function" ? arrayRuleDef(item, index) : arrayRuleDef;
-    const fieldMessages = arrayMessages?.[arrayKey]?.[field];
     const compositeKey = getItemCompositeKey(String(arrayKey), itemId, field);
+    let genericField = field.replace(/\.@\d+/, "");
+    if (genericField === "")
+      genericField = String(arrayKey);
+    else genericField = `${String(arrayKey)}.${genericField}`;
+    let effectivePath = `${String(arrayKey)}.${field}`;
+    if (field === "") effectivePath = String(arrayKey);
+    effectivePath = effectivePath.replace(/\.@\d+/g, "").replace(/\.@\d+$/, "");
+    const ruleDef = getRule(effectivePath);
+    const rule = typeof ruleDef === "function" ? ruleDef(value, state, item, index) : ruleDef;
+    const message = getMessage(effectivePath);
     setErrors(
-      (prev) => new Map(prev).set(
-        compositeKey,
-        performValidations(value, fieldRules, fieldMessages)
-      )
+      (prev) => new Map(prev).set(compositeKey, performValidations(value, rule, message))
     );
   };
   const getItemUXProps = (0, import_react.useCallback)(
@@ -394,12 +401,11 @@ function useForm(initialState, {
     validateItemInput(arrayKey, itemId, field, fixedValue);
   };
   const validateNestedInput = (dotPath, value) => {
-    const topKey = dotPath.split(".")[0];
+    const ruleDef = getRule(dotPath);
+    const rule = typeof ruleDef === "function" ? ruleDef(value, state) : ruleDef;
+    const message = getMessage(dotPath);
     setErrors(
-      (prev) => new Map(prev).set(
-        dotPath,
-        performValidations(value, rules?.[topKey], messages?.[topKey])
-      )
+      (prev) => new Map(prev).set(dotPath, performValidations(value, rule, message))
     );
   };
   const onNestedBlur = (dotPath) => {

package/dist/index.mjs

@@ -200,13 +200,7 @@ function useValidate() {
 }
 
 // src/hooks/useForm.tsx
-function useForm(initialState, {
-  rules,
-  messages,
-  arrayRules,
-  arrayMessages,
-  arrayIdentifiers
-} = {}) {
+function useForm(initialState, { rules, messages, arrayIdentifiers } = {}) {
   const [state, setState] = useState(initialState), [touched, setTouched] = useState(/* @__PURE__ */ new Map()), [errors2, setErrors] = useState(/* @__PURE__ */ new Map()), { performValidations } = useValidate();
   const indexMap = useMemo(() => {
     const map2 = /* @__PURE__ */ new Map();
@@ -233,12 +227,21 @@ function useForm(initialState, {
     },
     [indexMap]
   );
+  const getRule = (path) => {
+    if (rules?.[path]) return rules[path];
+    const genericPath = path.replace(/\.\d+\./g, ".").replace(/\.\d+$/, "");
+    return rules?.[genericPath];
+  };
+  const getMessage = (path) => {
+    if (messages?.[path]) return messages[path];
+    const genericPath = path.replace(/\.\d+\./g, ".").replace(/\.\d+$/, "");
+    return messages?.[genericPath];
+  };
   const validateInput = (compositeKey, value, ruleKey) => {
-    const error = performValidations(
-      value,
-      rules?.[ruleKey],
-      messages?.[ruleKey]
-    );
+    const ruleDef = getRule(ruleKey);
+    const rule = typeof ruleDef === "function" ? ruleDef(value, state) : ruleDef;
+    const message = getMessage(ruleKey);
+    const error = performValidations(value, rule, message);
     setErrors((prev) => new Map(prev).set(compositeKey, error));
   };
   const getUXProps = useCallback(
@@ -253,14 +256,14 @@ function useForm(initialState, {
     [errors2, touched]
   );
   const onBlur = (id) => {
-    validateInput(String(id), state[id], id);
+    validateInput(String(id), state[id], String(id));
     if (touched.get(String(id))) return;
     setTouched((prev) => new Map(prev).set(String(id), true));
   }, onValueChange = ((...args) => {
     if (args.length === 2) {
       const [id, value] = args;
       setState((prev) => handleNestedChange({ state: prev, id, value }));
-      validateInput(String(id), value, id);
+      validateInput(String(id), value, String(id));
       return;
     }
     if (args.length === 3) {
@@ -306,7 +309,7 @@ function useForm(initialState, {
         value: fixedValue
       })
     );
-    validateInput(String(id), fixedValue, id);
+    validateInput(String(id), fixedValue, String(id));
   };
   const getItemCompositeKey = (arrayKey, itemId, field) => `${arrayKey}.${itemId}.${field}`;
   const getPrimitiveCompositeKey = (arrayKey, index) => `${arrayKey}.@${index}`;
@@ -314,16 +317,20 @@ function useForm(initialState, {
   const validateItemInput = (arrayKey, itemId, field, value) => {
     const index = getIndex(String(arrayKey), itemId);
     if (index === void 0) return;
-    const arrayRuleDef = arrayRules?.[arrayKey]?.[field];
     const item = state[arrayKey][index];
-    const fieldRules = typeof arrayRuleDef === "function" ? arrayRuleDef(item, index) : arrayRuleDef;
-    const fieldMessages = arrayMessages?.[arrayKey]?.[field];
     const compositeKey = getItemCompositeKey(String(arrayKey), itemId, field);
+    let genericField = field.replace(/\.@\d+/, "");
+    if (genericField === "")
+      genericField = String(arrayKey);
+    else genericField = `${String(arrayKey)}.${genericField}`;
+    let effectivePath = `${String(arrayKey)}.${field}`;
+    if (field === "") effectivePath = String(arrayKey);
+    effectivePath = effectivePath.replace(/\.@\d+/g, "").replace(/\.@\d+$/, "");
+    const ruleDef = getRule(effectivePath);
+    const rule = typeof ruleDef === "function" ? ruleDef(value, state, item, index) : ruleDef;
+    const message = getMessage(effectivePath);
     setErrors(
-      (prev) => new Map(prev).set(
-        compositeKey,
-        performValidations(value, fieldRules, fieldMessages)
-      )
+      (prev) => new Map(prev).set(compositeKey, performValidations(value, rule, message))
     );
   };
   const getItemUXProps = useCallback(
@@ -375,12 +382,11 @@ function useForm(initialState, {
     validateItemInput(arrayKey, itemId, field, fixedValue);
   };
   const validateNestedInput = (dotPath, value) => {
-    const topKey = dotPath.split(".")[0];
+    const ruleDef = getRule(dotPath);
+    const rule = typeof ruleDef === "function" ? ruleDef(value, state) : ruleDef;
+    const message = getMessage(dotPath);
     setErrors(
-      (prev) => new Map(prev).set(
-        dotPath,
-        performValidations(value, rules?.[topKey], messages?.[topKey])
-      )
+      (prev) => new Map(prev).set(dotPath, performValidations(value, rule, message))
     );
   };
   const onNestedBlur = (dotPath) => {

package/package.json

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