htmx-router 1.0.7 → 1.0.10

package/cookies.js

@@ -52,7 +52,7 @@ export class Cookies {
         }
     }
     string(name) {
-        return encodeURIComponent(name) + "=" + encodeURIComponent(this.map[name]) + ";" + StringifyOptions(this.config[name]);
+        return encodeURIComponent(name) + "=" + encodeURIComponent(this.map[name]) + StringifyOptions(this.config[name]);
         ;
     }
     unset(name) {
@@ -82,7 +82,7 @@ function StringifyOptions(options) {
             continue;
         let value = String(raw);
         value = value[0].toUpperCase() + value.slice(1);
-        config += `${prop}=${value};`;
+        config += `; ${prop}=${value}`;
     }
     return config;
 }

package/css.d.ts

@@ -14,7 +14,7 @@ export declare function GetSheetUrl(): string;
 /**
  * RouteTree mounting point
  */
-export declare const path = "_/style/$hash";
+export declare const path = "/_/style/$hash";
 export declare const parameters: {
     hash: StringConstructor;
 };

package/css.js

@@ -45,7 +45,7 @@ export function GetSheetUrl() {
 /**
  * RouteTree mounting point
  */
-export const path = "_/style/$hash";
+export const path = "/_/style/$hash";
 export const parameters = {
     hash: String
 };

package/defer.d.ts

@@ -6,7 +6,7 @@ export declare function Deferral<T extends ParameterShaper>(func: RenderFunction
 /**
  * RouteTree mounting point
  */
-export declare const path = "_/defer/$";
+export declare const path = "/_/defer/$";
 export declare const parameters: {
     $: StringConstructor;
 };

package/defer.js

@@ -52,7 +52,7 @@ export function Deferral(func, params) {
 /**
  * RouteTree mounting point
  */
-export const path = "_/defer/$";
+export const path = "/_/defer/$";
 export const parameters = {
     "$": String
 };
@@ -69,7 +69,7 @@ export async function loader(ctx) {
         return null;
     }
     ctx.headers.set("X-Partial", "true");
-    const forward = new RouteContext(ctx, prelude, entry.shape);
+    const forward = new RouteContext(ctx, prelude, entry.shape, "");
     return await endpoint(forward);
 }
 export const action = loader;

package/endpoint.d.ts

@@ -12,7 +12,7 @@ export declare class Endpoint {
 /**
  * RouteTree mounting point
  */
-export declare const path = "_/endpoint/$";
+export declare const path = "/_/endpoint/$";
 export declare const parameters: {
     $: StringConstructor;
 };

package/endpoint.js

@@ -22,7 +22,7 @@ export class Endpoint {
 /**
  * RouteTree mounting point
  */
-export const path = "_/endpoint/$";
+export const path = "/_/endpoint/$";
 export const parameters = {
     "$": String
 };

package/internal/mount.d.ts

@@ -3,7 +3,7 @@ export declare function GetMountUrl(): string;
 /**
  * RouteTree mounting point
  */
-export declare const path = "_/mount/$hash";
+export declare const path = "/_/mount/$hash";
 export declare const parameters: {
     hash: StringConstructor;
 };

package/internal/mount.js

@@ -110,7 +110,7 @@ export function GetMountUrl() {
 /**
  * RouteTree mounting point
  */
-export const path = "_/mount/$hash";
+export const path = "/_/mount/$hash";
 export const parameters = {
     hash: String
 };

package/internal/router.d.ts

@@ -12,6 +12,6 @@ export declare class GenericContext {
     url: URL;
     render: (res: JSX.Element, headers: Headers) => Promise<Rendered> | Rendered;
     constructor(request: GenericContext["request"], url: GenericContext["url"], renderer: GenericContext["render"]);
-    shape<T extends ParameterShaper>(shape: T): RouteContext<T>;
+    shape<T extends ParameterShaper>(shape: T, path: string): RouteContext<T>;
 }
 export {};

package/internal/router.js

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

package/package.json

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

package/router.d.ts

@@ -7,13 +7,14 @@ export declare function GenerateRouteTree(props: {
     scope: string;
 }): RouteTree;
 export declare class RouteContext<T extends ParameterShaper = {}> {
+    readonly path: string;
     readonly request: Request;
     readonly headers: Headers;
     readonly cookie: Cookies;
     readonly params: Parameterized<T>;
     readonly url: URL;
     render: GenericContext["render"];
-    constructor(base: GenericContext | RouteContext, params: ParameterPrelude<T>, shape: T);
+    constructor(base: GenericContext | RouteContext, params: ParameterPrelude<T>, shape: T, path: string);
 }
 export declare class RouteTree {
     private nested;
@@ -22,7 +23,7 @@ export declare class RouteTree {
     private wild;
     private wildCard;
     constructor();
-    ingest(path: string | string[], module: RouteModule<any>): void;
+    ingest(node: RouteLeaf, path?: string[]): void;
     resolve(fragments: string[], ctx: GenericContext): Promise<Response | null>;
     private _resolve;
     private resolveIndex;
@@ -31,3 +32,12 @@ export declare class RouteTree {
     private resolveSlug;
     private unwrap;
 }
+declare class RouteLeaf {
+    private module;
+    readonly path: string;
+    constructor(module: RouteModule<any>, path: string);
+    resolve(ctx: GenericContext): Promise<Response | null>;
+    error(ctx: GenericContext, e: unknown): Promise<Response>;
+    private response;
+}
+export {};

package/router.js

@@ -13,27 +13,32 @@ export function GenerateRouteTree(props) {
     const tree = new RouteTree();
     for (const path in props.modules) {
         const mod = props.modules[path];
-        const tail = path.lastIndexOf(".");
-        const url = path.slice(props.scope.length, tail);
-        tree.ingest(url, mod);
+        let tail = path.lastIndexOf(".");
+        if (path.endsWith("/_index", tail))
+            tail -= "/_index".length;
+        const url = path.slice(props.scope.length - 1, tail);
+        const leaf = new RouteLeaf(mod, url);
+        tree.ingest(leaf);
         if (mod.route)
             mod.route(url);
     }
     // ingest router builtins
-    tree.ingest(endpoint.path, endpoint);
-    tree.ingest(dynamic.path, dynamic);
-    tree.ingest(mount.path, mount);
-    tree.ingest(css.path, css);
+    tree.ingest(new RouteLeaf(endpoint, endpoint.path));
+    tree.ingest(new RouteLeaf(dynamic, dynamic.path));
+    tree.ingest(new RouteLeaf(mount, mount.path));
+    tree.ingest(new RouteLeaf(css, css.path));
     return tree;
 }
 export class RouteContext {
+    path;
     request;
     headers; // response headers
     cookie;
     params;
     url;
     render;
-    constructor(base, params, shape) {
+    constructor(base, params, shape, path) {
+        this.path = path;
         this.cookie = base.cookie;
         this.headers = base.headers;
         this.request = base.request;
@@ -67,15 +72,15 @@ export class RouteTree {
         this.wild = null;
         this.slug = null;
     }
-    ingest(path, module) {
-        if (!Array.isArray(path))
-            path = path.split("/");
-        if (path.length === 0 || (path.length == 1 && path[0] === "_index")) {
-            this.index = new RouteLeaf(module);
+    ingest(node, path) {
+        if (!path)
+            path = node.path.length === 0 ? [] : node.path.slice(1).split("/");
+        if (path.length === 0) {
+            this.index = node;
             return;
         }
         if (path[0] === "$") {
-            this.slug = new RouteLeaf(module);
+            this.slug = node;
             return;
         }
         if (path[0][0] === "$") {
@@ -88,8 +93,7 @@ export class RouteTree {
             else if (wildCard !== this.wildCard) {
                 throw new Error(`Redefinition of wild card ${this.wildCard} to ${wildCard}`);
             }
-            path.splice(0, 1);
-            this.wild.ingest(path, module);
+            this.wild.ingest(node, path.slice(1));
             return;
         }
         let next = this.nested.get(path[0]);
@@ -97,8 +101,7 @@ export class RouteTree {
             next = new RouteTree();
             this.nested.set(path[0], next);
         }
-        path.splice(0, 1);
-        next.ingest(path, module);
+        next.ingest(node, path.slice(1));
     }
     async resolve(fragments, ctx) {
         if (!this.slug)
@@ -173,8 +176,10 @@ export class RouteTree {
 }
 class RouteLeaf {
     module;
-    constructor(module) {
+    path;
+    constructor(module, path) {
         this.module = module;
+        this.path = path;
     }
     async resolve(ctx) {
         const jsx = await this.response(ctx);
@@ -190,7 +195,7 @@ class RouteLeaf {
     async error(ctx, e) {
         if (!this.module.error)
             throw e;
-        let jsx = await this.module.error(ctx, e);
+        let jsx = await this.module.error(ctx.shape({}, this.path), e);
         const caught = jsx instanceof Response ? jsx
             : await ctx.render(jsx, ctx.headers);
         if (caught instanceof Response) {
@@ -204,7 +209,7 @@ class RouteLeaf {
         try {
             if (!this.module.loader && !this.module.action)
                 return null;
-            const context = ctx.shape(this.module.parameters || {});
+            const context = ctx.shape(this.module.parameters || {}, this.path);
             if (ctx.request.method === "HEAD" || ctx.request.method === "GET") {
                 if (this.module.loader)
                     return await this.module.loader(context);