feat: use merged request body during validation when mergeMultipartFieldsAndFiles flag is enabled

Closes: #4777

Author: thetutlage

modules/http/request_validator.ts

@@ -16,6 +16,8 @@ import type {
 } from '@vinejs/vine/types'
 
 import type { HttpContext } from './main.js'
+import type { FeatureFlags } from '../app.js'
+import type { ExperimentalFlagsList } from '../../types/app.js'
 import type { RequestValidationOptions } from '../../types/http.js'
 
 /**
@@ -25,9 +27,11 @@ import type { RequestValidationOptions } from '../../types/http.js'
  */
 export class RequestValidator {
   #ctx: HttpContext
+  #experimentalFlags?: FeatureFlags<ExperimentalFlagsList>
 
-  constructor(ctx: HttpContext) {
+  constructor(ctx: HttpContext, experimentalFlags?: FeatureFlags<ExperimentalFlagsList>) {
     this.#ctx = ctx
+    this.#experimentalFlags = experimentalFlags
   }
 
   /**
@@ -75,12 +79,18 @@ export class RequestValidator {
       validatorOptions.messagesProvider = RequestValidator.messagesProvider(this.#ctx)
     }
 
+    const requestBody = this.#experimentalFlags?.enabled('mergeMultipartFieldsAndFiles')
+      ? this.#ctx.request.all()
+      : {
+          ...this.#ctx.request.all(),
+          ...this.#ctx.request.allFiles(),
+        }
+
     /**
      * Data to validate
      */
     const data = validatorOptions.data || {
-      ...this.#ctx.request.all(),
-      ...this.#ctx.request.allFiles(),
+      ...requestBody,
       params: this.#ctx.request.params(),
       headers: this.#ctx.request.headers(),
       cookies: this.#ctx.request.cookiesList(),

providers/app_provider.ts

@@ -135,7 +135,7 @@ export default class AppServiceProvider {
   protected registerBodyParserMiddleware() {
     this.app.container.bind(BodyParserMiddleware, () => {
       const config = this.app.config.get<any>('bodyparser')
-      return new BodyParserMiddleware(config)
+      return new BodyParserMiddleware(config, this.app.experimentalFlags)
     })
   }
 

providers/vinejs_provider.ts

@@ -129,6 +129,8 @@ export default class VineJSServiceProvider {
   }
 
   boot() {
+    const experimentalFlags = this.app.experimentalFlags
+
     /**
      * The file method is used to validate a field to be a valid
      * multipart file.
@@ -142,7 +144,7 @@ export default class VineJSServiceProvider {
      * data for the current request using VineJS validators
      */
     Request.macro('validateUsing', function (this: Request, ...args) {
-      return new RequestValidator(this.ctx!).validateUsing(...args)
+      return new RequestValidator(this.ctx!, experimentalFlags).validateUsing(...args)
     })
   }
 }