bxo 0.0.5-dev.53 → 0.0.5-dev.54

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bxo",
   "module": "index.ts",
-  "version": "0.0.5-dev.53",
+  "version": "0.0.5-dev.54",
   "description": "A simple and lightweight web framework for Bun",
   "type": "module",
   "exports": {

package/src/utils/index.ts

@@ -90,22 +90,13 @@ export async function parseRequestBody(request: Request): Promise<any> {
     }
   } else if (contentType?.includes('multipart/form-data') || contentType?.includes('application/x-www-form-urlencoded')) {
     const formData = await request.formData();
-    // Convert FormData to a structured object that preserves file information
+    // Convert FormData to a structured object
     const formBody: Record<string, any> = {};
     
     for (const [key, value] of formData.entries()) {
       if (value instanceof File) {
-        // Handle file uploads
-        formBody[key] = {
-          type: 'file',
-          name: value.name,
-          size: value.size,
-          lastModified: value.lastModified,
-          file: value, // Keep the actual File object for access
-          // Add convenience properties
-          filename: value.name,
-          mimetype: value.type || 'application/octet-stream'
-        };
+        // Return File instances directly
+        formBody[key] = value;
       } else {
         // Handle regular form fields
         formBody[key] = value;
@@ -186,21 +177,13 @@ export function createRedirectResponse(
 }
 
 // Check if a value is a file upload
-export function isFileUpload(value: any): value is {
-  type: 'file';
-  file: File;
-  name: string;
-  size: number;
-  lastModified: number;
-  filename: string;
-  mimetype: string;
-} {
-  return value && typeof value === 'object' && value.type === 'file' && value.file instanceof File;
+export function isFileUpload(value: any): value is File {
+  return value instanceof File;
 }
 
 // Extract File object from upload value
 export function getFileFromUpload(value: any): File | null {
-  return isFileUpload(value) ? value.file : null;
+  return isFileUpload(value) ? value : null;
 }
 
 // Get file metadata without the File object
@@ -209,7 +192,7 @@ export function getFileInfo(value: any): { name: string; size: number; mimetype:
     return {
       name: value.name,
       size: value.size,
-      mimetype: value.mimetype,
+      mimetype: value.type || 'application/octet-stream',
       lastModified: value.lastModified
     };
   }
@@ -240,7 +223,7 @@ export function getFileUploads(formData: Record<string, any>): Record<string, Fi
   const files: Record<string, File> = {};
   for (const [key, value] of Object.entries(formData)) {
     if (isFileUpload(value)) {
-      files[key] = value.file;
+      files[key] = value;
     }
   }
   return files;

package/tests/unit/utils.test.ts

@@ -202,34 +202,17 @@ describe('Utility Functions', () => {
 
   describe('File Upload Utilities', () => {
     it('should identify file uploads correctly', () => {
-      const fileUpload = {
-        type: 'file',
-        name: 'test.jpg',
-        size: 1024,
-        lastModified: 1234567890,
-        file: new File(['test'], 'test.jpg'),
-        filename: 'test.jpg',
-        mimetype: 'image/jpeg'
-      };
+      const file = new File(['test'], 'test.jpg', { type: 'image/jpeg' });
       
-      expect(isFileUpload(fileUpload)).toBe(true);
+      expect(isFileUpload(file)).toBe(true);
       expect(isFileUpload('not a file')).toBe(false);
       expect(isFileUpload({ type: 'text' })).toBe(false);
     });
 
     it('should extract file from upload', () => {
-      const file = new File(['test'], 'test.jpg');
-      const fileUpload = {
-        type: 'file',
-        name: 'test.jpg',
-        size: 1024,
-        lastModified: 1234567890,
-        file,
-        filename: 'test.jpg',
-        mimetype: 'image/jpeg'
-      };
+      const file = new File(['test'], 'test.jpg', { type: 'image/jpeg' });
       
-      const result = getFileFromUpload(fileUpload);
+      const result = getFileFromUpload(file);
       expect(result).toBe(file);
     });
 
@@ -239,22 +222,14 @@ describe('Utility Functions', () => {
     });
 
     it('should get file info', () => {
-      const fileUpload = {
-        type: 'file',
-        name: 'test.jpg',
-        size: 1024,
-        lastModified: 1234567890,
-        file: new File(['test'], 'test.jpg'),
-        filename: 'test.jpg',
-        mimetype: 'image/jpeg'
-      };
+      const file = new File(['test'], 'test.jpg', { type: 'image/jpeg' });
       
-      const result = getFileInfo(fileUpload);
+      const result = getFileInfo(file);
       expect(result).toEqual({
         name: 'test.jpg',
-        size: 1024,
+        size: 4,
         mimetype: 'image/jpeg',
-        lastModified: 1234567890
+        lastModified: expect.any(Number)
       });
     });
 
@@ -264,17 +239,10 @@ describe('Utility Functions', () => {
     });
 
     it('should get all file uploads from form data', () => {
+      const file = new File(['test'], 'avatar.jpg', { type: 'image/jpeg' });
       const formData = {
         name: 'john',
-        avatar: {
-          type: 'file',
-          name: 'avatar.jpg',
-          size: 1024,
-          lastModified: 1234567890,
-          file: new File(['test'], 'avatar.jpg'),
-          filename: 'avatar.jpg',
-          mimetype: 'image/jpeg'
-        },
+        avatar: file,
         email: 'john@example.com'
       };
       
@@ -285,17 +253,10 @@ describe('Utility Functions', () => {
     });
 
     it('should get all non-file fields from form data', () => {
+      const file = new File(['test'], 'avatar.jpg', { type: 'image/jpeg' });
       const formData = {
         name: 'john',
-        avatar: {
-          type: 'file',
-          name: 'avatar.jpg',
-          size: 1024,
-          lastModified: 1234567890,
-          file: new File(['test'], 'avatar.jpg'),
-          filename: 'avatar.jpg',
-          mimetype: 'image/jpeg'
-        },
+        avatar: file,
         email: 'john@example.com'
       };