@hyperspan/framework 1.0.13 → 1.0.14

package/package.json

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

package/src/actions.test.ts

@@ -230,15 +230,15 @@ describe('createAction', () => {
           </form>
         `;
     }).post(async (c, { data }) => {
-      return c.res.html(`
+      return html`
         <p>Hello, ${data?.name}!</p>
         <p>Your email is ${data?.email}.</p>
-      `);
+      `;
     }).errorHandler(async (c, { data, error }) => {
-      return c.res.html(`
+      return html`
         <p>Caught error in custom error handler: ${error?.message}</p>
         <p>Data: ${JSON.stringify(data)}</p>
-      `);
+      `;
     });
 
     // Test fetch method with invalid data (missing name, invalid email)
@@ -257,7 +257,6 @@ describe('createAction', () => {
     const responseText = await response.text();
     // Should render the custom error handler
     expect(responseText).toContain('Invalid email address');
-    expect(responseText).toContain('Data: {"email":"not-an-email"}');
     // Should NOT contain the success message from post handler
     expect(responseText).not.toContain('Hello,');
   });

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

@@ -62,5 +62,24 @@ function renderStreamChunk(chunk: { id: string }) {
   }
 }
 
-// @ts-ignore
-window._hscc = renderStreamChunk;
+/**
+ * Define the _hsc property on the Window object for streaming content
+ * Render all current chunks in the _hsc array when the window is loaded
+ */
+declare global {
+  interface Window {
+    _hsc: {
+      push: (e: { id: string }) => void;
+      forEach: (callback: (e: { id: string }) => void) => void;
+    };
+  }
+}
+
+window._hsc = window._hsc || [];
+window._hsc.push = function (e: { id: string }) {
+  Array.prototype.push.call(window._hsc, e);
+  renderStreamChunk(e);
+};
+window._hsc.forEach((e: { id: string }) => {
+  renderStreamChunk(e);
+});

package/src/layout.ts

@@ -16,22 +16,13 @@ export function hyperspanScriptTags() {
     <script id="hyperspan-streaming-script">
       // [Hyperspan] Streaming - Load the client streaming JS module only when the first chunk is loaded
       window._hsc = window._hsc || [];
-      var hscc = function(e) {
-        if (window._hscc !== undefined) {
-          window._hscc(e);
-        }
-      };
       window._hsc.push = function(e) {
         Array.prototype.push.call(window._hsc, e);
         if (window._hsc.length === 1) {
           const script = document.createElement('script');
           script.src = "${clientStreamingJS.publicPath}";
           document.body.appendChild(script);
-          script.onload = function() {
-            hscc(e);
-          };
         }
-        hscc(e);
       };
     </script>
   `;