htmx-router 2.1.5 → 2.1.6

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import type { ParameterShaper } from "./util/parameters.js";
+import type { GenericContext } from "./internal/router.js";
 import type { RouteContext } from "./router.js";
 export type RenderFunction<T extends ParameterShaper = {}> = (ctx: RouteContext<T>) => Promise<Response | JSX.Element | null>;
 export type CatchFunction<T extends ParameterShaper = {}> = (ctx: RouteContext<T>, err: unknown) => Promise<Response | JSX.Element>;
@@ -15,4 +16,4 @@ export type ClientIslandManifest<T> = {
 type ClientIsland<T> = T extends (props: infer P) => JSX.Element ? (props: P & {
     children?: JSX.Element;
 }) => JSX.Element : T;
-export { RouteContext };
+export { RouteContext, GenericContext };

package/dist/response.js

@@ -108,17 +108,29 @@ export function AssertETagStale(request, headers, etag, options) {
             headers.append("Cache-Control", `max-age=${options.revalidate}`);
     }
     headers.append("Cache-Control", "must-revalidate");
-    headers.set("ETag", `"${encodeURIComponent(etag.trim())}"`);
-    const client = request.headers.get("if-none-match");
-    if (client !== etag)
+    etag = encodeURIComponent(etag.trim()); // safely handle any special characters
+    headers.set("ETag", `"${etag}"`);
+    const rules = request.headers.get("if-none-match");
+    if (!rules || !MatchEtags(rules.trim(), etag))
         return;
-    const res = new Response(null, {
-        status: 304, statusText: "Not Modified",
-        headers
-    });
+    const res = new Response(null, { headers, status: 304, statusText: "Not Modified" });
     res.headers.set("X-Caught", "true");
     throw res;
 }
+function MatchEtags(header, etag) {
+    if (header === "*")
+        return true;
+    for (const term of header.split(/,\s*/)) {
+        let s = term.startsWith('W/') ? 'W/'.length : 0;
+        let e = term.endsWith('"') ? term.length - 1 : term.length;
+        if (term.startsWith('"', s))
+            s++;
+        const tag = term.slice(s, e);
+        if (etag === tag)
+            return true;
+    }
+    return false;
+}
 /**
  * This is to fix issues with deno
  * When you try and change the statusText on a Response object

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "htmx-router",
-	"version": "2.1.5",
+	"version": "2.1.6",
 	"description": "A lightweight SSR framework with server+client islands",
 	"keywords": [ "htmx", "router", "client islands", "ssr", "vite" ],
 	"type": "module",