npm - htmx-router - Versions diffs - 1.0.2 → 1.0.4 - Mend

htmx-router 1.0.2 → 1.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/defer.d.ts +1 -1
package/defer.js +2 -7
package/endpoint.d.ts +1 -1
package/endpoint.js +1 -6
package/internal/component/defer.js +1 -1
package/internal/component/head.js +1 -1
package/internal/router.js +1 -0
package/package.json +1 -1
package/router.js +8 -6
package/status.d.ts +4 -2
package/status.js +2 -0

package/defer.d.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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/internal/component/defer.js CHANGED Viewed

@@ -5,7 +5,7 @@ import { Deferral } from "htmx-router/defer";
 export function Defer<T extends ParameterShaper>(props: {
 	params?: Parameterized<T>,
 	loader:  RenderFunction<T>,
-	children?: JSX.Element
+	children?: JSX.Element[] | JSX.Element
 }): JSX.Element {
 	return <div
 		hx-get={Deferral(props.loader, props.params)}

package/internal/component/head.js CHANGED Viewed

@@ -1,6 +1,6 @@
 const generic = `import { RenderMetaDescriptor, ShellOptions } from "htmx-router/shell";
-export function Head<T>(props: { options: ShellOptions<T>, children: JSX.Element }) {
+export function Head<T>(props: { options: ShellOptions<T>, children: JSX.Element[] | JSX.Element }) {
 	return <head>
 		{ RenderMetaDescriptor(props.options) as "safe" }
 		{ props.children as "safe" }

package/internal/router.js CHANGED Viewed

@@ -17,6 +17,7 @@ export class GenericContext {
         this.url = url;
         this.render = renderer;
         this.headers.set("x-powered-by", "htmx-router");
+        this.headers.set("content-type", "text/html");
     }
     shape(shape) {
         return new RouteContext(this, this.params, shape);

package/package.json CHANGED Viewed

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

package/router.js CHANGED Viewed

@@ -132,6 +132,8 @@ export class RouteTree {
         const res = await this.index.resolve(ctx);
         if (res instanceof Response)
             return res;
+        if (res === null)
+            return null;
         return new Response(res, { headers: ctx.headers });
     }
     async resolveNext(fragments, ctx) {
@@ -154,17 +156,17 @@ export class RouteTree {
         if (!this.slug)
             return null;
         ctx.params["$"] = fragments.join("/");
-        const res = this.slug.resolve
-            ? await this.slug.resolve(ctx)
-            : null;
+        const res = await this.slug.resolve(ctx);
         if (res instanceof Response)
             return res;
+        if (res === null)
+            return null;
         return new Response(res, { headers: ctx.headers });
     }
     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;
@@ -183,7 +185,7 @@ class RouteLeaf {
         this.module = module;
     }
     async resolve(ctx) {
-        const res = await this.renderWrapper(ctx);
+        const res = await this.response(ctx);
         if (res === null)
             return null;
         if (res instanceof Response)
@@ -198,7 +200,7 @@ class RouteLeaf {
             return res;
         return await ctx.render(res, ctx.headers);
     }
-    async renderWrapper(ctx) {
+    async response(ctx) {
         try {
             if (!this.module.loader && !this.module.action)
                 return null;

package/status.d.ts CHANGED Viewed

@@ -20,11 +20,13 @@ declare const definitions: {
     304: "Not Modified";
     305: "Use Proxy";
     306: "Switch Proxy";
+    307: "Temporary Redirect";
     308: "Permanent Redirect";
     400: "Bad Request";
     401: "Unauthorized";
     402: "Payment Required";
     403: "Forbidden";
+    404: "Not Found";
     405: "Method Not Allowed";
     406: "Not Acceptable";
     407: "Proxy Authentication Required";
@@ -62,8 +64,8 @@ declare const definitions: {
     511: "Network Authentication Required";
 };
 export type StatusText = typeof definitions[keyof typeof definitions];
-export declare function MakeStatus(lookup: number | StatusText | string): {
+export declare function MakeStatus(lookup: number | StatusText): {
     status: number;
-    statusText: string;
+    statusText: StatusText;
 };
 export {};

package/status.js CHANGED Viewed

@@ -20,11 +20,13 @@ const definitions = {
     304: "Not Modified",
     305: "Use Proxy",
     306: "Switch Proxy",
+    307: "Temporary Redirect",
     308: "Permanent Redirect",
     400: "Bad Request",
     401: "Unauthorized",
     402: "Payment Required",
     403: "Forbidden",
+    404: "Not Found",
     405: "Method Not Allowed",
     406: "Not Acceptable",
     407: "Proxy Authentication Required",