Merge branch 'main' into feat/support-validate-field

packages/resolvers/package.json

@@ -65,8 +65,8 @@
   ],
   "devDependencies": {
     "@vorms/core": "workspace:*",
-    "valibot": "^0.11.0",
-    "yup": "^0.32.11",
+    "valibot": "^0.28.1",
+    "yup": "^1.3.3",
     "zod": "^3.20.2"
   }
 }

packages/resolvers/valibot/src/types.ts

@@ -1,8 +1,8 @@
-import { ObjectSchema } from 'valibot';
+import { BaseSchema, BaseSchemaAsync } from 'valibot';
 
 import type { FormErrors, FormValues } from '@vorms/core';
 
-export type Resolver = <T extends ObjectSchema<any, any>>(
+export type Resolver = <T extends BaseSchema | BaseSchemaAsync>(
   schema: T,
 ) => <Values extends FormValues = FormValues>(
   values: Values,

packages/resolvers/valibot/src/valibot.ts

@@ -1,10 +1,10 @@
 import { toNestError } from '@vorms/resolvers';
-import { parseAsync } from 'valibot';
+import { parseAsync, ValiError } from 'valibot';
 
 import type { Resolver } from './types';
-import type { Issues } from 'valibot';
+import type { SchemaIssues } from 'valibot';
 
-const parseErrorSchema = (valibotIssues: Issues) => {
+const parseErrorSchema = (valibotIssues: SchemaIssues) => {
   const errors: Record<string, string> = {};
 
   while (valibotIssues.length) {
@@ -29,9 +29,12 @@ export const valibotResolver: Resolver = (schema) => async (values) => {
     await parseAsync(schema, values);
     return {};
   } catch (error: any) {
-    if (error.name !== 'ValiError') throw error;
-    return error.issues.length
-      ? toNestError(parseErrorSchema(error.issues))
-      : {};
+    if (error instanceof ValiError) {
+      return error.issues.length
+        ? toNestError(parseErrorSchema(error.issues))
+        : {};
+    }
+
+    throw error;
   }
 };

packages/resolvers/yup/src/types.ts

@@ -1,7 +1,7 @@
 import * as Yup from 'yup';
 
 import type { FormErrors, FormValues } from '@vorms/core';
-import type Lazy from 'yup/lib/Lazy';
+import type { Lazy } from 'yup';
 
 export type Resolver = <T extends Yup.AnyObjectSchema | Lazy<any>>(
   schema: T,