vlite3 0.9.6 → 0.9.7

package/components/Form/composables/useForm.js

@@ -1,192 +1,209 @@
-import { ref as w, shallowRef as Q, computed as W, watch as X } from "vue";
-import { deepClone as m, initializeFormValues as Y, cleanSubmitValues as Z, getNestedValue as R, evaluateConditional as $, setNestedValue as z, collectFileFields as _, filterNullCustomFields as ee } from "../utils/form.utils.js";
-import { useFileUpload as le } from "./useFileUpload.js";
-import { $t as ae } from "../../../utils/i18n.js";
-function ce(S) {
-  const { schema: d, values: F, isUpdate: V = !1, folderId: C, onSubmit: I } = S, { handleUploadFile: N } = le(), r = w(F ? m(F) : {}), f = w({}), j = w(!1), b = w(!1), p = w({}), g = Q(
-    F ? m(F) : {}
-  ), A = W(() => d ? Array.isArray(d[0]) ? d.flat() : d : []), O = async (e) => {
+import { ref as A, shallowRef as W, computed as X, watch as Y } from "vue";
+import { deepClone as h, initializeFormValues as Z, cleanSubmitValues as _, getNestedValue as G, evaluateConditional as g, setNestedValue as z, collectFileFields as ee, filterNullCustomFields as le } from "../utils/form.utils.js";
+import { useFileUpload as ae } from "./useFileUpload.js";
+import { $t as te } from "../../../utils/i18n.js";
+function ce($) {
+  const { schema: F, values: b, isUpdate: w = !1, folderId: D, onSubmit: O } = $, { handleUploadFile: P } = ae(), n = A(b ? h(b) : {}), p = A({}), j = A(!1), V = A(!1), m = A({}), x = W(
+    b ? h(b) : {}
+  ), S = X(() => F ? Array.isArray(F[0]) ? F.flat() : F : []), k = async (e) => {
     try {
-      const l = await Y(d, e);
-      r.value = l, g.value = m(l), b.value = !1;
+      const l = await Z(F, e);
+      n.value = l, x.value = h(l), V.value = !1;
     } catch (l) {
       console.error("[useForm] Initialization error:", l);
     }
   };
-  O(F), X(
-    () => F,
+  k(b), Y(
+    () => b,
     (e) => {
-      e && O(e);
+      e && k(e);
     },
     { deep: !0 }
   );
   const U = () => ({
-    values: r.value,
-    isUpdate: V
-  }), D = (e) => R(r.value, e), G = (e) => f.value[e] || "", P = (e, l) => {
-    l ? f.value[e] = l : delete f.value[e];
-  }, x = () => {
-    f.value = {};
-  }, k = (e) => e.when ? $(e.when, U()) : !0, E = (e) => $(e.disabled, U()), B = (e) => $(e.readonly, U()), T = async (e) => {
-    const l = D(e.name);
-    let t = "";
-    const n = e.labelI18n ? ae(e.labelI18n) : typeof e.label == "string" ? e.label : e.name;
-    if (e.required && (l == null || l === "" || Array.isArray(l) && l.length === 0) && (t = `${n} is required`), !t && e.maxFileSize) {
-      const i = e.maxFileSize * 1024 * 1024;
-      if (l != null && l !== "") {
-        const s = Array.isArray(l) ? l : [l];
-        for (const o of s) {
-          const a = o instanceof File ? o.size : o?.fileSize || o?.file?.size || o?.size;
-          if (a !== void 0 && a > i) {
-            t = `${n} size must be less than ${e.maxFileSize}MB`;
+    values: n.value,
+    globalValues: n.value,
+    isUpdate: w
+  }), B = (e) => G(n.value, e), H = (e) => p.value[e] || "", T = (e, l) => {
+    l ? p.value[e] = l : delete p.value[e];
+  }, E = () => {
+    p.value = {};
+  }, q = (e) => e.when ? g(e.when, U()) : !0, C = (e) => g(e.disabled, U()), L = (e) => g(e.readonly, U()), I = async (e, l = "") => {
+    const o = l ? `${l}.${e.name}` : e.name, t = B(o);
+    let s = "";
+    const i = e.labelI18n ? te(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 !== "") {
+        const a = Array.isArray(t) ? t : [t];
+        for (const c of a) {
+          const d = c instanceof File ? c.size : c?.fileSize || c?.file?.size || c?.size;
+          if (d !== void 0 && d > r) {
+            s = `${i} size must be less than ${e.maxFileSize}MB`;
             break;
           }
         }
       }
     }
-    if (!t && (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 && (t = `Maximum ${i} files allowed`);
+    if (!s && (e.type === "file" || e.type === "fileUploader") && (e.props?.multiple || e.maxFiles)) {
+      const r = e.maxFiles || e.props?.maxFiles;
+      r && Array.isArray(t) && t.length > r && (s = `Maximum ${r} files allowed`);
     }
-    if (!t && e.validation) {
-      p.value[e.name] = !0;
+    if (!s && e.validation) {
+      m.value[o] = !0;
       try {
-        t = await e.validation({
-          value: l,
-          values: r.value,
-          isUpdate: V
+        s = await e.validation({
+          value: t,
+          values: n.value,
+          globalValues: n.value,
+          isUpdate: w
         });
-      } catch (i) {
-        console.error(`[useForm] Validation error in field ${e.name}:`, i), t = "Validation failed";
+      } catch (r) {
+        console.error(`[useForm] Validation error in field ${o}:`, r), s = "Validation failed";
       } finally {
-        p.value[e.name] = !1;
+        m.value[o] = !1;
       }
     }
-    return t ? f.value[e.name] = t : delete f.value[e.name], t;
-  }, q = async () => {
-    x();
+    if (s ? p.value[o] = s : delete p.value[o], e.type === "customFields" && e.props?.schema) {
+      const r = e.props.schema, a = Array.isArray(t) ? t : [];
+      let c = !1;
+      for (let d = 0; d < a.length; d++) {
+        const v = { values: a[d] || {}, globalValues: n.value, isUpdate: w };
+        for (const u of r) {
+          const f = !u.when || g(u.when, v), R = g(u.disabled, v);
+          f && !R ? await I(u, `${o}.${d}`) && (c = !0) : delete p.value[`${o}.${d}.${u.name}`];
+        }
+      }
+      c && !s && (s = "Please fix errors in the list.", p.value[o] = s);
+    }
+    return s;
+  }, M = async () => {
+    E();
     let e = !0;
-    for (const l of A.value) {
-      if (!k(l) || E(l)) continue;
-      await T(l) && (e = !1);
+    for (const l of S.value) {
+      if (!q(l) || C(l)) continue;
+      await I(l) && (e = !1);
     }
     return e;
-  }, H = async (e, l, t) => {
-    const n = A.value.find((i) => i.name === e);
-    if (n && (E(n) || B(n))) {
+  }, J = async (e, l, o) => {
+    const t = S.value.find((s) => s.name === e);
+    if (t && (C(t) || L(t))) {
       console.warn(`[vlite3/useForm] Blocked attempted update to disabled/readonly field: ${e}`);
       return;
     }
-    if (r.value = z(r.value, e, l), b.value = !0, delete f.value[e], n?.updateValues) {
-      p.value[e] = !0;
+    if (n.value = z(n.value, e, l), V.value = !0, delete p.value[e], t?.updateValues) {
+      m.value[e] = !0;
       try {
-        const i = await n.updateValues({
-          values: r.value,
-          data: t,
-          isUpdate: V,
-          updateError: P
+        const s = await t.updateValues({
+          value: l,
+          // Exposing the explicitly requested value
+          values: n.value,
+          globalValues: n.value,
+          data: o,
+          isUpdate: w,
+          updateError: T
         });
-        i && typeof i == "object" && (r.value = { ...r.value, ...i });
-      } catch (i) {
-        console.error(`[useForm] Error in updateValues for ${e}:`, i);
+        s && typeof s == "object" && (n.value = { ...n.value, ...s });
+      } catch (s) {
+        console.error(`[useForm] Error in updateValues for ${e}:`, s);
       } finally {
-        p.value[e] = !1;
+        m.value[e] = !1;
       }
     }
-  }, J = async () => {
-    const e = m(r.value), l = _(d, e), t = (s, o) => {
+  }, K = async () => {
+    const e = h(n.value), l = ee(F, e), o = (i, r) => {
       let a = null;
-      s instanceof File ? a = s : s && typeof s == "object" && s.file instanceof File && (a = s.file);
-      const h = {
-        ...typeof s == "object" ? s : {},
-        fileName: s?.fileName || a?.name || o.split("/").pop() || "unknown",
-        fileUrl: o,
-        fileType: s?.fileType || a?.type || "application/octet-stream",
-        fileSize: s?.fileSize || a?.size || 0
+      i instanceof File ? a = i : i && typeof i == "object" && i.file instanceof File && (a = i.file);
+      const c = {
+        ...typeof i == "object" ? i : {},
+        fileName: i?.fileName || a?.name || r.split("/").pop() || "unknown",
+        fileUrl: r,
+        fileType: i?.fileType || a?.type || "application/octet-stream",
+        fileSize: i?.fileSize || a?.size || 0
       };
-      return delete h.file, delete h.base64, h;
-    }, n = l.map(async (s) => {
-      const { name: o, value: a, field: h } = s, L = h.returnFileObject === !0, M = Array.isArray(a) ? a.some(
+      return delete c.file, delete c.base64, c;
+    }, t = l.map(async (i) => {
+      const { name: r, value: a, field: c } = i, d = c.returnFileObject === !0, N = Array.isArray(a) ? a.some(
         (v) => v instanceof File || v && typeof v == "object" && v.file instanceof File
       ) : a instanceof File || a && typeof a == "object" && a.file instanceof File;
-      M && (p.value[o] = !0);
+      N && (m.value[r] = !0);
       try {
         if (Array.isArray(a)) {
-          const v = a.map(async (u) => {
-            if (u instanceof File || u && typeof u == "object" && u.file instanceof File) {
-              const y = await N(u, C);
-              return y ? L ? t(u, y) : y : null;
+          const v = a.map(async (f) => {
+            if (f instanceof File || f && typeof f == "object" && f.file instanceof File) {
+              const y = await P(f, D);
+              return y ? d ? o(f, y) : y : null;
             }
-            if (u && typeof u == "object") {
-              const y = { ...u };
+            if (f && typeof f == "object") {
+              const y = { ...f };
               return delete y.file, delete y.base64, y;
             }
-            return u;
-          }), c = await Promise.all(v);
-          return { name: o, value: c };
+            return f;
+          }), u = await Promise.all(v);
+          return { name: r, value: u };
         } else {
           if (a instanceof File || a && typeof a == "object" && a.file instanceof File) {
-            const c = await N(a, C);
-            if (c)
-              return { name: o, value: L ? t(a, c) : c };
+            const u = await P(a, D);
+            if (u)
+              return { name: r, value: d ? o(a, u) : u };
           } else if (a && typeof a == "object") {
-            const c = { ...a };
-            return delete c.file, delete c.base64, { name: o, value: c };
+            const u = { ...a };
+            return delete u.file, delete u.base64, { name: r, value: u };
           }
           return null;
         }
       } finally {
-        M && (p.value[o] = !1);
+        N && (m.value[r] = !1);
       }
     });
-    return (await Promise.all(n)).forEach((s) => {
-      s && (Object.assign(e, z(e, s.name, s.value)), r.value = z(r.value, s.name, s.value));
+    return (await Promise.all(t)).forEach((i) => {
+      i && (Object.assign(e, z(e, i.name, i.value)), n.value = z(n.value, i.name, i.value));
     }), e;
-  }, K = (e) => {
+  }, Q = (e) => {
     const l = { ...e };
-    for (const t of A.value)
-      if (t.type === "customFields" && t.props?.schema) {
-        const n = R(l, t.name);
-        if (Array.isArray(n)) {
-          const i = ee(n, t.props.schema);
-          Object.assign(l, z(l, t.name, i));
+    for (const o of S.value)
+      if (o.type === "customFields" && o.props?.schema) {
+        const t = G(l, o.name);
+        if (Array.isArray(t)) {
+          const s = le(t, o.props.schema);
+          Object.assign(l, z(l, o.name, s));
         }
       }
     return l;
   };
   return {
-    formValues: r,
-    errors: f,
+    formValues: n,
+    errors: p,
     isSubmitting: j,
-    isDirty: b,
-    fieldLoading: p,
-    handleFieldChange: H,
-    validateField: T,
-    validateAll: q,
-    isFieldVisible: k,
-    isFieldDisabled: E,
-    isFieldReadonly: B,
-    getFieldValue: D,
-    getFieldError: G,
-    setFieldError: P,
-    clearErrors: x,
+    isDirty: V,
+    fieldLoading: m,
+    handleFieldChange: J,
+    validateField: I,
+    validateAll: M,
+    isFieldVisible: q,
+    isFieldDisabled: C,
+    isFieldReadonly: L,
+    getFieldValue: B,
+    getFieldError: H,
+    setFieldError: T,
+    clearErrors: E,
     resetForm: () => {
-      r.value = m(g.value), x(), b.value = !1;
+      n.value = h(x.value), E(), V.value = !1;
     },
     handleSubmit: async () => {
-      if (await q()) {
+      if (await M()) {
         j.value = !0;
         try {
-          let l = await J();
-          l = K(l), l = await Z(
+          let l = await K();
+          l = Q(l), l = await _(
             l,
-            d,
-            S.emitFields,
-            S.emitFields
-          ), I && await I({
+            F,
+            $.emitFields,
+            $.emitFields
+          ), O && await O({
             values: l,
-            isUpdate: V
-          }), b.value = !1, g.value = m(l);
+            isUpdate: w
+          }), V.value = !1, x.value = h(l);
         } catch (l) {
           throw console.error("[useForm] Submit error:", l), l;
         } finally {
@@ -194,7 +211,7 @@ function ce(S) {
         }
       }
     },
-    flatSchema: A
+    flatSchema: S
   };
 }
 export {

package/components/Form/types.d.ts

@@ -28,7 +28,10 @@ export type IFormFieldType = 'text' | 'email' | 'password' | 'number' | 'file' |
  * Context passed to conditional functions
  */
 export interface IFormContext {
+    /** The local scope values (row values in customFields, or global values at root level) */
     values: Record<string, any>;
+    /** The root form state */
+    globalValues?: Record<string, any>;
     isUpdate?: boolean;
 }
 /**
@@ -41,6 +44,7 @@ export type IFormDisabled = boolean | ((context: IFormContext) => boolean);
 export interface IFormValidationContext {
     value: any;
     values: Record<string, any>;
+    globalValues?: Record<string, any>;
     isUpdate?: boolean;
 }
 export type IFormValidation = (context: IFormValidationContext) => string | Promise<string>;
@@ -48,7 +52,9 @@ export type IFormValidation = (context: IFormValidationContext) => string | Prom
  * UpdateValues function signature - allows computed/derived fields
  */
 export interface IFormUpdateContext {
+    value: any;
     values: Record<string, any>;
+    globalValues?: Record<string, any>;
     data?: any;
     isUpdate?: boolean;
     updateError?: (name: string, error: string) => void;