Skip to content
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

fix: infer correct hook handler #4945

Merged
merged 9 commits into from
Aug 7, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 24 additions & 1 deletion test/types/hooks.test-d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import fastify, {
RegisterOptions,
RouteOptions
} from '../../fastify'
import { RequestPayload, preHandlerAsyncHookHandler } from '../../types/hooks'
import { HookHandlerDoneFunction, RequestPayload, preHandlerAsyncHookHandler } from '../../types/hooks'
import { FastifyRouteConfig, RouteGenericInterface } from '../../types/route'

const server = fastify()
Expand Down Expand Up @@ -142,6 +142,12 @@ server.addHook('onReady', function (done) {
expectType<void>(done(new Error()))
})

server.addHook('onReady', async function () {
expectType<FastifyInstance>(this)
})

expectError(server.addHook('onReady', async function (done) {}))

server.addHook('onClose', (instance, done) => {
expectType<FastifyInstance>(instance)
expectAssignable<(err?: FastifyError) => void>(done)
Expand Down Expand Up @@ -392,3 +398,20 @@ server.addHook('preClose', function (done) {
server.addHook('preClose', async function () {
expectType<FastifyInstance>(this)
})

server.addHook('onRequest', function (request, reply, done) {
expectType<FastifyRequest>(request)
expectType<FastifyReply>(reply)
expectType<FastifyInstance>(this)
expectType<HookHandlerDoneFunction>(done)
})

server.addHook('onRequest', async function (request, reply) {
expectType<FastifyRequest>(request)
expectType<FastifyReply>(reply)
expectType<FastifyInstance>(this)
})

expectError(server.addHook('onRequest', async function (request, reply, done) {
expectType<FastifyInstance>(this)
}))
Uzlopak marked this conversation as resolved.
Show resolved Hide resolved