htmx-router 1.0.2 → 1.0.3

package/defer.d.ts

@@ -10,5 +10,5 @@ export declare const path = "_/defer/$";
 export declare const parameters: {
     $: StringConstructor;
 };
-export declare function loader(ctx: RouteContext<typeof parameters>): Promise<(Response | BodyInit) | null>;
+export declare function loader(ctx: RouteContext<typeof parameters>): Promise<JSX.Element | null>;
 export declare const action: typeof loader;

package/defer.js

@@ -68,13 +68,8 @@ export async function loader(ctx) {
         console.warn(`Warn: Function ${endpoint.name} was not registered for defer use`);
         return null;
     }
-    const forward = new RouteContext(ctx, prelude, entry.shape);
-    const res = await endpoint(forward);
-    if (res instanceof Response)
-        return res;
-    if (res === null)
-        return null;
     ctx.headers.set("X-Partial", "true");
-    return ctx.render(res, ctx.headers);
+    const forward = new RouteContext(ctx, prelude, entry.shape);
+    return await endpoint(forward);
 }
 export const action = loader;

package/endpoint.d.ts

@@ -16,5 +16,5 @@ export declare const path = "_/endpoint/$";
 export declare const parameters: {
     $: StringConstructor;
 };
-export declare function loader(ctx: RouteContext<typeof parameters>): Promise<(Response | BodyInit) | null>;
+export declare function loader(ctx: RouteContext<typeof parameters>): Promise<JSX.Element | null>;
 export declare const action: typeof loader;

package/endpoint.js

@@ -30,11 +30,6 @@ export async function loader(ctx) {
     const endpoint = registry.get(ctx.params["$"]);
     if (!endpoint)
         return null;
-    const res = await endpoint.render(ctx);
-    if (res === null)
-        return null;
-    if (res instanceof Response)
-        return res;
-    return ctx.render(res, ctx.headers);
+    return await endpoint.render(ctx);
 }
 export const action = loader;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "htmx-router",
-	"version": "1.0.2",
+	"version": "1.0.3",
 	"description": "A lightweight SSR framework with server+client islands",
 	"keywords": [
 		"htmx",

package/router.js

@@ -164,7 +164,7 @@ export class RouteTree {
     async unwrap(ctx, res) {
         if (!this.slug)
             throw res;
-        let caught = await this.slug.error(ctx, res);
+        const caught = await this.slug.error(ctx, res);
         if (caught instanceof Response) {
             caught.headers.set("X-Caught", "true");
             return caught;