@hyperspan/framework 0.4.5 → 0.5.1

package/dist/assets.js

@@ -22,12 +22,12 @@ async function buildClientJS() {
   const jsFile = output.outputs[0].path.split("/").reverse()[0];
   clientJSFiles.set("_hs", { src: `${CLIENTJS_PUBLIC_PATH}/${jsFile}` });
 }
-function renderClientJS(module, onLoad) {
+function renderClientJS(module, loadScript) {
   if (!module.__CLIENT_JS) {
     throw new Error(`[Hyperspan] Client JS was not loaded by Hyperspan! Ensure the filename ends with .client.ts to use this render method.`);
   }
   return html.raw(module.__CLIENT_JS.renderScriptTag({
-    onLoad: onLoad ? typeof onLoad === "string" ? onLoad : functionToString(onLoad) : undefined
+    loadScript: loadScript ? typeof loadScript === "string" ? loadScript : functionToString(loadScript) : undefined
   }));
 }
 function functionToString(fn) {

package/dist/server.js

@@ -54,8 +54,8 @@ export const __CLIENT_JS = {
   esmName: "${esmName}",
   sourceFile: "${args.path}",
   outputFile: "${result.outputs[0].path}",
-  renderScriptTag: ({ onLoad }) => {
-    const fn = onLoad ? (typeof onLoad === 'string' ? onLoad : \`const fn = \${functionToString(onLoad)}; fn(${fnArgs});\`) : '';
+  renderScriptTag: ({ loadScript }) => {
+    const fn = loadScript ? (typeof loadScript === 'string' ? loadScript : \`const fn = \${functionToString(loadScript)}; fn(${fnArgs});\`) : '';
     return \`<script type="module" data-source-id="${jsId}">import ${exports} from "${esmName}";
 \${fn}</script>\`;
   },
@@ -2117,7 +2117,7 @@ async function buildRoutes(config) {
   const files = await readdir(routesDir, { recursive: true });
   const routes = [];
   for (const file of files) {
-    if (!file.includes(".") || basename(file).startsWith(".")) {
+    if (!file.includes(".") || basename(file).startsWith(".") || file.includes(".test.") || file.includes(".spec.")) {
       continue;
     }
     let route = "/" + file.replace(extname(file), "");
@@ -2155,7 +2155,7 @@ async function buildActions(config) {
   const files = await readdir(routesDir, { recursive: true });
   const routes = [];
   for (const file of files) {
-    if (!file.includes(".") || basename(file).startsWith(".")) {
+    if (!file.includes(".") || basename(file).startsWith(".") || file.includes(".test.") || file.includes(".spec.")) {
       continue;
     }
     let route = assetHash("/" + file.replace(extname(file), ""));

package/package.json

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

package/src/actions.test.ts

@@ -1,11 +1,11 @@
-import { z } from 'zod';
+import { z } from 'zod/v4';
 import { unstable__createAction } from './actions';
 import { describe, it, expect } from 'bun:test';
 import { html, render, type HSHtml } from '@hyperspan/html';
-import type { Context } from 'hono';
+import type { THSContext } from './server';
 
 describe('createAction', () => {
-  const formWithNameOnly = ({ data }: { data?: { name: string } }) => {
+  const formWithNameOnly = (c: THSContext, { data }: { data?: { name: string } }) => {
     return html`
       <form>
         <p>
@@ -23,8 +23,18 @@ describe('createAction', () => {
         name: z.string(),
       });
       const action = unstable__createAction(schema, formWithNameOnly);
+      const mockContext = {
+        req: {
+          method: 'POST',
+          formData: async () => {
+            const formData = new FormData();
+            formData.append('name', 'John');
+            return formData;
+          },
+        },
+      } as THSContext;
 
-      const formResponse = render(action.render({ data: { name: 'John' } }) as HSHtml);
+      const formResponse = render(action.render(mockContext, { data: { name: 'John' } }) as HSHtml);
       expect(formResponse).toContain('value="John"');
     });
   });
@@ -52,7 +62,7 @@ describe('createAction', () => {
             return formData;
           },
         },
-      } as Context;
+      } as THSContext;
 
       const response = await action.run(mockContext);
 
@@ -85,7 +95,7 @@ describe('createAction', () => {
             return formData;
           },
         },
-      } as Context;
+      } as THSContext;
 
       const response = await action.run(mockContext);
 

package/src/actions.ts

@@ -2,8 +2,8 @@ import { html, HSHtml } from '@hyperspan/html';
 import * as z from 'zod/v4';
 import { HTTPException } from 'hono/http-exception';
 import { assetHash } from './assets';
