From f815fc67e39147c478b7df616928ed14dcafd8ff Mon Sep 17 00:00:00 2001
From: Alex Liu <dsa1314@gmail.com>
Date: Fri, 23 Jun 2023 21:57:41 +0800
Subject: [PATCH] fix(core): fix `register` type error (#28)

---
 .../core/src/composables/useFieldArray.ts     |  2 +-
 packages/core/src/composables/useForm.ts      | 18 ++++++++---
 .../src/composables/useInternalContext.ts     | 32 ++++++++++++-------
 packages/core/src/types.ts                    |  6 ++--
 4 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/packages/core/src/composables/useFieldArray.ts b/packages/core/src/composables/useFieldArray.ts
index d19fa31..be594e5 100644
--- a/packages/core/src/composables/useFieldArray.ts
+++ b/packages/core/src/composables/useFieldArray.ts
@@ -102,7 +102,7 @@ export function useFieldArray<Value>(
 
   const fields: Ref<FieldEntry<Value>[]> = ref([]);
   const values = computed(() => {
-    return getFieldValue<Value[] | undefined>(name).value || [];
+    return getFieldValue(name).value || [];
   });
 
   let seed = 0;
diff --git a/packages/core/src/composables/useForm.ts b/packages/core/src/composables/useForm.ts
index 2a412ca..529b746 100644
--- a/packages/core/src/composables/useForm.ts
+++ b/packages/core/src/composables/useForm.ts
@@ -15,8 +15,10 @@ import keysOf from '../utils/keysOf';
 import set from '../utils/set';
 
 import type { Reducer } from './useFormStore';
+import type { InternalContextValues } from './useInternalContext';
 import type {
   FieldAttrs,
+  FieldError,
   FieldMeta,
   FormErrors,
   FormEventHandler,
@@ -406,9 +408,12 @@ export function useForm<
     });
   };
 
-  const getFieldMeta = <Name extends Path<Values>>(
+  const getFieldMeta = <
+    Name extends Path<Values>,
+    Value = PathValue<Values, Name>,
+  >(
     name: MaybeRefOrGetter<Name>,
-  ): FieldMeta<PathValue<Values, Name>> => {
+  ): FieldMeta<Value> => {
     const error = computed(() => getFieldError(name));
     const touched = computed(() => getFieldTouched(name));
     const dirty = computed(() => getFieldDirty(name));
@@ -429,7 +434,12 @@ export function useForm<
     }));
   };
 
-  const getFieldError = (name: MaybeRefOrGetter<string>): FormErrors<any> => {
+  const getFieldError = <
+    Name extends Path<Values>,
+    Value = PathValue<Values, Name>,
+  >(
+    name: MaybeRefOrGetter<Name>,
+  ): FieldError<Value> => {
     name = toValue(name);
     return get(state.errors.value, name);
   };
@@ -628,7 +638,7 @@ export function useForm<
     validateField,
   };
 
-  provide(InternalContextKey, {
+  provide<InternalContextValues<Values>>(InternalContextKey, {
     getFieldValue,
     setFieldValue,
     getFieldError,
diff --git a/packages/core/src/composables/useInternalContext.ts b/packages/core/src/composables/useInternalContext.ts
index 9365489..85512f1 100644
--- a/packages/core/src/composables/useInternalContext.ts
+++ b/packages/core/src/composables/useInternalContext.ts
@@ -9,10 +9,12 @@ import {
 import {
   FieldArrayValidator,
   FieldAttrs,
-  FormErrors,
+  FieldError,
   FormTouched,
   FormValues,
   MaybeRefOrGetter,
+  Path,
+  PathValue,
   SetFieldArrayValue,
   UseFormRegister,
   UseFormSetFieldValue,
@@ -26,21 +28,25 @@ function injectMaybeSelf<T>(
   return vm?.provides[key as any] || inject(key, defaultValue);
 }
 
-export interface InternalContextValues {
+export interface InternalContextValues<Values extends FormValues> {
   registerFieldArray: (
-    name: MaybeRefOrGetter<string>,
+    name: MaybeRefOrGetter<Path<Values>>,
     options: {
-      validate?: FieldArrayValidator<any>;
+      validate?: FieldArrayValidator<PathValue<Values, Path<Values>>>;
       reset: () => void;
     },
   ) => void;
 
-  getFieldValue: <Value>(
-    name: MaybeRefOrGetter<string>,
-  ) => WritableComputedRef<Value>;
+  getFieldValue: (
+    name: MaybeRefOrGetter<Path<Values>>,
+  ) => WritableComputedRef<PathValue<Values, Path<Values>>>;
+
   setFieldValue: UseFormSetFieldValue<FormValues>;
 
-  getFieldError: (name: MaybeRefOrGetter<string>) => FormErrors<any>;
+  getFieldError: (
+    name: MaybeRefOrGetter<Path<Values>>,
+  ) => FieldError<PathValue<Values, Path<Values>>>;
+
   getFieldTouched: (name: MaybeRefOrGetter<string>) => FormTouched<boolean>;
   getFieldDirty: (name: MaybeRefOrGetter<string>) => boolean;
   getFieldAttrs: (name: MaybeRefOrGetter<string>) => ComputedRef<FieldAttrs>;
@@ -50,11 +56,13 @@ export interface InternalContextValues {
   register: UseFormRegister<FormValues>;
 }
 
-export const InternalContextKey: InjectionKey<InternalContextValues> = Symbol(
-  __DEV__ ? 'vorms internal context' : '',
-);
+export const InternalContextKey: InjectionKey<
+  InternalContextValues<FormValues>
+> = Symbol(__DEV__ ? 'vorms internal context' : '');
 
 export function useInternalContext() {
-  const context = injectMaybeSelf(InternalContextKey) as InternalContextValues;
+  const context = injectMaybeSelf(
+    InternalContextKey,
+  ) as InternalContextValues<FormValues>;
   return context;
 }
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
index ed4e4db..ed62175 100644
--- a/packages/core/src/types.ts
+++ b/packages/core/src/types.ts
@@ -35,8 +35,8 @@ export type FormErrors<Values> = {
 };
 
 export type FieldError<Value> = Value extends Primitive
-  ? string | string[] | void
-  : string | string[] | FormErrors<Value> | void;
+  ? string | string[] | undefined
+  : string | string[] | FormErrors<Value> | undefined;
 
 export interface FormState<Values extends FormValues> {
   values: Values;
@@ -154,7 +154,7 @@ export type FieldAttrs = {
 
 export type FieldMeta<Value> = {
   dirty: ComputedRef<boolean>;
-  error: ComputedRef<FormErrors<Value>>;
+  error: ComputedRef<FieldError<Value>>;
   touched: ComputedRef<boolean | undefined>;
 };