@kiyasov/platform-hono 1.6.1 → 2.0.1

package/dist/esm/src/multer/interceptors/base-interceptor.js

@@ -0,0 +1,23 @@
+import { mixin, } from '@nestjs/common';
+import { finalize } from 'rxjs';
+import { transformUploadOptions } from '../multipart/options';
+import { getMultipartRequest } from '../multipart/request';
+export function createInterceptor(rawOptions, handlerFn, resultProcessor) {
+    class MixinInterceptor {
+        constructor() {
+            this.options = transformUploadOptions(rawOptions);
+        }
+        async intercept(context, next) {
+            const ctx = context.switchToHttp();
+            const req = getMultipartRequest(ctx);
+            if (!req.header('content-type')?.startsWith('multipart/form-data')) {
+                return next.handle();
+            }
+            const result = await handlerFn(req, this.options);
+            resultProcessor(req, result);
+            return next.handle().pipe(finalize(result.remove));
+        }
+    }
+    return mixin(MixinInterceptor);
+}
+//# sourceMappingURL=base-interceptor.js.map

package/dist/esm/src/multer/interceptors/base-interceptor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-interceptor.js","sourceRoot":"","sources":["../../../../../src/multer/interceptors/base-interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,GAGN,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAIhC,OAAO,EAAE,sBAAsB,EAAiB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAO3D,MAAM,UAAU,iBAAiB,CAC/B,UAAyB,EACzB,SAA6B,EAC7B,eAGS;IAET,MAAM,gBAAgB;QAGpB;YACE,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC,UAAU,CAAC,CAAC;QACpD,CAAC;QAED,KAAK,CAAC,SAAS,CACb,OAAyB,EACzB,IAAiB;YAEjB,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;YACnC,MAAM,GAAG,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;YAErC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,UAAU,CAAC,qBAAqB,CAAC,EAAE,CAAC;gBACnE,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;YACvB,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAClD,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAE7B,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACrD,CAAC;KACF;IAED,OAAO,KAAK,CAAC,gBAAgB,CAAC,CAAC;AACjC,CAAC"}

package/dist/esm/src/multer/interceptors/file-fields-interceptor.d.ts

@@ -1,4 +1,4 @@
-import { NestInterceptor, Type } from '@nestjs/common';
 import { UploadField } from '../multipart/handlers/file-fields';
 import { UploadOptions } from '../multipart/options';
-export declare function FileFieldsInterceptor(uploadFields: UploadField[], options?: UploadOptions): Type<NestInterceptor>;
+import { createInterceptor } from './base-interceptor';
+export declare function FileFieldsInterceptor(uploadFields: UploadField[], localOptions?: UploadOptions): ReturnType<typeof createInterceptor>;

package/dist/esm/src/multer/interceptors/file-fields-interceptor.js

@@ -1,27 +1,10 @@
-import { mixin, } from '@nestjs/common';
-import { finalize } from 'rxjs';
 import { handleMultipartFileFields, uploadFieldsToMap, } from '../multipart/handlers/file-fields';