-import { IS_PROD, returnHTMLResponse, type THSResponseTypes } from './server';
-import type { Context, MiddlewareHandler } from 'hono';
+import { IS_PROD, returnHTMLResponse, type THSContext, type THSResponseTypes } from './server';
+import type { MiddlewareHandler } from 'hono';
 import type { HandlerResponse, Next, TypedResponse } from 'hono/types';
 
 /**
@@ -29,39 +29,34 @@ export interface HSAction<T extends z.ZodTypeAny> {
   _form: Parameters<HSAction<T>['form']>[0];
   form(
     renderForm: (
-      c: Context<any, any, {}>,
+      c: THSContext,
       { data, error }: { data?: z.infer<T>; error?: z.ZodError | Error }
     ) => HSHtml | void | null | Promise<HSHtml | void | null>
   ): HSAction<T>;
   post(
     handler: (
-      c: Context<any, any, {}>,
+      c: THSContext,
       { data }: { data?: z.infer<T> }
     ) => TActionResponse | Promise<TActionResponse>
   ): HSAction<T>;
   error(
     handler: (
-      c: Context<any, any, {}>,
+      c: THSContext,
       { data, error }: { data?: z.infer<T>; error?: z.ZodError | Error }
     ) => TActionResponse
   ): HSAction<T>;
-  render(
-    c: Context<any, any, {}>,
-    props?: { data?: z.infer<T>; error?: z.ZodError | Error }
-  ): TActionResponse;
-  run(c: Context<any, any, {}>): TActionResponse | Promise<TActionResponse>;
+  render(c: THSContext, props?: { data?: z.infer<T>; error?: z.ZodError | Error }): TActionResponse;
+  run(c: THSContext): TActionResponse | Promise<TActionResponse>;
   middleware: (
     middleware: Array<
       | MiddlewareHandler
-      | ((
-          context: Context<any, string, {}>
-        ) => TActionResponse | Promise<TActionResponse> | void | Promise<void>)
+      | ((context: THSContext) => TActionResponse | Promise<TActionResponse> | void | Promise<void>)
     >
   ) => HSAction<T>;
   _getRouteHandlers: () => Array<
     | MiddlewareHandler
-    | ((context: Context, next: Next) => TActionResponse | Promise<TActionResponse>)
-    | ((context: Context) => TActionResponse | Promise<TActionResponse>)
+    | ((context: THSContext, next: Next) => TActionResponse | Promise<TActionResponse>)
+    | ((context: THSContext) => TActionResponse | Promise<TActionResponse>)
   >;
 }
 
@@ -74,8 +69,8 @@ export function unstable__createAction<T extends z.ZodTypeAny>(
     _errorHandler: Parameters<HSAction<T>['error']>[0] | null = null,
     _middleware: Array<
       | MiddlewareHandler
-      | ((context: Context, next: Next) => TActionResponse | Promise<TActionResponse>)
-      | ((context: Context) => TActionResponse | Promise<TActionResponse>)
+      | ((context: THSContext, next: Next) => TActionResponse | Promise<TActionResponse>)
+      | ((context: THSContext) => TActionResponse | Promise<TActionResponse>)
     > = [];
 
   const api: HSAction<T> = {
@@ -113,10 +108,7 @@ export function unstable__createAction<T extends z.ZodTypeAny>(
     /**
      * Get form renderer method
      */
