Add routeOptions.config to types (#5034)

Signed-off-by: Matteo Collina <hello@matteocollina.com>
fastify · Sep 13, 2023 · 30c2dff · 30c2dff
1 parent 6b9b093
commit 30c2dff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/test/types/request.test-d.ts b/test/types/request.test-d.ts
@@ -3,6 +3,7 @@ import { expectAssignable, expectType } from 'tsd'
 import fastify, {
   ContextConfigDefault,
   FastifyContext,
+  FastifyContextConfig,
   FastifyLogFn,
   FastifySchema,
   FastifyTypeProviderDefault,
@@ -18,7 +19,7 @@ import { FastifyInstance } from '../../types/instance'
 import { FastifyLoggerInstance } from '../../types/logger'
 import { FastifyReply } from '../../types/reply'
 import { FastifyRequest, RequestRouteOptions } from '../../types/request'
-import { RouteGenericInterface } from '../../types/route'
+import { FastifyRouteConfig, RouteGenericInterface } from '../../types/route'
 import { RequestHeadersDefault, RequestParamsDefault, RequestQuerystringDefault } from '../../types/utils'
 
 interface RequestBody {
@@ -77,6 +78,8 @@ const getHandler: RouteHandler = function (request, _reply) {
   expectType<FastifyContext<ContextConfigDefault>>(request.context)
   expectType<FastifyContext<ContextConfigDefault>['config']>(request.context.config)
   expectType<FastifyContext<ContextConfigDefault>['config']>(request.routeConfig)
+  expectType<FastifyContext<ContextConfigDefault>['config']>(request.routeOptions.config)
+  expectType<ContextConfigDefault & FastifyRouteConfig & FastifyContextConfig>(request.routeOptions.config)
   expectType<FastifySchema>(request.routeSchema)
 
   expectType<RequestHeadersDefault & RawRequestDefaultExpression['headers']>(request.headers)

diff --git a/types/request.d.ts b/types/request.d.ts
@@ -1,8 +1,8 @@
 import { ErrorObject } from '@fastify/ajv-compiler'
-import { FastifyContext } from './context'
+import { FastifyContext, FastifyContextConfig } from './context'
 import { FastifyInstance } from './instance'
 import { FastifyBaseLogger } from './logger'
-import { RouteGenericInterface } from './route'
+import { RouteGenericInterface, FastifyRouteConfig } from './route'
 import { FastifySchema } from './schema'
 import { FastifyRequestType, FastifyTypeProvider, FastifyTypeProviderDefault, ResolveFastifyRequestType } from './type-provider'
 import { ContextConfigDefault, RawRequestDefaultExpression, RawServerBase, RawServerDefault, RequestBodyDefault, RequestHeadersDefault, RequestParamsDefault, RequestQuerystringDefault } from './utils'
@@ -20,15 +20,16 @@ export interface ValidationFunction {
   errors?: null | ErrorObject[];
 }
 
-export interface RequestRouteOptions {
+export interface RequestRouteOptions<ContextConfig = ContextConfigDefault> {
   method: string,
   url: string,
   bodyLimit:number,
   attachValidation:boolean,
   logLevel:string,
   version: string | undefined,
   exposeHeadRoute: boolean,
-  prefixTrailingSlash: string
+  prefixTrailingSlash: string,
+  config: FastifyContextConfig & FastifyRouteConfig & ContextConfig
 }
 
 /**
@@ -78,7 +79,7 @@ export interface FastifyRequest<RouteGeneric extends RouteGenericInterface = Rou
   readonly method: string;
   readonly routerPath: string;
   readonly routerMethod: string;
-  readonly routeOptions: Readonly<RequestRouteOptions>
+  readonly routeOptions: Readonly<RequestRouteOptions<ContextConfig>>
   readonly is404: boolean;
   readonly socket: RawRequest['socket'];