@effect-app/vue-components 4.0.0-beta.151 → 4.0.0-beta.153

package/dist/vue-components51.es.js

@@ -37,8 +37,8 @@ var y = /* @__PURE__ */ c({
 			key: T.value,
 			name: c.name,
 			validators: {
-				onBlur: k.value,
-				...c.validators
+				...c.validators,
+				onSubmit: k.value
 			}
 		}, {
 			default: v(({ field: t, state: r }) => [w.value ? (p(), a(n, d({ key: 0 }, {

package/dist/vue-components61.es.js

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

package/package.json

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

package/src/components/OmegaForm/OmegaInput.vue

@@ -4,16 +4,15 @@
     :key="fieldKey"
     :name="name"
     :validators="{
-      //     onChange: schema,
-      onBlur: schema,
-      ...validators
+      ...validators,
+      onSubmit: schema
     }"
   >
     <template #default="{ field, state }">
       <OmegaInternalInput
         v-if="meta"
         v-bind="{ ...$attrs, ...$props, inputClass: computedClass }"
-        :field="field"
+        :field="field as any"
         :state="state"
         :register="form.registerField"
         :label="label ?? errori18n(propsName)"

package/src/components/OmegaForm/useOmegaForm.ts

@@ -923,12 +923,20 @@ export const useOmegaForm = <
     })
   }
 
+  const hs = form.handleSubmit
+
+  const handleSubmit: typeof form.handleSubmit = async (meta?: Record<string, any>) => {
+    // workaround for not revealing all form errors on submit
+    // await form.validateAllFields("blur")
+    return await hs(meta)
+  }
+
   const handleSubmitEffect_ = (meta?: Record<string, any>) =>
     Effect.currentSpan.pipe(
       Effect.option,
       Effect
         .flatMap((span) =>
-          Effect.promise(() => form.handleSubmit(Option.isSome(span) ? { currentSpan: span.value, ...meta } : meta))
+          Effect.promise(() => handleSubmit(Option.isSome(span) ? { currentSpan: span.value, ...meta } : meta))
         )
     )
 
@@ -947,8 +955,6 @@ export const useOmegaForm = <
       })))
       : handleSubmitEffect_(options?.meta)
 
-  const handleSubmit = form.handleSubmit
-
   const fieldMap = ref(new Map<string, { label: string; id: string }>())
 
   const formWithExtras: OF<From, To> = Object.assign(form, {