fix: passthrough properties of multipartFileValidator

.vscode/settings.json

@@ -2,7 +2,9 @@
   "eslint.run": "onSave",
   "editor.formatOnSave": true,
   "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "editor.codeActionsOnSave": { "source.fixAll.eslint": true },
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit"
+  },
   "typescript.tsdk": "node_modules/typescript/lib",
   "typescript.referencesCodeLens.enabled": true,
   "files.eol": "\n",

package.json

@@ -106,6 +106,6 @@
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",
     "typescript": "^5.1.6",
-    "zod": "^3.21.4"
+    "zod": "^3.22.4"
   }
 }

servers/all/$server.ts

@@ -350,7 +350,7 @@ export default (fastify: FastifyInstance, options: FrourioOptions = {}) => {
       preParsing: hooks_gx3glp.preParsing,
       preValidation: formatMultipartData([['requiredArr', false], ['optionalArr', true], ['empty', true], ['vals', false], ['files', false]]),
     },
-    methodToHandler(controller_17nfdm3.post.handler),
+    asyncMethodToHandler(controller_17nfdm3.post.handler),
   );
 
   fastify.get(

servers/all/api/$relay.ts

@@ -24,13 +24,15 @@ export function defineController<M extends ServerMethods, T extends Record<strin
 }
 
 export const multipartFileValidator = (): z.ZodType<MultipartFile> =>
-  z.object({
-    type: z.literal('file'),
-    toBuffer: z.function().returns(z.promise(z.instanceof(Buffer))),
-    file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() })),
-    fieldname: z.string(),
-    filename: z.string(),
-    encoding: z.string(),
-    mimetype: z.string(),
-    fields: z.record(z.any()),
-  });
+  z
+    .object({
+      type: z.literal('file'),
+      toBuffer: z.function().returns(z.any()),
+      file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() }).passthrough()),
+      fieldname: z.string(),
+      filename: z.string(),
+      encoding: z.string(),
+      mimetype: z.string(),
+      fields: z.record(z.any()),
+    })
+    .passthrough();

servers/all/api/500/$relay.ts

@@ -24,13 +24,15 @@ export function defineController<M extends ServerMethods, T extends Record<strin
 }
 
 export const multipartFileValidator = (): z.ZodType<MultipartFile> =>
-  z.object({
-    type: z.literal('file'),
-    toBuffer: z.function().returns(z.promise(z.instanceof(Buffer))),
-    file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() })),
-    fieldname: z.string(),
-    filename: z.string(),
-    encoding: z.string(),
-    mimetype: z.string(),
-    fields: z.record(z.any()),
-  });
+  z
+    .object({
+      type: z.literal('file'),
+      toBuffer: z.function().returns(z.any()),
+      file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() }).passthrough()),
+      fieldname: z.string(),
+      filename: z.string(),
+      encoding: z.string(),
+      mimetype: z.string(),
+      fields: z.record(z.any()),
+    })
+    .passthrough();

servers/all/api/empty/$relay.ts

@@ -24,13 +24,15 @@ export function defineController<M extends ServerMethods, T extends Record<strin
 }
 
 export const multipartFileValidator = (): z.ZodType<MultipartFile> =>
-  z.object({
-    type: z.literal('file'),
-    toBuffer: z.function().returns(z.promise(z.instanceof(Buffer))),
-    file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() })),
-    fieldname: z.string(),
-    filename: z.string(),
-    encoding: z.string(),
-    mimetype: z.string(),
-    fields: z.record(z.any()),
-  });
+  z
+    .object({
+      type: z.literal('file'),
+      toBuffer: z.function().returns(z.any()),
+      file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() }).passthrough()),
+      fieldname: z.string(),
+      filename: z.string(),
+      encoding: z.string(),
+      mimetype: z.string(),
+      fields: z.record(z.any()),
+    })
+    .passthrough();

servers/all/api/empty/noEmpty/$relay.ts

@@ -24,13 +24,15 @@ export function defineController<M extends ServerMethods, T extends Record<strin
 }
 
 export const multipartFileValidator = (): z.ZodType<MultipartFile> =>
