vlite3 0.4.4 → 0.4.6

package/components/Form/composables/useForm.js

@@ -19,29 +19,29 @@ function te(b) {
     u.value = {};
   }, 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 s = "";
-    if (e.required && (l == null || l === "" || Array.isArray(l) && l.length === 0) && (s = `${e.label || e.name} is required`), !s && e.maxFileSize) {
+    let a = "";
+    if (e.required && (l == null || l === "" || Array.isArray(l) && l.length === 0) && (a = `${e.label || e.name} is required`), !a && e.maxFileSize) {
       const i = e.maxFileSize * 1024 * 1024;
       if (l != null && l !== "") {
         const n = Array.isArray(l) ? l : [l];
-        for (const a of n) {
-          const c = a instanceof File ? a.size : a?.fileSize || a?.file?.size || a?.size;
+        for (const s of n) {
+          const c = s instanceof File ? s.size : s?.fileSize || s?.file?.size || s?.size;
           if (c !== void 0 && c > i) {
-            s = `${e.label || e.name} size must be less than ${e.maxFileSize}MB`;
+            a = `${e.label || e.name} size must be less than ${e.maxFileSize}MB`;
             break;
           }
         }
       }
     }
-    if (!s && (e.type === "file" || e.type === "fileUploader") && (e.props?.multiple || e.maxFiles)) {
+    if (!a && (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 && (s = `Maximum ${i} files allowed`);
+      i && Array.isArray(l) && l.length > i && (a = `Maximum ${i} files allowed`);
     }
-    return !s && e.validation && (s = e.validation({
+    return !a && e.validation && (a = e.validation({
       value: l,
       values: t.value,
       isUpdate: F
-    })), s ? u.value[e.name] = s : delete u.value[e.name], s;
+    })), a ? u.value[e.name] = a : delete u.value[e.name], a;
   }, $ = () => {
     A();
     let e = !0;
@@ -50,36 +50,34 @@ function te(b) {
       P(l) && (e = !1);
     }
     return e;
-  }, R = (e, l, s) => {
+  }, R = (e, l, a) => {
     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: s,
+        data: a,
         isUpdate: F,
         updateError: N
       });
       n && typeof n == "object" && (t.value = { ...t.value, ...n });
     }
   }, G = async () => {
-    const e = m(t.value), l = W(o, e), s = (a, c) => {
+    const e = m(t.value), l = W(o, e), a = (s, c) => {
       let r = null;
-      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",
+      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",
         fileUrl: c,
-        fileType: a?.fileType || r?.type || "application/octet-stream",
-        fileSize: a?.fileSize || r?.size || 0
+        fileType: s?.fileType || r?.type || "application/octet-stream",
+        fileSize: s?.fileSize || r?.size || 0
       };
-    }, i = l.map(async (a) => {
-      const { name: c, value: r, field: J } = a, k = J.returnFileObject === !0;
+    }, i = l.map(async (s) => {
+      const { name: c, value: r, field: J } = s, 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 z = await E(f, g);
-            return z ? k ? s(f, z) : z : null;
+            return z ? k ? a(f, z) : z : null;
           }
           return f;
         }), p = await Promise.all(q);
@@ -88,22 +86,22 @@ function te(b) {
         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 ? s(r, p) : p };
+            return { name: c, value: k ? a(r, p) : p };
         }
         return null;
       }
     });
-    return (await Promise.all(i)).forEach((a) => {
-      a && Object.assign(e, x(e, a.name, a.value));
+    return (await Promise.all(i)).forEach((s) => {
+      s && Object.assign(e, x(e, s.name, s.value));
     }), e;
   }, H = (e) => {
     const l = { ...e };
-    for (const s of y.value)
-      if (s.type === "customFields" && s.props?.schema) {
-        const i = M(l, s.name);
+    for (const a of y.value)
+      if (a.type === "customFields" && a.props?.schema) {
+        const i = M(l, a.name);
         if (Array.isArray(i)) {
-          const n = X(i, s.props.schema);
-          Object.assign(l, x(l, s.name, n));
+          const n = X(i, a.props.schema);
+          Object.assign(l, x(l, a.name, n));
         }
       }
     return l;

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 o = t;
-  for (let i = 0; i < l.length - 1; i++) {
-    const c = l[i];
+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 o[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 o = t.mapFrom || t.name;
-    let i = n ? p(n, o) : 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(
-        (y) => y && typeof y == "object" ? p(y, c) : y
-      ) : 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 o = r[t.name];
+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 o = t.type;
+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 = p(n, t.name);
-      i && r.push({
-        name: t.name,
+      const i = d(r, n.name);
+      i && f.push({
+        name: n.name,
         value: i,
         type: o,
-        field: t
+        field: n
       });
     }
-    if (o === "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 y = t.props.schema.filter(
+        const u = n.props.schema.filter(
           (s) => s.type === "file" || s.type === "avatarUpload" || s.type === "fileUploader"
         );
-        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,
+        u.length > 0 && i.forEach((s, t) => {
+          u.forEach((a) => {
+            const l = s?.[a.name];
+            l && f.push({
+              name: `${n.name}.${t}.${a.name}`,
+              value: l,
               type: a.type,
               field: a
             });
@@ -96,64 +96,70 @@ 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, o = t ? d(e) : {}, i = Array.isArray(n[0]) ? n.flat() : n, c = r || [], y = 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 f = p(e, s.name);
-    if (f === void 0) continue;
-    if (s.type === "customFields" && s.props?.schema && Array.isArray(f)) {
+    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;
-      f = f.map((h) => g(h, A, r, l));
+      t = t.map((p) => g(p, A, f, y));
     }
     let a = !1;
-    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));
+    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 = (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]);
+    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 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]);
+        } 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 f of c)
-      e[f] !== void 0 && o[f] === void 0 && (o[f] = d(e[f]));
+    for (const t of c)
+      e[t] !== void 0 && o[t] === void 0 && (o[t] = m(e[t]));
     s(e, o);
   }
-  if (y.length > 0) {
-    const s = (f) => {
-      if (!(!f || typeof f != "object"))
-        if (Array.isArray(f))
-          f.forEach(s);
+  if (u.length > 0) {
+    const s = (t) => {
+      if (!(!t || typeof t != "object"))
+        if (Array.isArray(t))
+          t.forEach(s);
         else {
-          for (const a of y)
-            delete f[a];
-          for (const a in f)
-            s(f[a]);
+          for (const a of u)
+            delete t[a];
+          for (const a in t)
+            s(t[a]);
         }
     };
     s(o);
@@ -163,12 +169,12 @@ function g(e, n, r, l) {
 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.4",
+  "version": "0.4.6",
   "type": "module",
   "main": "index.js",
   "module": "index.js",