Adds defaults to TS generics definitions (#1669)

fastify · May 24, 2019 · 1958c74 · 1958c74
1 parent 712337d
commit 1958c74
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/fastify.d.ts b/fastify.d.ts
@@ -69,9 +69,9 @@ declare namespace fastify {
   }
 
   type FastifyMiddleware<
-  HttpServer,
-  HttpRequest,
-  HttpResponse,
+  HttpServer = http.Server,
+  HttpRequest = http.IncomingMessage,
+  HttpResponse = http.ServerResponse,
   Query = DefaultQuery,
   Params = DefaultParams,
   Headers = DefaultHeaders,
@@ -84,9 +84,9 @@ declare namespace fastify {
   ) => void
 
   type FastifyMiddlewareWithPayload<
-  HttpServer,
-  HttpRequest,
-  HttpResponse,
+  HttpServer = http.Server,
+  HttpRequest = http.IncomingMessage,
+  HttpResponse = http.ServerResponse,
   Query = DefaultQuery,
   Params = DefaultParams,
   Headers = DefaultHeaders,
@@ -100,8 +100,8 @@ declare namespace fastify {
   ) => void
 
   type RequestHandler<
-  HttpRequest,
-  HttpResponse,
+  HttpRequest = http.IncomingMessage,
+  HttpResponse = http.ServerResponse,
   Query = DefaultQuery,
   Params = DefaultParams,
   Headers = DefaultHeaders,
@@ -130,7 +130,7 @@ declare namespace fastify {
    * fastify's wrapped version of node.js IncomingMessage
    */
   interface FastifyRequest<
-    HttpRequest,
+    HttpRequest = http.IncomingMessage,
     Query = DefaultQuery,
     Params = DefaultParams,
     Headers = DefaultHeaders,
@@ -264,9 +264,9 @@ declare namespace fastify {
    * Route configuration options such as "url" and "method"
    */
   interface RouteOptions<
-    HttpServer,
-    HttpRequest,
-    HttpResponse,
+    HttpServer = http.Server,
+    HttpRequest = http.IncomingMessage,
+    HttpResponse = http.ServerResponse,
     Query = DefaultQuery,
     Params = DefaultParams,
     Headers = DefaultHeaders,

diff --git a/test/types/index.ts b/test/types/index.ts
@@ -604,3 +604,21 @@ const server2 = fastify()
 server2.close().then(() => {})
 const server3 = fastify()
 server3.close(() => {})
+
+{
+  // tests generics default values
+  const routeOptions: fastify.RouteOptions = {
+    method: 'GET',
+    url: '/',
+    handler: function (req, reply) { reply.send({}) }
+  }
+
+  const genericHandler: fastify.RequestHandler = (req, reply) => { reply.send(reply) }
+
+  const middleware: fastify.FastifyMiddleware = function middleware (req, reply, done) {
+    this.addHook('onClose', function (instance, done) {
+      done()
+    })
+    done()
+  }
+}