bxo 0.0.5-dev.60 → 0.0.5-dev.62

package/package.json

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

package/src/types/index.ts

@@ -3,16 +3,14 @@ import { z } from 'zod';
 // Type utilities for extracting types from Zod schemas
 export type InferZodType<T> = T extends z.ZodType<infer U> ? U : never;
 
-// Response configuration types
+// Response configuration types - only allow Record<number, schema> for better maintainability
 export type ResponseSchema = z.ZodSchema<any>;
 export type StatusResponseSchema = Record<number, ResponseSchema>;
-export type ResponseConfig = ResponseSchema | StatusResponseSchema;
+export type ResponseConfig = StatusResponseSchema;
 
 // Type utility to extract response type from response config
-export type InferResponseType<T> = T extends ResponseSchema
-  ? InferZodType<T>
-  : T extends StatusResponseSchema
-  ? { [K in keyof T]: InferZodType<T[K]> }[number]
+export type InferResponseType<T> = T extends StatusResponseSchema
+  ? T[keyof T] extends z.ZodType<infer U> ? U : never
   : never;
 
 // Cookie options interface for setting cookies
@@ -75,15 +73,11 @@ export type Context<TConfig extends RouteConfig = {}> = {
       ? T extends keyof TConfig['response']
       ? InferZodType<TConfig['response'][T]>
       : any
-      : TConfig['response'] extends ResponseSchema
-      ? InferZodType<TConfig['response']>
       : any
   ) => TConfig['response'] extends StatusResponseSchema
     ? T extends keyof TConfig['response']
     ? InferZodType<TConfig['response'][T]>
     : any
-    : TConfig['response'] extends ResponseSchema
-    ? InferZodType<TConfig['response']>
     : any;
   redirect: (location: string, status?: number) => Response;
   clearRedirect: () => void;
@@ -106,7 +100,9 @@ export interface InternalCookie {
 // Handler function type with proper response typing
 export type Handler<TConfig extends RouteConfig = {}, EC = {}> = (
   ctx: Context<TConfig> & EC
-) => Promise<InferResponseType<TConfig['response']> | any> | InferResponseType<TConfig['response']> | any;
+) => TConfig['response'] extends StatusResponseSchema
+  ? Promise<InferResponseType<TConfig['response']>> | InferResponseType<TConfig['response']>
+  : Promise<any> | any;
 
 // Route definition
 export interface Route {

package/src/utils/index.ts

@@ -42,7 +42,7 @@ export function validateData<T>(schema: z.ZodSchema<T> | undefined, data: any):
   return schema.parse(data);
 }
 
