From f92addb3b7cd5e09b9fcb57414fdb3c36f78933f Mon Sep 17 00:00:00 2001
From: Alex Liu <dsa1314@gmail.com>
Date: Sat, 13 May 2023 00:30:39 +0800
Subject: [PATCH] refactor(core): reduce `useField` code

---
 packages/core/src/composables/useField.ts           | 11 +++--------
 packages/core/src/composables/useForm.ts            |  3 +--
 packages/core/src/composables/useInternalContext.ts | 11 +++--------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/packages/core/src/composables/useField.ts b/packages/core/src/composables/useField.ts
index 7fef729..557329f 100644
--- a/packages/core/src/composables/useField.ts
+++ b/packages/core/src/composables/useField.ts
@@ -42,14 +42,9 @@ export function useField<Value>(
   name: MaybeRef<string>,
   options: UseFieldOptions<Value> = {},
 ): UseFormRegisterReturn<Value> {
-  const { registerField, getFieldValue, getFieldAttrs, getFieldMeta } =
-    useInternalContext();
+  const { register } = useInternalContext();
 
-  registerField(name, options);
+  register(name, options);
 
-  return {
-    value: getFieldValue<Value>(name),
-    attrs: getFieldAttrs(name),
-    ...getFieldMeta(name),
-  };
+  return register(name, options);
 }
diff --git a/packages/core/src/composables/useForm.ts b/packages/core/src/composables/useForm.ts
index 72c033a..411165e 100644
--- a/packages/core/src/composables/useForm.ts
+++ b/packages/core/src/composables/useForm.ts
@@ -593,16 +593,15 @@ export function useForm<Values extends FormValues = FormValues>(
   };
 
   provide(InternalContextKey, {
-    getFieldMeta,
     getFieldValue,
     setFieldValue,
     getFieldError,
     getFieldTouched,
     getFieldDirty,
     getFieldAttrs,
-    registerField,
     registerFieldArray,
     setFieldArrayValue,
+    register,
   });
 
   provide<UseFormReturn<Values>>(FormContextKey, context);
diff --git a/packages/core/src/composables/useInternalContext.ts b/packages/core/src/composables/useInternalContext.ts
index 0de159b..dcc9b90 100644
--- a/packages/core/src/composables/useInternalContext.ts
+++ b/packages/core/src/composables/useInternalContext.ts
@@ -9,13 +9,12 @@ import {
 import {
   FieldArrayValidator,
   FieldAttrs,
-  FieldMeta,
-  FieldValidator,
   FormErrors,
   FormTouched,
   FormValues,
   MaybeRef,
   SetFieldArrayValue,
+  UseFormRegister,
   UseFormSetFieldValue,
 } from '../types';
 
@@ -28,11 +27,6 @@ function injectMaybeSelf<T>(
 }
 
 export interface InternalContextValues {
-  registerField: (
-    name: MaybeRef<string>,
-    options: { validate?: FieldValidator<any> },
-  ) => void;
-
   registerFieldArray: (
     name: MaybeRef<string>,
     options: {
@@ -42,7 +36,6 @@ export interface InternalContextValues {
   ) => void;
 
   getFieldValue: <Value>(name: MaybeRef<string>) => WritableComputedRef<Value>;
-  getFieldMeta: (name: MaybeRef<string>) => FieldMeta;
   setFieldValue: UseFormSetFieldValue<FormValues>;
 
   getFieldError: (name: string) => FormErrors<any>;
@@ -51,6 +44,8 @@ export interface InternalContextValues {
   getFieldAttrs: (name: MaybeRef<string>) => ComputedRef<FieldAttrs>;
 
   setFieldArrayValue: SetFieldArrayValue;
+
+  register: UseFormRegister<FormValues>;
 }
 
 export const InternalContextKey: InjectionKey<InternalContextValues> = Symbol(