@hyperspan/framework 0.5.3 → 0.5.5

package/dist/middleware.js

@@ -3,7 +3,7 @@ import {
   __toESM
 } from "./chunk-atw8cdg1.js";
 
-// ../../node_modules/timestring/index.js
+// node_modules/timestring/index.js
 var require_timestring = __commonJS((exports, module) => {
   module.exports = parseTimestring;
   var DEFAULT_OPTS = {
@@ -73,7 +73,7 @@ var require_timestring = __commonJS((exports, module) => {
   }
 });
 
-// ../../node_modules/hono/dist/middleware/etag/digest.js
+// node_modules/hono/dist/middleware/etag/digest.js
 var mergeBuffers = (buffer1, buffer2) => {
   if (!buffer1) {
     return buffer2;
@@ -102,7 +102,7 @@ var generateDigest = async (stream, generator) => {
   return Array.prototype.map.call(new Uint8Array(result), (x) => x.toString(16).padStart(2, "0")).join("");
 };
 
-// ../../node_modules/hono/dist/middleware/etag/index.js
+// node_modules/hono/dist/middleware/etag/index.js
 var RETAINED_304_HEADERS = [
   "cache-control",
   "content-location",

package/dist/server.js

@@ -76,7 +76,7 @@ import { html, isHSHtml, renderStream, renderAsync, render } from "@hyperspan/ht
 import { readdir } from "node:fs/promises";
 import { basename, extname, join as join2 } from "node:path";
 
-// ../../node_modules/isbot/index.mjs
+// node_modules/isbot/index.mjs
 var fullPattern = " daum[ /]| deusu/|(?:^|[^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/|^azure|^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/|agent|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|fetcher|firephp|functionize|grab|headless|httrack|hubspot marketing grader|hydra|ibisbrowser|infrawatch|insight|inspect|iplabel|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/|xtate/";
 var naivePattern = /bot|crawl|http|lighthouse|scan|search|spider/i;
 var pattern;
@@ -95,7 +95,7 @@ function isbot(userAgent) {
   return Boolean(userAgent) && getPattern().test(userAgent);
 }
 
-// ../../node_modules/hono/dist/compose.js
+// node_modules/hono/dist/compose.js
 var compose = (middleware, onError, onNotFound) => {
   return (context, next) => {
     let index = -1;
@@ -139,10 +139,10 @@ var compose = (middleware, onError, onNotFound) => {
   };
 };
 
-// ../../node_modules/hono/dist/request/constants.js
+// node_modules/hono/dist/request/constants.js
 var GET_MATCH_RESULT = Symbol();
 
-// ../../node_modules/hono/dist/utils/body.js
+// node_modules/hono/dist/utils/body.js
 var parseBody = async (request, options = /* @__PURE__ */ Object.create(null)) => {
   const { all = false, dot = false } = options;
   const headers = request instanceof HonoRequest ? request.raw.headers : request.headers;
@@ -210,7 +210,7 @@ var handleParsingNestedValues = (form, key, value) => {
   });
 };
 
-// ../../node_modules/hono/dist/utils/url.js
+// node_modules/hono/dist/utils/url.js
 var splitPath = (path) => {
   const paths = path.split("/");
   if (paths[0] === "") {
@@ -279,7 +279,7 @@ var tryDecode = (str, decoder) => {
 var tryDecodeURI = (str) => tryDecode(str, decodeURI);
 var getPath = (request) => {
   const url = request.url;
-  const start = url.indexOf("/", url.charCodeAt(9) === 58 ? 13 : 8);
+  const start = url.indexOf("/", url.indexOf(":") + 4);
   let i = start;
   for (;i < url.length; i++) {
     const charCode = url.charCodeAt(i);
@@ -405,7 +405,7 @@ var getQueryParams = (url, key) => {
 };
 var decodeURIComponent_ = decodeURIComponent;
 
-// ../../node_modules/hono/dist/request.js
+// node_modules/hono/dist/request.js
 var tryDecodeURIComponent = (str) => tryDecode(str, decodeURIComponent_);
 var HonoRequest = class {
   raw;
@@ -516,7 +516,7 @@ var HonoRequest = class {
   }
 };
 
-// ../../node_modules/hono/dist/utils/html.js
+// node_modules/hono/dist/utils/html.js
 var HtmlEscapedCallbackPhase = {
   Stringify: 1,
   BeforeStream: 2,
@@ -554,7 +554,7 @@ var resolveCallback = async (str, phase, preserveCallbacks, context, buffer) =>
   }
 };
 
-// ../../node_modules/hono/dist/context.js
+// node_modules/hono/dist/context.js
 var TEXT_PLAIN = "text/plain; charset=UTF-8";
 var setDefaultContentType = (contentType, headers) => {
   return {
@@ -720,7 +720,7 @@ var Context = class {
   };
 };
 
-// ../../node_modules/hono/dist/router.js
+// node_modules/hono/dist/router.js
 var METHOD_NAME_ALL = "ALL";
 var METHOD_NAME_ALL_LOWERCASE = "all";
 var METHODS = ["get", "post", "put", "delete", "options", "patch"];
@@ -728,10 +728,10 @@ var MESSAGE_MATCHER_IS_ALREADY_BUILT = "Can not add a route since the matcher is
 var UnsupportedPathError = class extends Error {
 };
 
-// ../../node_modules/hono/dist/utils/constants.js
+// node_modules/hono/dist/utils/constants.js
 var COMPOSED_HANDLER = "__COMPOSED_HANDLER";
 
-// ../../node_modules/hono/dist/hono-base.js
+// node_modules/hono/dist/hono-base.js
 var notFoundHandler = (c) => {
   return c.text("404 Not Found", 404);
 };
@@ -950,7 +950,7 @@ var Hono = class {
   };
 };
 
-// ../../node_modules/hono/dist/router/reg-exp-router/node.js
+// node_modules/hono/dist/router/reg-exp-router/node.js
 var LABEL_REG_EXP_STR = "[^/]+";
 var ONLY_WILDCARD_REG_EXP_STR = ".*";
 var TAIL_WILDCARD_REG_EXP_STR = "(?:|/.*)";
@@ -1054,7 +1054,7 @@ var Node = class {
   }
 };
 
-// ../../node_modules/hono/dist/router/reg-exp-router/trie.js
+// node_modules/hono/dist/router/reg-exp-router/trie.js
 var Trie = class {
   #context = { varIndex: 0 };
   #root = new Node;
@@ -1110,7 +1110,7 @@ var Trie = class {
   }
 };
 
-// ../../node_modules/hono/dist/router/reg-exp-router/router.js
+// node_modules/hono/dist/router/reg-exp-router/router.js
 var emptyParam = [];
 var nullMatcher = [/^$/, [], /* @__PURE__ */ Object.create(null)];
 var wildcardRegExpCache = /* @__PURE__ */ Object.create(null);
@@ -1292,7 +1292,7 @@ var RegExpRouter = class {
   }
 };
 
-// ../../node_modules/hono/dist/router/smart-router/router.js
+// node_modules/hono/dist/router/smart-router/router.js
 var SmartRouter = class {
   name = "SmartRouter";
   #routers = [];
@@ -1347,7 +1347,7 @@ var SmartRouter = class {
   }
 };
 
-// ../../node_modules/hono/dist/router/trie-router/node.js
+// node_modules/hono/dist/router/trie-router/node.js
 var emptyParams = /* @__PURE__ */ Object.create(null);
 var Node2 = class {
   #methods;
@@ -1501,7 +1501,7 @@ var Node2 = class {
   }
 };
 
-// ../../node_modules/hono/dist/router/trie-router/router.js
+// node_modules/hono/dist/router/trie-router/router.js
 var TrieRouter = class {
   name = "TrieRouter";
   #node;
@@ -1523,7 +1523,7 @@ var TrieRouter = class {
   }
 };
 
-// ../../node_modules/hono/dist/hono.js
+// node_modules/hono/dist/hono.js
 var Hono2 = class extends Hono {
   constructor(options = {}) {
     super(options);
@@ -1533,14 +1533,14 @@ var Hono2 = class extends Hono {
   }
 };
 
-// ../../node_modules/hono/dist/adapter/bun/serve-static.js
+// node_modules/hono/dist/adapter/bun/serve-static.js
 import { stat } from "node:fs/promises";
 import { join } from "node:path";
 
-// ../../node_modules/hono/dist/utils/compress.js
+// node_modules/hono/dist/utils/compress.js
 var COMPRESSIBLE_CONTENT_TYPE_REGEX = /^\s*(?:text\/(?!event-stream(?:[;\s]|$))[^;\s]+|application\/(?:javascript|json|xml|xml-dtd|ecmascript|dart|postscript|rtf|tar|toml|vnd\.dart|vnd\.ms-fontobject|vnd\.ms-opentype|wasm|x-httpd-php|x-javascript|x-ns-proxy-autoconfig|x-sh|x-tar|x-virtualbox-hdd|x-virtualbox-ova|x-virtualbox-ovf|x-virtualbox-vbox|x-virtualbox-vdi|x-virtualbox-vhd|x-virtualbox-vmdk|x-www-form-urlencoded)|font\/(?:otf|ttf)|image\/(?:bmp|vnd\.adobe\.photoshop|vnd\.microsoft\.icon|vnd\.ms-dds|x-icon|x-ms-bmp)|message\/rfc822|model\/gltf-binary|x-shader\/x-fragment|x-shader\/x-vertex|[^;\s]+?\+(?:json|text|xml|yaml))(?:[;\s]|$)/i;
 
-// ../../node_modules/hono/dist/utils/mime.js
+// node_modules/hono/dist/utils/mime.js
 var getMimeType = (filename, mimes = baseMimes) => {
   const regexp = /\.([a-zA-Z0-9]+?)$/;
   const match = filename.match(regexp);
@@ -1613,7 +1613,7 @@ var _baseMimes = {
 };
 var baseMimes = _baseMimes;
 
-// ../../node_modules/hono/dist/middleware/serve-static/path.js
+// node_modules/hono/dist/middleware/serve-static/path.js
 var defaultJoin = (...paths) => {
   let result = paths.filter((p) => p !== "").join("/");
   result = result.replace(/(?<=\/)\/+/g, "");
@@ -1629,7 +1629,7 @@ var defaultJoin = (...paths) => {
   return resolved.join("/") || ".";
 };
 
-// ../../node_modules/hono/dist/middleware/serve-static/index.js
+// node_modules/hono/dist/middleware/serve-static/index.js
 var ENCODINGS = {
   br: ".br",
   zstd: ".zst",
@@ -1695,7 +1695,7 @@ var serveStatic = (options) => {
   };
 };
 
-// ../../node_modules/hono/dist/adapter/bun/serve-static.js
+// node_modules/hono/dist/adapter/bun/serve-static.js
 var serveStatic2 = (options) => {
   return async function serveStatic2(c, next) {
     const getContent = async (path) => {
@@ -1719,7 +1719,7 @@ var serveStatic2 = (options) => {
   };
 };
 
-// ../../node_modules/hono/dist/helper/ssg/middleware.js
+// node_modules/hono/dist/helper/ssg/middleware.js
 var X_HONO_DISABLE_SSG_HEADER_KEY = "x-hono-disable-ssg";
 var SSG_DISABLED_RESPONSE = (() => {
   try {
@@ -1731,10 +1731,10 @@ var SSG_DISABLED_RESPONSE = (() => {
     return null;
   }
 })();
-// ../../node_modules/hono/dist/adapter/bun/ssg.js
+// node_modules/hono/dist/adapter/bun/ssg.js
 var { write } = Bun;
 
-// ../../node_modules/hono/dist/helper/websocket/index.js
+// node_modules/hono/dist/helper/websocket/index.js
 var WSContext = class {
   #init;
   constructor(init) {
@@ -1782,10 +1782,10 @@ var defineWebSocketHelper = (handler) => {
   };
 };
 
-// ../../node_modules/hono/dist/adapter/bun/server.js
+// node_modules/hono/dist/adapter/bun/server.js
 var getBunServer = (c) => ("server" in c.env) ? c.env.server : c.env;
 
-// ../../node_modules/hono/dist/adapter/bun/websocket.js
+// node_modules/hono/dist/adapter/bun/websocket.js
 var upgradeWebSocket = defineWebSocketHelper((c, events) => {
   const server = getBunServer(c);
   if (!server) {
@@ -1804,7 +1804,7 @@ var upgradeWebSocket = defineWebSocketHelper((c, events) => {
   return;
 });
 
-// ../../node_modules/hono/dist/http-exception.js
+// node_modules/hono/dist/http-exception.js
 var HTTPException = class extends Error {
   res;
   status;
@@ -1827,7 +1827,7 @@ var HTTPException = class extends Error {
   }
 };
 
-// ../../node_modules/hono/dist/middleware/csrf/index.js
+// node_modules/hono/dist/middleware/csrf/index.js
 var secFetchSiteValues = ["same-origin", "same-site", "none", "cross-site"];
 var isSecFetchSite = (value) => secFetchSiteValues.includes(value);
 var isSafeMethodRe = /^(GET|HEAD)$/;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperspan/framework",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "Hyperspan Web Framework",
   "main": "dist/server.ts",
   "types": "src/server.ts",
@@ -65,7 +65,7 @@
     "typescript": "^5.8.3"
   },
   "dependencies": {
-    "@hyperspan/html": "0.1.7",
+    "@hyperspan/html": "0.2.0",
     "hono": "^4.9.4",
     "isbot": "^5.1.30",
     "timestring": "^7.0.0",

package/src/clientjs/hyperspan-client.ts

@@ -110,8 +110,13 @@ window.customElements.define('hs-action', HSAction);
 const actionFormObserver = new MutationObserver((list) => {
   list.forEach((mutation) => {
     mutation.addedNodes.forEach((node) => {
-      if (node instanceof HTMLFormElement) {
-        bindHSActionForm(node.closest('hs-action') as HSAction, node);
+      if (node && ('closest' in node || node instanceof HTMLFormElement)) {
+        bindHSActionForm(
+          (node as HTMLElement).closest('hs-action') as HSAction,
+          node instanceof HTMLFormElement
+            ? node
+            : ((node as HTMLElement | HTMLFormElement).querySelector('form') as HTMLFormElement)
+        );
       }
     });
   });
@@ -127,6 +132,7 @@ function bindHSActionForm(hsActionElement: HSAction, form: HTMLFormElement) {
 
   form.setAttribute('action', hsActionElement.getAttribute('url') || '');
   const submitHandler = (e: Event) => {
+    e.preventDefault();
     formSubmitToRoute(e, form as HTMLFormElement, {
       afterResponse: () => bindHSActionForm(hsActionElement, form),
     });
@@ -140,10 +146,8 @@ function bindHSActionForm(hsActionElement: HSAction, form: HTMLFormElement) {
  */
 type TFormSubmitOptons = { afterResponse: () => any };
 function formSubmitToRoute(e: Event, form: HTMLFormElement, opts: TFormSubmitOptons) {
-  e.preventDefault();
-
-  const formUrl = form.getAttribute('action') || '';
   const formData = new FormData(form);
+  const formUrl = form.getAttribute('action') || '';
   const method = form.getAttribute('method')?.toUpperCase() || 'POST';
   const headers = {
     Accept: 'text/html',