@effect-app/vue-components 0.8.0 → 0.8.2

package/dist/vue-components.es24.js

@@ -16,41 +16,41 @@ const re = /* @__PURE__ */ q({
     validators: {}
   },
   setup(C) {
-    const t = C, o = L(), N = o == null ? void 0 : o.appContext.components.VTextField, s = P(), u = t.field, a = J(u.store, (e) => e), d = l(() => {
+    const t = C, o = L(), N = o == null ? void 0 : o.appContext.components.VTextField, s = P(), u = t.field, a = J(u.store, (e) => e), f = l(() => {
       var e, r;
       return t.type ? t.type : ((e = t.meta) == null ? void 0 : e.type) === "string" ? t.meta.format === "email" ? "email" : "string" : ((r = t.meta) == null ? void 0 : r.type) || "unknown";
-    }), i = l(() => a.value.value), $ = l(
+    }), n = l(() => a.value.value), $ = l(
       () => (
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         a.value.meta.errors.map((e) => e == null ? void 0 : e.message).filter(Boolean)
       )
     ), k = (e) => e == null || e === !1 || e === "" || Number.isNaN(e);
     w(
-      () => !!i.value,
-      (e) => {
-        var r;
-        k(e) && ((r = t.meta) == null ? void 0 : r.type) !== "boolean" && F(() => {
-          var n;
+      () => !!n.value,
+      () => {
+        var e;
+        k(n.value) && ((e = t.meta) == null ? void 0 : e.type) !== "boolean" && F(() => {
+          var r;
           u.setValue(
-            ((n = t.meta) == null ? void 0 : n.nullableOrUndefined) === "undefined" ? void 0 : null
+            ((r = t.meta) == null ? void 0 : r.nullableOrUndefined) === "undefined" ? void 0 : null
           );
         });
       }
     ), x(() => {
       var e, r;
-      !i.value && !((e = t.meta) != null && e.required) && ((r = t.meta) == null ? void 0 : r.nullableOrUndefined) === "null" && u.setValue(null);
+      !n.value && !((e = t.meta) != null && e.required) && ((r = t.meta) == null ? void 0 : r.nullableOrUndefined) === "null" && u.setValue(null);
     });
-    const { addError: B, removeError: I, showErrors: O, showErrorsOn: _ } = K(), m = S(!1);
+    const { addError: B, removeError: I, showErrors: O, showErrorsOn: _ } = K(), i = S(!1);
     T(() => {
-      (O.value || _ === "onChange") && (m.value = !0);
+      (O.value || _ === "onChange") && (i.value = !0);
     });
-    const p = () => {
-      m.value = !0;
+    const m = () => {
+      i.value = !0;
     };
     x(() => {
-      i.value && p();
+      n.value && m();
     });
-    const c = l(() => !m.value && d.value !== "select" ? [] : $.value);
+    const d = l(() => !i.value && f.value !== "select" ? [] : $.value);
     w(
       () => a.value.meta.errors,
       () => {
@@ -61,36 +61,36 @@ const re = /* @__PURE__ */ q({
         }) : I(s);
       }
     );
-    const f = l(() => {
-      var e, r, n, v, g, y, h, b, E, V;
+    const p = l(() => {
+      var e, r, c, v, g, y, h, b, E, V;
       return {
         id: s,
         required: (e = t.meta) == null ? void 0 : e.required,
-        minLength: ((r = t.meta) == null ? void 0 : r.type) === "string" && ((n = t.meta) == null ? void 0 : n.minLength),
+        minLength: ((r = t.meta) == null ? void 0 : r.type) === "string" && ((c = t.meta) == null ? void 0 : c.minLength),
         maxLength: ((v = t.meta) == null ? void 0 : v.type) === "string" && ((g = t.meta) == null ? void 0 : g.maxLength),
         max: ((y = t.meta) == null ? void 0 : y.type) === "number" && ((h = t.meta) == null ? void 0 : h.maximum),
         min: ((b = t.meta) == null ? void 0 : b.type) === "number" && ((E = t.meta) == null ? void 0 : E.minimum),
         name: t.field.name,
         modelValue: t.field.state.value,
-        errorMessages: c.value,
-        error: !!c.value.length,
+        errorMessages: d.value,
+        error: !!d.value.length,
         field: t.field,
-        setRealDirty: p,
-        type: d.value,
+        setRealDirty: m,
+        type: f.value,
         label: `${t.label}${(V = t.meta) != null && V.required ? " *" : ""}`,
         options: t.options
       };
     });
-    return (e, r) => z(e.$slots, "default", A(D(f.value)), () => [
+    return (e, r) => z(e.$slots, "default", A(D(p.value)), () => [
       M("div", {
         class: R(e.$attrs.class),
-        onFocusout: p
+        onFocusout: m
       }, [
         j(N) ? (G(), U(Q, H({
           key: 0,
-          "input-props": f.value
+          "input-props": p.value
         }, e.$attrs, {
-          "vuetify-value": f.value.field.state.value
+          "vuetify-value": p.value.field.state.value
         }), null, 16, ["input-props", "vuetify-value"])) : Z("", !0)
       ], 34)
     ]);

package/dist/vue-components.es27.js

@@ -71,7 +71,7 @@ const b = /* @__PURE__ */ P({
         }, e.$attrs, {
           "model-value": e.vuetifyValue,
           "onUpdate:modelValue": r[1] || (r[1] = (p) => {
-            e.inputProps.field.handleChange(Number(p));
+            p || p === 0 ? e.inputProps.field.handleChange(Number(p)) : e.inputProps.field.handleChange(void 0);
           })
         }), null, 16, ["id", "required", "min", "max", "type", "name", "label", "error-messages", "error", "model-value"])) : l("", !0),
         e.inputProps.type === "select" || e.inputProps.type === "multiple" ? (o(), n(m, i({

package/dist/vue-components.es7.js

@@ -1,38 +1,31 @@
 import { ref as l, computed as p, readonly as v, provide as E, inject as f } from "vue";
-const u = Symbol();
-function h(e, a, t = "onSubmit") {
-  const r = l([]), n = (o) => {
-    r.value = r.value.filter((d) => d.inputId !== o);
-  }, c = (o) => {
-    n(o.inputId), r.value.push(o);
-  }, i = () => {
+const s = Symbol();
+function g(o, i, t = "onSubmit") {
+  const r = l([]), n = (e) => {
+    r.value = r.value.filter((d) => d.inputId !== e);
+  }, c = (e) => {
+    n(e.inputId), r.value.push(e);
+  }, m = () => {
     r.value = [];
-  }, m = p(() => {
-    switch (t) {
-      case "onChange":
-        return !0;
-      default:
-        return e.value > 0;
-    }
-  }), s = {
+  }, a = p(() => t === "onSubmit" ? o.value > 0 : !0), u = {
     errors: v(r),
     addError: c,
     removeError: n,
-    clearErrors: i,
-    showErrors: m,
-    generalErrors: a,
+    clearErrors: m,
+    showErrors: a,
+    generalErrors: i,
     showErrorsOn: t ?? "onSubmit"
   };
-  return E(u, s), s;
+  return E(s, u), u;
 }
-function w() {
-  const e = f(u);
-  if (!e)
+function O() {
+  const o = f(s);
+  if (!o)
     throw new Error("useOmegaErrors must be used within an OmegaForm provider");
-  return e;
+  return o;
 }
 export {
-  u as OmegaErrorsKey,
-  h as provideOmegaErrors,
-  w as useOmegaErrors
+  s as OmegaErrorsKey,
+  g as provideOmegaErrors,
+  O as useOmegaErrors
 };

package/dist/vue-components.es9.js

@@ -1,6 +1,6 @@
-import { S as i, Option as f, pipe as p } from "effect-app";
-import { useIntl as S } from "./vue-components.es3.js";
-const y = i.NonEmptyArray(i.String), v = (e) => i.AST.isUnion(e) && e.types.find((t) => t._tag === "UndefinedKeyword" || t === i.Null.ast), x = (e) => !e || !i.AST.isUnion(e) ? !1 : e.types.find((t) => t._tag === "UndefinedKeyword") ? "undefined" : e.types.find((t) => t === i.Null.ast) ? "null" : !1, m = ({ meta: e = {}, parent: t = "", property: n, propertySignatures: a }, l = {}) => {
+import { S as i, Option as g, pipe as y } from "effect-app";
+import { useIntl as v } from "./vue-components.es3.js";
+const x = i.NonEmptyArray(i.String), T = (e) => i.AST.isUnion(e) && e.types.find((t) => t._tag === "UndefinedKeyword" || t === i.Null.ast), h = (e) => !e || !i.AST.isUnion(e) ? !1 : e.types.find((t) => t._tag === "UndefinedKeyword") ? "undefined" : e.types.find((t) => t === i.Null.ast) ? "null" : !1, m = ({ meta: e = {}, parent: t = "", property: n, propertySignatures: r }, u = {}) => {
   if (n && n._tag === "Transformation")
     return m({
       parent: t,
@@ -12,52 +12,80 @@ const y = i.NonEmptyArray(i.String), v = (e) => i.AST.isUnion(e) && e.types.find
       meta: e,
       propertySignatures: n.propertySignatures
     });
-  if (a) {
-    for (const s of a) {
-      const u = t ? `${t}.${s.name.toString()}` : s.name.toString(), r = x(s.type), o = !r;
-      let d = s.type;
-      if (i.AST.isUnion(s.type) && (d = s.type.types.find(
-        (g) => g._tag !== "UndefinedKeyword" && g !== i.Null.ast
-      )), "propertySignatures" in d)
+  if (r) {
+    for (const s of r) {
+      const o = t ? `${t}.${s.name.toString()}` : s.name.toString(), a = h(s.type), l = !a, p = s.type;
+      if (i.AST.isUnion(s.type)) {
+        const d = s.type.types.filter(
+          (f) => f._tag !== "UndefinedKeyword" && f !== i.Null.ast
+        );
+        if (d.some(
+          (f) => "propertySignatures" in f
+        )) {
+          const f = m({
+            parent: o,
+            property: s.type,
+            meta: { required: l, nullableOrUndefined: a }
+          });
+          u[o] = f;
+          for (const c of d)
+            "propertySignatures" in c && Object.assign(
+              u,
+              m({
+                parent: o,
+                propertySignatures: c.propertySignatures,
+                meta: { required: l, nullableOrUndefined: a }
+              })
+            );
+        } else {
+          const f = m({
+            parent: o,
+            property: s.type,
+            meta: { required: l, nullableOrUndefined: a }
+          });
+          u[o] = f;
+        }
+      }
+      if ("propertySignatures" in p)
         Object.assign(
-          l,
+          u,
           m({
-            parent: u,
-            propertySignatures: d.propertySignatures,
-            meta: { required: o, nullableOrUndefined: r }
+            parent: o,
+            propertySignatures: p.propertySignatures,
+            meta: { required: l, nullableOrUndefined: a }
           })
         );
       else {
-        const g = m({
-          parent: u,
+        const d = m({
+          parent: o,
           property: s.type,
-          meta: { required: o, nullableOrUndefined: r }
+          meta: { required: l, nullableOrUndefined: a }
         });
-        l[u] = g;
+        u[o] = d;
       }
     }
-    return l;
+    return u;
   }
   if (n) {
-    const s = v(n);
+    const s = T(n);
     if (Object.hasOwnProperty.call(e, "required") || (e.required = !s), i.AST.isUnion(n)) {
-      const r = n.types.find(
-        (o) => o._tag !== "UndefinedKeyword" && o !== i.Null.ast
+      const a = n.types.find(
+        (l) => l._tag !== "UndefinedKeyword" && l !== i.Null.ast
       );
-      return "propertySignatures" in r ? m({
-        propertySignatures: r.propertySignatures,
+      return "propertySignatures" in a ? m({
+        propertySignatures: a.propertySignatures,
         parent: t,
         meta: e
       }) : n.types.every(i.AST.isLiteral) ? {
         ...e,
         type: "select",
-        members: n.types.map((o) => o.literal)
+        members: n.types.map((l) => l.literal)
       } : {
         ...e,
         ...m({
           parent: t,
           meta: e,
-          property: r
+          property: a
         })
       };
     }
@@ -68,11 +96,11 @@ const y = i.NonEmptyArray(i.String), v = (e) => i.AST.isUnion(e) && e.types.find
         members: n.elements,
         rest: n.rest
       };
-    const u = i.AST.getAnnotation(
+    const o = i.AST.getAnnotation(
       n,
       i.AST.JSONSchemaAnnotationId
-    ).pipe(f.getOrElse(() => ({})));
-    return e = { ...e, ...u }, "from" in n ? m({
+    ).pipe(g.getOrElse(() => ({})));
+    return e = { ...e, ...o }, "from" in n ? m({
       parent: t,
       meta: e,
       property: n.from
@@ -80,50 +108,50 @@ const y = i.NonEmptyArray(i.String), v = (e) => i.AST.isUnion(e) && e.types.find
       n,
       i.AST.TitleAnnotationId
     ).pipe(
-      f.getOrElse(() => "unknown")
+      g.getOrElse(() => "unknown")
     ), e);
   }
-  return l;
-}, c = (e) => {
+  return u;
+}, S = (e) => {
   const t = e.ast, n = {};
   if (t._tag === "Transformation" || t._tag === "Refinement")
-    return c(i.make(t.from));
+    return S(i.make(t.from));
   if ("propertySignatures" in t) {
-    const a = m({
+    const r = m({
       propertySignatures: t.propertySignatures
     });
-    if (Object.values(a).every((s) => s && "type" in s))
-      return a;
-    const l = (s, u = "") => {
-      for (const r in s) {
-        const o = u ? `${u}.${r}` : r;
-        s[r] && typeof s[r] == "object" && "type" in s[r] ? n[o] = s[r] : s[r] && typeof s[r] == "object" && l(s[r], o);
+    if (Object.values(r).every((s) => s && "type" in s))
+      return r;
+    const u = (s, o = "") => {
+      for (const a in s) {
+        const l = o ? `${o}.${a}` : a;
+        s[a] && typeof s[a] == "object" && "type" in s[a] ? n[l] = s[a] : s[a] && typeof s[a] == "object" && u(s[a], l);
       }
     };
-    l(a);
+    u(r);
   }
   return n;
-}, b = (e) => i.extend(e, i.Struct({})), A = (e) => {
-  const t = c(e), n = p(
+}, M = (e) => i.extend(e, i.Struct({})), N = (e) => {
+  const t = S(e), n = y(
     e.ast,
-    f.liftPredicate((a) => a._tag === "Refinement" && "filter" in a),
-    f.flatMap((a) => i.AST.getJSONSchemaAnnotation(a)),
-    f.filter((a) => "items" in a),
-    f.filterMap(
-      ({ items: a }) => i.decodeUnknownOption(y)(a)
+    g.liftPredicate((r) => r._tag === "Refinement" && "filter" in r),
+    g.flatMap((r) => i.AST.getJSONSchemaAnnotation(r)),
+    g.filter((r) => "items" in r),
+    g.filterMap(
+      ({ items: r }) => i.decodeUnknownOption(x)(r)
     ),
-    f.zipWith(
+    g.zipWith(
       i.AST.getMessageAnnotation(e.ast),
-      (a, l) => ({
-        items: a,
-        message: l("")
+      (r, u) => ({
+        items: r,
+        message: u("")
       })
     ),
-    f.getOrUndefined
+    g.getOrUndefined
   );
   return { schema: e, meta: t, filterItems: n };
-}, O = (e) => {
-  const { trans: t } = S();
+}, L = (e) => {
+  const { trans: t } = v();
   let n;
   switch (e.type) {
     case "string":
@@ -205,7 +233,7 @@ const y = i.NonEmptyArray(i.String), v = (e) => i.AST.isUnion(e) && e.types.find
       message: () => t("validation.empty")
     })
   ) : n = i.NullishOr(n), i.standardSchemaV1(n);
-}, L = (e, t) => i.NullOr(e).pipe(
+}, U = (e, t) => i.NullOr(e).pipe(
   i.transform(i.typeSchema(e), {
     decode: (n) => n ?? t(),
     encode: (n) => n
@@ -213,8 +241,8 @@ const y = i.NonEmptyArray(i.String), v = (e) => i.AST.isUnion(e) && e.types.find
 );
 export {
   m as createMeta,
-  b as duplicateSchema,
-  O as generateInputStandardSchemaFromFieldMeta,
-  A as generateMetaFromSchema,
-  L as nullableInput
+  M as duplicateSchema,
+  L as generateInputStandardSchemaFromFieldMeta,
+  N as generateMetaFromSchema,
+  U as nullableInput
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
     "@tanstack/vue-form": "^1.2.4",

package/src/components/OmegaForm/OmegaErrorsContext.ts

@@ -45,12 +45,8 @@ export function provideOmegaErrors(
   }
 
   const showErrors = computed(() => {
-    switch (showErrorsOn) {
-      case "onChange":
-        return true
-      default:
-        return formSubmissionAttempts.value > 0
-    }
+    if (showErrorsOn === "onSubmit") return formSubmissionAttempts.value > 0
+    return true
   })
 
   const context = {

package/src/components/OmegaForm/OmegaFormStuff.ts

@@ -257,13 +257,48 @@ export const createMeta = <T = any>(
       const nullableOrUndefined = isNullableOrUndefined(p.type)
       const isRequired = !nullableOrUndefined
 
-      let typeToProcess = p.type
+      const typeToProcess = p.type
       if (S.AST.isUnion(p.type)) {
-        typeToProcess = p.type.types.find(
+        const nonNullTypes = p.type.types.filter(
           t => t._tag !== "UndefinedKeyword" && t !== S.Null.ast,
-        )!
-      }
+        )
 
+        const hasStructMembers = nonNullTypes.some(
+          t => "propertySignatures" in t,
+        )
+
+        if (hasStructMembers) {
+          // Create metadata for the parent level (the union itself)
+          const parentMeta = createMeta<T>({
+            parent: key,
+            property: p.type,
+            meta: { required: isRequired, nullableOrUndefined },
+          })
+          acc[key as NestedKeyOf<T>] = parentMeta as FieldMeta
+
+          // Process each non-null type and merge their metadata
+          for (const nonNullType of nonNullTypes) {
+            if ("propertySignatures" in nonNullType) {
+              Object.assign(
+                acc,
+                createMeta<T>({
+                  parent: key,
+                  propertySignatures: nonNullType.propertySignatures,
+                  meta: { required: isRequired, nullableOrUndefined },
+                }),
+              )
+            }
+          }
+        } else {
+          // If no struct members, process as regular union
+          const newMeta = createMeta<T>({
+            parent: key,
+            property: p.type,
+            meta: { required: isRequired, nullableOrUndefined },
+          })
+          acc[key as NestedKeyOf<T>] = newMeta as FieldMeta
+        }
+      }
       if ("propertySignatures" in typeToProcess) {
         Object.assign(
           acc,

package/src/components/OmegaForm/OmegaInputVuetify.vue

@@ -63,7 +63,11 @@
       :model-value="vuetifyValue"
       @update:model-value="
         (e: any) => {
-          inputProps.field.handleChange(Number(e))
+          if (e || e === 0) {
+            inputProps.field.handleChange(Number(e))
+          } else {
+            inputProps.field.handleChange(undefined)
+          }
         }
       "
     />

package/src/components/OmegaForm/OmegaInternalInput.vue

@@ -79,8 +79,8 @@ const isFalsyButNotZero = (value: unknown): boolean => {
 //watchEffect will trigger infinite times with both free fieldValue and errors, so bet to watch a stupid boolean
 watch(
   () => !!fieldValue.value,
-  value => {
-    if (isFalsyButNotZero(value) && props.meta?.type !== "boolean") {
+  () => {
+    if (isFalsyButNotZero(fieldValue.value) && props.meta?.type !== "boolean") {
       nextTick(() => {
         fieldApi.setValue(
           props.meta?.nullableOrUndefined === "undefined" ? undefined : null,