@effect-app/vue-components 2.6.1 → 2.6.2

package/dist/vue-components.es10.js

@@ -1,20 +1,20 @@
 import { useForm as z } from "@tanstack/vue-form";
-import { Data as K, S as $, Effect as c, Fiber as k, Option as x, Array as g } from "effect-app";
-import { runtimeFiberAsPromise as T } from "./vue-components.es16.js";
-import { isObject as Z } from "./vue-components.es17.js";
-import { computed as N, onUnmounted as W, onMounted as G, onBeforeUnmount as Q, watch as R, ref as X, h as q } from "vue";
-import Y from "./vue-components.es18.js";
-import C from "./vue-components.es19.js";
-import ee from "./vue-components.es20.js";
+import { Data as K, S as w, Effect as c, Fiber as U, Option as A, Array as j } from "effect-app";
+import { runtimeFiberAsPromise as Z } from "./vue-components.es16.js";
+import { isObject as G } from "./vue-components.es17.js";
+import { computed as D, onUnmounted as R, onMounted as Q, onBeforeUnmount as X, watch as T, ref as Y, h as q } from "vue";
+import C from "./vue-components.es18.js";
+import ee from "./vue-components.es19.js";
+import te from "./vue-components.es20.js";
 import { generateMetaFromSchema as re } from "./vue-components.es12.js";
-import te from "./vue-components.es6.js";
-import ne from "./vue-components.es8.js";
-import se from "./vue-components.es21.js";
+import ne from "./vue-components.es6.js";
+import se from "./vue-components.es8.js";
+import oe from "./vue-components.es21.js";
 import { trace as B } from "./vue-components.es22.js";
