From bfc379aab3ae894a39c7b3a3fdde594f2aed8e10 Mon Sep 17 00:00:00 2001 From: Abhinav Kumar Date: Fri, 1 Nov 2024 15:35:27 +0530 Subject: [PATCH] minor changes Signed-off-by: Abhinav Kumar --- .../app/api/server/lib/getUploadFormData.ts | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/meteor/app/api/server/lib/getUploadFormData.ts b/apps/meteor/app/api/server/lib/getUploadFormData.ts index 00b78e8de88f0..1630afe8cae22 100644 --- a/apps/meteor/app/api/server/lib/getUploadFormData.ts +++ b/apps/meteor/app/api/server/lib/getUploadFormData.ts @@ -17,7 +17,7 @@ type UploadResult = { fields: K; }; -type OptionalUploadResult = +type UploadResultWithOptionalFile = | UploadResult | ({ [P in keyof Omit, 'fields'>]: undefined; @@ -35,9 +35,9 @@ export async function getUploadFormData< field?: T; validate?: V; sizeLimit?: number; - optional: true; + fileOptional: true; }, -): Promise>; +): Promise>; export async function getUploadFormData< T extends string, @@ -49,7 +49,7 @@ export async function getUploadFormData< field?: T; validate?: V; sizeLimit?: number; - optional?: false | undefined; + fileOptional?: false | undefined; }, ): Promise>; @@ -63,9 +63,9 @@ export async function getUploadFormData< field?: T; validate?: V; sizeLimit?: number; - optional?: boolean; + fileOptional?: boolean; } = {}, -): Promise> { +): Promise> { const limits = { files: 1, ...(options.sizeLimit && options.sizeLimit > -1 && { fileSize: options.sizeLimit }), @@ -74,9 +74,9 @@ export async function getUploadFormData< const bb = busboy({ headers: request.headers, defParamCharset: 'utf8', limits }); const fields = Object.create(null) as K; - let uploadedFile: OptionalUploadResult | undefined; + let uploadedFile: UploadResultWithOptionalFile | undefined; - let returnResult = (_value: OptionalUploadResult) => { + let returnResult = (_value: UploadResultWithOptionalFile) => { // noop }; let returnError = (_error?: Error | string | null | undefined) => { @@ -100,7 +100,7 @@ export async function getUploadFormData< if (!uploadedFile) { return returnError(new MeteorError('No file or fields were uploaded')); } - if (!('file' in uploadedFile) && !options.optional) { + if (!('file' in uploadedFile) && !options.fileOptional) { return returnError(new MeteorError('No file uploaded')); } if (options.validate !== undefined && !options.validate(fields)) { @@ -170,7 +170,7 @@ export async function getUploadFormData< request.pipe(bb); - return new Promise>((resolve, reject) => { + return new Promise>((resolve, reject) => { returnResult = resolve; returnError = reject; });