@effect-app/vue-components 4.0.0-beta.53 → 4.0.0-beta.54

package/dist/vue-components61.es.js

@@ -9,19 +9,19 @@ 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 _, 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";
+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";
 //#region src/components/OmegaForm/useOmegaForm.ts
-var ee = class extends S.TaggedError("FormErrors") {}, A = (e) => function(t) {
+var te = class extends S.TaggedError("FormErrors") {}, k = (e) => function(t) {
 	return { render() {
 		return h(t, {
 			form: e,
 			...this.$attrs
 		}, this.$slots);
 	} };
-}, j = (t) => {
+}, A = (t) => {
 	let { formatMessage: n } = e(), r = (e) => e.replace(/([A-Z])/g, " $1").replace(/^./, (e) => e.toUpperCase()).trim(), i = (e) => n ? n({
 		id: `general.fields.${e}`,
 		defaultMessage: r(e)
@@ -30,10 +30,10 @@ var ee = class extends S.TaggedError("FormErrors") {}, A = (e) => function(t) {
 		id: `${t.i18nNamespace}.fields.${e}`,
 		defaultMessage: i(e)
 	}) : i(e);
-}, M = (e) => function(t) {
+}, j = (e) => function(t) {
 	return {
 		setup() {
-			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);
+			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 = A(n);
 			return {
 				generalErrors: r,
 				errors: m(() => {
@@ -48,9 +48,9 @@ var ee = class extends S.TaggedError("FormErrors") {}, A = (e) => function(t) {
 						}), e;
 					}, []), n = [];
 					if (a.value.onSubmit) {
-						for (let [e, r] of Object.entries(a.value.onSubmit)) if (x.isArray(r) && r.length) for (let e of r) {
+						for (let [e, r] of Object.entries(a.value.onSubmit)) if (b.isArray(r) && r.length) for (let e of r) {
 							let r = e;
-							if (r?.path && x.isArray(r.path) && r.path.length) {
+							if (r?.path && b.isArray(r.path) && r.path.length) {
 								let e = r.path.join(".");
 								if (!t.value.has(e)) {
 									n.push({
@@ -75,27 +75,27 @@ var ee = class extends S.TaggedError("FormErrors") {}, A = (e) => function(t) {
 			}, this.$slots);
 		}
 	};
-}, N = (e, t) => e.includes(t), P = k(D.empty()), F = (e, h, S) => {
+}, M = (e, t) => e.includes(t), N = O(x.empty()), P = (e, h, x) => {
 	if (!e) throw Error("Schema is required");
-	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 S = i(e), O = E.toStandardSchemaV1(S), A = E.decodeUnknownEffect(S), { meta: P, unionMeta: ne } = r(e), F = m(() => x?.persistency?.id ? x.persistency.id : `${window.location.pathname}-${Object.keys(P).join("-")}`), I = () => {
 		let e = new URLSearchParams(window.location.search);
-		e.delete(I.value);
+		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 = S?.persistency;
-		if (i?.policies && !r && (N(i.policies, "local") || N(i.policies, "session"))) {
-			let e = N(i.policies, "local") ? localStorage : sessionStorage;
+		let r, i = x?.persistency;
+		if (i?.policies && !r && (M(i.policies, "local") || M(i.policies, "session"))) {
+			let e = M(i.policies, "local") ? localStorage : sessionStorage;
 			if (e) try {
-				let t = JSON.parse(e.getItem(I.value) || "{}");
-				e.removeItem(I.value), r = t;
+				let t = JSON.parse(e.getItem(F.value) || "{}");
+				e.removeItem(F.value), r = t;
 			} catch (e) {
 				console.error(e);
 			}
 		}
-		if (i?.policies && N(i.policies, "querystring")) try {
-			let e = new URLSearchParams(window.location.search).get(I.value);
-			ne(), e && (r = t(r || {}, JSON.parse(e)));
+		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)));
 		} catch (e) {
 			console.error(e);
 		}
@@ -105,33 +105,33 @@ var ee = class extends S.TaggedError("FormErrors") {}, A = (e) => function(t) {
 			persistency: r,
 			schema: n(e)
 		};
-		return (S?.defaultValuesPriority || [
+		return (x?.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 = O({
+	}), R = (e, t) => e ? a.with(o.setSpan(a.active(), e), t) : t(), z = D({
 		...h,
 		validators: {
-			onSubmit: k,
+			onSubmit: O,
 			...h?.validators || {}
 		},
 		onSubmit: h?.onSubmit ? ({ formApi: e, meta: t, value: n }) => R(t?.currentSpan, async () => {
-			let r = await P(j(n)), i = h.onSubmit({
+			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)) {
-				let e = await P(i);
+				let e = await N(i);
 				return w.isFiber(e) ? await s(e) : e;
 			}
 			return i;
 		}) : void 0,
 		defaultValues: L.value
 	}), B = () => {
-		Object.keys(F).forEach((e) => {
+		Object.keys(P).forEach((e) => {
 			z.setFieldValue(e, void 0);
 		});
 	}, V = (e) => e.reduce((e, t) => {
@@ -140,33 +140,33 @@ var ee = class extends S.TaggedError("FormErrors") {}, A = (e) => function(t) {
 	}, {}), H = (e) => {
 		if (!e) return;
 		let { banKeys: t, keys: n } = e;
-		return x.isArray(n) ? V(n) : x.isArray(t) ? V(Object.keys(F).filter((e) => t.includes(e))) : z.store.state.values;
+		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 = 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;
+		let e = x?.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);
-			return t.setItem(I.value, JSON.stringify(n));
+			return t.setItem(F.value, JSON.stringify(n));
 		}
 	}, W = () => {
-		let e = S?.persistency;
-		if (!(!e?.policies || e.policies.length === 0) && N(e.policies, "querystring")) {
+		let e = x?.persistency;
+		if (!(!e?.policies || e.policies.length === 0) && M(e.policies, "querystring")) {
 			let t = H(e), n = new URLSearchParams(window.location.search);
-			n.set(I.value, JSON.stringify(t));
+			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();
 	};
-	if (v(U), _(() => {
-		window.addEventListener("beforeunload", U), window.addEventListener("blur", W), S?.preventWindowExit && S.preventWindowExit !== "nope" && window.addEventListener("beforeunload", G);
+	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), S?.preventWindowExit && S.preventWindowExit !== "nope" && window.removeEventListener("beforeunload", G);
-	}), S?.preventWindowExit === "prevent-and-reset") {
+		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);
-		b([e, t], ([e, t], [i]) => {
+		y([e, t], ([e, t], [i]) => {
 			i && !e && t > 0 && n.value && z.reset(r.value);
 		});
 	}
@@ -175,15 +175,15 @@ var ee = class extends S.TaggedError("FormErrors") {}, A = (e) => function(t) {
 		...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 ee({
+		if (Object.keys(e.fields).length || e.form.errors.length) return yield* C.fail(new te({
 			form: e.form,
 			fields: e.fields
 		}));
-	}))) : K(e?.meta), J = z.handleSubmit, Y = y(/* @__PURE__ */ new Map()), X = Object.assign(z, {
-		i18nNamespace: S?.i18nNamespace,
-		ignorePreventCloseEvents: S?.ignorePreventCloseEvents,
-		meta: F,
-		unionMeta: te,
+	}))) : K(e?.meta), J = z.handleSubmit, Y = v(/* @__PURE__ */ new Map()), X = Object.assign(z, {
+		i18nNamespace: x?.i18nNamespace,
+		ignorePreventCloseEvents: x?.ignorePreventCloseEvents,
+		meta: P,
+		unionMeta: ne,
 		clear: B,
 		handleSubmit: (e) => J({
 			currentSpan: o.getSpan(a.active()),
@@ -191,17 +191,17 @@ var ee = class extends S.TaggedError("FormErrors") {}, A = (e) => function(t) {
 		}),
 		handleSubmitEffect: q,
 		registerField: (e) => {
-			b(e, (e) => {
+			y(e, (e) => {
 				Y.value.set(e.name, {
 					label: e.label,
 					id: e.id
 				});
-			}, { immediate: !0 }), v(() => {
+			}, { immediate: !0 }), _(() => {
 				Y.value.get(e.value.name)?.id === e.value.id && Y.value.delete(e.value.name);
 			});
 		}
-	}), Z = y(0), Q = z.useStore((e) => e.submissionAttempts);
-	b(z.useStore((e) => e.values), () => {
+	}), Z = v(0), Q = z.useStore((e) => e.submissionAttempts);
+	y(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) => ({
@@ -222,14 +222,14 @@ var ee = class extends S.TaggedError("FormErrors") {}, A = (e) => function(t) {
 		_keys: void 0,
 		_schema: e,
 		errorContext: $,
-		Form: A(X)(p),
-		Input: A(X)(S?.input ?? d),
-		TaggedUnion: A(X)(f),
+		Form: k(X)(p),
+		Input: k(X)(x?.input ?? d),
+		TaggedUnion: k(X)(f),
 		Field: z.Field,
-		Errors: M($)(u),
-		Array: A(X)(c),
-		AutoGen: A(X)(l)
+		Errors: j($)(u),
+		Array: k(X)(c),
+		AutoGen: k(X)(l)
 	});
 };
 //#endregion
-export { j as useErrorLabel, F as useOmegaForm };
+export { A as useErrorLabel, P as useOmegaForm };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "4.0.0-beta.53",
+  "version": "4.0.0-beta.54",
   "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.53",
-    "effect-app": "4.0.0-beta.53"
+    "@effect-app/vue": "4.0.0-beta.54",
+    "effect-app": "4.0.0-beta.54"
   },
   "scripts": {
     "check": "vue-tsc",

package/src/components/OmegaForm/useOmegaForm.ts

@@ -3,7 +3,7 @@
 
 import * as api from "@opentelemetry/api"
 import { type DeepKeys, DeepValue, type FormAsyncValidateOrFn, type FormValidateOrFn, type StandardSchemaV1, StandardSchemaV1Issue, useForm, ValidationError, ValidationErrorMap } from "@tanstack/vue-form"
-import { Array, Data, Effect, Fiber, Option, Order, S, ServiceMap } from "effect-app"
+import { Array, Context, Data, Effect, Fiber, Option, Order, S } from "effect-app"
 import { runtimeFiberAsPromise, UnionToTuples } from "effect-app/utils"
 import { Component, computed, ComputedRef, ConcreteComponent, h, type InjectionKey, onBeforeUnmount, onMounted, onUnmounted, Ref, ref, watch } from "vue"
 import { useIntl } from "../../utils"
@@ -670,7 +670,7 @@ export interface OmegaFormReturn<
   }
 }
 
-const runPromise = makeRunPromise(ServiceMap.empty())
+const runPromise = makeRunPromise(Context.empty())
 
 export const useOmegaForm = <
   // eslint-disable-next-line @typescript-eslint/no-explicit-any