Merge branch 'master' into fix/fastify.use-types

joelmukuthu · Jun 18, 2020 · e534636 · e534636
2 parents baa0e8d + 68f1ac6
commit e534636
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/test/types/instance.test-d.ts b/test/types/instance.test-d.ts
@@ -1,4 +1,4 @@
-import fastify, { FastifyInstance } from '../../fastify'
+import fastify, { FastifyError, FastifyInstance } from '../../fastify';
 import { expectAssignable, expectType } from 'tsd'
 import { IncomingMessage, ServerResponse } from 'http'
 
@@ -16,3 +16,10 @@ expectAssignable<FastifyInstance>(server.addSchema({
 
 expectType<unknown>(server.use(() => {}))
 expectType<unknown>(server.use('/foo', () => {}))
+
+server.setErrorHandler((function (error, request, reply) {
+  expectAssignable<FastifyInstance>(this)
+}))
+
+function errorHandler(this: FastifyInstance, error: FastifyError) {}
+server.setErrorHandler(errorHandler)
diff --git a/types/instance.d.ts b/types/instance.d.ts
@@ -227,7 +227,7 @@ export interface FastifyInstance<
    * Set a function that will be called whenever an error happens
    */
   setErrorHandler(
-    handler: (error: FastifyError, request: FastifyRequest<RawServer, RawRequest>, reply: FastifyReply<RawServer, RawRequest, RawReply>) => void
+    handler: (this: FastifyInstance<RawServer, RawRequest, RawReply, Logger>, error: FastifyError, request: FastifyRequest<RawServer, RawRequest>, reply: FastifyReply<RawServer, RawRequest, RawReply>) => void
   ): void;
 
   /**