Skip to content

feat(zod-validator): Optional passthrough param #1130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/hot-symbols-thank.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@hono/zod-validator': minor
---

Added optional opt field for passthrough and might further editions, passthrough and tests to it
92 changes: 88 additions & 4 deletions packages/zod-validator/src/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ describe('Basic', () => {
}
} & {
query?:
| {
name?: string | undefined
}
| undefined
| {
name?: string | undefined
}
| undefined
}
output: {
success: boolean
Expand Down Expand Up @@ -378,3 +378,87 @@ describe('Case-Insensitive Headers', () => {
type verify = Expect<Equal<Expected, Actual>>
})
})

describe('With options + passthrough', () => {
const app = new Hono()
const jsonSchema = z.object({
name: z.string(),
age: z.number()
});

const route = app.post(
'/',
zValidator('json', jsonSchema),
(c) => {
const data = c.req.valid('json')

return c.json({
success: true,
data
})
}
).post('/extended',
zValidator('json', jsonSchema, undefined, {
passthroughObject: true
}),
(c) => {
const data = c.req.valid('json')

return c.json({
success: true,
data
})
}
)

it('Should be ok due to passthrough schema', async () => {
const req = new Request('http://localhost/extended', {
body: JSON.stringify({
name: 'Superman',
age: 20,
length: 170,
weight: 55
}),
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
})
const res = await app.request(req)
expect(res).not.toBeNull()
expect(res.status).toBe(200)
expect(await res.json()).toEqual({
success: true,
data: {
name: "Superman",
age: 20,
length: 170,
weight: 55
}
})
})
it('Should be ok due to required schema', async () => {
const req = new Request('http://localhost', {
body: JSON.stringify({
name: 'Superman',
age: 20,
}),
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
})
const res = await app.request(req)

expect(res).not.toBeNull()
expect(res.status).toBe(200)
expect(await res.json()).toEqual({
success: true,
data: {
name: "Superman",
age: 20
}
})
})

})
32 changes: 19 additions & 13 deletions packages/zod-validator/src/index.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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) => {
Expand All @@ -63,7 +64,12 @@ export const zValidator = <
)
}

const result = await schema.safeParseAsync(validatorValue)
let result: z.infer<T>;
if (opt && "passthroughObject" 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)
Expand Down
Loading