@effect-app/vue-components 1.6.7 → 1.7.1

package/dist/types/components/OmegaForm/InputProps.d.ts

@@ -11,13 +11,19 @@ export type InputProps<From extends Record<PropertyKey, any>, TName extends Deep
         errorMessages: string[];
         error: boolean;
         setRealDirty: () => void;
-        type: string;
         label: string;
+        type: string;
+    };
+    field: OmegaFieldInternalApi<From, TName>;
+};
+export type MergedInputProps<From extends Record<PropertyKey, any>, TName extends DeepKeys<From>> = InputProps<From, TName>["inputProps"] & Pick<InputProps<From, TName>, "field">;
+export type VuetifyInputProps<From extends Record<PropertyKey, any>, TName extends DeepKeys<From>> = {
+    inputProps: InputProps<From, TName>["inputProps"] & {
+        type: string;
         options?: {
             title: string;
             value: string;
         }[];
     };
-    field: OmegaFieldInternalApi<From, TName>;
+    field: InputProps<From, TName>["field"];
 };
-export type MergedInputProps<From extends Record<PropertyKey, any>, TName extends DeepKeys<From>> = InputProps<From, TName>["inputProps"] & Pick<InputProps<From, TName>, "field">;

package/dist/types/components/OmegaForm/OmegaFormInput.vue.d.ts

@@ -1,10 +1,8 @@
 import { type DeepKeys } from "@tanstack/vue-form";
 import type { MergedInputProps } from "./InputProps";
-import type { DefaultInputProps } from "./OmegaFormStuff";
+import type { BaseProps, DefaultTypeProps } from "./OmegaFormStuff";
 declare const __VLS_export: <From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, Name extends DeepKeys<From>>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
-    props: __VLS_PrettifyLocal<{
-        name: Name;
-    } & DefaultInputProps<From>> & import("vue").PublicProps;
+    props: __VLS_PrettifyLocal<BaseProps<From, Name> & DefaultTypeProps> & import("vue").PublicProps;
     expose: (exposed: {}) => void;
     attrs: any;
     slots: {

package/dist/types/components/OmegaForm/OmegaFormStuff.d.ts

@@ -4,29 +4,35 @@ import { type RuntimeFiber } from "effect/Fiber";
 import { type OmegaFieldInternalApi } from "./InputProps";
 import { type OF, type OmegaFormReturn } from "./useOmegaForm";
 export type ShowErrorsOn = "onChange" | "onBlur" | "onSubmit";
-export type DefaultInputProps<From> = {
+export type BaseProps<From, TName extends DeepKeys<From>> = {
+    /** Will fallback to i18n when not specified */
     label?: string;
     validators?: FieldValidators<From>;
+    name: TName;
+};
+export type TypesWithOptions = "radio" | "select" | "multiple" | "autocomplete" | "autocompletemultiple";
+export type DefaultTypeProps = {
+    type?: TypeOverride;
+    options?: undefined;
+} | {
+    type?: TypesWithOptions;
     options?: {
         title: string;
         value: string;
     }[];
-    type?: TypeOverride;
 };
 export type OmegaInputPropsBase<From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>> = {
     form: OF<From, To> & {
         meta: MetaRecord<From>;
         i18nNamespace?: string;
     };
-    name: NestedKeyOf<From>;
-} & DefaultInputProps<From>;
-export type OmegaInputProps<From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, InputProps = DefaultInputProps<From>> = {
-    form: OmegaFormReturn<From, To, InputProps> & {
+} & BaseProps<From, NestedKeyOf<From>>;
+export type OmegaInputProps<From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, TypeProps = DefaultTypeProps> = {
+    form: OmegaFormReturn<From, To, TypeProps> & {
         meta: MetaRecord<From>;
         i18nNamespace?: string;
     };
-    name: NestedKeyOf<From>;
-} & DefaultInputProps<From>;
+} & BaseProps<From, NestedKeyOf<From>>;
 export type TypeOverride = "string" | "text" | "number" | "select" | "multiple" | "boolean" | "radio" | "autocomplete" | "autocompletemultiple" | "switch" | "range" | "password" | "email";
 export interface OmegaError {
     label: string;

package/dist/types/components/OmegaForm/OmegaInput.vue.d.ts

@@ -15,12 +15,8 @@ declare const __VLS_export: <From extends Record<PropertyKey, any>, To extends R
             errorMessages: string[];
             error: boolean;
             setRealDirty: () => void;
-            type: string;
             label: string;
-            options?: {
-                title: string;
-                value: string;
-            }[];
+            type: string;
         }) => any;
     };
     emit: {};

