@effect-app/vue-components 4.0.0-beta.49 → 4.0.0-beta.51

package/dist/vue-components61.es.js

@@ -8,15 +8,15 @@ import l from "./vue-components41.es.js";
 import u from "./vue-components45.es.js";
 import d from "./vue-components52.es.js";
 import f from "./vue-components56.es.js";
-import ee from "./vue-components60.es.js";
-import { computed as p, h as m, onBeforeUnmount as h, onMounted as g, onUnmounted as _, ref as v, watch as y } from "vue";
-import { Array as b, Data as x, Effect as S, Fiber as C, Option as w, S as T, ServiceMap as E } from "effect-app";
-import { useForm as D } from "@tanstack/vue-form";
-import { makeRunPromise as O } from "@effect-app/vue/runtime";
+import p from "./vue-components60.es.js";
+import { computed as m, h, onBeforeUnmount as g, onMounted as _, onUnmounted as v, ref as y, watch as b } from "vue";
+import { Array as x, Data as S, Effect as C, Fiber as w, Option as T, S as E, ServiceMap as D } from "effect-app";
+import { useForm as O } from "@tanstack/vue-form";
+import { makeRunPromise as k } from "@effect-app/vue/runtime";
 //#region src/components/OmegaForm/useOmegaForm.ts
