@hyperspan/framework 0.1.7 → 0.1.8

package/dist/assets.js

@@ -61,7 +61,7 @@ function md5(content) {
 }
 async function copyPreactToPublicFolder() {
   const sourceFile = resolve(PWD, "../", "./src/clientjs/preact.ts");
-  const preactClient = Bun.build({
+  await Bun.build({
     entrypoints: [sourceFile],
     outdir: "./public/_hs/js",
     minify: true,

package/dist/server.js

@@ -9,7 +9,7 @@ import { basename, extname, join } from "node:path";
 import { html, isHSHtml, renderStream, renderAsync, render } from "@hyperspan/html";
 
 // node_modules/isbot/index.mjs
-var fullPattern = " daum[ /]| deusu/| yadirectfetcher|(?:^|[^g])news(?!sapphire)|(?<! (?:channel/|google/))google(?!(app|/google| pixel))|(?<! cu)bots?(?:\\b|_)|(?<!(?:lib))http|(?<![hg]m)score|(?<!cam)scan|@[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|^email|^facebook|^getright/|^gozilla/|^hobbit|^hotzonu|^hwcdn/|^igetter/|^jeode/|^jetty/|^jigsaw|^microsoft bits|^movabletype|^mozilla/\\d\\.\\d\\s[\\w\\.-]+$|^mozilla/\\d\\.\\d\\s\\(compatible;?(?:\\s\\w+\\/\\d+\\.\\d+)?\\)$|^navermailapp|^netsurf|^offline|^openai/|^owler|^php|^postman|^python|^rank|^read|^reed|^rest|^rss|^snapchat|^space bison|^svn|^swcd |^taringa|^thumbor/|^track|^w3c|^webbandit/|^webcopier|^wget|^whatsapp|^wordpress|^xenu link sleuth|^yahoo|^yandex|^zdm/\\d|^zoom marketplace/|^{{.*}}$|analyzer|archive|ask jeeves/teoma|audit|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|grab|headless|httrack|hubspot marketing grader|hydra|ibisbrowser|infrawatch|insight|inspect|iplabel|ips-agent|java(?!;)|library|linkcheck|mail\\.ru/|manager|measure|neustar wpm|node|nutch|offbyone|onetrust|optimize|pageburst|pagespeed|parser|perl|phantomjs|pingdom|powermarks|preview|proxy|ptst[ /]\\d|retriever|rexx;|rigor|rss\\b|scrape|server|sogou|sparkler/|speedcurve|spider|splash|statuscake|supercleaner|synapse|synthetic|tools|torrent|transcoder|url|validator|virtuoso|wappalyzer|webglance|webkit2png|whatcms/";
+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|^email|^facebook|^getright/|^gozilla/|^hobbit|^hotzonu|^hwcdn/|^igetter/|^jeode/|^jetty/|^jigsaw|^microsoft bits|^movabletype|^mozilla/\\d\\.\\d\\s[\\w\\.-]+$|^mozilla/\\d\\.\\d\\s\\(compatible;?(?:\\s\\w+\\/\\d+\\.\\d+)?\\)$|^navermailapp|^netsurf|^offline|^openai/|^owler|^php|^postman|^python|^rank|^read|^reed|^rest|^rss|^snapchat|^space bison|^svn|^swcd |^taringa|^thumbor/|^track|^w3c|^webbandit/|^webcopier|^wget|^whatsapp|^wordpress|^xenu link sleuth|^yahoo|^yandex|^zdm/\\d|^zoom marketplace/|^{{.*}}$|adscanner/|analyzer|archive|ask jeeves/teoma|audit|bit\\.ly/|bluecoat drtr|browsex|burpcollaborator|capture|catch|check\\b|checker|chrome-lighthouse|chromeframe|classifier|cloudflare|convertify|cookiehubscan|crawl|cypress/|dareboost|datanyze|dejaclick|detect|dmbrowser|download|evc-batch/|exaleadcloudview|feed|firephp|functionize|gomezagent|headless|httrack|hubspot marketing grader|hydra|ibisbrowser|infrawatch|insight|inspect|iplabel|ips-agent|java(?!;)|jsjcw_scanner|library|linkcheck|mail\\.ru/|manager|measure|neustar wpm|node|nutch|offbyone|onetrust|optimize|pageburst|pagespeed|parser|perl|phantomjs|pingdom|powermarks|preview|proxy|ptst[ /]\\d|retriever|rexx;|rigor|rss\\b|scanner\\.|scrape|server|sogou|sparkler/|speedcurve|spider|splash|statuscake|supercleaner|synapse|synthetic|tools|torrent|transcoder|url|validator|virtuoso|wappalyzer|webglance|webkit2png|whatcms/|zgrab";
 var naivePattern = /bot|crawl|http|lighthouse|scan|search|spider/i;
 var pattern;
 function getPattern() {
@@ -841,11 +841,7 @@ var Hono = class {
         optionHandler = options;
       } else {
         optionHandler = options.optionHandler;
-        if (options.replaceRequest === false) {
-          replaceRequest = (request) => request;
-        } else {
-          replaceRequest = options.replaceRequest;
-        }
+        replaceRequest = options.replaceRequest;
       }
     }
     const getOptions = optionHandler ? (c) => {
@@ -855,8 +851,7 @@ var Hono = class {
       let executionContext = undefined;
       try {
         executionContext = c.executionCtx;
-      } catch {
-      }
+      } catch {}
       return [c.env, executionContext];
     };
     replaceRequest ||= (() => {
@@ -1750,8 +1745,7 @@ var serveStatic2 = (options) => {
       try {
         const stats = await stat(path);
         isDir2 = stats.isDirectory();
-      } catch {
-      }
+      } catch {}
       return isDir2;
     };
     return serveStatic({
@@ -1952,6 +1946,9 @@ function getRunnableRoute(route) {
 function isRunnableRoute(route) {
   return typeof route === "object" && "run" in route;
 }
+function createLayout(layout) {
+  return layout;
+}
 async function showErrorReponse(context, err) {
   const output = render(html`
     <main>
@@ -1969,7 +1966,6 @@ async function showErrorReponse(context, err) {
 var ROUTE_SEGMENT = /(\[[a-zA-Z_\.]+\])/g;
 async function buildRoutes(config) {
   const routesDir = join(config.appDir, "routes");
-  console.log(routesDir);
   const files = await readdir(routesDir, { recursive: true });
   const routes = [];
   for (const file of files) {
@@ -2096,6 +2092,7 @@ export {
   createRouteFromModule,
   createRoute,
   createReadableStreamFromAsyncGenerator,
+  createLayout,
   createAPIRoute,
   buildRoutes,
   StreamResponse,

package/package.json

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

package/src/assets.ts

@@ -101,7 +101,7 @@ function md5(content: string): string {
  */
 async function copyPreactToPublicFolder() {
   const sourceFile = resolve(PWD, '../', './src/clientjs/preact.ts');
-  const preactClient = Bun.build({
+  await Bun.build({
     entrypoints: [sourceFile],
     outdir: './public/_hs/js',
     minify: true,

package/src/server.ts

@@ -15,6 +15,8 @@ const CWD = process.cwd();
  */
 export type THSResponseTypes = HSHtml | Response | string | null;
 export type THSRouteHandler = (context: Context) => THSResponseTypes | Promise<THSResponseTypes>;
+export type THSAPIResponseTypes = Response | Record<any, any> | void;
+export type THSAPIRouteHandler = (context: Context) => THSResponseTypes | Promise<THSResponseTypes>;
 
 export type THSRoute = {
   _kind: 'hsRoute';
@@ -100,8 +102,8 @@ export function createRoute(handler?: THSRouteHandler): THSRoute {
  * Create new API Route
  * API Route handlers should return a JSON object or a Response
  */
-export function createAPIRoute(handler?: THSRouteHandler): THSRoute {
-  let _handlers: Record<string, THSRouteHandler> = {};
+export function createAPIRoute(handler?: THSAPIRouteHandler): THSRoute {
+  let _handlers: Record<string, THSAPIRouteHandler> = {};
 
   if (handler) {
     _handlers['GET'] = handler;
@@ -109,23 +111,23 @@ export function createAPIRoute(handler?: THSRouteHandler): THSRoute {
 
   const api: THSRoute = {
     _kind: 'hsRoute',
-    get(handler: THSRouteHandler) {
+    get(handler: THSAPIRouteHandler) {
       _handlers['GET'] = handler;
       return api;
     },
-    post(handler: THSRouteHandler) {
+    post(handler: THSAPIRouteHandler) {
       _handlers['POST'] = handler;
       return api;
     },
-    put(handler: THSRouteHandler) {
+    put(handler: THSAPIRouteHandler) {
       _handlers['PUT'] = handler;
       return api;
     },
-    delete(handler: THSRouteHandler) {
+    delete(handler: THSAPIRouteHandler) {
       _handlers['DELETE'] = handler;
       return api;
     },
-    patch(handler: THSRouteHandler) {
+    patch(handler: THSAPIRouteHandler) {
       _handlers['PATCH'] = handler;
       return api;
     },
@@ -202,6 +204,14 @@ export function isRunnableRoute(route: unknown): boolean {
   return typeof route === 'object' && 'run' in route;
 }
 
+/**
+ * Create a layout for a Hyperspan app. Passthrough for now.
+ * Future intent is to be able to conditionally render a layout for full page content vs. partial content.
+ */
+export function createLayout<T>(layout: (props: T) => HSHtml | Promise<HSHtml>) {
+  return layout;
+}
+
 /**
  * Basic error handling
  * @TODO: Should check for and load user-customizeable template with special name (app/__error.ts ?)
@@ -242,7 +252,6 @@ const ROUTE_SEGMENT = /(\[[a-zA-Z_\.]+\])/g;
 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 routes: THSRouteMap[] = [];