Adjust FastifyInstance types

Author: kibertoad

lib/errors/errorHandler.ts

@@ -128,9 +128,16 @@ export type ErrorHandlerParams = {
   resolveLogObject?: (error: unknown) => FreeformRecord | undefined
 }
 
-export function createErrorHandler(params: ErrorHandlerParams) {
+export function createErrorHandler(params: ErrorHandlerParams): (
+  // biome-ignore lint/suspicious/noExplicitAny: We should support any fastify instance generics
+  this: FastifyInstance<any, any, any, any, any>,
+  error: FreeformRecord,
+  request: FastifyRequest,
+  reply: FastifyReply,
+) => void {
   return function errorHandler(
-    this: FastifyInstance,
+    // biome-ignore lint/suspicious/noExplicitAny: We should support any fastify instance generics
+    this: FastifyInstance<any, any, any, any, any>,
     error: FreeformRecord,
     request: FastifyRequest,
     reply: FastifyReply,

lib/plugins/healthcheck/healthcheckCommons.ts

@@ -1,12 +1,35 @@
-import type { Either } from '@lokalise/node-core'
+import type { CommonLogger, Either } from '@lokalise/node-core'
 import type { FastifyInstance } from 'fastify'
+import type { FastifyTypeProviderDefault } from 'fastify/types/type-provider'
+import type {
+  RawReplyDefaultExpression,
+  RawRequestDefaultExpression,
+  RawServerDefault,
+} from 'fastify/types/utils'
 
-export type HealthChecker = (app: FastifyInstance) => Promise<Either<Error, true>>
+export type HealthChecker = (
+  app: FastifyInstance<
+    RawServerDefault,
+    RawRequestDefaultExpression,
+    RawReplyDefaultExpression,
+    CommonLogger,
+    FastifyTypeProviderDefault
+  >,
+) => Promise<Either<Error, true>>
 
 /**
  * Return a function which executes healthcheck and throws an error if it fails
  */
-export const wrapHealthCheck = (app: FastifyInstance, healthCheck: HealthChecker) => {
+export const wrapHealthCheck = (
+  app: FastifyInstance<
+    RawServerDefault,
+    RawRequestDefaultExpression,
+    RawReplyDefaultExpression,
+    CommonLogger,
+    FastifyTypeProviderDefault
+  >,
+  healthCheck: HealthChecker,
+) => {
   return async () => {
     const response = await healthCheck(app)
     if (response.error) {

lib/plugins/healthcheck/healthcheckMetricsPlugin.ts

@@ -1,6 +1,13 @@
 import type { FastifyInstance } from 'fastify'
 import fp from 'fastify-plugin'
 
+import type { CommonLogger } from '@lokalise/node-core'
+import type { FastifyTypeProviderDefault } from 'fastify/types/type-provider'
+import type {
+  RawReplyDefaultExpression,
+  RawRequestDefaultExpression,
+  RawServerDefault,
+} from 'fastify/types/utils'
 import type { HealthChecker } from './healthcheckCommons'
 
 const VALID_PROMETHEUS_NAME_REGEX = /[a-zA-Z_:][a-zA-Z0-9_:]*/
@@ -16,7 +23,15 @@ export type HealthcheckResult = {
 
 export type PrometheusHealthCheck = {
   name: string
-  checker: (app: FastifyInstance) => Promise<HealthcheckResult>
+  checker: (
+    app: FastifyInstance<
+      RawServerDefault,
+      RawRequestDefaultExpression,
+      RawReplyDefaultExpression,
+      CommonLogger,
+      FastifyTypeProviderDefault
+    >,
+  ) => Promise<HealthcheckResult>
 }
 
 /**
@@ -28,7 +43,15 @@ export const wrapHealthCheckForPrometheus = (
 ): PrometheusHealthCheck => {
   return {
     name: healthcheckName,
-    checker: async (app: FastifyInstance): Promise<HealthcheckResult> => {
+    checker: async (
+      app: FastifyInstance<
+        RawServerDefault,
+        RawRequestDefaultExpression,
+        RawReplyDefaultExpression,
+        CommonLogger,
+        FastifyTypeProviderDefault
+      >,
+    ): Promise<HealthcheckResult> => {
       const startTime = Date.now()
       const response = await healthCheck(app)
       const checkTimeInMsecs = Date.now() - startTime
@@ -42,7 +65,13 @@ export const wrapHealthCheckForPrometheus = (
 }
 
 function plugin(
-  app: FastifyInstance,
+  app: FastifyInstance<
+    RawServerDefault,
+    RawRequestDefaultExpression,
+    RawReplyDefaultExpression,
+    CommonLogger,
+    FastifyTypeProviderDefault
+  >,
   opts: HealthcheckMetricsPluginOptions,
   done: (err?: Error) => void,
 ) {

lib/plugins/healthcheck/publicHealthcheckPlugin.ts

@@ -1,6 +1,13 @@
 import type { FastifyInstance } from 'fastify'
 import fp from 'fastify-plugin'
 
+import type { CommonLogger } from '@lokalise/node-core'
+import type { FastifyTypeProviderDefault } from 'fastify/types/type-provider'
+import type {
+  RawReplyDefaultExpression,
+  RawRequestDefaultExpression,
+  RawServerDefault,
+} from 'fastify/types/utils'
 import type { HealthChecker } from './healthcheckCommons'
 
 export interface PublicHealthcheckPluginOptions {
@@ -22,7 +29,17 @@ export type HealthCheck = {
   checker: HealthChecker
 }
 
-function plugin(app: FastifyInstance, opts: PublicHealthcheckPluginOptions, done: () => void) {
+function plugin(
+  app: FastifyInstance<
+    RawServerDefault,
+    RawRequestDefaultExpression,
+    RawReplyDefaultExpression,
+    CommonLogger,
+    FastifyTypeProviderDefault
+  >,
+  opts: PublicHealthcheckPluginOptions,
+  done: () => void,
+) {
   const responsePayload = opts.responsePayload ?? {}
   app.route({
     url: opts.url ?? '/health',