-// Validate response against response config (supports both simple and status-based schemas)
+// Validate response against response config (only supports Record<number, schema> format)
 export function validateResponse(
   responseConfig: ResponseConfig | undefined, 
   data: any, 
@@ -50,31 +50,22 @@ export function validateResponse(
 ): any {
   if (!responseConfig) return data;
 
-  // If it's a simple schema (not status-based)
-  if ('parse' in responseConfig && typeof responseConfig.parse === 'function') {
-    return responseConfig.parse(data);
+  // Get the schema for the specific status code
+  const statusSchema = responseConfig[status];
+  if (statusSchema) {
+    return statusSchema.parse(data);
   }
 
-  // If it's a status-based schema
-  if (typeof responseConfig === 'object' && !('parse' in responseConfig)) {
-    const statusSchema = responseConfig[status];
-    if (statusSchema) {
-      return statusSchema.parse(data);
+  // If no specific status schema found, try to find a fallback
+  // Common fallback statuses: 200, 201, 400, 500
+  const fallbackStatuses = [200, 201, 400, 500];
+  for (const fallbackStatus of fallbackStatuses) {
+    if (responseConfig[fallbackStatus]) {
+      return responseConfig[fallbackStatus]?.parse(data);
     }
-
-    // If no specific status schema found, try to find a fallback
-    // Common fallback statuses: 200, 201, 400, 500
-    const fallbackStatuses = [200, 201, 400, 500];
-    for (const fallbackStatus of fallbackStatuses) {
-      if (responseConfig[fallbackStatus]) {
-        return responseConfig[fallbackStatus]?.parse(data);
-      }
-    }
-
-    // If no schema found for the status, return data as-is
-    return data;
   }
 
+  // If no schema found for the status, return data as-is
   return data;
 }
 
@@ -175,10 +166,6 @@ 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

package/tests/integration/bxo.test.ts

@@ -214,14 +214,14 @@ describe('BXO Framework Integration', () => {
         body: formData
       });
 
-      const data = await response.json() as { 
-        formData: { 
-          app: string, 
-          model: string, 
-          recordIds: string[], 
-          fields: string 
-        }, 
-        message: string 
+      const data = await response.json() as {
+        formData: {
+          app: string,
+          model: string,
+          recordIds: string[],
+          fields: string
+        },
+        message: string
       };
 
       expect(response.status).toBe(200);
@@ -248,8 +248,8 @@ describe('BXO Framework Integration', () => {
         body: formData
       });
 
-      const data = await response.json() as { 
-        formData: { 
+      const data = await response.json() as {
+        formData: {
           test: {
             test: string,
             new: string,
@@ -257,8 +257,8 @@ describe('BXO Framework Integration', () => {
               hi: string
             }
           }
-        }, 
-        message: string 
+        },
+        message: string
       };
 
       expect(response.status).toBe(200);
@@ -288,8 +288,8 @@ describe('BXO Framework Integration', () => {
         body: formData
       });
 
-      const data = await response.json() as { 
-        formData: { 
+      const data = await response.json() as {
+        formData: {
           records: Array<{
             qrPayment: {
               type: string;
@@ -299,8 +299,8 @@ describe('BXO Framework Integration', () => {
             },
             name: string
           }>
-        }, 
-        message: string 
+        },
+        message: string
       };
 
       expect(response.status).toBe(200);
@@ -339,8 +339,8 @@ describe('BXO Framework Integration', () => {
         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 { 
+
+        return {
           message: 'Files received',
           fileInfo: {
             isFile0: records[0]?.qrPayment instanceof File,

package/tests/unit/utils.test.ts

@@ -22,7 +22,7 @@ describe('Utility Functions', () => {
     it('should parse URLSearchParams correctly', () => {
       const searchParams = new URLSearchParams('name=john&age=25&city=new%20york');
       const result = parseQuery(searchParams);
-      
+
       expect(result).toEqual({
         name: 'john',
         age: '25',
@@ -33,7 +33,7 @@ describe('Utility Functions', () => {
     it('should handle empty search params', () => {
       const searchParams = new URLSearchParams('');
       const result = parseQuery(searchParams);
-      
+
       expect(result).toEqual({});
     });
   });
@@ -43,9 +43,9 @@ describe('Utility Functions', () => {
       const headers = new Headers();
       headers.set('content-type', 'application/json');
       headers.set('authorization', 'Bearer token123');
-      
+
       const result = parseHeaders(headers);
-      
+
       expect(result).toEqual({
         'content-type': 'application/json',
         'authorization': 'Bearer token123'
@@ -57,7 +57,7 @@ describe('Utility Functions', () => {
     it('should parse cookie header correctly', () => {
       const cookieHeader = 'name=john; age=25; city=new%20york';
       const result = parseCookies(cookieHeader);
-      
+
       expect(result).toEqual({
         name: 'john',
         age: '25',
@@ -82,17 +82,17 @@ describe('Utility Functions', () => {
         name: z.string(),
         age: z.number()
       });
-      
+
       const data = { name: 'john', age: 25 };
       const result = validateData(schema, data);
-      
+
       expect(result).toEqual(data);
     });
 
     it('should return data without validation when no schema', () => {
       const data = { name: 'john', age: 25 };
       const result = validateData(undefined, data);
-      
+
       expect(result).toEqual(data);
     });
 
@@ -101,9 +101,9 @@ describe('Utility Functions', () => {
         name: z.string(),
         age: z.number()
       });
-      
+
       const data = { name: 'john', age: 'invalid' };
-      
+
       expect(() => validateData(schema, data)).toThrow();
     });
   });
@@ -113,10 +113,12 @@ describe('Utility Functions', () => {
       const schema = z.object({
         message: z.string()
       });
-      
+
       const data = { message: 'success' };
-      const result = validateResponse(schema, data);
-      
+      const result = validateResponse({
+        200: schema
+      }, data, 200);
+
       expect(result).toEqual(data);
     });
 
@@ -125,17 +127,17 @@ describe('Utility Functions', () => {
         200: z.object({ message: z.string() }),
         400: z.object({ error: z.string() })
       };
-      
+
       const data = { message: 'success' };
       const result = validateResponse(schema, data, 200);
-      
+
       expect(result).toEqual(data);
     });
 
     it('should return data without validation when no schema', () => {
       const data = { message: 'success' };
       const result = validateResponse(undefined, data);
-      
+
       expect(result).toEqual(data);
     });
   });
@@ -152,9 +154,9 @@ describe('Utility Functions', () => {
           httpOnly: true
         }
       ];
-      
+
       const result = cookiesToHeaders(cookies);
-      
+
       expect(result).toHaveLength(1);
       expect(result[0]).toContain('session=abc123');
       expect(result[0]).toContain('Domain=example.com');
@@ -170,9 +172,9 @@ describe('Utility Functions', () => {
       const cookies = [
         { name: 'session', value: 'abc123' }
       ];
-      
+
       const result = mergeHeadersWithCookies(headers, cookies);
-      
+
       expect(result.get('content-type')).toBe('application/json');
       expect(result.get('set-cookie')).toBe('session=abc123');
     });
@@ -181,14 +183,14 @@ describe('Utility Functions', () => {
   describe('createRedirectResponse', () => {
     it('should create redirect response with default status', () => {
       const result = createRedirectResponse('/new-location');
-      
+
       expect(result.status).toBe(302);
       expect(result.headers.get('location')).toBe('/new-location');
     });
 
     it('should create redirect response with custom status', () => {
       const result = createRedirectResponse('/new-location', 301);
-      
+
       expect(result.status).toBe(301);
       expect(result.headers.get('location')).toBe('/new-location');
     });
@@ -196,7 +198,7 @@ describe('Utility Functions', () => {
     it('should include additional headers', () => {
       const headers = { 'x-custom': 'value' };
       const result = createRedirectResponse('/new-location', 302, headers);
-      
+
       expect(result.headers.get('x-custom')).toBe('value');
     });
   });
@@ -228,7 +230,7 @@ describe('Utility Functions', () => {
       });
 
       const result = await parseRequestBody(request);
-      
+
       expect(result.app).toBe('zodula');
       expect(result.model).toBe('zodula_User');
       expect(Array.isArray(result.recordIds)).toBe(true);
@@ -247,7 +249,7 @@ describe('Utility Functions', () => {
       });
 
       const result = await parseRequestBody(request);
-      
+
       expect(result.name).toBe('john');
       expect(result.email).toBe('john@example.com');
     });
@@ -264,7 +266,7 @@ describe('Utility Functions', () => {
       });
 
       const result = await parseRequestBody(request);
-      
+
       expect(result.name).toBe('john');
       expect(result.file).toBeInstanceOf(File);
       expect(result.file.name).toBe('test.txt');
@@ -282,7 +284,7 @@ describe('Utility Functions', () => {
       });
 
       const result = await parseRequestBody(request);
-      
+
       expect(result.test).toEqual({
         test: 'test',
         new: 'new',
@@ -313,7 +315,7 @@ describe('Utility Functions', () => {
       });
 
       const result = await parseRequestBody(request);
-      
+
       expect(result.x).toBe('1');
       expect(result.arr).toEqual(['1', '2', '3']);
       expect(result.arr2).toEqual(['1', ['2'], '3']);
@@ -335,7 +337,7 @@ describe('Utility Functions', () => {
       });
 
       const result = await parseRequestBody(request);
-      
+
       expect(result.myObj).toEqual({ x: 1, s: 'foo' });
       expect(result.settings).toEqual({ theme: 'dark', notifications: true });
     });
@@ -354,7 +356,7 @@ describe('Utility Functions', () => {
       });
 
       const result = await parseRequestBody(request);
-      
+
       expect(result.tags).toEqual(['javascript', 'typescript']);
       expect(result.scores).toEqual(['100', '95', '88']);
     });
@@ -363,7 +365,7 @@ describe('Utility Functions', () => {
   describe('File Upload Utilities', () => {
     it('should identify file uploads correctly', () => {
       const file = new File(['test'], 'test.jpg', { type: 'image/jpeg' });
-      
+
       expect(isFileUpload(file)).toBe(true);
       expect(isFileUpload('not a file')).toBe(false);
       expect(isFileUpload({ type: 'text' })).toBe(false);
@@ -371,7 +373,7 @@ describe('Utility Functions', () => {
 
     it('should extract file from upload', () => {
       const file = new File(['test'], 'test.jpg', { type: 'image/jpeg' });
-      
+
       const result = getFileFromUpload(file);
       expect(result).toBe(file);
     });
@@ -383,7 +385,7 @@ describe('Utility Functions', () => {
 
     it('should get file info', () => {
       const file = new File(['test'], 'test.jpg', { type: 'image/jpeg' });
-      
+
       const result = getFileInfo(file);
       expect(result).toEqual({
         name: 'test.jpg',
@@ -405,9 +407,9 @@ describe('Utility Functions', () => {
         avatar: file,
         email: 'john@example.com'
       };
-      
+
       const result = getFileUploads(formData);
-      
+
       expect(Object.keys(result)).toHaveLength(1);
       expect(result.avatar).toBeInstanceOf(File);
     });
@@ -419,9 +421,9 @@ describe('Utility Functions', () => {
         avatar: file,
         email: 'john@example.com'
       };
-      
+
       const result = getFormFields(formData);
-      
+
       expect(result).toEqual({
         name: 'john',
         email: 'john@example.com'