From 2dfaea580a9aeb11f4bc4b9ccb6a1879cda069fb Mon Sep 17 00:00:00 2001
From: Romain Hamel <rom.hml@gmail.com>
Date: Mon, 8 Apr 2024 12:00:38 +0200
Subject: [PATCH] chore(Form): export `FormValidationException` in `#ui/types`
 (#47)

---
 src/runtime/components/Form.vue          | 15 +--------------
 src/runtime/types/{form.d.ts => form.ts} | 21 ++++++++++++++++++++-
 2 files changed, 21 insertions(+), 15 deletions(-)
 rename src/runtime/types/{form.d.ts => form.ts} (69%)

diff --git a/src/runtime/components/Form.vue b/src/runtime/components/Form.vue
index 25ab5cfc..fdd1db6e 100644
--- a/src/runtime/components/Form.vue
+++ b/src/runtime/components/Form.vue
@@ -4,6 +4,7 @@ import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/form'
 import type { FormSchema, FormError, FormInputEvents, FormErrorEvent, FormSubmitEvent, FormEvent, FormInjectedOptions, Form, FormErrorWithId } from '#ui/types/form'
+import { FormValidationException } from '#ui/types/form'
 
 const appConfig = _appConfig as AppConfig & { ui: { form: Partial<typeof theme> } }
 
@@ -28,20 +29,6 @@ export interface FormEmits<T extends object> {
 export interface FormSlots {
   default(): any
 }
-
-export class FormValidationException extends Error {
-  formId: string | number
-  errors: FormErrorWithId[]
-  childrens: FormValidationException[]
-
-  constructor (formId: string | number, errors: FormErrorWithId[], childErrors: FormValidationException[]) {
-    super('Form validation exception')
-    this.formId = formId
-    this.errors = errors
-    this.childrens = childErrors
-    Object.setPrototypeOf(this, FormValidationException.prototype)
-  }
-}
 </script>
 
 <script lang="ts" setup generic="T extends object">
diff --git a/src/runtime/types/form.d.ts b/src/runtime/types/form.ts
similarity index 69%
rename from src/runtime/types/form.d.ts
rename to src/runtime/types/form.ts
index 5e5bda9a..cf639087 100644
--- a/src/runtime/types/form.d.ts
+++ b/src/runtime/types/form.ts
@@ -1,4 +1,8 @@
 import type { ComputedRef, Ref } from 'vue'
+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'
 
 export interface Form<T> {
   validate (opts?: { name: string | string[], silent?: false, nested?: boolean }): Promise<T | false>
@@ -10,7 +14,7 @@ export interface Form<T> {
   disabled: ComputedRef<boolean>
 }
 
-export type FormSchema<T extends object> =
+export type FormSchema<T extends Record<string, any>> =
   | ZodSchema
   | YupObjectSchema<T>
   | ValibotObjectSchema<T>
@@ -67,8 +71,23 @@ export interface FormInjectedOptions {
 export interface FormFieldInjectedOptions<T> {
   inputId: Ref<string | undefined>
   name: ComputedRef<string | undefined>
+  // @ts-ignore FIXME: TS doesn't like this
   size: ComputedRef<T['size']>
   error: ComputedRef<string | boolean | undefined>
   eagerValidation: ComputedRef<boolean | undefined>
   validateOnInputDelay: ComputedRef<number | undefined>
 }
+
+export class FormValidationException extends Error {
+  formId: string | number
+  errors: FormErrorWithId[]
+  childrens: FormValidationException[]
+
+  constructor (formId: string | number, errors: FormErrorWithId[], childErrors: FormValidationException[]) {
+    super('Form validation exception')
+    this.formId = formId
+    this.errors = errors
+    this.childrens = childErrors
+    Object.setPrototypeOf(this, FormValidationException.prototype)
+  }
+}