feat!: validator throws error rathar than return c.json()

deno_dist/validator/validator.ts

@@ -1,5 +1,6 @@
 import type { Context } from '../context.ts'
 import { getCookie } from '../helper/cookie/index.ts'
+import { HTTPException } from '../http-exception.ts'
 import type { Env, ValidationTargets, MiddlewareHandler, TypedResponse } from '../types.ts'
 import type { BodyData } from '../utils/body.ts'
 import { bufferToFormData } from '../utils/buffer.ts'
@@ -55,14 +56,7 @@ export const validator = <
       case 'json':
         if (!contentType || !contentType.startsWith('application/json')) {
           const message = `Invalid HTTP header: Content-Type=${contentType}`
-          console.error(message)
-          return c.json(
-            {
-              success: false,
-              message,
-            },
-            400
-          )
+          throw new HTTPException(400, { message })
         }
         /**
          * Get the arrayBuffer first, create JSON object via Response,
@@ -74,14 +68,8 @@ export const validator = <
           c.req.bodyCache.json = value
           c.req.bodyCache.arrayBuffer = arrayBuffer
         } catch {
-          console.error('Error: Malformed JSON in request body')
-          return c.json(
-            {
-              success: false,
-              message: 'Malformed JSON in request body',
-            },
-            400
-          )
+          const message = 'Malformed JSON in request body'
+          throw new HTTPException(400, { message })
         }
         break
       case 'form': {
@@ -101,13 +89,7 @@ export const validator = <
         } catch (e) {
           let message = 'Malformed FormData request.'
           message += e instanceof Error ? ` ${e.message}` : ` ${String(e)}`
-          return c.json(
-            {
-              success: false,
-              message,
-            },
-            400
-          )
+          throw new HTTPException(400, { message })
         }
         break
       }

src/validator/validator.test.ts

@@ -2,7 +2,8 @@
 import type { ZodSchema } from 'zod'
 import { z } from 'zod'
 import { Hono } from '../hono'
-import type { ExtractSchema, MiddlewareHandler, ValidationTargets } from '../types'
+import { HTTPException } from '../http-exception'
+import type { ErrorHandler, ExtractSchema, MiddlewareHandler, ValidationTargets } from '../types'
 import type { Equal, Expect } from '../utils/types'
 import type { ValidationFunction } from './validator'
 import { validator } from './validator'
@@ -75,16 +76,23 @@ describe('Validator middleware', () => {
   })
 })
 
+const onErrorHandler: ErrorHandler = (e, c) => {
+  if (e instanceof HTTPException) {
+    return c.json({ message: e.message, success: false }, e.status)
+  }
+  return c.json({ message: e.message }, 500)
+}
+
 describe('Malformed JSON', () => {
   const app = new Hono()
-
   app.post(
     '/post',
     validator('json', (value, c) => {}),
     (c) => {
       return c.text('Valid!')
     }
   )
+  app.onError(onErrorHandler)
 
   it('Should return 400 response', async () => {
     const res = await app.request('http://localhost/post', {
@@ -133,6 +141,7 @@ describe('Malformed FormData request', () => {
       return c.text('Valid!')
     }
   )
+  app.onError(onErrorHandler)
 
   it('Should return 400 response, for unsupported content type header', async () => {
     const res = await app.request('http://localhost/post', {

src/validator/validator.ts

@@ -1,5 +1,6 @@
 import type { Context } from '../context'
 import { getCookie } from '../helper/cookie'
+import { HTTPException } from '../http-exception'
 import type { Env, ValidationTargets, MiddlewareHandler, TypedResponse } from '../types'
 import type { BodyData } from '../utils/body'
 import { bufferToFormData } from '../utils/buffer'
@@ -55,14 +56,7 @@ export const validator = <
       case 'json':
         if (!contentType || !contentType.startsWith('application/json')) {
           const message = `Invalid HTTP header: Content-Type=${contentType}`
-          console.error(message)
-          return c.json(
-            {
-              success: false,
-              message,
-            },
-            400
-          )
+          throw new HTTPException(400, { message })
         }
         /**
          * Get the arrayBuffer first, create JSON object via Response,
@@ -74,14 +68,8 @@ export const validator = <
           c.req.bodyCache.json = value
           c.req.bodyCache.arrayBuffer = arrayBuffer
         } catch {
-          console.error('Error: Malformed JSON in request body')
-          return c.json(
-            {
-              success: false,
-              message: 'Malformed JSON in request body',
-            },
-            400
-          )
+          const message = 'Malformed JSON in request body'
+          throw new HTTPException(400, { message })
         }
         break
       case 'form': {
@@ -101,13 +89,7 @@ export const validator = <
         } catch (e) {
           let message = 'Malformed FormData request.'
           message += e instanceof Error ? ` ${e.message}` : ` ${String(e)}`
-          return c.json(
-            {
-              success: false,
-              message,
-            },
-            400
-          )
+          throw new HTTPException(400, { message })
         }
         break
       }