@volverjs/form-vue 0.0.11 → 0.0.12-beta.2

package/dist/index.es.js

@@ -1,10 +1,10 @@
 import { defineComponent as G, computed as y, onMounted as R, onBeforeUnmount as T, inject as O, toRefs as U, watch as w, provide as z, readonly as k, resolveComponent as g, defineAsyncComponent as D, h as x, ref as E, toRaw as Z, isProxy as j, withModifiers as F, unref as C, getCurrentInstance as ee } from "vue";
 import { watchThrottled as re } from "@vueuse/core";
-import { ZodObject as J, ZodDefault as te, ZodNullable as ae, ZodSchema as ne, ZodEffects as se } from "zod";
-function _(e) {
+import { ZodObject as J, ZodDefault as te, ZodNullable as ae, ZodSchema as ne, ZodEffects as se, ZodOptional as oe } from "zod";
+function A(e) {
   return Array.isArray(e);
 }
-function oe(e) {
+function ue(e) {
   return typeof e < "u";
 }
 function M(e) {
@@ -19,53 +19,53 @@ function P(e) {
 function $(e) {
   return typeof e > "u";
 }
-const ue = /^[0-9]+$/, ie = ["__proto__", "prototype", "constructor"];
+const ie = /^[0-9]+$/, le = ["__proto__", "prototype", "constructor"];
 function N(e, s, l) {
-  const o = oe(l) ? l : void 0;
+  const u = ue(l) ? l : void 0;
   if (!q(e) || !P(s))
-    return o;
+    return u;
   const n = Q(s);
   if (n.length !== 0) {
     for (const r of n) {
       if (r === "*")
         continue;
-      const u = function(a) {
-        return a.map((i) => $(i) || M(i) ? i : _(i) ? u(i) : i[r]);
+      const o = function(a) {
+        return a.map((i) => $(i) || M(i) ? i : A(i) ? o(i) : i[r]);
       };
-      if (_(e) && !ue.test(r) ? e = u(e) : e = e[r], $(e) || M(e))
+      if (A(e) && !ie.test(r) ? e = o(e) : e = e[r], $(e) || M(e))
         break;
     }
-    return $(e) ? o : e;
+    return $(e) ? u : e;
   }
 }
 function H(e, s, l) {
   if (!q(e) || !P(s))
     return;
-  const o = Q(s);
-  if (o.length === 0)
+  const u = Q(s);
+  if (u.length === 0)
     return;
-  const n = o.length;
+  const n = u.length;
   for (let r = 0; r < n; r++) {
-    const u = o[r];
+    const o = u[r];
     if (r === n - 1) {
-      e[u] = l;
+      e[o] = l;
       return;
     }
-    if (u === "*" && _(e)) {
-      const a = o.slice(r + 1).join(".");
+    if (o === "*" && A(e)) {
+      const a = u.slice(r + 1).join(".");
       for (const i of e)
         H(i, a, l);
       return;
     }
-    $(e[u]) && (e[u] = {}), e = e[u];
+    $(e[o]) && (e[o] = {}), e = e[o];
   }
 }
 function Q(e) {
   const s = e.split(/[.]|(?:\[(\d|\*)\])/).filter((l) => !!l);
-  return s.some((l) => ie.indexOf(l) !== -1) ? [] : s;
+  return s.some((l) => le.indexOf(l) !== -1) ? [] : s;
 }
 var f = /* @__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 = "datetimeLocal", 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))(f || {}), L = /* @__PURE__ */ ((e) => (e.invalid = "invalid", e.valid = "valid", e))(L || {});
-const le = (e, s, l, o) => G({
+const fe = (e, s, l, u) => G({
   name: "FieldComponent",
   props: {
     type: {
@@ -100,7 +100,7 @@ const le = (e, s, l, o) => G({
   },
   emits: ["invalid", "valid", "update:formData", "update:modelValue"],
   expose: ["invalid", "invalidLabel", "errors"],
-  setup(n, { slots: r, emit: u }) {
+  setup(n, { slots: r, emit: o }) {
     const a = y({
       get() {
         if (t != null && t.formData)
@@ -114,7 +114,7 @@ const le = (e, s, l, o) => G({
           Object(t.formData.value),
           String(n.name),
           v
-        ), u("update:modelValue", {
+        ), o("update:modelValue", {
           newValue: a.value,
           formData: t == null ? void 0 : t.formData
         }));
@@ -134,18 +134,18 @@ const le = (e, s, l, o) => G({
       var v;
       return (v = d.value) == null ? void 0 : v._errors;
     }), b = y(() => d.value !== void 0), S = w(b, () => {
-      b.value ? (u("invalid", c.value), i && i.errors.value.set(
+      b.value ? (o("invalid", c.value), i && i.errors.value.set(
         n.name,
         {
           _errors: c.value
         }
-      )) : (u("valid", a.value), i && i.errors.value.delete(
+      )) : (o("valid", a.value), i && i.errors.value.delete(
         n.name
       ));
     }), V = w(
       () => t == null ? void 0 : t.formData,
       () => {
-        u("update:formData", t == null ? void 0 : t.formData);
+        o("update:formData", t == null ? void 0 : t.formData);
       },
       { deep: !0 }
     ), p = (v) => {
@@ -198,7 +198,7 @@ const le = (e, s, l, o) => G({
             })) ?? r.defalut;
           }
         };
-      if (!((o == null ? void 0 : o.lazyLoad) ?? n.lazyLoad)) {
+      if (!((u == null ? void 0 : u.lazyLoad) ?? n.lazyLoad)) {
         let v;
         switch (n.type) {
           case f.select:
@@ -232,7 +232,7 @@ const le = (e, s, l, o) => G({
         );
       }
       return D(async () => {
-        switch (o != null && o.sideEffects && await Promise.resolve(o.sideEffects(n.type)), n.type) {
+        switch (u != null && u.sideEffects && await Promise.resolve(u.sideEffects(n.type)), n.type) {
           case f.textarea:
             return import("@volverjs/ui-vue/vv-textarea");
           case f.radio:
@@ -257,22 +257,24 @@ const le = (e, s, l, o) => G({
   }
 }), X = (e, s = {}) => {
   const l = (r) => {
-    let u = r;
-    for (; u instanceof se; )
-      u = u.innerType();
-    return u;
-  }, o = l(e);
+    let o = r;
+    for (; o instanceof se; )
+      o = o.innerType();
+    for (; o instanceof oe; )
+      o = o._def.innerType;
+    return o;
+  }, u = l(e);
   return {
-    ...(o instanceof J ? o._def.unknownKeys === "passthrough" : !1) ? s : {},
+    ...(u instanceof J ? u._def.unknownKeys === "passthrough" : !1) ? s : {},
     ...Object.fromEntries(
-      Object.entries(o.shape).map(
-        ([r, u]) => {
-          const a = s[r], i = l(u);
+      Object.entries(u.shape).map(
+        ([r, o]) => {
+          const a = s[r], i = l(o);
           let t;
           if (i instanceof te && (t = i._def.defaultValue()), a === null && i instanceof ae)
             return [r, a];
           if (i instanceof ne) {
-            const m = u.safeParse(a);
+            const m = o.safeParse(a);
             if (m.success)
               return [r, m.data ?? t];
           }
@@ -287,8 +289,8 @@ const le = (e, s, l, o) => G({
       )
     )
   };
-}, fe = (e, s, l) => {
-  const o = E(), n = E(), r = E(), u = G({
+}, ve = (e, s, l) => {
+  const u = E(), n = E(), r = E(), o = G({
     name: "FormComponent",
     props: {
       modelValue: {
@@ -322,7 +324,7 @@ const le = (e, s, l, o) => G({
       ), re(
         r,
         (d) => {
-          ((o.value || (l == null ? void 0 : l.continuosValidation)) ?? a.continuosValidation) && t(), (!d || !a.modelValue || JSON.stringify(d) !== JSON.stringify(a.modelValue)) && i("update:modelValue", d);
+          ((u.value || (l == null ? void 0 : l.continuosValidation)) ?? a.continuosValidation) && t(), (!d || !a.modelValue || JSON.stringify(d) !== JSON.stringify(a.modelValue)) && i("update:modelValue", d);
         },
         {
           deep: !0,
@@ -331,20 +333,20 @@ const le = (e, s, l, o) => G({
       );
       const t = (d = r.value) => {
         const c = e.safeParse(d);
-        return c.success ? (o.value = void 0, n.value = L.valid, r.value = c.data, i("update:modelValue", r.value), i("valid", c.data), !0) : (o.value = c.error.format(), n.value = L.invalid, i("invalid", o.value), !1);
+        return c.success ? (u.value = void 0, n.value = L.valid, r.value = c.data, i("update:modelValue", r.value), i("valid", c.data), !0) : (u.value = c.error.format(), n.value = L.invalid, i("invalid", u.value), !1);
       }, m = () => t() ? (i("submit", r.value), !0) : !1, h = y(() => n.value === L.invalid);
       return z(s, {
         formData: r,
         submit: m,
         validate: t,
-        errors: k(o),
+        errors: k(u),
         status: k(n),
         invalid: h
       }), {
         formData: r,
         submit: m,
         validate: t,
-        errors: k(o),
+        errors: k(u),
         status: k(n),
         invalid: h
       };
@@ -372,15 +374,15 @@ const le = (e, s, l, o) => G({
     }
   });
   return {
-    errors: o,
+    errors: u,
     status: n,
     formData: r,
     /**
      * An hack to add types to the default slot
      */
-    VvForm: u
+    VvForm: o
   };
-}, ve = (e, s) => G({
+}, de = (e, s) => G({
   name: "WrapperComponent",
   props: {
     name: {
@@ -394,8 +396,8 @@ const le = (e, s, l, o) => G({
   },
   emits: ["invalid", "valid"],
   expose: ["fields", "invalid"],
-  setup(o, { emit: n }) {
-    const r = O(e), u = O(s, void 0), a = E(/* @__PURE__ */ new Set()), i = E(/* @__PURE__ */ new Map()), { name: t } = U(o);
+  setup(u, { emit: n }) {
+    const r = O(e), o = O(s, void 0), a = E(/* @__PURE__ */ new Set()), i = E(/* @__PURE__ */ new Map()), { name: t } = U(u);
     z(s, {
       name: k(t),
       errors: i,
@@ -403,19 +405,19 @@ const le = (e, s, l, o) => G({
     }), w(
       a,
       (h) => {
-        u != null && u.fields && h.forEach((d) => {
-          u == null || u.fields.value.add(d);
+        o != null && o.fields && h.forEach((d) => {
+          o == null || o.fields.value.add(d);
         });
       },
       { deep: !0 }
     ), w(
       () => new Map(i.value),
       (h, d) => {
-        u != null && u.errors && (Array.from(d.keys()).forEach((c) => {
-          u.errors.value.delete(c);
+        o != null && o.errors && (Array.from(d.keys()).forEach((c) => {
+          o.errors.value.delete(c);
         }), Array.from(h.keys()).forEach((c) => {
           const b = h.get(c);
-          b && u.errors.value.set(c, b);
+          b && o.errors.value.set(c, b);
         }));
       },
       { deep: !0 }
@@ -434,11 +436,11 @@ const le = (e, s, l, o) => G({
     };
   },
   render() {
-    var o, n;
+    var u, n;
     return this.tag ? x(this.tag, null, {
       default: () => {
-        var r, u;
-        return ((u = (r = this.$slots).default) == null ? void 0 : u.call(r, {
+        var r, o;
+        return ((o = (r = this.$slots).default) == null ? void 0 : o.call(r, {
           invalid: this.invalid,
           formData: this.formData,
           submit: this.submit,
@@ -447,7 +449,7 @@ const le = (e, s, l, o) => G({
           fieldsErrors: this.fieldsErrors
         })) ?? this.$slots.defalut;
       }
-    }) : ((n = (o = this.$slots).default) == null ? void 0 : n.call(o, {
+    }) : ((n = (u = this.$slots).default) == null ? void 0 : n.call(u, {
       invalid: this.invalid,
       formData: this.formData,
       submit: this.submit,
@@ -456,7 +458,7 @@ const le = (e, s, l, o) => G({
       fieldsErrors: this.fieldsErrors
     })) ?? this.$slots.defalut;
   }
-}), de = (e, s) => {
+}), ce = (e, s) => {
   const l = G({
     props: {
       schema: {
@@ -464,15 +466,15 @@ const le = (e, s, l, o) => G({
         required: !0
       }
     },
-    setup(o, { slots: n }) {
+    setup(u, { slots: n }) {
       const r = O(e);
       if (!(r != null && r.formData))
         return;
-      const u = typeof o.schema == "function" ? o.schema(r) : o.schema;
+      const o = typeof u.schema == "function" ? u.schema(r) : u.schema;
       let a;
       return () => {
         var i;
-        return u.reduce(
+        return o.reduce(
           (t, m) => {
             const h = typeof m == "function" ? m(r) : m, {
               vvIs: d,
@@ -500,7 +502,7 @@ const le = (e, s, l, o) => G({
                 return t;
             } else
               a = void 0;
-            const A = S ? x(l, {
+            const _ = S ? x(l, {
               schema: S
             }) : void 0;
             return c ? (t.push(
@@ -514,15 +516,15 @@ const le = (e, s, l, o) => G({
                   showValid: K,
                   props: v
                 },
-                b ?? A
+                b ?? _
               )
             ), t) : d ? (t.push(
               x(
                 d,
                 v,
-                b ?? A
+                b ?? _
               )
-            ), t) : (S && t.push(A), t);
+            ), t) : (S && t.push(_), t);
           },
           [
             (i = n == null ? void 0 : n.default) == null ? void 0 : i.call(n, {
@@ -540,48 +542,48 @@ const le = (e, s, l, o) => G({
   });
   return l;
 }, B = (e, s = {}) => {
-  const l = Symbol(), o = Symbol(), n = Symbol(), { VvForm: r, errors: u, status: a, formData: i } = fe(
+  const l = Symbol(), u = Symbol(), n = Symbol(), { VvForm: r, errors: o, status: a, formData: i } = ve(
     e,
     l,
     s
-  ), t = ve(
+  ), t = de(
     l,
-    o
-  ), m = le(
+    u
+  ), m = fe(
     l,
-    o,
+    u,
     n,
     s
-  ), h = de(l, m);
+  ), h = ce(l, m);
   return {
     VvForm: r,
     VvFormWrapper: t,
     VvFormField: m,
     VvFormTemplate: h,
     formInjectionKey: l,
-    formWrapperInjectionKey: o,
+    formWrapperInjectionKey: u,
     formFieldInjectionKey: n,
-    errors: u,
+    errors: o,
     status: a,
     formData: i
   };
-}, Y = Symbol(), be = (e) => {
+}, Y = Symbol(), pe = (e) => {
   let s = {};
   return e.schema && (s = B(e.schema, e)), {
     ...s,
-    install(l, { global: o = !1 } = {}) {
-      l.provide(Y, e), o && (l.config.globalProperties.$vvForm = e, s != null && s.VvForm && l.component("VvForm", s.VvForm), s != null && s.VvFormWrapper && l.component("VvFormWrapper", s.VvFormWrapper), s != null && s.VvFormField && l.component("VvFormField", s.VvFormField), s != null && s.VvFormTemplate && l.component("VvFormTemplate", s.VvFormTemplate));
+    install(l, { global: u = !1 } = {}) {
+      l.provide(Y, e), u && (l.config.globalProperties.$vvForm = e, s != null && s.VvForm && l.component("VvForm", s.VvForm), s != null && s.VvFormWrapper && l.component("VvFormWrapper", s.VvFormWrapper), s != null && s.VvFormField && l.component("VvFormField", s.VvFormField), s != null && s.VvFormTemplate && l.component("VvFormTemplate", s.VvFormTemplate));
     }
   };
-}, pe = (e, s = {}) => ee() ? B(e, {
+}, ye = (e, s = {}) => ee() ? B(e, {
   ...O(Y, {}),
   ...s
-}) : B(e, s), ye = (e, s = {}) => B(e, s);
+}) : B(e, s), Ve = (e, s = {}) => B(e, s);
 export {
   f as FormFieldType,
-  be as createForm,
+  pe as createForm,
   X as defaultObjectBySchema,
-  ye as formFactory,
+  Ve as formFactory,
   Y as pluginInjectionKey,
-  pe as useForm
+  ye as useForm
 };

package/dist/index.umd.js

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

package/package.json

@@ -19,7 +19,7 @@
   "bugs": {
     "url": "https://github.com/volverjs/form-vue/issues"
   },
-  "version": "0.0.11",
+  "version": "0.0.12-beta.2",
   "engines": {
     "node": ">= 16.x"
   },
@@ -38,31 +38,31 @@
     "@volverjs/ui-vue": "0.0.6-beta.7",
     "@vueuse/core": "^10.1.2",
     "ts-dot-prop": "^2.1.2",
-    "vue": "^3.2.47",
+    "vue": "^3.3.2",
     "zod": "^3.21.4"
   },
   "devDependencies": {
-    "@playwright/experimental-ct-vue": "^1.32.3",
+    "@playwright/experimental-ct-vue": "1.32.3",
     "@testing-library/vue": "^7.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.59.2",
-    "@typescript-eslint/parser": "^5.59.2",
-    "@vitejs/plugin-vue": "^4.2.1",
-    "@volverjs/style": "^0.1.8",
-    "@vue/compiler-sfc": "^3.2.47",
-    "@vue/runtime-core": "^3.2.47",
+    "@typescript-eslint/eslint-plugin": "^5.59.6",
+    "@typescript-eslint/parser": "^5.59.6",
+    "@vitejs/plugin-vue": "^4.2.3",
+    "@volverjs/style": "^0.1.10",
+    "@vue/compiler-sfc": "^3.3.2",
+    "@vue/runtime-core": "^3.3.2",
     "@vue/test-utils": "^2.3.2",
     "copy": "^0.3.2",
-    "eslint": "^8.39.0",
+    "eslint": "^8.40.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "happy-dom": "^9.10.4",
+    "happy-dom": "^9.18.3",
     "prettier": "^2.8.8",
     "typescript": "^5.0.4",
-    "vite": "^4.3.4",
+    "vite": "^4.3.7",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-externalize-deps": "^0.6.0",
     "vitest": "^0.30.1",
-    "vue-tsc": "^1.6.3"
+    "vue-tsc": "^1.6.5"
   },
   "typesVersions": {
     "*": {

package/src/utils.ts

@@ -7,6 +7,7 @@ import {
 	ZodEffects,
 	ZodSchema,
 	ZodNullable,
+	ZodOptional,
 } from 'zod'
 import type { FormSchema } from './types'
 
@@ -15,12 +16,19 @@ export const defaultObjectBySchema = <Schema extends FormSchema>(
 	original: Partial<z.infer<Schema>> = {},
 ): Partial<z.infer<Schema>> => {
 	const getInnerType = <Type extends ZodTypeAny>(
-		schema: Type | ZodEffects<Type> | ZodEffects<ZodEffects<Type>>,
+		schema:
+			| Type
+			| ZodEffects<Type>
+			| ZodEffects<ZodEffects<Type>>
+			| ZodOptional<Type>,
 	) => {
 		let toReturn = schema
 		while (toReturn instanceof ZodEffects) {
 			toReturn = toReturn.innerType()
 		}
+		while (toReturn instanceof ZodOptional) {
+			toReturn = toReturn._def.innerType
+		}
 		return toReturn
 	}
 	const innerType = getInnerType<AnyZodObject>(schema)