@hyperspan/framework 1.0.11 → 1.0.13

package/package.json

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

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/server.ts

@@ -202,9 +202,11 @@ export function createRoute(config: Partial<HS.RouteConfig> = {}): HS.Route {
     /**
      * Add a middleware function to this route (for all HTTP methods) (non-destructive)
      */
-    use(middleware: HS.MiddlewareFunction, opts: { method?: HS.MiddlewareMethod } = {}) {
-      if (opts.method) {
-        api._middleware[opts.method].push(middleware);
+    use(middleware: HS.MiddlewareFunction, opts: HS.MiddlewareMethodOptions = {}) {
+      if (opts?.methods) {
+        opts.methods.forEach(method => {
+          api._middleware[method].push(middleware);
+        });
       } else {
         api._middleware['*'].push(middleware);
       }
@@ -214,9 +216,11 @@ export function createRoute(config: Partial<HS.RouteConfig> = {}): HS.Route {
      * Set the complete middleware stack for this route (for all HTTP methods) (destructive)
      * NOTE: This will override the middleware stack for this route
      */
-    middleware(middleware: Array<HS.MiddlewareFunction>, opts: { method?: HS.MiddlewareMethod } = {}) {
-      if (opts.method) {
-        api._middleware[opts.method] = middleware;
+    middleware(middleware: Array<HS.MiddlewareFunction>, opts: HS.MiddlewareMethodOptions = {}) {
+      if (opts?.methods) {
+        opts.methods.forEach(method => {
+          api._middleware[method] = middleware;
+        });
       } else {
         api._middleware['*'] = middleware;
       }
@@ -326,8 +330,10 @@ export async function createServer(config: HS.Config = {} as HS.Config): Promise
     _routes: _routes,
     _middleware: { GET: [], POST: [], PUT: [], PATCH: [], DELETE: [], HEAD: [], OPTIONS: [], '*': [] },
     use(middleware: HS.MiddlewareFunction, opts?: HS.MiddlewareMethodOptions) {
-      if (opts?.method) {
-        api._middleware[opts.method].push(middleware);
+      if (opts?.methods) {
+        opts.methods.forEach(method => {
+          api._middleware[method].push(middleware);
+        });
       } else {
         api._middleware['*'].push(middleware);
       }

package/src/types.ts

@@ -135,7 +135,7 @@ export namespace Hyperspan {
   ) => Promise<Response> | Response;
   export type MiddlewareMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'HEAD' | 'OPTIONS' | '*';
   export type MiddlewareMethodOptions = {
-    method?: Hyperspan.MiddlewareMethod;
+    methods?: Hyperspan.MiddlewareMethod[];
   };
 
   export interface Route {