bxo 0.0.5-dev.61 → 0.0.5-dev.63

package/package.json

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

package/src/types/index.ts

@@ -10,7 +10,7 @@ export type ResponseConfig = StatusResponseSchema;
 
 // Type utility to extract response type from response config
 export type InferResponseType<T> = T extends StatusResponseSchema
-  ? { [K in keyof T]: InferZodType<T[K]> }[number]
+  ? T[keyof T] extends z.ZodType<infer U> ? U : never
   : never;
 
 // Cookie options interface for setting cookies
@@ -100,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/response-handler.ts

@@ -127,7 +127,10 @@ export function processResponse(
     const headers = mergeHeadersWithCookies(responseHeaders, internalCookies);
 
     if (typeof response === 'string') {
-      headers.set('Content-Type', 'text/plain');
+      // Only set Content-Type to text/plain if not already set
+      if (!headers.has('Content-Type')) {
+        headers.set('Content-Type', 'text/plain');
+      }
       return new Response(response, {
         status: ctx.set.status || 200,
         headers: headers
@@ -182,12 +185,20 @@ export function processResponse(
   };
 
   if (typeof response === 'string') {
+    const finalHeaders: Record<string, string> = {};
+    // Copy existing headers if they exist
+    if (responseInit.headers) {
+      if (typeof responseInit.headers === 'object' && !Array.isArray(responseInit.headers)) {
+        Object.assign(finalHeaders, responseInit.headers);
+      }
+    }
+    // Only set Content-Type to text/plain if not already set
+    if (!finalHeaders['Content-Type']) {
+      finalHeaders['Content-Type'] = 'text/plain';
+    }
     return new Response(response, {
       ...responseInit,
-      headers: {
-        'Content-Type': 'text/plain',
-        ...responseInit.headers
-      }
+      headers: finalHeaders
     });
   }
 

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,