-var k = class extends x.TaggedError("FormErrors") {}, A = (e) => function(t) {
+var ee = class extends S.TaggedError("FormErrors") {}, A = (e) => function(t) {
 	return { render() {
-		return m(t, {
+		return h(t, {
 			form: e,
 			...this.$attrs
 		}, this.$slots);
@@ -36,7 +36,7 @@ var k = class extends x.TaggedError("FormErrors") {}, A = (e) => function(t) {
 			let { fieldMap: t, form: n } = e, r = n.useStore((e) => e.errors), i = n.useStore((e) => e.fieldMeta), a = n.useStore((e) => e.errorMap), o = j(n);
 			return {
 				generalErrors: r,
-				errors: p(() => {
+				errors: m(() => {
 					let e = Object.entries(i.value).reduce((e, [n, r]) => {
 						let i = r?.errors ?? [];
 						if (!i.length) return e;
@@ -48,9 +48,9 @@ var k = class extends x.TaggedError("FormErrors") {}, A = (e) => function(t) {
 						}), e;
 					}, []), n = [];
 					if (a.value.onSubmit) {
-						for (let [e, r] of Object.entries(a.value.onSubmit)) if (b.isArray(r) && r.length) for (let e of r) {
+						for (let [e, r] of Object.entries(a.value.onSubmit)) if (x.isArray(r) && r.length) for (let e of r) {
 							let r = e;
-							if (r?.path && b.isArray(r.path) && r.path.length) {
+							if (r?.path && x.isArray(r.path) && r.path.length) {
 								let e = r.path.join(".");
 								if (!t.value.has(e)) {
 									n.push({
@@ -68,154 +68,167 @@ var k = class extends x.TaggedError("FormErrors") {}, A = (e) => function(t) {
 			};
 		},
 		render({ errors: e, generalErrors: n }) {
-			return m(t, {
+			return h(t, {
 				errors: e,
 				generalErrors: n,
 				...this.$attrs
 			}, this.$slots);
 		}
 	};
-}, N = (e, t) => e.includes(t), P = O(E.empty()), F = (e, m, x) => {
+}, N = (e, t) => e.includes(t), P = k(D.empty()), F = (e, h, S) => {
 	if (!e) throw Error("Schema is required");
-	let E = i(e), O = T.toStandardSchemaV1(E), j = T.decodeUnknownEffect(E), { meta: F, unionMeta: I } = r(e), L = p(() => x?.persistency?.id ? x.persistency.id : `${window.location.pathname}-${Object.keys(F).join("-")}`), R = () => {
+	let D = i(e), k = E.toStandardSchemaV1(D), j = E.decodeUnknownEffect(D), { meta: F, unionMeta: te } = r(e), I = m(() => S?.persistency?.id ? S.persistency.id : `${window.location.pathname}-${Object.keys(F).join("-")}`), ne = () => {
 		let e = new URLSearchParams(window.location.search);
-		e.delete(L.value);
+		e.delete(I.value);
 		let t = new URL(window.location.href);
 		t.search = e.toString(), window.history.replaceState({}, "", t.toString());
-	}, z = p(() => {
-		let r, i = x?.persistency;
+	}, L = m(() => {
+		let r, i = S?.persistency;
 		if (i?.policies && !r && (N(i.policies, "local") || N(i.policies, "session"))) {
 			let e = N(i.policies, "local") ? localStorage : sessionStorage;
 			if (e) try {
-				let t = JSON.parse(e.getItem(L.value) || "{}");
-				e.removeItem(L.value), r = t;
+				let t = JSON.parse(e.getItem(I.value) || "{}");
+				e.removeItem(I.value), r = t;
 			} catch (e) {
 				console.error(e);
 			}
 		}
 		if (i?.policies && N(i.policies, "querystring")) try {
-			let e = new URLSearchParams(window.location.search).get(L.value);
-			R(), e && (r = t(r || {}, JSON.parse(e)));
+			let e = new URLSearchParams(window.location.search).get(I.value);
+			ne(), e && (r = t(r || {}, JSON.parse(e)));
 		} catch (e) {
 			console.error(e);
 		}
 		r ??= {};
 		let a = {
-			tanstack: m?.defaultValues || {},
+			tanstack: h?.defaultValues || {},
 			persistency: r,
 			schema: n(e)
 		};
-		return (x?.defaultValuesPriority || [
+		return (S?.defaultValuesPriority || [
 			"tanstack",
 			"persistency",
 			"schema"
 		]).reverse().reduce((e, n) => Object.keys(e).length ? t(e, a[n]) : a[n], {});
-	}), B = (e, t) => e ? a.with(o.setSpan(a.active(), e), t) : t(), V = D({
-		...m,
+	}), R = (e, t) => e ? a.with(o.setSpan(a.active(), e), t) : t(), z = O({
+		...h,
 		validators: {
-			onSubmit: O,
-			...m?.validators || {}
+			onSubmit: k,
+			...h?.validators || {}
 		},
-		onSubmit: m?.onSubmit ? ({ formApi: e, meta: t, value: n }) => B(t?.currentSpan, async () => {
-			let r = await P(j(n)), i = m.onSubmit({
+		onSubmit: h?.onSubmit ? ({ formApi: e, meta: t, value: n }) => R(t?.currentSpan, async () => {
+			let r = await P(j(n)), i = h.onSubmit({
 				formApi: e,
 				meta: t,
 				value: r
 			});
-			if (C.isFiber(i)) return await s(i);
-			if (S.isEffect(i)) {
+			if (w.isFiber(i)) return await s(i);
+			if (C.isEffect(i)) {
 				let e = await P(i);
-				return C.isFiber(e) ? await s(e) : e;
+				return w.isFiber(e) ? await s(e) : e;
 			}
 			return i;
 		}) : void 0,
-		defaultValues: z.value
-	}), H = () => {
+		defaultValues: L.value
+	}), B = () => {
 		Object.keys(F).forEach((e) => {
-			V.setFieldValue(e, void 0);
+			z.setFieldValue(e, void 0);
 		});
-	}, U = (e) => e.reduce((e, t) => {
+	}, V = (e) => e.reduce((e, t) => {
 		let n = t.split(".");
-		return n.reduce((e, r, i) => (i === n.length - 1 ? e[r] = V.getFieldValue(t) : e[r] = e[r] ?? {}, e[r]), e), e;
-	}, {}), W = (e) => {
+		return n.reduce((e, r, i) => (i === n.length - 1 ? e[r] = z.getFieldValue(t) : e[r] = e[r] ?? {}, e[r]), e), e;
+	}, {}), H = (e) => {
 		if (!e) return;
 		let { banKeys: t, keys: n } = e;
-		return b.isArray(n) ? U(n) : b.isArray(t) ? U(Object.keys(F).filter((e) => t.includes(e))) : V.store.state.values;
-	}, G = () => {
-		let e = x?.persistency;
+		return x.isArray(n) ? V(n) : x.isArray(t) ? V(Object.keys(F).filter((e) => t.includes(e))) : z.store.state.values;
+	}, U = () => {
+		let e = S?.persistency;
 		if (!(!e?.policies || e.policies.length === 0) && (N(e.policies, "local") || N(e.policies, "session"))) {
 			let t = N(e.policies, "local") ? localStorage : sessionStorage;
 			if (!t) return;
-			let n = W(e);
-			return t.setItem(L.value, JSON.stringify(n));
+			let n = H(e);
+			return t.setItem(I.value, JSON.stringify(n));
 		}
-	}, K = () => {
-		let e = x?.persistency;
+	}, W = () => {
+		let e = S?.persistency;
 		if (!(!e?.policies || e.policies.length === 0) && N(e.policies, "querystring")) {
-			let t = W(e), n = new URLSearchParams(window.location.search);
-			n.set(L.value, JSON.stringify(t));
+			let t = H(e), n = new URLSearchParams(window.location.search);
+			n.set(I.value, JSON.stringify(t));
 			let r = new URL(window.location.href);
 			r.search = n.toString(), window.history.replaceState({}, "", r.toString());
 		}
-	}, q = (e) => {
-		V.store.state.isDirty && e.preventDefault();
+	}, G = (e) => {
+		z.store.state.isDirty && e.preventDefault();
 	};
-	if (_(G), g(() => {
-		window.addEventListener("beforeunload", G), window.addEventListener("blur", K), x?.preventWindowExit && x.preventWindowExit !== "nope" && window.addEventListener("beforeunload", q);
-	}), h(() => {
-		window.removeEventListener("beforeunload", G), window.removeEventListener("blur", K), x?.preventWindowExit && x.preventWindowExit !== "nope" && window.removeEventListener("beforeunload", q);
-	}), x?.preventWindowExit === "prevent-and-reset") {
-		let e = V.useStore((e) => e.isSubmitting), t = V.useStore((e) => e.submissionAttempts), n = V.useStore((e) => e.canSubmit), r = V.useStore((e) => e.values);
-		y([e, t], ([e, t], [i]) => {
-			i && !e && t > 0 && n.value && V.reset(r.value);
+	if (v(U), _(() => {
+		window.addEventListener("beforeunload", U), window.addEventListener("blur", W), S?.preventWindowExit && S.preventWindowExit !== "nope" && window.addEventListener("beforeunload", G);
+	}), g(() => {
+		window.removeEventListener("beforeunload", U), window.removeEventListener("blur", W), S?.preventWindowExit && S.preventWindowExit !== "nope" && window.removeEventListener("beforeunload", G);
+	}), S?.preventWindowExit === "prevent-and-reset") {
+		let e = z.useStore((e) => e.isSubmitting), t = z.useStore((e) => e.submissionAttempts), n = z.useStore((e) => e.canSubmit), r = z.useStore((e) => e.values);
+		b([e, t], ([e, t], [i]) => {
+			i && !e && t > 0 && n.value && z.reset(r.value);
 		});
 	}
-	let J = (e) => S.currentSpan.pipe(S.option, S.flatMap((t) => S.promise(() => V.handleSubmit(w.isSome(t) ? {
+	let K = (e) => C.currentSpan.pipe(C.option, C.flatMap((t) => C.promise(() => z.handleSubmit(T.isSome(t) ? {
 		currentSpan: t.value,
 		...e
-	} : e)))), Y = (e) => e?.checkErrors ? J(e?.meta).pipe(S.flatMap(S.fnUntraced(function* () {
-		let e = V.getAllErrors();
-		if (Object.keys(e.fields).length || e.form.errors.length) return yield* S.fail(new k({
+	} : e)))), q = (e) => e?.checkErrors ? K(e?.meta).pipe(C.flatMap(C.fnUntraced(function* () {
+		let e = z.getAllErrors();
+		if (Object.keys(e.fields).length || e.form.errors.length) return yield* C.fail(new ee({
 			form: e.form,
 			fields: e.fields
 		}));
-	}))) : J(e?.meta), X = V.handleSubmit, Z = v(/* @__PURE__ */ new Map()), Q = Object.assign(V, {
-		i18nNamespace: x?.i18nNamespace,
-		ignorePreventCloseEvents: x?.ignorePreventCloseEvents,
+	}))) : K(e?.meta), J = z.handleSubmit, Y = y(/* @__PURE__ */ new Map()), X = Object.assign(z, {
+		i18nNamespace: S?.i18nNamespace,
+		ignorePreventCloseEvents: S?.ignorePreventCloseEvents,
 		meta: F,
-		unionMeta: I,
-		clear: H,
-		handleSubmit: (e) => X({
+		unionMeta: te,
+		clear: B,
+		handleSubmit: (e) => J({
 			currentSpan: o.getSpan(a.active()),
 			...e
 		}),
-		handleSubmitEffect: Y,
+		handleSubmitEffect: q,
 		registerField: (e) => {
-			y(e, (e) => {
-				Z.value.set(e.name, {
+			b(e, (e) => {
+				Y.value.set(e.name, {
 					label: e.label,
 					id: e.id
 				});
-			}, { immediate: !0 }), _(() => {
-				Z.value.get(e.value.name)?.id === e.value.id && Z.value.delete(e.value.name);
+			}, { immediate: !0 }), v(() => {
+				Y.value.get(e.value.name)?.id === e.value.id && Y.value.delete(e.value.name);
 			});
 		}
-	}), $ = {
-		form: Q,
-		fieldMap: Z
+	}), Z = y(0), Q = z.useStore((e) => e.submissionAttempts);
+	b(z.useStore((e) => e.values), () => {
+		if (Z.value !== Q.value) {
+			Z.value = Q.value;
+			for (let e of Object.values(z.fieldInfo)) e?.instance?.state.meta.errorMap?.onSubmit && e.instance.setMeta((e) => ({
+				...e,
+				errorMap: {
+					...e.errorMap,
+					onSubmit: void 0
+				}
+			}));
+		}
+	}, { deep: !0 });
+	let $ = {
+		form: X,
+		fieldMap: Y
 	};
-	return Object.assign(Q, {
+	return Object.assign(X, {
 		_paths: void 0,
 		_keys: void 0,
 		_schema: e,
 		errorContext: $,
-		Form: A(Q)(ee),
-		Input: A(Q)(x?.input ?? d),
-		TaggedUnion: A(Q)(f),
-		Field: V.Field,
+		Form: A(X)(p),
+		Input: A(X)(S?.input ?? d),
+		TaggedUnion: A(X)(f),
+		Field: z.Field,
 		Errors: M($)(u),
-		Array: A(Q)(c),
-		AutoGen: A(Q)(l)
+		Array: A(X)(c),
+		AutoGen: A(X)(l)
 	});
 };
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "4.0.0-beta.49",
+  "version": "4.0.0-beta.51",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
     "effect": "^4.0.0-beta.43",
@@ -57,8 +57,8 @@
     "highlight.js": "^11.11.1",
     "mitt": "^3.0.1",
     "vue3-highlightjs": "^1.0.5",
-    "@effect-app/vue": "4.0.0-beta.49",
-    "effect-app": "4.0.0-beta.49"
+    "effect-app": "4.0.0-beta.51",
+    "@effect-app/vue": "4.0.0-beta.51"
   },
   "scripts": {
     "check": "vue-tsc",

package/src/components/OmegaForm/useOmegaForm.ts

@@ -979,6 +979,24 @@ export const useOmegaForm = <
     }
   })
 
+  // Clear all field onSubmit errors when any value changes after a failed submission.
+  // Form-level onSubmit validation (e.g. union schemas) distributes errors to individual fields.
+  // TanStack only clears the changed field's onSubmit error, leaving sibling fields with stale
+  // errors that keep isFieldsValid=false and block re-submission.
+  const lastSubmitAttempts = ref(0)
+  const submissionAttempts = form.useStore((s) => s.submissionAttempts)
+  const formValues = form.useStore((s) => s.values)
+  watch(formValues, () => {
+    if (lastSubmitAttempts.value === submissionAttempts.value) return
+    lastSubmitAttempts.value = submissionAttempts.value
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    for (const info of Object.values(form.fieldInfo) as any[]) {
+      if (info?.instance?.state.meta.errorMap?.onSubmit) {
+        info.instance.setMeta((prev: any) => ({ ...prev, errorMap: { ...prev.errorMap, onSubmit: undefined } }))
+      }
+    }
+  }, { deep: true })
+
   const errorContext = { form: formWithExtras, fieldMap }
 
   return Object.assign(formWithExtras, {