@hyperspan/framework 0.1.1 → 0.1.3

package/src/assets.ts

@@ -11,7 +11,7 @@ const PWD = import.meta.dir;
  */
 export const clientJSFiles = new Map<string, { src: string; type?: string }>();
 export async function buildClientJS() {
-  const sourceFile = resolve(PWD, '../', './hyperspan/clientjs/hyperspan-client.ts');
+  const sourceFile = resolve(PWD, '../', './src/clientjs/hyperspan-client.ts');
   const output = await Bun.build({
     entrypoints: [sourceFile],
     outdir: `./public/_hs/js`,
@@ -20,8 +20,8 @@ export async function buildClientJS() {
   });
 
   const jsFile = output.outputs[0].path.split('/').reverse()[0];
+
   clientJSFiles.set('_hs', { src: '/_hs/js/' + jsFile });
-  return jsFile;
 }
 
 /**
@@ -61,7 +61,7 @@ export async function buildClientCSS() {
 export function hyperspanStyleTags() {
   const cssFiles = Array.from(clientCSSFiles.entries());
   return html`${cssFiles.map(
-    ([key, file]) => html`<link rel="stylesheet" href="/_hs/css/${file}" />`
+    ([_, file]) => html`<link rel="stylesheet" href="/_hs/css/${file}" />`
   )}`;
 }
 
@@ -71,6 +71,7 @@ export function hyperspanStyleTags() {
  */
 export function hyperspanScriptTags() {
   const jsFiles = Array.from(clientJSFiles.entries());
+
   return html`
     <script type="importmap">
       {

package/src/clientjs/hyperspan-client.ts

@@ -1,5 +1,5 @@
-import { html } from '../html';
-import { Idiomorph } from './idiomorph.esm';
+import {html} from '@hyperspan/html';
+import {Idiomorph} from './idiomorph.esm';
 
 /**
  * Used for streaming content from the server to the client.
@@ -20,7 +20,7 @@ function htmlAsyncContentObserver() {
       asyncContent.forEach((el: any) => {
         try {
           // Also observe child nodes for nested async content
-          asyncContentObserver.observe(el.content, { childList: true, subtree: true });
+          asyncContentObserver.observe(el.content, {childList: true, subtree: true});
 
           const slotId = el.id.replace('_content', '');
           const slotEl = document.getElementById(slotId);
@@ -41,7 +41,7 @@ function htmlAsyncContentObserver() {
         }
       });
     });
-    asyncContentObserver.observe(document.body, { childList: true, subtree: true });
+    asyncContentObserver.observe(document.body, {childList: true, subtree: true});
   }
 }
 htmlAsyncContentObserver();

package/src/server.ts

@@ -1,12 +1,12 @@
-import {readdir} from 'node:fs/promises';
-import {basename, extname, join} from 'node:path';
-import {TmplHtml, html, renderStream, renderAsync, render} from '@hyperspan/html';
-import {isbot} from 'isbot';
-import {buildClientJS, buildClientCSS} from './assets';
-import {Hono} from 'hono';
-import {serveStatic} from 'hono/bun';
+import { readdir } from 'node:fs/promises';
+import { basename, extname, join } from 'node:path';
+import { TmplHtml, html, renderStream, renderAsync, render } from '@hyperspan/html';
+import { isbot } from 'isbot';
+import { buildClientJS, buildClientCSS } from './assets';
+import { Hono } from 'hono';
+import { serveStatic } from 'hono/bun';
 import * as z from 'zod';
-import type {Context, Handler} from 'hono';
+import type { Context, Handler } from 'hono';
 
 export const IS_PROD = process.env.NODE_ENV === 'production';
 const CWD = process.cwd();
@@ -193,7 +193,7 @@ export async function runFileRoute(RouteModule: any, context: Context): Promise<
       if (!routeMethodHandler) {
         return new Response('Method Not Allowed', {
           status: 405,
-          headers: {'content-type': 'text/plain'},
+          headers: { 'content-type': 'text/plain' },
         });
       }
 
@@ -206,8 +206,15 @@ export async function runFileRoute(RouteModule: any, context: Context): Promise<
       return routeContent;
     }
 
+    let routeKind = typeof routeContent;
+
     // Render TmplHtml if returned from route handler
-    if (routeContent instanceof TmplHtml) {
+    if (
+      routeKind === 'object' &&
+      (routeContent instanceof TmplHtml ||
+        routeContent.constructor.name === 'TmplHtml' ||
+        routeContent?._kind === 'TmplHtml')
+    ) {
       if (streamingEnabled) {
         return new StreamResponse(renderStream(routeContent)) as Response;
       } else {
@@ -216,6 +223,8 @@ export async function runFileRoute(RouteModule: any, context: Context): Promise<
       }
     }
 
+    console.log('Returning unknown type... ', routeContent);
+
     return routeContent;
   } catch (e) {
     console.error(e);
@@ -235,13 +244,13 @@ async function runAPIRoute(routeFn: any, context: Context, middlewareResult?: an
 
     return context.json(
       {
-        meta: {success: false},
+        meta: { success: false },
         data: {
           message: e.message,
           stack: IS_PROD ? undefined : e.stack?.split('\n'),
         },
       },
-      {status: 500}
+      { status: 500 }
     );
   }
 }
@@ -267,7 +276,7 @@ async function showErrorReponse(context: Context, err: Error) {
 export type THSServerConfig = {
   appDir: string;
   staticFileRoot: string;
-  rewrites?: Array<{source: string; destination: string}>;
+  rewrites?: Array<{ source: string; destination: string }>;
   // For customizing the routes and adding your own...
   beforeRoutesAdded?: (app: Hono) => void;
   afterRoutesAdded?: (app: Hono) => void;
@@ -287,7 +296,7 @@ export async function buildRoutes(config: THSServerConfig): Promise<THSRouteMap[
   // Walk all pages and add them as routes
   const routesDir = join(config.appDir, 'routes');
   console.log(routesDir);
-  const files = await readdir(routesDir, {recursive: true});
+  const files = await readdir(routesDir, { recursive: true });
   const routes: THSRouteMap[] = [];
 
   for (const file of files) {
@@ -353,7 +362,7 @@ export async function createServer(config: THSServerConfig): Promise<Hono> {
     const fullRouteFile = join(CWD, route.file);
     const routePattern = normalizePath(route.route);
 
-    routeMap.push({route: routePattern, file: route.file});
+    routeMap.push({ route: routePattern, file: route.file });
 
     // Import route
     const routeModule = await import(fullRouteFile);
@@ -373,7 +382,7 @@ export async function createServer(config: THSServerConfig): Promise<Hono> {
     app.get('/', (context) => {
       return context.text(
         'No routes found. Add routes to app/routes. Example: `app/routes/index.ts`',
-        {status: 404}
+        { status: 404 }
       );
     });
   }
@@ -396,7 +405,7 @@ export async function createServer(config: THSServerConfig): Promise<Hono> {
   );
 
   app.notFound((context) => {
-    return context.text('Not... found?', {status: 404});
+    return context.text('Not... found?', { status: 404 });
   });
 
   return app;
@@ -431,7 +440,7 @@ export function createReadableStreamFromAsyncGenerator(output: AsyncGenerator) {
   return new ReadableStream({
     async start(controller) {
       while (true) {
-        const {done, value} = await output.next();
+        const { done, value } = await output.next();
 
         if (done) {
           controller.close();

package/dist/index.d.ts

@@ -1,121 +0,0 @@
-// Generated by dts-bundle-generator v9.5.1
-
-import { TmplHtml } from '@hyperspan/html';
-import { Context, Handler, Hono } from 'hono';
-
-export declare const IS_PROD: boolean;
-/**
- * Route
- * Define a route that can handle a direct HTTP request
- * Route handlers should return a Response or TmplHtml object
- */
-export declare function createRoute(handler: Handler): HSRoute;
-/**
- * Component
- * Define a component or partial with an optional loading placeholder
- * These can be rendered anywhere inside other templates - even if async.
- */
-export declare function createComponent(render: () => THSComponentReturn | Promise<THSComponentReturn>): HSComponent;
-/**
- * Form + route handler
- * Automatically handles and parses form data
- *
- * INITIAL IDEA OF HOW THIS WILL WORK:
- * ---
- * 1. Renders component as initial form markup for GET request
- * 2. Bind form onSubmit function to custom client JS handling
- * 3. Submits form with JavaScript fetch()
- * 4. Replaces form content with content from server
- * 5. All validation and save logic is on the server
- * 6. Handles any Exception thrown on server as error displayed in client
- */
-export declare function createForm(renderForm: (data?: any) => THSResponseTypes, schema?: z.ZodSchema | null): HSFormRoute;
-/**
- * Types
- */
-export type THSComponentReturn = TmplHtml | string | number | null;
-export type THSResponseTypes = TmplHtml | Response | string | null;
-export declare const HS_DEFAULT_LOADING: () => TmplHtml;
-/**
- * Route handler helper
- */
-export declare class HSComponent {
-	_kind: string;
-	_handlers: Record<string, Handler>;
-	_loading?: () => TmplHtml;
-	render: () => THSComponentReturn | Promise<THSComponentReturn>;
-	constructor(render: () => THSComponentReturn | Promise<THSComponentReturn>);
-	loading(fn: () => TmplHtml): this;
-}
-/**
- * Route handler helper
- */
-export declare class HSRoute {
-	_kind: string;
-	_handlers: Record<string, Handler>;
-	_methods: null | string[];
-	constructor(handler: Handler);
-}
-/**
- * Form route handler helper
- */
-export type THSFormRenderer = (data?: any) => THSResponseTypes;
-export declare class HSFormRoute {
-	_kind: string;
-	_handlers: Record<string, Handler>;
-	_form: THSFormRenderer;
-	_methods: null | string[];
-	_schema: null | z.ZodSchema;
-	constructor(renderForm: THSFormRenderer, schema?: z.ZodSchema | null);
-	getDefaultData(): unknown;
-	/**
-	 * Get form renderer method
-	 */
-	renderForm(data?: any): THSResponseTypes;
-	get(handler: Handler): this;
-	patch(handler: Handler): this;
-	post(handler: Handler): this;
-	put(handler: Handler): this;
-	delete(handler: Handler): this;
-}
-/**
- * Run route from file
- */
-export declare function runFileRoute(RouteModule: any, context: Context): Promise<Response | false>;
-export type THSServerConfig = {
-	appDir: string;
-	staticFileRoot: string;
-	rewrites?: Array<{
-		source: string;
-		destination: string;
-	}>;
-	beforeRoutesAdded?: (app: Hono) => void;
-	afterRoutesAdded?: (app: Hono) => void;
-};
-export type THSRouteMap = {
-	file: string;
-	route: string;
-	params: string[];
-};
-export declare function buildRoutes(config: THSServerConfig): Promise<THSRouteMap[]>;
-/**
- * Create and start Bun HTTP server
- */
-export declare function createServer(config: THSServerConfig): Promise<Hono>;
-/**
- * Streaming HTML Response
- */
-export declare class StreamResponse extends Response {
-	constructor(iterator: AsyncIterator<unknown>, options?: {});
-}
-/**
- * Does what it says on the tin...
- */
-export declare function createReadableStreamFromAsyncGenerator(output: AsyncGenerator): ReadableStream<any>;
-/**
- * Normalize URL path
- * Removes trailing slash and lowercases path
- */
-export declare function normalizePath(urlPath: string): string;
-
-export {};