fastify 4.23.0 → 4.23.2

package/docs/Reference/Request.md

@@ -31,7 +31,7 @@ Request is a core Fastify object containing the following fields:
   original `url` in case of internal re-routing 
 - `routerMethod` - Deprecated, use `request.routeOptions.method` instead. The
   method defined for the router that is handling the request
-- `routerPath` - Deprecated, use `request.routeOptions.config.url` instead. The
+- `routerPath` - Deprecated, use `request.routeOptions.url` instead. The
   path pattern defined for the router that is handling the request
 - `is404` - true if request is being handled by 404 handler, false if it is not
 - `connection` - Deprecated, use `socket` instead. The underlying connection of

package/fastify.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const VERSION = '4.23.0'
+const VERSION = '4.23.2'
 
 const Avvio = require('avvio')
 const http = require('node:http')

package/lib/warnings.js

@@ -31,9 +31,9 @@ warning.create('FastifyDeprecation', 'FSTDEP015', 'You are accessing the depreca
 
 warning.create('FastifyDeprecation', 'FSTDEP016', 'You are accessing the deprecated "request.routeConfig" property. Use "request.routeOptions.config" instead. Property "req.routeConfig" will be removed in `fastify@5`.')
 
-warning.create('FastifyDeprecation', 'FSTDEP017', 'You are accessing the deprecated "request.routerPath" property. Use "request.routeOptions.config.url" instead. Property "req.routerPath" will be removed in `fastify@5`.')
+warning.create('FastifyDeprecation', 'FSTDEP017', 'You are accessing the deprecated "request.routerPath" property. Use "request.routeOptions.url" instead. Property "req.routerPath" will be removed in `fastify@5`.')
 
-warning.create('FastifyDeprecation', 'FSTDEP018', 'You are accessing the deprecated "request.routerMethod" property. Use "request.routeOptions.config.method" instead. Property "req.routerMethod" will be removed in `fastify@5`.')
+warning.create('FastifyDeprecation', 'FSTDEP018', 'You are accessing the deprecated "request.routerMethod" property. Use "request.routeOptions.method" instead. Property "req.routerMethod" will be removed in `fastify@5`.')
 
 warning.create('FastifyWarning', 'FSTWRN001', 'The %s schema for %s: %s is missing. This may indicate the schema is not well specified.', { unlimited: true })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify",
-  "version": "4.23.0",
+  "version": "4.23.2",
   "description": "Fast and low overhead web framework, for Node.js",
   "main": "fastify.js",
   "type": "commonjs",

package/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,7 +78,10 @@ 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<FastifySchema>(request.routeOptions.schema)
 
   expectType<RequestHeadersDefault & RawRequestDefaultExpression['headers']>(request.headers)
   request.headers = {}

package/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,17 @@ export interface ValidationFunction {
   errors?: null | ErrorObject[];
 }
 
-export interface RequestRouteOptions {
-  method: string,
-  url: string,
-  bodyLimit:number,
-  attachValidation:boolean,
-  logLevel:string,
-  version: string | undefined,
-  exposeHeadRoute: boolean,
-  prefixTrailingSlash: string
+export interface RequestRouteOptions<ContextConfig = ContextConfigDefault, SchemaCompiler = FastifySchema> {
+  method: string;
+  url: string;
+  bodyLimit:number;
+  attachValidation:boolean;
+  logLevel:string;
+  version: string | undefined;
+  exposeHeadRoute: boolean;
+  prefixTrailingSlash: string;
+  config: FastifyContextConfig & FastifyRouteConfig & ContextConfig;
+  schema: SchemaCompiler;
 }
 
 /**
@@ -78,7 +80,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, SchemaCompiler>>
   readonly is404: boolean;
   readonly socket: RawRequest['socket'];