From 1a7acfd92b414c988f59d043242fd15774910e8f Mon Sep 17 00:00:00 2001 From: Uzlopak Date: Sat, 27 Aug 2022 11:00:10 +0200 Subject: [PATCH] replace FastifyLoggerInstance occurences in typings with FastifyBaseLogger (#4224) --- types/hooks.d.ts | 50 ++++++++++++++++++++++----------------------- types/instance.d.ts | 42 ++++++++++++++++++------------------- types/logger.d.ts | 2 +- types/plugin.d.ts | 6 +++--- types/reply.d.ts | 4 ++-- types/request.d.ts | 4 ++-- types/route.d.ts | 18 ++++++++-------- 7 files changed, 63 insertions(+), 63 deletions(-) diff --git a/types/hooks.d.ts b/types/hooks.d.ts index 54f8f634c3..03efbf8f36 100644 --- a/types/hooks.d.ts +++ b/types/hooks.d.ts @@ -5,7 +5,7 @@ import { RawServerBase, RawServerDefault, RawRequestDefaultExpression, RawReplyD import { FastifyRequest } from './request' import { FastifyReply } from './reply' import { FastifyError } from '@fastify/error' -import { FastifyLoggerInstance } from './logger' +import { FastifyBaseLogger } from './logger' import { FastifyTypeProvider, FastifyTypeProviderDefault @@ -34,7 +34,7 @@ export interface onRequestHookHandler< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { ( this: FastifyInstance, @@ -52,7 +52,7 @@ export interface onRequestAsyncHookHandler< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { ( this: FastifyInstance, @@ -73,7 +73,7 @@ export interface preParsingHookHandler< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { ( this: FastifyInstance, @@ -92,7 +92,7 @@ export interface preParsingAsyncHookHandler< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { ( this: FastifyInstance, @@ -113,7 +113,7 @@ export interface preValidationHookHandler< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { ( this: FastifyInstance, @@ -131,7 +131,7 @@ export interface preValidationAsyncHookHandler< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { ( this: FastifyInstance, @@ -151,7 +151,7 @@ export interface preHandlerHookHandler< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { ( this: FastifyInstance, @@ -169,7 +169,7 @@ export interface preHandlerAsyncHookHandler< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { ( this: FastifyInstance, @@ -198,7 +198,7 @@ export interface preSerializationHookHandler< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { ( this: FastifyInstance, @@ -218,7 +218,7 @@ export interface preSerializationAsyncHookHandler< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { ( this: FastifyInstance, @@ -241,7 +241,7 @@ export interface onSendHookHandler< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { ( this: FastifyInstance, @@ -261,7 +261,7 @@ export interface onSendAsyncHookHandler< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { ( this: FastifyInstance, @@ -283,7 +283,7 @@ export interface onResponseHookHandler< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { ( this: FastifyInstance, @@ -301,7 +301,7 @@ export interface onResponseAsyncHookHandler< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { ( this: FastifyInstance, @@ -322,7 +322,7 @@ export interface onTimeoutHookHandler< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { ( this: FastifyInstance, @@ -340,7 +340,7 @@ export interface onTimeoutAsyncHookHandler< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { ( this: FastifyInstance, @@ -364,7 +364,7 @@ export interface onErrorHookHandler< TError extends Error = FastifyError, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { ( this: FastifyInstance, @@ -384,7 +384,7 @@ export interface onErrorAsyncHookHandler< TError extends Error = FastifyError, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { ( this: FastifyInstance, @@ -407,7 +407,7 @@ export interface onRouteHookHandler< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { ( this: FastifyInstance, @@ -424,7 +424,7 @@ export interface onRegisterHookHandler< RawServer extends RawServerBase = RawServerDefault, RawRequest extends RawRequestDefaultExpression = RawRequestDefaultExpression, RawReply extends RawReplyDefaultExpression = RawReplyDefaultExpression, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance, + Logger extends FastifyBaseLogger = FastifyBaseLogger, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, Options extends FastifyPluginOptions = FastifyPluginOptions > { @@ -442,7 +442,7 @@ export interface onReadyHookHandler< RawServer extends RawServerBase = RawServerDefault, RawRequest extends RawRequestDefaultExpression = RawRequestDefaultExpression, RawReply extends RawReplyDefaultExpression = RawReplyDefaultExpression, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance, + Logger extends FastifyBaseLogger = FastifyBaseLogger, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, > { ( @@ -455,7 +455,7 @@ export interface onReadyAsyncHookHandler< RawServer extends RawServerBase = RawServerDefault, RawRequest extends RawRequestDefaultExpression = RawRequestDefaultExpression, RawReply extends RawReplyDefaultExpression = RawReplyDefaultExpression, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance, + Logger extends FastifyBaseLogger = FastifyBaseLogger, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, > { ( @@ -469,7 +469,7 @@ export interface onCloseHookHandler< RawServer extends RawServerBase = RawServerDefault, RawRequest extends RawRequestDefaultExpression = RawRequestDefaultExpression, RawReply extends RawReplyDefaultExpression = RawReplyDefaultExpression, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance, + Logger extends FastifyBaseLogger = FastifyBaseLogger, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, > { ( @@ -482,7 +482,7 @@ export interface onCloseAsyncHookHandler< RawServer extends RawServerBase = RawServerDefault, RawRequest extends RawRequestDefaultExpression = RawRequestDefaultExpression, RawReply extends RawReplyDefaultExpression = RawReplyDefaultExpression, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance, + Logger extends FastifyBaseLogger = FastifyBaseLogger, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault > { ( diff --git a/types/instance.d.ts b/types/instance.d.ts index 6db78ddd61..10693669c6 100644 --- a/types/instance.d.ts +++ b/types/instance.d.ts @@ -4,7 +4,7 @@ import * as http from 'http' import { CallbackFunc as LightMyRequestCallback, Chain as LightMyRequestChain, InjectOptions, Response as LightMyRequestResponse } from 'light-my-request' import { AddContentTypeParser, ConstructorAction, FastifyBodyParser, getDefaultJsonParser, hasContentTypeParser, ProtoAction, removeAllContentTypeParsers, removeContentTypeParser } from './content-type-parser' import { onCloseAsyncHookHandler, onCloseHookHandler, onErrorAsyncHookHandler, onErrorHookHandler, onReadyAsyncHookHandler, onReadyHookHandler, onRegisterHookHandler, onRequestAsyncHookHandler, onRequestHookHandler, onResponseAsyncHookHandler, onResponseHookHandler, onRouteHookHandler, onSendAsyncHookHandler, onSendHookHandler, onTimeoutAsyncHookHandler, onTimeoutHookHandler, preHandlerAsyncHookHandler, preHandlerHookHandler, preParsingAsyncHookHandler, preParsingHookHandler, preSerializationAsyncHookHandler, preSerializationHookHandler, preValidationAsyncHookHandler, preValidationHookHandler } from './hooks' -import { FastifyLoggerInstance } from './logger' +import { FastifyBaseLogger } from './logger' import { FastifyRegister } from './register' import { FastifyReply } from './reply' import { FastifyRequest } from './request' @@ -84,7 +84,7 @@ export interface FastifyInstance< RawServer extends RawServerBase = RawServerDefault, RawRequest extends RawRequestDefaultExpression = RawRequestDefaultExpression, RawReply extends RawReplyDefaultExpression = RawReplyDefaultExpression, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance, + Logger extends FastifyBaseLogger = FastifyBaseLogger, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, > { server: RawServer; @@ -198,7 +198,7 @@ export interface FastifyInstance< RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger >( name: 'onRequest', hook: onRequestHookHandler @@ -208,7 +208,7 @@ export interface FastifyInstance< RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger >( name: 'onRequest', hook: onRequestAsyncHookHandler @@ -222,7 +222,7 @@ export interface FastifyInstance< RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger >( name: 'preParsing', hook: preParsingHookHandler @@ -232,7 +232,7 @@ export interface FastifyInstance< RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger >( name: 'preParsing', hook: preParsingAsyncHookHandler @@ -245,7 +245,7 @@ export interface FastifyInstance< RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger >( name: 'preValidation', hook: preValidationHookHandler @@ -255,7 +255,7 @@ export interface FastifyInstance< RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger >( name: 'preValidation', hook: preValidationAsyncHookHandler @@ -268,7 +268,7 @@ export interface FastifyInstance< RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger >( name: 'preHandler', hook: preHandlerHookHandler @@ -278,7 +278,7 @@ export interface FastifyInstance< RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger >( name: 'preHandler', hook: preHandlerAsyncHookHandler @@ -293,7 +293,7 @@ export interface FastifyInstance< RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger >( name: 'preSerialization', hook: preSerializationHookHandler @@ -304,7 +304,7 @@ export interface FastifyInstance< RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger >( name: 'preSerialization', hook: preSerializationAsyncHookHandler @@ -319,7 +319,7 @@ export interface FastifyInstance< RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger >( name: 'onSend', hook: onSendHookHandler @@ -330,7 +330,7 @@ export interface FastifyInstance< RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger >( name: 'onSend', hook: onSendAsyncHookHandler @@ -344,7 +344,7 @@ export interface FastifyInstance< RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger >( name: 'onResponse', hook: onResponseHookHandler @@ -354,7 +354,7 @@ export interface FastifyInstance< RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger >( name: 'onResponse', hook: onResponseAsyncHookHandler @@ -368,7 +368,7 @@ export interface FastifyInstance< RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger >( name: 'onTimeout', hook: onTimeoutHookHandler @@ -378,7 +378,7 @@ export interface FastifyInstance< RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger >( name: 'onTimeout', hook: onTimeoutAsyncHookHandler @@ -394,7 +394,7 @@ export interface FastifyInstance< RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger >( name: 'onError', hook: onErrorHookHandler @@ -404,7 +404,7 @@ export interface FastifyInstance< RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger >( name: 'onError', hook: onErrorAsyncHookHandler @@ -419,7 +419,7 @@ export interface FastifyInstance< RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger >( name: 'onRoute', hook: onRouteHookHandler diff --git a/types/logger.d.ts b/types/logger.d.ts index d25f01da42..5fccf5b9c1 100644 --- a/types/logger.d.ts +++ b/types/logger.d.ts @@ -23,7 +23,7 @@ export type FastifyBaseLogger = pino.BaseLogger & { child(bindings: Bindings, options?: ChildLoggerOptions): FastifyBaseLogger } -// TODO delete FastifyLoggerInstance in the next major release. It seems that it is enough to have only FastifyBaseLogger. +// TODO delete FastifyBaseLogger in the next major release. It seems that it is enough to have only FastifyBaseLogger. /** * @deprecated Use FastifyBaseLogger instead */ diff --git a/types/plugin.d.ts b/types/plugin.d.ts index 302422b57f..77bce4e118 100644 --- a/types/plugin.d.ts +++ b/types/plugin.d.ts @@ -1,7 +1,7 @@ import { FastifyInstance } from './instance' import { RawServerBase, RawRequestDefaultExpression, RawReplyDefaultExpression, RawServerDefault } from './utils' import { FastifyTypeProvider, FastifyTypeProviderDefault } from './type-provider' -import { FastifyLoggerInstance } from './logger' +import { FastifyBaseLogger } from './logger' export type FastifyPluginOptions = Record @@ -11,7 +11,7 @@ export type FastifyPluginOptions = Record * Fastify allows the user to extend its functionalities with plugins. A plugin can be a set of routes, a server decorator or whatever. To activate plugins, use the `fastify.register()` method. */ export type FastifyPluginCallback, Server extends RawServerBase = RawServerDefault, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault> = ( - instance: FastifyInstance, RawReplyDefaultExpression, FastifyLoggerInstance, TypeProvider>, + instance: FastifyInstance, RawReplyDefaultExpression, FastifyBaseLogger, TypeProvider>, opts: Options, done: (err?: Error) => void ) => void @@ -26,7 +26,7 @@ export type FastifyPluginAsync< Server extends RawServerBase = RawServerDefault, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, > = ( - instance: FastifyInstance, RawReplyDefaultExpression, FastifyLoggerInstance, TypeProvider>, + instance: FastifyInstance, RawReplyDefaultExpression, FastifyBaseLogger, TypeProvider>, opts: Options ) => Promise; diff --git a/types/reply.d.ts b/types/reply.d.ts index 8b63716002..5cc08f41d8 100644 --- a/types/reply.d.ts +++ b/types/reply.d.ts @@ -1,7 +1,7 @@ import { RawReplyDefaultExpression, RawServerBase, RawServerDefault, ContextConfigDefault, RawRequestDefaultExpression, ReplyDefault } from './utils' import { FastifyReplyType, ResolveFastifyReplyType, FastifyTypeProvider, FastifyTypeProviderDefault } from './type-provider' import { FastifyContext } from './context' -import { FastifyLoggerInstance } from './logger' +import { FastifyBaseLogger } from './logger' import { FastifyRequest } from './request' import { RouteGenericInterface } from './route' import { FastifyInstance } from './instance' @@ -28,7 +28,7 @@ export interface FastifyReply< > { raw: RawReply; context: FastifyContext; - log: FastifyLoggerInstance; + log: FastifyBaseLogger; request: FastifyRequest; server: FastifyInstance; code(statusCode: number): FastifyReply; diff --git a/types/request.d.ts b/types/request.d.ts index 35418ef2a4..50ca80c4ef 100644 --- a/types/request.d.ts +++ b/types/request.d.ts @@ -1,4 +1,4 @@ -import { FastifyLoggerInstance } from './logger' +import { FastifyBaseLogger } from './logger' import { ContextConfigDefault, RawServerBase, RawServerDefault, RawRequestDefaultExpression, RequestBodyDefault, RequestQuerystringDefault, RequestParamsDefault, RequestHeadersDefault } from './utils' import { RouteGenericInterface } from './route' import { FastifyInstance } from './instance' @@ -24,7 +24,7 @@ export interface FastifyRequest // ^ Temporary Note: RequestType has been re-ordered to be the last argument in // generic list. This generic argument is now considered optional as it can be diff --git a/types/route.d.ts b/types/route.d.ts index bb58ede478..f8d2675cb4 100644 --- a/types/route.d.ts +++ b/types/route.d.ts @@ -11,7 +11,7 @@ import { FastifyTypeProviderDefault, ResolveFastifyReplyReturnType } from './type-provider' -import { FastifyLoggerInstance, LogLevel } from './logger' +import { FastifyBaseLogger, LogLevel } from './logger' export interface RouteGenericInterface extends RequestGenericInterface, ReplyGenericInterface {} @@ -26,7 +26,7 @@ export interface RouteShorthandOptions< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > { schema?: SchemaCompiler, // originally FastifySchema attachValidation?: boolean; @@ -67,7 +67,7 @@ export type RouteHandlerMethod< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > = ( this: FastifyInstance, request: FastifyRequest, @@ -86,7 +86,7 @@ export interface RouteShorthandOptionsWithHandler< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > extends RouteShorthandOptions { handler: RouteHandlerMethod; } @@ -100,16 +100,16 @@ export interface RouteShorthandMethod< RawReply extends RawReplyDefaultExpression = RawReplyDefaultExpression, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, > { - ( + ( path: string, opts: RouteShorthandOptions, handler: RouteHandlerMethod ): FastifyInstance; - ( + ( path: string, handler: RouteHandlerMethod ): FastifyInstance; - ( + ( path: string, opts: RouteShorthandOptionsWithHandler ): FastifyInstance; @@ -126,7 +126,7 @@ export interface RouteOptions< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > extends RouteShorthandOptions { method: HTTPMethods | HTTPMethods[]; url: string; @@ -141,7 +141,7 @@ export type RouteHandler< ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault, - Logger extends FastifyLoggerInstance = FastifyLoggerInstance + Logger extends FastifyBaseLogger = FastifyBaseLogger > = ( this: FastifyInstance, request: FastifyRequest,