@hyperspan/framework 0.0.1 → 0.0.3

package/README.md

@@ -2,9 +2,9 @@
 
 > [!NOTE] > **Hyperspan is still in the early stages of development, your feedback is appreciated.**
 
-No JSX. No Virtual DOM. No hydration time. No nonsense. Just blazing fast HTML strings with reactive templates.
+Hyperspan is a full-stack framework built with [Bun](https://bun.sh) that is focused on simplicity and ease of use.
 
-Hyperspan is a full-stack framework built with [Bun](https://bun.sh) that is focused on simplicity and perforamnce.
+No JSX. No Virtual DOM. No hydration time. No nonsense. Just blazing fast HTML strings with reactive templates.
 
 ## Who Is Hyperspan For?
 

package/build.ts

@@ -0,0 +1,29 @@
+import dts from 'bun-plugin-dts';
+
+await Promise.all([
+  // Build JS
+  Bun.build({
+    entrypoints: ['./src/index.ts'],
+    outdir: './dist',
+    target: 'browser',
+  }),
+  Bun.build({
+    entrypoints: ['./src/server.ts'],
+    outdir: './dist',
+    target: 'node',
+  }),
+
+  // Build type files for TypeScript
+  Bun.build({
+    entrypoints: ['./src/index.ts'],
+    outdir: './dist',
+    target: 'browser',
+    plugins: [dts()],
+  }),
+  Bun.build({
+    entrypoints: ['./src/server.ts'],
+    outdir: './dist',
+    target: 'node',
+    plugins: [dts()],
+  }),
+]);

package/dist/index.d.ts

@@ -0,0 +1,50 @@
+// Generated by dts-bundle-generator v9.5.1
+
+/**
+ * Template object - used so it will be possible to (eventually) pass down context
+ */
+export declare class HSTemplate {
+	__hsTemplate: boolean;
+	content: any[];
+	constructor(content: any[]);
+}
+/**
+ * HTML template
+ */
+export declare function html(strings: TemplateStringsArray, ...values: any[]): HSTemplate;
+export declare namespace html {
+	var raw: (value: string) => HSTemplate;
+}
+/**
+ * Render HSTemplate to async generator that streams output to a string
+ */
+export declare function renderToStream(template: HSTemplate | string): AsyncGenerator<string>;
+/**
+ * Render HSTemplate to string (awaits/buffers entire response)
+ */
+export declare function renderToString(template: HSTemplate | string): Promise<string>;
+/**
+ * Strip extra spacing between HTML tags (used for tests)
+ */
+export declare function compressHTMLString(str: string): string;
+/**
+ * LOL JavaScript...
+ */
+export declare function _typeOf(obj: any): string;
+/**
+ * Client component
+ */
+export type THSWCState = Record<string, any>;
+export type THSWCSetStateArg = THSWCState | ((state: THSWCState) => THSWCState);
+export type THSWC = {
+	this: THSWC;
+	state: THSWCState | undefined;
+	id: string;
+	setState: (fn: THSWCSetStateArg) => THSWCState;
+	mergeState: (newState: THSWCState) => THSWCState;
+	render: () => any;
+};
+export type THSWCUser = Pick<THSWC, "render"> & Record<string, any>;
+export declare function clientComponent(id: string, wc: THSWCUser): (attrs?: Record<string, string>, state?: Record<string, any>) => HSTemplate;
+
+export {};

package/dist/index.js

@@ -1,6 +1,6 @@
 var __create = Object.create;
-var __defProp = Object.defineProperty;
 var __getProtoOf = Object.getPrototypeOf;
+var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __toESM = (mod, isNodeMode, target) => {
@@ -18,7 +18,7 @@ var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports,
 
 // node_modules/escape-html/index.js
 var require_escape_html = __commonJS((exports, module) => {
-  var escapeHtml = function(string) {
+  function escapeHtml(string) {
     var str = "" + string;
     var match = matchHtmlRegExp.exec(str);
     if (!match) {
@@ -55,7 +55,7 @@ var require_escape_html = __commonJS((exports, module) => {
       html += escape;
     }
     return lastIndex !== index ? html + str.substring(lastIndex, index) : html;
-  };
+  }
   /*!
    * escape-html
    * Copyright(c) 2012-2013 TJ Holowaychuk
@@ -71,7 +71,7 @@ var require_escape_html = __commonJS((exports, module) => {
 var import_escape_html = __toESM(require_escape_html(), 1);
 
 // src/clientjs/md5.js
-var md5cycle = function(x, k) {
+function md5cycle(x, k) {
   var a = x[0], b = x[1], c = x[2], d = x[3];
   a = ff(a, b, c, d, k[0], 7, -680876936);
   d = ff(d, a, b, c, k[1], 12, -389564586);
@@ -141,24 +141,24 @@ var md5cycle = function(x, k) {
   x[1] = add32(b, x[1]);
   x[2] = add32(c, x[2]);
   x[3] = add32(d, x[3]);
-};
-var cmn = function(q, a, b, x, s, t) {
+}
+function cmn(q, a, b, x, s, t) {
   a = add32(add32(a, q), add32(x, t));
   return add32(a << s | a >>> 32 - s, b);
-};
-var ff = function(a, b, c, d, x, s, t) {
+}
+function ff(a, b, c, d, x, s, t) {
   return cmn(b & c | ~b & d, a, b, x, s, t);
-};
-var gg = function(a, b, c, d, x, s, t) {
+}
+function gg(a, b, c, d, x, s, t) {
   return cmn(b & d | c & ~d, a, b, x, s, t);
-};
-var hh = function(a, b, c, d, x, s, t) {
+}
+function hh(a, b, c, d, x, s, t) {
   return cmn(b ^ c ^ d, a, b, x, s, t);
-};
-var ii = function(a, b, c, d, x, s, t) {
+}
+function ii(a, b, c, d, x, s, t) {
   return cmn(c ^ (b | ~d), a, b, x, s, t);
-};
-var md51 = function(s) {
+}
+function md51(s) {
   var txt = "";
   var n = s.length, state = [1732584193, -271733879, -1732584194, 271733878], i;
   for (i = 64;i <= s.length; i += 64) {
@@ -177,28 +177,28 @@ var md51 = function(s) {
   tail[14] = n * 8;
   md5cycle(state, tail);
   return state;
-};
-var md5blk = function(s) {
+}
+function md5blk(s) {
   var md5blks = [], i;
   for (i = 0;i < 64; i += 4) {
     md5blks[i >> 2] = s.charCodeAt(i) + (s.charCodeAt(i + 1) << 8) + (s.charCodeAt(i + 2) << 16) + (s.charCodeAt(i + 3) << 24);
   }
   return md5blks;
-};
-var rhex = function(n) {
+}
+function rhex(n) {
   var s = "", j = 0;
   for (;j < 4; j++)
     s += hex_chr[n >> j * 8 + 4 & 15] + hex_chr[n >> j * 8 & 15];
   return s;
-};
-var hex = function(x) {
+}
+function hex(x) {
   for (var i = 0;i < x.length; i++)
     x[i] = rhex(x[i]);
   return x.join("");
-};
-var add32 = function(a, b) {
+}
+function add32(a, b) {
   return a + b & 4294967295;
-};
+}
 function md5(s) {
   return hex(md51(s));
 }
@@ -232,7 +232,7 @@ async function* _render(obj, promises = [], { js }) {
     kind = _typeOf(obj);
     value = obj;
   }
-  if (value instanceof HSTemplate) {
+  if (value instanceof HSTemplate || value.__hsTemplate) {
     yield* renderToStream(value);
   } else if (typeof value.render !== "undefined") {
     value.id = id;
@@ -269,6 +269,9 @@ async function* _render(obj, promises = [], { js }) {
       case "json":
         yield "";
         break;
+      case "number":
+        yield String(value);
+        break;
       case "object":
         if (typeof value.render === "function") {
           yield value.render();
@@ -322,9 +325,9 @@ async function renderToString(template) {
 function compressHTMLString(str) {
   return str.replace(/(<(pre|script|style|textarea)[^]+?<\/\2)|(^|>)\s+|\s+(?=<|$)/g, "$1$3");
 }
-var randomId = function() {
+function randomId() {
   return Math.random().toString(36).substring(2, 9);
-};
+}
 function _typeOf(obj) {
   if (obj instanceof Promise)
     return "promise";
@@ -352,12 +355,12 @@ function _typeOf(obj) {
     return "json";
   return typeof obj;
 }
-var isGenerator = function(obj) {
+function isGenerator(obj) {
   return obj && typeof obj.next == "function" && typeof obj.throw == "function";
-};
-var isPlainObject = function(val) {
+}
+function isPlainObject(val) {
   return Object == val.constructor;
-};
+}
 function clientComponent(id, wc) {
   const comp = {
     ...wc,
@@ -414,7 +417,7 @@ function renderFunctionToString(fn) {
   }
   return fns;
 }
-var renderObjectToLiteralString = function(obj) {
+function renderObjectToLiteralString(obj) {
   const lines = [];
   let str = 'hyperspan.wc.set("' + obj.id + '", {\n';
   for (const prop in obj) {
@@ -444,7 +447,7 @@ var renderObjectToLiteralString = function(obj) {
   str += lines.map((line) => line.join("") + ",").join("\n");
   str += "\n})";
   return str;
-};
+}
 var IS_CLIENT = typeof window !== "undefined";
 
 class HSTemplate {

package/dist/server.d.ts

@@ -0,0 +1,109 @@
+// Generated by dts-bundle-generator v9.5.1
+
+import Headers$1 from '@mjackson/headers';
+
+declare class HSTemplate {
+	__hsTemplate: boolean;
+	content: any[];
+	constructor(content: any[]);
+}
+export type THTTPMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
+declare class HSRequestContext {
+	req: Request;
+	locals: Record<string, any>;
+	headers: Headers$1;
+	route: {
+		params: Record<string, string>;
+		query: URLSearchParams;
+	};
+	constructor(req: Request, params?: Record<string, string>);
+	/**
+	 * Response helper
+	 * Merges a Response object while preserving all headers added in context/middleware
+	 */
+	resMerge(res: Response): Response;
+	/**
+	 * HTML response helper
+	 * Preserves all headers added in context/middleware
+	 */
+	html(content: string, options?: ResponseInit): Response;
+	/**
+	 * JSON response helper
+	 * Preserves all headers added in context/middleware
+	 */
+	json(content: any, options?: ResponseInit): Response;
+	notFound(msg?: string): Response;
+}
+export type THSRouteHandler = (context: HSRequestContext) => (Response | null | void) | Promise<Response | null | void>;
+declare class HSApp {
+	private _router;
+	private _mw;
+	_defaultRoute: THSRouteHandler;
+	constructor();
+	get(path: string, handler: THSRouteHandler): this;
+	post(path: string, handler: THSRouteHandler): this;
+	put(path: string, handler: THSRouteHandler): this;
+	delete(path: string, handler: THSRouteHandler): this;
+	all(path: string, handler: THSRouteHandler): this;
+	addRoute(methods: THTTPMethod[], path: string, handler: THSRouteHandler): this;
+	defaultRoute(handler: THSRouteHandler): void;
+	private _route;
+	run(req: Request): Promise<Response>;
+}
+export declare const IS_PROD: boolean;
+/**
+ * Run route from file
+ */
+export declare function runFileRoute(routeFile: string, context: HSRequestContext): Promise<any>;
+export type THSServerConfig = {
+	appDir: string;
+	staticFileRoot: string;
+	beforeRoutesAdded?: (app: HSApp) => void;
+	afterRoutesAdded?: (app: HSApp) => 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<HSApp>;
+/**
+ * Build client JS for end users (minimal JS for Hyperspan to work)
+ */
+export declare let clientJSFile: string;
+export declare function buildClientJS(): Promise<string>;
+/**
+ * Find client CSS file built for end users
+ * @TODO: Build this in code here vs. relying on tailwindcss CLI tool from package scripts
+ */
+export declare let clientCSSFile: string;
+export declare function buildClientCSS(): Promise<string | undefined>;
+/**
+ * Streaming HTML Response
+ */
+export declare class StreamResponse {
+	constructor(iterator: AsyncIterator<unknown>, options?: {});
+}
+/**
+ * Does what it says on the tin...
+ */
+export declare function createReadableStreamFromAsyncGenerator(output: AsyncGenerator): ReadableStream<any>;
+/**
+ * Form route
+ * Automatically handles and parses form data
+ *
+ * 1. Renders component as initial form markup
+ * 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 type TFormRouteFn = (context: HSRequestContext) => HSTemplate | Response;
+export declare function formRoute(handlerFn: TFormRouteFn): (context: HSRequestContext) => void;
+
+export {};

package/dist/server.js

@@ -1,7 +1,6 @@
-// @bun
 var __create = Object.create;
-var __defProp = Object.defineProperty;
 var __getProtoOf = Object.getPrototypeOf;
+var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __toESM = (mod, isNodeMode, target) => {
@@ -19,7 +18,7 @@ var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports,
 
 // node_modules/escape-html/index.js
 var require_escape_html = __commonJS((exports, module) => {
-  var escapeHtml = function(string) {
+  function escapeHtml(string) {
     var str = "" + string;
     var match = matchHtmlRegExp.exec(str);
     if (!match) {
@@ -56,7 +55,7 @@ var require_escape_html = __commonJS((exports, module) => {
       html += escape;
     }
     return lastIndex !== index ? html + str.substring(lastIndex, index) : html;
-  };
+  }
   /*!
    * escape-html
    * Copyright(c) 2012-2013 TJ Holowaychuk
@@ -300,7 +299,7 @@ var require_trek_middleware = __commonJS((exports, module) => {
 
 // node_modules/@fastify/deepmerge/index.js
 var require_deepmerge = __commonJS((exports, module) => {
-  var deepmergeConstructor = function(options) {
+  function deepmergeConstructor(options) {
     function isNotPrototypeKey(value) {
       return value !== "constructor" && value !== "prototype" && value !== "__proto__";
     }
@@ -404,7 +403,7 @@ var require_deepmerge = __commonJS((exports, module) => {
       return result;
     }
     return options && options.all ? _deepmergeAll : _deepmerge;
-  };
+  }
   var JSON_PROTO = Object.getPrototypeOf({});
   module.exports = deepmergeConstructor;
   module.exports.default = deepmergeConstructor;
@@ -412,14 +411,14 @@ var require_deepmerge = __commonJS((exports, module) => {
 });
 
 // src/server.ts
-import {readdir} from "fs/promises";
-import {basename, extname, join} from "path";
+import { readdir } from "node:fs/promises";
+import { basename, extname, join, resolve } from "node:path";
 
 // src/html.ts
 var import_escape_html = __toESM(require_escape_html(), 1);
 
 // src/clientjs/md5.js
-var md5cycle = function(x, k) {
+function md5cycle(x, k) {
   var a = x[0], b = x[1], c = x[2], d = x[3];
   a = ff(a, b, c, d, k[0], 7, -680876936);
   d = ff(d, a, b, c, k[1], 12, -389564586);
@@ -489,24 +488,24 @@ var md5cycle = function(x, k) {
   x[1] = add32(b, x[1]);
   x[2] = add32(c, x[2]);
   x[3] = add32(d, x[3]);
-};
-var cmn = function(q, a, b, x, s, t) {
+}
+function cmn(q, a, b, x, s, t) {
   a = add32(add32(a, q), add32(x, t));
   return add32(a << s | a >>> 32 - s, b);
-};
-var ff = function(a, b, c, d, x, s, t) {
+}
+function ff(a, b, c, d, x, s, t) {
   return cmn(b & c | ~b & d, a, b, x, s, t);
-};
-var gg = function(a, b, c, d, x, s, t) {
+}
+function gg(a, b, c, d, x, s, t) {
   return cmn(b & d | c & ~d, a, b, x, s, t);
-};
-var hh = function(a, b, c, d, x, s, t) {
+}
+function hh(a, b, c, d, x, s, t) {
   return cmn(b ^ c ^ d, a, b, x, s, t);
-};
-var ii = function(a, b, c, d, x, s, t) {
+}
+function ii(a, b, c, d, x, s, t) {
   return cmn(c ^ (b | ~d), a, b, x, s, t);
-};
-var md51 = function(s) {
+}
+function md51(s) {
   var txt = "";
   var n = s.length, state = [1732584193, -271733879, -1732584194, 271733878], i;
   for (i = 64;i <= s.length; i += 64) {
@@ -525,28 +524,28 @@ var md51 = function(s) {
   tail[14] = n * 8;
   md5cycle(state, tail);
   return state;
-};
-var md5blk = function(s) {
+}
+function md5blk(s) {
   var md5blks = [], i;
   for (i = 0;i < 64; i += 4) {
     md5blks[i >> 2] = s.charCodeAt(i) + (s.charCodeAt(i + 1) << 8) + (s.charCodeAt(i + 2) << 16) + (s.charCodeAt(i + 3) << 24);
   }
   return md5blks;
-};
-var rhex = function(n) {
+}
+function rhex(n) {
   var s = "", j = 0;
   for (;j < 4; j++)
     s += hex_chr[n >> j * 8 + 4 & 15] + hex_chr[n >> j * 8 & 15];
   return s;
-};
-var hex = function(x) {
+}
+function hex(x) {
   for (var i = 0;i < x.length; i++)
     x[i] = rhex(x[i]);
   return x.join("");
-};
-var add32 = function(a, b) {
+}
+function add32(a, b) {
   return a + b & 4294967295;
-};
+}
 function md5(s) {
   return hex(md51(s));
 }
@@ -580,7 +579,7 @@ async function* _render(obj, promises = [], { js }) {
     kind = _typeOf(obj);
     value = obj;
   }
-  if (value instanceof HSTemplate) {
+  if (value instanceof HSTemplate || value.__hsTemplate) {
     yield* renderToStream(value);
   } else if (typeof value.render !== "undefined") {
     value.id = id;
@@ -617,6 +616,9 @@ async function* _render(obj, promises = [], { js }) {
       case "json":
         yield "";
         break;
+      case "number":
+        yield String(value);
+        break;
       case "object":
         if (typeof value.render === "function") {
           yield value.render();
@@ -667,9 +669,9 @@ async function renderToString(template) {
   }
   return result;
 }
-var randomId = function() {
+function randomId() {
   return Math.random().toString(36).substring(2, 9);
-};
+}
 function _typeOf(obj) {
   if (obj instanceof Promise)
     return "promise";
@@ -697,12 +699,12 @@ function _typeOf(obj) {
     return "json";
   return typeof obj;
 }
-var isGenerator = function(obj) {
+function isGenerator(obj) {
   return obj && typeof obj.next == "function" && typeof obj.throw == "function";
-};
-var isPlainObject = function(val) {
+}
+function isPlainObject(val) {
   return Object == val.constructor;
-};
+}
 function renderFunctionToString(fn) {
   let fns = fn.toString();
   const firstLine = fns.split("\n")[0];
@@ -735,7 +737,7 @@ html.raw = (value) => {
 };
 
 // node_modules/isbot/index.mjs
-var getPattern = function() {
+function getPattern() {
   if (pattern instanceof RegExp) {
     return pattern;
   }
@@ -745,10 +747,10 @@ var getPattern = function() {
     pattern = naivePattern;
   }
   return pattern;
-};
-var isbot = function(userAgent) {
+}
+function isbot(userAgent) {
   return Boolean(userAgent) && getPattern().test(userAgent);
-};
+}
 var fullPattern = " daum[ /]| deusu/| yadirectfetcher|(?:^|[^g])news(?!sapphire)|(?<! (?:channel/|google/))google(?!(app|/google| pixel))|(?<! cu)bots?(?:\\b|_)|(?<!(?:lib))http|(?<![hg]m)score|@[a-z][\\w-]+\\.|\\(\\)|\\.com\\b|\\btime/|^<|^[\\w \\.\\-\\(?:\\):]+(?:/v?\\d+(?:\\.\\d+)?(?:\\.\\d{1,10})*?)?(?:,|$)|^[^ ]{50,}$|^\\d+\\b|^\\w*search\\b|^\\w+/[\\w\\(\\)]*$|^active|^ad muncher|^amaya|^avsdevicesdk/|^biglotron|^bot|^bw/|^clamav[ /]|^client/|^cobweb/|^custom|^ddg[_-]android|^discourse|^dispatch/\\d|^downcast/|^duckduckgo|^facebook|^getright/|^gozilla/|^hobbit|^hotzonu|^hwcdn/|^jeode/|^jetty/|^jigsaw|^microsoft bits|^movabletype|^mozilla/5\\.0\\s[a-z\\.-]+$|^mozilla/\\d\\.\\d \\(compatible;?\\)$|^mozilla/\\d\\.\\d \\w*$|^navermailapp|^netsurf|^offline|^owler|^php|^postman|^python|^rank|^read|^reed|^rest|^rss|^snapchat|^space bison|^svn|^swcd |^taringa|^thumbor/|^track|^valid|^w3c|^webbandit/|^webcopier|^wget|^whatsapp|^wordpress|^xenu link sleuth|^yahoo|^yandex|^zdm/\\d|^zoom marketplace/|^{{.*}}$|adscanner/|analyzer|archive|ask jeeves/teoma|bit\\.ly/|bluecoat drtr|browsex|burpcollaborator|capture|catch|check\\b|checker|chrome-lighthouse|chromeframe|classifier|cloudflare|convertify|crawl|cypress/|dareboost|datanyze|dejaclick|detect|dmbrowser|download|evc-batch/|exaleadcloudview|feed|firephp|functionize|gomezagent|headless|httrack|hubspot marketing grader|hydra|ibisbrowser|images|infrawatch|insight|inspect|iplabel|ips-agent|java(?!;)|jsjcw_scanner|library|linkcheck|mail\\.ru/|manager|measure|neustar wpm|node|nutch|offbyone|optimize|pageburst|pagespeed|parser|perl|phantomjs|pingdom|powermarks|preview|proxy|ptst[ /]\\d|reputation|resolver|retriever|rexx;|rigor|rss\\b|scanner\\.|scrape|server|sogou|sparkler/|speedcurve|spider|splash|statuscake|supercleaner|synapse|synthetic|tools|torrent|trace|transcoder|url|virtuoso|wappalyzer|webglance|webkit2png|whatcms/|zgrab";
 var naivePattern = /bot|crawl|http|lighthouse|scan|search|spider/i;
 var pattern;
@@ -756,7 +758,7 @@ var pattern;
 // src/app.ts
 var import_trek_router = __toESM(require_trek_router(), 1);
 var import_trek_middleware = __toESM(require_trek_middleware(), 1);
-var deepmerge = __toESM(require_deepmerge(), 1);
+var import_deepmerge = __toESM(require_deepmerge(), 1);
 
 // node_modules/@mjackson/headers/dist/lib/param-values.js
 function parseParams(input, delimiter = ";") {
@@ -1023,7 +1025,7 @@ class CacheControl {
   }
 }
 // node_modules/@mjackson/headers/dist/lib/content-disposition.js
-var decodeFilenameSplat = function(value) {
+function decodeFilenameSplat(value) {
   let match = value.match(/^([\w-]+)'([^']*)'(.+)$/);
   if (!match)
     return null;
@@ -1037,12 +1039,12 @@ var decodeFilenameSplat = function(value) {
     console.warn(`Failed to decode filename from charset ${charset}:`, error);
     return decodedFilename;
   }
-};
-var percentDecode = function(value) {
+}
+function percentDecode(value) {
   return value.replace(/\+/g, " ").replace(/%([0-9A-Fa-f]{2})/g, (_, hex2) => {
     return String.fromCharCode(parseInt(hex2, 16));
   });
-};
+}
 
 class ContentDisposition {
   filename;
@@ -1602,7 +1604,7 @@ class SuperHeaders extends Headers {
 function normalizePath(urlPath) {
   return (urlPath.endsWith("/") ? urlPath.substring(0, urlPath.length - 1) : urlPath).toLowerCase() || "/";
 }
-var mergeAll = deepmerge.default({ all: true });
+var mergeAll = import_deepmerge.default({ all: true });
 
 class HSRequestContext {
   req;
@@ -1707,10 +1709,10 @@ class HSApp {
 }
 
 // src/server.ts
-var requestIsBot = function(req) {
+function requestIsBot(req) {
   const ua = req.headers.get("User-Agent");
   return ua ? isbot(ua) : false;
-};
+}
 async function runFileRoute(routeFile, context) {
   const req = context.req;
   const url = new URL(req.url);
@@ -1808,7 +1810,7 @@ async function buildRoutes(config) {
       });
     }
     routes.push({
-      file,
+      file: join("./", routesDir, file),
       route: route || "/",
       params
     });
@@ -1817,46 +1819,52 @@ async function buildRoutes(config) {
 }
 async function createServer(config) {
   await Promise.all([buildClientJS(), buildClientCSS()]);
-  const app2 = new HSApp;
-  app2.defaultRoute(() => {
+  const app = new HSApp;
+  app.defaultRoute(() => {
     return new Response("Not... found?", { status: 404 });
   });
-  config.beforeRoutesAdded && config.beforeRoutesAdded(app2);
+  config.beforeRoutesAdded && config.beforeRoutesAdded(app);
   const fileRoutes = await buildRoutes(config);
+  const routeMap = [];
   for (let i = 0;i < fileRoutes.length; i++) {
     let route = fileRoutes[i];
-    const fullRouteFile = join("../../", config.appDir, "routes", route.file);
+    const fullRouteFile = join(CWD, route.file);
     const routePattern = normalizePath(route.route);
-    console.log("[Hyperspan] Added route: ", routePattern);
-    app2.all(routePattern, async (context) => {
+    routeMap.push({ route: routePattern, file: route.file });
+    app.all(routePattern, async (context) => {
       const matchedRoute = await runFileRoute(fullRouteFile, context);
       if (matchedRoute) {
         return matchedRoute;
       }
-      return app2._defaultRoute(context);
+      return app._defaultRoute(context);
     });
   }
-  config.afterRoutesAdded && config.afterRoutesAdded(app2);
-  app2.all("*", (context) => {
+  if (!IS_PROD) {
+    console.log("[Hyperspan] File system routes (in app/routes):");
+    console.table(routeMap);
+  }
+  config.afterRoutesAdded && config.afterRoutesAdded(app);
+  app.all("*", (context) => {
     const req = context.req;
     if (STATIC_FILE_MATCHER.test(req.url)) {
       const filePath = config.staticFileRoot + new URL(req.url).pathname;
       const file = Bun.file(filePath);
-      let headers2 = {};
+      let headers = {};
       if (IS_PROD) {
-        headers2 = {
+        headers = {
           "cache-control": "public, max-age=31557600"
         };
       }
-      return new Response(file, { headers: headers2 });
+      return new Response(file, { headers });
     }
-    return app2._defaultRoute(context);
+    return app._defaultRoute(context);
   });
-  return app2;
+  return app;
 }
 async function buildClientJS() {
+  const sourceFile = resolve(PWD, "../", "./src/clientjs/hyperspan-client.ts");
   const output = await Bun.build({
-    entrypoints: ["./src/hyperspan/clientjs/hyperspan-client.ts"],
+    entrypoints: [sourceFile],
     outdir: `./public/_hs/js`,
     naming: IS_PROD ? "[dir]/[name]-[hash].[ext]" : undefined,
     minify: IS_PROD
@@ -1900,6 +1908,8 @@ function formRoute(handlerFn) {
   };
 }
 var IS_PROD = false;
+var PWD = import.meta.dir;
+var CWD = process.cwd();
 var STATIC_FILE_MATCHER = /[^/\\&\?]+\.([a-zA-Z]+)$/;
 var _routeCache = {};
 var ROUTE_SEGMENT = /(\[[a-zA-Z_\.]+\])/g;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperspan/framework",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "Hyperspan Web Framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,9 +9,7 @@
     "access": "public"
   },
   "scripts": {
-    "build": "bun run clean && bun run build:client && bun run build:server",
-    "build:client": "bun build ./src/index.ts --outdir ./dist --target browser",
-    "build:server": "bun build ./src/server.ts --outdir ./dist --target bun",
+    "build": "bun ./build.ts",
     "clean": "rm -rf dist",
     "test": "bun test",
     "prepack": "npm run clean && npm run build"
@@ -20,7 +18,15 @@
     "type": "git",
     "url": "https://github.com/vlucas/hyperspan-framework"
   },
-  "keywords": ["framework", "node", "bun", "web", "framework", "javascript", "typescript"],
+  "keywords": [
+    "framework",
+    "node",
+    "bun",
+    "web",
+    "framework",
+    "javascript",
+    "typescript"
+  ],
   "author": "Vance Lucas <vance@vancelucas.com>",
   "license": "BSD-3-Clause",
   "bugs": {
@@ -34,5 +40,12 @@
     "isbot": "^5.1.17",
     "trek-middleware": "^1.2.0",
     "trek-router": "^1.2.0"
+  },
+  "devDependencies": {
+    "@types/bun": "^1.1.11",
+    "@types/escape-html": "^1.0.4",
+    "@types/node": "^22.7.5",
+    "bun-plugin-dts": "^0.3.0",
+    "typescript": "^5.6.3"
   }
 }

package/src/html.ts

@@ -68,7 +68,7 @@ async function* _render(
     value = obj;
   }
 
-  if (value instanceof HSTemplate) {
+  if (value instanceof HSTemplate || value.__hsTemplate) {
     yield* renderToStream(value);
   } else if (typeof value.render !== 'undefined') {
     value.id = id;
@@ -108,6 +108,9 @@ async function* _render(
       case 'json':
         yield ''; //JSON.stringify(value);
         break;
+      case 'number':
+        yield String(value);
+        break;
       case 'object':
         if (typeof value.render === 'function') {
           yield value.render();

package/src/server.ts

@@ -1,11 +1,13 @@
 import { readdir } from 'node:fs/promises';
-import { basename, extname, join } from 'node:path';
+import { basename, extname, join, resolve } from 'node:path';
 import { html, renderToStream, renderToString } from './html';
 import { isbot } from 'isbot';
 import { HSTemplate } from './html';
 import { HSApp, HSRequestContext, normalizePath } from './app';
 
 export const IS_PROD = process.env.NODE_ENV === 'production';
+const PWD = import.meta.dir;
+const CWD = process.cwd();
 const STATIC_FILE_MATCHER = /[^/\\&\?]+\.([a-zA-Z]+)$/;
 
 // Cached route components
@@ -188,7 +190,7 @@ export async function buildRoutes(config: THSServerConfig): Promise<THSRouteMap[
     }
 
     routes.push({
-      file,
+      file: join('./', routesDir, file),
       route: route || '/',
       params,
     });
@@ -215,14 +217,14 @@ export async function createServer(config: THSServerConfig): Promise<HSApp> {
 
   // Scan routes folder and add all file routes to the router
   const fileRoutes = await buildRoutes(config);
+  const routeMap = [];
 
   for (let i = 0; i < fileRoutes.length; i++) {
     let route = fileRoutes[i];
-    const fullRouteFile = join('../../', config.appDir, 'routes', route.file);
+    const fullRouteFile = join(CWD, route.file);
     const routePattern = normalizePath(route.route);
 
-    // @ts-ignore
-    console.log('[Hyperspan] Added route: ', routePattern);
+    routeMap.push({ route: routePattern, file: route.file });
 
     app.all(routePattern, async (context) => {
       const matchedRoute = await runFileRoute(fullRouteFile, context);
@@ -234,6 +236,12 @@ export async function createServer(config: THSServerConfig): Promise<HSApp> {
     });
   }
 
+  // Display routing table for dev env
+  if (!IS_PROD) {
+    console.log('[Hyperspan] File system routes (in app/routes):');
+    console.table(routeMap);
+  }
+
   // [Customization] After routes added...
   config.afterRoutesAdded && config.afterRoutesAdded(app);
 
@@ -267,8 +275,9 @@ export async function createServer(config: THSServerConfig): Promise<HSApp> {
  */
 export let clientJSFile: string;
 export async function buildClientJS() {
+  const sourceFile = resolve(PWD, '../', './src/clientjs/hyperspan-client.ts');
   const output = await Bun.build({
-    entrypoints: ['./src/hyperspan/clientjs/hyperspan-client.ts'],
+    entrypoints: [sourceFile],
     outdir: `./public/_hs/js`,
     naming: IS_PROD ? '[dir]/[name]-[hash].[ext]' : undefined,
     minify: IS_PROD,

package/tsconfig.json

@@ -19,8 +19,7 @@
     "skipLibCheck": true,
     "allowSyntheticDefaultImports": true,
     "forceConsistentCasingInFileNames": true,
-    "allowJs": true,
-    "types": ["bun-types"]
+    "allowJs": true
   },
   "exclude": ["node_modules", "__tests__", "*.test.ts"]
 }