@effect-app/vue-components 2.7.5 → 2.7.7

package/dist/types/components/OmegaForm/OmegaFormStuff.d.ts

@@ -136,6 +136,7 @@ export type CreateMeta = {
     propertySignatures?: never;
     property: S.AST.AST;
 });
+export declare const isNullableOrUndefined: (property: false | S.AST.AST | undefined) => false | "undefined" | "null";
 export declare const createMeta: <T = any>({ meta, parent, property, propertySignatures }: CreateMeta, acc?: Partial<MetaRecord<T>>) => MetaRecord<T> | FieldMeta;
 export declare const duplicateSchema: <From, To>(schema: S.Schema<To, From, never>) => S.extend<S.Schema<To, From, never>, S.Struct<{}>>;
 export declare const generateMetaFromSchema: <From, To>(schema: S.Schema<To, From, never>) => {

package/dist/vue-components.es.js

@@ -1,14 +1,14 @@
 import * as o from "./vue-components.es2.js";
-import { getTransformationFrom as f, provideIntl as u, useIntl as l, useIntlKey as s } from "./vue-components.es3.js";
+import { getTransformationFrom as f, provideIntl as l, useIntl as u, useIntlKey as s } from "./vue-components.es3.js";
 import { default as i } from "./vue-components.es4.js";
 import { default as g } from "./vue-components.es5.js";
 import { default as I } from "./vue-components.es6.js";
 import { default as y } from "./vue-components.es7.js";
 import { default as h } from "./vue-components.es8.js";
-import { default as S } from "./vue-components.es9.js";
-import { useOmegaForm as b } from "./vue-components.es10.js";
-import { useOnClose as U, usePreventClose as j } from "./vue-components.es11.js";
-import { createMeta as P, duplicateSchema as k, generateInputStandardSchemaFromFieldMeta as w, generateMetaFromSchema as B, getInputType as D, nullableInput as K } from "./vue-components.es12.js";
+import { default as C } from "./vue-components.es9.js";
+import { useOmegaForm as T } from "./vue-components.es10.js";
+import { useOnClose as M, usePreventClose as j } from "./vue-components.es11.js";
+import { createMeta as P, duplicateSchema as k, generateInputStandardSchemaFromFieldMeta as w, generateMetaFromSchema as B, getInputType as D, isNullableOrUndefined as K, nullableInput as N } from "./vue-components.es12.js";
 import { createUseFormWithCustomInput as W } from "./vue-components.es13.js";
 function r(a) {
   for (const e in o)
@@ -23,7 +23,7 @@ export {
   g as Dialog,
   I as OmegaInput,
   h as OmegaTaggedUnion,
-  S as OmegaTaggedUnionInternal,
+  C as OmegaTaggedUnionInternal,
   y as OmegaVuetifyInput,
   P as createMeta,
   W as createUseFormWithCustomInput,
@@ -33,11 +33,12 @@ export {
   B as generateMetaFromSchema,
   D as getInputType,
   f as getTransformationFrom,
-  K as nullableInput,
-  u as provideIntl,
-  l as useIntl,
+  K as isNullableOrUndefined,
+  N as nullableInput,
+  l as provideIntl,
+  u as useIntl,
   s as useIntlKey,
-  b as useOmegaForm,
-  U as useOnClose,
+  T as useOmegaForm,
+  M as useOnClose,
   j as usePreventClose
 };

package/dist/vue-components.es10.js

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

package/dist/vue-components.es12.js

@@ -379,5 +379,6 @@ export {
   F as generateInputStandardSchemaFromFieldMeta,
   j as generateMetaFromSchema,
   R as getInputType,
+  d as isNullableOrUndefined,
   D as nullableInput
 };

package/dist/vue-components.es2.js

@@ -1,28 +1,29 @@
 import { default as a } from "./vue-components.es4.js";
 import { default as r } from "./vue-components.es5.js";
-import { createMeta as n, duplicateSchema as u, generateInputStandardSchemaFromFieldMeta as p, generateMetaFromSchema as f, getInputType as l, nullableInput as d } from "./vue-components.es12.js";
-import { useOmegaForm as s } from "./vue-components.es10.js";
-import { default as i } from "./vue-components.es6.js";
+import { createMeta as n, duplicateSchema as u, generateInputStandardSchemaFromFieldMeta as f, generateMetaFromSchema as l, getInputType as p, isNullableOrUndefined as d, nullableInput as s } from "./vue-components.es12.js";
+import { useOmegaForm as x } from "./vue-components.es10.js";
+import { default as I } from "./vue-components.es6.js";
 import { default as c } from "./vue-components.es7.js";
-import { default as F } from "./vue-components.es8.js";
-import { default as C } from "./vue-components.es9.js";
+import { default as h } from "./vue-components.es8.js";
+import { default as S } from "./vue-components.es9.js";
 import { useOnClose as M, usePreventClose as T } from "./vue-components.es11.js";
 import { createUseFormWithCustomInput as y } from "./vue-components.es13.js";
 export {
   a as CommandButton,
   r as Dialog,
-  i as OmegaInput,
-  F as OmegaTaggedUnion,
-  C as OmegaTaggedUnionInternal,
+  I as OmegaInput,
+  h as OmegaTaggedUnion,
+  S as OmegaTaggedUnionInternal,
   c as OmegaVuetifyInput,
   n as createMeta,
   y as createUseFormWithCustomInput,
   u as duplicateSchema,
-  p as generateInputStandardSchemaFromFieldMeta,
-  f as generateMetaFromSchema,
-  l as getInputType,
-  d as nullableInput,
-  s as useOmegaForm,
+  f as generateInputStandardSchemaFromFieldMeta,
+  l as generateMetaFromSchema,
+  p as getInputType,
+  d as isNullableOrUndefined,
+  s as nullableInput,
+  x as useOmegaForm,
   M as useOnClose,
   T as usePreventClose
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "2.7.5",
+  "version": "2.7.7",
   "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": "3.12.0",
-    "@effect-app/vue": "2.92.2"
+    "@effect-app/vue": "2.92.2",
+    "effect-app": "3.12.0"
   },
   "scripts": {
     "build": "pnpm build:run",

package/src/components/OmegaForm/OmegaFormStuff.ts

@@ -321,7 +321,7 @@ const getNullableOrUndefined = (property: S.AST.AST) => {
   )
 }
 
-const isNullableOrUndefined = (property: false | S.AST.AST | undefined) => {
+export const isNullableOrUndefined = (property: false | S.AST.AST | undefined) => {
   if (!property || !S.AST.isUnion(property)) return false
   if (property.types.find((_) => _._tag === "UndefinedKeyword")) {
     return "undefined"

package/src/components/OmegaForm/useOmegaForm.ts

@@ -11,7 +11,7 @@ import { MergedInputProps } from "./InputProps"
 import OmegaArray from "./OmegaArray.vue"
 import OmegaAutoGen from "./OmegaAutoGen.vue"
 import OmegaErrorsInternal from "./OmegaErrorsInternal.vue"
-import { BaseProps, DefaultTypeProps, FieldPath, type FormProps, generateMetaFromSchema, type MetaRecord, type NestedKeyOf, OmegaArrayProps, OmegaAutoGenMeta, OmegaError, type OmegaFormApi, OmegaFormState } from "./OmegaFormStuff"
+import { BaseProps, DefaultTypeProps, FieldPath, type FormProps, generateMetaFromSchema, isNullableOrUndefined, type MetaRecord, type NestedKeyOf, OmegaArrayProps, OmegaAutoGenMeta, OmegaError, type OmegaFormApi, OmegaFormState } from "./OmegaFormStuff"
 import OmegaInput from "./OmegaInput.vue"
 import OmegaTaggedUnion from "./OmegaTaggedUnion.vue"
 import OmegaForm from "./OmegaWrapper.vue"
@@ -768,6 +768,22 @@ export const useOmegaForm = <
       try {
         const instance = schemaObj.make({})
         // For ExtendedClass, the instance is already in the correct encoded format
+        // But we need to check for nullable fields that may have been set to undefined
+        // instead of null, and fix them
+        if (schemaObj?.fields && typeof schemaObj.fields === "object") {
+          for (const [key, fieldSchema] of Object.entries(schemaObj.fields)) {
+            // Only fix fields that are undefined in the instance
+            if (instance[key] === undefined) {
+              const ast = (fieldSchema as any).ast
+              const nullableOrUndefined = isNullableOrUndefined(ast)
+              if (nullableOrUndefined === "null") {
+                instance[key] = null
+              } else if (nullableOrUndefined === "undefined") {
+                instance[key] = undefined
+              }
+            }
+          }
+        }
         return instance
       } catch {
         // If make() fails, fall through to manual extraction
@@ -813,12 +829,22 @@ export const useOmegaForm = <
         if ((fieldSchema as any)?.ast?.defaultValue) {
           try {
             const defaultValue = (fieldSchema as any).ast.defaultValue()
-            if (defaultValue !== undefined) {
-              result[key] = defaultValue
-            }
+            result[key] = defaultValue
           } catch {
             // Silently ignore if defaultValue() throws
           }
+        } else {
+          // TODO Should we put to null/undefined only leaves?
+          const ast = (fieldSchema as any).ast
+          const nullableOrUndefined = isNullableOrUndefined(ast)
+          switch (nullableOrUndefined) {
+            case "null":
+              result[key] = null
+              break
+            case "undefined":
+              result[key] = undefined
+              break
+          }
         }
 
         // Recursively check nested fields for structs and unions
@@ -847,7 +873,7 @@ export const useOmegaForm = <
       // 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)
       const decoded = (schema as any).make(defaultValues)
-      result = S.encodeSync(partialRecursive(schema))(decoded)
+      result = S.encodeSync(partialRecursive(extractDefaultsFromAST(schema)))(decoded)
     } catch (error) {
       // If make() fails, try to extract defaults from AST
       if (window.location.hostname === "localhost") {