refactor: better error handling

packages/validators/package.json

@@ -12,7 +12,8 @@
   },
   "dependencies": {
     "vitest": "^2.0.2",
-    "zod": "^3.23.8"
+    "zod": "^3.23.8",
+    "zod-validation-error": "^3.3.0"
   },
   "devDependencies": {
     "@types/node": "^18",

packages/validators/src/url/index.ts

@@ -1,4 +1,5 @@
 import { ZodError } from 'zod'
+import { fromError } from 'zod-validation-error'
 
 import { OptionsError, UrlValidationError } from '@/url/errors'
 import { defaultOptions, Options, optionsSchema } from '@/url/options'
@@ -8,13 +9,12 @@ export class UrlValidator {
   private schema
 
   constructor(options: Options = defaultOptions) {
-    let validatedOptions: Options
-    try {
-      validatedOptions = optionsSchema.parse({ ...defaultOptions, ...options })
-    } catch (error) {
-      throw new OptionsError(`Invalid options: ${(error as Error).message}`)
+    const result = optionsSchema.safeParse({ ...defaultOptions, ...options })
+    if (result.success) {
+      this.schema = createUrlSchema(result.data)
+      return
     }
-    this.schema = createUrlSchema(validatedOptions)
+    throw new OptionsError(fromError(result.error))
   }
 
   parse(url: string): URL {
@@ -23,7 +23,7 @@ export class UrlValidator {
       return result.data
     }
     if (result.error instanceof ZodError) {
-      throw new UrlValidationError(JSON.stringify(result.error.format()))
+      throw new UrlValidationError(fromError(result.error))
     } else {
       throw result.error
     }

packages/validators/src/url/options.ts

@@ -16,7 +16,17 @@ export type Whitelist = z.infer<typeof whitelistSchema>
 export const optionsSchema = z.object({
   baseUrl: z
     .string()
-    .transform((value) => new URL(value))
+    .transform((value, ctx) => {
+      try {
+        return new URL(value)
+      } catch (error) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: (error as Error).message,
+        })
+        return z.NEVER
+      }
+    })
     .refine(
       (value) => value.protocol === 'http:' || value.protocol === 'https:',
     )