fastify 3.16.0 → 3.18.0

package/test/internals/reply.test.js

@@ -1685,19 +1685,3 @@ test('reply.then', t => {
     response.destroy(_err)
   })
 })
-
-test('reply.sent should read from response.writableEnded if it is defined', t => {
-  t.plan(1)
-
-  const reply = new Reply({ writableEnded: true }, {}, {})
-
-  t.equal(reply.sent, true)
-})
-
-test('reply.sent should read from response.headersSent and response.finished if response.writableEnded is not defined', t => {
-  t.plan(1)
-
-  const reply = new Reply({ headersSent: true, finished: true }, {}, {})
-
-  t.equal(reply.sent, true)
-})

package/test/pretty-print.test.js

@@ -121,3 +121,92 @@ test('pretty print - nested plugins', t => {
     t.match(tree, 'baz')
   })
 })
+
+test('pretty print - commonPrefix', t => {
+  t.plan(4)
+
+  const fastify = Fastify()
+  fastify.get('/hello', () => {})
+  fastify.put('/hello', () => {})
+  fastify.get('/helicopter', () => {})
+
+  fastify.ready(() => {
+    const radixTree = fastify.printRoutes()
+    const flatTree = fastify.printRoutes({ commonPrefix: false })
+
+    const radixExpected = `└── /
+    ├── hel
+    │   ├── lo (GET)
+    │   └── icopter (GET)
+    └── hello (PUT)
+`
+    const flatExpected = `└── / (-)
+    ├── helicopter (GET)
+    └── hello (GET, PUT)
+`
+    t.equal(typeof radixTree, 'string')
+    t.equal(typeof flatTree, 'string')
+    t.equal(radixTree, radixExpected)
+    t.equal(flatTree, flatExpected)
+  })
+})
+
+test('pretty print - includeMeta, includeHooks', t => {
+  t.plan(6)
+
+  const fastify = Fastify()
+  const onTimeout = () => {}
+  fastify.get('/hello', () => {})
+  fastify.put('/hello', () => {})
+  fastify.get('/helicopter', () => {})
+
+  fastify.addHook('onRequest', () => {})
+  fastify.addHook('onTimeout', onTimeout)
+
+  fastify.ready(() => {
+    const radixTree = fastify.printRoutes({ includeHooks: true, includeMeta: ['errorHandler'] })
+    const flatTree = fastify.printRoutes({ commonPrefix: false, includeHooks: true, includeMeta: ['errorHandler'] })
+    const hooksOnly = fastify.printRoutes({ commonPrefix: false, includeHooks: true })
+
+    const radixExpected = `└── /
+    ├── hel
+    │   ├── lo (GET)
+    │   │   • (onTimeout) ["onTimeout()"]
+    │   │   • (onRequest) ["anonymous()"]
+    │   │   • (errorHandler) "defaultErrorHandler()"
+    │   └── icopter (GET)
+    │       • (onTimeout) ["onTimeout()"]
+    │       • (onRequest) ["anonymous()"]
+    │       • (errorHandler) "defaultErrorHandler()"
+    └── hello (PUT)
+        • (onTimeout) ["onTimeout()"]
+        • (onRequest) ["anonymous()"]
+        • (errorHandler) "defaultErrorHandler()"
+`
+    const flatExpected = `└── / (-)
+    ├── helicopter (GET)
+    │   • (onTimeout) ["onTimeout()"]
+    │   • (onRequest) ["anonymous()"]
+    │   • (errorHandler) "defaultErrorHandler()"
+    └── hello (GET, PUT)
+        • (onTimeout) ["onTimeout()"]
+        • (onRequest) ["anonymous()"]
+        • (errorHandler) "defaultErrorHandler()"
+`
+
+    const hooksOnlyExpected = `└── / (-)
+    ├── helicopter (GET)
+    │   • (onTimeout) ["onTimeout()"]
+    │   • (onRequest) ["anonymous()"]
+    └── hello (GET, PUT)
+        • (onTimeout) ["onTimeout()"]
+        • (onRequest) ["anonymous()"]
+`
+    t.equal(typeof radixTree, 'string')
+    t.equal(typeof flatTree, 'string')
+    t.equal(typeof hooksOnlyExpected, 'string')
+    t.equal(radixTree, radixExpected)
+    t.equal(flatTree, flatExpected)
+    t.equal(hooksOnly, hooksOnlyExpected)
+  })
+})

package/test/types/fastify.test-d.ts

@@ -3,12 +3,15 @@ import fastify, {
   FastifyInstance,
   FastifyPlugin,
   FastifyPluginAsync,
-  FastifyPluginCallback
+  FastifyPluginCallback,
+  LightMyRequestChain,
+  LightMyRequestResponse,
+  LightMyRequestCallback,
+  InjectOptions
 } from '../../fastify'
 import * as http from 'http'
 import * as https from 'https'
 import * as http2 from 'http2'
-import { Chain as LightMyRequestChain } from 'light-my-request'
 import { expectType, expectError, expectAssignable } from 'tsd'
 import { FastifyLoggerInstance } from '../../types/logger'
 import { Socket } from 'net'
@@ -27,6 +30,14 @@ expectType<LightMyRequestChain>(fastify({ http2: true, https: {} }).inject())
 expectError(fastify<http2.Http2Server>({ http2: false })) // http2 option must be true
 expectError(fastify<http2.Http2SecureServer>({ http2: false })) // http2 option must be true
 
+// light-my-request
+expectAssignable<InjectOptions>({ query: '' })
+fastify({ http2: true, https: {} }).inject().then((resp) => {
+  expectAssignable<LightMyRequestResponse>(resp)
+})
+const lightMyRequestCallback: LightMyRequestCallback = (err: Error, response: LightMyRequestResponse) => {}
+fastify({ http2: true, https: {} }).inject({}, lightMyRequestCallback)
+
 // server options
 expectAssignable<FastifyInstance<http2.Http2Server, http2.Http2ServerRequest, http2.Http2ServerResponse>>(fastify({ http2: true }))
 expectAssignable<FastifyInstance>(fastify({ ignoreTrailingSlash: true }))

package/test/versioned-routes.test.js

@@ -632,7 +632,7 @@ test('Should trigger a warning when a versioned route is registered via version
   t.plan(4)
 
   function onWarning (code) {
-    t.equal(code, 'FSTDEP006')
+    t.equal(code, 'FSTDEP008')
   }
   const warning = {
     emit: onWarning

package/test/wrapThenable.test.js

@@ -4,7 +4,6 @@ const t = require('tap')
 const test = t.test
 const { kReplySentOverwritten } = require('../lib/symbols')
 const wrapThenable = require('../lib/wrapThenable')
-const Reply = require('../lib/reply')
 
 test('should resolve immediately when reply[kReplySentOverwritten] is true', t => {
   const reply = {}
@@ -16,7 +15,7 @@ test('should resolve immediately when reply[kReplySentOverwritten] is true', t =
 
 test('should reject immediately when reply[kReplySentOverwritten] is true', t => {
   t.plan(1)
-  const reply = new Reply({}, {}, {})
+  const reply = { res: {} }
   reply[kReplySentOverwritten] = true
   reply.log = {
     error: ({ err }) => {