feat: remove object destructuring for clarity for now

logaretm · Nov 25, 2023 · 9678f82 · 9678f82
1 parent 3d08d08
commit 9678f82
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 29 deletions.
diff --git a/packages/vee-validate/src/types/forms.ts b/packages/vee-validate/src/types/forms.ts
@@ -326,5 +326,5 @@ export interface FormContext<TValues extends GenericObject = GenericObject, TOut
   >(
     path: MaybeRefOrGetter<TPath>,
     config?: Partial<InputBindsConfig<TValue, TExtras>> | LazyInputBindsConfig<TValue, TExtras>,
-  ): { model: Ref<TValue>; props: Ref<BaseFieldProps & TExtras> } & [Ref<TValue>, Ref<BaseFieldProps & TExtras>];
+  ): [Ref<TValue>, Ref<BaseFieldProps & TExtras>];
 }
diff --git a/packages/vee-validate/src/useForm.ts b/packages/vee-validate/src/useForm.ts
@@ -62,7 +62,6 @@ import {
   normalizeErrorItem,
   omit,
   debounceNextTick,
-  makeDestructurable,
 } from './utils';
 import { FormContextKey } from './symbols';
 import { validateTypedSchema, validateObjectSchema } from './validate';
@@ -1013,13 +1012,7 @@ export function useForm<
 
     const model = createModel(path, () => evalConfig().validateOnModelUpdate ?? true);
 
-    return makeDestructurable(
-      {
-        model,
-        props,
-      },
-      [model, props] as [Ref<TValue>, Ref<BaseFieldProps & TExtras>],
-    );
+    return [model, props] as [Ref<TValue>, Ref<BaseFieldProps & TExtras>];
   }
 
   return {

diff --git a/packages/vee-validate/src/utils/common.ts b/packages/vee-validate/src/utils/common.ts
@@ -359,23 +359,3 @@ export function debounceNextTick<
     return new Promise<TResult>(resolve => resolves.push(resolve));
   };
 }
-
-// https://github.com/vueuse/vueuse/blob/main/packages/shared/makeDestructurable/index.ts
-export function makeDestructurable<T extends Record<string, unknown>, A extends readonly any[]>(obj: T, arr: A): T & A {
-  const clone = { ...obj };
-
-  Object.defineProperty(clone, Symbol.iterator, {
-    enumerable: false,
-    value() {
-      let index = 0;
-      return {
-        next: () => ({
-          value: arr[index++],
-          done: index > arr.length,
-        }),
-      };
-    },
-  });
-
-  return clone as T & A;
-}