-import { transformUploadOptions } from '../multipart/options';
-import { getMultipartRequest } from '../multipart/request';
-export function FileFieldsInterceptor(uploadFields, options) {
-    class MixinInterceptor {
-        constructor() {
-            this.options = transformUploadOptions(options);
-            this.fieldsMap = uploadFieldsToMap(uploadFields);
-        }
-        async intercept(context, next) {
-            const ctx = context.switchToHttp();
-            const req = getMultipartRequest(ctx);
-            if (!req.header('content-type')?.startsWith('multipart/form-data')) {
-                return next.handle();
-            }
-            const { body, files, remove } = await handleMultipartFileFields(req, this.fieldsMap, this.options);
-            req.body = body;
-            req.storageFiles = files;
-            return next.handle().pipe(finalize(remove));
-        }
-    }
-    const Interceptor = mixin(MixinInterceptor);
-    return Interceptor;
+import { createInterceptor } from './base-interceptor';
+export function FileFieldsInterceptor(uploadFields, localOptions) {
+    const fieldsMap = uploadFieldsToMap(uploadFields);
+    return createInterceptor(localOptions ?? {}, (req, options) => handleMultipartFileFields(req, fieldsMap, options), (req, result) => {
+        req.body = result.body;
+        req.storageFiles = result.files;
+    });
 }
 //# sourceMappingURL=file-fields-interceptor.js.map

package/dist/esm/src/multer/interceptors/file-fields-interceptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-fields-interceptor.js","sourceRoot":"","sources":["../../../../../src/multer/interceptors/file-fields-interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,GAGN,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAEhC,OAAO,EACL,yBAAyB,EAGzB,iBAAiB,GAClB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAiB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE3D,MAAM,UAAU,qBAAqB,CACnC,YAA2B,EAC3B,OAAuB;IAEvB,MAAM,gBAAgB;QAKpB;YACE,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;YAC/C,IAAI,CAAC,SAAS,GAAG,iBAAiB,CAAC,YAAY,CAAC,CAAC;QACnD,CAAC;QAED,KAAK,CAAC,SAAS,CAAC,OAAyB,EAAE,IAAiB;YAC1D,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;YACnC,MAAM,GAAG,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;YAErC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,UAAU,CAAC,qBAAqB,CAAC,EAAE,CAAC;gBACnE,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;YACvB,CAAC;YAED,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,yBAAyB,CAC7D,GAAG,EACH,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,OAAO,CACb,CAAC;YAEF,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;YAChB,GAAG,CAAC,YAAY,GAAG,KAAK,CAAC;YAEzB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9C,CAAC;KACF;IAED,MAAM,WAAW,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAE5C,OAAO,WAAW,CAAC;AACrB,CAAC"}
+{"version":3,"file":"file-fields-interceptor.js","sourceRoot":"","sources":["../../../../../src/multer/interceptors/file-fields-interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EAEzB,iBAAiB,GAClB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,UAAU,qBAAqB,CACnC,YAA2B,EAC3B,YAA4B;IAE5B,MAAM,SAAS,GAAG,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAElD,OAAO,iBAAiB,CACtB,YAAY,IAAI,EAAE,EAClB,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,yBAAyB,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,EACpE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;QACd,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACvB,GAAG,CAAC,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC;IAClC,CAAC,CACF,CAAC;AACJ,CAAC"}

package/dist/esm/src/multer/interceptors/file-interceptor.d.ts

@@ -1,3 +1,3 @@
-import { NestInterceptor, Type } from '@nestjs/common';
 import { UploadOptions } from '../multipart/options';
-export declare function FileInterceptor(fieldname: string, options?: UploadOptions): Type<NestInterceptor>;
+import { createInterceptor } from './base-interceptor';
+export declare function FileInterceptor(fieldname: string, localOptions?: UploadOptions): ReturnType<typeof createInterceptor>;

package/dist/esm/src/multer/interceptors/file-interceptor.js

@@ -1,26 +1,9 @@
-import { mixin, } from '@nestjs/common';
-import { finalize } from 'rxjs';
 import { handleMultipartSingleFile } from '../multipart/handlers/single-file';
-import { transformUploadOptions } from '../multipart/options';
-import { getMultipartRequest } from '../multipart/request';
-export function FileInterceptor(fieldname, options) {
-    class MixinInterceptor {
-        constructor() {
-            this.options = transformUploadOptions(options);
-        }
-        async intercept(context, next) {
-            const ctx = context.switchToHttp();
-            const req = getMultipartRequest(ctx);
-            if (!req.header('content-type')?.startsWith('multipart/form-data')) {
-                return next.handle();
-            }
-            const { file, body, remove } = await handleMultipartSingleFile(req, fieldname, this.options);
-            req.body = body;
-            req.storageFile = file;
-            return next.handle().pipe(finalize(remove));
-        }
-    }
-    const Interceptor = mixin(MixinInterceptor);
-    return Interceptor;
+import { createInterceptor } from './base-interceptor';
+export function FileInterceptor(fieldname, localOptions) {
+    return createInterceptor(localOptions ?? {}, (req, options) => handleMultipartSingleFile(req, fieldname, options), (req, result) => {
+        req.body = result.body;
+        req.storageFile = result.file;
+    });
 }
 //# sourceMappingURL=file-interceptor.js.map

package/dist/esm/src/multer/interceptors/file-interceptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-interceptor.js","sourceRoot":"","sources":["../../../../../src/multer/interceptors/file-interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,GAGN,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAEhC,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,sBAAsB,EAAiB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE3D,MAAM,UAAU,eAAe,CAC7B,SAAiB,EACjB,OAAuB;IAEvB,MAAM,gBAAgB;QAGpB;YACE,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;QACjD,CAAC;QAED,KAAK,CAAC,SAAS,CAAC,OAAyB,EAAE,IAAiB;YAC1D,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;YACnC,MAAM,GAAG,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;YAErC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,UAAU,CAAC,qBAAqB,CAAC,EAAE,CAAC;gBACnE,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;YACvB,CAAC;YAED,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,yBAAyB,CAC5D,GAAG,EACH,SAAS,EACT,IAAI,CAAC,OAAO,CACb,CAAC;YAEF,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;YAChB,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC;YAEvB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9C,CAAC;KACF;IAED,MAAM,WAAW,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAE5C,OAAO,WAAW,CAAC;AACrB,CAAC"}
+{"version":3,"file":"file-interceptor.js","sourceRoot":"","sources":["../../../../../src/multer/interceptors/file-interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAE9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,UAAU,eAAe,CAC7B,SAAiB,EACjB,YAA4B;IAE5B,OAAO,iBAAiB,CACtB,YAAY,IAAI,EAAE,EAClB,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,yBAAyB,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,EACpE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;QACd,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACvB,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC;IAChC,CAAC,CACF,CAAC;AACJ,CAAC"}

package/dist/esm/src/multer/interceptors/files-interceptor.d.ts

@@ -1,3 +1,3 @@
-import { NestInterceptor, Type } from '@nestjs/common';
 import { UploadOptions } from '../multipart/options';
-export declare function FilesInterceptor(fieldname: string, maxCount?: number, options?: UploadOptions): Type<NestInterceptor>;
+import { createInterceptor } from './base-interceptor';
+export declare function FilesInterceptor(fieldname: string, maxCount?: number, localOptions?: UploadOptions): ReturnType<typeof createInterceptor>;

package/dist/esm/src/multer/interceptors/files-interceptor.js

@@ -1,26 +1,9 @@
-import { mixin, } from '@nestjs/common';
-import { finalize } from 'rxjs';
 import { handleMultipartMultipleFiles } from '../multipart/handlers/multiple-files';
-import { transformUploadOptions } from '../multipart/options';
-import { getMultipartRequest } from '../multipart/request';
-export function FilesInterceptor(fieldname, maxCount = 1, options) {
-    class MixinInterceptor {
-        constructor() {
-            this.options = transformUploadOptions(options);
-        }
-        async intercept(context, next) {
-            const ctx = context.switchToHttp();
-            const req = getMultipartRequest(ctx);
-            if (!req.header('content-type')?.startsWith('multipart/form-data')) {
-                return next.handle();
-            }
-            const { body, files, remove } = await handleMultipartMultipleFiles(req, fieldname, maxCount, this.options);
-            req.body = body;
-            req.storageFiles = files;
-            return next.handle().pipe(finalize(remove));
-        }
-    }
-    const Interceptor = mixin(MixinInterceptor);
-    return Interceptor;
+import { createInterceptor } from './base-interceptor';
+export function FilesInterceptor(fieldname, maxCount = 1, localOptions) {
+    return createInterceptor(localOptions ?? {}, (req, options) => handleMultipartMultipleFiles(req, fieldname, maxCount, options), (req, result) => {
+        req.body = result.body;
+        req.storageFiles = result.files;
+    });
 }
 //# sourceMappingURL=files-interceptor.js.map

package/dist/esm/src/multer/interceptors/files-interceptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"files-interceptor.js","sourceRoot":"","sources":["../../../../../src/multer/interceptors/files-interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,GAGN,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAEhC,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,EAAE,sBAAsB,EAAiB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE3D,MAAM,UAAU,gBAAgB,CAC9B,SAAiB,EACjB,QAAQ,GAAG,CAAC,EACZ,OAAuB;IAEvB,MAAM,gBAAgB;QAGpB;YACE,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;QACjD,CAAC;QAED,KAAK,CAAC,SAAS,CAAC,OAAyB,EAAE,IAAiB;YAC1D,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;YACnC,MAAM,GAAG,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;YAErC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,UAAU,CAAC,qBAAqB,CAAC,EAAE,CAAC;gBACnE,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;YACvB,CAAC;YAED,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,4BAA4B,CAChE,GAAG,EACH,SAAS,EACT,QAAQ,EACR,IAAI,CAAC,OAAO,CACb,CAAC;YAEF,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;YAChB,GAAG,CAAC,YAAY,GAAG,KAAK,CAAC;YAEzB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9C,CAAC;KACF;IAED,MAAM,WAAW,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAE5C,OAAO,WAAW,CAAC;AACrB,CAAC"}
+{"version":3,"file":"files-interceptor.js","sourceRoot":"","sources":["../../../../../src/multer/interceptors/files-interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAEpF,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,UAAU,gBAAgB,CAC9B,SAAiB,EACjB,QAAQ,GAAG,CAAC,EACZ,YAA4B;IAE5B,OAAO,iBAAiB,CACtB,YAAY,IAAI,EAAE,EAClB,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CACf,4BAA4B,CAAC,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,EACjE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;QACd,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACvB,GAAG,CAAC,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC;IAClC,CAAC,CACF,CAAC;AACJ,CAAC"}

package/dist/esm/src/multer/interceptors/index.d.ts

@@ -2,3 +2,4 @@ export * from './file-fields-interceptor';
 export * from './file-interceptor';
 export * from './any-files-interceptor';
 export * from './files-interceptor';
+export * from './base-interceptor';

package/dist/esm/src/multer/interceptors/index.js

@@ -2,4 +2,5 @@ export * from './file-fields-interceptor';
 export * from './file-interceptor';
 export * from './any-files-interceptor';
 export * from './files-interceptor';
+export * from './base-interceptor';
 //# sourceMappingURL=index.js.map

package/dist/esm/src/multer/interceptors/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/multer/interceptors/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/multer/interceptors/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC"}

package/dist/esm/src/multer/multipart/handlers/any-files.d.ts

@@ -1,10 +1,4 @@
-import { StorageFile } from '../../storage';
 import { UploadOptions } from '../options';
 import { THonoRequest } from '../request';
-export declare const handleMultipartAnyFiles: (req: THonoRequest, options: UploadOptions) => Promise<{
-    body: {
-        [x: string]: string | File;
-    };
-    files: StorageFile[];
-    remove: () => Promise<void>;
-}>;
+import { MultipleFilesResult } from './base-handler';
+export declare const handleMultipartAnyFiles: (req: THonoRequest, options: UploadOptions) => Promise<MultipleFilesResult>;

package/dist/esm/src/multer/multipart/handlers/any-files.js

@@ -1,29 +1,16 @@
-import { removeStorageFiles } from '../file';
-import { filterUpload } from '../filter';
-import { getParts } from '../request';
+import { FileHandler } from './base-handler';
 export const handleMultipartAnyFiles = async (req, options) => {
-    const parts = getParts(req, options);
-    const body = {};
-    const files = [];
-    const removeFiles = async (error) => {
-        return await removeStorageFiles(options.storage, files, error);
-    };
-    try {
-        for await (const [partFieldName, part] of Object.entries(parts)) {
-            if (!(part instanceof File)) {
-                body[partFieldName] = part;
-                continue;
-            }
-            const file = await options.storage.handleFile(part, req, partFieldName);
-            if (await filterUpload(options, req, file)) {
-                files.push(file);
-            }
+    const handler = new FileHandler(req, options);
+    await handler.process(async (fieldName, part) => {
+        const storageFile = await handler.handleSingleFile(fieldName, part);
+        if (storageFile) {
+            handler.addFile(fieldName, storageFile);
         }
-    }
-    catch (error) {
-        await removeFiles(true);
-        throw error;
-    }
-    return { body, files, remove: () => removeFiles() };
+    });
+    return {
+        body: handler.getBody(),
+        files: handler.getFiles(),
+        remove: handler.createRemoveFunction(),
+    };
 };
 //# sourceMappingURL=any-files.js.map

package/dist/esm/src/multer/multipart/handlers/any-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"any-files.js","sourceRoot":"","sources":["../../../../../../src/multer/multipart/handlers/any-files.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAgB,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEpD,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAC1C,GAAiB,EACjB,OAAsB,EACtB,EAAE;IACF,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAErC,MAAM,IAAI,GAAa,EAAE,CAAC;IAE1B,MAAM,KAAK,GAAkB,EAAE,CAAC;IAEhC,MAAM,WAAW,GAAG,KAAK,EAAE,KAAe,EAAE,EAAE;QAC5C,OAAO,MAAM,kBAAkB,CAAC,OAAO,CAAC,OAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAClE,CAAC,CAAC;IAEF,IAAI,CAAC;QACH,IAAI,KAAK,EAAE,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAChE,IAAI,CAAC,CAAC,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;gBAC5B,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;gBAC3B,SAAS;YACX,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;YAEzE,IAAI,MAAM,YAAY,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC;gBAC3C,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnB,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;QACxB,MAAM,KAAK,CAAC;IACd,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;AACtD,CAAC,CAAC"}
+{"version":3,"file":"any-files.js","sourceRoot":"","sources":["../../../../../../src/multer/multipart/handlers/any-files.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAuB,MAAM,gBAAgB,CAAC;AAElE,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAC1C,GAAiB,EACjB,OAAsB,EACQ,EAAE;IAChC,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAE9C,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE;QAC9C,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACpE,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE;QACvB,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE;QACzB,MAAM,EAAE,OAAO,CAAC,oBAAoB,EAAE;KACvC,CAAC;AACJ,CAAC,CAAC"}

package/dist/esm/src/multer/multipart/handlers/base-handler.d.ts

@@ -0,0 +1,42 @@
+import { BodyData } from 'hono/utils/body';
+import { StorageFile } from '../../storage/storage';
+import { UploadOptions } from '../options';
+import { THonoRequest } from '../request';
+export interface ProcessedFile {
+    file: StorageFile;
+    fieldName: string;
+}
+export interface FileProcessResult {
+    body: BodyData;
+    remove: () => Promise<void>;
+}
+export interface SingleFileResult extends FileProcessResult {
+    file?: StorageFile;
+}
+export interface MultipleFilesResult extends FileProcessResult {
+    files: StorageFile[];
+}
+export interface FileFieldsResult extends FileProcessResult {
+    files: Record<string, StorageFile[]>;
+}
+export declare class FileHandler {
+    private readonly req;
+    private readonly options;
+    private readonly body;
+    private readonly files;
+    private readonly filesByField;
+    private processed;
+    private cleanedUp;
+    constructor(req: THonoRequest, options: UploadOptions);
+    process(processor: (fieldName: string, file: File) => Promise<void>): Promise<void>;
+    handleSingleFile(fieldName: string, file: File): Promise<StorageFile | undefined>;
+    validateFieldName(fieldName: string, expectedFieldName: string): void;
+    validateSingleFile(currentFile: StorageFile | undefined): void;
+    validateMaxCount(fieldName: string, currentCount: number, maxCount: number): void;
+    addFile(fieldName: string, file: StorageFile): void;
+    getFiles(): StorageFile[];
+    getFilesByField(): Record<string, StorageFile[]>;
+    getBody(): BodyData;
+    cleanup(error?: boolean): Promise<void>;
+    createRemoveFunction(): () => Promise<void>;
+}

package/dist/esm/src/multer/multipart/handlers/base-handler.js

@@ -0,0 +1,102 @@
+import { BadRequestException } from '@nestjs/common';
+import { removeStorageFiles } from '../file';
+import { filterUpload } from '../filter';
+import { getParts } from '../request';
+export class FileHandler {
+    constructor(req, options) {
+        this.req = req;
+        this.options = options;
+        this.body = {};
+        this.files = [];
+        this.filesByField = {};
+        this.processed = false;
+        this.cleanedUp = false;
+    }
+    async process(processor) {
+        if (this.processed) {
+            throw new Error('Request already processed');
+        }
+        this.processed = true;
+        const parts = getParts(this.req, this.options);
+        try {
+            for await (const [fieldName, part] of Object.entries(parts)) {
+                if (Array.isArray(part) && part.every((item) => item instanceof File)) {
+                    for (const file of part) {
+                        await processor(fieldName, file);
+                    }
+                    continue;
+                }
+                if (!(part instanceof File)) {
+                    this.body[fieldName] = part;
+                    continue;
+                }
+                await processor(fieldName, part);
+            }
+        }
+        catch (error) {
+            await this.cleanup(true);
+            throw error;
+        }
+    }
+    async handleSingleFile(fieldName, file) {
+        const storageFile = await this.options.storage.handleFile(file, this.req, fieldName);
+        if (await filterUpload(this.options, this.req, storageFile)) {
+            return storageFile;
+        }
+        await this.options.storage.removeFile(storageFile, true);
+        return undefined;
+    }
+    validateFieldName(fieldName, expectedFieldName) {
+        if (fieldName !== expectedFieldName) {
+            throw new BadRequestException(`Field "${fieldName}" doesn't accept file.`);
+        }
+    }
+    validateSingleFile(currentFile) {
+        if (currentFile) {
+            throw new BadRequestException('Field accepts only one file.');
+        }
+    }
+    validateMaxCount(fieldName, currentCount, maxCount) {
+        if (currentCount >= maxCount) {
+            throw new BadRequestException(`Field "${fieldName}" accepts max ${maxCount} files.`);
+        }
+    }
+    addFile(fieldName, file) {
+        this.files.push(file);
+        if (!this.filesByField[fieldName]) {
+            this.filesByField[fieldName] = [];
+        }
+        this.filesByField[fieldName].push(file);
+    }
+    getFiles() {
+        return [...this.files];
+    }
+    getFilesByField() {
+        return { ...this.filesByField };
+    }
+    getBody() {
+        return { ...this.body };
+    }
+    async cleanup(error) {
+        if (this.cleanedUp) {
+            return;
+        }
+        this.cleanedUp = true;
+        await removeStorageFiles(this.options.storage, this.files, error);
+        this.files.length = 0;
+        for (const key of Object.keys(this.filesByField)) {
+            delete this.filesByField[key];
+        }
+    }
+    createRemoveFunction() {
+        let called = false;
+        return async () => {
+            if (called) {
+                return;
+            }
+            called = true;
+            await this.cleanup();
+        };
+    }
+}
+//# sourceMappingURL=base-handler.js.map

package/dist/esm/src/multer/multipart/handlers/base-handler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-handler.js","sourceRoot":"","sources":["../../../../../../src/multer/multipart/handlers/base-handler.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/multer/multipart/handlers/file-fields.d.ts

@@ -1,17 +1,10 @@
-import { BodyData } from 'hono/utils/body';
-import { StorageFile } from '../../storage/storage';
 import { UploadOptions } from '../options';
 import { THonoRequest } from '../request';
+import { FileFieldsResult } from './base-handler';
 export interface UploadField {
     name: string;
     maxCount?: number;
 }
 export type UploadFieldMapEntry = Required<Pick<UploadField, 'maxCount'>>;
-export declare const uploadFieldsToMap: (uploadFields: UploadField[]) => Map<string, {
-    maxCount: number;
-}>;
-export declare const handleMultipartFileFields: (req: THonoRequest, fieldsMap: Map<string, UploadFieldMapEntry>, options: UploadOptions) => Promise<{
-    body: BodyData;
-    files: Record<string, StorageFile[]>;
-    remove: () => Promise<void>;
-}>;
+export declare const uploadFieldsToMap: (uploadFields: UploadField[]) => Map<string, UploadFieldMapEntry>;
+export declare const handleMultipartFileFields: (req: THonoRequest, fieldsMap: Map<string, UploadFieldMapEntry>, options: UploadOptions) => Promise<FileFieldsResult>;

package/dist/esm/src/multer/multipart/handlers/file-fields.js

@@ -1,40 +1,26 @@
 import { BadRequestException } from '@nestjs/common';
-import { removeStorageFiles } from '../file';
-import { filterUpload } from '../filter';
-import { getParts } from '../request';
+import { FileHandler } from './base-handler';
 export const uploadFieldsToMap = (uploadFields) => new Map(uploadFields.map(({ name, ...opts }) => [name, { maxCount: 1, ...opts }]));
 export const handleMultipartFileFields = async (req, fieldsMap, options) => {
-    const parts = getParts(req, options);
-    const body = {};
+    const handler = new FileHandler(req, options);
     const files = {};
-    const removeFiles = async (error) => {
-        const allFiles = Object.values(files).flat();
-        return removeStorageFiles(options.storage, allFiles, error);
-    };
-    try {
-        for await (const [fieldName, part] of Object.entries(parts)) {
-            if (!(part instanceof File)) {
-                body[fieldName] = part;
-                continue;
-            }
-            const fieldOptions = fieldsMap.get(fieldName);
-            if (!fieldOptions) {
-                throw new BadRequestException(`Field ${fieldName} doesn't accept files`);
-            }
-            files[fieldName] = files[fieldName] || [];
-            if (files[fieldName].length >= fieldOptions.maxCount) {
-                throw new BadRequestException(`Field ${fieldName} accepts max ${fieldOptions.maxCount} files`);
-            }
-            const file = await options.storage.handleFile(part, req, fieldName);
-            if (await filterUpload(options, req, file)) {
-                files[fieldName].push(file);
-            }
+    await handler.process(async (fieldName, part) => {
+        const fieldOptions = fieldsMap.get(fieldName);
+        if (!fieldOptions) {
+            throw new BadRequestException(`Field ${fieldName} doesn't accept files`);
+        }
+        files[fieldName] = files[fieldName] || [];
+        handler.validateMaxCount(fieldName, files[fieldName].length, fieldOptions.maxCount);
+        const storageFile = await handler.handleSingleFile(fieldName, part);
+        if (storageFile) {
+            files[fieldName].push(storageFile);
+            handler.addFile(fieldName, storageFile);
         }
-    }
-    catch (error) {
-        await removeFiles(true);
-        throw error;
-    }
-    return { body, files, remove: removeFiles };
+    });
+    return {
+        body: handler.getBody(),
+        files,
+        remove: handler.createRemoveFunction(),
+    };
 };
 //# sourceMappingURL=file-fields.js.map

package/dist/esm/src/multer/multipart/handlers/file-fields.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-fields.js","sourceRoot":"","sources":["../../../../../../src/multer/multipart/handlers/file-fields.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAIrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAgB,QAAQ,EAAE,MAAM,YAAY,CAAC;AAcpD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,YAA2B,EAAE,EAAE,CAC/D,IAAI,GAAG,CACL,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,CAC1E,CAAC;AASJ,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,EAC5C,GAAiB,EACjB,SAA2C,EAC3C,OAAsB,EAKrB,EAAE;IACH,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACrC,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,MAAM,KAAK,GAAkC,EAAE,CAAC;IAOhD,MAAM,WAAW,GAAG,KAAK,EAAE,KAAe,EAAiB,EAAE;QAC3D,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7C,OAAO,kBAAkB,CAAC,OAAO,CAAC,OAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC/D,CAAC,CAAC;IAEF,IAAI,CAAC;QACH,IAAI,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5D,IAAI,CAAC,CAAC,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;gBAC5B,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;gBACvB,SAAS;YACX,CAAC;YAED,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC9C,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,IAAI,mBAAmB,CAC3B,SAAS,SAAS,uBAAuB,CAC1C,CAAC;YACJ,CAAC;YAED,KAAK,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YAC1C,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,MAAM,IAAI,YAAY,CAAC,QAAQ,EAAE,CAAC;gBACrD,MAAM,IAAI,mBAAmB,CAC3B,SAAS,SAAS,gBAAgB,YAAY,CAAC,QAAQ,QAAQ,CAChE,CAAC;YACJ,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;YACrE,IAAI,MAAM,YAAY,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC;gBAC3C,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;QACxB,MAAM,KAAK,CAAC;IACd,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;AAC9C,CAAC,CAAC"}
+{"version":3,"file":"file-fields.js","sourceRoot":"","sources":["../../../../../../src/multer/multipart/handlers/file-fields.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAKrD,OAAO,EAAE,WAAW,EAAoB,MAAM,gBAAgB,CAAC;AAY/D,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,YAA2B,EACO,EAAE,CACpC,IAAI,GAAG,CACL,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,CAC1E,CAAC;AAKJ,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,EAC5C,GAAiB,EACjB,SAA2C,EAC3C,OAAsB,EACK,EAAE;IAC7B,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC9C,MAAM,KAAK,GAAkC,EAAE,CAAC;IAEhD,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE;QAC9C,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,mBAAmB,CAAC,SAAS,SAAS,uBAAuB,CAAC,CAAC;QAC3E,CAAC;QAED,KAAK,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC1C,OAAO,CAAC,gBAAgB,CACtB,SAAS,EACT,KAAK,CAAC,SAAS,CAAC,CAAC,MAAM,EACvB,YAAY,CAAC,QAAQ,CACtB,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACpE,IAAI,WAAW,EAAE,CAAC;YAChB,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACnC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE;QACvB,KAAK;QACL,MAAM,EAAE,OAAO,CAAC,oBAAoB,EAAE;KACvC,CAAC;AACJ,CAAC,CAAC"}

package/dist/esm/src/multer/multipart/handlers/index.d.ts

@@ -1 +1,6 @@
-export { UploadField } from './file-fields';
+export { UploadField, uploadFieldsToMap } from './file-fields';
+export { handleMultipartSingleFile } from './single-file';
+export { handleMultipartMultipleFiles } from './multiple-files';
+export { handleMultipartFileFields } from './file-fields';
+export { handleMultipartAnyFiles } from './any-files';
+export { FileHandler, SingleFileResult, MultipleFilesResult, FileFieldsResult, } from './base-handler';

package/dist/esm/src/multer/multipart/handlers/index.js

@@ -1,2 +1,7 @@
-export {};
+export { uploadFieldsToMap } from './file-fields';
+export { handleMultipartSingleFile } from './single-file';
+export { handleMultipartMultipleFiles } from './multiple-files';
+export { handleMultipartFileFields } from './file-fields';
+export { handleMultipartAnyFiles } from './any-files';
+export { FileHandler, } from './base-handler';
 //# sourceMappingURL=index.js.map

package/dist/esm/src/multer/multipart/handlers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/multer/multipart/handlers/index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/multer/multipart/handlers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,4BAA4B,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EACL,WAAW,GAIZ,MAAM,gBAAgB,CAAC"}

package/dist/esm/src/multer/multipart/handlers/multiple-files.d.ts

@@ -1,10 +1,4 @@
-import { StorageFile } from '../../storage';
 import { UploadOptions } from '../options';
 import { THonoRequest } from '../request';
-export declare const handleMultipartMultipleFiles: (req: THonoRequest, fieldname: string, maxCount: number, options: UploadOptions) => Promise<{
-    body: {
-        [x: string]: string | File;
-    };
-    files: StorageFile[];
-    remove: () => Promise<void>;
-}>;
+import { MultipleFilesResult } from './base-handler';
+export declare const handleMultipartMultipleFiles: (req: THonoRequest, fieldname: string, maxCount: number, options: UploadOptions) => Promise<MultipleFilesResult>;

package/dist/esm/src/multer/multipart/handlers/multiple-files.js

@@ -1,42 +1,24 @@
 import { BadRequestException } from '@nestjs/common';
-import { removeStorageFiles } from '../file';
-import { filterUpload } from '../filter';
-import { getParts } from '../request';
+import { FileHandler } from './base-handler';
 export const handleMultipartMultipleFiles = async (req, fieldname, maxCount, options) => {
-    const parts = getParts(req, options);
-    const body = {};
+    const handler = new FileHandler(req, options);
     const files = [];
-    const removeFiles = async (error) => {
-        return await removeStorageFiles(options.storage, files, error);
-    };
-    try {
-        for await (const [partFieldName, part] of Object.entries(parts)) {
-            if (!(part instanceof File || Array.isArray(part))) {
-                body[partFieldName] = part;
-                continue;
-            }
-            const partArray = Array.isArray(part) ? part : [part];
-            for (const singlePart of partArray) {
-                if (!(singlePart instanceof File)) {
-                    throw new BadRequestException(`Field ${partFieldName} contains invalid file data`);
-                }
-                if (partFieldName !== fieldname) {
-                    throw new BadRequestException(`Field ${partFieldName} doesn't accept files`);
-                }
-                if (files.length >= maxCount) {
-                    throw new BadRequestException(`Field ${partFieldName} accepts max ${maxCount} files`);
-                }
-                const file = await options.storage.handleFile(singlePart, req, partFieldName);
-                if (await filterUpload(options, req, file)) {
-                    files.push(file);
-                }
-            }
+    await handler.process(async (fieldName, part) => {
+        if (!(part instanceof File)) {
+            throw new BadRequestException(`Field ${fieldName} contains invalid file data`);
+        }
+        handler.validateFieldName(fieldName, fieldname);
+        handler.validateMaxCount(fieldName, files.length, maxCount);
+        const storageFile = await handler.handleSingleFile(fieldName, part);
+        if (storageFile) {
+            files.push(storageFile);
+            handler.addFile(fieldName, storageFile);
         }
-    }
-    catch (error) {
-        await removeFiles(error);
-        throw error;
-    }
-    return { body, files, remove: () => removeFiles() };
+    });
+    return {
+        body: handler.getBody(),
+        files,
+        remove: handler.createRemoveFunction(),
+    };
 };
 //# sourceMappingURL=multiple-files.js.map