-    render(
-      c: Context<any, any, {}>,
-      formState?: { data?: z.infer<T>; error?: z.ZodError | Error }
-    ) {
+    render(c: THSContext, formState?: { data?: z.infer<T>; error?: z.ZodError | Error }) {
       const form = _form ? _form(c, formState || {}) : null;
       return form ? html`<hs-action url="${this._route}">${form}</hs-action>` : null;
     },
@@ -124,7 +116,7 @@ export function unstable__createAction<T extends z.ZodTypeAny>(
     _getRouteHandlers() {
       return [
         ..._middleware,
-        async (c: Context) => {
+        async (c: THSContext) => {
           const response = await returnHTMLResponse(c, () => api.run(c));
 
           // Replace redirects with special header because fetch() automatically follows redirects

package/src/assets.ts

@@ -36,7 +36,7 @@ export async function buildClientJS() {
 /**
  * Render a client JS module as a script tag
  */
-export function renderClientJS<T>(module: T, onLoad?: (module: T) => void | string) {
+export function renderClientJS<T>(module: T, loadScript?: ((module: T) => void) | string) {
   // @ts-ignore
   if (!module.__CLIENT_JS) {
     throw new Error(
@@ -47,7 +47,11 @@ export function renderClientJS<T>(module: T, onLoad?: (module: T) => void | stri
   return html.raw(
     // @ts-ignore
     module.__CLIENT_JS.renderScriptTag({
-      onLoad: onLoad ? (typeof onLoad === 'string' ? onLoad : functionToString(onLoad)) : undefined,
+      loadScript: loadScript
+        ? typeof loadScript === 'string'
+          ? loadScript
+          : functionToString(loadScript)
+        : undefined,
     })
   );
 }

package/src/plugins.ts

@@ -71,8 +71,8 @@ export const __CLIENT_JS = {
   esmName: "${esmName}",
   sourceFile: "${args.path}",
   outputFile: "${result.outputs[0].path}",
-  renderScriptTag: ({ onLoad }) => {
-    const fn = onLoad ? (typeof onLoad === 'string' ? onLoad : \`const fn = \${functionToString(onLoad)}; fn(${fnArgs});\`) : '';
+  renderScriptTag: ({ loadScript }) => {
+    const fn = loadScript ? (typeof loadScript === 'string' ? loadScript : \`const fn = \${functionToString(loadScript)}; fn(${fnArgs});\`) : '';
     return \`<script type="module" data-source-id="${jsId}">import ${exports} from "${esmName}";\n\${fn}</script>\`;
   },
 }

package/src/server.ts

@@ -18,16 +18,19 @@ const CWD = process.cwd();
 /**
  * Types
  */
+export type THSContext = Context<any, any, {}>;
 export type THSResponseTypes = HSHtml | Response | string | null;
-export type THSRouteHandler = (context: Context) => THSResponseTypes | Promise<THSResponseTypes>;
-export type THSAPIRouteHandler = (context: Context) => Promise<any> | any;
+export type THSRouteHandler = (context: THSContext) => THSResponseTypes | Promise<THSResponseTypes>;
+export type THSAPIRouteHandler = (context: THSContext) => Promise<any> | any;
 
 export type THSRoute = {
   _kind: 'hsRoute';
   get: (handler: THSRouteHandler) => THSRoute;
   post: (handler: THSRouteHandler) => THSRoute;
   middleware: (middleware: Array<MiddlewareHandler>) => THSRoute;
-  _getRouteHandlers: () => Array<MiddlewareHandler | ((context: Context) => HandlerResponse<any>)>;
+  _getRouteHandlers: () => Array<
+    MiddlewareHandler | ((context: THSContext) => HandlerResponse<any>)
+  >;
 };
 export type THSAPIRoute = {
   _kind: 'hsAPIRoute';
@@ -37,7 +40,9 @@ export type THSAPIRoute = {
   delete: (handler: THSAPIRouteHandler) => THSAPIRoute;
   patch: (handler: THSAPIRouteHandler) => THSAPIRoute;
   middleware: (middleware: Array<MiddlewareHandler>) => THSAPIRoute;
-  _getRouteHandlers: () => Array<MiddlewareHandler | ((context: Context) => HandlerResponse<any>)>;
+  _getRouteHandlers: () => Array<
+    MiddlewareHandler | ((context: THSContext) => HandlerResponse<any>)
+  >;
 };
 
 export function createConfig(config: THSServerConfig): THSServerConfig {
@@ -82,7 +87,7 @@ export function createRoute(handler?: THSRouteHandler): THSRoute {
     _getRouteHandlers() {
       return [
         ..._middleware,
-        async (context: Context) => {
+        async (context: THSContext) => {
           const method = context.req.method.toUpperCase();
 
           // Handle CORS preflight requests
@@ -166,7 +171,7 @@ export function createAPIRoute(handler?: THSAPIRouteHandler): THSAPIRoute {
     _getRouteHandlers() {
       return [
         ..._middleware,
-        async (context: Context) => {
+        async (context: THSContext) => {
           const method = context.req.method.toUpperCase();
 
           // Handle CORS preflight requests
@@ -246,7 +251,7 @@ export function createAPIRoute(handler?: THSAPIRouteHandler): THSAPIRoute {
  * Return HTML response from userland route handler
  */
 export async function returnHTMLResponse(
-  context: Context,
+  context: THSContext,
   handlerFn: () => unknown,
   responseOptions?: { status?: ContentfulStatusCode; headers?: Headers | Record<string, string> }
 ): Promise<Response> {
@@ -333,7 +338,7 @@ export function isRunnableRoute(route: unknown): boolean {
  * @TODO: Should check for and load user-customizeable template with special name (app/__error.ts ?)
  */
 async function showErrorReponse(
-  context: Context,
+  context: THSContext,
   err: Error,
   responseOptions?: { status?: ContentfulStatusCode; headers?: Headers | Record<string, string> }
 ) {
@@ -408,8 +413,13 @@ export async function buildRoutes(config: THSServerConfig): Promise<THSRouteMap[
   const routes: THSRouteMap[] = [];
 
   for (const file of files) {
-    // No directories
-    if (!file.includes('.') || basename(file).startsWith('.')) {
+    // No directories or test files
+    if (
+      !file.includes('.') ||
+      basename(file).startsWith('.') ||
+      file.includes('.test.') ||
+      file.includes('.spec.')
+    ) {
       continue;
     }
 
@@ -466,8 +476,13 @@ export async function buildActions(config: THSServerConfig): Promise<THSRouteMap
   const routes: THSRouteMap[] = [];
 
   for (const file of files) {
-    // No directories
-    if (!file.includes('.') || basename(file).startsWith('.')) {
+    // No directories or test files
+    if (
+      !file.includes('.') ||
+      basename(file).startsWith('.') ||
+      file.includes('.test.') ||
+      file.includes('.spec.')
+    ) {
       continue;
     }
 
@@ -496,7 +511,7 @@ export async function buildActions(config: THSServerConfig): Promise<THSRouteMap
  */
 export function createRouteFromModule(
   RouteModule: any
-): Array<MiddlewareHandler | ((context: Context) => HandlerResponse<any>)> {
+): Array<MiddlewareHandler | ((context: THSContext) => HandlerResponse<any>)> {
   const route = getRunnableRoute(RouteModule);
   return route._getRouteHandlers();
 }