@hyperspan/framework 0.1.2 → 0.1.4

package/build.ts

@@ -1,27 +1,29 @@
 import {build} from 'bun';
 import dts from 'bun-plugin-dts';
 
-const filesToBuild = ['./src/index.ts', './src/server.ts', './src/assets.ts'];
+const entrypoints = ['./src/server.ts', './src/assets.ts'];
+const external = ['@hyperspan/html'];
 const outdir = './dist';
 const target = 'node';
+const splitting = true;
 
-await Promise.all(
-  filesToBuild.map((file) =>
-    Promise.all([
-      // Build JS
-      build({
-        entrypoints: [file],
-        outdir,
-        target,
-      }),
+await Promise.all([
+  // Build JS
+  build({
+    entrypoints,
+    external,
+    outdir,
+    target,
+    splitting,
+  }),
 
-      // Build type files for TypeScript
-      build({
-        entrypoints: [file],
-        outdir,
-        target,
-        plugins: [dts()],
-      }),
-    ])
-  )
-);
+  // Build type files for TypeScript
+  build({
+    entrypoints,
+    external,
+    outdir,
+    target,
+    splitting,
+    plugins: [dts()],
+  }),
+]);

package/dist/assets.d.ts

@@ -19,7 +19,7 @@ export declare const clientJSFiles: Map<string, {
 	src: string;
 	type?: string;
 }>;
