bxo 0.0.5-dev.55 → 0.0.5-dev.57

package/package.json

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

package/src/index.ts

@@ -47,7 +47,9 @@ export type {
   Plugin,
   Context,
   FileUpload,
-  FormData
+  FormData,
+  InferResponseType,
+  InferZodType
 } from './types';
 
 // Re-export everything from the main BXO class for backward compatibility

package/src/utils/index.ts

@@ -175,6 +175,10 @@ function setNestedValue(obj: any, baseKey: string, path: string[], value: any, i
       // Numeric key - treat as array index
       const index = parseInt(lastKey, 10);
       if (Array.isArray(current)) {
+        // Ensure array is large enough
+        while (current.length <= index) {
+          current.push(undefined);
+        }
         current[index] = value;
       } else {
         // Convert to array if needed
@@ -204,51 +208,46 @@ export async function parseRequestBody(request: Request): Promise<any> {
     const formBody: Record<string, any> = {};
     
     for (const [key, value] of formData.entries()) {
-      if (value instanceof File) {
-        // Return File instances directly
-        formBody[key] = value;
-      } else {
-        // Parse the key to handle nested objects and arrays (Axios-compatible)
-        const parsedKey = parseFormKey(key);
-        
-        if (parsedKey.isJson) {
-          // Handle JSON serialization (e.g., "obj{}")
-          if (typeof value === 'string') {
-            try {
-              formBody[parsedKey.baseKey] = JSON.parse(value);
-            } catch {
-              formBody[parsedKey.baseKey] = value;
-            }
-          } else {
+      // Parse the key to handle nested objects and arrays (Axios-compatible)
+      const parsedKey = parseFormKey(key);
+      
+      if (parsedKey.isJson) {
+        // Handle JSON serialization (e.g., "obj{}")
+        if (typeof value === 'string') {
+          try {
+            formBody[parsedKey.baseKey] = JSON.parse(value);
+          } catch {
             formBody[parsedKey.baseKey] = value;
           }
-        } else if (parsedKey.isArray) {
-          // Handle array notation like "recordIds[]"
-          if (parsedKey.baseKey in formBody) {
-            if (Array.isArray(formBody[parsedKey.baseKey])) {
-              formBody[parsedKey.baseKey].push(value);
-            } else {
-              formBody[parsedKey.baseKey] = [formBody[parsedKey.baseKey], value];
-            }
+        } else {
+          formBody[parsedKey.baseKey] = value;
+        }
+      } else if (parsedKey.isArray) {
+        // Handle array notation like "recordIds[]"
+        if (parsedKey.baseKey in formBody) {
+          if (Array.isArray(formBody[parsedKey.baseKey])) {
+            formBody[parsedKey.baseKey].push(value);
           } else {
-            formBody[parsedKey.baseKey] = [value];
+            formBody[parsedKey.baseKey] = [formBody[parsedKey.baseKey], value];
           }
-        } else if (parsedKey.path.length > 0) {
-          // Handle nested object notation like "test[new]", "test[hi][hi]", "arr[0]", "users[0][name]"
-          setNestedValue(formBody, parsedKey.baseKey, parsedKey.path, value, parsedKey.hasIndexes);
         } else {
-          // Handle regular form fields - check if this key already exists
-          if (key in formBody) {
-            // If key already exists, convert to array or append to existing array
-            if (Array.isArray(formBody[key])) {
-              formBody[key].push(value);
-            } else {
-              formBody[key] = [formBody[key], value];
-            }
+          formBody[parsedKey.baseKey] = [value];
+        }
+      } else if (parsedKey.path.length > 0) {
+        // Handle nested object notation like "test[new]", "test[hi][hi]", "arr[0]", "users[0][name]"
+        setNestedValue(formBody, parsedKey.baseKey, parsedKey.path, value, parsedKey.hasIndexes);
+      } else {
+        // Handle regular form fields - check if this key already exists
+        if (key in formBody) {
+          // If key already exists, convert to array or append to existing array
+          if (Array.isArray(formBody[key])) {
+            formBody[key].push(value);
           } else {
-            // First occurrence of this key
-            formBody[key] = value;
+            formBody[key] = [formBody[key], value];
           }
+        } else {
+          // First occurrence of this key
+          formBody[key] = value;
         }
       }
     }

package/src/utils/response-handler.ts

@@ -134,6 +134,40 @@ export function processResponse(
       });
     }
 
+    // Check if response contains File objects
+    const containsFiles = (obj: any): boolean => {
+      if (obj instanceof File) return true;
+      if (Array.isArray(obj)) {
+        return obj.some(item => containsFiles(item));
+      }
+      if (obj && typeof obj === 'object') {
+        return Object.values(obj).some(value => containsFiles(value));
+      }
+      return false;
+    };
+
+    if (containsFiles(response)) {
+      // For responses containing files, we need to handle them specially
+      // For now, we'll convert File objects to a serializable format
+      const serializableResponse = JSON.parse(JSON.stringify(response, (key, value) => {
+        if (value instanceof File) {
+          return {
+            type: 'File',
+            name: value.name,
+            size: value.size,
+            lastModified: value.lastModified
+          };
+        }
+        return value;
+      }));
+      
+      headers.set('Content-Type', 'application/json');
+      return new Response(JSON.stringify(serializableResponse), {
+        status: ctx.set.status || 200,
+        headers: headers
+      });
+    }
+
     headers.set('Content-Type', 'application/json');
     return new Response(JSON.stringify(response), {
       status: ctx.set.status || 200,
@@ -157,6 +191,42 @@ export function processResponse(
     });
   }
 
+  // Check if response contains File objects (for the no-cookies case)
+  const containsFiles = (obj: any): boolean => {
+    if (obj instanceof File) return true;
+    if (Array.isArray(obj)) {
+      return obj.some(item => containsFiles(item));
+    }
+    if (obj && typeof obj === 'object') {
+      return Object.values(obj).some(value => containsFiles(value));
+    }
+    return false;
+  };
+
+  if (containsFiles(response)) {
+    // For responses containing files, we need to handle them specially
+    // For now, we'll convert File objects to a serializable format
+    const serializableResponse = JSON.parse(JSON.stringify(response, (key, value) => {
+      if (value instanceof File) {
+        return {
+          type: 'File',
+          name: value.name,
+          size: value.size,
+          lastModified: value.lastModified
+        };
+      }
+      return value;
+    }));
+    
+    return new Response(JSON.stringify(serializableResponse), {
+      ...responseInit,
+      headers: {
+        'Content-Type': 'application/json',
+        ...responseInit.headers
+      }
+    });
+  }
+
   return new Response(JSON.stringify(response), {
     ...responseInit,
     headers: {

package/tests/integration/bxo.test.ts

@@ -271,6 +271,116 @@ describe('BXO Framework Integration', () => {
       });
       expect(data.message).toBe('Nested data submitted');
     });
+
+    it('should handle form data with nested arrays and files', async () => {
+      app.post('/api/records-with-files', (ctx) => {
+        return { formData: ctx.body, message: 'Records with files submitted' };
+      });
+
+      const formData = new FormData();
+      formData.append('records[0][qrPayment]', new File(['test file content'], 'test.png', { type: 'image/png' }));
+      formData.append('records[1][qrPayment]', new File(['test file content 2'], 'test2.png', { type: 'image/png' }));
+      formData.append('records[0][name]', 'Record 1');
+      formData.append('records[1][name]', 'Record 2');
+
+      const response = await fetch(`${baseUrl}/api/records-with-files`, {
+        method: 'POST',
+        body: formData
+      });
+
+      const data = await response.json() as { 
+        formData: { 
+          records: Array<{
+            qrPayment: {
+              type: string;
+              name: string;
+              size: number;
+              lastModified: number;
+            },
+            name: string
+          }>
+        }, 
+        message: string 
+      };
+
+      expect(response.status).toBe(200);
+      expect(Array.isArray(data.formData.records)).toBe(true);
+      expect(data.formData.records).toHaveLength(2);
+      expect(data.formData.records[0]?.name).toBe('Record 1');
+      expect(data.formData.records[1]?.name).toBe('Record 2');
+      expect(data.formData.records[0]?.qrPayment).toEqual({
+        type: 'File',
+        name: 'test.png',
+        size: 17,
+        lastModified: 0
+      });
+      expect(data.formData.records[1]?.qrPayment).toEqual({
+        type: 'File',
+        name: 'test2.png',
+        size: 19,
+        lastModified: 0
+      });
+      expect(data.message).toBe('Records with files submitted');
+    });
+
+    it('should have File objects in ctx.body', async () => {
+      app.post('/api/files-test', (ctx) => {
+        // Check if the files are actual File instances
+        const body = ctx.body as {
+          records: Array<{
+            qrPayment: File;
+            name: string;
+          }>;
+        };
+        const records = body.records;
+        console.log('File instance check:');
+        console.log('records[0].qrPayment instanceof File:', records[0]?.qrPayment instanceof File);
+        console.log('records[1].qrPayment instanceof File:', records[1]?.qrPayment instanceof File);
+        console.log('File name:', records[0]?.qrPayment.name);
+        console.log('File size:', records[0]?.qrPayment.size);
+        console.log('File type:', records[0]?.qrPayment.type);
+        
+        return { 
+          message: 'Files received',
+          fileInfo: {
+            isFile0: records[0]?.qrPayment instanceof File,
+            isFile1: records[1]?.qrPayment instanceof File,
+            name0: records[0]?.qrPayment.name,
+            size0: records[0]?.qrPayment.size,
+            type0: records[0]?.qrPayment.type
+          }
+        };
+      });
+
+      const formData = new FormData();
+      formData.append('records[0][qrPayment]', new File(['test file content'], 'test.png', { type: 'image/png' }));
+      formData.append('records[1][qrPayment]', new File(['test file content 2'], 'test2.png', { type: 'image/png' }));
+      formData.append('records[0][name]', 'Record 1');
+      formData.append('records[1][name]', 'Record 2');
+
+      const response = await fetch(`${baseUrl}/api/files-test`, {
+        method: 'POST',
+        body: formData
+      });
+
+      const data = await response.json() as {
+        message: string;
+        fileInfo: {
+          isFile0: boolean;
+          isFile1: boolean;
+          name0: string;
+          size0: number;
+          type0: string;
+        };
+      };
+
+      expect(response.status).toBe(200);
+      expect(data.fileInfo.isFile0).toBe(true);
+      expect(data.fileInfo.isFile1).toBe(true);
+      expect(data.fileInfo.name0).toBe('test.png');
+      expect(data.fileInfo.size0).toBe(17);
+      expect(data.fileInfo.type0).toBe('image/png');
+    });
   });
 
   describe('Response Handling', () => {