@effect-app/vue-components 0.18.15 → 0.18.16

package/dist/vue-components.es20.js

@@ -1,6 +1,6 @@
 import { defineComponent as F, getCurrentInstance as B, computed as v, onBeforeMount as C, watch as g, createElementBlock as O, openBlock as S, withModifiers as I, createElementVNode as L, unref as m, renderSlot as d, createCommentVNode as V, Fragment as k } from "vue";
 import { useStore as h } from "@tanstack/vue-form";
-import { getOmegaStore as $ } from "./vue-components.es25.js";
+import { getOmegaStore as $ } from "./vue-components.es26.js";
 import { provideOmegaErrors as A } from "./vue-components.es8.js";
 import { useOmegaForm as K } from "./vue-components.es9.js";
 const _ = ["disabled"], D = /* @__PURE__ */ F({

package/dist/vue-components.es22.js

@@ -1,5 +1,5 @@
 import { Exit as c, Runtime as s } from "effect";
-import { dual as n, isFunction as m } from "./vue-components.es26.js";
+import { dual as n, isFunction as m } from "./vue-components.es24.js";
 const i = Symbol.for("clone-trait"), u = n(2, (e, t) => i in e ? e[i](t) : Object.setPrototypeOf(t, Object.getPrototypeOf(e)));
 n(2, (e, t) => u(e, { ...e, ...m(t) ? t(e) : t }));
 const b = (e) => new Promise((t, r) => e.addObserver((o) => {

package/dist/vue-components.es23.js

@@ -1,4 +1,4 @@
-import { isFunction as c } from "./vue-components.es26.js";
+import { isFunction as c } from "./vue-components.es24.js";
 const s = c, t = (o) => typeof o == "object" && o !== null, i = (o) => t(o) || s(o);
 export {
   s as isFunction,

package/dist/vue-components.es24.js

@@ -1,92 +1,44 @@
-(function(){"use strict";try{if(typeof document<"u"){var i=document.createElement("style");if(i.appendChild(document.createTextNode(".omega-input .v-input__details:has(.v-messages:empty){grid-template-rows:0fr;transition:all .2s}.omega-input .v-messages:empty{min-height:0}.omega-input .v-input__details:has(.v-messages){transition:all .2s;overflow:hidden;min-height:0;display:grid;grid-template-rows:1fr}.omega-input .v-messages{transition:all .2s}.omega-input .v-messages>*{transition-duration:0s!important}.omega-input [role=alert]:has(.v-messages:empty){padding:0}.omega-input .v-btn{cursor:pointer;width:auto;appearance:none;box-shadow:none;display:block;min-width:auto;height:auto;padding:.5em .5em .5em 1em}")),document.head.appendChild(i),window.customElements){const e=window.customElements.define;window.customElements.define=function(s,t){const n=t.prototype.connectedCallback;return t.prototype.connectedCallback=function(){if(n&&n.call(this),this.shadowRoot){const a=document.createElement("style");a.appendChild(document.createTextNode(".omega-input .v-input__details:has(.v-messages:empty){grid-template-rows:0fr;transition:all .2s}.omega-input .v-messages:empty{min-height:0}.omega-input .v-input__details:has(.v-messages){transition:all .2s;overflow:hidden;min-height:0;display:grid;grid-template-rows:1fr}.omega-input .v-messages{transition:all .2s}.omega-input .v-messages>*{transition-duration:0s!important}.omega-input [role=alert]:has(.v-messages:empty){padding:0}.omega-input .v-btn{cursor:pointer;width:auto;appearance:none;box-shadow:none;display:block;min-width:auto;height:auto;padding:.5em .5em .5em 1em}")),this.shadowRoot.appendChild(a)}},e.call(window.customElements,s,t)}}}}catch(e){console.error("vite-plugin-css-injected-by-js",e)}})();
-import { defineComponent as w, getCurrentInstance as x, useId as C, computed as a, watch as f, nextTick as N, onMounted as d, ref as $, watchEffect as k, renderSlot as B, normalizeProps as I, guardReactiveProps as O, createElementVNode as _, normalizeClass as q, createBlock as L, createCommentVNode as P, unref as F, openBlock as S, mergeProps as T } from "vue";
-import { useStore as z } from "@tanstack/vue-form";
-import { useOmegaErrors as A } from "./vue-components.es8.js";
-import D from "./vue-components.es28.js";
-
-const J = /* @__PURE__ */ w({
-  inheritAttrs: !1,
-  __name: "OmegaInternalInput",
-  props: {
-    field: {},
-    meta: {},
-    label: {},
-    options: {},
-    type: {},
-    validators: {}
-  },
-  setup(c) {
-    const e = c, v = x()?.appContext.components.VTextField, l = C(), o = e.field, r = z(o.store, (t) => t), m = a(() => e.type ? e.type : e.meta?.type === "string" ? e.meta.format === "email" ? "email" : "string" : e.meta?.type || "unknown"), n = a(() => r.value.value), g = a(
-      () => (
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        r.value.meta.errors.map((t) => t?.message).filter(Boolean)
-      )
-    ), y = (t) => t == null || t === !1 || t === "" || Number.isNaN(t);
-    f(
-      () => !!n.value,
-      () => {
-        y(n.value) && e.meta?.type !== "boolean" && N(() => {
-          o.setValue(
-            e.meta?.nullableOrUndefined === "undefined" ? void 0 : null
-          );
-        });
-      }
-    ), d(() => {
-      !n.value && !e.meta?.required && e.meta?.nullableOrUndefined === "null" && o.setValue(null);
-    });
-    const { addError: h, removeError: b, showErrors: E, showErrorsOn: V } = A(), s = $(!1);
-    k(() => {
-      (E.value || V === "onChange") && (s.value = !0);
-    });
-    const u = () => {
-      s.value = !0;
-    };
-    d(() => {
-      n.value && u();
-    });
-    const p = a(() => !s.value && m.value !== "select" ? [] : g.value);
-    f(
-      () => r.value.meta.errors,
-      () => {
-        r.value.meta.errors.length ? h({
-          inputId: l,
-          errors: r.value.meta.errors.map((t) => t.message).filter(Boolean),
-          label: e.label
-        }) : b(l);
-      }
-    );
-    const i = a(() => ({
-      id: l,
-      required: e.meta?.required,
-      minLength: e.meta?.type === "string" && e.meta?.minLength,
-      maxLength: e.meta?.type === "string" && e.meta?.maxLength,
-      max: e.meta?.type === "number" && e.meta?.maximum,
-      min: e.meta?.type === "number" && e.meta?.minimum,
-      name: e.field.name,
-      modelValue: e.field.state.value,
-      errorMessages: p.value,
-      error: !!p.value.length,
-      field: e.field,
-      setRealDirty: u,
-      type: m.value,
-      label: `${e.label}${e.meta?.required ? " *" : ""}`,
-      options: e.options
-    }));
-    return (t, R) => B(t.$slots, "default", I(O(i.value)), () => [
-      _("div", {
-        class: q(t.$attrs.class),
-        onFocusout: u
-      }, [
-        F(v) ? (S(), L(D, T({
-          key: 0,
-          "input-props": i.value
-        }, t.$attrs, {
-          "vuetify-value": i.value.field.state.value
-        }), null, 16, ["input-props", "vuetify-value"])) : P("", !0)
-      ], 34)
-    ]);
+const f = (c) => typeof c == "function", a = function(c, r) {
+  switch (c) {
+    case 0:
+    case 1:
+      throw new RangeError(`Invalid arity ${c}`);
+    case 2:
+      return function(n, t) {
+        return arguments.length >= 2 ? r(n, t) : function(e) {
+          return r(e, n);
+        };
+      };
+    case 3:
+      return function(n, t, e) {
+        return arguments.length >= 3 ? r(n, t, e) : function(u) {
+          return r(u, n, t);
+        };
+      };
+    case 4:
+      return function(n, t, e, u) {
+        return arguments.length >= 4 ? r(n, t, e, u) : function(i) {
+          return r(i, n, t, e);
+        };
+      };
+    case 5:
+      return function(n, t, e, u, i) {
+        return arguments.length >= 5 ? r(n, t, e, u, i) : function(s) {
+          return r(s, n, t, e, u);
+        };
+      };
+    default:
+      return function() {
+        if (arguments.length >= c)
+          return r.apply(this, arguments);
+        const n = arguments;
+        return function(t) {
+          return r(t, ...n);
+        };
+      };
   }
-});
+};
 export {
-  J as default
+  a as dual,
+  f as isFunction
 };

package/dist/vue-components.es25.js

@@ -1,13 +1,92 @@
-import { useStore as u } from "@tanstack/vue-form";
-import { computed as f } from "vue";
-function c(o, t) {
-  return f(() => t ? u(o.store, (n) => {
-    const r = {};
-    for (const e of t)
-      r[e] = n[e];
-    return r;
-  }).value : {});
-}
+(function(){"use strict";try{if(typeof document<"u"){var i=document.createElement("style");if(i.appendChild(document.createTextNode(".omega-input .v-input__details:has(.v-messages:empty){grid-template-rows:0fr;transition:all .2s}.omega-input .v-messages:empty{min-height:0}.omega-input .v-input__details:has(.v-messages){transition:all .2s;overflow:hidden;min-height:0;display:grid;grid-template-rows:1fr}.omega-input .v-messages{transition:all .2s}.omega-input .v-messages>*{transition-duration:0s!important}.omega-input [role=alert]:has(.v-messages:empty){padding:0}.omega-input .v-btn{cursor:pointer;width:auto;appearance:none;box-shadow:none;display:block;min-width:auto;height:auto;padding:.5em .5em .5em 1em}")),document.head.appendChild(i),window.customElements){const e=window.customElements.define;window.customElements.define=function(s,t){const n=t.prototype.connectedCallback;return t.prototype.connectedCallback=function(){if(n&&n.call(this),this.shadowRoot){const a=document.createElement("style");a.appendChild(document.createTextNode(".omega-input .v-input__details:has(.v-messages:empty){grid-template-rows:0fr;transition:all .2s}.omega-input .v-messages:empty{min-height:0}.omega-input .v-input__details:has(.v-messages){transition:all .2s;overflow:hidden;min-height:0;display:grid;grid-template-rows:1fr}.omega-input .v-messages{transition:all .2s}.omega-input .v-messages>*{transition-duration:0s!important}.omega-input [role=alert]:has(.v-messages:empty){padding:0}.omega-input .v-btn{cursor:pointer;width:auto;appearance:none;box-shadow:none;display:block;min-width:auto;height:auto;padding:.5em .5em .5em 1em}")),this.shadowRoot.appendChild(a)}},e.call(window.customElements,s,t)}}}}catch(e){console.error("vite-plugin-css-injected-by-js",e)}})();
+import { defineComponent as w, getCurrentInstance as x, useId as C, computed as a, watch as f, nextTick as N, onMounted as d, ref as $, watchEffect as k, renderSlot as B, normalizeProps as I, guardReactiveProps as O, createElementVNode as _, normalizeClass as q, createBlock as L, createCommentVNode as P, unref as F, openBlock as S, mergeProps as T } from "vue";
+import { useStore as z } from "@tanstack/vue-form";
+import { useOmegaErrors as A } from "./vue-components.es8.js";
+import D from "./vue-components.es28.js";
+
+const J = /* @__PURE__ */ w({
+  inheritAttrs: !1,
+  __name: "OmegaInternalInput",
+  props: {
+    field: {},
+    meta: {},
+    label: {},
+    options: {},
+    type: {},
+    validators: {}
+  },
+  setup(c) {
+    const e = c, v = x()?.appContext.components.VTextField, l = C(), o = e.field, r = z(o.store, (t) => t), m = a(() => e.type ? e.type : e.meta?.type === "string" ? e.meta.format === "email" ? "email" : "string" : e.meta?.type || "unknown"), n = a(() => r.value.value), g = a(
+      () => (
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        r.value.meta.errors.map((t) => t?.message).filter(Boolean)
+      )
+    ), y = (t) => t == null || t === !1 || t === "" || Number.isNaN(t);
+    f(
+      () => !!n.value,
+      () => {
+        y(n.value) && e.meta?.type !== "boolean" && N(() => {
+          o.setValue(
+            e.meta?.nullableOrUndefined === "undefined" ? void 0 : null
+          );
+        });
+      }
+    ), d(() => {
+      !n.value && !e.meta?.required && e.meta?.nullableOrUndefined === "null" && o.setValue(null);
+    });
+    const { addError: h, removeError: b, showErrors: E, showErrorsOn: V } = A(), s = $(!1);
+    k(() => {
+      (E.value || V === "onChange") && (s.value = !0);
+    });
+    const u = () => {
+      s.value = !0;
+    };
+    d(() => {
+      n.value && u();
+    });
+    const p = a(() => !s.value && m.value !== "select" ? [] : g.value);
+    f(
+      () => r.value.meta.errors,
+      () => {
+        r.value.meta.errors.length ? h({
+          inputId: l,
+          errors: r.value.meta.errors.map((t) => t.message).filter(Boolean),
+          label: e.label
+        }) : b(l);
+      }
+    );
+    const i = a(() => ({
+      id: l,
+      required: e.meta?.required,
+      minLength: e.meta?.type === "string" && e.meta?.minLength,
+      maxLength: e.meta?.type === "string" && e.meta?.maxLength,
+      max: e.meta?.type === "number" && e.meta?.maximum,
+      min: e.meta?.type === "number" && e.meta?.minimum,
+      name: e.field.name,
+      modelValue: e.field.state.value,
+      errorMessages: p.value,
+      error: !!p.value.length,
+      field: e.field,
+      setRealDirty: u,
+      type: m.value,
+      label: `${e.label}${e.meta?.required ? " *" : ""}`,
+      options: e.options
+    }));
+    return (t, R) => B(t.$slots, "default", I(O(i.value)), () => [
+      _("div", {
+        class: q(t.$attrs.class),
+        onFocusout: u
+      }, [
+        F(v) ? (S(), L(D, T({
+          key: 0,
+          "input-props": i.value
+        }, t.$attrs, {
+          "vuetify-value": i.value.field.state.value
+        }), null, 16, ["input-props", "vuetify-value"])) : P("", !0)
+      ], 34)
+    ]);
+  }
+});
 export {
-  c as getOmegaStore
+  J as default
 };

package/dist/vue-components.es26.js

@@ -1,44 +1,13 @@
-const f = (c) => typeof c == "function", a = function(c, r) {
-  switch (c) {
-    case 0:
-    case 1:
-      throw new RangeError(`Invalid arity ${c}`);
-    case 2:
-      return function(n, t) {
-        return arguments.length >= 2 ? r(n, t) : function(e) {
-          return r(e, n);
-        };
-      };
-    case 3:
-      return function(n, t, e) {
-        return arguments.length >= 3 ? r(n, t, e) : function(u) {
-          return r(u, n, t);
-        };
-      };
-    case 4:
-      return function(n, t, e, u) {
-        return arguments.length >= 4 ? r(n, t, e, u) : function(i) {
-          return r(i, n, t, e);
-        };
-      };
-    case 5:
-      return function(n, t, e, u, i) {
-        return arguments.length >= 5 ? r(n, t, e, u, i) : function(s) {
-          return r(s, n, t, e, u);
-        };
-      };
-    default:
-      return function() {
-        if (arguments.length >= c)
-          return r.apply(this, arguments);
-        const n = arguments;
-        return function(t) {
-          return r(t, ...n);
-        };
-      };
-  }
-};
+import { useStore as u } from "@tanstack/vue-form";
+import { computed as f } from "vue";
+function c(o, t) {
+  return f(() => t ? u(o.store, (n) => {
+    const r = {};
+    for (const e of t)
+      r[e] = n[e];
+    return r;
+  }).value : {});
+}
 export {
-  a as dual,
-  f as isFunction
+  c as getOmegaStore
 };

package/dist/vue-components.es27.js

@@ -1,4 +1,4 @@
-import f from "./vue-components.es24.js";
+import f from "./vue-components.es25.js";
 export {
   f as default
 };

package/dist/vue-components.es7.js

@@ -1,6 +1,6 @@
 import { defineComponent as d, inject as f, computed as r, createBlock as n, openBlock as m, resolveDynamicComponent as c, withCtx as l, createCommentVNode as v, mergeProps as y, renderSlot as g, normalizeProps as h, guardReactiveProps as b } from "vue";
 import { generateInputStandardSchemaFromFieldMeta as C } from "./vue-components.es10.js";
-import F from "./vue-components.es24.js";
+import F from "./vue-components.es25.js";
 const P = /* @__PURE__ */ d({
   inheritAttrs: !1,
   __name: "OmegaInput",

package/dist/vue-components.es9.js

@@ -1,13 +1,13 @@
 import { useForm as U } from "@tanstack/vue-form";
-import { S as F, Fiber as p, Effect as o } from "effect-app";
-import { runtimeFiberAsPromise as O } from "./vue-components.es22.js";
-import { isObject as I } from "./vue-components.es23.js";
-import { computed as b, onUnmounted as R, onMounted as A, onBeforeUnmount as D, provide as M } from "vue";
-import N from "./vue-components.es6.js";
-import { generateMetaFromSchema as J } from "./vue-components.es10.js";
-const K = Symbol("OmegaForm"), z = (f, i, a) => {
+import { S as F, Fiber as p, Effect as o, Option as O } from "effect-app";
+import { runtimeFiberAsPromise as I } from "./vue-components.es22.js";
+import { isObject as R } from "./vue-components.es23.js";
+import { computed as b, onUnmounted as A, onMounted as M, onBeforeUnmount as N, provide as D } from "vue";
+import J from "./vue-components.es6.js";
+import { generateMetaFromSchema as K } from "./vue-components.es10.js";
+const q = Symbol("OmegaForm"), G = (f, s, a) => {
   if (!f) throw new Error("Schema is required");
-  const g = F.standardSchemaV1(f), { filterItems: V, meta: u } = J(f), l = b(() => {
+  const g = F.standardSchemaV1(f), { filterItems: V, meta: u } = K(f), l = b(() => {
     if (a?.persistency?.id)
       return a.persistency.id;
     const e = window.location.pathname, r = Object.keys(u);
@@ -20,19 +20,19 @@ const K = Symbol("OmegaForm"), z = (f, i, a) => {
   };
   function S(e, r) {
     for (const t in r)
-      r[t] && I(r[t]) ? (e[t] || (e[t] = {}), S(e[t], r[t])) : e[t] = r[t];
+      r[t] && R(r[t]) ? (e[t] || (e[t] = {}), S(e[t], r[t])) : e[t] = r[t];
     return e;
   }
   const P = b(() => {
-    if (i?.defaultValues && !a?.persistency?.overrideDefaultValues)
-      return i?.defaultValues;
+    if (s?.defaultValues && !a?.persistency?.overrideDefaultValues)
+      return s?.defaultValues;
     let e;
     const r = a?.persistency;
     if (!r?.policies || r.policies.length === 0) return {};
     if (r.policies.includes("querystring"))
       try {
-        const s = new URLSearchParams(window.location.search).get(l.value);
-        E(), s && (e = JSON.parse(s));
+        const i = new URLSearchParams(window.location.search).get(l.value);
+        E(), i && (e = JSON.parse(i));
       } catch (t) {
         console.error(t);
       }
@@ -43,38 +43,38 @@ const K = Symbol("OmegaForm"), z = (f, i, a) => {
       const t = r.policies.includes("local") ? localStorage : sessionStorage;
       if (t)
         try {
-          const s = JSON.parse(
+          const i = JSON.parse(
             t.getItem(l.value) || "{}"
           );
-          t.removeItem(l.value), e = s;
-        } catch (s) {
-          console.error(s);
+          t.removeItem(l.value), e = i;
+        } catch (i) {
+          console.error(i);
         }
     }
-    if (e ??= {}, i?.defaultValues == null)
+    if (e ??= {}, s?.defaultValues == null)
       return e;
     {
-      const t = i?.defaultValues;
+      const t = s?.defaultValues;
       return S(t, e);
     }
   }), c = U({
-    ...i,
+    ...s,
     validators: {
       onSubmit: g,
-      ...i?.validators || {}
+      ...s?.validators || {}
     },
-    onSubmit: i?.onSubmit ? ({ formApi: e, meta: r, value: t }) => {
-      const s = i.onSubmit({
+    onSubmit: s?.onSubmit ? ({ formApi: e, meta: r, value: t }) => {
+      const i = s.onSubmit({
         formApi: e,
         meta: r,
         value: t
       });
-      return p.isFiber(s) && p.isRuntimeFiber(s) ? O(s) : o.isEffect(s) ? o.runPromise(
-        s.pipe(
+      return p.isFiber(i) && p.isRuntimeFiber(i) ? I(i) : o.isEffect(i) ? o.runPromise(
+        i.pipe(
           r?.currentSpan ? o.withParentSpan(r.currentSpan) : (n) => n,
           o.flatMap((n) => p.join(n))
         )
-      ) : s;
+      ) : i;
     } : void 0,
     defaultValues: P.value
   }), j = () => {
@@ -82,8 +82,8 @@ const K = Symbol("OmegaForm"), z = (f, i, a) => {
       c.setFieldValue(e, void 0);
     });
   }, w = (e) => e.reduce((r, t) => {
-    const s = t.split(".");
-    return s.reduce((n, d, L) => (L === s.length - 1 ? n[d] = c.getFieldValue(t) : n[d] = n[d] ?? {}, n[d]), r), r;
+    const i = t.split(".");
+    return i.reduce((n, d, L) => (L === i.length - 1 ? n[d] = c.getFieldValue(t) : n[d] = n[d] ?? {}, n[d]), r), r;
   }, {}), h = (e) => {
     if (e) {
       if (Array.isArray(e.keys))
@@ -107,13 +107,13 @@ const K = Symbol("OmegaForm"), z = (f, i, a) => {
     if (!(!e?.policies || e.policies.length === 0) && e.policies.includes("querystring")) {
       const r = h(e), t = new URLSearchParams(window.location.search);
       t.set(l.value, JSON.stringify(r));
-      const s = new URL(window.location.href);
-      s.search = t.toString(), window.history.replaceState({}, "", s.toString());
+      const i = new URL(window.location.href);
+      i.search = t.toString(), window.history.replaceState({}, "", i.toString());
     }
   };
-  R(m), A(() => {
+  A(m), M(() => {
     window.addEventListener("beforeunload", m), window.addEventListener("blur", y);
-  }), D(() => {
+  }), N(() => {
     window.removeEventListener("beforeunload", m), window.removeEventListener("blur", y);
   });
   const v = Object.assign(c, {
@@ -122,21 +122,18 @@ const K = Symbol("OmegaForm"), z = (f, i, a) => {
     clear: j,
     /** @experimental */
     handleSubmitEffect: (e) => o.currentSpan.pipe(
-      o.orDie,
+      o.option,
       o.flatMap(
-        (r) => (
-          // TODO: fix type of handleSubmit, TSubmitMeta is somehow async validator :D
-          o.promise(() => c.handleSubmit({ currentSpan: r, ...e }))
-        )
+        (r) => o.promise(() => c.handleSubmit(O.isSome(r) ? { currentSpan: r.value, ...e } : e))
       )
     )
   });
-  return M(K, v), Object.assign(v, {
-    Input: N,
+  return D(q, v), Object.assign(v, {
+    Input: J,
     Field: c.Field
   });
 };
 export {
-  K as OmegaFormKey,
-  z as useOmegaForm
+  q as OmegaFormKey,
+  G as useOmegaForm
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "0.18.15",
+  "version": "0.18.16",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
     "@tanstack/vue-form": "1.2.4",
@@ -53,7 +53,7 @@
   "dependencies": {
     "highlight.js": "^11.11.1",
     "vue3-highlightjs": "^1.0.5",
-    "@effect-app/vue": "2.55.7",
+    "@effect-app/vue": "2.55.8",
     "effect-app": "3.3.4"
   },
   "scripts": {

package/src/components/OmegaForm/useOmegaForm.ts

@@ -2,7 +2,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { type DeepKeys, type FormAsyncValidateOrFn, type FormValidateOrFn, type StandardSchemaV1, useForm } from "@tanstack/vue-form"
-import { Effect, Fiber, S } from "effect-app"
+import { Effect, Fiber, Option, S } from "effect-app"
 import { runtimeFiberAsPromise } from "effect-app/utils"
 import { isObject } from "effect/Predicate"
 import { computed, type InjectionKey, onBeforeUnmount, onMounted, onUnmounted, provide } from "vue"
@@ -326,11 +326,10 @@ export const useOmegaForm = <
     /** @experimental */
     handleSubmitEffect: (meta?: Record<string, any>) =>
       Effect.currentSpan.pipe(
-        Effect.orDie,
+        Effect.option,
         Effect
           .flatMap((span) =>
-            // TODO: fix type of handleSubmit, TSubmitMeta is somehow async validator :D
-            Effect.promise(() => form.handleSubmit({ currentSpan: span, ...meta }))
+            Effect.promise(() => form.handleSubmit(Option.isSome(span) ? { currentSpan: span.value, ...meta } : meta))
           )
       )
   })