@hyperspan/framework 0.5.2 → 0.5.4

package/dist/server.js

@@ -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);

package/package.json

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

package/src/actions.ts

@@ -30,22 +30,25 @@ export interface HSAction<T extends z.ZodTypeAny> {
   form(
     renderForm: (
       c: THSContext,
-      { data, error }: { data?: z.infer<T>; error?: z.ZodError | Error }
+      { data, error }: { data?: Partial<z.infer<T>>; error?: z.ZodError | Error }
     ) => HSHtml | void | null | Promise<HSHtml | void | null>
   ): HSAction<T>;
   post(
     handler: (
       c: THSContext,
-      { data }: { data?: z.infer<T> }
+      { data }: { data?: Partial<z.infer<T>> }
     ) => TActionResponse | Promise<TActionResponse>
   ): HSAction<T>;
   error(
     handler: (
       c: THSContext,
-      { data, error }: { data?: z.infer<T>; error?: z.ZodError | Error }
+      { data, error }: { data?: Partial<z.infer<T>>; error?: z.ZodError | Error }
     ) => TActionResponse
   ): HSAction<T>;
-  render(c: THSContext, props?: { data?: z.infer<T>; error?: z.ZodError | Error }): TActionResponse;
+  render(
+    c: THSContext,
+    props?: { data?: Partial<z.infer<T>>; error?: z.ZodError | Error }
+  ): TActionResponse;
   run(c: THSContext): TActionResponse | Promise<TActionResponse>;
   middleware: (
     middleware: Array<
@@ -108,7 +111,7 @@ export function unstable__createAction<T extends z.ZodTypeAny>(
     /**
      * Get form renderer method
      */
-    render(c: THSContext, formState?: { data?: z.infer<T>; error?: z.ZodError | Error }) {
+    render(c: THSContext, formState?: { data?: Partial<z.infer<T>>; error?: z.ZodError | Error }) {
       const form = _form ? _form(c, formState || {}) : null;
       return form ? html`<hs-action url="${this._route}">${form}</hs-action>` : null;
     },
@@ -149,9 +152,9 @@ export function unstable__createAction<T extends z.ZodTypeAny>(
       }
 
       const formData = await c.req.formData();
-      const jsonData = unstable__formDataToJSON(formData);
+      const jsonData = unstable__formDataToJSON(formData) as Partial<z.infer<T>>;
       const schemaData = schema ? schema.safeParse(jsonData) : null;
-      const data = schemaData?.success ? (schemaData.data as z.infer<T>) : jsonData;
+      const data = schemaData?.success ? (schemaData.data as Partial<z.infer<T>>) : jsonData;
       let error: z.ZodError | Error | null = null;
 
       try {

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',

package/src/plugins.ts

@@ -1,4 +1,4 @@
-import { assetHash, CLIENTJS_PUBLIC_PATH, clientImportMap, clientJSFiles } from './assets';
+import { assetHash, CLIENTJS_PUBLIC_PATH, clientImportMap } from './assets';
 import { IS_PROD, type THSServerConfig } from './server';
 
 const CLIENT_JS_CACHE = new Map<string, string>();