@effect-app/vue-components 0.12.22 → 0.13.1

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

@@ -1,6 +1,8 @@
 import type { DeepValue, DeepKeys, FieldApi, FormAsyncValidateOrFn, FormValidateOrFn, StandardSchemaV1, FieldValidateOrFn, FieldValidateFn, FieldValidateAsyncFn, FieldAsyncValidateOrFn } from "@tanstack/vue-form";
-export type OmegaFieldInternalApi<From, To> = FieldApi<From, DeepKeys<From>, DeepValue<From, any>, FieldValidateOrFn<From, DeepKeys<From>, DeepValue<From, any>> | undefined, StandardSchemaV1<unknown, To> | FieldValidateFn<From, any, To>, StandardSchemaV1<unknown, To> | FieldValidateAsyncFn<From, any, To>, FieldValidateOrFn<From, DeepKeys<From>, DeepValue<From, any>>, FieldAsyncValidateOrFn<From, DeepKeys<From>, DeepValue<From, any>>, FieldValidateOrFn<From, DeepKeys<From>, DeepValue<From, any>> | undefined, FieldAsyncValidateOrFn<From, DeepKeys<From>, DeepValue<From, any>> | undefined, FormValidateOrFn<From> | undefined, FormValidateOrFn<From> | undefined, any, FormValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined, FormValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined>;
-export type InputProps<T, S = unknown> = {
+export type OmegaFieldInternalApi<From extends Record<PropertyKey, any>, TName extends DeepKeys<From>> = FieldApi<From, TName, DeepValue<From, TName>, FieldValidateOrFn<From, TName, DeepValue<From, TName>> | undefined, StandardSchemaV1<DeepValue<From, TName>, unknown> | FieldValidateFn<From, TName>, StandardSchemaV1<DeepValue<From, TName>, unknown> | FieldValidateAsyncFn<From, TName>, FieldValidateOrFn<From, TName, DeepValue<From, TName>>, FieldAsyncValidateOrFn<From, TName, DeepValue<From, TName>>, FieldValidateOrFn<From, TName, DeepValue<From, TName>> | undefined, FieldAsyncValidateOrFn<From, TName, DeepValue<From, TName>> | undefined, FormValidateOrFn<From> | undefined, FormValidateOrFn<From> | undefined, any, // FormAsyncValidateOrFn<From>, 
+// FormAsyncValidateOrFn<From>, 
+FormValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined, FormValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined>;
+export type InputProps<From extends Record<PropertyKey, any>, TName extends DeepKeys<From>> = {
     id: string;
     required?: boolean;
     minLength?: number | false;
@@ -8,10 +10,10 @@ export type InputProps<T, S = unknown> = {
     max?: number | false;
     min?: number | false;
     name: string;
-    modelValue: S;
+    modelValue: DeepValue<From, TName>;
     errorMessages: string[];
     error: boolean;
-    field: OmegaFieldInternalApi<T, S>;
+    field: OmegaFieldInternalApi<From, TName>;
     setRealDirty: () => void;
     type: string;
     label: string;

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

@@ -1,6 +1,6 @@
 import { type OmegaInputProps } from "./OmegaFormStuff";
 import { type DeepValue, type DeepKeys } from "@tanstack/vue-form";
-declare const _default: <From, To>(__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 _default: <From extends Record<PropertyKey, string>, To extends Record<PropertyKey, string>>(__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> & (Omit<OmegaInputProps<From, To>, "type" | "label" | "items" | "options" | "validators"> & {
         items?: DeepValue<To, DeepKeys<To>>;
     }) & Partial<{}>> & import("vue").PublicProps;

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

@@ -1,8 +1,8 @@
 import { type OmegaInputProps } from "./OmegaFormStuff";
 import { Order } from "effect-app";
 import { DeepKeys } from "@tanstack/vue-form";
-export type OmegaAutoGenMeta<From, To> = Omit<OmegaInputProps<From, To>, "form">;
-declare const _default: <From, To>(__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<{
+export type OmegaAutoGenMeta<From extends Record<PropertyKey, string>, To extends Record<PropertyKey, string>> = Omit<OmegaInputProps<From, To>, "form">;
+declare const _default: <From extends Record<PropertyKey, string>, To extends Record<PropertyKey, string>>(__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> & {
         form: OmegaInputProps<From, To>["form"];
         pick?: DeepKeys<From>[];

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

@@ -1,9 +1,9 @@
 import type { FieldValidators, TypeOverride } from "./OmegaFormStuff";
 import type { InputProps } from "./InputProps";
 import { DeepKeys } from "@tanstack/vue-form";
-declare const _default: <From, To extends Record<PropertyKey, any>>(__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 _default: <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<Pick<Partial<{}> & Omit<{} & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, never>, never> & {
-        name: DeepKeys<From>;
+        name: Name;
         label: string;
         validators?: FieldValidators<From>;
         options?: {
@@ -15,7 +15,7 @@ declare const _default: <From, To extends Record<PropertyKey, any>>(__VLS_props:
     expose(exposed: import("vue").ShallowUnwrapRef<{}>): void;
     attrs: any;
     slots: {
-        default: InputProps<From, To>;
+        default(props: InputProps<From, Name>): void;
     };
     emit: {};
 }>) => import("vue").VNode & {

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

@@ -3,7 +3,7 @@ import { type FormAsyncValidateOrFn, type FormValidateOrFn, type StandardSchemaV
 import { OmegaFormReturn } from "./useOmegaForm";
 import { OmegaFieldInternalApi } from "./InputProps";
 export type ShowErrorsOn = "onChange" | "onBlur" | "onSubmit";
-export type OmegaInputProps<From, To> = {
+export type OmegaInputProps<From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>> = {
     form: OmegaFormReturn<From, To> & {
         meta: MetaRecord<From>;
     };
@@ -33,8 +33,8 @@ export type OmegaFormParams<From, To> = FormApi<From, FormValidateOrFn<From> | u
 export type OmegaFormState<From, To> = FormState<From, FormValidateOrFn<From> | undefined, FormValidateOrFn<From> | undefined, StandardSchemaV1<From, To>, FormValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined, FormValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined>;
 export type OmegaFormApi<From, To> = OmegaFormParams<From, To> & VueFormApi<From, FormValidateOrFn<From> | undefined, FormValidateOrFn<From> | undefined, StandardSchemaV1<From, To>, FormValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined, FormValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined>;
 export type FormComponent<T, S> = VueFormApi<T, FormValidateOrFn<T> | undefined, FormValidateOrFn<T> | undefined, StandardSchemaV1<T, S>, FormValidateOrFn<T> | undefined, FormAsyncValidateOrFn<T> | undefined, FormValidateOrFn<T> | undefined, FormAsyncValidateOrFn<T> | undefined, FormAsyncValidateOrFn<T> | undefined, FormAsyncValidateOrFn<T> | undefined>;
-export type FormType<T, S = unknown> = OmegaFormApi<T, S> & {
-    Field: OmegaFieldInternalApi<T, S>;
+export type FormType<From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, Name extends DeepKeys<From>> = OmegaFormApi<From, To> & {
+    Field: OmegaFieldInternalApi<From, Name>;
 };
 export type PrefixFromDepth<K extends string | number, _TDepth extends any[]> = K;
 export type NestedKeyOf<T> = DeepKeys<T>;

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

@@ -1,5 +1,5 @@
 import { type OmegaInputProps } from "./OmegaFormStuff";
-declare const _default: <From, To>(__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 _default: <From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>>(__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> & OmegaInputProps<From, To> & Partial<{}>> & import("vue").PublicProps;
     expose(exposed: import("vue").ShallowUnwrapRef<{}>): void;
     attrs: any;
@@ -12,7 +12,7 @@ declare const _default: <From, To>(__VLS_props: NonNullable<Awaited<typeof __VLS
             max?: number | false;
             min?: number | false;
             name: string;
-            modelValue: any;
+            modelValue: import("@tanstack/vue-form").DeepValue<From, any>;
             errorMessages: string[];
             error: boolean;
             field: import("./InputProps").OmegaFieldInternalApi<From, any>;

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

@@ -1,10 +1,11 @@
+import { DeepKeys } from "@tanstack/vue-form";
 import type { InputProps } from "./InputProps";
-declare const _default: <T, S>(__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 _default: <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<Pick<Partial<{}> & Omit<{
         readonly onBlur?: ((event: Event) => any) | undefined;
         readonly onFocus?: ((event: Event) => any) | undefined;
     } & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, never>, "onBlur" | "onFocus"> & {
-        inputProps: InputProps<T, S>;
+        inputProps: InputProps<From, Name>;
         vuetifyValue: unknown;
     } & Partial<{}>> & import("vue").PublicProps;
     expose(exposed: import("vue").ShallowUnwrapRef<{}>): void;

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

@@ -1,8 +1,9 @@
+import { DeepKeys } from "@tanstack/vue-form";
 import type { FieldValidators, MetaRecord, NestedKeyOf, TypeOverride } from "./OmegaFormStuff";
 import type { OmegaFieldInternalApi } from "./InputProps";
-declare const _default: <From, To>(__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 _default: <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<Pick<Partial<{}> & Omit<{} & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, never>, never> & {
-        field: OmegaFieldInternalApi<From, To>;
+        field: OmegaFieldInternalApi<From, Name>;
         meta: MetaRecord<From>[NestedKeyOf<From>];
         label: string;
         options?: {
@@ -23,10 +24,10 @@ declare const _default: <From, To>(__VLS_props: NonNullable<Awaited<typeof __VLS
             max?: number | false;
             min?: number | false;
             name: string;
-            modelValue: To;
+            modelValue: import("@tanstack/vue-form").DeepValue<From, Name>;
             errorMessages: string[];
             error: boolean;
-            field: OmegaFieldInternalApi<From, To>;
+            field: OmegaFieldInternalApi<From, Name>;
             setRealDirty: () => void;
             type: string;
             label: string;

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

@@ -1,7 +1,8 @@
+import { DeepKeys } from "@tanstack/vue-form";
 import { type Record, S } from "effect-app";
-import { type NestedKeyOf, type FilterItems, type FormProps, type MetaRecord, type OmegaFormApi } from "./OmegaFormStuff";
+import { type NestedKeyOf, type FilterItems, type FormProps, type MetaRecord, type OmegaFormApi, TypeOverride, FieldValidators } from "./OmegaFormStuff";
 import { type InjectionKey } from "vue";
-import OmegaFormInput from "./OmegaFormInput.vue";
+import { InputProps } from "./InputProps";
 type keysRule<T> = {
     keys?: NestedKeyOf<T>[];
     banKeys?: "You should only use one of banKeys or keys, not both, moron";
@@ -26,8 +27,30 @@ interface OF<From, To> extends OmegaFormApi<From, To> {
     clear: () => void;
 }
 export declare const OmegaFormKey: InjectionKey<OF<any, any>>;
-export interface OmegaFormReturn<From, To> extends OF<From, To> {
-    Input: typeof OmegaFormInput;
+type __VLS_PrettifyLocal<T> = {
+    [K in keyof T]: T[K];
+} & {};
+export interface OmegaFormReturn<From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>> 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;
+            label: string;
+            validators?: FieldValidators<From>;
+            options?: {
+                title: string;
+                value: string;
+            }[];
+            type?: TypeOverride;
+        } & Partial<{}>> & import("vue").PublicProps;
+        expose(exposed: import("vue").ShallowUnwrapRef<{}>): void;
+        attrs: any;
+        slots: {
+            default(props: InputProps<From, Name>): void;
+        };
+        emit: {};
+    }>) => import("vue").VNode & {
+        __ctx?: Awaited<typeof __VLS_setup>;
+    };
 }
 export declare const useOmegaForm: <From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>>(schema: S.Schema<To, From, never>, tanstackFormOptions?: NoInfer<FormProps<From, To>>, omegaConfig?: OmegaConfig<To>) => OmegaFormReturn<From, To>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "0.12.22",
+  "version": "0.13.1",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
     "@tanstack/vue-form": "^1.2.4",
@@ -50,8 +50,8 @@
   "dependencies": {
     "highlight.js": "^11.11.1",
     "vue3-highlightjs": "^1.0.5",
-    "effect-app": "3.0.9",
-    "@effect-app/vue": "2.51.10"
+    "@effect-app/vue": "2.51.10",
+    "effect-app": "3.0.9"
   },
   "scripts": {
     "build": "pnpm build:run",

package/src/components/OmegaForm/InputProps.ts

@@ -13,29 +13,40 @@ import type {
   FieldAsyncValidateOrFn,
 } from "@tanstack/vue-form"
 
-export type OmegaFieldInternalApi<From, To> = FieldApi<
-  From,
-  DeepKeys<From>,
-  DeepValue<From, any>,
-  FieldValidateOrFn<From, DeepKeys<From>, DeepValue<From, any>> | undefined,
-  StandardSchemaV1<unknown, To> | FieldValidateFn<From, any, To>,
-  StandardSchemaV1<unknown, To> | FieldValidateAsyncFn<From, any, To>,
-  FieldValidateOrFn<From, DeepKeys<From>, DeepValue<From, any>>,
-  FieldAsyncValidateOrFn<From, DeepKeys<From>, DeepValue<From, any>>,
-  FieldValidateOrFn<From, DeepKeys<From>, DeepValue<From, any>> | undefined,
-  FieldAsyncValidateOrFn<From, DeepKeys<From>, DeepValue<From, any>> | undefined,
-  FormValidateOrFn<From> | undefined,
-  FormValidateOrFn<From> | undefined,
-  any,
-  FormValidateOrFn<From> | undefined,
-  FormAsyncValidateOrFn<From> | undefined,
-  FormValidateOrFn<From> | undefined,
-  FormAsyncValidateOrFn<From> | undefined,
-  FormAsyncValidateOrFn<From> | undefined,
-  FormAsyncValidateOrFn<From> | undefined
+export type OmegaFieldInternalApi<From extends Record<PropertyKey, any>, TName extends DeepKeys<From>> = FieldApi<
+/* in out TParentData*/ From,
+/* in out TName*/ TName,
+/* in out TData*/  DeepValue<From, TName>,
+/* in out TOnMount*/  FieldValidateOrFn<From, TName, DeepValue<From, TName>> | undefined,
+/* in out TOnChange*/  StandardSchemaV1<DeepValue<From, TName>, unknown> | FieldValidateFn<From, TName>,
+/* in out TOnChangeAsync*/  StandardSchemaV1<DeepValue<From, TName>, unknown> | FieldValidateAsyncFn<From, TName>,
+/* in out TOnBlur*/  FieldValidateOrFn<From, TName, DeepValue<From, TName>>,
+/* in out TOnBlurAsync*/  FieldAsyncValidateOrFn<From, TName, DeepValue<From, TName>>,
+/* in out TOnSubmit*/  FieldValidateOrFn<From, TName, DeepValue<From, TName>> | undefined,
+/* in out TOnSubmitAsync*/  FieldAsyncValidateOrFn<From, TName, DeepValue<From, TName>> | undefined,
+/* in out TFormOnMount*/  FormValidateOrFn<From> | undefined,
+/* in out TFormOnChange*/  FormValidateOrFn<From> | undefined,
+// using `any` for now to silence:
+/*
+Type 'FieldApi<From, DeepKeys<From>, DeepValue<From, DeepKeys<From>>, FieldValidateOrFn<From, DeepKeys<From>, DeepValue<From, DeepKeys<...>>> | undefined, ... 14 more ..., FormAsyncValidateOrFn<...> | undefined>' is not assignable to type 'OmegaFieldInternalApi<From, any>'.
+  The types of 'form.options.defaultState' are incompatible between these types.
+    Type 'Partial<FormState<From, FormValidateOrFn<From> | undefined, FormValidateOrFn<From> | undefined, StandardSchemaV1<From, To>, ... 4 more ..., FormAsyncValidateOrFn<...> | undefined>> | undefined' is not assignable to type 'Partial<FormState<From, FormValidateOrFn<From> | undefined, FormValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From>, ... 4 more ..., FormAsyncValidateOrFn<...> | undefined>> | undefined'.
+      Type 'Partial<FormState<From, FormValidateOrFn<From> | undefined, FormValidateOrFn<From> | undefined, StandardSchemaV1<From, To>, ... 4 more ..., FormAsyncValidateOrFn<...> | undefined>>' is not assignable to type 'Partial<FormState<From, FormValidateOrFn<From> | undefined, FormValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From>, ... 4 more ..., FormAsyncValidateOrFn<...> | undefined>>'.
+        Types of property 'errorMap' are incompatible.
+          Type 'FormValidationErrorMap<undefined, undefined, Record<string, StandardSchemaV1Issue[]>, undefined, undefined, undefined, undefined, undefined> | undefined' is not assignable to type 'FormValidationErrorMap<undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined> | undefined'.
+            Type 'FormValidationErrorMap<undefined, undefined, Record<string, StandardSchemaV1Issue[]>, undefined, undefined, undefined, undefined, undefined>' is not assignable to type 'FormValidationErrorMap<undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined>'.
+              Type 'Record<string, StandardSchemaV1Issue[]>' is not assignable to type 'undefined'.
+*/
+/* in out TFormOnChangeAsync*/ any, // FormAsyncValidateOrFn<From>, 
+/* in out TFormOnBlur*/  FormValidateOrFn<From> | undefined,
+/* in out TFormOnBlurAsync*/  FormAsyncValidateOrFn<From> | undefined,
+/* in out TFormOnSubmit*/  FormValidateOrFn<From> | undefined,
+/* in out TFormOnSubmitAsync*/  FormAsyncValidateOrFn<From> | undefined,
+/* in out TFormOnServer*/  FormAsyncValidateOrFn<From> | undefined,
+/* in out TParentSubmitMeta*/  FormAsyncValidateOrFn<From> | undefined
 >
 
-export type InputProps<T, S = unknown> = {
+export type InputProps<From extends Record<PropertyKey, any>, TName extends DeepKeys<From>> = {
   id: string
   required?: boolean
   minLength?: number | false
@@ -43,10 +54,10 @@ export type InputProps<T, S = unknown> = {
   max?: number | false
   min?: number | false
   name: string
-  modelValue: S
+  modelValue: DeepValue<From, TName>
   errorMessages: string[]
   error: boolean
-  field: OmegaFieldInternalApi<T, S>
+  field: OmegaFieldInternalApi<From, TName>
   setRealDirty: () => void
   type: string
   label: string

package/src/components/OmegaForm/OmegaArray.vue

@@ -25,7 +25,7 @@
   </component>
 </template>
 
-<script setup lang="ts" generic="From, To">
+<script setup lang="ts" generic="From extends Record<PropertyKey, string>, To extends Record<PropertyKey, string>">
 import { computed, onMounted, provide } from "vue"
 import {
   type CreateMeta,

package/src/components/OmegaForm/OmegaAutoGen.vue

@@ -7,7 +7,7 @@
   </slot>
 </template>
 
-<script setup lang="ts" generic="From, To">
+<script setup lang="ts" generic="From extends Record<PropertyKey, string>, To extends Record<PropertyKey, string>">
 import { computed } from "vue"
 import {
   type NestedKeyOf,
@@ -21,7 +21,7 @@ import OmegaInput from "./OmegaInput.vue"
 import { DeepKeys } from "@tanstack/vue-form"
 import { OmegaFormReturn } from "./useOmegaForm"
 
-export type OmegaAutoGenMeta<From, To> = Omit<OmegaInputProps<From, To>, "form">
+export type OmegaAutoGenMeta<From extends Record<PropertyKey, string>, To extends Record<PropertyKey, string>> = Omit<OmegaInputProps<From, To>, "form">
 type NewMeta = OmegaAutoGenMeta<From, To>
 
 const mapObject =

package/src/components/OmegaForm/OmegaFormInput.vue

@@ -14,7 +14,7 @@
   </OmegaInput>
 </template>
 
-<script setup lang="ts" generic="From, To extends Record<PropertyKey, any>">
+<script setup lang="ts" generic="From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, Name extends DeepKeys<From>">
 import { inject } from "vue"
 import type {
   FieldValidators,
@@ -33,7 +33,7 @@ if (!form) {
 }
 
 defineProps<{
-  name: DeepKeys<From>
+  name: Name
   label: string
   validators?: FieldValidators<From>
   options?: { title: string; value: string }[]
@@ -41,7 +41,6 @@ defineProps<{
 }>()
 
 defineSlots<{
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  default: InputProps<From, To>
+  default(props: InputProps<From, Name>): void
 }>()
 </script>

package/src/components/OmegaForm/OmegaFormStuff.ts

@@ -18,7 +18,7 @@ import { OmegaFieldInternalApi } from "./InputProps"
 
 export type ShowErrorsOn = "onChange" | "onBlur" | "onSubmit"
 
-export type OmegaInputProps<From, To> = {
+export type OmegaInputProps<From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>> = {
   form: OmegaFormReturn<From, To> & {
     meta: MetaRecord<From>
   }
@@ -123,8 +123,8 @@ export type FormComponent<T, S> = VueFormApi<
   FormAsyncValidateOrFn<T> | undefined
 >
 
-export type FormType<T, S = unknown> = OmegaFormApi<T, S> & {
-  Field: OmegaFieldInternalApi<T, S>
+export type FormType<From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, Name extends DeepKeys<From>> = OmegaFormApi<From, To> & {
+  Field: OmegaFieldInternalApi<From, Name>
 }
 
 export type PrefixFromDepth<

package/src/components/OmegaForm/OmegaInput.vue

@@ -25,7 +25,7 @@
   </component>
 </template>
 
-<script setup lang="ts" generic="From, To">
+<script setup lang="ts" generic="From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>">
 import { computed, inject, type Ref } from "vue"
 import {
   type FieldMeta,

package/src/components/OmegaForm/OmegaInputVuetify.vue

@@ -64,9 +64,9 @@
       @update:model-value="
         (e: any) => {
           if (e || e === 0) {
-              inputProps.field.handleChange(Number(e))
+              inputProps.field.handleChange(Number(e) as any)
           } else {
-            inputProps.field.handleChange(undefined)
+            inputProps.field.handleChange(undefined as any)
           }
         }
       "
@@ -85,7 +85,7 @@
       :error="inputProps.error"
       v-bind="$attrs"
       :model-value="vuetifyValue"
-      @clear="inputProps.field.handleChange(undefined)"
+      @clear="inputProps.field.handleChange(undefined as any)"
       @update:model-value="inputProps.field.handleChange"
     />
 
@@ -106,17 +106,18 @@
       :chips="inputProps.type === 'autocompletemultiple'"
       v-bind="$attrs"
       :model-value="vuetifyValue"
-      @clear="inputProps.field.handleChange(undefined)"
+      @clear="inputProps.field.handleChange(undefined as any)"
       @update:model-value="inputProps.field.handleChange"
     />
   </div>
 </template>
 
-<script setup lang="ts" generic="T, S">
+<script setup lang="ts" generic="From extends Record<PropertyKey, any>, Name extends DeepKeys<From>">
+import { DeepKeys } from "@tanstack/vue-form";
 import type { InputProps } from "./InputProps"
 
 defineProps<{
-  inputProps: InputProps<T, S>
+  inputProps: InputProps<From, Name>
   vuetifyValue: unknown
 }>()
 

package/src/components/OmegaForm/OmegaInternalInput.vue

@@ -11,8 +11,8 @@
   </slot>
 </template>
 
-<script setup lang="ts" generic="From, To">
-import { useStore } from "@tanstack/vue-form"
+<script setup lang="ts" generic="From extends Record<PropertyKey, any>, Name extends DeepKeys<From>">
+import { DeepKeys, useStore } from "@tanstack/vue-form"
 import {
   useId,
   computed,
@@ -39,7 +39,7 @@ defineOptions({
 })
 
 const props = defineProps<{
-  field: OmegaFieldInternalApi<From, To>
+  field: OmegaFieldInternalApi<From, Name>
   meta: MetaRecord<From>[NestedKeyOf<From>]
   label: string
   options?: { title: string; value: string }[]
@@ -83,7 +83,7 @@ watch(
     if (isFalsyButNotZero(fieldValue.value) && props.meta?.type !== "boolean") {
       nextTick(() => {
         fieldApi.setValue(
-          props.meta?.nullableOrUndefined === "undefined" ? undefined : null,
+          props.meta?.nullableOrUndefined === "undefined" ? undefined : null as any,
         )
       })
     }
@@ -96,7 +96,7 @@ onMounted(() => {
     !props.meta?.required &&
     props.meta?.nullableOrUndefined === "null"
   ) {
-    fieldApi.setValue(null)
+    fieldApi.setValue(null as any)
   }
 })
 const { addError, removeError, showErrors, showErrorsOn } = useOmegaErrors()
@@ -143,7 +143,7 @@ watch(
   },
 )
 
-const inputProps: ComputedRef<InputProps<From, To>> = computed(() => ({
+const inputProps: ComputedRef<InputProps<From, Name>> = computed(() => ({
   id,
   required: props.meta?.required,
   minLength: props.meta?.type === "string" && props.meta?.minLength,

package/src/components/OmegaForm/useOmegaForm.ts

@@ -4,6 +4,7 @@ import {
   type FormValidateOrFn,
   type FormAsyncValidateOrFn,
   type StandardSchemaV1,
+  DeepKeys,
 } from "@tanstack/vue-form"
 import { type Record, S } from "effect-app"
 import {
@@ -13,6 +14,8 @@ import {
   type FormProps,
   type MetaRecord,
   type OmegaFormApi,
+  TypeOverride,
+  FieldValidators,
 } from "./OmegaFormStuff"
 import {
   computed,
@@ -24,7 +27,7 @@ import {
 } from "vue"
 import { isObject } from "effect/Predicate"
 import OmegaFormInput from "./OmegaFormInput.vue"
-import { OmegaFieldInternalApi } from "./InputProps"
+import { InputProps, OmegaFieldInternalApi } from "./InputProps"
 
 type keysRule<T> =
   | {
@@ -56,15 +59,39 @@ interface OF<From, To> extends OmegaFormApi<From, To> {
 
 export const OmegaFormKey = Symbol("OmegaForm") as InjectionKey<OF<any, any>>
 
-export interface OmegaFormReturn<From, To> extends OF<From, To> {
-  Input: typeof OmegaFormInput
+type __VLS_PrettifyLocal<T> = {
+    [K in keyof T]: T[K];
+} & {};
+
+export interface OmegaFormReturn<From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>> 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>>(__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;
+        label: string;
+        validators?: FieldValidators<From>;
+        options?: {
+            title: string;
+            value: string;
+        }[];
+        type?: TypeOverride;
+    } & Partial<{}>> & import("vue").PublicProps;
+    expose(exposed: import("vue").ShallowUnwrapRef<{}>): void;
+    attrs: any;
+    slots: {
+        default(props: InputProps<From, Name>): void;
+    };
+    emit: {};
+}>) => import("vue").VNode & {
+    __ctx?: Awaited<typeof __VLS_setup>;
+};
 }
 
 export const useOmegaForm = <
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   From extends Record<PropertyKey, any>,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  To extends Record<PropertyKey, any>
+  To extends Record<PropertyKey, any>,
 >(
   schema: S.Schema<To, From, never>,
   tanstackFormOptions?: NoInfer<FormProps<From, To>>,
@@ -287,6 +314,6 @@ export const useOmegaForm = <
 
   return Object.assign(formWithExtras, {
     Input: OmegaFormInput,
-    Field: form.Field as unknown as OmegaFieldInternalApi<From, To>,
+    Field: form.Field
   })
 }