-  z.object({
-    type: z.literal('file'),
-    toBuffer: z.function().returns(z.promise(z.instanceof(Buffer))),
-    file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() })),
-    fieldname: z.string(),
-    filename: z.string(),
-    encoding: z.string(),
-    mimetype: z.string(),
-    fields: z.record(z.any()),
-  });
+  z
+    .object({
+      type: z.literal('file'),
+      toBuffer: z.function().returns(z.any()),
+      file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() }).passthrough()),
+      fieldname: z.string(),
+      filename: z.string(),
+      encoding: z.string(),
+      mimetype: z.string(),
+      fields: z.record(z.any()),
+    })
+    .passthrough();

servers/all/api/multiForm/$relay.ts

@@ -24,13 +24,15 @@ export function defineController<M extends ServerMethods, T extends Record<strin
 }
 
 export const multipartFileValidator = (): z.ZodType<MultipartFile> =>
-  z.object({
-    type: z.literal('file'),
-    toBuffer: z.function().returns(z.promise(z.instanceof(Buffer))),
-    file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() })),
-    fieldname: z.string(),
-    filename: z.string(),
-    encoding: z.string(),
-    mimetype: z.string(),
-    fields: z.record(z.any()),
-  });
+  z
+    .object({
+      type: z.literal('file'),
+      toBuffer: z.function().returns(z.any()),
+      file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() }).passthrough()),
+      fieldname: z.string(),
+      filename: z.string(),
+      encoding: z.string(),
+      mimetype: z.string(),
+      fields: z.record(z.any()),
+    })
+    .passthrough();

servers/all/api/multiForm/controller.ts

@@ -15,12 +15,18 @@ export default defineController(() => ({
         files: z.array(multipartFileValidator()),
       }),
     },
-    handler: ({ body }) => ({
-      status: 201,
-      body: Object.entries(body).reduce(
-        (p, [key, val]) => ({ ...p, [key]: Array.isArray(val) ? val.length : -1 }),
-        {} as Methods['post']['resBody']
-      ),
-    }),
+    handler: async ({ body }) => {
+      const res = {
+        status: 201 as const,
+        body: Object.entries(body).reduce(
+          (p, [key, val]) => ({ ...p, [key]: Array.isArray(val) ? val.length : -1 }),
+          {} as Methods['post']['resBody']
+        ),
+      };
+
+      await body.icon.toBuffer(); // for validator test
+
+      return res;
+    },
   },
 }));

servers/all/api/texts/$relay.ts

@@ -24,13 +24,15 @@ export function defineController<M extends ServerMethods, T extends Record<strin
 }
 
 export const multipartFileValidator = (): z.ZodType<MultipartFile> =>
-  z.object({
-    type: z.literal('file'),
-    toBuffer: z.function().returns(z.promise(z.instanceof(Buffer))),
-    file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() })),
-    fieldname: z.string(),
-    filename: z.string(),
-    encoding: z.string(),
-    mimetype: z.string(),
-    fields: z.record(z.any()),
-  });
+  z
+    .object({
+      type: z.literal('file'),
+      toBuffer: z.function().returns(z.any()),
+      file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() }).passthrough()),
+      fieldname: z.string(),
+      filename: z.string(),
+      encoding: z.string(),
+      mimetype: z.string(),
+      fields: z.record(z.any()),
+    })
+    .passthrough();

servers/all/api/texts/_label@string/$relay.ts

@@ -34,13 +34,15 @@ export function defineController<M extends ServerMethods, T extends Record<strin
 }
 
 export const multipartFileValidator = (): z.ZodType<MultipartFile> =>
-  z.object({
-    type: z.literal('file'),
-    toBuffer: z.function().returns(z.promise(z.instanceof(Buffer))),
-    file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() })),
-    fieldname: z.string(),
-    filename: z.string(),
-    encoding: z.string(),
-    mimetype: z.string(),
-    fields: z.record(z.any()),
-  });
+  z
+    .object({
+      type: z.literal('file'),
+      toBuffer: z.function().returns(z.any()),
+      file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() }).passthrough()),
+      fieldname: z.string(),
+      filename: z.string(),
+      encoding: z.string(),
+      mimetype: z.string(),
+      fields: z.record(z.any()),
+    })
+    .passthrough();

servers/all/api/texts/sample/$relay.ts

@@ -24,13 +24,15 @@ export function defineController<M extends ServerMethods, T extends Record<strin
 }
 
 export const multipartFileValidator = (): z.ZodType<MultipartFile> =>
