fix: refactored zod and valibot validators

YannicEl · Aug 23, 2023 · 026a0be · 026a0be
1 parent 82afa69
commit 026a0be
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/packages/lib/src/validators/validators.ts b/packages/lib/src/validators/validators.ts
@@ -46,19 +46,10 @@ const emojiRegex = /^(\p{Extended_Pictographic}|\p{Emoji_Component})+$/u;
 
 export const emoji = defineValidator('emoji', (value) => regex(emojiRegex).validate(value));
 
-export const zodValidator = defineValidatorWithArgs(
-	'zodValidator',
-	(value, schema: ZodSchema) => schema.safeParse(value).success
-);
+export function zodValidator(name: string, schema: ZodSchema) {
+	return defineValidator(name, (value) => schema.safeParse(value).success);
+}
 
-export const valibotValidator = defineValidatorWithArgs(
-	'valibotValidator',
-	(value, schema: ValibotSchema) => {
-		try {
-			return !!schema.parse(value);
-		} catch (error) {
-			console.log('hi');
-			return false;
-		}
-	}
-);
+export function valibotValidator(name: string, schema: ValibotSchema) {
+	return defineValidator(name, (value) => !!schema._parse(value).output);
+}