@hyperspan/framework 1.0.14 → 1.0.16

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.14",
+  "version": "1.0.16",
   "description": "Hyperspan Web Framework",
   "main": "src/server.ts",
   "types": "src/server.ts",
@@ -73,7 +73,7 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@hyperspan/html": "^1.0.0",
+    "@hyperspan/html": "^1.0.1",
     "debug": "^4.4.3",
     "isbot": "^5.1.32",
     "zod": "^4.1.12"

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

@@ -58,11 +58,19 @@ function formSubmitToRoute(e: Event, form: HTMLFormElement, opts: TFormSubmitOpt
   const formData = new FormData(form);
   const formUrl = form.getAttribute('action') || '';
   const method = form.getAttribute('method')?.toUpperCase() || 'POST';
+  const confirmMessage = form.getAttribute('data-confirm') || '';
   const headers = {
     Accept: 'text/html',
     'X-Request-Type': 'partial',
   };
 
+  if (confirmMessage) {
+    const confirmed = window.confirm(confirmMessage);
+    if (!confirmed) {
+      return;
+    }
+  }
+
   const hsActionTag = form.closest('hs-action');
   const submitBtn = form.querySelector('button[type=submit],input[type=submit]');
   if (submitBtn) {
@@ -92,6 +100,13 @@ function formSubmitToRoute(e: Event, form: HTMLFormElement, opts: TFormSubmitOpt
       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();
     });

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,
     });
   }