@juantroconisf/lib 11.6.0 → 11.7.0

package/dist/index.mjs

@@ -18,11 +18,13 @@ function handleNestedChange({
   value,
   hasNestedValues = false
 }) {
-  if (!hasNestedValues) return { ...state, [id]: value };
-  const propertyDepth = String(id).split("."), newValues = { ...state };
-  let current = newValues;
-  for (let i = 0; i < propertyDepth.length - 1; i++) {
-    const key = propertyDepth[i];
+  const isNested = hasNestedValues || String(id).includes(".");
+  if (!isNested) return { ...state, [id]: value };
+  const keys = String(id).split(".");
+  const newState = { ...state };
+  let current = newState;
+  for (let i = 0; i < keys.length - 1; i++) {
+    const key = keys[i];
     if (Array.isArray(current[key])) {
       current[key] = [...current[key]];
     } else {
@@ -30,8 +32,8 @@ function handleNestedChange({
     }
     current = current[key];
   }
-  current[propertyDepth[propertyDepth.length - 1]] = value;
-  return { ...newValues };
+  current[keys[keys.length - 1]] = value;
+  return newState;
 }
 function handleArrayItemChange({
   state,
@@ -72,21 +74,6 @@ function removeCompositeKeysByPrefix(map, prefix) {
   }
   return result;
 }
-function setNestedValue(state, dotPath, value) {
-  const keys = dotPath.split(".");
-  const copy = { ...state };
-  let current = copy;
-  for (let i = 0; i < keys.length - 1; i++) {
-    if (Array.isArray(current[keys[i]])) {
-      current[keys[i]] = [...current[keys[i]]];
-    } else {
-      current[keys[i]] = { ...current[keys[i]] };
-    }
-    current = current[keys[i]];
-  }
-  current[keys[keys.length - 1]] = value;
-  return copy;
-}
 
 // src/hooks/useForm.tsx
 import { Form } from "@heroui/react";
@@ -381,7 +368,7 @@ function useForm(schema, {
   }, [schema]);
   const [state, setState] = useState(initialState), [metadata, setMetadata] = useState(/* @__PURE__ */ new Map());
   useComponentLanguage();
-  const stateRef = useRef(state), metadataRef = useRef(metadata);
+  const stateRef = useRef(state), metadataRef = useRef(metadata), propsCache = useRef(/* @__PURE__ */ new Map());
   stateRef.current = state;
   metadataRef.current = metadata;
   const indexMap = useMemo(() => {
@@ -442,14 +429,7 @@ function useForm(schema, {
   const runValidation = useCallback(
     (ruleDef, value, compositeKey, realPath, fullState) => {
       if (isSchema(ruleDef)) {
-        try {
-          if (validationSchema && realPath && fullState !== void 0) {
-            validationSchema.validateSyncAt(realPath, fullState);
-          } else {
-            ruleDef.validateSync(value);
-          }
-          return false;
-        } catch (err) {
+        const updateMetadata = (err) => {
           const error = {
             isInvalid: true,
             errorMessage: err.message || "Invalid"
@@ -464,7 +444,32 @@ function useForm(schema, {
             newMap.set(compositeKey, { ...currentMeta, ...error });
             return newMap;
           });
-          return true;
+        };
+        try {
+          if (validationSchema && realPath && fullState !== void 0) {
+            validationSchema.validateSyncAt(realPath, fullState);
+          } else {
+            ruleDef.validateSync(value);
+          }
+          return false;
+        } catch (err) {
+          if (err.name === "ValidationError") {
+            updateMetadata(err);
+            return true;
+          }
+          return (async () => {
+            try {
+              if (validationSchema && realPath && fullState !== void 0) {
+                await validationSchema.validateAt(realPath, fullState);
+              } else {
+                await ruleDef.validate(value);
+              }
+              return false;
+            } catch (asyncErr) {
+              updateMetadata(asyncErr);
+              return true;
+            }
+          })();
         }
       }
       return false;
@@ -475,35 +480,46 @@ function useForm(schema, {
     (compositeKey, fieldPath, realPath, value, fullState) => {
       let schemaRule = getRule(fieldPath, validationSchema);
       if (schemaRule) {
-        if (runValidation(schemaRule, value, compositeKey, realPath, fullState))
-          return true;
+        const result = runValidation(
+          schemaRule,
+          value,
+          compositeKey,
+          realPath,
+          fullState
+        );
+        if (result === true) return true;
+        if (result instanceof Promise) {
+          return result.then((res) => {
+            if (!res) clearError();
+            return res;
+          });
+        }
       }
-      setMetadata((prev) => {
-        const newMap = new Map(prev);
-        const currentMeta = newMap.get(compositeKey) || {
-          isTouched: false,
-          isInvalid: false,
-          errorMessage: ""
-        };
-        newMap.set(compositeKey, {
-          ...currentMeta,
-          isInvalid: false,
-          errorMessage: ""
+      function clearError() {
+        setMetadata((prev) => {
+          const newMap = new Map(prev);
+          const currentMeta = newMap.get(compositeKey) || {
+            isTouched: false,
+            isInvalid: false,
+            errorMessage: ""
+          };
+          newMap.set(compositeKey, {
+            ...currentMeta,
+            isInvalid: false,
+            errorMessage: ""
+          });
+          return newMap;
         });
-        return newMap;
-      });
+      }
+      clearError();
       return false;
     },
     [getRule, runValidation, validationSchema]
   );
   const validateAll = useCallback(() => {
     if (!validationSchema) return false;
-    let hasError = false;
     const newMetadata = new Map(metadataRef.current);
-    try {
-      validationSchema.validateSync(state, { abortEarly: false });
-    } catch (err) {
-      hasError = true;
+    const handleErrors = (err) => {
       if (err.inner) {
         err.inner.forEach((validationError) => {
           const yupPath = validationError.path;
@@ -544,9 +560,26 @@ function useForm(schema, {
           });
         });
       }
+      setMetadata(newMetadata);
+      return true;
+    };
+    try {
+      validationSchema.validateSync(state, { abortEarly: false });
+    } catch (err) {
+      if (err.name === "ValidationError") {
+        return handleErrors(err);
+      }
+      return (async () => {
+        try {
+          await validationSchema.validate(state, { abortEarly: false });
+          return false;
+        } catch (asyncErr) {
+          return handleErrors(asyncErr);
+        }
+      })();
     }
     setMetadata(newMetadata);
-    return hasError;
+    return false;
   }, [validationSchema, state, arrayIdentifiers]);
   const handleFieldChange = useCallback(
     (resolution, newValue) => {
@@ -631,7 +664,12 @@ function useForm(schema, {
           nextState = { ...nextState, [parentKey]: parentArr };
         }
       } else if (type === "deep" /* Deep */) {
-        nextState = setNestedValue(nextState, resolution.realPath, finalValue);
+        nextState = handleNestedChange({
+          state: nextState,
+          id: resolution.realPath,
+          value: finalValue,
+          hasNestedValues: true
+        });
       }
       setState(nextState);
       validateField(
@@ -687,8 +725,8 @@ function useForm(schema, {
     [validateField, getRule, validationSchema]
   );
   const on = useMemo(
-    () => ({
-      input: (...args) => {
+    () => {
+      const getCachedProps = (method, args, factory) => {
         const data = resolveFieldData(
           args,
           stateRef.current,
@@ -698,117 +736,78 @@ function useForm(schema, {
           validationSchema
         );
         if (!data) return {};
-        return {
+        const meta = metadataRef.current.get(data.compositeKey);
+        const deps = JSON.stringify([
+          data.value,
+          meta?.isInvalid,
+          meta?.errorMessage,
+          meta?.isTouched
+        ]);
+        const cacheKey = `${method}:${JSON.stringify(args)}`;
+        const cached = propsCache.current.get(cacheKey);
+        if (cached && cached.deps === deps) {
+          return cached.props;
+        }
+        const props = factory(data);
+        propsCache.current.set(cacheKey, { props, deps });
+        return props;
+      };
+      return {
+        input: (...args) => getCachedProps("input", args, (data) => ({
           ...createHandlers(data),
           value: data.value === null || data.value === void 0 ? "" : typeof data.value === "boolean" ? data.value : String(data.value),
           onValueChange: (v) => handleFieldChange(data, v)
-        };
-      },
-      select: (...args) => {
-        const data = resolveFieldData(
-          args,
-          stateRef.current,
-          getIndex,
-          getNestedValue,
-          getRule,
-          validationSchema
-        );
-        if (!data) return {};
-        const isArray = Array.isArray(data.value);
-        return {
-          ...createHandlers(data),
-          selectedKeys: data.value === null || data.value === void 0 ? [] : isArray ? data.value.map(String) : [String(data.value)],
-          onSelectionChange: (v) => {
-            const fixed = typeof v === "string" || v === null ? v : isArray ? Array.from(v) : Array.from(v)[0] ?? null;
-            handleFieldChange(data, fixed);
-          }
-        };
-      },
-      autocomplete: (...args) => {
-        const data = resolveFieldData(
-          args,
-          stateRef.current,
-          getIndex,
-          getNestedValue,
-          getRule,
-          validationSchema
-        );
-        if (!data) return {};
-        return {
+        })),
+        select: (...args) => getCachedProps("select", args, (data) => {
+          const isArray = Array.isArray(data.value);
+          return {
+            ...createHandlers(data),
+            selectedKeys: data.value === null || data.value === void 0 ? [] : isArray ? data.value.map(String) : [String(data.value)],
+            onSelectionChange: (v) => {
+              const fixed = typeof v === "string" || v === null ? v : isArray ? Array.from(v) : Array.from(v)[0] ?? null;
+              handleFieldChange(data, fixed);
+            }
+          };
+        }),
+        autocomplete: (...args) => getCachedProps("autocomplete", args, (data) => ({
           ...createHandlers(data),
           selectedKey: data.value === null || data.value === void 0 ? null : String(data.value),
           onSelectionChange: (v) => {
             const fixed = typeof v === "string" || v === null || v === void 0 ? v : String(v);
             handleFieldChange(data, fixed);
           }
-        };
-      },
-      numberInput: (...args) => {
-        const data = resolveFieldData(
-          args,
-          stateRef.current,
-          getIndex,
-          getNestedValue,
-          getRule,
-          validationSchema
-        );
-        if (!data) return {};
-        return {
+        })),
+        numberInput: (...args) => getCachedProps("numberInput", args, (data) => ({
           ...createHandlers(data),
           value: data.value === null || data.value === void 0 ? "" : String(data.value),
           onValueChange: (v) => handleFieldChange(data, v)
-        };
-      },
-      checkbox: (...args) => {
-        const data = resolveFieldData(
-          args,
-          stateRef.current,
-          getIndex,
-          getNestedValue,
-          getRule,
-          validationSchema
-        );
-        if (!data) return {};
-        return {
+        })),
+        checkbox: (...args) => getCachedProps("checkbox", args, (data) => ({
           ...createHandlers(data),
           isSelected: Boolean(data.value),
           onValueChange: (v) => handleFieldChange(data, v)
-        };
-      },
-      switch: (...args) => {
-        const data = resolveFieldData(
-          args,
-          stateRef.current,
-          getIndex,
-          getNestedValue,
-          getRule,
-          validationSchema
-        );
-        if (!data) return {};
-        return {
+        })),
+        switch: (...args) => getCachedProps("switch", args, (data) => ({
           ...createHandlers(data),
           isSelected: Boolean(data.value),
           onValueChange: (v) => handleFieldChange(data, v)
-        };
-      },
-      radio: (...args) => {
-        const data = resolveFieldData(
-          args,
-          stateRef.current,
-          getIndex,
-          getNestedValue,
-          getRule,
-          validationSchema
-        );
-        if (!data) return {};
-        return {
+        })),
+        radio: (...args) => getCachedProps("radio", args, (data) => ({
           ...createHandlers(data),
           value: data.value === null || data.value === void 0 ? "" : String(data.value),
           onValueChange: (v) => handleFieldChange(data, v)
-        };
-      }
-    }),
-    [createHandlers, getIndex, handleFieldChange, getRule, validationSchema]
+        }))
+      };
+    },
+    [
+      createHandlers,
+      getIndex,
+      handleFieldChange,
+      getRule,
+      validationSchema,
+      state,
+      metadata
+    ]
   );
   const helpers = useMemo(
     () => ({
@@ -925,7 +924,7 @@ function useForm(schema, {
         return getNestedValue(stateRef.current, arrayKey)[index];
       }
     }),
-    [getIndex, arrayIdentifiers]
+    [getIndex, arrayIdentifiers, state, metadata]
   );
   const onBlur = useCallback(
     (id) => {
@@ -1009,9 +1008,9 @@ function useForm(schema, {
     [getIndex, handleFieldChange, getRule, validationSchema]
   );
   const onFormSubmit = useCallback(
-    (fn) => (e) => {
+    (fn) => async (e) => {
       e.preventDefault();
-      if (validateAll()) return;
+      if (await validateAll()) return;
       fn(stateRef.current, e);
     },
     [validateAll]
@@ -1044,9 +1043,9 @@ function useForm(schema, {
   const ControlledForm = useMemo(() => {
     return (props) => {
       const { onSubmit, ...rest } = props;
-      const handleSubmit = (e) => {
+      const handleSubmit = async (e) => {
         e.preventDefault();
-        if (validateAllRef.current()) {
+        if (await validateAllRef.current()) {
           return;
         }
         onFormSubmitPropRef.current?.(stateRef.current, e);

package/package.json

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