-  z.object({
-    type: z.literal('file'),
-    toBuffer: z.function().returns(z.promise(z.instanceof(Buffer))),
-    file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() })),
-    fieldname: z.string(),
-    filename: z.string(),
-    encoding: z.string(),
-    mimetype: z.string(),
-    fields: z.record(z.any()),
-  });
+  z
+    .object({
+      type: z.literal('file'),
+      toBuffer: z.function().returns(z.any()),
+      file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() }).passthrough()),
+      fieldname: z.string(),
+      filename: z.string(),
+      encoding: z.string(),
+      mimetype: z.string(),
+      fields: z.record(z.any()),
+    })
+    .passthrough();

servers/all/api/users/$relay.ts

@@ -28,13 +28,15 @@ export function defineController<M extends ServerMethods, T extends Record<strin
 }
 
 export const multipartFileValidator = (): z.ZodType<MultipartFile> =>
-  z.object({
-    type: z.literal('file'),
-    toBuffer: z.function().returns(z.promise(z.instanceof(Buffer))),
-    file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() })),
-    fieldname: z.string(),
-    filename: z.string(),
-    encoding: z.string(),
-    mimetype: z.string(),
-    fields: z.record(z.any()),
-  });
+  z
+    .object({
+      type: z.literal('file'),
+      toBuffer: z.function().returns(z.any()),
+      file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() }).passthrough()),
+      fieldname: z.string(),
+      filename: z.string(),
+      encoding: z.string(),
+      mimetype: z.string(),
+      fields: z.record(z.any()),
+    })
+    .passthrough();

servers/all/api/users/_userId@number/$relay.ts

@@ -38,13 +38,15 @@ export function defineController<M extends ServerMethods, T extends Record<strin
 }
 
 export const multipartFileValidator = (): z.ZodType<MultipartFile> =>
-  z.object({
-    type: z.literal('file'),
-    toBuffer: z.function().returns(z.promise(z.instanceof(Buffer))),
-    file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() })),
-    fieldname: z.string(),
-    filename: z.string(),
-    encoding: z.string(),
-    mimetype: z.string(),
-    fields: z.record(z.any()),
-  });
+  z
+    .object({
+      type: z.literal('file'),
+      toBuffer: z.function().returns(z.any()),
+      file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() }).passthrough()),
+      fieldname: z.string(),
+      filename: z.string(),
+      encoding: z.string(),
+      mimetype: z.string(),
+      fields: z.record(z.any()),
+    })
+    .passthrough();

servers/all/api/users/_userId@number/_name/$relay.ts

@@ -39,13 +39,15 @@ export function defineController<M extends ServerMethods, T extends Record<strin
 }
 
 export const multipartFileValidator = (): z.ZodType<MultipartFile> =>
-  z.object({
-    type: z.literal('file'),
-    toBuffer: z.function().returns(z.promise(z.instanceof(Buffer))),
-    file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() })),
-    fieldname: z.string(),
-    filename: z.string(),
-    encoding: z.string(),
-    mimetype: z.string(),
-    fields: z.record(z.any()),
-  });
+  z
+    .object({
+      type: z.literal('file'),
+      toBuffer: z.function().returns(z.any()),
+      file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() }).passthrough()),
+      fieldname: z.string(),
+      filename: z.string(),
+      encoding: z.string(),
+      mimetype: z.string(),
+      fields: z.record(z.any()),
+    })
+    .passthrough();

servers/all/api/zod/$relay.ts

@@ -24,13 +24,15 @@ export function defineController<M extends ServerMethods, T extends Record<strin
 }
 
 export const multipartFileValidator = (): z.ZodType<MultipartFile> =>
-  z.object({
-    type: z.literal('file'),
-    toBuffer: z.function().returns(z.promise(z.instanceof(Buffer))),
-    file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() })),
-    fieldname: z.string(),
-    filename: z.string(),
-    encoding: z.string(),
-    mimetype: z.string(),
-    fields: z.record(z.any()),
-  });
+  z
+    .object({
+      type: z.literal('file'),
+      toBuffer: z.function().returns(z.any()),
+      file: z.instanceof(Readable).and(z.object({ truncated: z.boolean(), bytesRead: z.number() }).passthrough()),
+      fieldname: z.string(),
+      filename: z.string(),
+      encoding: z.string(),
+      mimetype: z.string(),
+      fields: z.record(z.any()),
+    })
+    .passthrough();