@volverjs/form-vue 1.0.0-beta.13 → 1.0.0-beta.15

package/dist/index.es.js

@@ -1,78 +1,78 @@
-import { defineComponent as R, inject as B, toRefs as H, computed as w, onMounted as P, watch as I, onBeforeUnmount as F, unref as C, provide as M, readonly as E, resolveComponent as S, defineAsyncComponent as ee, h as O, ref as $, toRaw as A, isProxy as re, withModifiers as te, getCurrentInstance as ae } from "vue";
-import { watchIgnorable as ne, throttleFilter as ue } from "@vueuse/core";
-import { ZodObject as z, ZodDefault as le, ZodNullable as ie, ZodSchema as se, ZodArray as fe, ZodEffects as oe, ZodOptional as de } from "zod";
-function Z(e) {
+import { defineComponent as z, inject as $, toRefs as P, computed as w, onMounted as Q, watch as S, onBeforeUnmount as re, unref as C, provide as M, readonly as E, resolveComponent as I, defineAsyncComponent as te, h as k, ref as _, toRaw as A, isProxy as ae, withModifiers as ne, getCurrentInstance as ue } from "vue";
+import { watchIgnorable as le, throttleFilter as ie } from "@vueuse/core";
+import { ZodObject as G, ZodDefault as se, ZodNullable as fe, ZodSchema as oe, ZodArray as de, ZodRecord as ve, ZodEffects as q, ZodOptional as T } from "zod";
+function J(e) {
   return Array.isArray(e);
 }
-function ve(e) {
+function ce(e) {
   return typeof e < "u";
 }
-function q(e) {
+function H(e) {
   return e === null;
 }
-function Q(e) {
+function X(e) {
   return typeof e == "object";
 }
-function X(e) {
+function Y(e) {
   return typeof e == "string";
 }
-function G(e) {
+function L(e) {
   return typeof e > "u";
 }
-const ce = /^[0-9]+$/, me = ["__proto__", "prototype", "constructor"];
+const me = /^[0-9]+$/, he = ["__proto__", "prototype", "constructor"];
 function K(e, i, a) {
-  const f = ve(a) ? a : void 0;
-  if (!Q(e) || !X(i))
+  const f = ce(a) ? a : void 0;
+  if (!X(e) || !Y(i))
     return f;
-  const u = T(i);
+  const u = j(i);
   if (u.length !== 0) {
-    for (const r of u) {
-      if (r === "*")
+    for (const t of u) {
+      if (t === "*")
         continue;
       const l = function(n) {
-        return n.map((t) => G(t) || q(t) ? t : Z(t) ? l(t) : t[r]);
+        return n.map((r) => L(r) || H(r) ? r : J(r) ? l(r) : r[t]);
       };
-      if (Z(e) && !ce.test(r) ? e = l(e) : e = e[r], G(e) || q(e))
+      if (J(e) && !me.test(t) ? e = l(e) : e = e[t], L(e) || H(e))
         break;
     }
-    return G(e) ? f : e;
+    return L(e) ? f : e;
   }
 }
-function Y(e, i, a) {
-  if (!Q(e) || !X(i))
+function D(e, i, a) {
+  if (!X(e) || !Y(i))
     return;
-  const f = T(i);
+  const f = j(i);
   if (f.length === 0)
     return;
   const u = f.length;
-  for (let r = 0; r < u; r++) {
-    const l = f[r];
-    if (r === u - 1) {
+  for (let t = 0; t < u; t++) {
+    const l = f[t];
+    if (t === u - 1) {
       e[l] = a;
       return;
     }
-    if (l === "*" && Z(e)) {
-      const n = f.slice(r + 1).join(".");
-      for (const t of e)
-        Y(t, n, a);
+    if (l === "*" && J(e)) {
+      const n = f.slice(t + 1).join(".");
+      for (const r of e)
+        D(r, n, a);
       return;
     }
-    G(e[l]) && (e[l] = {}), e = e[l];
+    L(e[l]) && (e[l] = {}), e = e[l];
   }
 }
-function T(e) {
+function j(e) {
   const i = e.split(/[.]|(?:\[(\d|\*)\])/).filter((a) => !!a);
-  return i.some((a) => me.indexOf(a) !== -1) ? [] : i;
+  return i.some((a) => he.indexOf(a) !== -1) ? [] : i;
 }
-var o = /* @__PURE__ */ ((e) => (e.text = "text", e.number = "number", e.email = "email", e.password = "password", e.tel = "tel", e.url = "url", e.search = "search", e.date = "date", e.time = "time", e.datetimeLocal = "datetime-local", e.month = "month", e.week = "week", e.color = "color", e.select = "select", e.checkbox = "checkbox", e.radio = "radio", e.textarea = "textarea", e.radioGroup = "radioGroup", e.checkboxGroup = "checkboxGroup", e.combobox = "combobox", e.custom = "custom", e))(o || {}), p = /* @__PURE__ */ ((e) => (e.invalid = "invalid", e.valid = "valid", e.submitting = "submitting", e.updated = "updated", e.unknown = "unknown", e))(p || {});
-function he(e, i, a, f) {
-  return R({
+var d = /* @__PURE__ */ ((e) => (e.text = "text", e.number = "number", e.email = "email", e.password = "password", e.tel = "tel", e.url = "url", e.search = "search", e.date = "date", e.time = "time", e.datetimeLocal = "datetime-local", e.month = "month", e.week = "week", e.color = "color", e.select = "select", e.checkbox = "checkbox", e.radio = "radio", e.textarea = "textarea", e.radioGroup = "radioGroup", e.checkboxGroup = "checkboxGroup", e.combobox = "combobox", e.custom = "custom", e))(d || {}), x = /* @__PURE__ */ ((e) => (e.invalid = "invalid", e.valid = "valid", e.submitting = "submitting", e.updated = "updated", e.unknown = "unknown", e))(x || {});
+function ye(e, i, a, f) {
+  return z({
     name: "VvFormField",
     props: {
       type: {
         type: String,
-        validator: (u) => Object.values(o).includes(u),
-        default: o.custom
+        validator: (u) => Object.values(d).includes(u),
+        default: d.custom
       },
       is: {
         type: [Object, String],
@@ -105,140 +105,140 @@ function he(e, i, a, f) {
     },
     emits: ["invalid", "valid", "update:formData", "update:modelValue"],
     expose: ["invalid", "invalidLabel", "errors"],
-    setup(u, { slots: r, emit: l }) {
-      const n = B(i, void 0);
+    setup(u, { slots: t, emit: l }) {
+      const n = $(i, void 0);
       n && n.fields.value.add(u.name);
-      const t = B(e), { props: b, name: d } = H(u), c = w({
+      const r = $(e), { props: g, name: o } = P(u), c = w({
         get() {
-          if (t != null && t.formData)
+          if (r != null && r.formData)
             return K(
-              Object(t.formData.value),
+              Object(r.formData.value),
               String(u.name)
             );
         },
         set(s) {
-          t != null && t.formData && (Y(
-            Object(t.formData.value),
+          r != null && r.formData && (D(
+            Object(r.formData.value),
             String(u.name),
             s
           ), l("update:modelValue", {
             newValue: c.value,
-            formData: t == null ? void 0 : t.formData
+            formData: r == null ? void 0 : r.formData
           }));
         }
       });
-      P(() => {
+      Q(() => {
         c.value === void 0 && u.defaultValue !== void 0 && (c.value = u.defaultValue);
       });
-      const g = w(() => {
-        if (t != null && t.errors.value)
-          return K(t.errors.value, String(u.name));
-      }), V = w(() => {
+      const m = w(() => {
+        if (r != null && r.errors.value)
+          return K(r.errors.value, String(u.name));
+      }), h = w(() => {
         var s;
-        return (s = g.value) == null ? void 0 : s._errors;
-      }), v = w(() => g.value !== void 0), h = I(v, () => {
-        v.value ? (l("invalid", V.value), n && n.errors.value.set(
+        return (s = m.value) == null ? void 0 : s._errors;
+      }), v = w(() => m.value !== void 0), b = S(v, () => {
+        v.value ? (l("invalid", h.value), n && n.errors.value.set(
           u.name,
           {
-            _errors: V.value
+            _errors: h.value
           }
         )) : (l("valid", c.value), n && n.errors.value.delete(
           u.name
         ));
-      }), m = I(
-        () => t == null ? void 0 : t.formData,
+      }), y = S(
+        () => r == null ? void 0 : r.formData,
         () => {
-          l("update:formData", t == null ? void 0 : t.formData);
+          l("update:formData", r == null ? void 0 : r.formData);
         },
         { deep: !0 }
       );
-      F(() => {
-        h(), m();
+      re(() => {
+        b(), y();
       });
-      const y = (s) => {
+      const V = (s) => {
         c.value = s;
-      }, x = w(() => {
-        let s = b.value;
-        return typeof s == "function" && (s = s(t == null ? void 0 : t.formData)), Object.keys(s).reduce(
-          (_, k) => (_[k] = C(s[k]), _),
+      }, p = w(() => {
+        let s = g.value;
+        return typeof s == "function" && (s = s(r == null ? void 0 : r.formData)), Object.keys(s).reduce(
+          (N, O) => (N[O] = C(s[O]), N),
           {}
         );
-      }), W = w(() => t != null && t.readonly.value ? !0 : x.value.readonly ?? u.readonly), U = w(() => ({
-        ...x.value,
-        name: x.value.name ?? u.name,
+      }), W = w(() => r != null && r.readonly.value ? !0 : p.value.readonly ?? u.readonly), U = w(() => ({
+        ...p.value,
+        name: p.value.name ?? u.name,
         invalid: v.value,
         valid: u.showValid ? !!(!v.value && c.value) : void 0,
         type: ((s) => {
           if ([
-            o.text,
-            o.number,
-            o.email,
-            o.password,
-            o.tel,
-            o.url,
-            o.search,
-            o.date,
-            o.time,
-            o.datetimeLocal,
-            o.month,
-            o.week,
-            o.color
+            d.text,
+            d.number,
+            d.email,
+            d.password,
+            d.tel,
+            d.url,
+            d.search,
+            d.date,
+            d.time,
+            d.datetimeLocal,
+            d.month,
+            d.week,
+            d.color
           ].includes(s))
             return s;
         })(u.type),
-        invalidLabel: V.value,
+        invalidLabel: h.value,
         modelValue: c.value,
         readonly: W.value,
-        "onUpdate:modelValue": y
+        "onUpdate:modelValue": V
       }));
       return M(a, {
-        name: E(d),
-        errors: E(g)
+        name: E(o),
+        errors: E(m)
       }), { component: w(() => {
-        if (u.type === o.custom)
+        if (u.type === d.custom)
           return {
             render() {
               var s;
-              return ((s = r.default) == null ? void 0 : s.call(r, {
+              return ((s = t.default) == null ? void 0 : s.call(t, {
                 modelValue: c.value,
-                onUpdate: y,
-                submit: t == null ? void 0 : t.submit,
-                validate: t == null ? void 0 : t.validate,
+                onUpdate: V,
+                submit: r == null ? void 0 : r.submit,
+                validate: r == null ? void 0 : r.validate,
                 invalid: v.value,
-                invalidLabel: V.value,
-                formData: t == null ? void 0 : t.formData.value,
-                formErrors: t == null ? void 0 : t.errors.value,
-                errors: g.value,
+                invalidLabel: h.value,
+                formData: r == null ? void 0 : r.formData.value,
+                formErrors: r == null ? void 0 : r.errors.value,
+                errors: m.value,
                 readonly: W.value
-              })) ?? r.defalut;
+              })) ?? t.defalut;
             }
           };
         if (!((f == null ? void 0 : f.lazyLoad) ?? u.lazyLoad)) {
           let s;
           switch (u.type) {
-            case o.select:
-              s = S("VvSelect");
+            case d.select:
+              s = I("VvSelect");
               break;
-            case o.checkbox:
-              s = S("VvCheckbox");
+            case d.checkbox:
+              s = I("VvCheckbox");
               break;
-            case o.radio:
-              s = S("VvRadio");
+            case d.radio:
+              s = I("VvRadio");
               break;
-            case o.textarea:
-              s = S("VvTextarea");
+            case d.textarea:
+              s = I("VvTextarea");
               break;
-            case o.radioGroup:
-              s = S("VvRadioGroup");
+            case d.radioGroup:
+              s = I("VvRadioGroup");
               break;
-            case o.checkboxGroup:
-              s = S("VvCheckboxGroup");
+            case d.checkboxGroup:
+              s = I("VvCheckboxGroup");
               break;
-            case o.combobox:
-              s = S("VvCombobox");
+            case d.combobox:
+              s = I("VvCombobox");
               break;
             default:
-              s = S("VvInputText");
+              s = I("VvInputText");
           }
           if (typeof s != "string")
             return s;
@@ -246,21 +246,21 @@ function he(e, i, a, f) {
             `[form-vue warn]: ${s} not found, the component will be loaded asynchronously. To avoid this warning, please set "lazyLoad" option.`
           );
         }
-        return ee(async () => {
+        return te(async () => {
           switch (f != null && f.sideEffects && await Promise.resolve(f.sideEffects(u.type)), u.type) {
-            case o.textarea:
+            case d.textarea:
               return import("@volverjs/ui-vue/vv-textarea");
-            case o.radio:
+            case d.radio:
               return import("@volverjs/ui-vue/vv-radio");
-            case o.radioGroup:
+            case d.radioGroup:
               return import("@volverjs/ui-vue/vv-radio-group");
-            case o.checkbox:
+            case d.checkbox:
               return import("@volverjs/ui-vue/vv-checkbox");
-            case o.checkboxGroup:
+            case d.checkboxGroup:
               return import("@volverjs/ui-vue/vv-checkbox-group");
-            case o.select:
+            case d.select:
               return import("@volverjs/ui-vue/vv-select");
-            case o.combobox:
+            case d.combobox:
               return import("@volverjs/ui-vue/vv-combobox");
           }
           return import("@volverjs/ui-vue/vv-input-text");
@@ -268,72 +268,84 @@ function he(e, i, a, f) {
       }), hasProps: U, invalid: v };
     },
     render() {
-      return this.is ? O(this.is, this.hasProps, this.$slots) : this.type === o.custom ? O(this.component, null, this.$slots) : O(this.component, this.hasProps, this.$slots);
+      return this.is ? k(this.is, this.hasProps, this.$slots) : this.type === d.custom ? k(this.component, null, this.$slots) : k(this.component, this.hasProps, this.$slots);
     }
   });
 }
-function J(e, i = {}) {
-  const a = (r) => {
-    let l = r;
-    for (; l instanceof oe; )
-      l = l.innerType();
-    return l instanceof de && (l = l._def.innerType), l;
-  }, f = a(e);
+function R(e, i = {}) {
+  const a = (l) => {
+    let n = l;
+    for (; n instanceof q; )
+      n = n.innerType();
+    return n instanceof T && (n = n._def.innerType), n;
+  }, f = (l) => {
+    let n = l;
+    for (; n instanceof q; )
+      n = n.innerType();
+    return n instanceof T;
+  }, u = a(e);
   return {
-    ...(f instanceof z ? f._def.unknownKeys === "passthrough" : !1) ? i : {},
+    ...(u instanceof G ? u._def.unknownKeys === "passthrough" : !1) ? i : {},
     ...Object.fromEntries(
-      Object.entries(f.shape).map(
-        ([r, l]) => {
-          const n = i[r];
-          let t = a(l), b;
-          if (t instanceof le && (b = t._def.defaultValue(), t = t._def.innerType), n === null && t instanceof ie)
-            return [r, n];
-          if (t instanceof se) {
-            const d = l.safeParse(n);
-            if (d.success)
-              return [r, d.data ?? b];
+      Object.entries(u.shape).map(
+        ([l, n]) => {
+          const r = i[l], g = f(n);
+          let o = a(n), c;
+          if (o instanceof se && (c = o._def.defaultValue(), o = o._def.innerType), r === null && o instanceof fe)
+            return [l, r];
+          if (r == null && g)
+            return [l, c];
+          if (o instanceof oe) {
+            const m = n.safeParse(r);
+            if (m.success)
+              return [l, m.data ?? c];
           }
-          if (t instanceof fe && Array.isArray(n) && n.length) {
-            const d = a(t._def.type);
-            if (d instanceof z)
+          if (o instanceof de && Array.isArray(r) && r.length) {
+            const m = a(o._def.type);
+            if (m instanceof G)
               return [
-                r,
-                n.map(
-                  (c) => J(
-                    d,
-                    c && typeof c == "object" ? c : void 0
+                l,
+                r.map(
+                  (h) => R(
+                    m,
+                    h && typeof h == "object" ? h : void 0
                   )
-                ) ?? b
+                )
               ];
           }
-          return t instanceof z ? [
-            r,
-            J(
-              t,
-              n && typeof n == "object" ? n : b
+          if (o instanceof ve && r) {
+            const m = a(o._def.valueType);
+            if (m instanceof G)
+              return [l, Object.keys(r).reduce((h, v) => (h[v] = R(m, r[v]), h), {})];
+          }
+          return o instanceof G ? [
+            l,
+            R(
+              o,
+              r && typeof r == "object" ? r : c
             )
-          ] : [r, b];
+          ] : [l, c];
         }
       )
     )
   };
 }
-function ye(e, i, a, f) {
-  const u = $(), r = $(), l = w(() => r.value === p.invalid), n = $(), t = $(!1), b = async (v = n.value) => {
-    if (t.value)
+function be(e, i, a, f) {
+  const u = _(), t = _(), l = w(() => t.value === x.invalid), n = _(), r = _(!1), g = async (v = n.value) => {
+    if (r.value)
       return !0;
-    const h = await e.safeParseAsync(v);
-    return h.success ? (u.value = void 0, r.value = p.valid, n.value = h.data, !0) : (u.value = h.error.format(), r.value = p.invalid, !1);
-  }, d = async () => t.value || !await b() ? !1 : (r.value = p.submitting, !0), { ignoreUpdates: c, stop: g } = ne(
+    const b = await e.safeParseAsync(v);
+    return b.success ? (u.value = void 0, t.value = x.valid, n.value = b.data, !0) : (u.value = b.error.format(), t.value = x.invalid, !1);
+  }, o = async () => r.value || !await g() ? !1 : (t.value = x.submitting, !0), { ignoreUpdates: c, stop: m } = le(
     n,
     () => {
-      r.value = p.updated;
+      t.value = x.updated;
     },
     {
       deep: !0,
-      eventFilter: ue((a == null ? void 0 : a.updateThrottle) ?? 500)
+      eventFilter: ie((a == null ? void 0 : a.updateThrottle) ?? 500)
     }
-  ), V = R({
+  ), h = z({
     name: "VvForm",
     props: {
       continuousValidation: {
@@ -373,82 +385,82 @@ function ye(e, i, a, f) {
       "invalid",
       "readonly"
     ],
-    setup(v, { emit: h }) {
-      return n.value = J(
+    setup(v, { emit: b }) {
+      return n.value = R(
         e,
         A(v.modelValue)
-      ), I(
+      ), S(
         () => v.modelValue,
-        (m) => {
-          if (m) {
-            const y = re(m) ? A(m) : m;
-            if (JSON.stringify(y) === JSON.stringify(A(n.value)))
+        (y) => {
+          if (y) {
+            const V = ae(y) ? A(y) : y;
+            if (JSON.stringify(V) === JSON.stringify(A(n.value)))
               return;
-            n.value = typeof (y == null ? void 0 : y.clone) == "function" ? y.clone() : JSON.parse(JSON.stringify(y));
+            n.value = typeof (V == null ? void 0 : V.clone) == "function" ? V.clone() : JSON.parse(JSON.stringify(V));
           }
         },
         { deep: !0 }
-      ), I(r, async (m) => {
-        var y, x, W, U, N;
-        if (m === p.invalid) {
+      ), S(t, async (y) => {
+        var V, p, W, U, B;
+        if (y === x.invalid) {
           const s = A(u.value);
-          h("invalid", s), (y = a == null ? void 0 : a.onInvalid) == null || y.call(
+          b("invalid", s), (V = a == null ? void 0 : a.onInvalid) == null || V.call(
             a,
             s
           );
           return;
         }
-        if (m === p.valid) {
+        if (y === x.valid) {
           const s = A(n.value);
-          h("valid", s), (x = a == null ? void 0 : a.onValid) == null || x.call(a, s), h("update:modelValue", s), (W = a == null ? void 0 : a.onUpdate) == null || W.call(a, s);
+          b("valid", s), (p = a == null ? void 0 : a.onValid) == null || p.call(a, s), b("update:modelValue", s), (W = a == null ? void 0 : a.onUpdate) == null || W.call(a, s);
           return;
         }
-        if (m === p.submitting) {
+        if (y === x.submitting) {
           const s = A(n.value);
-          h("submit", s), (U = a == null ? void 0 : a.onSubmit) == null || U.call(a, s);
+          b("submit", s), (U = a == null ? void 0 : a.onSubmit) == null || U.call(a, s);
         }
-        if (m === p.updated) {
-          if ((u.value || a != null && a.continuousValidation || v.continuousValidation) && await b(), !n.value || !v.modelValue || JSON.stringify(n.value) !== JSON.stringify(v.modelValue)) {
+        if (y === x.updated) {
+          if ((u.value || a != null && a.continuousValidation || v.continuousValidation) && await g(), !n.value || !v.modelValue || JSON.stringify(n.value) !== JSON.stringify(v.modelValue)) {
             const s = A(n.value);
-            h("update:modelValue", s), (N = a == null ? void 0 : a.onUpdate) == null || N.call(a, s);
+            b("update:modelValue", s), (B = a == null ? void 0 : a.onUpdate) == null || B.call(a, s);
           }
-          r.value === p.updated && (r.value = p.unknown);
+          t.value === x.updated && (t.value = x.unknown);
         }
-      }), P(() => {
-        t.value = v.readonly;
-      }), I(
+      }), Q(() => {
+        r.value = v.readonly;
+      }), S(
         () => v.readonly,
-        (m) => {
-          t.value = m;
+        (y) => {
+          r.value = y;
         }
-      ), I(t, (m) => {
-        m !== v.readonly && h("update:readonly", t.value);
+      ), S(r, (y) => {
+        y !== v.readonly && b("update:readonly", r.value);
       }), M(i, {
         formData: n,
-        submit: d,
-        validate: b,
+        submit: o,
+        validate: g,
         ignoreUpdates: c,
-        stopUpdatesWatch: g,
+        stopUpdatesWatch: m,
         errors: E(u),
-        status: E(r),
+        status: E(t),
         invalid: l,
-        readonly: t
+        readonly: r
       }), {
         formData: n,
-        submit: d,
-        validate: b,
+        submit: o,
+        validate: g,
         ignoreUpdates: c,
-        stopUpdatesWatch: g,
+        stopUpdatesWatch: m,
         errors: E(u),
-        status: E(r),
+        status: E(t),
         invalid: l,
-        isReadonly: t
+        isReadonly: r
       };
     },
     render() {
       const v = () => {
-        var h, m;
-        return ((m = (h = this.$slots) == null ? void 0 : h.default) == null ? void 0 : m.call(h, {
+        var b, y;
+        return ((y = (b = this.$slots) == null ? void 0 : b.default) == null ? void 0 : y.call(b, {
           formData: this.formData,
           submit: this.submit,
           validate: this.validate,
@@ -460,13 +472,13 @@ function ye(e, i, a, f) {
           readonly: this.isReadonly
         })) ?? this.$slots.default;
       };
-      return O(
+      return k(
         this.tag,
         {
-          onSubmit: te(this.submit, ["prevent"])
+          onSubmit: ne(this.submit, ["prevent"])
         },
         (this.template ?? (a == null ? void 0 : a.template)) && f ? [
-          O(
+          k(
             f,
             {
               schema: this.template ?? (a == null ? void 0 : a.template)
@@ -483,22 +495,22 @@ function ye(e, i, a, f) {
   });
   return {
     errors: u,
-    status: r,
+    status: t,
     invalid: l,
-    readonly: t,
+    readonly: r,
     formData: n,
-    validate: b,
-    submit: d,
+    validate: g,
+    submit: o,
     ignoreUpdates: c,
-    stopUpdatesWatch: g,
+    stopUpdatesWatch: m,
     /**
      * An hack to add types to the default slot
      */
-    VvForm: V
+    VvForm: h
   };
 }
-function be(e, i) {
-  return R({
+function Ve(e, i) {
+  return z({
     name: "VvFormWrapper",
     props: {
       name: {
@@ -513,50 +525,50 @@ function be(e, i) {
     emits: ["invalid", "valid"],
     expose: ["fields", "invalid"],
     setup(f, { emit: u }) {
-      const r = B(e), l = B(i, void 0), n = $(/* @__PURE__ */ new Set()), t = $(/* @__PURE__ */ new Map()), { name: b } = H(f);
+      const t = $(e), l = $(i, void 0), n = _(/* @__PURE__ */ new Set()), r = _(/* @__PURE__ */ new Map()), { name: g } = P(f);
       M(i, {
-        name: E(b),
-        errors: t,
+        name: E(g),
+        errors: r,
         fields: n
-      }), I(
+      }), S(
         n,
         (c) => {
-          l != null && l.fields && c.forEach((g) => {
-            l == null || l.fields.value.add(g);
+          l != null && l.fields && c.forEach((m) => {
+            l == null || l.fields.value.add(m);
           });
         },
         { deep: !0 }
-      ), I(
-        () => new Map(t.value),
-        (c, g) => {
-          l != null && l.errors && (Array.from(g.keys()).forEach((V) => {
-            l.errors.value.delete(V);
-          }), Array.from(c.keys()).forEach((V) => {
-            const v = c.get(V);
-            v && l.errors.value.set(V, v);
+      ), S(
+        () => new Map(r.value),
+        (c, m) => {
+          l != null && l.errors && (Array.from(m.keys()).forEach((h) => {
+            l.errors.value.delete(h);
+          }), Array.from(c.keys()).forEach((h) => {
+            const v = c.get(h);
+            v && l.errors.value.set(h, v);
           }));
         },
         { deep: !0 }
       );
-      const d = w(() => r != null && r.invalid.value ? t.value.size > 0 : !1);
-      return I(d, () => {
-        d.value ? u("invalid") : u("valid");
+      const o = w(() => t != null && t.invalid.value ? r.value.size > 0 : !1);
+      return S(o, () => {
+        o.value ? u("invalid") : u("valid");
       }), {
-        formData: r == null ? void 0 : r.formData,
-        errors: r == null ? void 0 : r.errors,
-        submit: r == null ? void 0 : r.submit,
-        validate: r == null ? void 0 : r.validate,
-        invalid: d,
+        formData: t == null ? void 0 : t.formData,
+        errors: t == null ? void 0 : t.errors,
+        submit: t == null ? void 0 : t.submit,
+        validate: t == null ? void 0 : t.validate,
+        invalid: o,
         fields: n,
-        fieldsErrors: t
+        fieldsErrors: r
       };
     },
     render() {
       var f, u;
-      return this.tag ? O(this.tag, null, {
+      return this.tag ? k(this.tag, null, {
         default: () => {
-          var r, l;
-          return ((l = (r = this.$slots).default) == null ? void 0 : l.call(r, {
+          var t, l;
+          return ((l = (t = this.$slots).default) == null ? void 0 : l.call(t, {
             invalid: this.invalid,
             formData: this.formData,
             submit: this.submit,
@@ -576,8 +588,8 @@ function be(e, i) {
     }
   });
 }
-function Ve(e, i) {
-  const a = R({
+function ge(e, i) {
+  const a = z({
     name: "VvFormTemplate",
     props: {
       schema: {
@@ -590,154 +602,154 @@ function Ve(e, i) {
       }
     },
     setup(f, { slots: u }) {
-      const r = B(e);
-      if (r != null && r.formData)
+      const t = $(e);
+      if (t != null && t.formData)
         return () => {
-          var b;
+          var g;
           const l = typeof f.schema == "function" ? f.schema(
-            r,
+            t,
             f.scope
           ) : f.schema;
           let n;
-          const t = l.reduce((d, c) => {
-            const g = typeof c == "function" ? c(r, f.scope) : c, {
-              vvIs: V,
+          const r = l.reduce((o, c) => {
+            const m = typeof c == "function" ? c(t, f.scope) : c, {
+              vvIs: h,
               vvName: v,
-              vvSlots: h,
-              vvChildren: m,
-              vvIf: y,
-              vvElseIf: x,
+              vvSlots: b,
+              vvChildren: y,
+              vvIf: V,
+              vvElseIf: p,
               vvType: W,
               vvDefaultValue: U,
-              vvShowValid: N,
+              vvShowValid: B,
               vvContent: s,
-              ..._
-            } = g;
-            if (y !== void 0) {
-              if (typeof y == "string" ? n = !!K(
-                Object(r.formData.value),
-                y
-              ) : typeof y == "function" ? n = C(y(r)) : n = C(y), !n)
-                return d;
-            } else if (x !== void 0 && n !== void 0) {
-              if (n || (typeof x == "string" ? n = !!K(
-                Object(r.formData.value),
-                x
-              ) : typeof x == "function" ? n = C(x(r)) : n = C(x), !n))
-                return d;
+              ...N
+            } = m;
+            if (V !== void 0) {
+              if (typeof V == "string" ? n = !!K(
+                Object(t.formData.value),
+                V
+              ) : typeof V == "function" ? n = C(V(t)) : n = C(V), !n)
+                return o;
+            } else if (p !== void 0 && n !== void 0) {
+              if (n || (typeof p == "string" ? n = !!K(
+                Object(t.formData.value),
+                p
+              ) : typeof p == "function" ? n = C(p(t)) : n = C(p), !n))
+                return o;
             } else
               n = void 0;
-            let k;
-            return m && (typeof V == "string" ? k = O(a, {
-              schema: m
-            }) : k = {
-              default: (j) => O(a, {
-                schema: m,
-                scope: j
+            let O;
+            return y && (typeof h == "string" ? O = k(a, {
+              schema: y
+            }) : O = {
+              default: (ee) => k(a, {
+                schema: y,
+                scope: ee
               })
-            }), v ? (d.push(
-              O(
+            }), v ? (o.push(
+              k(
                 i,
                 {
                   name: v,
-                  is: V,
+                  is: h,
                   type: W,
                   defaultValue: U,
-                  showValid: N,
-                  props: _
+                  showValid: B,
+                  props: N
                 },
-                h ?? k ?? s
+                b ?? O ?? s
               )
-            ), d) : V ? (d.push(
-              O(
-                V,
-                _,
-                h ?? k ?? s
+            ), o) : h ? (o.push(
+              k(
+                h,
+                N,
+                b ?? O ?? s
               )
-            ), d) : (k && ("default" in k ? d.push(k.default(f.scope)) : d.push(k)), d);
+            ), o) : (O && ("default" in O ? o.push(O.default(f.scope)) : o.push(O)), o);
           }, []);
-          return t.push(
-            (b = u == null ? void 0 : u.default) == null ? void 0 : b.call(u, {
-              formData: r == null ? void 0 : r.formData.value,
-              submit: r == null ? void 0 : r.submit,
-              validate: r == null ? void 0 : r.validate,
-              errors: r == null ? void 0 : r.errors.value,
-              status: r == null ? void 0 : r.status.value,
-              invalid: r == null ? void 0 : r.invalid.value
+          return r.push(
+            (g = u == null ? void 0 : u.default) == null ? void 0 : g.call(u, {
+              formData: t == null ? void 0 : t.formData.value,
+              submit: t == null ? void 0 : t.submit,
+              validate: t == null ? void 0 : t.validate,
+              errors: t == null ? void 0 : t.errors.value,
+              status: t == null ? void 0 : t.status.value,
+              invalid: t == null ? void 0 : t.invalid.value
             })
-          ), t;
+          ), r;
         };
     }
   });
   return a;
 }
-function L(e, i = {}) {
-  const a = Symbol("formInjectionKey"), f = Symbol("formWrapperInjectionKey"), u = Symbol("formFieldInjectionKey"), r = be(
+function Z(e, i = {}) {
+  const a = Symbol("formInjectionKey"), f = Symbol("formWrapperInjectionKey"), u = Symbol("formFieldInjectionKey"), t = Ve(
     a,
     f
-  ), l = he(
+  ), l = ye(
     a,
     f,
     u,
     i
-  ), n = Ve(a, l), {
-    VvForm: t,
-    errors: b,
-    status: d,
+  ), n = ge(a, l), {
+    VvForm: r,
+    errors: g,
+    status: o,
     invalid: c,
-    readonly: g,
-    formData: V,
+    readonly: m,
+    formData: h,
     validate: v,
-    submit: h,
-    ignoreUpdates: m,
-    stopUpdatesWatch: y
-  } = ye(e, a, i, n);
+    submit: b,
+    ignoreUpdates: y,
+    stopUpdatesWatch: V
+  } = be(e, a, i, n);
   return {
-    VvForm: t,
-    VvFormWrapper: r,
+    VvForm: r,
+    VvFormWrapper: t,
     VvFormField: l,
     VvFormTemplate: n,
     formInjectionKey: a,
     formWrapperInjectionKey: f,
     formFieldInjectionKey: u,
-    errors: b,
-    status: d,
+    errors: g,
+    status: o,
     invalid: c,
-    readonly: g,
-    formData: V,
+    readonly: m,
+    formData: h,
     validate: v,
-    submit: h,
-    ignoreUpdates: m,
-    stopUpdatesWatch: y
+    submit: b,
+    ignoreUpdates: y,
+    stopUpdatesWatch: V
   };
 }
-const D = Symbol("pluginInjectionKey");
-function ke(e) {
+const F = Symbol("pluginInjectionKey");
+function we(e) {
   let i = {};
-  return e.schema && (i = L(e.schema, e)), {
+  return e.schema && (i = Z(e.schema, e)), {
     ...i,
     install(a, { global: f = !1 } = {}) {
-      a.provide(D, e), f && (a.config.globalProperties.$vvForm = e, i != null && i.VvForm && a.component("VvForm", i.VvForm), i != null && i.VvFormWrapper && a.component("VvFormWrapper", i.VvFormWrapper), i != null && i.VvFormField && a.component("VvFormField", i.VvFormField), i != null && i.VvFormTemplate && a.component("VvFormTemplate", i.VvFormTemplate));
+      a.provide(F, e), f && (a.config.globalProperties.$vvForm = e, i != null && i.VvForm && a.component("VvForm", i.VvForm), i != null && i.VvFormWrapper && a.component("VvFormWrapper", i.VvFormWrapper), i != null && i.VvFormField && a.component("VvFormField", i.VvFormField), i != null && i.VvFormTemplate && a.component("VvFormTemplate", i.VvFormTemplate));
     }
   };
 }
-function we(e, i = {}) {
-  return ae() ? L(
+function ke(e, i = {}) {
+  return ue() ? Z(
     e,
     {
-      ...B(D, {}),
+      ...$(F, {}),
       ...i
     }
-  ) : L(e, i);
+  ) : Z(e, i);
 }
-function Oe(e, i = {}) {
-  return L(e, i);
+function Se(e, i = {}) {
+  return Z(e, i);
 }
 export {
-  o as FormFieldType,
-  ke as createForm,
-  J as defaultObjectBySchema,
-  Oe as formFactory,
-  D as pluginInjectionKey,
-  we as useForm
+  d as FormFieldType,
+  we as createForm,
+  R as defaultObjectBySchema,
+  Se as formFactory,
+  F as pluginInjectionKey,
+  ke as useForm
 };

package/dist/index.umd.js

@@ -1 +1 @@
-(function(w,e){typeof exports=="object"&&typeof module<"u"?e(exports,require("vue"),require("@vueuse/core"),require("zod")):typeof define=="function"&&define.amd?define(["exports","vue","@vueuse/core","zod"],e):(w=typeof globalThis<"u"?globalThis:w||self,e(w["@volverjs/form-vue"]={},w.Vue,w.VueUseCore,w.zod))})(this,function(w,e,$,S){"use strict";function N(r){return Array.isArray(r)}function J(r){return typeof r<"u"}function K(r){return r===null}function G(r){return typeof r=="object"}function L(r){return typeof r=="string"}function W(r){return typeof r>"u"}const M=/^[0-9]+$/,z=["__proto__","prototype","constructor"];function A(r,s,n){const f=J(n)?n:void 0;if(!G(r)||!L(s))return f;const i=q(s);if(i.length!==0){for(const t of i){if(t==="*")continue;const u=function(l){return l.map(a=>W(a)||K(a)?a:N(a)?u(a):a[t])};if(N(r)&&!M.test(t)?r=u(r):r=r[t],W(r)||K(r))break}return W(r)?f:r}}function Z(r,s,n){if(!G(r)||!L(s))return;const f=q(s);if(f.length===0)return;const i=f.length;for(let t=0;t<i;t++){const u=f[t];if(t===i-1){r[u]=n;return}if(u==="*"&&N(r)){const l=f.slice(t+1).join(".");for(const a of r)Z(a,l,n);return}W(r[u])&&(r[u]={}),r=r[u]}}function q(r){const s=r.split(/[.]|(?:\[(\d|\*)\])/).filter(n=>!!n);return s.some(n=>z.indexOf(n)!==-1)?[]:s}var d=(r=>(r.text="text",r.number="number",r.email="email",r.password="password",r.tel="tel",r.url="url",r.search="search",r.date="date",r.time="time",r.datetimeLocal="datetime-local",r.month="month",r.week="week",r.color="color",r.select="select",r.checkbox="checkbox",r.radio="radio",r.textarea="textarea",r.radioGroup="radioGroup",r.checkboxGroup="checkboxGroup",r.combobox="combobox",r.custom="custom",r))(d||{}),O=(r=>(r.invalid="invalid",r.valid="valid",r.submitting="submitting",r.updated="updated",r.unknown="unknown",r))(O||{});function T(r,s,n,f){return e.defineComponent({name:"VvFormField",props:{type:{type:String,validator:i=>Object.values(d).includes(i),default:d.custom},is:{type:[Object,String],default:void 0},name:{type:[String,Number,Boolean,Symbol],required:!0},props:{type:[Object,Function],default:()=>({})},showValid:{type:Boolean,default:!1},defaultValue:{type:[String,Number,Boolean,Array,Object],default:void 0},lazyLoad:{type:Boolean,default:!1},readonly:{type:Boolean,default:void 0}},emits:["invalid","valid","update:formData","update:modelValue"],expose:["invalid","invalidLabel","errors"],setup(i,{slots:t,emit:u}){const l=e.inject(s,void 0);l&&l.fields.value.add(i.name);const a=e.inject(r),{props:V,name:c}=e.toRefs(i),v=e.computed({get(){if(a!=null&&a.formData)return A(Object(a.formData.value),String(i.name))},set(o){a!=null&&a.formData&&(Z(Object(a.formData.value),String(i.name),o),u("update:modelValue",{newValue:v.value,formData:a==null?void 0:a.formData}))}});e.onMounted(()=>{v.value===void 0&&i.defaultValue!==void 0&&(v.value=i.defaultValue)});const p=e.computed(()=>{if(a!=null&&a.errors.value)return A(a.errors.value,String(i.name))}),g=e.computed(()=>{var o;return(o=p.value)==null?void 0:o._errors}),m=e.computed(()=>p.value!==void 0),y=e.watch(m,()=>{m.value?(u("invalid",g.value),l&&l.errors.value.set(i.name,{_errors:g.value})):(u("valid",v.value),l&&l.errors.value.delete(i.name))}),h=e.watch(()=>a==null?void 0:a.formData,()=>{u("update:formData",a==null?void 0:a.formData)},{deep:!0});e.onBeforeUnmount(()=>{y(),h()});const b=o=>{v.value=o},x=e.computed(()=>{let o=V.value;return typeof o=="function"&&(o=o(a==null?void 0:a.formData)),Object.keys(o).reduce((U,k)=>(U[k]=e.unref(o[k]),U),{})}),C=e.computed(()=>a!=null&&a.readonly.value?!0:x.value.readonly??i.readonly),I=e.computed(()=>({...x.value,name:x.value.name??i.name,invalid:m.value,valid:i.showValid?!!(!m.value&&v.value):void 0,type:(o=>{if([d.text,d.number,d.email,d.password,d.tel,d.url,d.search,d.date,d.time,d.datetimeLocal,d.month,d.week,d.color].includes(o))return o})(i.type),invalidLabel:g.value,modelValue:v.value,readonly:C.value,"onUpdate:modelValue":b}));return e.provide(n,{name:e.readonly(c),errors:e.readonly(p)}),{component:e.computed(()=>{if(i.type===d.custom)return{render(){var o;return((o=t.default)==null?void 0:o.call(t,{modelValue:v.value,onUpdate:b,submit:a==null?void 0:a.submit,validate:a==null?void 0:a.validate,invalid:m.value,invalidLabel:g.value,formData:a==null?void 0:a.formData.value,formErrors:a==null?void 0:a.errors.value,errors:p.value,readonly:C.value}))??t.defalut}};if(!((f==null?void 0:f.lazyLoad)??i.lazyLoad)){let o;switch(i.type){case d.select:o=e.resolveComponent("VvSelect");break;case d.checkbox:o=e.resolveComponent("VvCheckbox");break;case d.radio:o=e.resolveComponent("VvRadio");break;case d.textarea:o=e.resolveComponent("VvTextarea");break;case d.radioGroup:o=e.resolveComponent("VvRadioGroup");break;case d.checkboxGroup:o=e.resolveComponent("VvCheckboxGroup");break;case d.combobox:o=e.resolveComponent("VvCombobox");break;default:o=e.resolveComponent("VvInputText")}if(typeof o!="string")return o;console.warn(`[form-vue warn]: ${o} not found, the component will be loaded asynchronously. To avoid this warning, please set "lazyLoad" option.`)}return e.defineAsyncComponent(async()=>{switch(f!=null&&f.sideEffects&&await Promise.resolve(f.sideEffects(i.type)),i.type){case d.textarea:return import("@volverjs/ui-vue/vv-textarea");case d.radio:return import("@volverjs/ui-vue/vv-radio");case d.radioGroup:return import("@volverjs/ui-vue/vv-radio-group");case d.checkbox:return import("@volverjs/ui-vue/vv-checkbox");case d.checkboxGroup:return import("@volverjs/ui-vue/vv-checkbox-group");case d.select:return import("@volverjs/ui-vue/vv-select");case d.combobox:return import("@volverjs/ui-vue/vv-combobox")}return import("@volverjs/ui-vue/vv-input-text")})}),hasProps:I,invalid:m}},render(){return this.is?e.h(this.is,this.hasProps,this.$slots):this.type===d.custom?e.h(this.component,null,this.$slots):e.h(this.component,this.hasProps,this.$slots)}})}function E(r,s={}){const n=t=>{let u=t;for(;u instanceof S.ZodEffects;)u=u.innerType();return u instanceof S.ZodOptional&&(u=u._def.innerType),u},f=n(r);return{...(f instanceof S.ZodObject?f._def.unknownKeys==="passthrough":!1)?s:{},...Object.fromEntries(Object.entries(f.shape).map(([t,u])=>{const l=s[t];let a=n(u),V;if(a instanceof S.ZodDefault&&(V=a._def.defaultValue(),a=a._def.innerType),l===null&&a instanceof S.ZodNullable)return[t,l];if(a instanceof S.ZodSchema){const c=u.safeParse(l);if(c.success)return[t,c.data??V]}if(a instanceof S.ZodArray&&Array.isArray(l)&&l.length){const c=n(a._def.type);if(c instanceof S.ZodObject)return[t,l.map(v=>E(c,v&&typeof v=="object"?v:void 0))??V]}return a instanceof S.ZodObject?[t,E(a,l&&typeof l=="object"?l:V)]:[t,V]}))}}function P(r,s,n,f){const i=e.ref(),t=e.ref(),u=e.computed(()=>t.value===O.invalid),l=e.ref(),a=e.ref(!1),V=async(m=l.value)=>{if(a.value)return!0;const y=await r.safeParseAsync(m);return y.success?(i.value=void 0,t.value=O.valid,l.value=y.data,!0):(i.value=y.error.format(),t.value=O.invalid,!1)},c=async()=>a.value||!await V()?!1:(t.value=O.submitting,!0),{ignoreUpdates:v,stop:p}=$.watchIgnorable(l,()=>{t.value=O.updated},{deep:!0,eventFilter:$.throttleFilter((n==null?void 0:n.updateThrottle)??500)}),g=e.defineComponent({name:"VvForm",props:{continuousValidation:{type:Boolean,default:!1},modelValue:{type:Object,default:()=>({})},readonly:{type:Boolean,default:(n==null?void 0:n.readonly)??!1},tag:{type:String,default:"form"},template:{type:[Array,Function],default:void 0}},emits:["invalid","valid","submit","update:modelValue","update:readonly"],expose:["submit","validate","errors","status","valid","invalid","readonly"],setup(m,{emit:y}){return l.value=E(r,e.toRaw(m.modelValue)),e.watch(()=>m.modelValue,h=>{if(h){const b=e.isProxy(h)?e.toRaw(h):h;if(JSON.stringify(b)===JSON.stringify(e.toRaw(l.value)))return;l.value=typeof(b==null?void 0:b.clone)=="function"?b.clone():JSON.parse(JSON.stringify(b))}},{deep:!0}),e.watch(t,async h=>{var b,x,C,I,R;if(h===O.invalid){const o=e.toRaw(i.value);y("invalid",o),(b=n==null?void 0:n.onInvalid)==null||b.call(n,o);return}if(h===O.valid){const o=e.toRaw(l.value);y("valid",o),(x=n==null?void 0:n.onValid)==null||x.call(n,o),y("update:modelValue",o),(C=n==null?void 0:n.onUpdate)==null||C.call(n,o);return}if(h===O.submitting){const o=e.toRaw(l.value);y("submit",o),(I=n==null?void 0:n.onSubmit)==null||I.call(n,o)}if(h===O.updated){if((i.value||n!=null&&n.continuousValidation||m.continuousValidation)&&await V(),!l.value||!m.modelValue||JSON.stringify(l.value)!==JSON.stringify(m.modelValue)){const o=e.toRaw(l.value);y("update:modelValue",o),(R=n==null?void 0:n.onUpdate)==null||R.call(n,o)}t.value===O.updated&&(t.value=O.unknown)}}),e.onMounted(()=>{a.value=m.readonly}),e.watch(()=>m.readonly,h=>{a.value=h}),e.watch(a,h=>{h!==m.readonly&&y("update:readonly",a.value)}),e.provide(s,{formData:l,submit:c,validate:V,ignoreUpdates:v,stopUpdatesWatch:p,errors:e.readonly(i),status:e.readonly(t),invalid:u,readonly:a}),{formData:l,submit:c,validate:V,ignoreUpdates:v,stopUpdatesWatch:p,errors:e.readonly(i),status:e.readonly(t),invalid:u,isReadonly:a}},render(){const m=()=>{var y,h;return((h=(y=this.$slots)==null?void 0:y.default)==null?void 0:h.call(y,{formData:this.formData,submit:this.submit,validate:this.validate,ignoreUpdates:this.ignoreUpdates,stopUpdatesWatch:this.stopUpdatesWatch,errors:this.errors,status:this.status,invalid:this.invalid,readonly:this.isReadonly}))??this.$slots.default};return e.h(this.tag,{onSubmit:e.withModifiers(this.submit,["prevent"])},(this.template??(n==null?void 0:n.template))&&f?[e.h(f,{schema:this.template??(n==null?void 0:n.template)},{default:m})]:{default:m})}});return{errors:i,status:t,invalid:u,readonly:a,formData:l,validate:V,submit:c,ignoreUpdates:v,stopUpdatesWatch:p,VvForm:g}}function H(r,s){return e.defineComponent({name:"VvFormWrapper",props:{name:{type:String,required:!0},tag:{type:String,default:void 0}},emits:["invalid","valid"],expose:["fields","invalid"],setup(f,{emit:i}){const t=e.inject(r),u=e.inject(s,void 0),l=e.ref(new Set),a=e.ref(new Map),{name:V}=e.toRefs(f);e.provide(s,{name:e.readonly(V),errors:a,fields:l}),e.watch(l,v=>{u!=null&&u.fields&&v.forEach(p=>{u==null||u.fields.value.add(p)})},{deep:!0}),e.watch(()=>new Map(a.value),(v,p)=>{u!=null&&u.errors&&(Array.from(p.keys()).forEach(g=>{u.errors.value.delete(g)}),Array.from(v.keys()).forEach(g=>{const m=v.get(g);m&&u.errors.value.set(g,m)}))},{deep:!0});const c=e.computed(()=>t!=null&&t.invalid.value?a.value.size>0:!1);return e.watch(c,()=>{c.value?i("invalid"):i("valid")}),{formData:t==null?void 0:t.formData,errors:t==null?void 0:t.errors,submit:t==null?void 0:t.submit,validate:t==null?void 0:t.validate,invalid:c,fields:l,fieldsErrors:a}},render(){var f,i;return this.tag?e.h(this.tag,null,{default:()=>{var t,u;return((u=(t=this.$slots).default)==null?void 0:u.call(t,{invalid:this.invalid,formData:this.formData,submit:this.submit,validate:this.validate,errors:this.errors,fieldsErrors:this.fieldsErrors}))??this.$slots.defalut}}):((i=(f=this.$slots).default)==null?void 0:i.call(f,{invalid:this.invalid,formData:this.formData,submit:this.submit,validate:this.validate,errors:this.errors,fieldsErrors:this.fieldsErrors}))??this.$slots.defalut}})}function Q(r,s){const n=e.defineComponent({name:"VvFormTemplate",props:{schema:{type:[Array,Function],required:!0},scope:{type:Object,default:()=>({})}},setup(f,{slots:i}){const t=e.inject(r);if(t!=null&&t.formData)return()=>{var V;const u=typeof f.schema=="function"?f.schema(t,f.scope):f.schema;let l;const a=u.reduce((c,v)=>{const p=typeof v=="function"?v(t,f.scope):v,{vvIs:g,vvName:m,vvSlots:y,vvChildren:h,vvIf:b,vvElseIf:x,vvType:C,vvDefaultValue:I,vvShowValid:R,vvContent:o,...U}=p;if(b!==void 0){if(typeof b=="string"?l=!!A(Object(t.formData.value),b):typeof b=="function"?l=e.unref(b(t)):l=e.unref(b),!l)return c}else if(x!==void 0&&l!==void 0){if(l||(typeof x=="string"?l=!!A(Object(t.formData.value),x):typeof x=="function"?l=e.unref(x(t)):l=e.unref(x),!l))return c}else l=void 0;let k;return h&&(typeof g=="string"?k=e.h(n,{schema:h}):k={default:j=>e.h(n,{schema:h,scope:j})}),m?(c.push(e.h(s,{name:m,is:g,type:C,defaultValue:I,showValid:R,props:U},y??k??o)),c):g?(c.push(e.h(g,U,y??k??o)),c):(k&&("default"in k?c.push(k.default(f.scope)):c.push(k)),c)},[]);return a.push((V=i==null?void 0:i.default)==null?void 0:V.call(i,{formData:t==null?void 0:t.formData.value,submit:t==null?void 0:t.submit,validate:t==null?void 0:t.validate,errors:t==null?void 0:t.errors.value,status:t==null?void 0:t.status.value,invalid:t==null?void 0:t.invalid.value})),a}}});return n}function B(r,s={}){const n=Symbol("formInjectionKey"),f=Symbol("formWrapperInjectionKey"),i=Symbol("formFieldInjectionKey"),t=H(n,f),u=T(n,f,i,s),l=Q(n,u),{VvForm:a,errors:V,status:c,invalid:v,readonly:p,formData:g,validate:m,submit:y,ignoreUpdates:h,stopUpdatesWatch:b}=P(r,n,s,l);return{VvForm:a,VvFormWrapper:t,VvFormField:u,VvFormTemplate:l,formInjectionKey:n,formWrapperInjectionKey:f,formFieldInjectionKey:i,errors:V,status:c,invalid:v,readonly:p,formData:g,validate:m,submit:y,ignoreUpdates:h,stopUpdatesWatch:b}}const _=Symbol("pluginInjectionKey");function X(r){let s={};return r.schema&&(s=B(r.schema,r)),{...s,install(n,{global:f=!1}={}){n.provide(_,r),f&&(n.config.globalProperties.$vvForm=r,s!=null&&s.VvForm&&n.component("VvForm",s.VvForm),s!=null&&s.VvFormWrapper&&n.component("VvFormWrapper",s.VvFormWrapper),s!=null&&s.VvFormField&&n.component("VvFormField",s.VvFormField),s!=null&&s.VvFormTemplate&&n.component("VvFormTemplate",s.VvFormTemplate))}}}function Y(r,s={}){return e.getCurrentInstance()?B(r,{...e.inject(_,{}),...s}):B(r,s)}function D(r,s={}){return B(r,s)}w.FormFieldType=d,w.createForm=X,w.defaultObjectBySchema=E,w.formFactory=D,w.pluginInjectionKey=_,w.useForm=Y,Object.defineProperty(w,Symbol.toStringTag,{value:"Module"})});
+(function(w,e){typeof exports=="object"&&typeof module<"u"?e(exports,require("vue"),require("@vueuse/core"),require("zod")):typeof define=="function"&&define.amd?define(["exports","vue","@vueuse/core","zod"],e):(w=typeof globalThis<"u"?globalThis:w||self,e(w["@volverjs/form-vue"]={},w.Vue,w.VueUseCore,w.zod))})(this,function(w,e,N,O){"use strict";function Z(t){return Array.isArray(t)}function J(t){return typeof t<"u"}function $(t){return t===null}function G(t){return typeof t=="object"}function K(t){return typeof t=="string"}function W(t){return typeof t>"u"}const M=/^[0-9]+$/,T=["__proto__","prototype","constructor"];function A(t,s,n){const f=J(n)?n:void 0;if(!G(t)||!K(s))return f;const i=q(s);if(i.length!==0){for(const a of i){if(a==="*")continue;const u=function(l){return l.map(r=>W(r)||$(r)?r:Z(r)?u(r):r[a])};if(Z(t)&&!M.test(a)?t=u(t):t=t[a],W(t)||$(t))break}return W(t)?f:t}}function L(t,s,n){if(!G(t)||!K(s))return;const f=q(s);if(f.length===0)return;const i=f.length;for(let a=0;a<i;a++){const u=f[a];if(a===i-1){t[u]=n;return}if(u==="*"&&Z(t)){const l=f.slice(a+1).join(".");for(const r of t)L(r,l,n);return}W(t[u])&&(t[u]={}),t=t[u]}}function q(t){const s=t.split(/[.]|(?:\[(\d|\*)\])/).filter(n=>!!n);return s.some(n=>T.indexOf(n)!==-1)?[]:s}var c=(t=>(t.text="text",t.number="number",t.email="email",t.password="password",t.tel="tel",t.url="url",t.search="search",t.date="date",t.time="time",t.datetimeLocal="datetime-local",t.month="month",t.week="week",t.color="color",t.select="select",t.checkbox="checkbox",t.radio="radio",t.textarea="textarea",t.radioGroup="radioGroup",t.checkboxGroup="checkboxGroup",t.combobox="combobox",t.custom="custom",t))(c||{}),k=(t=>(t.invalid="invalid",t.valid="valid",t.submitting="submitting",t.updated="updated",t.unknown="unknown",t))(k||{});function P(t,s,n,f){return e.defineComponent({name:"VvFormField",props:{type:{type:String,validator:i=>Object.values(c).includes(i),default:c.custom},is:{type:[Object,String],default:void 0},name:{type:[String,Number,Boolean,Symbol],required:!0},props:{type:[Object,Function],default:()=>({})},showValid:{type:Boolean,default:!1},defaultValue:{type:[String,Number,Boolean,Array,Object],default:void 0},lazyLoad:{type:Boolean,default:!1},readonly:{type:Boolean,default:void 0}},emits:["invalid","valid","update:formData","update:modelValue"],expose:["invalid","invalidLabel","errors"],setup(i,{slots:a,emit:u}){const l=e.inject(s,void 0);l&&l.fields.value.add(i.name);const r=e.inject(t),{props:g,name:d}=e.toRefs(i),v=e.computed({get(){if(r!=null&&r.formData)return A(Object(r.formData.value),String(i.name))},set(o){r!=null&&r.formData&&(L(Object(r.formData.value),String(i.name),o),u("update:modelValue",{newValue:v.value,formData:r==null?void 0:r.formData}))}});e.onMounted(()=>{v.value===void 0&&i.defaultValue!==void 0&&(v.value=i.defaultValue)});const h=e.computed(()=>{if(r!=null&&r.errors.value)return A(r.errors.value,String(i.name))}),y=e.computed(()=>{var o;return(o=h.value)==null?void 0:o._errors}),m=e.computed(()=>h.value!==void 0),V=e.watch(m,()=>{m.value?(u("invalid",y.value),l&&l.errors.value.set(i.name,{_errors:y.value})):(u("valid",v.value),l&&l.errors.value.delete(i.name))}),b=e.watch(()=>r==null?void 0:r.formData,()=>{u("update:formData",r==null?void 0:r.formData)},{deep:!0});e.onBeforeUnmount(()=>{V(),b()});const p=o=>{v.value=o},x=e.computed(()=>{let o=g.value;return typeof o=="function"&&(o=o(r==null?void 0:r.formData)),Object.keys(o).reduce((U,S)=>(U[S]=e.unref(o[S]),U),{})}),C=e.computed(()=>r!=null&&r.readonly.value?!0:x.value.readonly??i.readonly),I=e.computed(()=>({...x.value,name:x.value.name??i.name,invalid:m.value,valid:i.showValid?!!(!m.value&&v.value):void 0,type:(o=>{if([c.text,c.number,c.email,c.password,c.tel,c.url,c.search,c.date,c.time,c.datetimeLocal,c.month,c.week,c.color].includes(o))return o})(i.type),invalidLabel:y.value,modelValue:v.value,readonly:C.value,"onUpdate:modelValue":p}));return e.provide(n,{name:e.readonly(d),errors:e.readonly(h)}),{component:e.computed(()=>{if(i.type===c.custom)return{render(){var o;return((o=a.default)==null?void 0:o.call(a,{modelValue:v.value,onUpdate:p,submit:r==null?void 0:r.submit,validate:r==null?void 0:r.validate,invalid:m.value,invalidLabel:y.value,formData:r==null?void 0:r.formData.value,formErrors:r==null?void 0:r.errors.value,errors:h.value,readonly:C.value}))??a.defalut}};if(!((f==null?void 0:f.lazyLoad)??i.lazyLoad)){let o;switch(i.type){case c.select:o=e.resolveComponent("VvSelect");break;case c.checkbox:o=e.resolveComponent("VvCheckbox");break;case c.radio:o=e.resolveComponent("VvRadio");break;case c.textarea:o=e.resolveComponent("VvTextarea");break;case c.radioGroup:o=e.resolveComponent("VvRadioGroup");break;case c.checkboxGroup:o=e.resolveComponent("VvCheckboxGroup");break;case c.combobox:o=e.resolveComponent("VvCombobox");break;default:o=e.resolveComponent("VvInputText")}if(typeof o!="string")return o;console.warn(`[form-vue warn]: ${o} not found, the component will be loaded asynchronously. To avoid this warning, please set "lazyLoad" option.`)}return e.defineAsyncComponent(async()=>{switch(f!=null&&f.sideEffects&&await Promise.resolve(f.sideEffects(i.type)),i.type){case c.textarea:return import("@volverjs/ui-vue/vv-textarea");case c.radio:return import("@volverjs/ui-vue/vv-radio");case c.radioGroup:return import("@volverjs/ui-vue/vv-radio-group");case c.checkbox:return import("@volverjs/ui-vue/vv-checkbox");case c.checkboxGroup:return import("@volverjs/ui-vue/vv-checkbox-group");case c.select:return import("@volverjs/ui-vue/vv-select");case c.combobox:return import("@volverjs/ui-vue/vv-combobox")}return import("@volverjs/ui-vue/vv-input-text")})}),hasProps:I,invalid:m}},render(){return this.is?e.h(this.is,this.hasProps,this.$slots):this.type===c.custom?e.h(this.component,null,this.$slots):e.h(this.component,this.hasProps,this.$slots)}})}function R(t,s={}){const n=u=>{let l=u;for(;l instanceof O.ZodEffects;)l=l.innerType();return l instanceof O.ZodOptional&&(l=l._def.innerType),l},f=u=>{let l=u;for(;l instanceof O.ZodEffects;)l=l.innerType();return l instanceof O.ZodOptional},i=n(t);return{...(i instanceof O.ZodObject?i._def.unknownKeys==="passthrough":!1)?s:{},...Object.fromEntries(Object.entries(i.shape).map(([u,l])=>{const r=s[u],g=f(l);let d=n(l),v;if(d instanceof O.ZodDefault&&(v=d._def.defaultValue(),d=d._def.innerType),r===null&&d instanceof O.ZodNullable)return[u,r];if(r==null&&g)return[u,v];if(d instanceof O.ZodSchema){const h=l.safeParse(r);if(h.success)return[u,h.data??v]}if(d instanceof O.ZodArray&&Array.isArray(r)&&r.length){const h=n(d._def.type);if(h instanceof O.ZodObject)return[u,r.map(y=>R(h,y&&typeof y=="object"?y:void 0))]}if(d instanceof O.ZodRecord&&r){const h=n(d._def.valueType);if(h instanceof O.ZodObject)return[u,Object.keys(r).reduce((y,m)=>(y[m]=R(h,r[m]),y),{})]}return d instanceof O.ZodObject?[u,R(d,r&&typeof r=="object"?r:v)]:[u,v]}))}}function H(t,s,n,f){const i=e.ref(),a=e.ref(),u=e.computed(()=>a.value===k.invalid),l=e.ref(),r=e.ref(!1),g=async(m=l.value)=>{if(r.value)return!0;const V=await t.safeParseAsync(m);return V.success?(i.value=void 0,a.value=k.valid,l.value=V.data,!0):(i.value=V.error.format(),a.value=k.invalid,!1)},d=async()=>r.value||!await g()?!1:(a.value=k.submitting,!0),{ignoreUpdates:v,stop:h}=N.watchIgnorable(l,()=>{a.value=k.updated},{deep:!0,eventFilter:N.throttleFilter((n==null?void 0:n.updateThrottle)??500)}),y=e.defineComponent({name:"VvForm",props:{continuousValidation:{type:Boolean,default:!1},modelValue:{type:Object,default:()=>({})},readonly:{type:Boolean,default:(n==null?void 0:n.readonly)??!1},tag:{type:String,default:"form"},template:{type:[Array,Function],default:void 0}},emits:["invalid","valid","submit","update:modelValue","update:readonly"],expose:["submit","validate","errors","status","valid","invalid","readonly"],setup(m,{emit:V}){return l.value=R(t,e.toRaw(m.modelValue)),e.watch(()=>m.modelValue,b=>{if(b){const p=e.isProxy(b)?e.toRaw(b):b;if(JSON.stringify(p)===JSON.stringify(e.toRaw(l.value)))return;l.value=typeof(p==null?void 0:p.clone)=="function"?p.clone():JSON.parse(JSON.stringify(p))}},{deep:!0}),e.watch(a,async b=>{var p,x,C,I,E;if(b===k.invalid){const o=e.toRaw(i.value);V("invalid",o),(p=n==null?void 0:n.onInvalid)==null||p.call(n,o);return}if(b===k.valid){const o=e.toRaw(l.value);V("valid",o),(x=n==null?void 0:n.onValid)==null||x.call(n,o),V("update:modelValue",o),(C=n==null?void 0:n.onUpdate)==null||C.call(n,o);return}if(b===k.submitting){const o=e.toRaw(l.value);V("submit",o),(I=n==null?void 0:n.onSubmit)==null||I.call(n,o)}if(b===k.updated){if((i.value||n!=null&&n.continuousValidation||m.continuousValidation)&&await g(),!l.value||!m.modelValue||JSON.stringify(l.value)!==JSON.stringify(m.modelValue)){const o=e.toRaw(l.value);V("update:modelValue",o),(E=n==null?void 0:n.onUpdate)==null||E.call(n,o)}a.value===k.updated&&(a.value=k.unknown)}}),e.onMounted(()=>{r.value=m.readonly}),e.watch(()=>m.readonly,b=>{r.value=b}),e.watch(r,b=>{b!==m.readonly&&V("update:readonly",r.value)}),e.provide(s,{formData:l,submit:d,validate:g,ignoreUpdates:v,stopUpdatesWatch:h,errors:e.readonly(i),status:e.readonly(a),invalid:u,readonly:r}),{formData:l,submit:d,validate:g,ignoreUpdates:v,stopUpdatesWatch:h,errors:e.readonly(i),status:e.readonly(a),invalid:u,isReadonly:r}},render(){const m=()=>{var V,b;return((b=(V=this.$slots)==null?void 0:V.default)==null?void 0:b.call(V,{formData:this.formData,submit:this.submit,validate:this.validate,ignoreUpdates:this.ignoreUpdates,stopUpdatesWatch:this.stopUpdatesWatch,errors:this.errors,status:this.status,invalid:this.invalid,readonly:this.isReadonly}))??this.$slots.default};return e.h(this.tag,{onSubmit:e.withModifiers(this.submit,["prevent"])},(this.template??(n==null?void 0:n.template))&&f?[e.h(f,{schema:this.template??(n==null?void 0:n.template)},{default:m})]:{default:m})}});return{errors:i,status:a,invalid:u,readonly:r,formData:l,validate:g,submit:d,ignoreUpdates:v,stopUpdatesWatch:h,VvForm:y}}function Q(t,s){return e.defineComponent({name:"VvFormWrapper",props:{name:{type:String,required:!0},tag:{type:String,default:void 0}},emits:["invalid","valid"],expose:["fields","invalid"],setup(f,{emit:i}){const a=e.inject(t),u=e.inject(s,void 0),l=e.ref(new Set),r=e.ref(new Map),{name:g}=e.toRefs(f);e.provide(s,{name:e.readonly(g),errors:r,fields:l}),e.watch(l,v=>{u!=null&&u.fields&&v.forEach(h=>{u==null||u.fields.value.add(h)})},{deep:!0}),e.watch(()=>new Map(r.value),(v,h)=>{u!=null&&u.errors&&(Array.from(h.keys()).forEach(y=>{u.errors.value.delete(y)}),Array.from(v.keys()).forEach(y=>{const m=v.get(y);m&&u.errors.value.set(y,m)}))},{deep:!0});const d=e.computed(()=>a!=null&&a.invalid.value?r.value.size>0:!1);return e.watch(d,()=>{d.value?i("invalid"):i("valid")}),{formData:a==null?void 0:a.formData,errors:a==null?void 0:a.errors,submit:a==null?void 0:a.submit,validate:a==null?void 0:a.validate,invalid:d,fields:l,fieldsErrors:r}},render(){var f,i;return this.tag?e.h(this.tag,null,{default:()=>{var a,u;return((u=(a=this.$slots).default)==null?void 0:u.call(a,{invalid:this.invalid,formData:this.formData,submit:this.submit,validate:this.validate,errors:this.errors,fieldsErrors:this.fieldsErrors}))??this.$slots.defalut}}):((i=(f=this.$slots).default)==null?void 0:i.call(f,{invalid:this.invalid,formData:this.formData,submit:this.submit,validate:this.validate,errors:this.errors,fieldsErrors:this.fieldsErrors}))??this.$slots.defalut}})}function X(t,s){const n=e.defineComponent({name:"VvFormTemplate",props:{schema:{type:[Array,Function],required:!0},scope:{type:Object,default:()=>({})}},setup(f,{slots:i}){const a=e.inject(t);if(a!=null&&a.formData)return()=>{var g;const u=typeof f.schema=="function"?f.schema(a,f.scope):f.schema;let l;const r=u.reduce((d,v)=>{const h=typeof v=="function"?v(a,f.scope):v,{vvIs:y,vvName:m,vvSlots:V,vvChildren:b,vvIf:p,vvElseIf:x,vvType:C,vvDefaultValue:I,vvShowValid:E,vvContent:o,...U}=h;if(p!==void 0){if(typeof p=="string"?l=!!A(Object(a.formData.value),p):typeof p=="function"?l=e.unref(p(a)):l=e.unref(p),!l)return d}else if(x!==void 0&&l!==void 0){if(l||(typeof x=="string"?l=!!A(Object(a.formData.value),x):typeof x=="function"?l=e.unref(x(a)):l=e.unref(x),!l))return d}else l=void 0;let S;return b&&(typeof y=="string"?S=e.h(n,{schema:b}):S={default:j=>e.h(n,{schema:b,scope:j})}),m?(d.push(e.h(s,{name:m,is:y,type:C,defaultValue:I,showValid:E,props:U},V??S??o)),d):y?(d.push(e.h(y,U,V??S??o)),d):(S&&("default"in S?d.push(S.default(f.scope)):d.push(S)),d)},[]);return r.push((g=i==null?void 0:i.default)==null?void 0:g.call(i,{formData:a==null?void 0:a.formData.value,submit:a==null?void 0:a.submit,validate:a==null?void 0:a.validate,errors:a==null?void 0:a.errors.value,status:a==null?void 0:a.status.value,invalid:a==null?void 0:a.invalid.value})),r}}});return n}function B(t,s={}){const n=Symbol("formInjectionKey"),f=Symbol("formWrapperInjectionKey"),i=Symbol("formFieldInjectionKey"),a=Q(n,f),u=P(n,f,i,s),l=X(n,u),{VvForm:r,errors:g,status:d,invalid:v,readonly:h,formData:y,validate:m,submit:V,ignoreUpdates:b,stopUpdatesWatch:p}=H(t,n,s,l);return{VvForm:r,VvFormWrapper:a,VvFormField:u,VvFormTemplate:l,formInjectionKey:n,formWrapperInjectionKey:f,formFieldInjectionKey:i,errors:g,status:d,invalid:v,readonly:h,formData:y,validate:m,submit:V,ignoreUpdates:b,stopUpdatesWatch:p}}const _=Symbol("pluginInjectionKey");function Y(t){let s={};return t.schema&&(s=B(t.schema,t)),{...s,install(n,{global:f=!1}={}){n.provide(_,t),f&&(n.config.globalProperties.$vvForm=t,s!=null&&s.VvForm&&n.component("VvForm",s.VvForm),s!=null&&s.VvFormWrapper&&n.component("VvFormWrapper",s.VvFormWrapper),s!=null&&s.VvFormField&&n.component("VvFormField",s.VvFormField),s!=null&&s.VvFormTemplate&&n.component("VvFormTemplate",s.VvFormTemplate))}}}function z(t,s={}){return e.getCurrentInstance()?B(t,{...e.inject(_,{}),...s}):B(t,s)}function D(t,s={}){return B(t,s)}w.FormFieldType=c,w.createForm=Y,w.defaultObjectBySchema=R,w.formFactory=D,w.pluginInjectionKey=_,w.useForm=z,Object.defineProperty(w,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@volverjs/form-vue",
   "type": "module",
-  "version": "1.0.0-beta.13",
+  "version": "1.0.0-beta.15",
   "description": "Vue 3 Forms with @volverjs/ui-vue",
   "author": "8 Wave S.r.l.",
   "license": "MIT",
@@ -49,28 +49,28 @@
   "engines": {
     "node": ">= 16.x"
   },
-  "dependencies": {
-    "@volverjs/ui-vue": "0.0.10-beta.36",
-    "@vueuse/core": "^10.10.0",
+  "peerDependencies": {
+    "@volverjs/ui-vue": "0.0.10-beta.41",
+    "@vueuse/core": "^10.11.0",
     "ts-dot-prop": "^2.1.4",
-    "vue": "^3.4.27",
+    "vue": "^3.4.29",
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^2.20.0",
+    "@antfu/eslint-config": "^2.21.1",
     "@nabla/vite-plugin-eslint": "^2.0.4",
     "@playwright/experimental-ct-vue": "1.44.1",
     "@testing-library/vue": "^8.1.0",
     "@vitejs/plugin-vue": "^5.0.5",
     "@volverjs/style": "0.1.12-beta.15",
-    "@vue/compiler-sfc": "^3.4.27",
-    "@vue/runtime-core": "^3.4.27",
+    "@vue/compiler-sfc": "^3.4.29",
+    "@vue/runtime-core": "^3.4.29",
     "@vue/test-utils": "^2.4.6",
     "copy": "^0.3.2",
-    "eslint": "^9.4.0",
+    "eslint": "^9.5.0",
     "happy-dom": "^14.12.0",
     "typescript": "^5.4.5",
-    "vite": "^5.2.12",
+    "vite": "^5.3.1",
     "vite-plugin-dts": "^3.9.1",
     "vite-plugin-externalize-deps": "^0.8.0",
     "vitest": "^1.6.0"

package/src/utils.ts

@@ -8,12 +8,13 @@ import {
     ZodSchema,
     ZodNullable,
     ZodOptional,
+    ZodRecord,
     ZodArray,
 } from 'zod'
 import type { FormSchema } from './types'
 
-export function defaultObjectBySchema<Schema extends FormSchema>(schema: Schema,	original: Partial<z.infer<Schema>> & Record<string, unknown> = {}): Partial<z.infer<Schema>> {
-    const getInnerType = <Type extends ZodTypeAny>(
+export function defaultObjectBySchema<Schema extends FormSchema>(schema: Schema, original: Partial<z.infer<Schema>> & Record<string, unknown> = {}): Partial<z.infer<Schema>> {
+    const getSchemaInnerType = <Type extends ZodTypeAny>(
         schema:
             | Type
             | ZodEffects<Type>
@@ -29,7 +30,23 @@ export function defaultObjectBySchema<Schema extends FormSchema>(schema: Schema,
         }
         return toReturn
     }
-    const innerType = getInnerType<AnyZodObject>(schema)
+    const isSchemaOptional = <Type extends ZodTypeAny>(
+        schema:
+            | Type
+            | ZodEffects<Type>
+            | ZodEffects<ZodEffects<Type>>
+            | ZodOptional<Type>,
+    ) => {
+        let toReturn = schema
+        while (toReturn instanceof ZodEffects) {
+            toReturn = toReturn.innerType()
+        }
+        if (toReturn instanceof ZodOptional) {
+            return true
+        }
+        return false
+    }
+    const innerType = getSchemaInnerType<AnyZodObject>(schema)
     const unknownKeys
 		= innerType instanceof ZodObject
 		    ? innerType._def.unknownKeys === 'passthrough'
@@ -40,7 +57,8 @@ export function defaultObjectBySchema<Schema extends FormSchema>(schema: Schema,
             (Object.entries(innerType.shape) as [string, ZodTypeAny][]).map(
                 ([key, subSchema]) => {
                     const originalValue = original[key]
-                    let innerType = getInnerType(subSchema)
+                    const isOptional = isSchemaOptional(subSchema)
+                    let innerType = getSchemaInnerType(subSchema)
                     let defaultValue: Partial<z.infer<Schema>> | undefined
                     if (innerType instanceof ZodDefault) {
                         defaultValue = innerType._def.defaultValue()
@@ -52,6 +70,9 @@ export function defaultObjectBySchema<Schema extends FormSchema>(schema: Schema,
                     ) {
                         return [key, originalValue]
                     }
+                    if ((originalValue === undefined || originalValue === null) && isOptional) {
+                        return [key, defaultValue]
+                    }
                     if (innerType instanceof ZodSchema) {
                         const parse = subSchema.safeParse(originalValue)
                         if (parse.success) {
@@ -63,7 +84,7 @@ export function defaultObjectBySchema<Schema extends FormSchema>(schema: Schema,
                         && Array.isArray(originalValue)
                         && originalValue.length
                     ) {
-                        const arrayType = getInnerType(innerType._def.type)
+                        const arrayType = getSchemaInnerType(innerType._def.type)
                         if (arrayType instanceof ZodObject) {
                             return [
                                 key,
@@ -76,10 +97,19 @@ export function defaultObjectBySchema<Schema extends FormSchema>(schema: Schema,
 											typeof arrayType
 										>,
                                     ),
-                                ) ?? defaultValue,
+                                ),
                             ]
                         }
                     }
+                    if (innerType instanceof ZodRecord && originalValue) {
+                        const valueType = getSchemaInnerType(innerType._def.valueType)
+                        if (valueType instanceof ZodObject) {
+                            return [key, Object.keys(originalValue).reduce((acc: Record<string, unknown>, recordKey: string) => {
+                                acc[recordKey] = defaultObjectBySchema(valueType, originalValue[recordKey])
+                                return acc
+                            }, {})]
+                        }
+                    }
                     if (innerType instanceof ZodObject) {
                         return [
                             key,