@kiyasov/platform-hono 1.6.0 → 2.0.0

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

@@ -1,3 +1,3 @@
 export * from './options';
 export * from './filter';
-export { UploadFilterFile, UploadFilterHandler } from './filter';
+export { type UploadFilterFile, type UploadFilterHandler } from './filter';

package/dist/esm/src/multer/multipart/options.d.ts

@@ -1,21 +1,15 @@
-import busboy from 'busboy';
-import { DiskStorage, Storage } from '../storage';
+import { Storage, StorageFile } from '../storage';
 import { UploadFilterHandler } from './filter';
-export type UploadOptions = busboy.BusboyConfig & {
+export interface UploadLimits {
+    fileSize?: number;
+    files?: number;
+    fields?: number;
+}
+export type UploadOptions = {
     dest?: string;
-    storage?: Storage;
+    storage?: Storage<StorageFile>;
     filter?: UploadFilterHandler;
+    limits?: UploadLimits;
 };
 export declare const DEFAULT_UPLOAD_OPTIONS: Partial<UploadOptions>;
-export declare const transformUploadOptions: (opts?: UploadOptions) => Partial<UploadOptions> | {
-    storage: DiskStorage;
-    headers?: import("node:http").IncomingHttpHeaders | undefined;
-    highWaterMark?: number | undefined;
-    fileHwm?: number | undefined;
-    defCharset?: string | undefined;
-    defParamCharset?: string | undefined;
-    preservePath?: boolean | undefined;
-    limits?: busboy.Limits | undefined;
-    dest?: string;
-    filter?: UploadFilterHandler;
-};
+export declare const transformUploadOptions: (opts?: UploadOptions) => UploadOptions;

package/dist/esm/src/multer/multipart/options.js.map

@@ -1 +1 @@
-{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../../../src/multer/multipart/options.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAW,MAAM,YAAY,CAAC;AASjE,MAAM,CAAC,MAAM,sBAAsB,GAA2B;IAC5D,OAAO,EAAE,IAAI,aAAa,EAAE;CAC7B,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,IAAoB,EAAE,EAAE;IAC7D,IAAI,IAAI,IAAI,IAAI;QAAE,OAAO,sBAAsB,CAAC;IAEhD,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;QACtB,OAAO;YACL,GAAG,IAAI;YACP,OAAO,EAAE,IAAI,WAAW,CAAC;gBACvB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO;aACzB,CAAC;SACH,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,GAAG,sBAAsB,EAAE,GAAG,IAAI,EAAE,CAAC;AAChD,CAAC,CAAC"}
+{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../../../src/multer/multipart/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAwB,MAAM,YAAY,CAAC;AA6B9E,MAAM,CAAC,MAAM,sBAAsB,GAA2B;IAC5D,OAAO,EAAE,IAAI,aAAa,EAAE;CAC7B,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,IAAoB,EAAiB,EAAE;IAC5E,IAAI,IAAI,IAAI,IAAI;QAAE,OAAO,sBAAuC,CAAC;IAEjE,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;QACtB,OAAO;YACL,GAAG,IAAI;YACP,OAAO,EAAE,IAAI,WAAW,CAAC;gBACvB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO;aACzB,CAAC;SACH,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,GAAG,sBAAsB,EAAE,GAAG,IAAI,EAAmB,CAAC;AACjE,CAAC,CAAC"}

package/dist/esm/src/multer/multipart/request.js

@@ -4,10 +4,21 @@ export const getMultipartRequest = (ctx) => {
 };
 export const getParts = (req, options) => {
     const parts = req.body ?? {};
-    for (const [key, file] of Object.entries(parts)) {
-        if (file instanceof File) {
+    for (const [key, value] of Object.entries(parts)) {
+        if (Array.isArray(value) && value.every((item) => item instanceof File)) {
             const maxSize = options?.limits?.fileSize;
-            if (maxSize && file.size > maxSize) {
+            if (maxSize) {
+                for (const file of value) {
+                    if (file.size > maxSize) {
+                        throw new BadRequestException(`File "${key}" is too large. Maximum size is ${maxSize} bytes.`);
+                    }
+                }
+            }
+            continue;
+        }
+        if (value instanceof File) {
+            const maxSize = options?.limits?.fileSize;
+            if (maxSize && value.size > maxSize) {
                 throw new BadRequestException(`File "${key}" is too large. Maximum size is ${maxSize} bytes.`);
             }
         }

package/dist/esm/src/multer/multipart/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../../../src/multer/multipart/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAqBrD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,GAAsB,EAAgB,EAAE;IAC1E,OAAO,GAAG,CAAC,UAAU,EAAgB,CAAC;AACxC,CAAC,CAAC;AASF,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,GAAiB,EACjB,OAAsB,EACZ,EAAE;IACZ,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;IAE7B,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChD,IAAI,IAAI,YAAY,IAAI,EAAE,CAAC;YACzB,MAAM,OAAO,GAAG,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC;YAC1C,IAAI,OAAO,IAAI,IAAI,CAAC,IAAI,GAAG,OAAO,EAAE,CAAC;gBACnC,MAAM,IAAI,mBAAmB,CAC3B,SAAS,GAAG,mCAAmC,OAAO,SAAS,CAChE,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}
+{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../../../src/multer/multipart/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAqBrD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,GAAsB,EAAgB,EAAE;IAC1E,OAAO,GAAG,CAAC,UAAU,EAAgB,CAAC;AACxC,CAAC,CAAC;AASF,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,GAAiB,EACjB,OAAsB,EACZ,EAAE;IACZ,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;IAE7B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAEjD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;YACxE,MAAM,OAAO,GAAG,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC;YAC1C,IAAI,OAAO,EAAE,CAAC;gBACZ,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;oBACzB,IAAI,IAAI,CAAC,IAAI,GAAG,OAAO,EAAE,CAAC;wBACxB,MAAM,IAAI,mBAAmB,CAC3B,SAAS,GAAG,mCAAmC,OAAO,SAAS,CAChE,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;YACD,SAAS;QACX,CAAC;QAGD,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;YAC1B,MAAM,OAAO,GAAG,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC;YAC1C,IAAI,OAAO,IAAI,KAAK,CAAC,IAAI,GAAG,OAAO,EAAE,CAAC;gBACpC,MAAM,IAAI,mBAAmB,CAC3B,SAAS,GAAG,mCAAmC,OAAO,SAAS,CAChE,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}

package/dist/esm/src/multer/storage/disk-storage.d.ts

@@ -22,7 +22,8 @@ export declare class DiskStorage implements Storage<DiskStorageFile, DiskStorage
         path: string;
         mimetype: string;
         encoding: string;
-        fieldname: string;
+        fieldName: string;
+        uploadedAt: string;
     }>;
     removeFile(file: DiskStorageFile, force?: boolean): Promise<void>;
     protected getFilename(file: File, req: HonoRequest, obj?: DiskStorageOptionHandler): Promise<string>;

package/dist/esm/src/multer/storage/disk-storage.js

@@ -40,7 +40,8 @@ export class DiskStorage {
             path,
             mimetype: file.type,
             encoding: 'utf-8',
-            fieldname: fieldName,
+            fieldName: fieldName,
+            uploadedAt: new Date().toISOString(),
         };
     }
     async removeFile(file, force) {

package/dist/esm/src/multer/storage/disk-storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"disk-storage.js","sourceRoot":"","sources":["../../../../../src/multer/storage/disk-storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAmBtD,MAAM,sBAAsB,GAAG,CAC7B,IAAU,EACV,GAAgB,EAChB,GAA8B,EAC9B,EAAE;IACF,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE,CAAC;QAC9B,OAAO,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACxB,CAAC;IAED,IAAI,GAAG,IAAI,IAAI;QAAE,OAAO,GAAG,CAAC;IAE5B,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;AAClE,MAAM,OAAO,WAAW;IAKtB,YAAY,OAA4B;QACtC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,IAAI,0BAA0B,IAAI,IAAI,EAAE,CAAC;YACvC,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,0BAA0B,EAAE,CAAC;QACvE,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,IAAU,EAAE,GAAgB,EAAE,SAAiB;QACrE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC3E,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAE1E,IAAI,CAAC,CAAC,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YAC9B,MAAM,KAAK,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACzC,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAEvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACxC,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAE1D,MAAM,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAEvC,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,YAAY;YACzB,IAAI;YACJ,QAAQ;YACR,gBAAgB,EAAE,IAAI,CAAC,IAAI;YAC3B,IAAI;YACJ,QAAQ,EAAE,IAAI,CAAC,IAAI;YACnB,QAAQ,EAAE,OAAO;YACjB,SAAS,EAAE,SAAS;SACrB,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,IAAqB,EAAE,KAAe;QAC5D,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,IAAI,CAAC,KAAK;YAAE,OAAO;QAEjD,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAES,KAAK,CAAC,WAAW,CACzB,IAAU,EACV,GAAgB,EAChB,GAA8B;QAE9B,OAAO,CACL,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CACvE,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,kBAAkB,CAChC,IAAU,EACV,GAAgB,EAChB,GAA8B;QAE9B,OAAO,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,EAAE,CAAC;IAC5D,CAAC;CACF"}
+{"version":3,"file":"disk-storage.js","sourceRoot":"","sources":["../../../../../src/multer/storage/disk-storage.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/multer/storage/memory-storage.d.ts

@@ -5,15 +5,6 @@ export interface MemoryStorageFile extends StorageFile {
     stream: () => ReadableStream<Uint8Array>;
 }
 export declare class MemoryStorage implements Storage<MemoryStorageFile> {
-    handleFile(file: File, _req: HonoRequest, fieldName: string): Promise<{
-        buffer: Buffer<ArrayBuffer>;
-        size: number;
-        encoding: string;
-        mimetype: string;
-        fieldname: string;
-        originalFilename: string;
-        stream: () => ReadableStream<Uint8Array<ArrayBuffer>>;
-        lastModified: number;
-    }>;
-    removeFile(file: MemoryStorageFile): Promise<void>;
+    handleFile(file: File, _req: HonoRequest, fieldName: string): Promise<MemoryStorageFile>;
+    removeFile(file: StorageFile): Promise<void>;
 }

package/dist/esm/src/multer/storage/memory-storage.js

@@ -4,20 +4,22 @@ export class MemoryStorage {
             .stream()
             .pipeTo(new WritableStream())
             .then(() => file.arrayBuffer())
-            .then((buffer) => Buffer.from(buffer));
+            .then((buf) => Buffer.from(buf));
         return {
             buffer,
             size: buffer.length,
             encoding: 'utf-8',
             mimetype: file.type,
-            fieldname: fieldName,
+            fieldName: fieldName,
             originalFilename: file.name,
+            uploadedAt: new Date().toISOString(),
             stream: () => file.stream(),
-            lastModified: file.lastModified,
         };
     }
     async removeFile(file) {
-        delete file.buffer;
+        if ('buffer' in file) {
+            delete file.buffer;
+        }
     }
 }
 //# sourceMappingURL=memory-storage.js.map

package/dist/esm/src/multer/storage/memory-storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"memory-storage.js","sourceRoot":"","sources":["../../../../../src/multer/storage/memory-storage.ts"],"names":[],"mappings":"AASA,MAAM,OAAO,aAAa;IACjB,KAAK,CAAC,UAAU,CAAC,IAAU,EAAE,IAAiB,EAAE,SAAiB;QACtE,MAAM,MAAM,GAAG,MAAM,IAAI;aACtB,MAAM,EAAE;aACR,MAAM,CAAC,IAAI,cAAc,EAAE,CAAC;aAC5B,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;aAC9B,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAEzC,OAAO;YACL,MAAM;YACN,IAAI,EAAE,MAAM,CAAC,MAAM;YACnB,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE,IAAI,CAAC,IAAI;YACnB,SAAS,EAAE,SAAS;YACpB,gBAAgB,EAAE,IAAI,CAAC,IAAI;YAC3B,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE;YAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,IAAuB;QAC7C,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;CACF"}
+{"version":3,"file":"memory-storage.js","sourceRoot":"","sources":["../../../../../src/multer/storage/memory-storage.ts"],"names":[],"mappings":"AASA,MAAM,OAAO,aAAa;IACjB,KAAK,CAAC,UAAU,CACrB,IAAU,EACV,IAAiB,EACjB,SAAiB;QAEjB,MAAM,MAAM,GAAG,MAAM,IAAI;aACtB,MAAM,EAAE;aACR,MAAM,CAAC,IAAI,cAAc,EAAE,CAAC;aAC5B,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;aAC9B,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAEnC,OAAO;YACL,MAAM;YACN,IAAI,EAAE,MAAM,CAAC,MAAM;YACnB,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE,IAAI,CAAC,IAAI;YACnB,SAAS,EAAE,SAAS;YACpB,gBAAgB,EAAE,IAAI,CAAC,IAAI;YAC3B,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACpC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE;SAC5B,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,IAAiB;QAEvC,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,OAAQ,IAA0B,CAAC,MAAM,CAAC;QAC5C,CAAC;IACH,CAAC;CACF"}

package/dist/esm/src/multer/storage/storage.d.ts

@@ -1,13 +1,14 @@
 import { HonoRequest } from 'hono';
 export interface StorageFile {
-    size: number;
-    fieldname: string;
-    encoding: string;
-    mimetype: string;
+    fieldName: string;
     originalFilename: string;
+    mimetype: string;
+    encoding: string;
+    size: number;
+    uploadedAt?: string;
 }
 export interface Storage<T extends StorageFile = StorageFile, K = any> {
     handleFile: (file: File, req: HonoRequest, fieldName: string) => Promise<T>;
-    removeFile: (file: T, force?: boolean) => Promise<void> | void;
+    removeFile: (file: T | StorageFile, force?: boolean) => Promise<void> | void;
     options?: K;
 }

package/dist/esm/src/multer/utils/file.d.ts

@@ -0,0 +1,6 @@
+export declare function formatBytes(bytes: number): string;
+export declare function validateFileSize(file: File, maxSize: number): void;
+export declare function getFileExtension(filename: string): string;
+export declare function isAllowedFileType(file: File, allowedTypes: string[]): boolean;
+export declare function sanitizeFilename(filename: string): string;
+export declare function getUniqueFilename(filename: string, existingFilenames?: Set<string>): string;

package/dist/esm/src/multer/utils/file.js

@@ -0,0 +1,54 @@
+export function formatBytes(bytes) {
+    if (bytes === 0)
+        return '0 Bytes';
+    const k = 1024;
+    const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
+    const i = Math.floor(Math.log(bytes) / Math.log(k));
+    return `${parseFloat((bytes / Math.pow(k, i)).toFixed(2))} ${sizes[i]}`;
+}
+export function validateFileSize(file, maxSize) {
+    if (file.size > maxSize) {
+        throw new Error(`File "${file.name}" (${formatBytes(file.size)}) exceeds maximum size of ${formatBytes(maxSize)}`);
+    }
+}
+export function getFileExtension(filename) {
+    const ext = filename.lastIndexOf('.');
+    return ext === -1 ? '' : filename.slice(ext + 1);
+}
+export function isAllowedFileType(file, allowedTypes) {
+    return allowedTypes.some((type) => {
+        if (type.startsWith('.')) {
+            return getFileExtension(file.name).toLowerCase() === type.slice(1);
+        }
+        if (type.endsWith('/*')) {
+            const prefix = type.slice(0, -2);
+            return file.type.startsWith(prefix);
+        }
+        return file.type === type;
+    });
+}
+export function sanitizeFilename(filename) {
+    return filename
+        .replace(/[^a-zA-Z0-9.-]/g, '_')
+        .replace(/_{2,}/g, '_')
+        .replace(/^\.+|\.+$/g, '');
+}
+export function getUniqueFilename(filename, existingFilenames) {
+    if (!existingFilenames?.has(filename)) {
+        return filename;
+    }
+    const name = filename.lastIndexOf('.');
+    if (name === -1) {
+        return `${filename}_1`;
+    }
+    const baseName = filename.slice(0, name);
+    const ext = filename.slice(name);
+    let counter = 1;
+    let newFilename = `${baseName}_${counter}${ext}`;
+    while (existingFilenames.has(newFilename)) {
+        counter++;
+        newFilename = `${baseName}_${counter}${ext}`;
+    }
+    return newFilename;
+}
+//# sourceMappingURL=file.js.map

package/dist/esm/src/multer/utils/file.js.map

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

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

@@ -0,0 +1,2 @@
+export * from './file';
+export * from './validators';

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

@@ -0,0 +1,3 @@
+export * from './file';
+export * from './validators';
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/multer/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC"}

package/dist/esm/src/multer/utils/validators.d.ts

@@ -0,0 +1,18 @@
+export declare const FileTypes: {
+    readonly IMAGES: readonly ["image/jpeg", "image/png", "image/gif", "image/webp", "image/svg+xml", "image/avif", "image/heic", "image/heif", "image/tiff", "image/bmp", "image/x-icon", ".jpg", ".jpeg", ".png", ".gif", ".webp", ".svg", ".avif", ".heic", ".heif", ".tiff", ".bmp", ".ico"];
+    readonly DOCUMENTS: readonly ["application/pdf", ".pdf", "application/msword", ".doc", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", ".docx", "application/vnd.ms-excel", ".xls", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", ".xlsx", "application/vnd.ms-powerpoint", ".ppt", "application/vnd.openxmlformats-officedocument.presentationml.presentation", ".pptx", "application/vnd.oasis.opendocument.text", ".odt", "application/vnd.oasis.opendocument.spreadsheet", ".ods", "application/vnd.oasis.opendocument.presentation", ".odp", "application/vnd.apple.pages", ".pages", "application/vnd.apple.numbers", ".numbers", "application/vnd.apple.keynote", ".key", "application/rtf", ".rtf", "text/plain", ".txt", "text/csv", ".csv"];
+    readonly VIDEOS: readonly ["video/mp4", "video/mpeg", "video/quicktime", "video/webm", "video/x-msvideo", "video/x-matroska", "video/quicktime", "video/x-flv", ".mp4", ".mpeg", ".mov", ".webm", ".avi", ".mkv", ".flv"];
+    readonly AUDIO: readonly ["audio/mpeg", "audio/mp4", "audio/wav", "audio/ogg", "audio/webm", "audio/flac", "audio/aac", "audio/x-m4a", "audio/x-wav", ".mp3", ".m4a", ".wav", ".ogg", ".flac", ".aac"];
+    readonly ARCHIVES: readonly ["application/zip", "application/x-zip-compressed", ".zip", "application/x-rar-compressed", ".rar", "application/x-7z-compressed", ".7z", "application/x-tar", ".tar", "application/gzip", ".gz", "application/x-gzip", "application/x-bzip2", ".bz2", "application/x-compress", ".Z", "application/x-apple-diskimage", ".dmg", "application/x-iso9660-image", ".iso"];
+    readonly MODELS_3D: readonly ["model/stl", ".stl", "model/obj", ".obj", "model/gltf-binary", ".glb", "model/gltf+json", ".gltf", "model/fbx", ".fbx", "model/dae", ".dae", "model/vnd.collada+xml"];
+    readonly FONTS: readonly ["font/ttf", ".ttf", "font/otf", ".otf", "font/woff", ".woff", "font/woff2", ".woff2", "application/x-font-ttf", "application/x-font-opentype"];
+};
+export interface FileValidatorOptions {
+    maxSize?: number;
+    allowedTypes?: string[];
+    deniedTypes?: string[];
+}
+export declare function validateFile(file: File, options: FileValidatorOptions): {
+    isValid: boolean;
+    error?: string;
+};

package/dist/esm/src/multer/utils/validators.js

@@ -0,0 +1,167 @@
+import { isAllowedFileType } from './file';
+export const FileTypes = {
+    IMAGES: [
+        'image/jpeg',
+        'image/png',
+        'image/gif',
+        'image/webp',
+        'image/svg+xml',
+        'image/avif',
+        'image/heic',
+        'image/heif',
+        'image/tiff',
+        'image/bmp',
+        'image/x-icon',
+        '.jpg',
+        '.jpeg',
+        '.png',
+        '.gif',
+        '.webp',
+        '.svg',
+        '.avif',
+        '.heic',
+        '.heif',
+        '.tiff',
+        '.bmp',
+        '.ico',
+    ],
+    DOCUMENTS: [
+        'application/pdf',
+        '.pdf',
+        'application/msword',
+        '.doc',
+        'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        '.docx',
+        'application/vnd.ms-excel',
+        '.xls',
+        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        '.xlsx',
+        'application/vnd.ms-powerpoint',
+        '.ppt',
+        'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+        '.pptx',
+        'application/vnd.oasis.opendocument.text',
+        '.odt',
+        'application/vnd.oasis.opendocument.spreadsheet',
+        '.ods',
+        'application/vnd.oasis.opendocument.presentation',
+        '.odp',
+        'application/vnd.apple.pages',
+        '.pages',
+        'application/vnd.apple.numbers',
+        '.numbers',
+        'application/vnd.apple.keynote',
+        '.key',
+        'application/rtf',
+        '.rtf',
+        'text/plain',
+        '.txt',
+        'text/csv',
+        '.csv',
+    ],
+    VIDEOS: [
+        'video/mp4',
+        'video/mpeg',
+        'video/quicktime',
+        'video/webm',
+        'video/x-msvideo',
+        'video/x-matroska',
+        'video/quicktime',
+        'video/x-flv',
+        '.mp4',
+        '.mpeg',
+        '.mov',
+        '.webm',
+        '.avi',
+        '.mkv',
+        '.flv',
+    ],
+    AUDIO: [
+        'audio/mpeg',
+        'audio/mp4',
+        'audio/wav',
+        'audio/ogg',
+        'audio/webm',
+        'audio/flac',
+        'audio/aac',
+        'audio/x-m4a',
+        'audio/x-wav',
+        '.mp3',
+        '.m4a',
+        '.wav',
+        '.ogg',
+        '.flac',
+        '.aac',
+    ],
+    ARCHIVES: [
+        'application/zip',
+        'application/x-zip-compressed',
+        '.zip',
+        'application/x-rar-compressed',
+        '.rar',
+        'application/x-7z-compressed',
+        '.7z',
+        'application/x-tar',
+        '.tar',
+        'application/gzip',
+        '.gz',
+        'application/x-gzip',
+        'application/x-bzip2',
+        '.bz2',
+        'application/x-compress',
+        '.Z',
+        'application/x-apple-diskimage',
+        '.dmg',
+        'application/x-iso9660-image',
+        '.iso',
+    ],
+    MODELS_3D: [
+        'model/stl',
+        '.stl',
+        'model/obj',
+        '.obj',
+        'model/gltf-binary',
+        '.glb',
+        'model/gltf+json',
+        '.gltf',
+        'model/fbx',
+        '.fbx',
+        'model/dae',
+        '.dae',
+        'model/vnd.collada+xml',
+    ],
+    FONTS: [
+        'font/ttf',
+        '.ttf',
+        'font/otf',
+        '.otf',
+        'font/woff',
+        '.woff',
+        'font/woff2',
+        '.woff2',
+        'application/x-font-ttf',
+        'application/x-font-opentype',
+    ],
+};
+export function validateFile(file, options) {
+    if (options.maxSize && file.size > options.maxSize) {
+        return {
+            isValid: false,
+            error: `File "${file.name}" exceeds maximum size of ${options.maxSize} bytes`,
+        };
+    }
+    if (options.deniedTypes && isAllowedFileType(file, options.deniedTypes)) {
+        return {
+            isValid: false,
+            error: `File type "${file.type}" is not allowed`,
+        };
+    }
+    if (options.allowedTypes && !isAllowedFileType(file, options.allowedTypes)) {
+        return {
+            isValid: false,
+            error: `File type "${file.type}" is not allowed. Allowed types: ${options.allowedTypes.join(', ')}`,
+        };
+    }
+    return { isValid: true };
+}
+//# sourceMappingURL=validators.js.map

package/dist/esm/src/multer/utils/validators.js.map

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