@effect-app/vue-components 1.8.5 → 1.8.7

package/dist/vue-components.es6.js

@@ -1,7 +1,7 @@
 (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 b, getCurrentInstance as C, useId as x, computed as n, onMounted as P, renderSlot as _, normalizeProps as m, guardReactiveProps as $, createElementVNode as N, normalizeClass as V, createBlock as k, createCommentVNode as q, unref as B, openBlock as F, mergeProps as I } from "vue";
-import { useStore as L } from "@tanstack/vue-form";
-import w from "./vue-components.es24.js";
+import { defineComponent as b, getCurrentInstance as C, useId as x, computed as n, onMounted as P, renderSlot as _, normalizeProps as m, guardReactiveProps as $, createElementVNode as M, normalizeClass as N, createBlock as V, createCommentVNode as k, unref as q, openBlock as B, mergeProps as F } from "vue";
+import { useStore as I } from "@tanstack/vue-form";
+import L from "./vue-components.es24.js";
 
 const U = /* @__PURE__ */ b({
   inheritAttrs: !1,
@@ -16,9 +16,9 @@ const U = /* @__PURE__ */ b({
     options: {}
   },
   setup(u) {
-    const e = u, p = C()?.appContext.components.VTextField, i = x(), a = e.field, l = L(a.store, (t) => t), d = n(() => e.type ? e.type : e.meta?.type === "string" ? e.meta.format === "email" ? "email" : "string" : e.meta?.type || "unknown");
+    const e = u, p = C()?.appContext.components.VTextField, i = x(), a = e.field, o = I(a.store, (t) => t), d = n(() => e.type ? e.type : e.meta?.type === "string" ? e.meta.format === "email" ? "email" : "string" : e.meta?.type || "unknown");
     e.register(n(() => ({ name: e.field.name, label: e.label, id: i })));
-    const f = n(() => l.value.value), c = n(() => l.value.meta.errors ?? []), s = n(
+    const f = n(() => o.value.value), c = n(() => o.value.meta.errors ?? []), s = n(
       () => (
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         c.value.map((t) => t?.message).filter(Boolean)
@@ -26,22 +26,22 @@ const U = /* @__PURE__ */ b({
     ), g = (t) => t == null || t === !1 || t === "" || Number.isNaN(t), y = (t) => {
       g(t) && e.meta?.type !== "boolean" ? e.field.handleChange(
         e.meta?.nullableOrUndefined === "undefined" ? void 0 : null
-      ) : e.field.handleChange(t);
+      ) : e.field.handleChange(t), e.field.setMeta((r) => ({ ...r, errorMap: { ...r.errorMap, onSubmit: void 0 } }));
     };
     P(() => {
       if (!f.value && !e.meta?.required && e.meta?.nullableOrUndefined === "null") {
-        const t = l.value.meta.isDirty;
+        const t = o.value.meta.isDirty;
         a.setValue(null), a.setMeta((r) => ({ ...r, isDirty: t }));
       }
     });
     const h = (t) => {
       const r = {
-        get(S, v, z) {
+        get(O, v, z) {
           return v === "handleChange" ? y : Reflect.get(...arguments);
         }
       };
       return new Proxy(t, r);
-    }, o = n(() => ({
+    }, l = n(() => ({
       inputProps: {
         id: i,
         required: e.meta?.required,
@@ -57,11 +57,11 @@ const U = /* @__PURE__ */ b({
       },
       field: h(e.field)
     }));
-    return (t, r) => _(t.$slots, "default", m($({ ...t.$attrs, ...o.value.inputProps, field: o.value.field })), () => [
-      N("div", {
-        class: V(t.$attrs.class)
+    return (t, r) => _(t.$slots, "default", m($({ ...t.$attrs, ...l.value.inputProps, field: l.value.field })), () => [
+      M("div", {
+        class: N(t.$attrs.class)
       }, [
-        B(p) ? (F(), k(w, m(I({ key: 0 }, { ...t.$attrs, ...o.value })), null, 16)) : q("", !0)
+        q(p) ? (B(), V(L, m(F({ key: 0 }, { ...t.$attrs, ...l.value })), null, 16)) : k("", !0)
       ], 2)
     ]);
   }

package/dist/vue-components.es7.js

@@ -1,72 +1,71 @@
-import { useForm as T } from "@tanstack/vue-form";
-import { Data as W, S as U, Effect as l, Array as g, Option as E, Fiber as F } from "effect-app";
-import { runtimeFiberAsPromise as k } from "./vue-components.es13.js";
-import { isObject as z } from "./vue-components.es14.js";
-import { computed as $, onUnmounted as A, onMounted as Q, onBeforeUnmount as X, watch as N, h as D } from "vue";
+import { useForm as k } from "@tanstack/vue-form";
+import { Data as B, S as L, Effect as l, Fiber as b, Option as G, Array as O } from "effect-app";
+import { runtimeFiberAsPromise as T } from "./vue-components.es12.js";
+import { isObject as W } from "./vue-components.es13.js";
+import { computed as I, onUnmounted as U, onMounted as z, onBeforeUnmount as Q, ref as X, watch as $, h as N } from "vue";
 import { usePreventClose as Y } from "./vue-components.es8.js";
-import Z from "./vue-components.es15.js";
-import C from "./vue-components.es16.js";
-import ee from "./vue-components.es17.js";
+import Z from "./vue-components.es14.js";
+import C from "./vue-components.es15.js";
+import ee from "./vue-components.es16.js";
 import { generateMetaFromSchema as re } from "./vue-components.es9.js";
 import te from "./vue-components.es5.js";
-import se from "./vue-components.es18.js";
-import { trace as _ } from "./vue-components.es19.js";
-import { context as M } from "./vue-components.es20.js";
-class ne extends W.TaggedError("FormErrors") {
+import se from "./vue-components.es17.js";
+import { trace as A } from "./vue-components.es18.js";
+import { context as y } from "./vue-components.es19.js";
+class ne extends B.TaggedError("FormErrors") {
 }
-const h = (c) => function(o) {
+const p = (c) => function(i) {
   return {
     render() {
-      return D(o, {
+      return N(i, {
         form: c,
         ...this.$attrs
       }, this.$slots);
     }
   };
-}, oe = (c) => function(o) {
+}, ie = (c) => function(i) {
   return {
     setup() {
       return {
         ...c
       };
     },
-    render({ errors: S, generalErrors: w, showErrors: v }) {
-      return D(o, {
-        errors: S,
-        generalErrors: w,
-        showErrors: v,
+    render({ fieldMap: h, form: S }) {
+      return N(i, {
+        form: S,
+        fieldMap: h,
         ...this.$attrs
       }, this.$slots);
     }
   };
-}, ye = (c, a, o) => {
+}, ye = (c, a, i) => {
   if (!c) throw new Error("Schema is required");
-  const S = U.standardSchemaV1(c), w = U.decode(c), { filterItems: v, meta: p } = re(c), m = $(() => {
-    if (o?.persistency?.id)
-      return o.persistency.id;
-    const e = window.location.pathname, r = Object.keys(p);
+  const h = L.standardSchemaV1(c), S = L.decode(c), { filterItems: _, meta: d } = re(c), m = I(() => {
+    if (i?.persistency?.id)
+      return i.persistency.id;
+    const e = window.location.pathname, r = Object.keys(d);
     return `${e}-${r.join("-")}`;
-  }), R = () => {
+  }), D = () => {
     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());
   };
-  function j(e, r) {
+  function g(e, r) {
     for (const t in r)
-      r[t] && z(r[t]) ? (e[t] || (e[t] = {}), j(e[t], r[t])) : e[t] = r[t];
+      r[t] && W(r[t]) ? (e[t] || (e[t] = {}), g(e[t], r[t])) : e[t] = r[t];
     return e;
   }
-  const x = $(() => {
-    if (a?.defaultValues && !o?.persistency?.overrideDefaultValues)
+  const R = I(() => {
+    if (a?.defaultValues && !i?.persistency?.overrideDefaultValues)
       return a?.defaultValues;
     let e;
-    const r = o?.persistency;
+    const r = i?.persistency;
     if (!r?.policies || r.policies.length === 0) return {};
     if (r.policies.includes("querystring"))
       try {
         const s = new URLSearchParams(window.location.search).get(m.value);
-        R(), s && (e = JSON.parse(s));
+        D(), s && (e = JSON.parse(s));
       } catch (t) {
         console.error(t);
       }
@@ -89,113 +88,104 @@ const h = (c) => function(o) {
       return e;
     {
       const t = a?.defaultValues;
-      return j(t, e);
+      return g(t, e);
     }
-  }), H = (e, r) => e ? M.with(_.setSpan(M.active(), e), r) : r(), u = T({
+  }), x = (e, r) => e ? y.with(A.setSpan(y.active(), e), r) : r(), u = k({
     ...a,
     validators: {
-      onSubmit: S,
+      onSubmit: h,
       ...a?.validators || {}
     },
-    onSubmit: a?.onSubmit ? ({ formApi: e, meta: r, value: t }) => H(r?.currentSpan, async () => {
-      const s = await l.runPromise(w(t)), n = a.onSubmit({
+    onSubmit: a?.onSubmit ? ({ formApi: e, meta: r, value: t }) => x(r?.currentSpan, async () => {
+      const s = await l.runPromise(S(t)), n = a.onSubmit({
         formApi: e,
         meta: r,
         value: s
       });
-      return F.isFiber(n) && F.isRuntimeFiber(n) ? await k(n) : l.isEffect(n) ? await l.runPromise(
+      return b.isFiber(n) && b.isRuntimeFiber(n) ? await T(n) : l.isEffect(n) ? await l.runPromise(
         n.pipe(
           // meta?.currentSpan
           //   ? Effect.withParentSpan(meta.currentSpan)
           //   : (_) => _,
-          l.flatMap((d) => F.join(d))
+          l.flatMap((f) => b.join(f))
         )
       ) : n;
     }) : void 0,
-    defaultValues: x.value
-  }), J = () => {
-    Object.keys(p).forEach((e) => {
+    defaultValues: R.value
+  }), H = () => {
+    Object.keys(d).forEach((e) => {
       u.setFieldValue(e, void 0);
     });
-  }, V = (e) => e.reduce((r, t) => {
+  }, E = (e) => e.reduce((r, t) => {
     const s = t.split(".");
-    return s.reduce((n, d, G) => (G === s.length - 1 ? n[d] = u.getFieldValue(t) : n[d] = n[d] ?? {}, n[d]), r), r;
-  }, {}), O = (e) => {
+    return s.reduce((n, f, K) => (K === s.length - 1 ? n[f] = u.getFieldValue(t) : n[f] = n[f] ?? {}, n[f]), r), r;
+  }, {}), F = (e) => {
     if (e) {
-      if (g.isArray(e.keys))
-        return V(e.keys);
-      if (g.isArray(e.banKeys)) {
-        const r = Object.keys(p).filter((t) => e.banKeys?.includes(t));
-        return V(r);
+      if (O.isArray(e.keys))
+        return E(e.keys);
+      if (O.isArray(e.banKeys)) {
+        const r = Object.keys(d).filter((t) => e.banKeys?.includes(t));
+        return E(r);
       }
       return u.store.state.values;
     }
-  }, b = () => {
-    const e = o?.persistency;
+  }, v = () => {
+    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 t = O(e);
+      const t = F(e);
       return r.setItem(m.value, JSON.stringify(t));
     }
-  }, P = () => {
-    const e = o?.persistency;
+  }, V = () => {
+    const e = i?.persistency;
     if (!(!e?.policies || e.policies.length === 0) && e.policies.includes("querystring")) {
-      const r = O(e), t = new URLSearchParams(window.location.search);
+      const r = F(e), t = new URLSearchParams(window.location.search);
       t.set(m.value, JSON.stringify(r));
       const s = new URL(window.location.href);
       s.search = t.toString(), window.history.replaceState({}, "", s.toString());
     }
   };
-  A(b), Q(() => {
-    window.addEventListener("beforeunload", b), window.addEventListener("blur", P);
-  }), X(() => {
-    window.removeEventListener("beforeunload", b), window.removeEventListener("blur", P);
+  U(v), z(() => {
+    window.addEventListener("beforeunload", v), window.addEventListener("blur", V);
+  }), Q(() => {
+    window.removeEventListener("beforeunload", v), window.removeEventListener("blur", V);
   });
-  const I = (e) => l.currentSpan.pipe(
+  const j = (e) => l.currentSpan.pipe(
     l.option,
     l.flatMap(
-      (r) => l.promise(() => u.handleSubmit(E.isSome(r) ? { currentSpan: r.value, ...e } : e))
+      (r) => l.promise(() => u.handleSubmit(G.isSome(r) ? { currentSpan: r.value, ...e } : e))
     )
-  ), q = (e) => e?.checkErrors ? I(e?.meta).pipe(l.flatMap(l.fnUntraced(function* () {
+  ), J = (e) => e?.checkErrors ? j(e?.meta).pipe(l.flatMap(l.fnUntraced(function* () {
     const r = u.getAllErrors();
     if (Object.keys(r.fields).length || r.form.errors.length)
       return yield* new ne({ form: r.form, fields: r.fields });
-  }))) : I(e?.meta), B = u.handleSubmit, f = /* @__PURE__ */ new Map(), i = Object.assign(u, {
-    i18nNamespace: o?.i18nNamespace,
-    meta: p,
-    filterItems: v,
-    clear: J,
+  }))) : j(e?.meta), q = u.handleSubmit, w = X(/* @__PURE__ */ new Map()), o = Object.assign(u, {
+    i18nNamespace: i?.i18nNamespace,
+    meta: d,
+    filterItems: _,
+    clear: H,
     handleSubmit: (e) => {
-      const r = _.getSpan(M.active());
-      return B({ currentSpan: r, ...e });
+      const r = A.getSpan(y.active());
+      return q({ currentSpan: r, ...e });
     },
     // /** @experimental */
-    handleSubmitEffect: q,
+    handleSubmitEffect: J,
     registerField: (e) => {
-      N(e, (r) => f.set(r.name, { label: r.label, id: r.id }), { immediate: !0 }), A(() => f.delete(e.value.name));
+      $(e, (r) => w.value.set(r.name, { label: r.label, id: r.id }), { immediate: !0 }), U(() => w.value.delete(e.value.name));
     }
-  }), y = i.useStore((e) => e.errors), K = i.useStore(
-    (e) => g.filterMap(
-      Object.entries(e.fieldMeta),
-      ([r, t]) => (t.errors ?? []).length && f.get(r)?.id ? E.some({
-        label: f.get(r).label,
-        inputId: f.get(r).id,
-        errors: (t.errors ?? []).map((s) => s.message).filter(Boolean)
-      }) : E.none()
-    )
-  );
-  N(
-    () => [i.filterItems, y.value],
+  }), M = o.useStore((e) => e.errors);
+  $(
+    () => [o.filterItems, M.value],
     () => {
-      const e = i.filterItems, r = y.value;
+      const e = o.filterItems, r = M.value;
       return e ? r ? (Object.values(r).filter(
         (s) => !!s
       ).flatMap(
         (s) => Object.values(s).flat().map((n) => n.message)
       ).some((s) => s === e.message) && e.items.forEach((s) => {
-        const n = i.getFieldMeta(s);
-        n && i.setFieldMeta(s, {
+        const n = o.getFieldMeta(s);
+        n && o.setFieldMeta(s, {
           ...n,
           errorMap: {
             onSubmit: [
@@ -206,15 +196,15 @@ const h = (c) => function(o) {
       }), {}) : {} : {};
     }
   );
-  const L = { generalErrors: y, errors: K };
-  return o?.ignorePreventCloseEvents || Y(() => i.useStore((e) => e.isDirty)), Object.assign(i, {
-    errorContext: L,
-    Form: h(i)(se),
-    Input: h(i)(o?.input ?? te),
+  const P = { form: o, fieldMap: w };
+  return i?.ignorePreventCloseEvents || Y(() => o.useStore((e) => e.isDirty)), Object.assign(o, {
+    errorContext: P,
+    Form: p(o)(se),
+    Input: p(o)(i?.input ?? te),
     Field: u.Field,
-    Errors: oe(L)(ee),
-    Array: h(i)(Z),
-    AutoGen: h(i)(C)
+    Errors: ie(P)(ee),
+    Array: p(o)(Z),
+    AutoGen: p(o)(C)
   });
 };
 export {

package/dist/vue-components.es8.js

@@ -1,6 +1,6 @@
-import r from "./vue-components.es23.js";
+import r from "./vue-components.es22.js";
 import { inject as c, provide as l } from "vue";
-import { onMountedWithCleanup as u } from "./vue-components.es12.js";
+import { onMountedWithCleanup as u } from "./vue-components.es23.js";
 const f = () => r(), i = Symbol("DialogBus"), p = () => c(i, null), g = () => {
   const e = f();
   return l(i, e), e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "1.8.5",
+  "version": "1.8.7",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
     "effect": "^3.18.0",

package/src/components/OmegaForm/OmegaErrorsInternal.vue

@@ -74,27 +74,45 @@
 <script setup lang="ts">
 import { mdiLink } from "@mdi/js"
 import type { StandardSchemaV1Issue } from "@tanstack/vue-form"
+import { Array as Array$, Option } from "effect-app"
 import { computed, getCurrentInstance } from "vue"
 import { useIntl } from "../../utils"
-import { type OmegaError } from "./OmegaFormStuff"
+import { type OmegaError, type OmegaFormApi } from "./OmegaFormStuff"
 
 const instance = getCurrentInstance()
 const vuetified = instance?.appContext.components["VAlert"]
 
 const props = defineProps<
   {
-    errors: readonly OmegaError[]
-    generalErrors: (Record<string, StandardSchemaV1Issue[]> | undefined)[] | undefined
+    form: OmegaFormApi<any, any>
+    fieldMap: Map<string, { id: string; label: string }>
   }
 >()
 
+const generalErrors = props.form.useStore((state) => state.errors)
+const fieldMeta = props.form.useStore((state) => state.fieldMeta)
+const errors = computed(() =>
+  Array$.filterMap(
+    Object
+      .entries(fieldMeta.value),
+    ([key, m]): Option.Option<OmegaError> =>
+      ((m as any).errors ?? []).length && props.fieldMap.get(key)?.id
+        ? Option.some({
+          label: props.fieldMap.get(key)!.label,
+          inputId: props.fieldMap.get(key)!.id,
+          errors: ((m as any).errors ?? []).map((e: any) => e.message).filter(Boolean)
+        })
+        : Option.none()
+  )
+)
+
 const { trans } = useIntl()
 
 const showedGeneralErrors = computed(() => {
-  if (!props.generalErrors) return []
+  if (!generalErrors.value) return []
 
-  return props
-    .generalErrors
+  return generalErrors
+    .value
     .filter((record): record is Record<string, StandardSchemaV1Issue[]> => Boolean(record))
     .flatMap((errorRecord) =>
       Object

package/src/components/OmegaForm/OmegaInternalInput.vue

@@ -88,6 +88,10 @@ const handleChange: OmegaFieldInternalApi<From, Name>["handleChange"] = (value)
   } else {
     props.field.handleChange(value)
   }
+
+  // whenever we change the field, regardless if we set it to null, we should reset onSubmit.
+  // not sure why this is not the case in tanstack form.
+  props.field.setMeta((m) => ({ ...m, errorMap: { ...m.errorMap, onSubmit: undefined } }))
 }
 
 // TODO: it would be cleaner when default values are handled in the form initialization via Schema or by the one using the form component..

package/src/components/OmegaForm/useOmegaForm.ts

@@ -6,7 +6,7 @@ import { type DeepKeys, DeepValue, type FormAsyncValidateOrFn, type FormValidate
 import { Array, Data, Effect, Fiber, Option, Order, S } from "effect-app"
 import { runtimeFiberAsPromise } from "effect-app/utils"
 import { isObject } from "effect/Predicate"
-import { Component, computed, ComputedRef, ConcreteComponent, h, type InjectionKey, onBeforeUnmount, onMounted, onUnmounted, Ref, watch } from "vue"
+import { Component, computed, ComputedRef, ConcreteComponent, h, type InjectionKey, onBeforeUnmount, onMounted, onUnmounted, Ref, ref, watch } from "vue"
 import { usePreventClose } from "./blockDialog"
 import { MergedInputProps } from "./InputProps"
 import OmegaArray from "./OmegaArray.vue"
@@ -65,13 +65,8 @@ const fHoc = (form: OF<any, any>) => {
 }
 
 const eHoc = (errorProps: {
-  generalErrors: Readonly<
-    Ref<
-      (Record<string, StandardSchemaV1Issue[]> | undefined)[],
-      (Record<string, StandardSchemaV1Issue[]> | undefined)[]
-    >
-  >
-  errors: Readonly<Ref<(OmegaError | undefined)[], (OmegaError | undefined)[]>>
+  form: OF<any, any>
+  fieldMap: Ref<Map<string, { id: string; label: string }>>
 }) => {
   return function FormHoc<P>(
     WrappedComponent: Component<P>
@@ -82,11 +77,10 @@ const eHoc = (errorProps: {
           ...errorProps
         }
       },
-      render({ errors, generalErrors, showErrors }: any) {
+      render({ fieldMap, form }: any) {
         return h(WrappedComponent, {
-          errors,
-          generalErrors,
-          showErrors,
+          form,
+          fieldMap,
           ...this.$attrs
         } as any, this.$slots)
       }
@@ -863,7 +857,7 @@ export const useOmegaForm = <
 
   const handleSubmit = form.handleSubmit
 
-  const fieldMap = new Map<string, { label: string; id: string }>()
+  const fieldMap = ref(new Map<string, { label: string; id: string }>())
 
   const formWithExtras: OF<From, To> = Object.assign(form, {
     i18nNamespace: omegaConfig?.i18nNamespace,
@@ -877,26 +871,12 @@ export const useOmegaForm = <
     // /** @experimental */
     handleSubmitEffect,
     registerField: (field: ComputedRef<{ name: string; label: string; id: string }>) => {
-      watch(field, (f) => fieldMap.set(f.name, { label: f.label, id: f.id }), { immediate: true })
-      onUnmounted(() => fieldMap.delete(field.value.name)) // todo; perhap only when owned (id match)
+      watch(field, (f) => fieldMap.value.set(f.name, { label: f.label, id: f.id }), { immediate: true })
+      onUnmounted(() => fieldMap.value.delete(field.value.name)) // todo; perhap only when owned (id match)
     }
   })
 
   const errors = formWithExtras.useStore((state) => state.errors)
-  const fieldErrors = formWithExtras.useStore((state) =>
-    Array.filterMap(
-      Object
-        .entries(state.fieldMeta),
-      ([key, m]): Option.Option<OmegaError> =>
-        ((m as any).errors ?? []).length && fieldMap.get(key)?.id
-          ? Option.some({
-            label: fieldMap.get(key)!.label,
-            inputId: fieldMap.get(key)!.id,
-            errors: ((m as any).errors ?? []).map((e: any) => e.message).filter(Boolean)
-          })
-          : Option.none()
-    )
-  )
 
   watch(
     () => [formWithExtras.filterItems, errors.value],
@@ -937,7 +917,7 @@ export const useOmegaForm = <
     }
   )
 
-  const errorContext = { generalErrors: errors, errors: fieldErrors }
+  const errorContext = { form: formWithExtras, fieldMap }
 
   if (!omegaConfig?.ignorePreventCloseEvents) {
     usePreventClose(() => formWithExtras.useStore((state) => state.isDirty))