vlite3 0.4.3 → 0.4.6

package/components/Form/composables/useForm.js

@@ -1,23 +1,23 @@
 import { ref as v, computed as K, watch as L } from "vue";
-import { initializeFormValues as B, deepClone as m, cleanSubmitValues as Q, getNestedValue as M, evaluateConditional as z, setNestedValue as w, collectFileFields as W, filterNullCustomFields as X } from "../utils/form.utils.js";
+import { initializeFormValues as B, deepClone as m, cleanSubmitValues as Q, getNestedValue as M, evaluateConditional as w, setNestedValue as x, collectFileFields as W, filterNullCustomFields as X } from "../utils/form.utils.js";
 import { useFileUpload as Y } from "./useFileUpload.js";
-function te(x) {
-  const { schema: o, values: U, isUpdate: F = !1, folderId: g, onSubmit: j } = x, { handleUploadFile: E } = Y(), t = v(B(o, U)), u = v({}), b = v(!1), d = v(!1), h = v(m(t.value)), y = K(() => o ? Array.isArray(o[0]) ? o.flat() : o : []);
+function te(b) {
+  const { schema: o, values: U, isUpdate: F = !1, folderId: g, onSubmit: j } = b, { handleUploadFile: E } = Y(), t = v(B(o, U)), u = v({}), h = v(!1), d = v(!1), V = v(m(t.value)), y = K(() => o ? Array.isArray(o[0]) ? o.flat() : o : []);
   L(
     () => U,
     (e) => {
-      e && (t.value = B(o, e), h.value = m(t.value), d.value = !1);
+      e && (t.value = B(o, e), V.value = m(t.value), d.value = !1);
     },
     { deep: !0 }
   );
-  const V = () => ({
+  const S = () => ({
     values: t.value,
     isUpdate: F
   }), C = (e) => M(t.value, e), T = (e) => u.value[e] || "", N = (e, l) => {
     l ? u.value[e] = l : delete u.value[e];
-  }, S = () => {
+  }, A = () => {
     u.value = {};
-  }, O = (e) => e.when ? z(e.when, V()) : !0, D = (e) => z(e.disabled, V()), I = (e) => z(e.readonly, V()), P = (e) => {
+  }, O = (e) => e.when ? w(e.when, S()) : !0, D = (e) => w(e.disabled, S()), I = (e) => w(e.readonly, S()), P = (e) => {
     const l = C(e.name);
     let a = "";
     if (e.required && (l == null || l === "" || Array.isArray(l) && l.length === 0) && (a = `${e.label || e.name} is required`), !a && e.maxFileSize) {
@@ -43,7 +43,7 @@ function te(x) {
       isUpdate: F
     })), a ? u.value[e.name] = a : delete u.value[e.name], a;
   }, $ = () => {
-    S();
+    A();
     let e = !0;
     for (const l of y.value) {
       if (!O(l) || D(l)) continue;
@@ -51,7 +51,7 @@ function te(x) {
     }
     return e;
   }, R = (e, l, a) => {
-    t.value = w(t.value, e, l), d.value = !0, delete u.value[e];
+    t.value = x(t.value, e, l), d.value = !0, delete u.value[e];
     const i = y.value.find((n) => n.name === e);
     if (i?.updateValues) {
       const n = i.updateValues({
@@ -76,8 +76,8 @@ function te(x) {
       if (Array.isArray(r)) {
         const q = r.map(async (f) => {
           if (f instanceof File || f && typeof f == "object" && f.file instanceof File) {
-            const A = await E(f, g);
-            return A ? k ? a(f, A) : A : null;
+            const z = await E(f, g);
+            return z ? k ? a(f, z) : z : null;
           }
           return f;
         }), p = await Promise.all(q);
@@ -92,7 +92,7 @@ function te(x) {
       }
     });
     return (await Promise.all(i)).forEach((s) => {
-      s && Object.assign(e, w(e, s.name, s.value));
+      s && Object.assign(e, x(e, s.name, s.value));
     }), e;
   }, H = (e) => {
     const l = { ...e };
@@ -101,7 +101,7 @@ function te(x) {
         const i = M(l, a.name);
         if (Array.isArray(i)) {
           const n = X(i, a.props.schema);
-          Object.assign(l, w(l, a.name, n));
+          Object.assign(l, x(l, a.name, n));
         }
       }
     return l;
@@ -109,7 +109,7 @@ function te(x) {
   return {
     formValues: t,
     errors: u,
-    isSubmitting: b,
+    isSubmitting: h,
     isDirty: d,
     handleFieldChange: R,
     validateField: P,
@@ -120,23 +120,28 @@ function te(x) {
     getFieldValue: C,
     getFieldError: T,
     setFieldError: N,
-    clearErrors: S,
+    clearErrors: A,
     resetForm: () => {
-      t.value = m(h.value), S(), d.value = !1;
+      t.value = m(V.value), A(), d.value = !1;
     },
     handleSubmit: async () => {
       if ($()) {
-        b.value = !0;
+        h.value = !0;
         try {
           let l = await G();
-          l = H(l), l = Q(l, o, x.emitFields, []), j && await j({
+          l = H(l), l = Q(
+            l,
+            o,
+            b.emitFields,
+            b.emitFields
+          ), j && await j({
             values: l,
             isUpdate: F
-          }), d.value = !1, h.value = m(l);
+          }), d.value = !1, V.value = m(l);
         } catch (l) {
           throw console.error("[useForm] Submit error:", l), l;
         } finally {
-          b.value = !1;
+          h.value = !1;
         }
       }
     },

package/components/Form/utils/form.utils.js

@@ -1,93 +1,93 @@
 function k(e) {
   return !!e && typeof e == "object";
 }
-function p(e, n) {
-  if (!n || !e) return;
-  const r = n.split(".");
-  let l = e;
-  for (const t of r) {
-    if (l == null) return;
-    l = l[t];
+function d(e, r) {
+  if (!r || !e) return;
+  const f = r.split(".");
+  let y = e;
+  for (const n of f) {
+    if (y == null) return;
+    y = y[n];
   }
-  return l;
+  return y;
 }
-function m(e, n, r) {
-  if (!n) return e;
-  const l = n.split("."), t = { ...e };
-  let f = t;
-  for (let i = 0; i < l.length - 1; i++) {
-    const c = l[i];
-    Array.isArray(f[c]) ? f[c] = [...f[c]] : f[c] = f[c] ? { ...f[c] } : {}, f = f[c];
+function v(e, r, f) {
+  if (!r) return e;
+  const y = r.split("."), n = { ...e };
+  let o = n;
+  for (let i = 0; i < y.length - 1; i++) {
+    const c = y[i];
+    Array.isArray(o[c]) ? o[c] = [...o[c]] : o[c] = o[c] ? { ...o[c] } : {}, o = o[c];
   }
-  return f[l[l.length - 1]] = r, t;
+  return o[y[y.length - 1]] = f, n;
 }
-function v(e, n) {
-  return !k(n) || !n.name ? e : p(e, n.name) === void 0 && n.value !== void 0 ? m(e, n.name, n.value) : e;
+function h(e, r) {
+  return !k(r) || !r.name ? e : d(e, r.name) === void 0 && r.value !== void 0 ? v(e, r.name, r.value) : e;
 }
-function E(e, n) {
-  let r = n ? d(n) : {};
-  const l = Array.isArray(e[0]) ? e.flat() : e;
-  for (const t of l) {
-    if (!t.name) continue;
-    const f = t.mapFrom || t.name;
-    let i = n ? p(n, f) : void 0;
+function E(e, r) {
+  let f = r ? m(r) : {};
+  const y = Array.isArray(e[0]) ? e.flat() : e;
+  for (const n of y) {
+    if (!n.name) continue;
+    const o = n.mapFrom || n.name;
+    let i = r ? d(r, o) : void 0;
     if (i != null) {
-      const c = t.valueKey || t.key;
+      const c = n.valueKey || n.key;
       c && (Array.isArray(i) ? i = i.map(
-        (u) => u && typeof u == "object" ? p(u, c) : u
-      ) : typeof i == "object" && (i = p(i, c))), t.format && (i = t.format(i, n || {}));
+        (u) => u && typeof u == "object" ? d(u, c) : u
+      ) : typeof i == "object" && (i = d(i, c))), n.format && (i = n.format(i, r || {}));
     }
     if (i === void 0) {
-      if (t.mapFrom && n) {
-        const c = p(n, t.name);
+      if (n.mapFrom && r) {
+        const c = d(r, n.name);
         c !== void 0 && (i = c);
       }
       if (i === void 0) {
-        const c = typeof t.value == "function" ? t.value() : t.value;
-        c !== void 0 && Object.assign(r, m(r, t.name, c));
+        const c = typeof n.value == "function" ? n.value() : n.value;
+        c !== void 0 && Object.assign(f, v(f, n.name, c));
       } else
-        Object.assign(r, m(r, t.name, i));
+        Object.assign(f, v(f, n.name, i));
     } else
-      Object.assign(r, m(r, t.name, i));
-    r = v(r, t.addonLeft), r = v(r, t.addonRight);
+      Object.assign(f, v(f, n.name, i));
+    f = h(f, n.addonLeft), f = h(f, n.addonRight);
   }
-  return r;
+  return f;
 }
-function O(e, n) {
-  return e === void 0 ? !1 : typeof e == "boolean" ? e : typeof e == "function" ? e(n) : !1;
+function O(e, r) {
+  return e === void 0 ? !1 : typeof e == "boolean" ? e : typeof e == "function" ? e(r) : !1;
 }
-function S(e, n) {
-  return Array.isArray(e) ? e.filter((r) => r ? !n.every((t) => {
-    const f = r[t.name];
-    return f == null || f === "";
+function S(e, r) {
+  return Array.isArray(e) ? e.filter((f) => f ? !r.every((n) => {
+    const o = f[n.name];
+    return o == null || o === "";
   }) : !1) : [];
 }
-function F(e, n) {
-  const r = [], l = Array.isArray(e[0]) ? e.flat() : e;
-  for (const t of l) {
-    if (!t.name) continue;
-    const f = t.type;
-    if (f === "file" || f === "avatarUpload" || f === "fileUploader") {
-      const i = p(n, t.name);
-      i && r.push({
-        name: t.name,
+function F(e, r) {
+  const f = [], y = Array.isArray(e[0]) ? e.flat() : e;
+  for (const n of y) {
+    if (!n.name) continue;
+    const o = n.type;
+    if (o === "file" || o === "avatarUpload" || o === "fileUploader") {
+      const i = d(r, n.name);
+      i && f.push({
+        name: n.name,
         value: i,
-        type: f,
-        field: t
+        type: o,
+        field: n
       });
     }
-    if (f === "customFields" && t.props?.schema) {
-      const i = p(n, t.name);
+    if (o === "customFields" && n.props?.schema) {
+      const i = d(r, n.name);
       if (Array.isArray(i)) {
-        const u = t.props.schema.filter(
+        const u = n.props.schema.filter(
           (s) => s.type === "file" || s.type === "avatarUpload" || s.type === "fileUploader"
         );
-        u.length > 0 && i.forEach((s, o) => {
+        u.length > 0 && i.forEach((s, t) => {
           u.forEach((a) => {
-            const y = s?.[a.name];
-            y && r.push({
-              name: `${t.name}.${o}.${a.name}`,
-              value: y,
+            const l = s?.[a.name];
+            l && f.push({
+              name: `${n.name}.${t}.${a.name}`,
+              value: l,
               type: a.type,
               field: a
             });
@@ -96,79 +96,85 @@ function F(e, n) {
       }
     }
   }
-  return r;
+  return f;
 }
-function d(e) {
+function m(e) {
   if (e === null || typeof e != "object") return e;
   if (e instanceof Date) return new Date(e.getTime());
   if (e instanceof File) return e;
-  if (Array.isArray(e)) return e.map((r) => d(r));
-  const n = {};
-  for (const r in e)
-    Object.prototype.hasOwnProperty.call(e, r) && (n[r] = d(e[r]));
-  return n;
+  if (Array.isArray(e)) return e.map((f) => m(f));
+  const r = {};
+  for (const f in e)
+    Object.prototype.hasOwnProperty.call(e, f) && (r[f] = m(e[f]));
+  return r;
 }
 function x(e) {
   return e ? typeof e == "object" && (typeof e.render == "function" || typeof e.setup == "function" || e.__name !== void 0 || e.name !== void 0) : !1;
 }
-function g(e, n, r, l) {
-  const t = r === void 0 && l === void 0, f = t ? d(e) : {}, i = Array.isArray(n[0]) ? n.flat() : n, c = r || [], u = l || [];
+function g(e, r, f, y) {
+  const n = f === void 0 && y === void 0, o = n ? m(e) : {}, i = Array.isArray(r[0]) ? r.flat() : r, c = f || [], u = y || [];
   for (const s of i) {
     if (!s.name) continue;
-    let o = p(e, s.name);
-    if (o === void 0) continue;
-    if (s.type === "customFields" && s.props?.schema && Array.isArray(o)) {
+    let t = d(e, s.name);
+    if (t === void 0) continue;
+    if (t = m(t), s.type === "customFields" && s.props?.schema && Array.isArray(t)) {
       const A = s.props.schema;
-      o = o.map((h) => g(h, A, r, l));
+      t = t.map((p) => g(p, A, f, y));
     }
     let a = !1;
-    s.transform && (o = s.transform(o, e), a = !0);
-    const y = s.mapTo || s.name;
-    y !== s.name && (a = !0, t && !s.name.includes(".") && delete f[s.name]), !t || a ? Object.assign(f, m(f, y, o)) : Object.assign(f, m(f, s.name, o));
+    s.transform && (t = s.transform(t, e), a = !0);
+    const l = s.mapTo || s.name;
+    l !== s.name && (a = !0, n && !s.name.includes(".") && delete o[s.name]), !n || a ? Object.assign(o, v(o, l, t)) : Object.assign(o, v(o, s.name, t));
   }
   if (c.length > 0) {
-    const s = (o, a) => {
-      if (!(!o || typeof o != "object") && !(!a || typeof a != "object"))
-        if (Array.isArray(o) && Array.isArray(a))
-          o.forEach((y, A) => {
-            a[A] && s(y, a[A]);
+    const s = (t, a) => {
+      if (!(!t || typeof t != "object") && !(!a || typeof a != "object"))
+        if (Array.isArray(t) && Array.isArray(a)) {
+          for (const l of c) {
+            const A = t.find((p) => p && typeof p == "object" && p[l] !== void 0)?.[l];
+            A !== void 0 && a.forEach((p) => {
+              p && typeof p == "object" && p[l] === void 0 && (p[l] = m(A));
+            });
+          }
+          t.forEach((l, A) => {
+            a[A] && s(l, a[A]);
           });
-        else {
-          for (const y of c)
-            o[y] !== void 0 && a[y] === void 0 && (a[y] = d(o[y]));
-          for (const y in a)
-            typeof a[y] == "object" && typeof o[y] == "object" && s(o[y], a[y]);
+        } else {
+          for (const l of c)
+            t[l] !== void 0 && a[l] === void 0 && (a[l] = m(t[l]));
+          for (const l in a)
+            typeof a[l] == "object" && typeof t[l] == "object" && s(t[l], a[l]);
         }
     };
-    for (const o of c)
-      e[o] !== void 0 && f[o] === void 0 && (f[o] = d(e[o]));
-    s(e, f);
+    for (const t of c)
+      e[t] !== void 0 && o[t] === void 0 && (o[t] = m(e[t]));
+    s(e, o);
   }
   if (u.length > 0) {
-    const s = (o) => {
-      if (!(!o || typeof o != "object"))
-        if (Array.isArray(o))
-          o.forEach(s);
+    const s = (t) => {
+      if (!(!t || typeof t != "object"))
+        if (Array.isArray(t))
+          t.forEach(s);
         else {
           for (const a of u)
-            delete o[a];
-          for (const a in o)
-            s(o[a]);
+            delete t[a];
+          for (const a in t)
+            s(t[a]);
         }
     };
-    s(f);
+    s(o);
   }
-  return f;
+  return o;
 }
 export {
   g as cleanSubmitValues,
   F as collectFileFields,
-  d as deepClone,
+  m as deepClone,
   O as evaluateConditional,
   S as filterNullCustomFields,
-  p as getNestedValue,
+  d as getNestedValue,
   E as initializeFormValues,
   k as isAddonObject,
   x as isComponent,
-  m as setNestedValue
+  v as setNestedValue
 };

package/package.json

@@ -3,7 +3,7 @@
   "private": false,
   "description": "A Vue 3 UI component library built with Tailwind CSS.",
   "license": "MIT",
-  "version": "0.4.3",
+  "version": "0.4.6",
   "type": "module",
   "main": "index.js",
   "module": "index.js",