From 559a8cba5814194b679de5beb3a66d5bda87e25b Mon Sep 17 00:00:00 2001
From: Mauro Erta <mauro.erta@gmail.com>
Date: Mon, 29 Apr 2024 18:12:09 +0200
Subject: [PATCH] fix(FormField): added a utility type to fix some type errors
 (#81)

Co-authored-by: Mauro Erta <mauro.erta@sap.com>
Co-authored-by: Benjamin Canac <canacb1@gmail.com>
---
 src/runtime/composables/useFormField.ts | 7 +++----
 src/runtime/types/form.ts               | 4 ++--
 src/runtime/types/utils.d.ts            | 4 ++++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/runtime/composables/useFormField.ts b/src/runtime/composables/useFormField.ts
index d5dcd57b..3f138499 100644
--- a/src/runtime/composables/useFormField.ts
+++ b/src/runtime/composables/useFormField.ts
@@ -1,14 +1,13 @@
 import { inject, ref, computed } from 'vue'
 import { type UseEventBusReturn, useDebounceFn } from '@vueuse/core'
 import type { FormEvent, FormInputEvents, FormFieldInjectedOptions, FormInjectedOptions } from '#ui/types/form'
+import type { GetObjectField } from '#ui/types/utils'
 
 type Props<T> = {
   id?: string
   name?: string
-  // @ts-expect-error FIXME: TS doesn't like this
-  size?: T['size']
-  // @ts-expect-error FIXME: TS doesn't like this
-  color?: T['color']
+  size?: GetObjectField<T, 'size'>
+  color?: GetObjectField<T, 'color'>
   eagerValidation?: boolean
   legend?: string
   disabled?: boolean
diff --git a/src/runtime/types/form.ts b/src/runtime/types/form.ts
index 056cb53a..f87dee68 100644
--- a/src/runtime/types/form.ts
+++ b/src/runtime/types/form.ts
@@ -3,6 +3,7 @@ import type { ZodSchema } from 'zod'
 import type { Schema as JoiSchema } from 'joi'
 import type { ObjectSchema as YupObjectSchema } from 'yup'
 import type { ObjectSchemaAsync as ValibotObjectSchema } from 'valibot'
+import type { GetObjectField } from './utils'
 
 export interface Form<T> {
   validate (opts?: { name: string | string[], silent?: false, nested?: boolean }): Promise<T | false>
@@ -71,8 +72,7 @@ export interface FormInjectedOptions {
 export interface FormFieldInjectedOptions<T> {
   id: Ref<string | undefined>
   name: ComputedRef<string | undefined>
-  // @ts-expect-error FIXME: TS doesn't like this
-  size: ComputedRef<T['size']>
+  size: ComputedRef<GetObjectField<T, 'size'>>
   error: ComputedRef<string | boolean | undefined>
   eagerValidation: ComputedRef<boolean | undefined>
   validateOnInputDelay: ComputedRef<number | undefined>
diff --git a/src/runtime/types/utils.d.ts b/src/runtime/types/utils.d.ts
index 80aadc50..2257721d 100644
--- a/src/runtime/types/utils.d.ts
+++ b/src/runtime/types/utils.d.ts
@@ -4,3 +4,7 @@ export type DeepPartial<T> = Partial<{
 
 export type DynamicSlots<T extends { slot?: string }, SlotProps, Slot = T['slot']> =
   Record<string, SlotProps> & (Slot extends string ? Record<Slot, SlotProps> : Record<string, never>)
+
+export type GetObjectField<MaybeObject, Key extends string> = MaybeObject extends Record<string, any>
+  ? MaybeObject[Key]
+  : never