suimeng
/
honojs-middleware
mirror of https://github.com/honojs/middleware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(zod-validator): support `TypedResponse` in hook (#114) 

* fix(zod-validator): support `TypedResponse` in hook

* changeset
pull/115/head
Yusuke Wada 2023-08-18 23:56:39 +09:00 committed by GitHub
parent 5eb29ae29e
commit 3de3d7cd1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/modern-dancers-lick.md 100644
View File

@ -0,0 +1,5 @@
---
'@hono/zod-validator': patch
---
fix(zod-validator): support TypedResponse in hook

20
packages/zod-validator/src/index.ts
View File

@ -1,11 +1,18 @@
import type { Context, MiddlewareHandler, Env, ValidationTargets } from 'hono' import type { Context, MiddlewareHandler, Env, ValidationTargets, TypedResponse } from 'hono'
import { validator } from 'hono/validator' import { validator } from 'hono/validator'
import type { z, ZodSchema, ZodError } from 'zod' import type { z, ZodSchema, ZodError } from 'zod'
type Hook<T, E extends Env, P extends string> = ( export type Hook<T, E extends Env, P extends string, O = {}> = (
result: { success: true; data: T } | { success: false; error: ZodError; data: T }, result: { success: true; data: T } | { success: false; error: ZodError; data: T },
c: Context<E, P> c: Context<E, P>
) => Response | Promise<Response> | void | Promise<Response | void> ) =>
| Response
| Promise<Response>
| void
| Promise<Response | void>
| TypedResponse<O>
| Promise<TypedResponse<O>>
| Promise<TypedResponse<O> | void>
export const zValidator = < export const zValidator = <
T extends ZodSchema, T extends ZodSchema,
@ -29,7 +36,12 @@ export const zValidator = <
if (hook) { if (hook) {
const hookResult = hook({ data: value, ...result }, c) const hookResult = hook({ data: value, ...result }, c)
if (hookResult instanceof Response || hookResult instanceof Promise) { if (
hookResult &&
(hookResult instanceof Response ||
hookResult instanceof Promise ||
'response' in hookResult)
) {
return hookResult return hookResult
} }
} }