@hyperspan/framework 1.0.2 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperspan/framework",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Hyperspan Web Framework",
   "main": "src/server.ts",
   "types": "src/server.ts",

package/src/actions.test.ts

@@ -2,7 +2,6 @@ import { test, expect, describe } from 'bun:test';
 import { createAction } from './actions';
 import { html, render, type HSHtml } from '@hyperspan/html';
 import { createContext } from './server';
-import type { Hyperspan as HS } from './types';
 import * as z from 'zod/v4';
 
 describe('createAction', () => {

package/src/server.test.ts

@@ -144,7 +144,7 @@ test('createContext() can get and set cookies', () => {
   }
 });
 
-test('createContext() merge() function preserves custom headers when using response methods', () => {
+test('createContext() merge() function preserves custom headers when using response methods', async () => {
   // Create a request
   const request = new Request('http://localhost:3000/');
 
@@ -157,7 +157,7 @@ test('createContext() merge() function preserves custom headers when using respo
   context.res.headers.set('Authorization', 'Bearer token123');
 
   // Use html() method which should merge headers
-  const response = context.res.html('<h1>Test</h1>');
+  const response = await context.res.html('<h1>Test</h1>');
 
   // Verify the response has both the custom headers and the Content-Type header
   expect(response.headers.get('X-Custom-Header')).toBe('custom-value');
@@ -169,7 +169,7 @@ test('createContext() merge() function preserves custom headers when using respo
   expect(response.status).toBe(200);
 });
 
-test('createContext() merge() function preserves custom headers with json() method', () => {
+test('createContext() merge() function preserves custom headers with json() method', async () => {
   const request = new Request('http://localhost:3000/');
   const context = createContext(request);
 
@@ -178,7 +178,7 @@ test('createContext() merge() function preserves custom headers with json() meth
   context.res.headers.set('X-Request-ID', 'req-123');
 
   // Use json() method
-  const response = context.res.json({ message: 'Hello' });
+  const response = await context.res.json({ message: 'Hello' });
 
   // Verify headers are merged
   expect(response.headers.get('X-API-Version')).toBe('v1');
@@ -186,7 +186,7 @@ test('createContext() merge() function preserves custom headers with json() meth
   expect(response.headers.get('Content-Type')).toBe('application/json');
 });
 
-test('createContext() merge() function allows response headers to override context headers', () => {
+test('createContext() merge() function allows response headers to override context headers', async () => {
   const request = new Request('http://localhost:3000/');
   const context = createContext(request);
 
@@ -194,7 +194,7 @@ test('createContext() merge() function allows response headers to override conte
   context.res.headers.set('X-Header', 'context-value');
 
   // Use html() with options that include the same header (should override)
-  const response = context.res.html('<h1>Test</h1>', {
+  const response = await context.res.html('<h1>Test</h1>', {
     headers: {
       'X-Header': 'response-value',
     },

package/src/server.ts

@@ -64,14 +64,14 @@ export function createContext(req: Request, route?: HS.Route): HS.Context {
   // Status override for the response. Will use if set. (e.g. c.res.status = 400)
   let status: number | undefined = undefined;
 
-  const merge = (response: Response) => {
+  const merge = async (response: Response) => {
     // Convert headers to plain objects and merge (response headers override context headers)
     const mergedHeaders = {
       ...Object.fromEntries(headers.entries()),
       ...Object.fromEntries(response.headers.entries()),
     };
 
-    return new Response(response.body, {
+    return new Response(await response.text(), {
       status: context.res.status ?? response.status,
       headers: mergedHeaders,
     });

package/src/types.ts

@@ -69,13 +69,13 @@ export namespace Hyperspan {
     cookies: Hyperspan.Cookies;
     headers: Headers; // Headers to merge with final outgoing response
     status: number | undefined;
-    html: (html: string, options?: ResponseInit) => Response
-    json: (json: any, options?: ResponseInit) => Response;
-    text: (text: string, options?: ResponseInit) => Response;
-    redirect: (url: string, options?: ResponseInit) => Response;
-    error: (error: Error, options?: ResponseInit) => Response;
-    notFound: (options?: ResponseInit) => Response;
-    merge: (response: Response) => Response;
+    html: (html: string, options?: ResponseInit) => Promise<Response>;
+    json: (json: any, options?: ResponseInit) => Promise<Response>;
+    text: (text: string, options?: ResponseInit) => Promise<Response>;
+    redirect: (url: string, options?: ResponseInit) => Promise<Response>;
+    error: (error: Error, options?: ResponseInit) => Promise<Response>;
+    notFound: (options?: ResponseInit) => Promise<Response>;
+    merge: (response: Response) => Promise<Response>;
   };
 
   export interface Context {