Companion change to fastify PR

See fastify/fastify#5648
fastify · Sep 2, 2024 · 468a769 · 468a769
1 parent 39e89ea
commit 468a769
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "@types/node": "^22.0.0",
     "concat-stream": "^2.0.0",
     "eslint": "^9.9.0",
-    "fastify": "^5.0.0-alpha.3",
+    "fastify": "voxpelli/fastify#prototype-improved-register",
     "neostandard": "^0.11.3",
     "pino": "^9.1.0",
     "proxyquire": "^2.1.3",

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -2,17 +2,19 @@
 //                 Leo <https://github.com/leomelzer>
 /// <reference types="node" />
 
-import { FastifyPluginAsync, FastifyReply, FastifyRequest, RouteOptions } from 'fastify'
+import { FastifyPluginAsync, FastifyReply, FastifyReplyMixin, FastifyRequest, RouteOptions } from 'fastify'
 import { Stats } from 'fs'
 
 declare module 'fastify' {
-  interface FastifyReply {
-    sendFile(filename: string, rootPath?: string): FastifyReply;
-    sendFile(filename: string, options?: fastifyStatic.SendOptions): FastifyReply;
-    sendFile(filename: string, rootPath?: string, options?: fastifyStatic.SendOptions): FastifyReply;
-    download(filepath: string, options?: fastifyStatic.SendOptions): FastifyReply;
-    download(filepath: string, filename?: string): FastifyReply;
-    download(filepath: string, filename?: string, options?: fastifyStatic.SendOptions): FastifyReply;
+  interface FastifyReplyMixins {
+    fastifyStatic: FastifyReplyMixin<'fastifyStatic', {
+      sendFile<T extends FastifyReply>(this: T, filename: string, rootPath?: string): T,
+      sendFile<T extends FastifyReply>(this: T, filename: string, options?: fastifyStatic.SendOptions): T,
+      sendFile<T extends FastifyReply>(this: T, filename: string, rootPath?: string, options?: fastifyStatic.SendOptions): T,
+      download<T extends FastifyReply>(this: T, filepath: string, options?: fastifyStatic.SendOptions): T,
+      download<T extends FastifyReply>(this: T, filepath: string, filename?: string): T,
+      download<T extends FastifyReply>(this: T, filepath: string, filename?: string, options?: fastifyStatic.SendOptions): T,
+    }>
   }
 }
 

diff --git a/types/index.test-d.ts b/types/index.test-d.ts
@@ -121,7 +121,9 @@ appWithImplicitHttp
   .register(fastifyStatic, options)
   .after(() => {
     appWithImplicitHttp.get('/', (request, reply) => {
-      reply.sendFile('some-file-name')
+      if (reply.hasMixin('fastifyStatic')) {
+        reply.sendFile('some-file-name').sendFile('some-file-name')
+      }
     })
   })