From 9a4bb34d7d14add0a3199103f4b583e8307d1d6d Mon Sep 17 00:00:00 2001
From: Romain Hamel <rom.hml@gmail.com>
Date: Wed, 19 Mar 2025 12:18:26 +0100
Subject: [PATCH] refactor(Form)!: drop explicit support for `zod` and
 `valibot` (#3617)

---
 .../examples/form/FormExampleValibot.vue      |  2 +-
 docs/content/3.components/form.md             |  4 +-
 docs/package.json                             |  2 +-
 package.json                                  |  2 +-
 pnpm-lock.yaml                                | 14 ++--
 renovate.json                                 |  2 -
 src/runtime/types/form.ts                     |  7 --
 src/runtime/utils/form.ts                     | 69 +------------------
 test/components/Form.spec.ts                  |  7 --
 9 files changed, 14 insertions(+), 95 deletions(-)

diff --git a/docs/app/components/content/examples/form/FormExampleValibot.vue b/docs/app/components/content/examples/form/FormExampleValibot.vue
index 4e96a5a0..2ed4d02a 100644
--- a/docs/app/components/content/examples/form/FormExampleValibot.vue
+++ b/docs/app/components/content/examples/form/FormExampleValibot.vue
@@ -22,7 +22,7 @@ async function onSubmit(event: FormSubmitEvent<Schema>) {
 </script>
 
 <template>
-  <UForm :schema="v.safeParser(schema)" :state="state" class="space-y-4" @submit="onSubmit">
+  <UForm :schema="schema" :state="state" class="space-y-4" @submit="onSubmit">
     <UFormField label="Email" name="email">
       <UInput v-model="state.email" />
     </UFormField>
diff --git a/docs/content/3.components/form.md b/docs/content/3.components/form.md
index 2191fdf9..4c305b8c 100644
--- a/docs/content/3.components/form.md
+++ b/docs/content/3.components/form.md
@@ -9,7 +9,7 @@ links:
 
 ## Usage
 
-Use the Form component to validate form data using schema libraries such as [Valibot](https://github.com/fabian-hiller/valibot), [Zod](https://github.com/colinhacks/zod), [Yup](https://github.com/jquense/yup), [Joi](https://github.com/hapijs/joi), [Superstruct](https://github.com/ianstormtaylor/superstruct) or your own validation logic.
+Use the Form component to validate form data using validation libraries such as [Valibot](https://github.com/fabian-hiller/valibot), [Zod](https://github.com/colinhacks/zod), [Yup](https://github.com/jquense/yup), [Joi](https://github.com/hapijs/joi), [Superstruct](https://github.com/ianstormtaylor/superstruct) or your own validation logic.
 
 It works with the [FormField](/components/form-field) component to display error messages around form elements automatically.
 
@@ -18,7 +18,7 @@ It works with the [FormField](/components/form-field) component to display error
 It requires two props:
 
 - `state` - a reactive object holding the form's state.
-- `schema` - a schema object from a validation library like [Valibot](https://github.com/fabian-hiller/valibot), [Zod](https://github.com/colinhacks/zod), [Yup](https://github.com/jquense/yup), [Joi](https://github.com/hapijs/joi) or [Superstruct](https://github.com/ianstormtaylor/superstruct).
+- `schema` - any [Standard Schema](https://standardschema.dev/) or a schema from [Yup](https://github.com/jquense/yup), [Joi](https://github.com/hapijs/joi) or [Superstruct](https://github.com/ianstormtaylor/superstruct).
 
 ::warning
 **No validation library is included** by default, ensure you **install the one you need**.
diff --git a/docs/package.json b/docs/package.json
index 827ded10..4db9e4a7 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -27,7 +27,7 @@
     "shiki-transformer-color-highlight": "^1.0.0",
     "superstruct": "^2.0.2",
     "ufo": "^1.5.4",
-    "valibot": "^0.42.1",
+    "valibot": "^1.0.0",
     "yup": "^1.6.1",
     "zod": "^3.24.2"
   },
diff --git a/package.json b/package.json
index 95df7136..383a1454 100644
--- a/package.json
+++ b/package.json
@@ -134,7 +134,7 @@
     "nuxt": "^3.16.0",
     "release-it": "^18.1.2",
     "superstruct": "^2.0.2",
-    "valibot": "^0.42.1",
+    "valibot": "^1.0.0",
     "vitest": "^3.0.9",
     "vitest-environment-nuxt": "^1.0.1",
     "vue-tsc": "^2.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f87fc94b..16b29fc2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -184,8 +184,8 @@ importers:
         specifier: ^2.0.2
         version: 2.0.2
       valibot:
-        specifier: ^0.42.1
-        version: 0.42.1(typescript@5.6.3)
+        specifier: ^1.0.0
+        version: 1.0.0(typescript@5.6.3)
       vitest:
         specifier: ^3.0.9
         version: 3.0.9(@types/debug@4.1.12)(@types/node@22.13.10)(happy-dom@17.4.4)(jiti@2.4.2)(lightningcss@1.29.2)(terser@5.39.0)(yaml@2.7.0)
@@ -292,8 +292,8 @@ importers:
         specifier: ^1.5.4
         version: 1.5.4
       valibot:
-        specifier: ^0.42.1
-        version: 0.42.1(typescript@5.6.3)
+        specifier: ^1.0.0
+        version: 1.0.0(typescript@5.6.3)
       yup:
         specifier: ^1.6.1
         version: 1.6.1
@@ -6827,8 +6827,8 @@ packages:
   util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
-  valibot@0.42.1:
-    resolution: {integrity: sha512-3keXV29Ar5b//Hqi4MbSdV7lfVp6zuYLZuA9V1PvQUsXqogr+u5lvLPLk3A4f74VUXDnf/JfWMN6sB+koJ/FFw==}
+  valibot@1.0.0:
+    resolution: {integrity: sha512-1Hc0ihzWxBar6NGeZv7fPLY0QuxFMyxwYR2sF1Blu7Wq7EnremwY2W02tit2ij2VJT8HcSkHAQqmFfl77f73Yw==}
     peerDependencies:
       typescript: 5.6.3
     peerDependenciesMeta:
@@ -14879,7 +14879,7 @@ snapshots:
 
   util-deprecate@1.0.2: {}
 
-  valibot@0.42.1(typescript@5.6.3):
+  valibot@1.0.0(typescript@5.6.3):
     optionalDependencies:
       typescript: 5.6.3
 
diff --git a/renovate.json b/renovate.json
index c1c6df10..a34eb39b 100644
--- a/renovate.json
+++ b/renovate.json
@@ -6,8 +6,6 @@
     "enabled": true
   },
   "ignoreDeps": [
-    "valibot30",
-    "valibot31",
     "typescript",
     "vaul-vue",
     "vue-tsc"
diff --git a/src/runtime/types/form.ts b/src/runtime/types/form.ts
index 7bf3c25c..ae080593 100644
--- a/src/runtime/types/form.ts
+++ b/src/runtime/types/form.ts
@@ -1,9 +1,7 @@
 import type { StandardSchemaV1 } from '@standard-schema/spec'
 import type { ComputedRef, DeepReadonly, Ref } from 'vue'
-import type { ZodSchema } from 'zod'
 import type { Schema as JoiSchema } from 'joi'
 import type { ObjectSchema as YupObjectSchema } from 'yup'
-import type { GenericSchema as ValibotSchema, GenericSchemaAsync as ValibotSchemaAsync, SafeParser as ValibotSafeParser, SafeParserAsync as ValibotSafeParserAsync } from 'valibot'
 import type { GetObjectField } from './utils'
 import type { Struct as SuperstructSchema } from 'superstruct'
 
@@ -23,12 +21,7 @@ export interface Form<T extends object> {
 }
 
 export type FormSchema<T extends object> =
-  | ZodSchema
   | YupObjectSchema<T>
-  | ValibotSchema
-  | ValibotSchemaAsync
-  | ValibotSafeParser<any, any>
-  | ValibotSafeParserAsync<any, any>
   | JoiSchema<T>
   | SuperstructSchema<any, any>
   | StandardSchemaV1
diff --git a/src/runtime/utils/form.ts b/src/runtime/utils/form.ts
index 160ba8f8..13964b06 100644
--- a/src/runtime/utils/form.ts
+++ b/src/runtime/utils/form.ts
@@ -1,8 +1,6 @@
 import type { StandardSchemaV1 } from '@standard-schema/spec'
-import type { ZodSchema } from 'zod'
 import type { ValidationError as JoiError, Schema as JoiSchema } from 'joi'
 import type { ObjectSchema as YupObjectSchema, ValidationError as YupError } from 'yup'
-import type { GenericSchema as ValibotSchema, GenericSchemaAsync as ValibotSchemaAsync, SafeParser as ValibotSafeParser, SafeParserAsync as ValibotSafeParserAsync } from 'valibot'
 import type { Struct } from 'superstruct'
 import type { FormSchema, ValidateReturnSchema } from '../types/form'
 
@@ -23,10 +21,6 @@ export function isSuperStructSchema(schema: any): schema is Struct<any, any> {
   )
 }
 
-export function isZodSchema(schema: any): schema is ZodSchema {
-  return schema.parse !== undefined
-}
-
 export function isJoiSchema(schema: any): schema is JoiSchema {
   return schema.validateAsync !== undefined && schema.id !== undefined
 }
@@ -35,10 +29,6 @@ export function isJoiError(error: any): error is JoiError {
   return error.isJoi === true
 }
 
-export function isValibotSchema(schema: any): schema is ValibotSchema | ValibotSchemaAsync | ValibotSafeParser<any, any> | ValibotSafeParserAsync<any, any> {
-  return '_run' in schema || (typeof schema === 'function' && 'schema' in schema)
-}
-
 export function isStandardSchema(schema: any): schema is StandardSchemaV1 {
   return '~standard' in schema
 }
@@ -112,28 +102,6 @@ async function validateSuperstructSchema(state: any, schema: Struct<any, any>):
   }
 }
 
-async function validateZodSchema(
-  state: any,
-  schema: ZodSchema
-): Promise<ValidateReturnSchema<typeof state>> {
-  const result = await schema.safeParseAsync(state)
-  if (result.success === false) {
-    const errors = result.error.issues.map(issue => ({
-      name: issue.path.join('.'),
-      message: issue.message
-    }))
-
-    return {
-      errors,
-      result: null
-    }
-  }
-  return {
-    result: result.data,
-    errors: null
-  }
-}
-
 async function validateJoiSchema(
   state: any,
   schema: JoiSchema
@@ -161,44 +129,11 @@ async function validateJoiSchema(
   }
 }
 
-async function validateValibotSchema(
-  state: any,
-  schema: ValibotSchema | ValibotSchemaAsync | ValibotSafeParser<any, any> | ValibotSafeParserAsync<any, any>
-): Promise<ValidateReturnSchema<typeof state>> {
-  const result = await ('_run' in schema ? schema._run({ typed: false, value: state }, {}) : schema(state))
-
-  if (!result.issues || result.issues.length === 0) {
-    const output = ('output' in result
-      ? result.output
-      : 'value' in result
-        ? result.value
-        : null)
-    return {
-      errors: null,
-      result: output
-    }
-  }
-
-  const errors = result.issues.map(issue => ({
-    name: issue.path?.map((item: any) => item.key).join('.') || '',
-    message: issue.message
-  }))
-
-  return {
-    errors,
-    result: null
-  }
-}
-
 export function validateSchema<T extends object>(state: T, schema: FormSchema<T>): Promise<ValidateReturnSchema<typeof state>> {
-  if (isZodSchema(schema)) {
-    return validateZodSchema(state, schema)
+  if (isStandardSchema(schema)) {
+    return validateStandardSchema(state, schema)
   } else if (isJoiSchema(schema)) {
     return validateJoiSchema(state, schema)
-  } else if (isStandardSchema(schema)) {
-    return validateStandardSchema(state, schema)
-  } else if (isValibotSchema(schema)) {
-    return validateValibotSchema(state, schema)
   } else if (isYupSchema(schema)) {
     return validateYupSchema(state, schema)
   } else if (isSuperStructSchema(schema)) {
diff --git a/test/components/Form.spec.ts b/test/components/Form.spec.ts
index 8df0c132..9ca9c6c4 100644
--- a/test/components/Form.spec.ts
+++ b/test/components/Form.spec.ts
@@ -59,13 +59,6 @@ describe('Form', () => {
       })
     }
     ],
-    ['valibot safeParser', {
-      schema: valibot.safeParser(valibot.object({
-        email: valibot.string(),
-        password: valibot.pipe(valibot.string(), valibot.minLength(8, 'Must be at least 8 characters'))
-      }))
-    }
-    ],
     ['superstruct', {
       schema: object({
         email: nonempty(string()),