add optional passthrough to options

pull/1130/head
migawka 2025-04-18 23:34:53 +02:00
parent abb260632f
commit 73c961310a
1 changed files with 19 additions and 13 deletions

View File

@ -1,7 +1,7 @@
import type { Context, Env, Input, MiddlewareHandler, TypedResponse, ValidationTargets } from 'hono'
import { validator } from 'hono/validator'
import { ZodObject } from 'zod'
import type { ZodError, ZodSchema, z } from 'zod'
import { ZodError, ZodSchema, z } from 'zod'
export type Hook<
T,
@ -27,23 +27,24 @@ export const zValidator = <
Out = z.output<T>,
I extends Input = {
in: HasUndefined<In> extends true
? {
[K in Target]?: In extends ValidationTargets[K]
? In
: { [K2 in keyof In]?: ValidationTargets[K][K2] }
}
: {
[K in Target]: In extends ValidationTargets[K]
? In
: { [K2 in keyof In]: ValidationTargets[K][K2] }
}
? {
[K in Target]?: In extends ValidationTargets[K]
? In
: { [K2 in keyof In]?: ValidationTargets[K][K2] }
}
: {
[K in Target]: In extends ValidationTargets[K]
? In
: { [K2 in keyof In]: ValidationTargets[K][K2] }
}
out: { [K in Target]: Out }
},
V extends I = I
>(
target: Target,
schema: T,
hook?: Hook<z.infer<T>, E, P, Target>
hook?: Hook<z.infer<T>, E, P, Target>,
opt?: { passthroughObject?: boolean }
): MiddlewareHandler<E, P, V> =>
// @ts-expect-error not typed well
validator(target, async (value, c) => {
@ -63,7 +64,12 @@ export const zValidator = <
)
}
const result = await schema.safeParseAsync(validatorValue)
let result: z.infer<T>;
if (opt && "passthrough" in opt) {
result = await schema.passthrough().safeParseAsync(validatorValue)
} else {
result = await schema.safeParseAsync(validatorValue)
}
if (hook) {
const hookResult = await hook({ data: validatorValue, ...result, target }, c)