From cda204bb2f728306ff4503527b1de569d38369e8 Mon Sep 17 00:00:00 2001 From: Alex Liu Date: Sun, 18 Feb 2024 01:20:49 +0800 Subject: [PATCH] chore: upgrade valibot version --- packages/resolvers/package.json | 2 +- packages/resolvers/valibot/src/valibot.ts | 17 ++++++++++------- pnpm-lock.yaml | 9 +++++++-- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/packages/resolvers/package.json b/packages/resolvers/package.json index 960c279..e9b4166 100644 --- a/packages/resolvers/package.json +++ b/packages/resolvers/package.json @@ -65,7 +65,7 @@ ], "devDependencies": { "@vorms/core": "workspace:*", - "valibot": "^0.11.0", + "valibot": "^0.28.1", "yup": "^0.32.11", "zod": "^3.20.2" } diff --git a/packages/resolvers/valibot/src/valibot.ts b/packages/resolvers/valibot/src/valibot.ts index 7103fe4..4ba7771 100644 --- a/packages/resolvers/valibot/src/valibot.ts +++ b/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 = {}; 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; } }; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e351520..20778b1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -123,8 +123,8 @@ importers: specifier: workspace:* version: link:../core valibot: - specifier: ^0.11.0 - version: 0.11.0 + specifier: ^0.28.1 + version: 0.28.1 yup: specifier: ^0.32.11 version: 0.32.11 @@ -4484,6 +4484,11 @@ packages: /valibot@0.11.0: resolution: {integrity: sha512-qF54ZhrrME9jsicNOw16G7+4JIM2hoT5lyybCJqK7AyvU7/q7/kkmf6xaPc+GigF+GAO66ZWB12ZbFV5RyiQIA==} + dev: false + + /valibot@0.28.1: + resolution: {integrity: sha512-zQnjwNJuXk6362Leu0+4eFa/SMwRom3/hEvH6s1EGf3oXIPbo2WFKDra9ymnbVh3clLRvd8hw4sKF5ruI2Lyvw==} + dev: true /vite-node@0.32.2(@types/node@18.16.18): resolution: {integrity: sha512-dTQ1DCLwl2aEseov7cfQ+kDMNJpM1ebpyMMMwWzBvLbis8Nla/6c9WQcqpPssTwS6Rp/+U6KwlIj8Eapw4bLdA==}