-export declare function buildClientJS(): Promise<string>;
+export declare function buildClientJS(): Promise<void>;
 /**
  * Find client CSS file built for end users
  * @TODO: Build this in code here vs. relying on tailwindcss CLI tool from package scripts

package/dist/assets.js

@@ -1,161 +1,5 @@
-// ../html/dist/html.js
-/*!
- * escape-html
- * Copyright(c) 2012-2013 TJ Holowaychuk
- * Copyright(c) 2015 Andreas Lubbe
- * Copyright(c) 2015 Tiancheng "Timothy" Gu
- * MIT Licensed
- */
-var matchHtmlRegExp = /["'&<>]/;
-function escapeHtml(string) {
-  const str = "" + string;
-  const match = matchHtmlRegExp.exec(str);
-  if (!match) {
-    return str;
-  }
-  let escape;
-  let html = "";
-  let index = 0;
-  let lastIndex = 0;
-  for (index = match.index;index < str.length; index++) {
-    switch (str.charCodeAt(index)) {
-      case 34:
-        escape = "&quot;";
-        break;
-      case 38:
-        escape = "&amp;";
-        break;
-      case 39:
-        escape = "&#39;";
-        break;
-      case 60:
-        escape = "&lt;";
-        break;
-      case 62:
-        escape = "&gt;";
-        break;
-      default:
-        continue;
-    }
-    if (lastIndex !== index) {
-      html += str.substring(lastIndex, index);
-    }
-    lastIndex = index + 1;
-    html += escape;
-  }
-  return lastIndex !== index ? html + str.substring(lastIndex, index) : html;
-}
-
-class TmplHtml {
-  _kind = "hstmpl";
-  content = "";
-  asyncContent;
-  constructor(props) {
-    this.content = props.content;
-    this.asyncContent = props.asyncContent;
-  }
-}
-var htmlId = 0;
-function html(strings, ...values) {
-  const asyncContent = [];
-  let content = "";
-  for (let i = 0;i < strings.length; i++) {
-    const value = values[i];
-    const kind = _typeOf(value);
-    const renderValue = _renderValue(value, { kind, asyncContent }) || "";
-    content += strings[i] + (renderValue ? renderValue : "");
-  }
-  return new TmplHtml({ content, asyncContent });
-}
-html.raw = (content) => ({ _kind: "html_safe", content });
-function _renderValue(value, opts = {
-  kind: undefined,
-  id: undefined,
-  asyncContent: []
-}) {
-  if (value === null || value === undefined || Number.isNaN(value)) {
-    return "";
-  }
-  const kind = opts.kind || _typeOf(value);
-  let id = opts.id;
-  switch (kind) {
-    case "array":
-      return value.map((v) => _renderValue(v, { id, asyncContent: opts.asyncContent })).join("");
-    case "object":
-      id = `async_loading_${htmlId++}`;
-      if (value instanceof TmplHtml || value.constructor.name === "TmplHtml" || value?._kind === "hstmpl") {
-        opts.asyncContent.push(...value.asyncContent);
-        return value.content;
-      }
-      if (value?._kind === "html_safe") {
-        return value?.content || "";
-      }
-      if (typeof value.renderAsync === "function") {
-        opts.asyncContent.push({
-          id,
-          promise: value.renderAsync().then((result) => ({
-            id,
-            value: result,
-            asyncContent: opts.asyncContent
-          }))
-        });
-      }
-      if (typeof value.render === "function") {
-        return render(_htmlPlaceholder(id, value.render()));
-      }
-      return JSON.stringify(value);
-    case "promise":
-      id = `async_loading_${htmlId++}`;
-      opts.asyncContent.push({
-        id,
-        promise: value.then((result) => ({
-          id,
-          value: result,
-          asyncContent: opts.asyncContent
-        }))
-      });
-      return render(_htmlPlaceholder(id));
-    case "generator":
-      throw new Error("Generators are not supported as a template value at this time. Sorry :(");
-    default:
-      console.log("_renderValue kind =", kind, value);
-  }
-  return escapeHtml(String(value));
-}
-function _htmlPlaceholder(id, content = "Loading...") {
-  return html`<!--hs:loading:${id}--><slot id="${id}">${content}</slot><!--/hs:loading:${id}-->`;
-}
-function render(tmpl) {
-  return tmpl.content;
-}
-function _typeOf(obj) {
-  if (obj instanceof Promise)
-    return "promise";
-  if (obj instanceof Date)
-    return "date";
-  if (obj instanceof String)
-    return "string";
-  if (obj instanceof Number)
-    return "number";
-  if (obj instanceof Boolean)
-    return "boolean";
-  if (obj instanceof Function)
-    return "function";
-  if (Array.isArray(obj))
-    return "array";
-  if (Number.isNaN(obj))
-    return "NaN";
-  if (obj === undefined)
-    return "undefined";
-  if (obj === null)
-    return "null";
-  if (isGenerator(obj))
-    return "generator";
-  return typeof obj;
-}
-function isGenerator(obj) {
-  return obj && typeof obj.next == "function" && typeof obj.throw == "function";
-}
+// src/assets.ts
+import { html } from "@hyperspan/html";
 
 // src/clientjs/md5.js
 function md5cycle(x, k) {
@@ -307,7 +151,6 @@ async function buildClientJS() {
   });
   const jsFile = output.outputs[0].path.split("/").reverse()[0];
   clientJSFiles.set("_hs", { src: "/_hs/js/" + jsFile });
-  return jsFile;
 }
 var clientCSSFiles = new Map;
 async function buildClientCSS() {
@@ -391,3 +234,4 @@ export {
   buildClientJS,
   buildClientCSS
 };
+

package/dist/server.d.ts

@@ -1,6 +1,6 @@
 // Generated by dts-bundle-generator v9.5.1
 
-import { Context, Handler, Hono } from 'hono';
+import { Context, Hono } from 'hono';
 
 declare class TmplHtml {
 	_kind: string;
@@ -15,84 +15,46 @@ declare class TmplHtml {
 	constructor(props: Pick<TmplHtml, "content" | "asyncContent">);
 }
 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;
-}
+export type THSRouteHandler = (context: Context) => THSResponseTypes | Promise<THSResponseTypes>;
 /**
- * Route handler helper
+ * Route
+ * Define a route that can handle a direct HTTP request
+ * Route handlers should return a Response or TmplHtml object
  */
-export declare class HSRoute {
+export declare function createRoute(handler?: THSRouteHandler): {
 	_kind: string;
-	_handlers: Record<string, Handler>;
-	_methods: null | string[];
-	constructor(handler: Handler);
-}
+	get(handler: THSRouteHandler): any;
+	post(handler: THSRouteHandler): any;
+	put(handler: THSRouteHandler): any;
+	delete(handler: THSRouteHandler): any;
+	patch(handler: THSRouteHandler): any;
+	run(method: string, context: Context): Promise<Response>;
+};
+export type THSRoute = ReturnType<typeof createRoute>;
 /**
- * Form route handler helper
+ * Create new API Route
+ * API Route handlers should return a JSON object or a Response
  */
-export type THSFormRenderer = (data?: any) => THSResponseTypes;
-export declare class HSFormRoute {
+export declare function createAPIRoute(handler?: THSRouteHandler): {
 	_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;
-}
+	get(handler: THSRouteHandler): any;
+	post(handler: THSRouteHandler): any;
+	put(handler: THSRouteHandler): any;
+	delete(handler: THSRouteHandler): any;
+	patch(handler: THSRouteHandler): any;
+	run(method: string, context: Context): Promise<Response>;
+};
+export type THSAPIRoute = ReturnType<typeof createAPIRoute>;
 /**
- * Run route from file
+ * Get a Hyperspan runnable route from a module import
+ * @throws Error if no runnable route found
  */
-export declare function runFileRoute(RouteModule: any, context: Context): Promise<Response | false>;
+export declare function getRunnableRoute(route: unknown): THSRoute;
+export declare function isRouteRunnable(route: unknown): boolean;
 export type THSServerConfig = {
 	appDir: string;
 	staticFileRoot: string;
@@ -109,6 +71,10 @@ export type THSRouteMap = {
 	params: string[];
 };
 export declare function buildRoutes(config: THSServerConfig): Promise<THSRouteMap[]>;
+/**
+ * Run route from file
+ */
+export declare function createRouteFromModule(RouteModule: any): (context: Context) => Promise<Response>;
 /**
  * Create and start Bun HTTP server
  */