@teamnovu/kit-vue-forms 0.2.4 → 0.2.6

package/dist/components/Field.vue.d.ts

@@ -3,11 +3,11 @@ import { Paths, PickProps } from '../types/util.ts';
 import { UseFieldOptions } from '../composables/useField.ts';
 import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode } from 'vue';
 import { ValidationErrors, ErrorMessage } from '../index.js';
-export interface FieldProps<TData extends object, TPath extends string> extends UseFieldOptions<PickProps<TData, TPath>, TPath> {
-    form: Form<TData>;
+export interface FieldProps<TData extends object, TPath extends string, TDataOut = TData> extends UseFieldOptions<PickProps<TData, TPath>, TPath> {
+    form: Form<TData, TDataOut>;
 }
-declare const _default: <TData extends object, TPath extends Paths<TData>>(__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<{} & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>, never> & FieldProps<TData, TPath> & Partial<{}>> & PublicProps;
+declare const _default: <TData extends object, TPath extends Paths<TData>, TDataOut = TData>(__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<{} & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>, never> & FieldProps<TData, TPath, TDataOut> & Partial<{}>> & PublicProps;
     expose(exposed: ShallowUnwrapRef<{}>): void;
     attrs: any;
     slots: {

package/dist/components/FormFieldWrapper.vue.d.ts

@@ -1,15 +1,15 @@
 import { Component, VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode } from 'vue';
 import { ComponentProps } from 'vue-component-type-helpers';
 import { Paths } from '../types/util.ts';
-import { Form } from '../types/form.ts';
-export interface FormFieldWrapperProps<TData extends object, TPath extends string, TComponent> {
+import { Form, FormDataDefault } from '../types/form.ts';
+export interface FormFieldWrapperProps<TForm extends Form<FormDataDefault, unknown>, TPath extends string, TComponent> {
     component: TComponent;
     componentProps: Omit<ComponentProps<TComponent>, 'modelValue' | 'update:modelValue' | 'errors'>;
-    form: Form<TData>;
+    form: TForm;
     path: TPath;
 }
-declare const _default: <TData extends object, TPath extends Paths<TData>, TComponent extends Component>(__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<{} & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>, never> & FormFieldWrapperProps<TData, TPath, TComponent> & Partial<{}>> & PublicProps;
+declare const _default: <TForm extends Form<FormDataDefault, unknown>, TPath extends Paths<TForm extends Form<infer Data> ? Data : never>, TComponent extends Component>(__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<{} & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>, never> & FormFieldWrapperProps<TForm, TPath, TComponent> & Partial<{}>> & PublicProps;
     expose(exposed: ShallowUnwrapRef<{}>): void;
     attrs: any;
     slots: Partial<Record<number, (_: any) => any>> & {

package/dist/components/FormPart.vue.d.ts

@@ -1,12 +1,12 @@
 import { Form } from '../types/form.ts';
 import { EntityPaths, PickEntity } from '../types/util.ts';
 import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode } from 'vue';
-export interface FormPartProps<TData extends object, TPath> {
-    form: Form<TData>;
+export interface FormPartProps<TData extends object, TPath, TDataOut = TData> {
+    form: Form<TData, TDataOut>;
     path: TPath;
 }
-declare const _default: <TData extends object, TPath extends EntityPaths<TData>>(__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<{} & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>, never> & FormPartProps<TData, TPath> & Partial<{}>> & PublicProps;
+declare const _default: <TData extends object, TPath extends EntityPaths<TData>, TDataOut = TData>(__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<{} & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>, never> & FormPartProps<TData, TPath, TDataOut> & Partial<{}>> & PublicProps;
     expose(exposed: ShallowUnwrapRef<{}>): void;
     attrs: any;
     slots: {

package/dist/composables/useForm.d.ts

@@ -9,7 +9,7 @@ export interface UseFormOptions<T extends FormDataDefault, TOut = T> extends Val
     keepValuesOnUnmount?: MaybeRef<boolean>;
 }
 export declare function useForm<T extends FormDataDefault, TOut = T>(options: UseFormOptions<T, TOut> & {
-    schema: MaybeRef<z.ZodType<TOut, T>>;
+    schema: MaybeRef<z.ZodType<TOut, unknown>>;
 }): Form<T, TOut>;
 export declare function useForm<T extends FormDataDefault>(options: Omit<UseFormOptions<T, T>, 'schema'> & {
     schema?: undefined;

package/dist/composables/useValidation.d.ts

@@ -4,7 +4,7 @@ import { FormDataDefault } from '../types/form';
 import { ErrorBag, ValidationFunction, ValidationResult, Validator } from '../types/validation';
 import { ValidationErrors } from '..';
 export interface ValidatorOptions<T, TOut = T> {
-    schema?: MaybeRef<z.ZodType<TOut, T> | undefined>;
+    schema?: MaybeRef<z.ZodType<TOut, unknown> | undefined>;
     validateFn?: MaybeRef<ValidationFunction<T, TOut> | undefined>;
 }
 export interface ValidationOptions<T, TOut = T> extends ValidatorOptions<T, TOut> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamnovu/kit-vue-forms",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "",
   "main": "dist/index.js",
   "type": "module",

package/src/components/Field.vue

@@ -4,18 +4,22 @@
 
 <script
   setup lang="ts"
-  generic="TData extends object, TPath extends Paths<TData>"
+  generic="TData extends object, TPath extends Paths<TData>, TDataOut = TData"
 >
 import { reactive } from 'vue'
 import type { Form } from '../types/form.ts'
 import type { Paths, PickProps } from '../types/util.ts'
 import type { UseFieldOptions } from '../composables/useField.ts'
 
-export interface FieldProps<TData extends object, TPath extends string> extends UseFieldOptions<PickProps<TData, TPath>, TPath> {
-  form: Form<TData>
+export interface FieldProps<
+  TData extends object,
+  TPath extends string,
+  TDataOut = TData,
+> extends UseFieldOptions<PickProps<TData, TPath>, TPath> {
+  form: Form<TData, TDataOut>
 }
 
-const props = defineProps<FieldProps<TData, TPath>>()
+const props = defineProps<FieldProps<TData, TPath, TDataOut>>()
 
 const field = props.form.defineField({
   path: props.path,

package/src/components/FormFieldWrapper.vue

@@ -28,17 +28,25 @@
 <script
   setup
   lang="ts"
-  generic="TData extends object, TPath extends Paths<TData>, TComponent extends Component"
+  generic="
+    TForm extends Form<FormDataDefault, unknown>,
+    TPath extends Paths<TForm extends Form<infer Data> ? Data : never>,
+    TComponent extends Component
+  "
 >
 import { type Component } from 'vue'
 import type { ComponentProps } from 'vue-component-type-helpers'
 import type { Paths } from '../types/util.ts'
-import type { Form } from '../types/form.ts'
+import type { Form, FormDataDefault } from '../types/form.ts'
 
-export interface FormFieldWrapperProps<TData extends object, TPath extends string, TComponent> {
+export interface FormFieldWrapperProps<
+  TForm extends Form<FormDataDefault, unknown>,
+  TPath extends string,
+  TComponent,
+> {
   component: TComponent
   componentProps: Omit<ComponentProps<TComponent>, 'modelValue' | 'update:modelValue' | 'errors'>
-  form: Form<TData>
+  form: TForm
   path: TPath
 }
 
@@ -46,5 +54,5 @@ defineOptions({
   inheritAttrs: false,
 })
 
-defineProps<FormFieldWrapperProps<TData, TPath, TComponent>>()
+defineProps<FormFieldWrapperProps<TForm, TPath, TComponent>>()
 </script>

package/src/components/FormPart.vue

@@ -5,18 +5,18 @@
 <script
   setup
   lang="ts"
-  generic="TData extends object, TPath extends EntityPaths<TData>"
+  generic="TData extends object, TPath extends EntityPaths<TData>, TDataOut = TData"
 >
 import { computed } from 'vue'
 import type { Form } from '../types/form.ts'
 import type { EntityPaths } from '../types/util.ts'
 
-export interface FormPartProps<TData extends object, TPath> {
-  form: Form<TData>
+export interface FormPartProps<TData extends object, TPath, TDataOut = TData> {
+  form: Form<TData, TDataOut>
   path: TPath
 }
 
-const props = defineProps<FormPartProps<TData, TPath>>()
+const props = defineProps<FormPartProps<TData, TPath, TDataOut>>()
 
 const subform = computed(() => props.form.getSubForm(props.path))
 </script>

package/src/composables/useForm.ts

@@ -33,7 +33,7 @@ export interface UseFormOptions<T extends FormDataDefault, TOut = T>
 export function useForm<
   T extends FormDataDefault,
   TOut = T,
->(options: UseFormOptions<T, TOut> & { schema: MaybeRef<z.ZodType<TOut, T>> }): Form<T, TOut>
+>(options: UseFormOptions<T, TOut> & { schema: MaybeRef<z.ZodType<TOut, unknown>> }): Form<T, TOut>
 
 // Overload: without schema - infer types from initialData
 export function useForm<T extends FormDataDefault>(

package/src/composables/useValidation.ts

@@ -6,7 +6,7 @@ import { hasErrors, isValidResult, mergeErrors } from '../utils/validation'
 import { flattenError } from '../utils/zod'
 
 export interface ValidatorOptions<T, TOut = T> {
-  schema?: MaybeRef<z.ZodType<TOut, T> | undefined>
+  schema?: MaybeRef<z.ZodType<TOut, unknown> | undefined>
   validateFn?: MaybeRef<ValidationFunction<T, TOut> | undefined>
 }