@hyperspan/framework 1.0.12 → 1.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperspan/framework",
-  "version": "1.0.12",
+  "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/client/js.test.ts

@@ -0,0 +1,27 @@
+import { describe, expect, test } from 'bun:test';
+import { extractExports } from './js';
+
+describe('extractExports', () => {
+  test('extracts aliased export from bundled JS content', () => {
+    const contents = 'function d(n,t){if(t)n.classList.remove("hidden");else n.classList.add("hidden")}function p(){let n=document.querySelector("[data-google-spreadsheet-id]"),t=document.querySelector("[data-google-sheet-select]"),a=document.querySelector("[data-google-sheet-message]");if(console.log("googleSheetsPickerClient",n,t),!n||!t)return;let l=(e)=>{if(!a)return;a.textContent=e||"",d(a,Boolean(e))},h=(e)=>{t.innerHTML="",e.forEach((s)=>{let o=document.createElement("option");o.value=s,o.textContent=s,t.appendChild(o)})},r=(e)=>{d(t,e),t.disabled=!e,t.required=e},c=async()=>{let e=n.value.trim();if(l(null),!e){r(!1);return}try{let s=await fetch(`/api/google-sheets/${encodeURIComponent(e)}`),o=await s.json();if(!s.ok||o.error)throw Error(o.error||"Unable to load sheet names.");let i=(o.sheets||[]).map((u)=>u.title).filter(Boolean);if(i.length===0){l("No sheets found in that spreadsheet."),r(!1);return}h(i),t.value=i[0],r(!0)}catch(s){l(s instanceof Error?s.message:"Unable to load sheet names."),r(!1)}};n.addEventListener("input",c),n.addEventListener("change",c)}export{p as mountGoogleSheetsPicker};';
+
+    const result = extractExports(contents);
+
+    expect(result).toEqual({
+      exports: '{mountGoogleSheetsPicker}',
+      fnArgs: '{mountGoogleSheetsPicker}',
+    });
+  });
+
+  test('returns empty exports when none found', () => {
+    const contents = 'function noop(){return 1}const value=2;';
+
+    const result = extractExports(contents);
+
+    expect(result).toEqual({
+      exports: '* as _module',
+      fnArgs: '_module',
+    });
+  });
+});
+

package/src/client/js.ts

@@ -47,21 +47,7 @@ export async function buildClientJS(modulePathResolved: string): Promise<HS.Clie
 
         // Get the contents of the file to extract the exports
         const contents = await result.outputs[0].text();
-        const exportLine = EXPORT_REGEX.exec(contents);
-
-        let exports = '{}';
-        if (exportLine) {
-          const exportName = exportLine[1];
-          exports =
-            '{' +
-            exportName
-              .split(',')
-              .map((name) => name.trim().split(' as '))
-              .map(([name, alias]) => `${alias === 'default' ? 'default as ' + name : alias}`)
-              .join(', ') +
-            '}';
-        }
-        const fnArgs = exports.replace(/(\w+)\s*as\s*(\w+)/g, '$1: $2');
+        const { exports, fnArgs } = extractExports(contents);
 
         CLIENT_JS_CACHE.set(assetHash, { esmName, exports, fnArgs, publicPath });
       })();
@@ -102,6 +88,36 @@ export async function buildClientJS(modulePathResolved: string): Promise<HS.Clie
   }
 }
 
+/**
+ * Extract the exports from a client JS module
+ */
+export function extractExports(contents: string): { exports: string, fnArgs: string } {
+  const exportLine = EXPORT_REGEX.exec(contents);
+  let exports = '{}';
+  let fnArgs = '{}';
+
+  if (exportLine) {
+    const exportName = exportLine[1];
+    exports =
+      '{' +
+      exportName
+        .split(',')
+        .map((name) => name.trim().split(' as '))
+        .map(([name, alias]) => `${alias === 'default' ? 'default as ' + name : alias}`)
+        .join(', ') +
+      '}';
+  }
+
+  fnArgs = exports.replace(/(\w+)\s*as\s*(\w+)/g, '$1: $2').trim();
+
+  if (exports === '{}' && fnArgs === '{}') {
+    exports = '* as _module'
+    fnArgs = '_module'
+  }
+
+  return { exports, fnArgs };
+}
+
 /**
  * Convert a function to a string (results in loss of context!)
  * Handles named, async, and arrow functions

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>
   `;