Merge pull request #311 from frouriojs/develop

release v1.2.2
frouriojs · Jan 17, 2025 · b908321 · b908321
2 parents c8db031 + 3624a0f
commit b908321
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/servers/all/$server.ts b/servers/all/$server.ts
@@ -26,7 +26,7 @@ import type { FastifyInstance, RouteHandlerMethod, preValidationHookHandler, Fas
 
 export type FrourioOptions = {
   basePath?: string;
-  multipart?: FastifyMultipartAttachFieldsToBodyOptions;
+  multipart?: Omit<FastifyMultipartAttachFieldsToBodyOptions, 'attachFieldsToBody'>;
 };
 
 type HttpStatusNoOk = 301 | 302 | 400 | 401 | 402 | 403 | 404 | 405 | 406 | 409 | 500 | 501 | 502 | 503 | 504 | 505;
@@ -342,7 +342,7 @@ export default (fastify: FastifyInstance, options: FrourioOptions = {}) => {
   const controller_1pjj81w = controllerFn_1pjj81w(fastify);
   const controller_iyk7j5 = controllerFn_iyk7j5(fastify);
 
-  fastify.register(multipart, { attachFieldsToBody: true, limits: { fileSize: 1024 ** 3 }, ...options.multipart });
+  fastify.register(multipart, { limits: { fileSize: 1024 ** 3 }, ...options.multipart, attachFieldsToBody: true });
 
   fastify.get(
     basePath || '/',

diff --git a/servers/minimum/$server.ts b/servers/minimum/$server.ts
@@ -8,7 +8,7 @@ import type { FastifyInstance, RouteHandlerMethod, preValidationHookHandler, onR
 
 export type FrourioOptions = {
   basePath?: string;
-  multipart?: FastifyMultipartAttachFieldsToBodyOptions;
+  multipart?: Omit<FastifyMultipartAttachFieldsToBodyOptions, 'attachFieldsToBody'>;
 };
 
 type HttpStatusNoOk = 301 | 302 | 400 | 401 | 402 | 403 | 404 | 405 | 406 | 409 | 500 | 501 | 502 | 503 | 504 | 505;

diff --git a/servers/noMulter/$server.ts b/servers/noMulter/$server.ts
@@ -16,7 +16,7 @@ import type { FastifyInstance, RouteHandlerMethod, preValidationHookHandler, Fas
 
 export type FrourioOptions = {
   basePath?: string;
-  multipart?: FastifyMultipartAttachFieldsToBodyOptions;
+  multipart?: Omit<FastifyMultipartAttachFieldsToBodyOptions, 'attachFieldsToBody'>;
 };
 
 type HttpStatusNoOk = 301 | 302 | 400 | 401 | 402 | 403 | 404 | 405 | 406 | 409 | 500 | 501 | 502 | 503 | 504 | 505;

diff --git a/servers/noTypedParams/$server.ts b/servers/noTypedParams/$server.ts
@@ -16,7 +16,7 @@ import type { FastifyInstance, RouteHandlerMethod, preValidationHookHandler, Rou
 
 export type FrourioOptions = {
   basePath?: string;
-  multipart?: FastifyMultipartAttachFieldsToBodyOptions;
+  multipart?: Omit<FastifyMultipartAttachFieldsToBodyOptions, 'attachFieldsToBody'>;
 };
 
 type HttpStatusNoOk = 301 | 302 | 400 | 401 | 402 | 403 | 404 | 405 | 406 | 409 | 500 | 501 | 502 | 503 | 504 | 505;
@@ -202,7 +202,7 @@ export default (fastify: FastifyInstance, options: FrourioOptions = {}) => {
   const controller_1bjhajh = controllerFn_1bjhajh(fastify);
   const controller_g6e9u2 = controllerFn_g6e9u2(fastify);
 
-  fastify.register(multipart, { attachFieldsToBody: true, limits: { fileSize: 1024 ** 3 }, ...options.multipart });
+  fastify.register(multipart, { limits: { fileSize: 1024 ** 3 }, ...options.multipart, attachFieldsToBody: true });
 
   fastify.get(
     basePath || '/',

diff --git a/servers/noValidator/$server.ts b/servers/noValidator/$server.ts
@@ -18,7 +18,7 @@ import type { FastifyInstance, RouteHandlerMethod, preValidationHookHandler, Fas
 
 export type FrourioOptions = {
   basePath?: string;
-  multipart?: FastifyMultipartAttachFieldsToBodyOptions;
+  multipart?: Omit<FastifyMultipartAttachFieldsToBodyOptions, 'attachFieldsToBody'>;
 };
 
 type HttpStatusNoOk = 301 | 302 | 400 | 401 | 402 | 403 | 404 | 405 | 406 | 409 | 500 | 501 | 502 | 503 | 504 | 505;
@@ -233,7 +233,7 @@ export default (fastify: FastifyInstance, options: FrourioOptions = {}) => {
   const controller_g6e9u2 = controllerFn_g6e9u2(fastify);
   const controller_1y88f1f = controllerFn_1y88f1f(fastify);
 
-  fastify.register(multipart, { attachFieldsToBody: true, limits: { fileSize: 1024 ** 3 }, ...options.multipart });
+  fastify.register(multipart, { limits: { fileSize: 1024 ** 3 }, ...options.multipart, attachFieldsToBody: true });
 
   fastify.get(
     basePath || '/',

diff --git a/src/buildServerFile.ts b/src/buildServerFile.ts
@@ -55,7 +55,7 @@ ${imports}import type { FastifyInstance, RouteHandlerMethod, preValidationHookHa
 
 export type FrourioOptions = {
   basePath?: string;
-  multipart?: FastifyMultipartAttachFieldsToBodyOptions;
+  multipart?: Omit<FastifyMultipartAttachFieldsToBodyOptions, 'attachFieldsToBody'>;
 };
 
 type HttpStatusNoOk = 301 | 302 | 400 | 401 | 402 | 403 | 404 | 405 | 406 | 409 | 500 | 501 | 502 | 503 | 504 | 505;
@@ -369,7 +369,7 @@ export default (fastify: FastifyInstance, options: FrourioOptions = {}) => {
 ${consts}
 ${
   hasMultipart
-    ? '  fastify.register(multipart, { attachFieldsToBody: true, limits: { fileSize: 1024 ** 3 }, ...options.multipart });\n\n'
+    ? '  fastify.register(multipart, { limits: { fileSize: 1024 ** 3 }, ...options.multipart, attachFieldsToBody: true });\n\n'
     : ''
 }${controllers}
   return fastify;