package/dist/types/components/OmegaForm/OmegaInputVuetify.vue.d.ts

@@ -1,7 +1,7 @@
 import { type DeepKeys } from "@tanstack/vue-form";
-import type { InputProps } from "./InputProps";
+import type { VuetifyInputProps } from "./InputProps";
 declare const __VLS_export: <From extends Record<PropertyKey, any>, Name extends DeepKeys<From>>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
-    props: __VLS_PrettifyLocal<InputProps<From, Name> & {
+    props: __VLS_PrettifyLocal<VuetifyInputProps<From, Name> & {
         onBlur?: ((event: Event) => any) | undefined;
         onFocus?: ((event: Event) => any) | undefined;
     }> & import("vue").PublicProps;

package/dist/types/components/OmegaForm/OmegaInternalInput.vue.d.ts

@@ -6,10 +6,6 @@ declare const __VLS_export: <From extends Record<PropertyKey, any>, Name extends
         field: OmegaFieldInternalApi<From, Name>;
         meta: MetaRecord<From>[NestedKeyOf<From>];
         label: string;
-        options?: {
-            title: string;
-            value: string;
-        }[];
         type?: TypeOverride;
         validators?: FieldValidators<From>;
     }> & import("vue").PublicProps;
@@ -27,12 +23,8 @@ declare const __VLS_export: <From extends Record<PropertyKey, any>, Name extends
             errorMessages: string[];
             error: boolean;
             setRealDirty: () => void;
-            type: string;
             label: string;
-            options?: {
-                title: string;
-                value: string;
-            }[];
+            type: string;
         }) => any;
     };
     emit: {};

package/dist/types/components/OmegaForm/OmegaWrapper.vue.d.ts

@@ -1,6 +1,6 @@
-import { type DefaultInputProps, type OmegaFormState } from "./OmegaFormStuff";
+import { type DefaultTypeProps, type OmegaFormState } from "./OmegaFormStuff";
 import { type OmegaFormReturn } from "./useOmegaForm";
