feat: deprecate names option on validate API

logaretm · Jul 11, 2020 · fe90820 · fe90820
1 parent 5937be1
commit fe90820
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 17 deletions.
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -61,7 +61,6 @@ export type Flag =
 export interface FormController {
   register(field: any): void;
   values: ComputedRef<Record<string, any>>;
-  names: ComputedRef<Record<string, string>>;
   fields: ComputedRef<Record<string, any>>;
   schema?: Record<string, GenericValidateFunction | string | Record<string, any>>;
 }

diff --git a/packages/core/src/useField.ts b/packages/core/src/useField.ts
@@ -37,7 +37,6 @@ export function useField(fieldName: MaybeReactive<string>, rules: RuleExpression
     const result = await validate(value.value, normalizedRules.value, {
       name: unwrap(fieldName),
       values: form?.values.value ?? {},
-      names: form?.names.value ?? {},
       bails,
     });
 

diff --git a/packages/core/src/useForm.ts b/packages/core/src/useForm.ts
@@ -8,6 +8,8 @@ interface FormOptions {
   initialValues?: Record<string, any>;
 }
 
+type FieldComposite = ReturnType<typeof useField>;
+
 export function useForm(opts?: FormOptions) {
   const fields: Ref<any[]> = ref([]);
   const isSubmitting = ref(false);
@@ -24,23 +26,15 @@ export function useForm(opts?: FormOptions) {
   });
 
   const values = computed(() => {
-    return activeFields.value.reduce((acc: any, field: any) => {
+    return activeFields.value.reduce((acc: any, field) => {
       acc[field.name] = field.value;
 
       return acc;
     }, {});
   });
 
-  const names = computed(() => {
-    return fields.value.reduce((acc: any, field: any) => {
-      acc[field.name] = field.name;
-
-      return acc;
-    }, {});
-  });
-
   const controller: FormController = {
-    register(field: ReturnType<typeof useField>) {
+    register(field: FieldComposite) {
       const name = unwrap(field.name);
       // Set the initial value for that field
       if (opts?.initialValues?.[name]) {
@@ -51,7 +45,6 @@ export function useForm(opts?: FormOptions) {
     },
     fields: fieldsById,
     values,
-    names,
     schema: opts?.validationSchema,
   };
 
@@ -66,7 +59,7 @@ export function useForm(opts?: FormOptions) {
   };
 
   const errors = computed(() => {
-    return activeFields.value.reduce((acc: Record<string, string[]>, field) => {
+    return activeFields.value.reduce((acc: Record<string, string>, field) => {
       acc[field.name] = field.errorMessage;
 
       return acc;

diff --git a/packages/core/src/validate.ts b/packages/core/src/validate.ts
@@ -14,13 +14,11 @@ interface FieldValidationContext {
   skipIfEmpty: boolean;
   forceRequired: boolean;
   crossTable: Record<string, any>;
-  names: Record<string, string>;
 }
 
 interface ValidationOptions {
   name?: string;
   values?: Record<string, any>;
-  names?: Record<string, string>;
   bails?: boolean;
   skipIfEmpty?: boolean;
   isInitial?: boolean;
@@ -43,7 +41,6 @@ export async function validate(
     skipIfEmpty: skipIfEmpty ?? true,
     forceRequired: false,
     crossTable: options?.values || {},
-    names: options?.names || {},
   };
 
   const result = await _validate(field, value);