@effect-app/vue-components 4.0.0-beta.9 → 4.0.0-beta.91

package/dist/vue-components57.es.js

@@ -0,0 +1,12 @@
+import { computed as e } from "vue";
+import { useStore as t } from "@tanstack/vue-form";
+//#region src/components/OmegaForm/getOmegaStore.ts
+function n(n, r) {
+	return e(() => r ? t(n.store, (e) => {
+		let t = {};
+		for (let n of r) t[n] = e[n];
+		return t;
+	}).value : {});
+}
+//#endregion
+export { n as getOmegaStore };

package/dist/vue-components58.es.js

@@ -0,0 +1,22 @@
+import { usePreventClose as e } from "./vue-components7.es.js";
+import { getOmegaStore as t } from "./vue-components57.es.js";
+import { createElementBlock as n, createElementVNode as r, defineComponent as i, openBlock as a, renderSlot as o, unref as s, withModifiers as c } from "vue";
+import { useStore as l } from "@tanstack/vue-form";
+//#region src/components/OmegaForm/OmegaWrapper.vue?vue&type=script&setup=true&lang.ts
+var u = ["disabled"], d = /* @__PURE__ */ i({
+	__name: "OmegaWrapper",
+	props: {
+		form: {},
+		disabled: { type: Boolean },
+		subscribe: {}
+	},
+	setup(i) {
+		let d = i, f = l(d.form.store, (e) => e.isSubmitting), p = t(d.form, d.subscribe);
+		return d.form.ignorePreventCloseEvents || e(() => d.form.useStore((e) => e.isDirty)), (e, t) => (a(), n("form", {
+			novalidate: "",
+			onSubmit: t[0] ||= c((e) => i.form.handleSubmit(), ["prevent", "stop"])
+		}, [r("fieldset", { disabled: s(f) || i.disabled }, [o(e.$slots, "default", { subscribedValues: s(p) }, void 0, !0)], 8, u)], 32));
+	}
+});
+//#endregion
+export { d as default };

package/dist/vue-components6.es.js

@@ -0,0 +1,13 @@
+import { onMounted as e, onUnmounted as t } from "vue";
+//#region src/components/OmegaForm/onMountedWithCleanup.ts
+function n(n) {
+	let r;
+	e(() => {
+		let e = n();
+		e && (r = e);
+	}), t(() => {
+		r && r();
+	});
+}
+//#endregion
+export { n as onMountedWithCleanup };

package/dist/vue-components60.es.js

@@ -0,0 +1,7 @@
+(function(){try{if(typeof document<`u`){var e=document.createElement(`style`);if(e.appendChild(document.createTextNode(`fieldset[data-v-8c9cb27c]{display:contents}fieldset[disabled][data-v-8c9cb27c]>*{pointer-events:none}`)),document.head.appendChild(e),window.customElements){let e=window.customElements.define;window.customElements.define=function(t,n){let r=n.prototype.connectedCallback;return n.prototype.connectedCallback=function(){if(r&&r.call(this),this.shadowRoot){let e=document.createElement(`style`);e.appendChild(document.createTextNode(`fieldset[data-v-8c9cb27c]{display:contents}fieldset[disabled][data-v-8c9cb27c]>*{pointer-events:none}`)),this.shadowRoot.appendChild(e)}},e.call(window.customElements,t,n)}}}}catch(e){console.error(`vite-plugin-css-injected-by-js`,e)}})();import e from "./vue-components44.es.js";
+import t from "./vue-components58.es.js";
+
+//#region src/components/OmegaForm/OmegaWrapper.vue
+var n = /* @__PURE__ */ e(t, [["__scopeId", "data-v-8c9cb27c"]]);
+//#endregion
+export { n as default };

package/dist/vue-components61.es.js

