vlite3 0.4.3 → 0.4.4

package/components/Form/composables/useForm.js

@@ -1,83 +1,85 @@
 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) {
+    let s = "";
+    if (e.required && (l == null || l === "" || Array.isArray(l) && l.length === 0) && (s = `${e.label || e.name} is required`), !s && e.maxFileSize) {
       const i = e.maxFileSize * 1024 * 1024;
       if (l != null && l !== "") {
         const n = Array.isArray(l) ? l : [l];
-        for (const s of n) {
-          const c = s instanceof File ? s.size : s?.fileSize || s?.file?.size || s?.size;
+        for (const a of n) {
+          const c = a instanceof File ? a.size : a?.fileSize || a?.file?.size || a?.size;
           if (c !== void 0 && c > i) {
-            a = `${e.label || e.name} size must be less than ${e.maxFileSize}MB`;
+            s = `${e.label || e.name} size must be less than ${e.maxFileSize}MB`;
             break;
           }
         }
       }
     }
-    if (!a && (e.type === "file" || e.type === "fileUploader") && (e.props?.multiple || e.maxFiles)) {
+    if (!s && (e.type === "file" || e.type === "fileUploader") && (e.props?.multiple || e.maxFiles)) {
       const i = e.maxFiles || e.props?.maxFiles;
-      i && Array.isArray(l) && l.length > i && (a = `Maximum ${i} files allowed`);
+      i && Array.isArray(l) && l.length > i && (s = `Maximum ${i} files allowed`);
     }
-    return !a && e.validation && (a = e.validation({
+    return !s && e.validation && (s = e.validation({
       value: l,
       values: t.value,
       isUpdate: F
-    })), a ? u.value[e.name] = a : delete u.value[e.name], a;
+    })), s ? u.value[e.name] = s : delete u.value[e.name], s;
   }, $ = () => {
-    S();
+    A();
     let e = !0;
     for (const l of y.value) {
       if (!O(l) || D(l)) continue;
       P(l) && (e = !1);
     }
     return e;
-  }, R = (e, l, a) => {
-    t.value = w(t.value, e, l), d.value = !0, delete u.value[e];
+  }, R = (e, l, s) => {
+    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({
         values: t.value,
-        data: a,
+        data: s,
         isUpdate: F,
         updateError: N
       });
       n && typeof n == "object" && (t.value = { ...t.value, ...n });
     }
   }, G = async () => {
-    const e = m(t.value), l = W(o, e), a = (s, c) => {
+    const e = m(t.value), l = W(o, e), s = (a, c) => {
       let r = null;
-      return s instanceof File ? r = s : s && typeof s == "object" && s.file instanceof File && (r = s.file), {
-        fileName: s?.fileName || r?.name || c.split("/").pop() || "unknown",
+      return a instanceof File ? r = a : a && typeof a == "object" && a.file instanceof File && (r = a.file), {
+        // Spread original item to keep any metadata like __typename
+        ...typeof a == "object" && a !== null && !(a instanceof File) ? a : {},
+        fileName: a?.fileName || r?.name || c.split("/").pop() || "unknown",
         fileUrl: c,
-        fileType: s?.fileType || r?.type || "application/octet-stream",
-        fileSize: s?.fileSize || r?.size || 0
+        fileType: a?.fileType || r?.type || "application/octet-stream",
+        fileSize: a?.fileSize || r?.size || 0
       };
-    }, i = l.map(async (s) => {
-      const { name: c, value: r, field: J } = s, k = J.returnFileObject === !0;
+    }, i = l.map(async (a) => {
+      const { name: c, value: r, field: J } = a, k = J.returnFileObject === !0;
       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 ? s(f, z) : z : null;
           }
           return f;
         }), p = await Promise.all(q);
@@ -86,22 +88,22 @@ function te(x) {
         if (r instanceof File || r && typeof r == "object" && r.file instanceof File) {
           const p = await E(r, g);
           if (p)
-            return { name: c, value: k ? a(r, p) : p };
+            return { name: c, value: k ? s(r, p) : p };
         }
         return null;
       }
     });
-    return (await Promise.all(i)).forEach((s) => {
-      s && Object.assign(e, w(e, s.name, s.value));
+    return (await Promise.all(i)).forEach((a) => {
+      a && Object.assign(e, x(e, a.name, a.value));
     }), e;
   }, H = (e) => {
     const l = { ...e };
-    for (const a of y.value)
-      if (a.type === "customFields" && a.props?.schema) {
-        const i = M(l, a.name);
+    for (const s of y.value)
+      if (s.type === "customFields" && s.props?.schema) {
+        const i = M(l, s.name);
         if (Array.isArray(i)) {
-          const n = X(i, a.props.schema);
-          Object.assign(l, w(l, a.name, n));
+          const n = X(i, s.props.schema);
+          Object.assign(l, x(l, s.name, n));
         }
       }
     return l;
@@ -109,7 +111,7 @@ function te(x) {
   return {
     formValues: t,
     errors: u,
-    isSubmitting: b,
+    isSubmitting: h,
     isDirty: d,
     handleFieldChange: R,
     validateField: P,
@@ -120,23 +122,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

@@ -14,12 +14,12 @@ function p(e, n) {
 function m(e, n, r) {
   if (!n) return e;
   const l = n.split("."), t = { ...e };
-  let f = t;
+  let o = 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];
+    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[l[l.length - 1]] = r, t;
 }
 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;
@@ -29,12 +29,12 @@ function E(e, 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;
+    const o = t.mapFrom || t.name;
+    let i = n ? p(n, o) : void 0;
     if (i != null) {
       const c = t.valueKey || t.key;
       c && (Array.isArray(i) ? i = i.map(
-        (u) => u && typeof u == "object" ? p(u, c) : u
+        (y) => y && typeof y == "object" ? p(y, c) : y
       ) : typeof i == "object" && (i = p(i, c))), t.format && (i = t.format(i, n || {}));
     }
     if (i === void 0) {
@@ -58,36 +58,36 @@ function O(e, n) {
 }
 function S(e, n) {
   return Array.isArray(e) ? e.filter((r) => r ? !n.every((t) => {
-    const f = r[t.name];
-    return f == null || f === "";
+    const o = r[t.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 o = t.type;
+    if (o === "file" || o === "avatarUpload" || o === "fileUploader") {
       const i = p(n, t.name);
       i && r.push({
         name: t.name,
         value: i,
-        type: f,
+        type: o,
         field: t
       });
     }
-    if (f === "customFields" && t.props?.schema) {
+    if (o === "customFields" && t.props?.schema) {
       const i = p(n, t.name);
       if (Array.isArray(i)) {
-        const u = t.props.schema.filter(
+        const y = t.props.schema.filter(
           (s) => s.type === "file" || s.type === "avatarUpload" || s.type === "fileUploader"
         );
-        u.length > 0 && i.forEach((s, o) => {
-          u.forEach((a) => {
-            const y = s?.[a.name];
-            y && r.push({
-              name: `${t.name}.${o}.${a.name}`,
-              value: y,
+        y.length > 0 && i.forEach((s, f) => {
+          y.forEach((a) => {
+            const u = s?.[a.name];
+            u && r.push({
+              name: `${t.name}.${f}.${a.name}`,
+              value: u,
               type: a.type,
               field: a
             });
@@ -112,53 +112,53 @@ 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 || [];
+  const t = r === void 0 && l === void 0, o = t ? d(e) : {}, i = Array.isArray(n[0]) ? n.flat() : n, c = r || [], y = l || [];
   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 f = p(e, s.name);
+    if (f === void 0) continue;
+    if (s.type === "customFields" && s.props?.schema && Array.isArray(f)) {
       const A = s.props.schema;
-      o = o.map((h) => g(h, A, r, l));
+      f = f.map((h) => g(h, A, r, l));
     }
     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 && (f = s.transform(f, e), a = !0);
+    const u = s.mapTo || s.name;
+    u !== s.name && (a = !0, t && !s.name.includes(".") && delete o[s.name]), !t || a ? Object.assign(o, m(o, u, f)) : Object.assign(o, m(o, s.name, f));
   }
   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 = (f, a) => {
+      if (!(!f || typeof f != "object") && !(!a || typeof a != "object"))
+        if (Array.isArray(f) && Array.isArray(a))
+          f.forEach((u, A) => {
+            a[A] && s(u, 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]);
+          for (const u of c)
+            f[u] !== void 0 && a[u] === void 0 && (a[u] = d(f[u]));
+          for (const u in a)
+            typeof a[u] == "object" && a[u] !== null && typeof f[u] == "object" && f[u] !== null && s(f[u], a[u]);
         }
     };
-    for (const o of c)
-      e[o] !== void 0 && f[o] === void 0 && (f[o] = d(e[o]));
-    s(e, f);
+    for (const f of c)
+      e[f] !== void 0 && o[f] === void 0 && (o[f] = d(e[f]));
+    s(e, o);
   }
-  if (u.length > 0) {
-    const s = (o) => {
-      if (!(!o || typeof o != "object"))
-        if (Array.isArray(o))
-          o.forEach(s);
+  if (y.length > 0) {
+    const s = (f) => {
+      if (!(!f || typeof f != "object"))
+        if (Array.isArray(f))
+          f.forEach(s);
         else {
-          for (const a of u)
-            delete o[a];
-          for (const a in o)
-            s(o[a]);
+          for (const a of y)
+            delete f[a];
+          for (const a in f)
+            s(f[a]);
         }
     };
-    s(f);
+    s(o);
   }
-  return f;
+  return o;
 }
 export {
   g as cleanSubmitValues,

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.4",
   "type": "module",
   "main": "index.js",
   "module": "index.js",