-declare const __VLS_export: <From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, K extends keyof OmegaFormState<From, To> = keyof OmegaFormState<From, To>, Props = DefaultInputProps<From>>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
+declare const __VLS_export: <From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, K extends keyof OmegaFormState<From, To> = keyof OmegaFormState<From, To>, Props = DefaultTypeProps>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<{
         form: OmegaFormReturn<From, To, Props>;
         disabled?: boolean;

package/dist/types/components/OmegaForm/createUseFormWithCustomInput.d.ts

@@ -1,4 +1,4 @@
 import { type Component } from "vue";
-import { type DefaultInputProps } from "./OmegaFormStuff";
+import { type DefaultTypeProps } from "./OmegaFormStuff";
 import { useOmegaForm } from "./useOmegaForm";
-export declare const createUseFormWithCustomInput: (CustomInputComponent: Component) => <From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, Props = DefaultInputProps<From>>(...args: Parameters<typeof useOmegaForm<From, To>>) => import("./useOmegaForm").OmegaFormReturn<From, To, Props>;
+export declare const createUseFormWithCustomInput: <TypeProps = DefaultTypeProps>(CustomInputComponent: Component) => <From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>>(...args: Parameters<typeof useOmegaForm<From, To>>) => import("./useOmegaForm").OmegaFormReturn<From, To, TypeProps>;

package/dist/types/components/OmegaForm/useOmegaForm.d.ts

@@ -2,7 +2,7 @@ import { type DeepKeys, DeepValue, StandardSchemaV1Issue, ValidationError, Valid
 import { Effect, Order, S } from "effect-app";
 import { type InjectionKey } from "vue";
 import { MergedInputProps } from "./InputProps";
-import { DefaultInputProps, type FilterItems, type FormProps, type MetaRecord, type NestedKeyOf, OmegaAutoGenMeta, OmegaError, type OmegaFormApi, OmegaFormState, OmegaInputProps, ShowErrorsOn } from "./OmegaFormStuff";
+import { BaseProps, DefaultTypeProps, type FilterItems, type FormProps, type MetaRecord, type NestedKeyOf, OmegaAutoGenMeta, OmegaError, type OmegaFormApi, OmegaFormState, OmegaInputProps, ShowErrorsOn } from "./OmegaFormStuff";
 type keysRule<T> = {
     keys?: NestedKeyOf<T>[];
     banKeys?: "You should only use one of banKeys or keys, not both, moron";
@@ -63,11 +63,9 @@ export declare const OmegaFormKey: InjectionKey<OF<any, any>>;
 type __VLS_PrettifyLocal<T> = {
     [K in keyof T]: T[K];
 } & {};
-export interface OmegaFormReturn<From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, Props = DefaultInputProps<From>> extends OF<From, To> {
+export interface OmegaFormReturn<From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, TypeProps = DefaultTypeProps> extends OF<From, To> {
     Input: <Name extends DeepKeys<From>>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
-        props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{} & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, never>, never> & {
-            name: Name;
-        } & Props & Partial<{}>> & import("vue").PublicProps;
+        props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{} & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, never>, never> & BaseProps<From, Name> & TypeProps & Partial<{}>> & import("vue").PublicProps;
         expose(exposed: import("vue").ShallowUnwrapRef<{}>): void;
         attrs: any;
         slots: {
@@ -161,5 +159,5 @@ export interface OmegaFormReturn<From extends Record<PropertyKey, any>, To exten
         __ctx?: Awaited<typeof __VLS_setup>;
     };
 }
-export declare const useOmegaForm: <From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, Props = DefaultInputProps<From>>(schema: S.Schema<To, From, never>, tanstackFormOptions?: NoInfer<FormProps<From, To>>, omegaConfig?: OmegaConfig<To>) => OmegaFormReturn<From, To, Props>;
+export declare const useOmegaForm: <From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, TypeProps = DefaultTypeProps>(schema: S.Schema<To, From, never>, tanstackFormOptions?: NoInfer<FormProps<From, To>>, omegaConfig?: OmegaConfig<To>) => OmegaFormReturn<From, To, TypeProps>;
 export {};

package/dist/vue-components.es16.js

@@ -1,8 +1,8 @@
-(function(){"use strict";try{if(typeof document<"u"){var n=document.createElement("style");if(n.appendChild(document.createTextNode("fieldset[data-v-440e1a59]{display:contents}fieldset[disabled][data-v-440e1a59]>*{pointer-events:none}")),document.head.appendChild(n),window.customElements){const e=window.customElements.define;window.customElements.define=function(i,t){const d=t.prototype.connectedCallback;return t.prototype.connectedCallback=function(){if(d&&d.call(this),this.shadowRoot){const o=document.createElement("style");o.appendChild(document.createTextNode("fieldset[data-v-440e1a59]{display:contents}fieldset[disabled][data-v-440e1a59]>*{pointer-events:none}")),this.shadowRoot.appendChild(o)}},e.call(window.customElements,i,t)}}}}catch(e){console.error("vite-plugin-css-injected-by-js",e)}})();
+(function(){"use strict";try{if(typeof document<"u"){var n=document.createElement("style");if(n.appendChild(document.createTextNode("fieldset[data-v-8fe92df3]{display:contents}fieldset[disabled][data-v-8fe92df3]>*{pointer-events:none}")),document.head.appendChild(n),window.customElements){const e=window.customElements.define;window.customElements.define=function(i,t){const d=t.prototype.connectedCallback;return t.prototype.connectedCallback=function(){if(d&&d.call(this),this.shadowRoot){const o=document.createElement("style");o.appendChild(document.createTextNode("fieldset[data-v-8fe92df3]{display:contents}fieldset[disabled][data-v-8fe92df3]>*{pointer-events:none}")),this.shadowRoot.appendChild(o)}},e.call(window.customElements,i,t)}}}}catch(e){console.error("vite-plugin-css-injected-by-js",e)}})();
 import o from "./vue-components.es31.js";
 
 import m from "./vue-components.es30.js";
-const e = /* @__PURE__ */ m(o, [["__scopeId", "data-v-440e1a59"]]);
+const a = /* @__PURE__ */ m(o, [["__scopeId", "data-v-8fe92df3"]]);
 export {
-  e as default
+  a as default
 };

package/dist/vue-components.es4.js

@@ -1,48 +1,44 @@
-import { defineComponent as y, inject as h, computed as s, createBlock as i, openBlock as u, resolveDynamicComponent as M, withCtx as c, createCommentVNode as $, mergeProps as b, renderSlot as C, normalizeProps as k, guardReactiveProps as F } from "vue";
+import { defineComponent as h, inject as $, computed as s, createBlock as i, openBlock as u, resolveDynamicComponent as M, withCtx as f, createCommentVNode as b, mergeProps as C, renderSlot as k, normalizeProps as y, guardReactiveProps as F } from "vue";
 import { useIntl as A } from "./vue-components.es3.js";
 import { generateInputStandardSchemaFromFieldMeta as w } from "./vue-components.es9.js";
 import I from "./vue-components.es5.js";
-const z = /* @__PURE__ */ y({
+const z = /* @__PURE__ */ h({
   inheritAttrs: !1,
   __name: "OmegaInput",
   props: {
     form: {},
-    name: {},
     label: {},
     validators: {},
-    options: {},
-    type: {}
+    name: {}
   },
   setup(a) {
-    const e = a, r = h(
+    const e = a, n = $(
       "getMetaFromArray",
       null
-    ), t = s(() => r?.value && r.value(e.name) ? r.value(e.name) : e.form.meta[e.name]), f = s(() => {
-      if (!t.value)
+    ), r = s(() => n?.value && n.value(e.name) ? n.value(e.name) : e.form.meta[e.name]), c = s(() => {
+      if (!r.value)
         throw console.log(e.name, Object.keys(e.form.meta), e.form.meta), new Error("Meta is undefined");
-      return w(t.value);
-    }), { formatMessage: o } = A(), d = (n) => n.replace(/([A-Z])/g, " $1").replace(/^./, (l) => l.toUpperCase()).trim(), m = () => o({ id: `general.fields.${e.name}`, defaultMessage: d(e.name) }), p = () => e.form.i18nNamespace ? o({ id: `${e.form.i18nNamespace}.fields.${e.name}`, defaultMessage: m() }) : m();
-    return (n, l) => (u(), i(M(a.form.Field), {
+      return w(r.value);
+    }), { formatMessage: o } = A(), d = (t) => t.replace(/([A-Z])/g, " $1").replace(/^./, (l) => l.toUpperCase()).trim(), m = () => o({ id: `general.fields.${e.name}`, defaultMessage: d(e.name) }), p = () => e.form.i18nNamespace ? o({ id: `${e.form.i18nNamespace}.fields.${e.name}`, defaultMessage: m() }) : m();
+    return (t, l) => (u(), i(M(a.form.Field), {
       name: a.name,
       validators: {
-        onChange: f.value,
+        onChange: c.value,
         ...a.validators
       }
     }, {
-      default: c(({ field: v }) => [
-        t.value ? (u(), i(I, b({
+      default: f(({ field: v }) => [
+        r.value ? (u(), i(I, C({
           key: 0,
           field: v,
           label: a.label ?? p(),
-          options: a.options,
-          meta: t.value,
-          type: a.type
-        }, n.$attrs), {
-          default: c((g) => [
-            C(n.$slots, "default", k(F(g)))
+          meta: r.value
+        }, { ...t.$attrs, ...t.$props }), {
+          default: f((g) => [
+            k(t.$slots, "default", y(F(g)))
           ]),
           _: 3
-        }, 16, ["field", "label", "options", "meta", "type"])) : $("", !0)
+        }, 16, ["field", "label", "meta"])) : b("", !0)
       ]),
       _: 3
     }, 8, ["name", "validators"]));

package/dist/vue-components.es5.js

@@ -1,24 +1,23 @@
 (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 $, getCurrentInstance as B, useId as I, computed as n, onMounted as g, ref as V, watchEffect as k, watch as q, onUnmounted as D, renderSlot as F, normalizeProps as h, guardReactiveProps as L, createElementVNode as O, normalizeClass as M, createBlock as R, createCommentVNode as S, unref as U, openBlock as z, mergeProps as A } from "vue";
-import { useStore as T } from "@tanstack/vue-form";
-import Z from "./vue-components.es23.js";
+import { defineComponent as I, getCurrentInstance as V, useId as $, computed as n, onMounted as g, ref as k, watchEffect as q, watch as D, onUnmounted as F, useAttrs as L, renderSlot as O, normalizeProps as h, guardReactiveProps as A, createElementVNode as M, normalizeClass as R, createBlock as S, createCommentVNode as U, unref as z, openBlock as T, mergeProps as Z } from "vue";
+import { useStore as j } from "@tanstack/vue-form";
+import G from "./vue-components.es23.js";
 
-const Y = /* @__PURE__ */ $({
+const te = /* @__PURE__ */ I({
   inheritAttrs: !1,
   __name: "OmegaInternalInput",
   props: {
     field: {},
     meta: {},
     label: {},
-    options: {},
     type: {},
     validators: {}
   },
   setup(v) {
-    const e = v, y = B()?.appContext.components.VTextField, a = I(), l = e.field, o = T(l.store, (t) => t), m = n(() => e.type ? e.type : e.meta?.type === "string" ? e.meta.format === "email" ? "email" : "string" : e.meta?.type || "unknown"), p = n(() => o.value.value), d = n(() => o.value.meta.errors ?? []), b = n(
+    const e = v, y = V()?.appContext.components.VTextField, a = $(), l = e.field, o = j(l.store, (t) => t), m = n(() => e.type ? e.type : e.meta?.type === "string" ? e.meta.format === "email" ? "email" : "string" : e.meta?.type || "unknown"), d = n(() => o.value.value), f = n(() => o.value.meta.errors ?? []), b = n(
       () => (
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        d.value.map((t) => t?.message).filter(Boolean)
+        f.value.map((t) => t?.message).filter(Boolean)
       )
     ), C = (t) => t == null || t === !1 || t === "" || Number.isNaN(t), x = (t) => {
       C(t) && e.meta?.type !== "boolean" ? e.field.handleChange(
@@ -26,68 +25,68 @@ const Y = /* @__PURE__ */ $({
       ) : e.field.handleChange(t);
     };
     g(() => {
-      if (!p.value && !e.meta?.required && e.meta?.nullableOrUndefined === "null") {
+      if (!d.value && !e.meta?.required && e.meta?.nullableOrUndefined === "null") {
         const t = o.value.meta.isDirty;
         l.setValue(null), l.setMeta((r) => ({ ...r, isDirty: t }));
       }
     });
-    const { mapError: w, removeError: f, showErrors: _, showErrorsOn: E } = e.field.form.errorContext, s = V(!1);
-    k(() => {
-      (_.value || E === "onChange") && (s.value = !0);
+    const { mapError: _, removeError: c, showErrors: w, showErrorsOn: E } = e.field.form.errorContext, s = k(!1);
+    q(() => {
+      (w.value || E === "onChange") && (s.value = !0);
     });
     const i = () => {
       s.value = !0;
     };
     g(() => {
-      p.value && i();
+      d.value && i();
     });
-    const c = n(() => !s.value && m.value !== "select" ? [] : b.value);
-    q(
-      d,
+    const p = n(() => !s.value && m.value !== "select" ? [] : b.value);
+    D(
+      f,
       (t) => {
-        t.length ? w({
+        t.length ? _({
           inputId: a,
           errors: o.value.meta.errors.map((r) => r.message).filter(Boolean),
           label: e.label
-        }) : f(a);
+        }) : c(a);
       }
-    ), D(() => {
-      f(a);
+    ), F(() => {
+      c(a);
     });
     const P = (t) => {
       const r = {
-        get(H, N, J) {
-          return N === "handleChange" ? x : Reflect.get(...arguments);
+        get(K, B, Q) {
+          return B === "handleChange" ? x : Reflect.get(...arguments);
         }
       };
       return new Proxy(t, r);
-    }, u = n(() => ({
+    }, N = L(), u = n(() => ({
       inputProps: {
+        ...N,
         id: a,
         required: e.meta?.required,
         minLength: e.meta?.type === "string" && e.meta?.minLength,
         maxLength: e.meta?.type === "string" && e.meta?.maxLength,
         max: e.meta?.type === "number" && e.meta?.maximum,
         min: e.meta?.type === "number" && e.meta?.minimum,
-        errorMessages: c.value,
-        error: !!c.value.length,
+        errorMessages: p.value,
+        error: !!p.value.length,
         setRealDirty: i,
         type: m.value,
-        label: `${e.label}${e.meta?.required ? " *" : ""}`,
-        options: e.options
+        label: `${e.label}${e.meta?.required ? " *" : ""}`
       },
       field: P(e.field)
     }));
-    return (t, r) => F(t.$slots, "default", h(L({ ...u.value.inputProps, field: u.value.field })), () => [
-      O("div", {
-        class: M(t.$attrs.class),
+    return (t, r) => O(t.$slots, "default", h(A({ ...u.value.inputProps, field: u.value.field })), () => [
+      M("div", {
+        class: R(t.$attrs.class),
         onFocusout: i
       }, [
-        U(y) ? (z(), R(Z, h(A({ key: 0 }, { ...u.value, ...t.$attrs })), null, 16)) : S("", !0)
+        z(y) ? (T(), S(G, h(Z({ key: 0 }, u.value)), null, 16)) : U("", !0)
       ], 34)
     ]);
   }
 });
 export {
-  Y as default
+  te as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "1.6.7",
+  "version": "1.7.1",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
     "effect": "^3.18.0",
@@ -51,8 +51,8 @@
     "highlight.js": "^11.11.1",
     "mitt": "^3.0.1",
     "vue3-highlightjs": "^1.0.5",
-    "@effect-app/vue": "2.84.2",
-    "effect-app": "3.10.1"
+    "effect-app": "3.10.1",
+    "@effect-app/vue": "2.84.2"
   },
   "scripts": {
     "build": "pnpm build:run",

package/src/components/OmegaForm/InputProps.ts

@@ -38,9 +38,8 @@ export type InputProps<From extends Record<PropertyKey, any>, TName extends Deep
     errorMessages: string[]
     error: boolean
     setRealDirty: () => void
-    type: string
     label: string
-    options?: { title: string; value: string }[]
+    type: string
   }
   field: OmegaFieldInternalApi<From, TName>
 }
@@ -48,3 +47,11 @@ export type InputProps<From extends Record<PropertyKey, any>, TName extends Deep
 export type MergedInputProps<From extends Record<PropertyKey, any>, TName extends DeepKeys<From>> =
   & InputProps<From, TName>["inputProps"]
   & Pick<InputProps<From, TName>, "field">
+
+export type VuetifyInputProps<From extends Record<PropertyKey, any>, TName extends DeepKeys<From>> = {
+  inputProps: InputProps<From, TName>["inputProps"] & {
+    type: string
+    options?: { title: string; value: string }[]
+  }
+  field: InputProps<From, TName>["field"]
+}

package/src/components/OmegaForm/OmegaFormInput.vue

@@ -2,11 +2,6 @@
   <OmegaInput
     v-bind="$props"
     :form="form"
-    :name="name"
-    :label="label"
-    :validators="validators"
-    :options="options"
-    :type="type"
   >
     <template #default="slotProps">
       <slot v-bind="slotProps" />
@@ -26,7 +21,7 @@
 import { type DeepKeys } from "@tanstack/vue-form"
 import { inject } from "vue"
 import type { MergedInputProps } from "./InputProps"
-import type { DefaultInputProps, OmegaInputProps } from "./OmegaFormStuff"
+import type { BaseProps, DefaultTypeProps, OmegaInputProps } from "./OmegaFormStuff"
 import OmegaInput from "./OmegaInput.vue"
 import { OmegaFormKey } from "./useOmegaForm"
 
@@ -40,9 +35,7 @@ if (!form) {
 }
 
 defineProps<
-  {
-    name: Name
-  } & DefaultInputProps<From>
+  BaseProps<From, Name> & DefaultTypeProps
 >()
 
 defineSlots<{

package/src/components/OmegaForm/OmegaFormStuff.ts

@@ -9,14 +9,25 @@ import { type OF, type OmegaFormReturn } from "./useOmegaForm"
 
 export type ShowErrorsOn = "onChange" | "onBlur" | "onSubmit"
 
-export type DefaultInputProps<From> = {
+export type BaseProps<From, TName extends DeepKeys<From>> = {
+  /** Will fallback to i18n when not specified */
   label?: string
   validators?: FieldValidators<From>
+  name: TName
+}
+
+export type TypesWithOptions = "radio" | "select" | "multiple" | "autocomplete" | "autocompletemultiple"
+export type DefaultTypeProps = {
+  type?: TypeOverride
+  options?: undefined
+} | {
+  type?: TypesWithOptions
+  // TODO: options should depend on `type`, but since there is auto-type, we can't currently enforce it.
+  // hence we allow it also for type? (undefined) atm
   options?: {
     title: string
     value: string
   }[]
-  type?: TypeOverride
 }
 
 export type OmegaInputPropsBase<
@@ -27,20 +38,18 @@ export type OmegaInputPropsBase<
     meta: MetaRecord<From>
     i18nNamespace?: string
   }
-  name: NestedKeyOf<From>
-} & DefaultInputProps<From>
+} & BaseProps<From, NestedKeyOf<From>>
 
 export type OmegaInputProps<
   From extends Record<PropertyKey, any>,
   To extends Record<PropertyKey, any>,
-  InputProps = DefaultInputProps<From>
+  TypeProps = DefaultTypeProps
 > = {
-  form: OmegaFormReturn<From, To, InputProps> & {
+  form: OmegaFormReturn<From, To, TypeProps> & {
     meta: MetaRecord<From>
     i18nNamespace?: string
   }
-  name: NestedKeyOf<From>
-} & DefaultInputProps<From> // InputProps // TODO
+} & BaseProps<From, NestedKeyOf<From>>
 
 export type TypeOverride =
   | "string"

package/src/components/OmegaForm/OmegaInput.vue

@@ -12,10 +12,8 @@
         v-if="meta"
         :field="field"
         :label="label ?? i18n()"
-        :options="options"
         :meta="meta"
-        :type="type"
-        v-bind="$attrs"
+        v-bind="{ ...$attrs, ...$props }"
       >
         <template #default="inputProps">
           <slot v-bind="inputProps" />

package/src/components/OmegaForm/OmegaInputVuetify.vue

@@ -133,9 +133,9 @@
 >
 import { type DeepKeys } from "@tanstack/vue-form"
 import { getInputType } from "../OmegaForm/OmegaFormStuff"
-import type { InputProps } from "./InputProps"
+import type { VuetifyInputProps } from "./InputProps"
 
-defineProps<InputProps<From, Name>>()
+defineProps<VuetifyInputProps<From, Name>>()
 
 defineEmits<{
   (e: "focus", event: Event): void

package/src/components/OmegaForm/OmegaInternalInput.vue

@@ -6,7 +6,7 @@
     >
       <OmegaInputVuetify
         v-if="vuetified"
-        v-bind="{ ...inputProps, ...$attrs }"
+        v-bind="inputProps"
       />
     </div>
   </slot>
@@ -18,7 +18,7 @@
   generic="From extends Record<PropertyKey, any>, Name extends DeepKeys<From>"
 >
 import { type DeepKeys, useStore } from "@tanstack/vue-form"
-import { computed, type ComputedRef, getCurrentInstance, onMounted, onUnmounted, ref, useId, watch, watchEffect } from "vue"
+import { computed, type ComputedRef, getCurrentInstance, onMounted, onUnmounted, ref, useAttrs, useId, watch, watchEffect } from "vue"
 import type { InputProps, OmegaFieldInternalApi } from "./InputProps"
 import type { FieldValidators, MetaRecord, NestedKeyOf, TypeOverride } from "./OmegaFormStuff"
 import OmegaInputVuetify from "./OmegaInputVuetify.vue"
@@ -31,7 +31,6 @@ const props = defineProps<{
   field: OmegaFieldInternalApi<From, Name>
   meta: MetaRecord<From>[NestedKeyOf<From>]
   label: string
-  options?: { title: string; value: string }[]
   type?: TypeOverride
   validators?: FieldValidators<From>
 }>()
@@ -160,8 +159,11 @@ const wrapField = (field: OmegaFieldInternalApi<From, Name>) => {
   return proxy3 as typeof field
 }
 
+const attrs = useAttrs()
+
 const inputProps: ComputedRef<InputProps<From, Name>> = computed(() => ({
   inputProps: {
+    ...attrs,
     id,
     required: props.meta?.required,
     minLength: props.meta?.type === "string" && props.meta?.minLength,
@@ -172,8 +174,7 @@ const inputProps: ComputedRef<InputProps<From, Name>> = computed(() => ({
     error: !!showedErrors.value.length,
     setRealDirty,
     type: fieldType.value,
-    label: `${props.label}${props.meta?.required ? " *" : ""}`,
-    options: props.options
+    label: `${props.label}${props.meta?.required ? " *" : ""}`
   },
 
   field: wrapField(props.field)

package/src/components/OmegaForm/OmegaWrapper.vue

@@ -16,7 +16,7 @@
   From extends Record<PropertyKey, any>,
   To extends Record<PropertyKey, any>,
   K extends keyof OmegaFormState<From, To> = keyof OmegaFormState<From, To>,
-  Props = DefaultInputProps<From>
+  Props = DefaultTypeProps
 "
 >
 /**
@@ -31,7 +31,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { useStore } from "@tanstack/vue-form"
 import { getOmegaStore } from "./getOmegaStore"
-import { type DefaultInputProps, type OmegaFormApi, type OmegaFormState } from "./OmegaFormStuff"
+import { type DefaultTypeProps, type OmegaFormApi, type OmegaFormState } from "./OmegaFormStuff"
 import { type OmegaFormReturn } from "./useOmegaForm"
 
 type OmegaWrapperProps = {

package/src/components/OmegaForm/createUseFormWithCustomInput.ts

@@ -1,15 +1,16 @@
 import type { DeepKeys } from "@tanstack/vue-form"
 import { type Component, h } from "vue"
 import type { MergedInputProps } from "./InputProps"
-import { type DefaultInputProps } from "./OmegaFormStuff"
+import { type DefaultTypeProps } from "./OmegaFormStuff"
 import OmegaInput from "./OmegaInput.vue"
 import { useOmegaForm } from "./useOmegaForm"
 
-export const createUseFormWithCustomInput = (CustomInputComponent: Component) => {
+export const createUseFormWithCustomInput = <
+  TypeProps = DefaultTypeProps
+>(CustomInputComponent: Component) => {
   return <
     From extends Record<PropertyKey, any>,
-    To extends Record<PropertyKey, any>,
-    Props = DefaultInputProps<From>
+    To extends Record<PropertyKey, any>
   >(
     ...args: Parameters<typeof useOmegaForm<From, To>>
   ) => {
@@ -33,7 +34,7 @@ export const createUseFormWithCustomInput = (CustomInputComponent: Component) =>
       }
     }
 
-    const form = useOmegaForm<From, To, Props>(
+    const form = useOmegaForm<From, To, TypeProps>(
       schema,
       tanstackFormOptions,
       {

package/src/components/OmegaForm/useOmegaForm.ts

@@ -13,7 +13,7 @@ import OmegaArray from "./OmegaArray.vue"
 import OmegaAutoGen from "./OmegaAutoGen.vue"
 import { buildOmegaErrors } from "./OmegaErrorsContext"
 import OmegaErrorsInternal from "./OmegaErrorsInternal.vue"
-import { DefaultInputProps, type FilterItems, type FormProps, generateMetaFromSchema, type MetaRecord, type NestedKeyOf, OmegaAutoGenMeta, OmegaError, type OmegaFormApi, OmegaFormState, OmegaInputProps, ShowErrorsOn } from "./OmegaFormStuff"
+import { BaseProps, DefaultTypeProps, type FilterItems, type FormProps, generateMetaFromSchema, type MetaRecord, type NestedKeyOf, OmegaAutoGenMeta, OmegaError, type OmegaFormApi, OmegaFormState, OmegaInputProps, ShowErrorsOn } from "./OmegaFormStuff"
 import OmegaInput from "./OmegaInput.vue"
 import OmegaForm from "./OmegaWrapper.vue"
 
@@ -133,7 +133,7 @@ type __VLS_PrettifyLocal<T> =
 export interface OmegaFormReturn<
   From extends Record<PropertyKey, any>,
   To extends Record<PropertyKey, any>,
-  Props = DefaultInputProps<From>
+  TypeProps = DefaultTypeProps
 > extends OF<From, To> {
   // this crazy thing here is copied from the OmegaFormInput.vue.d.ts, with `From` removed as Generic, instead closed over from the From generic above..
   Input: <Name extends DeepKeys<From>>(
@@ -151,10 +151,8 @@ export interface OmegaFormReturn<
             >,
             never
           >
-          & {
-            name: Name
-          }
-          & Props
+          & BaseProps<From, Name>
+          & TypeProps
           & Partial<{}>
         >
         & import("vue").PublicProps
@@ -589,12 +587,12 @@ export const useOmegaForm = <
   From extends Record<PropertyKey, any>,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   To extends Record<PropertyKey, any>,
-  Props = DefaultInputProps<From>
+  TypeProps = DefaultTypeProps
 >(
   schema: S.Schema<To, From, never>,
   tanstackFormOptions?: NoInfer<FormProps<From, To>>,
   omegaConfig?: OmegaConfig<To>
-): OmegaFormReturn<From, To, Props> => {
+): OmegaFormReturn<From, To, TypeProps> => {
   if (!schema) throw new Error("Schema is required")
   const standardSchema = S.standardSchemaV1(schema)
   const decode = S.decode(schema)