@@ -0,0 +1,235 @@
+import { useIntl as e } from "./vue-components11.es.js";
+import { deepMerge as t, defaultsValueFromSchema as n, generateMetaFromSchema as r, toFormSchema as i } from "./vue-components12.es.js";
+import { context as a } from "./vue-components32.es.js";
+import { trace as o } from "./vue-components34.es.js";
+import { runtimeFiberAsPromise as s } from "./vue-components37.es.js";
+import c from "./vue-components39.es.js";
+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 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";
+//#region src/components/OmegaForm/useOmegaForm.ts
+var te = class extends S.TaggedError("FormErrors") {}, k = (e) => function(t) {
+	return { render() {
+		return h(t, {
+			form: e,
+			...this.$attrs
+		}, this.$slots);
+	} };
+}, 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)
+	}) : r(e);
+	return (e) => t.i18nNamespace ? n({
+		id: `${t.i18nNamespace}.fields.${e}`,
+		defaultMessage: i(e)
+	}) : i(e);
+}, 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 = A(n);
+			return {
+				generalErrors: r,
+				errors: m(() => {
+					let e = Object.entries(i.value).reduce((e, [n, r]) => {
+						let i = r?.errors ?? [];
+						if (!i.length) return e;
+						let a = t.value.get(n);
+						return a && e.push({
+							label: a.label,
+							inputId: a.id,
+							errors: [i[0]?.message].filter(Boolean)
+						}), 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) {
+							let r = e;
+							if (r?.path && b.isArray(r.path) && r.path.length) {
+								let e = r.path.join(".");
+								if (!t.value.has(e)) {
+									n.push({
+										label: o(e),
+										inputId: e,
+										errors: [r.message].filter(Boolean)
+									});
+									break;
+								}
+							}
+						}
+					}
+					return [...e, ...n];
+				})
+			};
+		},
+		render({ errors: e, generalErrors: n }) {
+			return h(t, {
+				errors: e,
+				generalErrors: n,
+				...this.$attrs
+			}, this.$slots);
+		}
+	};
+}, M = (e, t) => e.includes(t), N = O(x.empty()), P = (e, h, x) => {
+	if (!e) throw Error("Schema is required");
+	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(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;
+		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(F.value) || "{}");
+				e.removeItem(F.value), r = t;
+			} catch (e) {
+				console.error(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);
+		}
+		r ??= {};
+		let a = {
+			tanstack: h?.defaultValues || {},
+			persistency: r,
+			schema: n(e)
+		};
+		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 = D({
+		...h,
+		validators: {
+			onSubmit: O,
+			...h?.validators || {}
+		},
+		onSubmit: h?.onSubmit ? ({ formApi: e, meta: t, value: n }) => R(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)) {
+				let e = await N(i);
+				return w.isFiber(e) ? await s(e) : e;
+			}
+			return i;
+		}) : void 0,
+		defaultValues: L.value
+	}), B = () => {
+		Object.keys(P).forEach((e) => {
+			z.setFieldValue(e, void 0);
+		});
+	}, V = (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) => {
+		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;
+		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(F.value, JSON.stringify(n));
+		}
+	}, W = () => {
+		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(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 (_(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);
+		});
+	}
+	let K = (e) => C.currentSpan.pipe(C.option, C.flatMap((t) => C.promise(() => z.handleSubmit(T.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({
+			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,
+		meta: P,
+		unionMeta: ne,
+		clear: B,
+		handleSubmit: (e) => J({
+			currentSpan: o.getSpan(a.active()),
+			...e
+		}),
+		handleSubmitEffect: q,
+		registerField: (e) => {
+			y(e, (e) => {
+				Y.value.set(e.name, {
+					label: e.label,
+					id: e.id
+				});
+			}, { immediate: !0 }), _(() => {
+				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), () => {
+		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(X, {
+		_paths: void 0,
+		_keys: void 0,
+		_schema: e,
+		errorContext: $,
+		Form: k(X)(p),
+		Input: k(X)(x?.input ?? d),
+		TaggedUnion: k(X)(f),
+		Field: z.Field,
+		Errors: j($)(u),
+		Array: k(X)(c),
+		AutoGen: k(X)(l)
+	});
+};
+//#endregion
+export { A as useErrorLabel, P as useOmegaForm };

package/dist/vue-components62.es.js

@@ -0,0 +1,33 @@
+import e from "./vue-components52.es.js";
+import { useOmegaForm as t } from "./vue-components61.es.js";
+import { h as n } from "vue";
+//#region src/components/OmegaForm/createUseFormWithCustomInput.ts
+var r = (r) => (...i) => {
+	let [a, o, s] = i, c = {
+		name: "WrappedInput",
+		inheritAttrs: !1,
+		setup(t, { attrs: i, slots: a }) {
+			return () => n(e, {
+				...t,
+				...i
+			}, {
+				default: ({ field: e, state: t, ...o }) => n(r, {
+					...Object.fromEntries(Object.entries(i).filter(([e]) => !Object.prototype.hasOwnProperty.call(o, e) && e !== "form")),
+					field: e,
+					state: t,
+					inputProps: o
+				}, {
+					...a.label && { label: (e) => a.label(e) },
+					...a.default && { default: (e) => a.default(e) }
+				}),
+				...a.label && { label: (e) => a.label(e) }
+			});
+		}
+	};
+	return t(a, o, {
+		...s,
+		input: c
+	});
+};
+//#endregion
+export { r as createUseFormWithCustomInput };

package/dist/vue-components63.es.js

@@ -0,0 +1,8 @@
+import "./vue-components7.es.js";
+import "./vue-components12.es.js";
+import "./vue-components50.es.js";
+import "./vue-components52.es.js";
+import "./vue-components54.es.js";
+import "./vue-components56.es.js";
+import "./vue-components61.es.js";
+import "./vue-components62.es.js";

package/dist/vue-components64.es.js

@@ -0,0 +1,36 @@
+import { __exportAll as e } from "./vue-components2.es.js";
+import t from "./vue-components4.es.js";
+import { useOnClose as n, usePreventClose as r } from "./vue-components7.es.js";
+import i from "./vue-components9.es.js";
+import { createMeta as a, deepMerge as o, defaultsValueFromSchema as s, duplicateSchema as c, generateInputStandardSchemaFromFieldMeta as l, generateMetaFromSchema as u, getInputType as d, isNullableOrUndefined as f, toFormSchema as p } from "./vue-components12.es.js";
+import m from "./vue-components50.es.js";
+import h from "./vue-components52.es.js";
+import g from "./vue-components54.es.js";
+import _ from "./vue-components56.es.js";
+import { useOmegaForm as v } from "./vue-components61.es.js";
+import { createUseFormWithCustomInput as y } from "./vue-components62.es.js";
+import "./vue-components63.es.js";
+//#region src/components/index.ts
+var b = /* @__PURE__ */ e({
+	CommandButton: () => t,
+	Dialog: () => i,
+	OmegaInput: () => h,
+	OmegaTaggedUnion: () => _,
+	OmegaTaggedUnionInternal: () => g,
+	OmegaVuetifyInput: () => m,
+	createMeta: () => a,
+	createUseFormWithCustomInput: () => y,
+	deepMerge: () => o,
+	defaultsValueFromSchema: () => s,
+	duplicateSchema: () => c,
+	generateInputStandardSchemaFromFieldMeta: () => l,
+	generateMetaFromSchema: () => u,
+	getInputType: () => d,
+	isNullableOrUndefined: () => f,
+	toFormSchema: () => p,
+	useOmegaForm: () => v,
+	useOnClose: () => n,
+	usePreventClose: () => r
+});
+//#endregion
+export { b as components_exports };

package/dist/vue-components7.es.js

@@ -0,0 +1,28 @@
+import e from "./vue-components5.es.js";
+import { onMountedWithCleanup as t } from "./vue-components6.es.js";
+import { inject as n, provide as r } from "vue";
+//#region src/components/OmegaForm/blockDialog.ts
+var i = () => e(), a = Symbol("DialogBus"), o = () => n(a, null), s = () => {
+	let e = i();
+	return r(a, e), e;
+}, c = (e) => {
+	let n = o();
+	if (!n) return;
+	let r = e();
+	t(() => {
+		let e = (e) => {
+			r.value && (confirm("Es sind ungespeicherte Änderungen vorhanden. Wirklich schließen?") || (e.prevent = !0));
+		};
+		return n.on("dialog-closing", e), () => n.off("dialog-closing", e);
+	});
+}, l = (e) => {
+	let t = o();
+	return t ||= s(), () => {
+		let n = {};
+		t.emit("dialog-closing", n), n.prevent ? typeof n.prevent == "object" && "then" in n.prevent && n.prevent.then((t) => {
+			t !== !1 && e();
+		}) : e();
+	};
+};
+//#endregion
+export { l as useOnClose, c as usePreventClose };

package/dist/vue-components8.es.js

@@ -0,0 +1,47 @@
+import { onMountedWithCleanup as e } from "./vue-components6.es.js";
+import { useOnClose as t } from "./vue-components7.es.js";
+import { computed as n, createBlock as r, createSlots as i, defineComponent as a, guardReactiveProps as o, mergeModels as s, normalizeProps as c, openBlock as l, renderList as u, renderSlot as d, resolveComponent as f, unref as p, useModel as m, useSlots as h, withCtx as g } from "vue";
+//#region src/components/Dialog.vue?vue&type=script&setup=true&lang.ts
+var _ = /* @__PURE__ */ a({
+	__name: "Dialog",
+	props: /* @__PURE__ */ s({ persistent: { type: Boolean } }, {
+		modelValue: {
+			type: Boolean,
+			default: !1
+		},
+		modelModifiers: {}
+	}),
+	emits: ["update:modelValue"],
+	setup(a) {
+		let s = a, _ = m(a, "modelValue"), v = h(), y = n(() => {
+			let { default: e, ...t } = v;
+			return t;
+		}), b = t(() => _.value = !1);
+		return e(() => {
+			let e = (e) => {
+				_.value && !s.persistent && e.code === "Escape" && b();
+			};
+			return document.addEventListener("keydown", e), () => document.removeEventListener("keydown", e);
+		}), (e, t) => {
+			let n = f("v-dialog");
+			return l(), r(n, {
+				modelValue: _.value,
+				"onUpdate:modelValue": t[0] ||= (e) => _.value = e,
+				persistent: "",
+				"onClick:outside": p(b)
+			}, i({
+				default: g(({ isActive: t }) => [d(e.$slots, "default", {
+					open: _.value,
+					cancel: p(b),
+					isActive: t
+				})]),
+				_: 2
+			}, [u(y.value, (t, n) => ({
+				name: n,
+				fn: g((t) => [d(e.$slots, n, c(o(t)))])
+			}))]), 1032, ["modelValue", "onClick:outside"]);
+		};
+	}
+});
+//#endregion
+export { _ as default };

package/dist/vue-components9.es.js

@@ -0,0 +1,5 @@
+import e from "./vue-components8.es.js";
+//#region src/components/Dialog.vue
+var t = e;
+//#endregion
+export { t as default };

package/package.json

@@ -1,39 +1,40 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "4.0.0-beta.9",
+  "version": "4.0.0-beta.91",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
-    "effect": "^4.0.0-beta.25",
-    "intl-messageformat": "^11.1.2",
+    "effect": "^4.0.0-beta.47",
+    "intl-messageformat": "^11.2.0",
     "mdi-js": "^1.0.1",
     "primeflex": "^4.0.0",
     "primeicons": "^7.0.0",
     "primevue": "^4.5.4",
-    "vue": "^3.5.29",
-    "vuetify": "^4.0.0"
+    "vue": "^3.5.32",
+    "vuetify": "^4.0.5"
   },
   "devDependencies": {
-    "@storybook/vue3": "^10.2.13",
-    "@storybook/vue3-vite": "^10.2.13",
-    "@types/node": "^25.3.3",
-    "@vitejs/plugin-vue": "^6.0.4",
+    "@storybook/vue3": "^10.3.4",
+    "@storybook/vue3-vite": "^10.3.4",
+    "@types/node": "^25.5.2",
+    "@vitejs/plugin-vue": "^6.0.5",
     "@vue/test-utils": "^2.4.6",
     "@vueuse/core": "^14.2.1",
-    "dprint": "^0.52.0",
-    "jsdom": "^28.1.0",
+    "dprint": "^0.53.2",
+    "jsdom": "^29.0.2",
     "rimraf": "^6.1.3",
-    "sass": "^1.97.3",
-    "storybook": "^10.2.13",
-    "typescript": "~5.9.3",
-    "vite": "^7.3.1",
+    "sass": "^1.99.0",
+    "storybook": "^10.3.4",
+    "storybook-vue3-router": "^7.0.0",
+    "typescript": "~6.0.2",
+    "vite": "^8.0.6",
     "vite-plugin-css-injected-by-js": "^4.0.1",
     "vitepress": "^1.6.4",
-    "vitest": "^4.0.18",
-    "vue-router": "^5.0.3",
+    "vitest": "^4.1.3",
+    "vue-router": "^5.0.4",
     "vue-toastification": "^2.0.0-rc.5",
-    "vue-tsc": "^3.2.5",
-    "vuetify": "^4.0.0",
-    "@effect-app/eslint-shared-config": "0.5.7-beta.1"
+    "vue-tsc": "^3.2.6",
+    "vuetify": "^4.0.5",
+    "@effect-app/eslint-shared-config": "0.5.7-beta.9"
   },
   "files": [
     "src",
@@ -45,21 +46,25 @@
       "types": "./dist/types/index.d.ts",
       "import": "./dist/vue-components.es.js"
     },
-    "./dist/vue-components.css": "./dist/vue-components.css"
+    "./dist/vue-components.css": "./dist/vue-components.css",
+    "./reset.css": {
+      "development": "./src/reset.css",
+      "default": "./dist/reset.css"
+    }
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/api": "^1.9.1",
     "@tanstack/vue-form": "^1.23.5",
     "highlight.js": "^11.11.1",
     "mitt": "^3.0.1",
     "vue3-highlightjs": "^1.0.5",
-    "@effect-app/vue": "4.0.0-beta.9",
-    "effect-app": "4.0.0-beta.9"
+    "@effect-app/vue": "4.0.0-beta.91",
+    "effect-app": "4.0.0-beta.91"
   },
   "scripts": {
     "check": "vue-tsc",
     "build": "pnpm build:run",
-    "build:run": "rimraf dist && vue-tsc && vite build",
+    "build:run": "rimraf dist && vue-tsc && vite build && cp src/reset.css dist/reset.css",
     "docs:dev": "vitepress dev docs",
     "docs:build": "vitepress build docs",
     "docs:serve": "vitepress serve docs",

package/src/components/CommandButton.vue

@@ -66,7 +66,7 @@ export default {
       :label="command.label"
       :title="title ?? command.action"
     >
-      <span>{{ command.label }}</span>
+      {{ command.label }}
     </slot>
   </v-btn>
   <v-btn

package/src/components/OmegaForm/OmegaAutoGen.vue

@@ -20,8 +20,7 @@
   Name extends DeepKeys<From>"
 >
 import { type DeepKeys } from "@tanstack/vue-form"
-import { pipe } from "effect/Function"
-import * as Order from "effect/Order"
+import { Order } from "effect-app"
 import { computed } from "vue"
 import { type FieldMeta, type FieldPath, type OmegaAutoGenMeta, type OmegaInputProps } from "./OmegaFormStuff"
 
@@ -71,37 +70,33 @@ const orderBy: Order.Order<NewMeta> = Order.mapInput(
   (x: NewMeta) => namePosition(x.name, props.order || [])
 )
 
-const children = computed<NewMeta[]>(() =>
-  pipe(
-    props.form.meta as Record<DeepKeys<From>, FieldMeta | undefined>,
-    // include / exclude
-    filterRecord((_, metaKey) =>
+const children = computed<NewMeta[]>(() => {
+  const included = filterRecord((value, metaKey) =>
+    Boolean(value)
+    && (
       props.pick
         ? props.pick.includes(metaKey) && !props.omit?.includes(metaKey)
         : !props.omit?.includes(metaKey)
-    ),
-    (x: Record<DeepKeys<From>, FieldMeta | undefined>) => x,
-    // labelMap and adding name
-    mapObject((metaValue, metaKey) => ({
-      name: metaKey as Name,
-      label: props.labelMap?.(metaKey) || metaKey,
-      ...(metaValue ?? {})
-    })),
-    // filterMap
-    props.filterMap
-      ? filterMapRecord((m: NewMeta) => {
-        const result = props.filterMap?.(m.name!, m as NewMeta)
-        return result === undefined || result === true ? m : result
-      })
-      : (x: Record<DeepKeys<From>, NewMeta>) => x,
-    // transform to array
-    (obj: Record<DeepKeys<From>, NewMeta>) => Object.values(obj) as NewMeta[],
-    // order
-    (items: NewMeta[]) => [...items].sort((a, b) => orderBy(a, b)),
-    // sort
-    props.sort ? (items: NewMeta[]) => [...items].sort((a, b) => props.sort!(a, b)) : (x: NewMeta[]) => x
-  )
-)
+    )
+  )(props.form.meta as Record<DeepKeys<From>, FieldMeta | undefined>) as Record<DeepKeys<From>, FieldMeta>
+
+  const withLabels = mapObject((metaValue: FieldMeta, metaKey) => ({
+    name: metaKey,
+    label: props.labelMap?.(metaKey) || metaKey,
+    ...metaValue
+  }))(included) as unknown as Record<DeepKeys<From>, NewMeta>
+
+  const filtered = props.filterMap
+    ? filterMapRecord((m: NewMeta) => {
+      const result = props.filterMap?.(m.name, m)
+      return result === undefined || result === true ? m : result
+    })(withLabels) as Record<DeepKeys<From>, NewMeta>
+    : withLabels
+
+  const sorted = [...Object.values(filtered) as NewMeta[]].sort(orderBy)
+
+  return props.sort ? sorted.sort(props.sort) : sorted
+})
 
 defineSlots<{
   default(props: { child: NewMeta }): void

package/src/components/OmegaForm/OmegaErrorsInternal.vue

@@ -130,10 +130,9 @@ const showedGeneralErrors = computed(() => {
         .flatMap((issues) =>
           issues
             .filter(
-              (issue): issue is StandardSchemaV1Issue & { message: string } =>
-                typeof (issue as { message?: unknown })?.message === "string"
+              (issue): issue is StandardSchemaV1Issue & { message: string } => Boolean(issue?.message)
             )
-            .map((issue) => (issue as StandardSchemaV1Issue & { message: string }).message)
+            .map((issue) => issue.message)
         )
     )
 })