@richie-router/server 0.1.6 → 0.1.7

package/dist/cjs/index.test.cjs

@@ -67,6 +67,78 @@ function createTestArtifacts(options) {
     }
   };
 }
+function createCompetingHeadArtifacts() {
+  const rootRoute = import_core.createRouteNode("__root__", {}, { isRoot: true });
+  const usernameRoute = import_core.createRouteNode("/$username", {});
+  const usernameIndexRoute = import_core.createRouteNode("/$username/", {});
+  const usernameSlugRoute = import_core.createRouteNode("/$username/$slug", {});
+  const loginRoute = import_core.createRouteNode("/login", {});
+  const registerRoute = import_core.createRouteNode("/register", {});
+  const tagsTagRoute = import_core.createRouteNode("/tags/$tag", {});
+  usernameRoute._setServerHead(true);
+  usernameIndexRoute._setServerHead(true);
+  usernameSlugRoute._setServerHead(true);
+  loginRoute._setServerHead(true);
+  registerRoute._setServerHead(true);
+  tagsTagRoute._setServerHead(true);
+  usernameRoute._addFileChildren({
+    index: usernameIndexRoute,
+    slug: usernameSlugRoute
+  });
+  rootRoute._addFileChildren({
+    username: usernameRoute,
+    login: loginRoute,
+    register: registerRoute,
+    tags: tagsTagRoute
+  });
+  const routerSchema = import_core.defineRouterSchema({
+    "/$username/": {
+      serverHead: true
+    },
+    "/$username/$slug": {
+      serverHead: true
+    },
+    "/login": {
+      serverHead: true
+    },
+    "/register": {
+      serverHead: true
+    },
+    "/tags/$tag": {
+      serverHead: true
+    }
+  });
+  const headTags = import__.defineHeadTags(rootRoute, routerSchema, {
+    "/$username/": {
+      head: ({ params }) => [
+        { tag: "title", children: `User ${params.username}` }
+      ]
+    },
+    "/$username/$slug": {
+      head: ({ params }) => [
+        { tag: "title", children: `Post ${params.username}/${params.slug}` }
+      ]
+    },
+    "/login": {
+      head: () => [
+        { tag: "title", children: "Login" }
+      ]
+    },
+    "/register": {
+      head: () => [
+        { tag: "title", children: "Register" }
+      ]
+    },
+    "/tags/$tag": {
+      head: ({ params }) => [
+        { tag: "title", children: `Tag ${params.tag}` }
+      ]
+    }
+  });
+  return {
+    headTags
+  };
+}
 import_bun_test.describe("handleSpaRequest", () => {
   import_bun_test.test('treats "/" as the root basePath and trims trailing slashes', () => {
     const { spaRoutesManifest } = createTestArtifacts();
@@ -267,6 +339,39 @@ import_bun_test.describe("handleRequest basePath", () => {
     import_bun_test.expect(payload.richieRouterHead).toContain("window.__RICHIE_ROUTER_HEAD__");
     import_bun_test.expect(result.response.headers.get("cache-control")).toBe("private, no-store");
   });
+  import_bun_test.test("prefers static routes over dynamic siblings when resolving document head payloads", async () => {
+    const { headTags } = createCompetingHeadArtifacts();
+    const tagResult = await import__.handleHeadRequest(new Request("https://example.com/head-api?href=%2Ftags%2Ftesting"), {
+      headTags
+    });
+    import_bun_test.expect(tagResult.matched).toBe(true);
+    import_bun_test.expect(await tagResult.response.json()).toMatchObject({
+      href: "/tags/testing",
+      routeHeads: [
+        {
+          routeId: "/tags/$tag",
+          head: [
+            { tag: "title", children: "Tag testing" }
+          ]
+        }
+      ]
+    });
+    const loginResult = await import__.handleHeadRequest(new Request("https://example.com/head-api?href=%2Flogin"), {
+      headTags
+    });
+    import_bun_test.expect(loginResult.matched).toBe(true);
+    import_bun_test.expect(await loginResult.response.json()).toMatchObject({
+      href: "/login",
+      routeHeads: [
+        {
+          routeId: "/login",
+          head: [
+            { tag: "title", children: "Login" }
+          ]
+        }
+      ]
+    });
+  });
   import_bun_test.test("returns redirect responses for document head payload requests", async () => {
     const { headTags } = createTestArtifacts({
       redirectAbout: true

package/dist/esm/index.test.mjs

@@ -67,6 +67,78 @@ function createTestArtifacts(options) {
     }
   };
 }
+function createCompetingHeadArtifacts() {
+  const rootRoute = createRouteNode("__root__", {}, { isRoot: true });
+  const usernameRoute = createRouteNode("/$username", {});
+  const usernameIndexRoute = createRouteNode("/$username/", {});
+  const usernameSlugRoute = createRouteNode("/$username/$slug", {});
+  const loginRoute = createRouteNode("/login", {});
+  const registerRoute = createRouteNode("/register", {});
+  const tagsTagRoute = createRouteNode("/tags/$tag", {});
+  usernameRoute._setServerHead(true);
+  usernameIndexRoute._setServerHead(true);
+  usernameSlugRoute._setServerHead(true);
+  loginRoute._setServerHead(true);
+  registerRoute._setServerHead(true);
+  tagsTagRoute._setServerHead(true);
+  usernameRoute._addFileChildren({
+    index: usernameIndexRoute,
+    slug: usernameSlugRoute
+  });
+  rootRoute._addFileChildren({
+    username: usernameRoute,
+    login: loginRoute,
+    register: registerRoute,
+    tags: tagsTagRoute
+  });
+  const routerSchema = defineRouterSchema({
+    "/$username/": {
+      serverHead: true
+    },
+    "/$username/$slug": {
+      serverHead: true
+    },
+    "/login": {
+      serverHead: true
+    },
+    "/register": {
+      serverHead: true
+    },
+    "/tags/$tag": {
+      serverHead: true
+    }
+  });
+  const headTags = defineHeadTags(rootRoute, routerSchema, {
+    "/$username/": {
+      head: ({ params }) => [
+        { tag: "title", children: `User ${params.username}` }
+      ]
+    },
+    "/$username/$slug": {
+      head: ({ params }) => [
+        { tag: "title", children: `Post ${params.username}/${params.slug}` }
+      ]
+    },
+    "/login": {
+      head: () => [
+        { tag: "title", children: "Login" }
+      ]
+    },
+    "/register": {
+      head: () => [
+        { tag: "title", children: "Register" }
+      ]
+    },
+    "/tags/$tag": {
+      head: ({ params }) => [
+        { tag: "title", children: `Tag ${params.tag}` }
+      ]
+    }
+  });
+  return {
+    headTags
+  };
+}
 describe("handleSpaRequest", () => {
   test('treats "/" as the root basePath and trims trailing slashes', () => {
     const { spaRoutesManifest } = createTestArtifacts();
@@ -267,6 +339,39 @@ describe("handleRequest basePath", () => {
     expect(payload.richieRouterHead).toContain("window.__RICHIE_ROUTER_HEAD__");
     expect(result.response.headers.get("cache-control")).toBe("private, no-store");
   });
+  test("prefers static routes over dynamic siblings when resolving document head payloads", async () => {
+    const { headTags } = createCompetingHeadArtifacts();
+    const tagResult = await handleHeadRequest(new Request("https://example.com/head-api?href=%2Ftags%2Ftesting"), {
+      headTags
+    });
+    expect(tagResult.matched).toBe(true);
+    expect(await tagResult.response.json()).toMatchObject({
+      href: "/tags/testing",
+      routeHeads: [
+        {
+          routeId: "/tags/$tag",
+          head: [
+            { tag: "title", children: "Tag testing" }
+          ]
+        }
+      ]
+    });
+    const loginResult = await handleHeadRequest(new Request("https://example.com/head-api?href=%2Flogin"), {
+      headTags
+    });
+    expect(loginResult.matched).toBe(true);
+    expect(await loginResult.response.json()).toMatchObject({
+      href: "/login",
+      routeHeads: [
+        {
+          routeId: "/login",
+          head: [
+            { tag: "title", children: "Login" }
+          ]
+        }
+      ]
+    });
+  });
   test("returns redirect responses for document head payload requests", async () => {
     const { headTags } = createTestArtifacts({
       redirectAbout: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@richie-router/server",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Server helpers for Richie Router head tags and document handling",
   "sideEffects": false,
   "exports": {
@@ -13,7 +13,7 @@
     }
   },
   "dependencies": {
-    "@richie-router/core": "^0.1.3"
+    "@richie-router/core": "^0.1.4"
   },
   "author": "Richie <oss@ricsam.dev>",
   "homepage": "https://docs.ricsam.dev/richie-router",