@hyperspan/framework 1.0.15 → 1.0.17

package/.claude/settings.local.json

@@ -0,0 +1,7 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(bun test:*)"
+    ]
+  }
+}

package/package.json

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

package/src/client/_hs/hyperspan-actions.client.ts

@@ -77,6 +77,27 @@ function formSubmitToRoute(e: Event, form: HTMLFormElement, opts: TFormSubmitOpt
     submitBtn.setAttribute('disabled', 'disabled');
   }
 
+  function applyResponseHtml(html: string) {
+    const isFullDocument = html.includes('<html');
+    if (isFullDocument) {
+      html = html.replace(/^[\s\uFEFF]*<!DOCTYPE[^>]*>/i, '');
+    }
+    const target = isFullDocument ? window.document : hsActionTag || form;
+    const options = isFullDocument ? undefined : { morphStyle: 'innerHTML' };
+
+    Idiomorph.morph(target, html, options);
+
+    if (!isFullDocument) {
+      const outerElement = target.querySelector('hs-action');
+      if (outerElement) {
+        outerElement.replaceWith(...outerElement.childNodes);
+      }
+    }
+
+    opts.afterResponse && opts.afterResponse();
+    lazyLoadScripts();
+  }
+
   fetch(formUrl, { body: formData, method, headers })
     .then((res: Response) => {
       // Look for special header that indicates a redirect.
@@ -84,6 +105,17 @@ function formSubmitToRoute(e: Event, form: HTMLFormElement, opts: TFormSubmitOpt
       if (res.headers.has('X-Redirect-Location')) {
         const newUrl = res.headers.get('X-Redirect-Location');
         if (newUrl) {
+          const resolved = new URL(newUrl, window.location.href);
+
+          // If the new URL is the same as the current URL, we can just fetch the new HTML and apply it
+          if (resolved.pathname === window.location.pathname) {
+            return fetch(resolved.href, {
+              headers: { Accept: 'text/html' },
+            })
+              .then((r) => r.text());
+          }
+
+          // If the new URL is different, we need to redirect the user to the new URL
           window.location.assign(newUrl);
         }
         return '';
@@ -97,17 +129,9 @@ function formSubmitToRoute(e: Event, form: HTMLFormElement, opts: TFormSubmitOpt
         return;
       }
 
-      const target = content.includes('<html') ? window.document.body : hsActionTag || form;
-
-      Idiomorph.morph(target, content, { morphStyle: 'innerHTML' });
-
-      // Check for nested hs-action elements and remove them if present
-      const outerElement = target.querySelector('hs-action');
-      if (outerElement) {
-        outerElement.replaceWith(...outerElement.childNodes);
-      }
-
-      opts.afterResponse && opts.afterResponse();
-      lazyLoadScripts();
+      applyResponseHtml(content);
+    })
+    .catch((error) => {
+      console.error('[Hyperspan] Error submitting form action:', error);
     });
 }

package/src/server.test.ts

@@ -214,6 +214,75 @@ test('createContext() merge() function preserves custom headers with json() meth
   expect(response.headers.get('Content-Type')).toBe('application/json');
 });
 
+test('route returning AsyncGenerator produces a streaming response', async () => {
+  async function* streamingHandler() {
+    yield '<h1>Hello</h1>';
+    yield '<p>World</p>';
+    yield '<p>Streaming</p>';
+  }
+
+  const route = createRoute().get(async (_context: HS.Context) => {
+    return streamingHandler();
+  });
+
+  const request = new Request('http://localhost:3000/');
+  const response = await route.fetch(request);
+
+  expect(response).toBeInstanceOf(Response);
+  expect(response.status).toBe(200);
+  expect(response.headers.get('Transfer-Encoding')).toBe('chunked');
+  expect(response.headers.get('Content-Type')).toBe('text/html; charset=UTF-8');
+
+  const text = await response.text();
+  expect(text).toBe('<h1>Hello</h1><p>World</p><p>Streaming</p>');
+});
+
+test('route returning a sync Generator produces a streaming response', async () => {
+  function* streamingHandler() {
+    yield '<h1>Hello</h1>';
+    yield '<p>World</p>';
+    yield '<p>Streaming</p>';
+  }
+
+  const route = createRoute().get((_context: HS.Context) => {
+    return streamingHandler();
+  });
+
+  const request = new Request('http://localhost:3000/');
+  const response = await route.fetch(request);
+
+  expect(response).toBeInstanceOf(Response);
+  expect(response.status).toBe(200);
+  expect(response.headers.get('Transfer-Encoding')).toBe('chunked');
+  expect(response.headers.get('Content-Type')).toBe('text/html; charset=UTF-8');
+
+  const text = await response.text();
+  expect(text).toBe('<h1>Hello</h1><p>World</p><p>Streaming</p>');
+});
+
+test('route returning a Generator respects Content-Type set on context.res.headers', async () => {
+  async function* streamingHandler() {
+    yield 'Hello';
+    yield ' World';
+  }
+
+  const route = createRoute().get((context: HS.Context) => {
+    context.res.headers.set('Content-Type', 'text/plain');
+    return streamingHandler();
+  });
+
+  const request = new Request('http://localhost:3000/');
+  const response = await route.fetch(request);
+
+  expect(response).toBeInstanceOf(Response);
+  expect(response.status).toBe(200);
+  expect(response.headers.get('Transfer-Encoding')).toBe('chunked');
+  expect(response.headers.get('Content-Type')).toBe('text/plain');
+
+  const text = await response.text();
+  expect(text).toBe('Hello World');
+});
+
 test('createContext() merge() function allows response headers to override context headers', async () => {
   const request = new Request('http://localhost:3000/');
   const context = createContext(request);

package/src/server.ts

@@ -291,7 +291,7 @@ export function createRoute(config: Partial<HS.RouteConfig> = {}): HS.Route {
 
         const contentType = _typeOf(routeContent);
         if (contentType === 'generator') {
-          return new StreamResponse(routeContent as AsyncGenerator);
+          return new StreamResponse(routeContent as AsyncGenerator, { headers: Object.fromEntries(context.res.headers.entries()) });
         }
 
         return routeContent;
@@ -545,14 +545,20 @@ export class StreamResponse extends Response {
     const { status, headers, ...restOptions } = options;
     const stream = createReadableStreamFromAsyncGenerator(iterator as AsyncGenerator);
 
+    const mergedHeaders = new Headers({
+      'Transfer-Encoding': 'chunked',
+      'Content-Type': 'text/html; charset=UTF-8',
+      'Content-Encoding': 'Identity',
+    });
+    if (headers) {
+      for (const [key, value] of Object.entries(headers)) {
+        mergedHeaders.set(key, value);
+      }
+    }
+
     return new Response(stream, {
       status: status ?? 200,
-      headers: {
-        'Transfer-Encoding': 'chunked',
-        'Content-Type': 'text/html; charset=UTF-8',
-        'Content-Encoding': 'Identity',
-        ...(headers ?? {}),
-      },
+      headers: mergedHeaders,
       ...restOptions,
     });
   }