@teamnovu/kit-vue-forms 0.0.8 → 0.0.10

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

@@ -1,7 +1,7 @@
 import { Form } from '../types/form.ts';
 import { Paths, PickProps } from '../types/util.ts';
 import { UseFieldOptions } from '../composables/useField.ts';
-import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, Ref, VNode } from 'vue';
+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>;
@@ -12,12 +12,12 @@ declare const _default: <TData extends object, TPath extends Paths<TData>>(__VLS
     attrs: any;
     slots: {
         default?(_: {
-            data: Ref<PickProps<TData, TPath>, PickProps<TData, TPath>>;
-            path: Ref<TPath, TPath>;
-            initialValue: Readonly< Ref<PickProps<TData, TPath>, PickProps<TData, TPath>>>;
-            errors: Ref<ValidationErrors>;
-            touched: Ref<boolean>;
-            dirty: Ref<boolean>;
+            data: PickProps<TData, TPath>;
+            path: TPath;
+            initialValue: PickProps<TData, TPath>;
+            errors: ValidationErrors;
+            touched: boolean;
+            dirty: boolean;
             setData: (newData: PickProps<TData, TPath>) => void;
             onBlur: () => void;
             onFocus: () => void;

package/dist/composables/useFieldRegistry.d.ts

@@ -1,19 +1,19 @@
-import { FormDataDefault, FormField } from '../types/form';
+import { FieldsTuple, FormDataDefault, FormField } from '../types/form';
 import { Paths, PickProps } from '../types/util';
 import { UseFieldOptions } from './useField';
 type FieldRegistryCache<T> = Record<Paths<T>, FormField<any, string>>;
 export type ResolvedFormField<T, K extends Paths<T>> = FormField<PickProps<T, K>, K>;
-export type DefineFieldOptions<F, K extends string> = Pick<UseFieldOptions<F, K>, 'path' | 'type' | 'required'>;
+export type DefineFieldOptions<F, K extends string> = Pick<UseFieldOptions<F, K>, 'path'>;
 interface FormState<T extends FormDataDefault, TIn extends FormDataDefault = T> {
     data: T;
     initialData: TIn;
 }
 export declare function useFieldRegistry<T extends FormDataDefault>(formState: FormState<T>): {
     fields: FieldRegistryCache<T>;
-    getField: <K extends Paths<T>>(path: K) => ResolvedFormField<T, K> | undefined;
-    getFields: () => ResolvedFormField<T, Paths<T>>[];
+    getField: <K extends Paths<T>>(path: K) => ResolvedFormField<T, K>;
+    getFields: <TData extends T>() => FieldsTuple<TData>;
     registerField: <K extends Paths<T>>(field: ResolvedFormField<T, K>) => void;
-    defineField: <K extends Paths<T>>(options: DefineFieldOptions<PickProps<T, K>, K>) => FormField<PickProps<any, K>, K>;
+    defineField: <K extends Paths<T>>(options: DefineFieldOptions<PickProps<T, K>, K>) => FormField<K extends `${infer TRoot}.${infer TRest}` ? TRoot extends string | number | symbol ? TRest extends string ? TRest extends infer T_1 ? T_1 extends TRest ? T_1 extends `${infer TRoot}.${infer TRest}` ? TRoot extends string | number | symbol ? TRest extends string ? TRest extends infer T_2 ? T_2 extends TRest ? T_2 extends `${infer TRoot}.${infer TRest}` ? TRoot extends string | number | symbol ? TRest extends string ? TRest extends infer T_3 ? T_3 extends TRest ? T_3 extends `${infer TRoot}.${infer TRest}` ? TRoot extends string | number | symbol ? TRest extends string ? TRest extends infer T_4 ? T_4 extends TRest ? T_4 extends `${infer TRoot}.${infer TRest}` ? TRoot extends string | number | symbol ? TRest extends string ? TRest extends infer T_5 ? T_5 extends TRest ? T_5 extends `${infer TRoot}.${infer TRest}` ? TRoot extends string | number | symbol ? TRest extends string ? TRest extends infer T_6 ? T_6 extends TRest ? T_6 extends `${infer TRoot}.${infer TRest}` ? TRoot extends string | number | symbol ? TRest extends string ? TRest extends infer T_7 ? T_7 extends TRest ? T_7 extends `${infer TRoot}.${infer TRest}` ? TRoot extends string | number | symbol ? TRest extends string ? TRest extends infer T_8 ? T_8 extends TRest ? T_8 extends `${infer TRoot}.${infer TRest}` ? TRoot extends string | number | symbol ? TRest extends string ? TRest extends infer T_9 ? T_9 extends TRest ? T_9 extends `${infer TRoot}.${infer TRest}` ? TRoot extends string | number | symbol ? TRest extends string ? TRest extends infer T_10 ? T_10 extends TRest ? T_10 extends `${infer TRoot}.${infer TRest}` ? TRoot extends string | number | symbol ? TRest extends string ? /*elided*/ any : never : TRoot extends `${number}` ? never : never : T_10 extends string | number | symbol ? Required<any>[T_10] : T_10 extends `${number}` ? never : never : never : never : never : TRoot extends `${number}` ? never : never : T_9 extends string | number | symbol ? Required<any>[T_9] : T_9 extends `${number}` ? never : never : never : never : never : TRoot extends `${number}` ? never : never : T_8 extends string | number | symbol ? Required<any>[T_8] : T_8 extends `${number}` ? never : never : never : never : never : TRoot extends `${number}` ? never : never : T_7 extends string | number | symbol ? Required<any>[T_7] : T_7 extends `${number}` ? never : never : never : never : never : TRoot extends `${number}` ? never : never : T_6 extends string | number | symbol ? Required<any>[T_6] : T_6 extends `${number}` ? never : never : never : never : never : TRoot extends `${number}` ? never : never : T_5 extends string | number | symbol ? Required<any>[T_5] : T_5 extends `${number}` ? never : never : never : never : never : TRoot extends `${number}` ? never : never : T_4 extends string | number | symbol ? Required<any>[T_4] : T_4 extends `${number}` ? never : never : never : never : never : TRoot extends `${number}` ? never : never : T_3 extends string | number | symbol ? Required<any>[T_3] : T_3 extends `${number}` ? never : never : never : never : never : TRoot extends `${number}` ? never : never : T_2 extends string | number | symbol ? Required<any>[T_2] : T_2 extends `${number}` ? never : never : never : never : never : TRoot extends `${number}` ? never : never : T_1 extends string | number | symbol ? Required<any>[T_1] : T_1 extends `${number}` ? never : never : never : never : never : TRoot extends `${number}` ? never : never : K extends string | number | symbol ? any : K extends `${number}` ? never : never, K>;
 };
 export type FieldRegistry<T extends FormDataDefault> = ReturnType<typeof useFieldRegistry<T>>;
 export {};

package/dist/composables/useValidation.d.ts

@@ -16,7 +16,7 @@ export declare function useValidation<T extends FormDataDefault>(formState: {
     data: T;
 }, options: ValidationOptions<T>): {
     validateForm: () => Promise<ValidationResult>;
-    defineValidator: (options: ValidatorOptions<T> | Ref<Validator<T>>) => Ref<Validator<T> | undefined, Validator<T> | undefined>;
+    defineValidator: <TData extends T>(options: ValidatorOptions<TData> | Ref<Validator<TData>>) => Ref<Validator<TData> | undefined, Validator<TData> | undefined>;
     isValid: ComputedRef<boolean>;
     validators: Ref<Ref<Validator<T> | undefined, Validator<T> | undefined>[], Ref<Validator<T> | undefined, Validator<T> | undefined>[]>;
     isValidated: Ref<boolean, boolean>;

package/dist/index.mjs

@@ -1,22 +1,22 @@
 var x = Object.defineProperty;
 var K = (e, r, t) => r in e ? x(e, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[r] = t;
-var R = (e, r, t) => K(e, typeof r != "symbol" ? r + "" : r, t);
-import { toValue as W, toRaw as q, computed as d, unref as c, reactive as b, watch as F, toRefs as O, toRef as S, ref as A, isRef as _, getCurrentScope as I, onBeforeUnmount as J, defineComponent as T, renderSlot as B, normalizeProps as G, guardReactiveProps as L } from "vue";
+var S = (e, r, t) => K(e, typeof r != "symbol" ? r + "" : r, t);
+import { toValue as W, toRaw as I, computed as d, unref as c, reactive as m, watch as F, toRefs as O, toRef as D, ref as A, isRef as _, getCurrentScope as J, onBeforeUnmount as T, defineComponent as B, renderSlot as G, normalizeProps as L, guardReactiveProps as U } from "vue";
 import "zod";
 function y(e) {
-  const r = W(e), t = q(r);
+  const r = W(e), t = I(r);
   return structuredClone(t);
 }
 function N(e) {
   return e === "" ? [] : e.split(/\s*\.\s*/).filter(Boolean);
 }
-function m(e, r) {
+function w(e, r) {
   return (Array.isArray(r) ? r : N(r)).reduce(
     (a, s) => a == null ? void 0 : a[s],
     e
   );
 }
-function U(e, r, t) {
+function Z(e, r, t) {
   const a = Array.isArray(r) ? r : N(r);
   if (a.length === 0)
     throw new Error("Path cannot be empty");
@@ -29,16 +29,16 @@ function U(e, r, t) {
 }
 const z = (e, r) => d({
   get() {
-    return m(c(e), c(r));
+    return w(c(e), c(r));
   },
   set(t) {
-    U(c(e), c(r), t);
+    Z(c(e), c(r), t);
   }
 });
 function E(e, r) {
   return !e && !r ? "" : !e && r ? r : !r && e ? e : `${e}.${r}`;
 }
-function Z(e, r) {
+function k(e, r) {
   if (!r)
     return e;
   const t = `${r}.`, a = Object.fromEntries(
@@ -52,8 +52,8 @@ function Z(e, r) {
     propertyErrors: a
   };
 }
-function k(e) {
-  const r = b({
+function q(e) {
+  const r = m({
     value: e.value,
     path: e.path,
     initialValue: d(() => Object.freeze(y(e.initialValue))),
@@ -97,14 +97,14 @@ function H(e) {
   };
   return {
     fields: r,
-    getField: (u) => r[u],
+    getField: (u) => r[u] ?? {},
     getFields: () => Object.values(r),
     registerField: t,
     defineField: (u) => {
-      const v = k({
+      const v = q({
         ...u,
-        value: z(S(e, "data"), u.path),
-        initialValue: d(() => m(e.initialData, c(u.path)))
+        value: z(D(e, "data"), u.path),
+        initialValue: d(() => w(e.initialData, c(u.path)))
       });
       return t(v), v;
     }
@@ -144,7 +144,7 @@ function Y(...e) {
     };
   }, {});
 }
-function D(...e) {
+function P(...e) {
   if (!e.length)
     return {
       general: [],
@@ -227,8 +227,8 @@ class tr {
 }
 class ar {
   constructor(r, t) {
-    R(this, "schemaValidator");
-    R(this, "functionValidator");
+    S(this, "schemaValidator");
+    S(this, "functionValidator");
     this.schema = r, this.validateFn = t, this.schemaValidator = new er(this.schema), this.functionValidator = new tr(this.validateFn);
   }
   async validate(r) {
@@ -238,19 +238,19 @@ class ar {
     ]);
     return {
       isValid: t.isValid && a.isValid,
-      errors: D(t.errors, a.errors)
+      errors: P(t.errors, a.errors)
     };
   }
 }
-function P(e) {
+function b(e) {
   return d(() => new ar(
     c(e.schema),
     c(e.validateFn)
   ));
 }
 function sr(e, r) {
-  const t = b({
-    validators: A([P(r)]),
+  const t = m({
+    validators: A([b(r)]),
     isValidated: !1,
     errors: c(r.errors) ?? V.errors
   });
@@ -272,8 +272,8 @@ function sr(e, r) {
     t.isValidated && u();
   });
   const a = (o) => {
-    const l = _(o) ? o : P(o);
-    return t.validators.push(l), I() && J(() => {
+    const l = _(o) ? o : b(o);
+    return t.validators.push(l), J() && T(() => {
       t.validators = t.validators.filter(
         (f) => f !== l
       );
@@ -285,8 +285,8 @@ function sr(e, r) {
     ), l = o.every((p) => p.isValid);
     let { errors: f } = V;
     if (!l) {
-      const p = o.map((w) => w.errors);
-      f = D(...p);
+      const p = o.map((R) => R.errors);
+      f = P(...p);
     }
     return {
       errors: f,
@@ -294,7 +294,7 @@ function sr(e, r) {
     };
   }
   const n = (o) => {
-    t.errors = D(c(r.errors) ?? V.errors, o);
+    t.errors = P(c(r.errors) ?? V.errors, o);
   }, u = async () => {
     const o = await s();
     return n(o.errors), t.isValidated = !0, {
@@ -314,7 +314,7 @@ class ir {
     this.path = r, this.validator = t;
   }
   async validate(r) {
-    const t = m(r, this.path);
+    const t = w(r, this.path);
     if (!this.validator)
       return V;
     const a = await this.validator.validate(t);
@@ -333,7 +333,7 @@ class ir {
   }
 }
 function nr(e, r, t) {
-  const a = z(e.data, r), s = d(() => m(e.initialData.value, r)), n = (i) => ({
+  const a = z(e.data, r), s = d(() => w(e.initialData.value, r)), n = (i) => ({
     ...i,
     path: d(() => c(i.path).replace(r + ".", "")),
     setData: (h) => {
@@ -341,8 +341,7 @@ function nr(e, r, t) {
     }
   }), u = (i) => {
     const h = E(r, i), g = e.getField(h);
-    if (g)
-      return n(g);
+    return g ? n(g) : {};
   }, v = (i) => {
     const h = E(r, i.path), g = e.defineField({
       ...i,
@@ -355,7 +354,7 @@ function nr(e, r, t) {
   }).map((i) => n(i)), l = () => e.getFields().filter((i) => {
     const h = i.path.value;
     return h.startsWith(r + ".") || h === r;
-  }), f = d(() => l().some((i) => i.dirty.value)), p = d(() => l().some((i) => i.touched.value)), w = d(() => e.isValid.value), M = d(() => e.isValidated.value), $ = d(() => Z(c(e.errors), r));
+  }), f = d(() => l().some((i) => i.dirty.value)), p = d(() => l().some((i) => i.touched.value)), R = d(() => e.isValid.value), M = d(() => e.isValidated.value), $ = d(() => k(c(e.errors), r));
   return {
     data: a,
     initialData: s,
@@ -364,11 +363,11 @@ function nr(e, r, t) {
     getFields: o,
     isDirty: f,
     isTouched: p,
-    isValid: w,
+    isValid: R,
     isValidated: M,
     errors: $,
     defineValidator: (i) => {
-      const h = _(i) ? i : P(i), g = d(
+      const h = _(i) ? i : b(i), g = d(
         () => new ir(r, c(h))
       );
       return e.defineValidator(g), h;
@@ -385,11 +384,13 @@ function nr(e, r, t) {
   };
 }
 function vr(e) {
-  const r = d(() => Object.freeze(y(e.initialData))), t = A(y(r)), a = b({
+  const r = d(() => Object.freeze(y(e.initialData))), t = A(y(r)), a = m({
     initialData: r,
     data: t
   }), s = H(a), n = sr(a, e), u = Q(s), v = () => {
-    t.value = y(r), s.getFields().forEach((f) => f.reset());
+    t.value = y(r), s.getFields().forEach(
+      (f) => f.reset()
+    );
   };
   function o(f, p) {
     return nr(l, f);
@@ -400,12 +401,12 @@ function vr(e) {
     ...u,
     reset: v,
     getSubForm: o,
-    initialData: S(a, "initialData"),
-    data: S(a, "data")
+    initialData: D(a, "initialData"),
+    data: D(a, "data")
   };
   return l;
 }
-const pr = /* @__PURE__ */ T({
+const pr = /* @__PURE__ */ B({
   __name: "Field",
   props: {
     form: {},
@@ -416,10 +417,9 @@ const pr = /* @__PURE__ */ T({
   },
   setup(e) {
     const r = e, t = r.form.defineField({
-      path: r.path,
-      required: r.required
+      path: r.path
     });
-    return (a, s) => B(a.$slots, "default", G(L(c(t))));
+    return (a, s) => G(a.$slots, "default", L(U(m(c(t)))));
   }
 });
 export {

package/dist/types/form.d.ts

@@ -19,18 +19,22 @@ export interface FormField<T, P extends string> {
     setErrors: (newErrors: ValidationErrorMessage[]) => void;
     clearErrors: () => void;
 }
+export type FieldsTuple<T, TPaths = Paths<T>> = [
+    ...(TPaths extends infer P ? P extends string ? FormField<PickProps<T, P>, P> : never : never)[]
+];
+export type AnyField<T> = FormField<PickProps<T, Paths<T>>, Paths<T>>;
 export interface Form<T extends FormDataDefault> {
     data: Ref<T>;
     initialData: Readonly<Ref<T>>;
     defineField: <P extends Paths<T>>(options: DefineFieldOptions<PickProps<T, P>, P>) => FormField<PickProps<T, P>, P>;
-    getField: <P extends Paths<T>>(path: P) => FormField<PickProps<T, P>, P> | undefined;
-    getFields: () => FormField<PickProps<T, Paths<T>>, Paths<T>>[];
+    getField: <P extends Paths<T>>(path: P) => FormField<PickProps<T, P>, P>;
+    getFields: <TData extends T>() => FieldsTuple<TData>;
     isDirty: Ref<boolean>;
     isTouched: Ref<boolean>;
     isValid: Ref<boolean>;
     isValidated: Ref<boolean>;
     errors: Ref<ErrorBag>;
-    defineValidator: (options: ValidatorOptions<T> | Ref<Validator<T>>) => Ref<Validator<T> | undefined>;
+    defineValidator: <TData extends T>(options: ValidatorOptions<TData> | Ref<Validator<TData>>) => Ref<Validator<TData> | undefined>;
     reset: () => void;
     validateForm: () => Promise<ValidationResult>;
     getSubForm: <P extends EntityPaths<T>>(path: P, options?: SubformOptions<PickEntity<T, P>>) => Form<PickEntity<T, P>>;

package/dist/types/util.d.ts

@@ -6,7 +6,7 @@ export type SplitPath<TPath extends string> = TPath extends `${infer T1}.${infer
 /**
  * Picks the exact type of the Entity at the nested PropertyKeys path.
  */
-export type PickProps<Entity, PropertyKeys extends string> = PropertyKeys extends `${infer TRoot}.${infer TRest}` ? TRoot extends keyof Entity ? TRest extends string ? Entity[TRoot] extends object ? PickProps<Entity[TRoot], TRest> : never : never : TRoot extends `${number}` ? Entity extends unknown[] ? TRest extends string ? Entity[number] extends object ? PickProps<Entity[number], TRest> : never : never : never : never : PropertyKeys extends keyof Entity ? Entity[PropertyKeys] : PropertyKeys extends `${number}` ? Entity extends unknown[] ? Entity[number] : never : never;
+export type PickProps<Entity, PropertyKeys extends string> = Entity extends NonNullable<infer NonNullEntity> ? Required<NonNullEntity> extends infer RequiredEntity ? PropertyKeys extends `${infer TRoot}.${infer TRest}` ? TRoot extends keyof RequiredEntity ? TRest extends string ? RequiredEntity[TRoot] extends object ? PickProps<RequiredEntity[TRoot], TRest> : never : never : TRoot extends `${number}` ? RequiredEntity extends unknown[] ? TRest extends string ? RequiredEntity[number] extends object ? PickProps<RequiredEntity[number], TRest> : never : never : never : never : PropertyKeys extends keyof Required<RequiredEntity> ? RequiredEntity[PropertyKeys] : PropertyKeys extends `${number}` ? RequiredEntity extends unknown[] ? RequiredEntity[number] : never : never : never : never;
 /**
  * Resolves to a union of dot-connected paths of all nested properties of T.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamnovu/kit-vue-forms",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "",
   "main": "index.js",
   "exports": {

package/src/components/Field.vue

@@ -1,11 +1,12 @@
 <template>
-  <slot v-bind="field" />
+  <slot v-bind="reactive(field)" />
 </template>
 
 <script
   setup lang="ts"
   generic="TData extends object, TPath extends Paths<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'
@@ -18,6 +19,5 @@ const props = defineProps<FieldProps<TData, TPath>>()
 
 const field = props.form.defineField({
   path: props.path,
-  required: props.required,
 })
 </script>

package/src/composables/useFieldRegistry.ts

@@ -1,5 +1,5 @@
 import { computed, toRef, unref } from 'vue'
-import type { FormDataDefault, FormField } from '../types/form'
+import type { FieldsTuple, FormDataDefault, FormField } from '../types/form'
 import type { Paths, PickProps } from '../types/util'
 import { getLens, getNestedValue } from '../utils/path'
 import { useField, type UseFieldOptions } from './useField'
@@ -9,7 +9,7 @@ type FieldRegistryCache<T> = Record<Paths<T>, FormField<any, string>>
 
 export type ResolvedFormField<T, K extends Paths<T>> = FormField<PickProps<T, K>, K>
 
-export type DefineFieldOptions<F, K extends string> = Pick<UseFieldOptions<F, K>, 'path' | 'type' | 'required'>
+export type DefineFieldOptions<F, K extends string> = Pick<UseFieldOptions<F, K>, 'path'>
 
 interface FormState<T extends FormDataDefault, TIn extends FormDataDefault = T> {
   data: T
@@ -27,11 +27,11 @@ export function useFieldRegistry<T extends FormDataDefault>(
   }
 
   const getField = <K extends Paths<T>>(path: K) => {
-    return fields[path] as ResolvedFormField<T, K> | undefined
+    return (fields[path] ?? {}) as ResolvedFormField<T, K>
   }
 
-  const getFields = () => {
-    return Object.values(fields) as ResolvedFormField<T, Paths<T>>[]
+  const getFields = <TData extends T>() => {
+    return Object.values(fields) as FieldsTuple<TData>
   }
 
   const defineField = <K extends Paths<T>>(options: DefineFieldOptions<PickProps<T, K>, K>) => {

package/src/composables/useForm.ts

@@ -1,5 +1,5 @@
 import { computed, reactive, ref, toRef, type MaybeRef, type MaybeRefOrGetter, type Ref } from 'vue'
-import type { Form, FormDataDefault } from '../types/form'
+import type { AnyField, Form, FormDataDefault } from '../types/form'
 import type { EntityPaths, PickEntity } from '../types/util'
 import type { ValidationStrategy } from '../types/validation'
 import { cloneRefValue } from '../utils/general'
@@ -32,7 +32,9 @@ export function useForm<T extends FormDataDefault>(options: UseFormOptions<T>) {
 
   const reset = () => {
     data.value = cloneRefValue(initialData)
-    fields.getFields().forEach(field => field.reset())
+    fields.getFields().forEach(
+      (field: AnyField<T>) => field.reset(),
+    )
   }
 
   function getSubForm<K extends EntityPaths<T>>(

package/src/composables/useFormState.ts

@@ -1,16 +1,16 @@
 import { computed, unref } from 'vue'
-import type { FormDataDefault } from '../types/form'
+import type { AnyField, FormDataDefault } from '../types/form'
 import type { FieldRegistry } from './useFieldRegistry'
 
 export function useFormState<T extends FormDataDefault>(
   formFieldRegistry: FieldRegistry<T>,
 ) {
   const isDirty = computed(() => {
-    return formFieldRegistry.getFields().some(field => unref(field.dirty))
+    return formFieldRegistry.getFields().some((field: AnyField<T>) => unref(field.dirty))
   })
 
   const isTouched = computed(() => {
-    return formFieldRegistry.getFields().some(field => unref(field.touched))
+    return formFieldRegistry.getFields().some((field: AnyField<T>) => unref(field.touched))
   })
 
   return {

package/src/composables/useSubform.ts

@@ -1,5 +1,5 @@
 import { computed, isRef, unref, type Ref } from 'vue'
-import type { Form, FormDataDefault, FormField } from '../types/form'
+import type { FieldsTuple, Form, FormDataDefault, FormField } from '../types/form'
 import type { EntityPaths, Paths, PickEntity, PickProps } from '../types/util'
 import type { ValidationResult, Validator } from '../types/validation'
 import { filterErrorsForPath, getLens, getNestedValue, joinPath } from '../utils/path'
@@ -81,7 +81,7 @@ export function createSubformInterface<
     const mainFormField = mainForm.getField(fullPath as ScopedMainPaths)
 
     if (!mainFormField) {
-      return
+      return {} as FormField<PickProps<ST, P>, P>
     }
 
     return adaptMainFormField<P>(mainFormField)
@@ -99,13 +99,13 @@ export function createSubformInterface<
     return adaptMainFormField<P>(mainField)
   }
 
-  const getFields = <P extends SP>(): FormField<PickProps<ST, P>, P>[] => {
+  const getFields = <P extends SP>() => {
     return (mainForm.getFields() as FormField<PickProps<T, ScopedMainPaths>, ScopedMainPaths>[])
       .filter((field) => {
         const fieldPath = field.path.value
         return fieldPath.startsWith(path + '.') || fieldPath === path
       })
-      .map(field => adaptMainFormField(field))
+      .map(field => adaptMainFormField(field)) as FieldsTuple<ST, P>
   }
 
   // Helper function to get all fields without type parameter

package/src/composables/useValidation.ts

@@ -155,10 +155,10 @@ export function useValidation<T extends FormDataDefault>(
     }
   })
 
-  const defineValidator = (options: ValidatorOptions<T> | Ref<Validator<T>>) => {
+  const defineValidator = <TData extends T>(options: ValidatorOptions<TData> | Ref<Validator<TData>>) => {
     const validator = isRef(options) ? options : createValidator(options)
 
-    validationState.validators.push(validator)
+    validationState.validators.push(validator as Ref<Validator<T> | undefined>)
 
     if (getCurrentScope()) {
       onBeforeUnmount(() => {

package/src/types/form.ts

@@ -22,6 +22,16 @@ export interface FormField<T, P extends string> {
   clearErrors: () => void
 }
 
+export type FieldsTuple<T, TPaths = Paths<T>> = [...(
+  TPaths extends infer P
+    ? P extends string
+      ? FormField<PickProps<T, P>, P>
+      : never
+    : never
+)[]]
+
+export type AnyField<T> = FormField<PickProps<T, Paths<T>>, Paths<T>>
+
 export interface Form<T extends FormDataDefault> {
   // Data properties
   data: Ref<T>
@@ -29,8 +39,8 @@ export interface Form<T extends FormDataDefault> {
 
   // Field operations
   defineField: <P extends Paths<T>>(options: DefineFieldOptions<PickProps<T, P>, P>) => FormField<PickProps<T, P>, P>
-  getField: <P extends Paths<T>>(path: P) => FormField<PickProps<T, P>, P> | undefined
-  getFields: () => FormField<PickProps<T, Paths<T>>, Paths<T>>[]
+  getField: <P extends Paths<T>>(path: P) => FormField<PickProps<T, P>, P>
+  getFields: <TData extends T>() => FieldsTuple<TData>
 
   // State properties
   isDirty: Ref<boolean>
@@ -39,7 +49,7 @@ export interface Form<T extends FormDataDefault> {
   isValidated: Ref<boolean>
   errors: Ref<ErrorBag>
 
-  defineValidator: (options: ValidatorOptions<T> | Ref<Validator<T>>) => Ref<Validator<T> | undefined>
+  defineValidator: <TData extends T>(options: ValidatorOptions<TData> | Ref<Validator<TData>>) => Ref<Validator<TData> | undefined>
 
   // Operations
   reset: () => void

package/src/types/util.ts

@@ -12,31 +12,35 @@ export type SplitPath<TPath extends string> =
  * Picks the exact type of the Entity at the nested PropertyKeys path.
  */
 export type PickProps<Entity, PropertyKeys extends string> =
-  PropertyKeys extends `${infer TRoot}.${infer TRest}`
-    ? TRoot extends keyof Entity
-      ? TRest extends string
-        ? Entity[TRoot] extends object
-          ? PickProps<Entity[TRoot], TRest>
-          : never
-        : never
-      // We might have an array at hand but the key is a string with a number in it
-      : TRoot extends `${number}`
-        ? Entity extends unknown[]
+  Entity extends NonNullable<infer NonNullEntity>
+    ? Required<NonNullEntity> extends infer RequiredEntity
+      ? PropertyKeys extends `${infer TRoot}.${infer TRest}`
+        ? TRoot extends keyof RequiredEntity
           ? TRest extends string
-            ? Entity[number] extends object
-              ? PickProps<Entity[number], TRest>
+            ? RequiredEntity[TRoot] extends object
+              ? PickProps<RequiredEntity[TRoot], TRest>
               : never
             : never
-          : never
-        : never
-    // We might have an array at hand but the key is a string with a number in it
-    : PropertyKeys extends keyof Entity
-      ? Entity[PropertyKeys]
-      : PropertyKeys extends `${number}`
-        ? Entity extends unknown[]
-          ? Entity[number]
-          : never
-        : never
+        // We might have an array at hand but the key is a string with a number in it
+          : TRoot extends `${number}`
+            ? RequiredEntity extends unknown[]
+              ? TRest extends string
+                ? RequiredEntity[number] extends object
+                  ? PickProps<RequiredEntity[number], TRest>
+                  : never
+                : never
+              : never
+            : never
+      // We might have an array at hand but the key is a string with a number in it
+        : PropertyKeys extends keyof Required<RequiredEntity>
+          ? RequiredEntity[PropertyKeys]
+          : PropertyKeys extends `${number}`
+            ? RequiredEntity extends unknown[]
+              ? RequiredEntity[number]
+              : never
+            : never
+      : never
+    : never
 
 /**
  * Resolves to a union of dot-connected paths of all nested properties of T.

package/tsconfig.json

@@ -4,12 +4,11 @@
     "outDir": "dist",
     "verbatimModuleSyntax": true,
     "types": [
-      "vue",
-      "vite/client",
-    ],
+      "vite/client"
+    ]
   },
   "include": [
-    "src/**/*",
+    "src/**/*"
   ],
   "exclude": [
     "dist",