@hyperspan/framework 0.1.1 → 0.1.3

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

@@ -1,5 +1,17 @@
 // Generated by dts-bundle-generator v9.5.1
 
+declare class TmplHtml {
+	_kind: string;
+	content: string;
+	asyncContent: Array<{
+		id: string;
+		promise: Promise<{
+			id: string;
+			value: unknown;
+		}>;
+	}>;
+	constructor(props: Pick<TmplHtml, "content" | "asyncContent">);
+}
 /**
  * Build client JS for end users (minimal JS for Hyperspan to work)
  */
@@ -7,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
@@ -17,12 +29,12 @@ export declare function buildClientCSS(): Promise<string | undefined>;
 /**
  * Output HTML style tag for Hyperspan app
  */
-export declare function hyperspanStyleTags(): import("@hyperspan/html").TmplHtml;
+export declare function hyperspanStyleTags(): TmplHtml;
 /**
  * Output HTML script tag for Hyperspan app
  * Required for functioning streaming so content can pop into place properly once ready
  */
-export declare function hyperspanScriptTags(): import("@hyperspan/html").TmplHtml;
+export declare function hyperspanScriptTags(): TmplHtml;
 /**
  * Return a Preact component, mounted as an island in a <script> tag so it can be embedded into the page response.
  */

package/dist/assets.js

@@ -1,162 +1,5 @@
-// node_modules/@hyperspan/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 {
-  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++) {
-    let value = values[i];
-    let renderValue;
-    if (value !== null && value !== undefined) {
-      let id = `async_loading_${htmlId++}`;
-      let kind = _typeOf(value);
-      if (!renderValue) {
-        renderValue = _renderValue(value, { id, 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);
-  const id = opts.id || "";
-  switch (kind) {
-    case "array":
-      return value.map((v) => _renderValue(v, { id, asyncContent: opts.asyncContent })).join("");
-    case "object":
-      if (value instanceof TmplHtml) {
-        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":
-      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 :(");
-  }
-  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) {
@@ -299,7 +142,7 @@ var IS_PROD = false;
 var PWD = import.meta.dir;
 var clientJSFiles = new Map;
 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`,
@@ -308,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() {
@@ -332,7 +174,7 @@ async function buildClientCSS() {
 }
 function hyperspanStyleTags() {
   const cssFiles = Array.from(clientCSSFiles.entries());
-  return html`${cssFiles.map(([key, file]) => html`<link rel="stylesheet" href="/_hs/css/${file}" />`)}`;
+  return html`${cssFiles.map(([_, file]) => html`<link rel="stylesheet" href="/_hs/css/${file}" />`)}`;
 }
 function hyperspanScriptTags() {
   const jsFiles = Array.from(clientJSFiles.entries());
@@ -392,3 +234,4 @@ export {
   buildClientJS,
   buildClientCSS
 };
+

package/dist/server.d.ts

@@ -1,8 +1,19 @@
 // Generated by dts-bundle-generator v9.5.1
 
-import { TmplHtml } from '@hyperspan/html';
 import { Context, Handler, Hono } from 'hono';
 
+declare class TmplHtml {
+	_kind: string;
+	content: string;
+	asyncContent: Array<{
+		id: string;
+		promise: Promise<{
+			id: string;
+			value: unknown;
+		}>;
+	}>;
+	constructor(props: Pick<TmplHtml, "content" | "asyncContent">);
+}
 export declare const IS_PROD: boolean;
 /**
  * Route