-import { context as A } from "./vue-components.es23.js";
-class oe extends K.TaggedError("FormErrors") {
+import { context as V } from "./vue-components.es23.js";
+class ie extends K.TaggedError("FormErrors") {
 }
-const F = (a) => function(i) {
+const O = (a) => function(i) {
   return {
     render() {
       return q(i, {
@@ -23,36 +23,36 @@ const F = (a) => function(i) {
       }, this.$slots);
     }
   };
-}, ie = (a) => function(i) {
+}, ae = (a) => function(i) {
   return {
     setup() {
-      const { fieldMap: b, form: v } = a, f = v.useStore((u) => u.errors), m = v.useStore((u) => u.fieldMeta), O = v.useStore((u) => u.errorMap), M = N(() => {
-        const u = g.filterMap(
-          Object.entries(m.value),
-          ([j, h]) => {
-            const o = h.errors ?? [];
-            if (!o.length) return x.none();
-            const l = b.value.get(j);
-            return l ? x.some({
-              label: l.label,
-              inputId: l.id,
+      const { fieldMap: h, form: p } = a, f = p.useStore((u) => u.errors), d = p.useStore((u) => u.fieldMeta), k = p.useStore((u) => u.errorMap), x = D(() => {
+        const u = j.filterMap(
+          Object.entries(d.value),
+          ([E, v]) => {
+            const b = v.errors ?? [];
+            if (!b.length) return A.none();
+            const o = h.value.get(E);
+            return o ? A.some({
+              label: o.label,
+              inputId: o.id,
               // Only show the first error
-              errors: [o[0]?.message].filter(Boolean)
-            }) : x.none();
+              errors: [b[0]?.message].filter(Boolean)
+            }) : A.none();
           }
         ), y = [];
-        if (O.value.onSubmit) {
-          for (const [j, h] of Object.entries(O.value.onSubmit))
-            if (g.isArray(h) && h.length)
-              for (const o of h) {
-                const l = o;
-                if (l?.path && g.isArray(l.path) && l.path.length) {
-                  const w = l.path.join(".");
-                  if (!b.value.has(w)) {
+        if (k.value.onSubmit) {
+          for (const [E, v] of Object.entries(k.value.onSubmit))
+            if (j.isArray(v) && v.length)
+              for (const b of v) {
+                const o = b;
+                if (o?.path && j.isArray(o.path) && o.path.length) {
+                  const g = o.path.join(".");
+                  if (!h.value.has(g)) {
                     y.push({
-                      label: w,
-                      inputId: w,
-                      errors: [l.message].filter(Boolean)
+                      label: g,
+                      inputId: g,
+                      errors: [o.message].filter(Boolean)
                     });
                     break;
                   }
@@ -63,187 +63,209 @@ const F = (a) => function(i) {
       });
       return {
         generalErrors: f,
-        errors: M
+        errors: x
       };
     },
-    render({ errors: b, generalErrors: v }) {
+    render({ errors: h, generalErrors: p }) {
       return q(i, {
-        errors: b,
-        generalErrors: v,
+        errors: h,
+        generalErrors: p,
         ...this.$attrs
       }, this.$slots);
     }
   };
-}, Ee = (a, p, i) => {
+}, ge = (a, m, i) => {
   if (!a) throw new Error("Schema is required");
-  const b = $.standardSchemaV1(a), v = $.decode(a), { meta: f } = re(a), m = N(() => {
+  const h = w.standardSchemaV1(a), p = w.decode(a), { meta: f } = re(a), d = D(() => {
     if (i?.persistency?.id)
       return i.persistency.id;
-    const e = window.location.pathname, r = Object.keys(f);
-    return `${e}-${r.join("-")}`;
-  }), O = () => {
+    const e = window.location.pathname, t = Object.keys(f);
+    return `${e}-${t.join("-")}`;
+  }), k = () => {
     const e = new URLSearchParams(window.location.search);
-    e.delete(m.value);
-    const r = new URL(window.location.href);
-    r.search = e.toString(), window.history.replaceState({}, "", r.toString());
+    e.delete(d.value);
+    const t = new URL(window.location.href);
+    t.search = e.toString(), window.history.replaceState({}, "", t.toString());
   };
-  function M(e, r) {
-    for (const n in r)
-      r[n] && Z(r[n]) ? (e[n] || (e[n] = {}), M(e[n], r[n])) : e[n] = r[n];
+  function x(e, t) {
+    for (const r in t)
+      t[r] && G(t[r]) ? (e[r] || (e[r] = {}), x(e[r], t[r])) : e[r] = t[r];
     return e;
   }
   const u = (e) => {
     if (!e) return;
-    const r = { ...e };
-    for (const n in f) {
-      const s = f[n], t = r[n], E = (t == null || t === !1 || t === "" || Number.isNaN(t)) && t !== !1 && t !== 0;
-      s && !s.required && s.nullableOrUndefined && s.type !== "boolean" && (t === void 0 || E) && (r[n] = s.nullableOrUndefined === "undefined" ? void 0 : null);
+    const t = { ...e };
+    for (const r in f) {
+      const s = f[r], n = t[r], F = (n == null || n === !1 || n === "" || Number.isNaN(n)) && n !== !1 && n !== 0;
+      s && !s.required && s.nullableOrUndefined && s.type !== "boolean" && (n === void 0 || F) && (t[r] = s.nullableOrUndefined === "undefined" ? void 0 : null);
     }
-    return r;
-  }, y = (e = {}) => {
+    return t;
+  }, y = (e) => {
+    const t = {};
+    if (e?.fields && typeof e.fields == "object")
+      for (const [r, s] of Object.entries(e.fields)) {
+        if (s?.ast?.defaultValue)
+          try {
+            const l = s.ast.defaultValue();
+            l !== void 0 && (t[r] = l);
+          } catch {
+          }
+        const n = y(s);
+        Object.keys(n).length > 0 && (t[r] && typeof t[r] == "object" ? Object.assign(t[r], n) : t[r] || (t[r] = n));
+      }
+    return t;
+  }, E = (e = {}) => {
     try {
-      if ("make" in a && typeof a.make == "function")
-        return a.make(e, { disableValidation: !0 });
-    } catch (r) {
-      return console.warn("Could not extract schema constructor defaults:", r), {};
+      if ("make" in a && typeof a.make == "function") {
+        const t = a.make(e);
+        return w.encodeSync(a.pipe(w.partial))(t);
+      }
+    } catch (t) {
+      window.location.hostname === "localhost" && console.warn("schema.make() failed, extracting defaults from AST:", t);
+      try {
+        const r = y(a);
+        return w.encodeSync(a.pipe(w.partial))(r);
+      } catch (r) {
+        return window.location.hostname === "localhost" && console.warn("Could not extract defaults from AST:", r), {};
+      }
     }
-  }, j = N(() => {
-    const e = y(u(p?.defaultValues));
+  }, v = D(() => {
+    const e = E(u(m?.defaultValues));
     if (e && !i?.persistency?.overrideDefaultValues)
       return e;
-    let r;
-    const n = i?.persistency;
-    if (!n?.policies || n.policies.length === 0) return {};
-    if (n.policies.includes("querystring"))
+    let t;
+    const r = i?.persistency;
+    if (!r?.policies || r.policies.length === 0) return {};
+    if (r.policies.includes("querystring"))
       try {
-        const t = new URLSearchParams(window.location.search).get(m.value);
-        O(), t && (r = JSON.parse(t));
+        const n = new URLSearchParams(window.location.search).get(d.value);
+        k(), n && (t = JSON.parse(n));
       } catch (s) {
         console.error(s);
       }
     if (
       // query string has higher priority than local/session storage
-      !r && (n.policies.includes("local") || n.policies.includes("session"))
+      !t && (r.policies.includes("local") || r.policies.includes("session"))
     ) {
-      const s = n.policies.includes("local") ? localStorage : sessionStorage;
+      const s = r.policies.includes("local") ? localStorage : sessionStorage;
       if (s)
         try {
-          const t = JSON.parse(
-            s.getItem(m.value) || "{}"
+          const n = JSON.parse(
+            s.getItem(d.value) || "{}"
           );
-          s.removeItem(m.value), r = t;
-        } catch (t) {
-          console.error(t);
+          s.removeItem(d.value), t = n;
+        } catch (n) {
+          console.error(n);
         }
     }
-    return r ??= y({}), e ? M(e, r) : r;
-  }), h = (e, r) => e ? A.with(B.setSpan(A.active(), e), r) : r(), o = z({
-    ...p,
+    return t ??= E({}), e ? x(e, t) : t;
+  }), b = (e, t) => e ? V.with(B.setSpan(V.active(), e), t) : t(), o = z({
+    ...m,
     validators: {
-      onSubmit: b,
-      ...p?.validators || {}
+      onSubmit: h,
+      ...m?.validators || {}
     },
-    onSubmit: p?.onSubmit ? ({ formApi: e, meta: r, value: n }) => h(r?.currentSpan, async () => {
-      const s = await c.runPromise(v(n)), t = p.onSubmit({
+    onSubmit: m?.onSubmit ? ({ formApi: e, meta: t, value: r }) => b(t?.currentSpan, async () => {
+      const s = await c.runPromise(p(r)), n = m.onSubmit({
         formApi: e,
-        meta: r,
+        meta: t,
         value: s
       });
-      return k.isFiber(t) && k.isRuntimeFiber(t) ? await T(t) : c.isEffect(t) ? await c.runPromise(
-        t.pipe(
+      return U.isFiber(n) && U.isRuntimeFiber(n) ? await Z(n) : c.isEffect(n) ? await c.runPromise(
+        n.pipe(
           // meta?.currentSpan
           //   ? Effect.withParentSpan(meta.currentSpan)
           //   : (_) => _,
-          c.flatMap((d) => k.join(d))
+          c.flatMap((l) => U.join(l))
         )
-      ) : t;
+      ) : n;
     }) : void 0,
-    defaultValues: j.value
-  }), l = () => {
+    defaultValues: v.value
+  }), g = () => {
     Object.keys(f).forEach((e) => {
       o.setFieldValue(e, void 0);
     });
-  }, w = (e) => e.reduce((r, n) => {
-    const s = n.split(".");
-    return s.reduce((t, d, E) => (E === s.length - 1 ? t[d] = o.getFieldValue(n) : t[d] = t[d] ?? {}, t[d]), r), r;
+  }, N = (e) => e.reduce((t, r) => {
+    const s = r.split(".");
+    return s.reduce((n, l, F) => (F === s.length - 1 ? n[l] = o.getFieldValue(r) : n[l] = n[l] ?? {}, n[l]), t), t;
   }, {}), _ = (e) => {
     if (e) {
-      if (g.isArray(e.keys))
-        return w(e.keys);
-      if (g.isArray(e.banKeys)) {
-        const r = Object.keys(f).filter((n) => e.banKeys?.includes(n));
-        return w(r);
+      if (j.isArray(e.keys))
+        return N(e.keys);
+      if (j.isArray(e.banKeys)) {
+        const t = Object.keys(f).filter((r) => e.banKeys?.includes(r));
+        return N(t);
       }
       return o.store.state.values;
     }
-  }, P = () => {
+  }, M = () => {
     const e = i?.persistency;
     if (!(!e?.policies || e.policies.length === 0) && (e.policies.includes("local") || e.policies.includes("session"))) {
-      const r = e.policies.includes("local") ? localStorage : sessionStorage;
-      if (!r) return;
-      const n = _(e);
-      return r.setItem(m.value, JSON.stringify(n));
+      const t = e.policies.includes("local") ? localStorage : sessionStorage;
+      if (!t) return;
+      const r = _(e);
+      return t.setItem(d.value, JSON.stringify(r));
     }
   }, L = () => {
     const e = i?.persistency;
     if (!(!e?.policies || e.policies.length === 0) && e.policies.includes("querystring")) {
-      const r = _(e), n = new URLSearchParams(window.location.search);
-      n.set(m.value, JSON.stringify(r));
+      const t = _(e), r = new URLSearchParams(window.location.search);
+      r.set(d.value, JSON.stringify(t));
       const s = new URL(window.location.href);
-      s.search = n.toString(), window.history.replaceState({}, "", s.toString());
+      s.search = r.toString(), window.history.replaceState({}, "", s.toString());
     }
-  }, V = (e) => {
+  }, I = (e) => {
     o.store.state.isDirty && e.preventDefault();
   };
-  if (W(P), G(() => {
-    window.addEventListener("beforeunload", P), window.addEventListener("blur", L), i?.preventWindowExit && i.preventWindowExit !== "nope" && window.addEventListener("beforeunload", V);
-  }), Q(() => {
-    window.removeEventListener("beforeunload", P), window.removeEventListener("blur", L), i?.preventWindowExit && i.preventWindowExit !== "nope" && window.removeEventListener("beforeunload", V);
+  if (R(M), Q(() => {
+    window.addEventListener("beforeunload", M), window.addEventListener("blur", L), i?.preventWindowExit && i.preventWindowExit !== "nope" && window.addEventListener("beforeunload", I);
+  }), X(() => {
+    window.removeEventListener("beforeunload", M), window.removeEventListener("blur", L), i?.preventWindowExit && i.preventWindowExit !== "nope" && window.removeEventListener("beforeunload", I);
   }), i?.preventWindowExit === "prevent-and-reset") {
-    const e = o.useStore((t) => t.isSubmitting), r = o.useStore((t) => t.submissionAttempts), n = o.useStore((t) => t.canSubmit), s = o.useStore((t) => t.values);
-    R([e, r], ([t, d], [E]) => {
-      E && !t && d > 0 && n.value && o.reset(s.value);
+    const e = o.useStore((n) => n.isSubmitting), t = o.useStore((n) => n.submissionAttempts), r = o.useStore((n) => n.canSubmit), s = o.useStore((n) => n.values);
+    T([e, t], ([n, l], [F]) => {
+      F && !n && l > 0 && r.value && o.reset(s.value);
     });
   }
-  const D = (e) => c.currentSpan.pipe(
+  const $ = (e) => c.currentSpan.pipe(
     c.option,
     c.flatMap(
-      (r) => c.promise(() => o.handleSubmit(x.isSome(r) ? { currentSpan: r.value, ...e } : e))
+      (t) => c.promise(() => o.handleSubmit(A.isSome(t) ? { currentSpan: t.value, ...e } : e))
     )
-  ), H = (e) => e?.checkErrors ? D(e?.meta).pipe(c.flatMap(c.fnUntraced(function* () {
-    const r = o.getAllErrors();
-    if (Object.keys(r.fields).length || r.form.errors.length)
-      return yield* new oe({ form: r.form, fields: r.fields });
-  }))) : D(e?.meta), J = o.handleSubmit, U = X(/* @__PURE__ */ new Map()), S = Object.assign(o, {
+  ), H = (e) => e?.checkErrors ? $(e?.meta).pipe(c.flatMap(c.fnUntraced(function* () {
+    const t = o.getAllErrors();
+    if (Object.keys(t.fields).length || t.form.errors.length)
+      return yield* new ie({ form: t.form, fields: t.fields });
+  }))) : $(e?.meta), J = o.handleSubmit, P = Y(/* @__PURE__ */ new Map()), S = Object.assign(o, {
     i18nNamespace: i?.i18nNamespace,
     ignorePreventCloseEvents: i?.ignorePreventCloseEvents,
     meta: f,
-    clear: l,
+    clear: g,
     handleSubmit: (e) => {
-      const r = B.getSpan(A.active());
-      return J({ currentSpan: r, ...e });
+      const t = B.getSpan(V.active());
+      return J({ currentSpan: t, ...e });
     },
     // /** @experimental */
     handleSubmitEffect: H,
     registerField: (e) => {
-      R(e, (r) => U.value.set(r.name, { label: r.label, id: r.id }), { immediate: !0 }), W(() => U.value.delete(e.value.name));
+      T(e, (t) => P.value.set(t.name, { label: t.label, id: t.id }), { immediate: !0 }), R(() => P.value.delete(e.value.name));
     }
-  }), I = { form: S, fieldMap: U };
+  }), W = { form: S, fieldMap: P };
   return Object.assign(S, {
     // Type-level properties for performance optimization (not used at runtime)
     _paths: void 0,
     _keys: void 0,
-    errorContext: I,
-    Form: F(S)(se),
-    Input: F(S)(i?.input ?? te),
-    TaggedUnion: F(S)(ne),
+    errorContext: W,
+    Form: O(S)(oe),
+    Input: O(S)(i?.input ?? ne),
+    TaggedUnion: O(S)(se),
     Field: o.Field,
-    Errors: ie(I)(ee),
-    Array: F(S)(Y),
-    AutoGen: F(S)(C)
+    Errors: ae(W)(te),
+    Array: O(S)(C),
+    AutoGen: O(S)(ee)
   });
 };
 export {
-  oe as FormErrors,
-  Ee as useOmegaForm
+  ie as FormErrors,
+  ge as useOmegaForm
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
     "effect": "^3.18.0",
@@ -53,8 +53,8 @@
     "highlight.js": "^11.11.1",
     "mitt": "^3.0.1",
     "vue3-highlightjs": "^1.0.5",
-    "@effect-app/vue": "2.92.2",
-    "effect-app": "3.12.0"
+    "effect-app": "3.12.0",
+    "@effect-app/vue": "2.92.2"
   },
   "scripts": {
     "build": "pnpm build:run",

package/src/components/OmegaForm/useOmegaForm.ts

@@ -706,16 +706,66 @@ export const useOmegaForm = <
     return normalized
   }
 
+  // Helper function to recursively extract default values from schema AST
+  const extractDefaultsFromAST = (schemaObj: any): any => {
+    const result: Record<string, any> = {}
+
+    // Check if this schema has fields (struct)
+    if (schemaObj?.fields && typeof schemaObj.fields === "object") {
+      for (const [key, fieldSchema] of Object.entries(schemaObj.fields)) {
+        // Check if this field has a default value in its AST
+        if ((fieldSchema as any)?.ast?.defaultValue) {
+          try {
+            const defaultValue = (fieldSchema as any).ast.defaultValue()
+            if (defaultValue !== undefined) {
+              result[key] = defaultValue
+            }
+          } catch {
+            // Silently ignore if defaultValue() throws
+          }
+        }
+
+        // Recursively check nested fields for structs
+        const nestedDefaults = extractDefaultsFromAST(fieldSchema as any)
+        if (Object.keys(nestedDefaults).length > 0) {
+          // If we already have a default value for this key, merge with nested
+          if (result[key] && typeof result[key] === "object") {
+            Object.assign(result[key], nestedDefaults)
+          } else if (!result[key]) {
+            // Only set nested defaults if we don't have a default value
+            result[key] = nestedDefaults
+          }
+        }
+      }
+    }
+
+    return result
+  }
+
   // Extract default values from schema constructors (e.g., withDefaultConstructor)
   const extractSchemaDefaults = (defaultValues: Partial<From> = {}) => {
     try {
+      // First try to use schema.make() if available
       // Note: Partial schemas don't have .make() method yet (https://github.com/Effect-TS/effect/issues/4222)
       if ("make" in schema && typeof (schema as any).make === "function") {
-        return (schema as any).make(defaultValues, { disableValidation: true })
+        const decoded = (schema as any).make(defaultValues)
+        return S.encodeSync(schema.pipe(S.partial))(decoded)
       }
     } catch (error) {
-      console.warn("Could not extract schema constructor defaults:", error)
-      return {}
+      // If make() fails, try to extract defaults from AST
+      if (window.location.hostname === "localhost") {
+        console.warn("schema.make() failed, extracting defaults from AST:", error)
+      }
+      try {
+        const astDefaults = extractDefaultsFromAST(schema)
+
+        return S.encodeSync(schema.pipe(S.partial))(astDefaults)
+      } catch (astError) {
+        if (window.location.hostname === "localhost") {
+          console.warn("Could not extract defaults from AST:", astError)
+        }
+        return {}
+      }
     }
   }