vlite3 1.0.10 → 1.1.2

package/components/Form/FormField.vue.d.ts

@@ -30,10 +30,10 @@ declare const _default: import('vue').DefineComponent<Props, {}, {}, {}, {}, imp
     variant: InputVariant;
     size: InputSize;
     rounded: InputRounded;
+    loading: boolean;
     readonly: boolean;
     error: string;
     disabled: boolean;
-    loading: boolean;
     isUpdate: boolean;
     floatingActive: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;

package/components/Form/composables/useForm.d.ts

@@ -45,6 +45,8 @@ export interface UseFormReturn {
     handleSubmit: () => Promise<void>;
     /** Flattened schema for iteration */
     flatSchema: ComputedRef<IForm[]>;
+    /** Re-initialize form with new schema/values (useful for async data loading) */
+    reinitialize: (newSchema?: IForm[] | IForm[][], newValues?: Record<string, any>) => Promise<void>;
 }
 /**
  * Main form composable for managing form state, validation, and submission

package/components/Form/composables/useForm.js

@@ -1,37 +1,41 @@
-import { ref as S, shallowRef as Z, computed as _, watch as ee } from "vue";
-import { deepClone as g, initializeFormValues as ae, cleanSubmitValues as le, getNestedValue as H, evaluateConditional as $, setNestedValue as j, collectFileFields as te, filterNullCustomFields as se } from "../utils/form.utils.js";
-import { useFileUpload as ie } from "./useFileUpload.js";
-import { $t as oe } from "../../../utils/i18n.js";
-function me(B) {
-  const { schema: h, values: w, isUpdate: b = !1, folderId: U, onSubmit: q } = B, { handleUploadFile: E } = ie(), n = S(w ? g(w) : {}), y = S({}), I = S(!1), A = S(!1), m = S({}), C = Z(
-    w ? g(w) : {}
-  ), x = _(() => h ? Array.isArray(h[0]) ? h.flat() : h : []), L = async (e) => {
+import { ref as z, shallowRef as H, computed as ee, watch as ae } from "vue";
+import { deepClone as V, initializeFormValues as le, cleanSubmitValues as te, getNestedValue as J, evaluateConditional as S, setNestedValue as j, collectFileFields as se, filterNullCustomFields as ie } from "../utils/form.utils.js";
+import { useFileUpload as oe } from "./useFileUpload.js";
+import { $t as re } from "../../../utils/i18n.js";
+function Fe(q) {
+  let { schema: K, values: b, isUpdate: F = !1, folderId: U, onSubmit: L } = q;
+  const { handleUploadFile: E } = oe(), n = z(b ? V(b) : {}), y = z({}), I = z(!1), g = z(!1), m = z({}), A = H(K), C = H(
+    b ? V(b) : {}
+  ), $ = ee(() => {
+    const e = A.value;
+    return e ? Array.isArray(e[0]) ? e.flat() : e : [];
+  }), D = async (e) => {
     try {
-      const a = await ae(h, e, n.value, b);
-      n.value = a, C.value = g(a), A.value = !1;
+      const a = await le(A.value, e, n.value, F);
+      n.value = a, C.value = V(a), g.value = !1;
     } catch (a) {
       console.error("[useForm] Initialization error:", a);
     }
   };
-  L(w), ee(
-    () => w,
+  D(b), ae(
+    () => b,
     (e) => {
-      e && L(e);
+      e && D(e);
     },
     { deep: !0 }
   );
-  const D = () => ({
+  const N = () => ({
     values: n.value,
     globalValues: n.value,
-    isUpdate: b
-  }), M = (e) => H(n.value, e), J = (e) => y.value[e] || "", R = (e, a) => {
+    isUpdate: F
+  }), M = (e) => J(n.value, e), Q = (e) => y.value[e] || "", R = (e, a) => {
     a ? y.value[e] = a : delete y.value[e];
-  }, N = () => {
+  }, O = () => {
     y.value = {};
-  }, z = (e) => e.when ? $(e.when, D()) : !0, O = (e) => $(e.disabled, D()), W = (e) => $(e.readonly, D()), P = async (e, a = "") => {
+  }, x = (e) => e.when ? S(e.when, N()) : !0, P = (e) => S(e.disabled, N()), W = (e) => S(e.readonly, N()), T = async (e, a = "") => {
     const o = a ? `${a}.${e.name}` : e.name, t = M(o);
     let s = "";
-    const i = e.labelI18n ? oe(e.labelI18n) : typeof e.label == "string" ? e.label : e.name;
+    const i = e.labelI18n ? re(e.labelI18n) : typeof e.label == "string" ? e.label : e.name;
     if (e.required && (t == null || t === "" || Array.isArray(t) && t.length === 0) && (s = `${i} is required`), !s && e.maxFileSize) {
       const r = e.maxFileSize * 1024 * 1024;
       if (t != null && t !== "") {
@@ -56,7 +60,7 @@ function me(B) {
           value: t,
           values: n.value,
           globalValues: n.value,
-          isUpdate: b
+          isUpdate: F
         });
       } catch (r) {
         console.error(`[useForm] Validation error in field ${o}:`, r), s = "Validation failed";
@@ -68,30 +72,30 @@ function me(B) {
       const r = e.props.schema, l = Array.isArray(t) ? t : [];
       let f = !1;
       for (let v = 0; v < l.length; v++) {
-        const d = { values: l[v] || {}, globalValues: n.value, isUpdate: b };
+        const d = { values: l[v] || {}, globalValues: n.value, isUpdate: F };
         for (const u of r) {
-          const c = !u.when || $(u.when, d), V = $(u.disabled, d);
-          c && !V ? await P(u, `${o}.${v}`) && (f = !0) : delete y.value[`${o}.${v}.${u.name}`];
+          const c = !u.when || S(u.when, d), w = S(u.disabled, d);
+          c && !w ? await T(u, `${o}.${v}`) && (f = !0) : delete y.value[`${o}.${v}.${u.name}`];
         }
       }
       f && !s && (s = "Please fix errors in the list.", y.value[o] = s);
     }
     return s;
   }, G = async () => {
-    N();
+    O();
     let e = !0;
-    for (const a of x.value) {
-      if (!z(a) || O(a)) continue;
-      await P(a) && (e = !1);
+    for (const a of $.value) {
+      if (!x(a) || P(a)) continue;
+      await T(a) && (e = !1);
     }
     return e;
-  }, K = async (e, a, o) => {
-    const t = x.value.find((s) => s.name === e);
-    if (t && (!z(t) || O(t) || W(t))) {
+  }, X = async (e, a, o) => {
+    const t = $.value.find((s) => s.name === e);
+    if (t && (!x(t) || P(t) || W(t))) {
       console.warn(`[vlite3/useForm] Blocked attempted update to disabled/readonly/hidden field: ${e}`);
       return;
     }
-    if (n.value = j(n.value, e, a), A.value = !0, delete y.value[e], t?.updateValues) {
+    if (n.value = j(n.value, e, a), g.value = !0, delete y.value[e], t?.updateValues) {
       m.value[e] = !0;
       try {
         const s = await t.updateValues({
@@ -100,7 +104,7 @@ function me(B) {
           values: n.value,
           globalValues: n.value,
           data: o,
-          isUpdate: b,
+          isUpdate: F,
           updateError: R
         });
         s && typeof s == "object" && (n.value = { ...n.value, ...s });
@@ -110,8 +114,8 @@ function me(B) {
         m.value[e] = !1;
       }
     }
-  }, Q = async () => {
-    const e = g(n.value), a = te(h, e, n.value, b), o = (i, r) => {
+  }, Y = async () => {
+    const e = V(n.value), a = se(A.value, e, n.value, F), o = (i, r) => {
       let l = null;
       i instanceof File ? l = i : i && typeof i == "object" && i.file instanceof File && (l = i.file);
       const f = {
@@ -128,29 +132,29 @@ function me(B) {
         const d = l, u = Array.isArray(d.images) ? d.images : [], c = d.thumbnail;
         m.value[r] = !0;
         try {
-          const V = await Promise.all(
-            u.map(async (F) => {
-              if (F.startsWith("data:image/")) {
-                const k = await (await fetch(F)).blob(), Y = new File([k], `thumbnail-${Date.now()}.${k.type.split("/")[1] || "jpg"}`, { type: k.type });
-                return await E(Y, U) || F;
+          const w = await Promise.all(
+            u.map(async (h) => {
+              if (h.startsWith("data:image/")) {
+                const B = await (await fetch(h)).blob(), _ = new File([B], `thumbnail-${Date.now()}.${B.type.split("/")[1] || "jpg"}`, { type: B.type });
+                return await E(_, U) || h;
               }
-              return F;
+              return h;
             })
           );
           let p = c;
           if (c && c.startsWith("data:image/")) {
-            const F = u.indexOf(c);
-            F !== -1 && V[F] && (p = V[F]);
+            const h = u.indexOf(c);
+            h !== -1 && w[h] && (p = w[h]);
           }
-          return { name: r, value: { images: V, thumbnail: p } };
+          return { name: r, value: { images: w, thumbnail: p } };
         } finally {
           m.value[r] = !1;
         }
       }
-      const v = f.returnFileObject === !0, T = Array.isArray(l) ? l.some(
+      const v = f.returnFileObject === !0, k = Array.isArray(l) ? l.some(
         (d) => d instanceof File || d && typeof d == "object" && d.file instanceof File
       ) : l instanceof File || l && typeof l == "object" && l.file instanceof File;
-      T && (m.value[r] = !0);
+      k && (m.value[r] = !0);
       try {
         if (Array.isArray(l)) {
           const d = l.map(async (c) => {
@@ -177,19 +181,19 @@ function me(B) {
           return null;
         }
       } finally {
-        T && (m.value[r] = !1);
+        k && (m.value[r] = !1);
       }
     });
     return (await Promise.all(t)).forEach((i) => {
       i && (Object.assign(e, j(e, i.name, i.value)), n.value = j(n.value, i.name, i.value));
     }), e;
-  }, X = (e) => {
+  }, Z = (e) => {
     const a = { ...e };
-    for (const o of x.value)
-      if (z(o) && o.type === "customFields" && o.props?.schema) {
-        const t = H(a, o.name);
+    for (const o of $.value)
+      if (x(o) && o.type === "customFields" && o.props?.schema) {
+        const t = J(a, o.name);
         if (Array.isArray(t)) {
-          const s = se(t, o.props.schema);
+          const s = ie(t, o.props.schema);
           Object.assign(a, j(a, o.name, s));
         }
       }
@@ -199,37 +203,37 @@ function me(B) {
     formValues: n,
     errors: y,
     isSubmitting: I,
-    isDirty: A,
+    isDirty: g,
     fieldLoading: m,
-    handleFieldChange: K,
-    validateField: P,
+    handleFieldChange: X,
+    validateField: T,
     validateAll: G,
-    isFieldVisible: z,
-    isFieldDisabled: O,
+    isFieldVisible: x,
+    isFieldDisabled: P,
     isFieldReadonly: W,
     getFieldValue: M,
-    getFieldError: J,
+    getFieldError: Q,
     setFieldError: R,
-    clearErrors: N,
+    clearErrors: O,
     resetForm: () => {
-      n.value = g(C.value), N(), A.value = !1;
+      n.value = V(C.value), O(), g.value = !1;
     },
     handleSubmit: async () => {
       if (await G()) {
         I.value = !0;
         try {
-          let a = await Q();
-          a = X(a), a = await le(
+          let a = await Y();
+          a = Z(a), a = await te(
             a,
-            h,
-            B.emitFields,
+            A.value,
+            q.emitFields,
             void 0,
             n.value,
-            b
-          ), q && await q({
+            F
+          ), L && await L({
             values: a,
-            isUpdate: b
-          }), A.value = !1, C.value = g(a);
+            isUpdate: F
+          }), g.value = !1, C.value = V(a);
         } catch (a) {
           throw console.error("[useForm] Submit error:", a), a;
         } finally {
@@ -237,9 +241,12 @@ function me(B) {
         }
       }
     },
-    flatSchema: x
+    flatSchema: $,
+    reinitialize: async (e, a) => {
+      e !== void 0 && (A.value = e), a !== void 0 && (b = a), await D(a !== void 0 ? a : b);
+    }
   };
 }
 export {
-  me as useForm
+  Fe as useForm
 };

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

@@ -1,11 +1,11 @@
-function T(e) {
+function x(e) {
   return !!e && typeof e == "object";
 }
-function E(e) {
+function U(e) {
   return e ? typeof e == "object" && (typeof e.render == "function" || typeof e.setup == "function" || e.__name !== void 0 || e.name !== void 0) : !1;
 }
-function V(e, n) {
-  if (typeof e.type == "function" && !E(e.type))
+function b(e, n) {
+  if (typeof e.type == "function" && !U(e.type))
     try {
       return e.type(n);
     } catch (i) {
@@ -23,7 +23,7 @@ function p(e, n) {
   }
   return f;
 }
-function g(e, n, i) {
+function A(e, n, i) {
   if (!n) return e;
   const f = n.split("."), o = { ...e };
   let a = o;
@@ -34,50 +34,50 @@ function g(e, n, i) {
   return a[f[f.length - 1]] = i, o;
 }
 function k(e, n) {
-  return !T(n) || !n.name ? e : p(e, n.name) === void 0 && n.value !== void 0 ? g(e, n.name, n.value) : e;
+  return !x(n) || !n.name ? e : p(e, n.name) === void 0 && n.value !== void 0 ? A(e, n.name, n.value) : e;
 }
-async function U(e, n, i, f) {
+async function T(e, n, i, f) {
   let o = n ? S(n) : {};
   const a = i || o, c = Array.isArray(e[0]) ? e.flat() : e;
   for (const t of c) {
     if (!t.name) continue;
-    const d = { values: o, globalValues: a, isUpdate: f };
-    if (t.when && !b(t.when, d))
+    const h = { values: o, globalValues: a, isUpdate: f };
+    if (t.when && !v(t.when, h))
       continue;
     const m = t.mapFrom || t.name;
     let s = n ? p(n, m) : void 0;
     if (s != null) {
-      const l = t.valueKey || t.key;
-      l && (Array.isArray(s) ? s = s.map(
-        (r) => r && typeof r == "object" ? p(r, l) : r
-      ) : typeof s == "object" && (s = p(s, l))), t.format && (s = await t.format(s, n || {}));
+      const u = t.valueKey || t.key;
+      u && (Array.isArray(s) ? s = s.map(
+        (r) => r && typeof r == "object" ? p(r, u) : r
+      ) : typeof s == "object" && (s = p(s, u))), t.format && (s = await t.format(s, n || {}));
     }
     if (s === void 0) {
       if (t.mapFrom && n) {
-        const l = p(n, t.name);
-        l !== void 0 && (s = l);
+        const u = p(n, t.name);
+        u !== void 0 && (s = u);
       }
       if (s === void 0) {
-        const l = typeof t.value == "function" ? t.value() : t.value;
-        l !== void 0 && Object.assign(o, g(o, t.name, l));
+        const u = typeof t.value == "function" ? t.value() : t.value;
+        u !== void 0 && Object.assign(o, A(o, t.name, u));
       } else
-        Object.assign(o, g(o, t.name, s));
+        Object.assign(o, A(o, t.name, s));
     } else
-      Object.assign(o, g(o, t.name, s));
-    if (o = k(o, t.addonLeft), o = k(o, t.addonRight), V(t, d) === "customFields" && t.props?.schema) {
-      const l = t.props.schema;
+      Object.assign(o, A(o, t.name, s));
+    if (o = k(o, t.addonLeft), o = k(o, t.addonRight), b(t, h) === "customFields" && t.props?.schema) {
+      const u = t.props.schema;
       let r = p(o, t.name);
       if (Array.isArray(r) && r.length > 0) {
         const y = await Promise.all(
-          r.map((u) => U(l, u, a, f))
+          r.map((l) => T(u, l, a, f))
         );
-        Object.assign(o, g(o, t.name, y));
+        Object.assign(o, A(o, t.name, y));
       }
     }
   }
   return o;
 }
-function b(e, n) {
+function v(e, n) {
   return e === void 0 ? !1 : typeof e == "boolean" ? e : typeof e == "function" ? e(n) : !1;
 }
 function $(e, n) {
@@ -93,10 +93,10 @@ function B(e, n, i, f) {
   const o = [], a = i || n, c = Array.isArray(e[0]) ? e.flat() : e;
   for (const t of c) {
     if (!t.name) continue;
-    const d = { values: n, globalValues: a, isUpdate: f };
-    if (t.when && !b(t.when, d))
+    const h = { values: n, globalValues: a, isUpdate: f };
+    if (t.when && !v(t.when, h))
       continue;
-    const m = V(t, d);
+    const m = b(t, h);
     if (m === "file" || m === "avatarUpload" || m === "fileUploader") {
       const s = p(n, t.name);
       s && o.push({
@@ -118,20 +118,20 @@ function B(e, n, i, f) {
     if (m === "customFields" && t.props?.schema) {
       const s = p(n, t.name);
       if (Array.isArray(s)) {
-        const r = t.props.schema.filter((y) => !E(y.type));
-        r.length > 0 && s.forEach((y, u) => {
-          r.forEach((h) => {
-            const v = { values: y || {}, globalValues: a, isUpdate: f };
-            if (h.when && !b(h.when, v))
+        const r = t.props.schema.filter((y) => !U(y.type));
+        r.length > 0 && s.forEach((y, l) => {
+          r.forEach((g) => {
+            const F = { values: y || {}, globalValues: a, isUpdate: f };
+            if (g.when && !v(g.when, F))
               return;
-            const A = V(h, v);
-            if (A === "file" || A === "avatarUpload" || A === "fileUploader") {
-              const w = y?.[h.name];
+            const d = b(g, F);
+            if (d === "file" || d === "avatarUpload" || d === "fileUploader") {
+              const w = y?.[g.name];
               w && o.push({
-                name: `${t.name}.${u}.${h.name}`,
+                name: `${t.name}.${l}.${g.name}`,
                 value: w,
-                type: A,
-                field: h
+                type: d,
+                field: g
               });
             }
           });
@@ -152,67 +152,67 @@ function S(e) {
   return n;
 }
 function I(e, n) {
-  const i = V(e, n);
-  return i === "multiSelect" ? [] : i === "thumbnailSelector" ? { images: [], thumbnail: null } : i === "switch" || i === "check" ? !1 : null;
+  const i = b(e, n);
+  return i === "multiSelect" ? [] : i === "thumbnailSelector" ? { images: [], thumbnail: null } : i === "switch" || i === "check" ? !1 : (i === "fileUploader" || i === "file" || i === "avatarUpload") && e.props?.multiple ? [] : null;
 }
 function K(e) {
   return !!(e == null || e === "" || Array.isArray(e) && e.length === 0);
 }
-function F(e, n) {
+function O(e, n) {
   if (!(!e || typeof e != "object"))
     if (Array.isArray(e))
-      e.forEach((i) => F(i, n));
+      e.forEach((i) => O(i, n));
     else {
       for (const i of n)
         delete e[i];
       for (const i in e)
-        F(e[i], n);
+        O(e[i], n);
     }
 }
 async function P(e, n, i, f, o, a) {
-  const c = S(e), t = o || e, d = Array.isArray(n[0]) ? n.flat() : n, m = /* @__PURE__ */ new Set();
-  for (const r of d) {
+  const c = S(e), t = o || e, h = Array.isArray(n[0]) ? n.flat() : n, m = /* @__PURE__ */ new Set();
+  for (const r of h) {
     if (!r.name) continue;
     const y = { values: e, globalValues: t, isUpdate: a };
-    (!r.when || b(r.when, y)) && m.add(r.name);
+    (!r.when || v(r.when, y)) && m.add(r.name);
   }
-  const s = i || [], l = [];
-  for (const r of d) {
+  const s = i || [], u = [];
+  for (const r of h) {
     if (!r.name) continue;
     const y = { values: e, globalValues: t, isUpdate: a };
-    if (r.when && !b(r.when, y)) {
+    if (r.when && !v(r.when, y)) {
       m.has(r.name) || delete c[r.name];
       continue;
     }
-    let u = p(e, r.name);
-    const h = r.name.split(".")[0], v = Object.prototype.hasOwnProperty.call(e, h), A = V(r, y);
-    if (K(u)) {
-      if (!v) {
+    let l = p(e, r.name);
+    const g = r.name.split(".")[0], F = Object.prototype.hasOwnProperty.call(e, g), d = b(r, y);
+    if (Array.isArray(l) && (d === "fileUploader" || d === "file" || d === "avatarUpload") && (l = l.filter((V) => V != null && V !== "")), K(l)) {
+      if (!F) {
         m.has(r.name) || delete c[r.name];
         continue;
       }
-      u = I(r, y);
+      l = I(r, y);
     }
-    if (u = S(u), A === "customFields" && r.props?.schema && Array.isArray(u)) {
-      const O = r.props.schema;
-      u = await Promise.all(u.map((x) => P(x, O, i, f, t, a)));
+    if (l = S(l), d === "customFields" && r.props?.schema && Array.isArray(l)) {
+      const V = r.props.schema;
+      l = await Promise.all(l.map((E) => P(E, V, i, f, t, a)));
     }
-    r.transform && (u = await r.transform(u, e));
+    r.transform && (l = await r.transform(l, e));
     const w = r.mapTo || r.name;
-    w !== r.name ? (delete c[r.name], Object.assign(c, g(c, w, u))) : Object.assign(c, g(c, r.name, u));
+    w !== r.name ? (delete c[r.name], Object.assign(c, A(c, w, l))) : Object.assign(c, A(c, r.name, l));
   }
-  return s.length > 0 && F(c, s), l.length > 0 && F(c, l), c;
+  return s.length > 0 && O(c, s), u.length > 0 && O(c, u), c;
 }
 export {
   P as cleanSubmitValues,
   B as collectFileFields,
   S as deepClone,
-  b as evaluateConditional,
+  v as evaluateConditional,
   $ as filterNullCustomFields,
   p as getNestedValue,
-  U as initializeFormValues,
-  T as isAddonObject,
-  E as isComponent,
-  V as resolveFieldType,
-  g as setNestedValue
+  T as initializeFormValues,
+  x as isAddonObject,
+  U as isComponent,
+  b as resolveFieldType,
+  A as setNestedValue
 };