@jant/core 0.6.8 → 0.6.10

package/src/routes/feed/__tests__/feed.test.ts

@@ -15,6 +15,8 @@ import { createMediaService } from "../../../services/media.js";
 import { DEFAULT_APP_PORT } from "../../../lib/env.js";
 import { resolveConfig } from "../../../lib/resolve-config.js";
 import { feedRoutes } from "../feed.js";
+import { latestRoutes } from "../../pages/latest.js";
+import { featuredRoutes } from "../../pages/featured.js";
 import type { Database } from "../../../db/index.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
@@ -58,6 +60,9 @@ function createFeedTestApp(envOverrides: Partial<Bindings> = {}) {
   });
 
   app.route("/feed", feedRoutes);
+  // The canonical latest/featured feeds live in their page route groups.
+  app.route("/latest", latestRoutes);
+  app.route("/featured", featuredRoutes);
 
   return { app, services, db: db as unknown as Database };
 }
@@ -166,7 +171,7 @@ describe("Atom Feed Routes", () => {
     });
   });
 
-  describe("/feed/latest — latest public posts", () => {
+  describe("/latest/feed — latest public posts", () => {
     it("returns public published posts and excludes hidden, private, and draft posts", async () => {
       const { app, services } = createFeedTestApp();
 
@@ -204,7 +209,7 @@ describe("Atom Feed Routes", () => {
         status: "draft",
       });
 
-      const res = await app.request("/feed/latest");
+      const res = await app.request("/latest/feed");
       expect(res.status).toBe(200);
 
       const xml = await res.text();
@@ -237,7 +242,7 @@ describe("Atom Feed Routes", () => {
         status: "published",
       });
 
-      const res = await app.request("/feed/latest?format=note");
+      const res = await app.request("/latest/feed?format=note");
       expect(res.status).toBe(200);
 
       const xml = await res.text();
@@ -262,7 +267,7 @@ describe("Atom Feed Routes", () => {
         status: "published",
       });
 
-      const res = await app.request("/feed/latest?format=invalid");
+      const res = await app.request("/latest/feed?format=invalid");
       expect(res.status).toBe(200);
 
       const xml = await res.text();
@@ -273,14 +278,14 @@ describe("Atom Feed Routes", () => {
     it("returns Atom content type", async () => {
       const { app } = createFeedTestApp();
 
-      const res = await app.request("/feed/latest");
+      const res = await app.request("/latest/feed");
       expect(res.headers.get("Content-Type")).toBe(
         "application/atom+xml; charset=utf-8",
       );
     });
   });
 
-  describe("/feed/featured — featured posts", () => {
+  describe("/featured/feed — featured posts", () => {
     it("returns only featured posts", async () => {
       const { app, services } = createFeedTestApp();
 
@@ -298,7 +303,7 @@ describe("Atom Feed Routes", () => {
         featured: true,
       });
 
-      const res = await app.request("/feed/featured");
+      const res = await app.request("/featured/feed");
       expect(res.status).toBe(200);
 
       const xml = await res.text();
@@ -307,6 +312,24 @@ describe("Atom Feed Routes", () => {
     });
   });
 
+  describe("legacy feed path redirects", () => {
+    it("redirects /feed/latest to /latest/feed, preserving ?format=", async () => {
+      const { app } = createFeedTestApp();
+
+      const res = await app.request("/feed/latest?format=note");
+      expect(res.status).toBe(308);
+      expect(res.headers.get("Location")).toBe("/latest/feed?format=note");
+    });
+
+    it("redirects /feed/featured to /featured/feed", async () => {
+      const { app } = createFeedTestApp();
+
+      const res = await app.request("/feed/featured");
+      expect(res.status).toBe(308);
+      expect(res.headers.get("Location")).toBe("/featured/feed");
+    });
+  });
+
   describe("legacy atom.xml redirects", () => {
     it("redirects /feed/atom.xml to /feed", async () => {
       const { app } = createFeedTestApp();
@@ -316,38 +339,54 @@ describe("Atom Feed Routes", () => {
       expect(res.headers.get("Location")).toBe("/feed");
     });
 
-    it("redirects /feed/latest/atom.xml to /feed/latest", async () => {
+    it("redirects /feed/latest/atom.xml to /latest/feed", async () => {
       const { app } = createFeedTestApp();
 
       const res = await app.request("/feed/latest/atom.xml");
       expect(res.status).toBe(308);
-      expect(res.headers.get("Location")).toBe("/feed/latest");
+      expect(res.headers.get("Location")).toBe("/latest/feed");
     });
 
-    it("redirects /feed/featured/atom.xml to /feed/featured", async () => {
+    it("redirects /feed/featured/atom.xml to /featured/feed", async () => {
       const { app } = createFeedTestApp();
 
       const res = await app.request("/feed/featured/atom.xml");
       expect(res.status).toBe(308);
-      expect(res.headers.get("Location")).toBe("/feed/featured");
+      expect(res.headers.get("Location")).toBe("/featured/feed");
+    });
+
+    it("redirects /latest/feed/atom.xml to /latest/feed", async () => {
+      const { app } = createFeedTestApp();
+
+      const res = await app.request("/latest/feed/atom.xml");
+      expect(res.status).toBe(308);
+      expect(res.headers.get("Location")).toBe("/latest/feed");
+    });
+
+    it("redirects /featured/feed/atom.xml to /featured/feed", async () => {
+      const { app } = createFeedTestApp();
+
+      const res = await app.request("/featured/feed/atom.xml");
+      expect(res.status).toBe(308);
+      expect(res.headers.get("Location")).toBe("/featured/feed");
     });
   });
 
   describe("legacy feed aliases", () => {
-    it("redirects /feed/all to /feed/latest", async () => {
+    it("redirects /feed/all to /latest/feed", async () => {
       const { app } = createFeedTestApp();
 
       const res = await app.request("/feed/all?format=note");
       expect(res.status).toBe(308);
-      expect(res.headers.get("Location")).toBe("/feed/latest?format=note");
+      expect(res.headers.get("Location")).toBe("/latest/feed?format=note");
     });
 
-    it("redirects /feed/all/atom.xml to /feed/latest", async () => {
+    it("redirects /feed/all/atom.xml to /latest/feed", async () => {
       const { app } = createFeedTestApp();
 
       const res = await app.request("/feed/all/atom.xml?format=link");
       expect(res.status).toBe(308);
-      expect(res.headers.get("Location")).toBe("/feed/latest");
+      expect(res.headers.get("Location")).toBe("/latest/feed");
     });
   });
 
@@ -388,7 +427,7 @@ describe("Atom Feed Routes", () => {
         });
       }
 
-      const res = await app.request("/feed/latest");
+      const res = await app.request("/latest/feed");
       expect(res.status).toBe(200);
 
       const xml = await res.text();
@@ -413,7 +452,7 @@ describe("Atom Feed Routes", () => {
         });
       }
 
-      const res = await app.request("/feed/latest");
+      const res = await app.request("/latest/feed");
       expect(res.status).toBe(200);
 
       const xml = await res.text();
@@ -436,7 +475,7 @@ describe("Atom Feed Routes", () => {
         });
       }
 
-      const res = await app.request("/feed/featured");
+      const res = await app.request("/featured/feed");
       expect(res.status).toBe(200);
 
       const xml = await res.text();
@@ -463,7 +502,7 @@ describe("Atom Feed Routes", () => {
         replyToId: root.id,
       });
 
-      const res = await app.request("/feed/latest");
+      const res = await app.request("/latest/feed");
       expect(res.status).toBe(200);
 
       const xml = await res.text();

package/src/routes/feed/feed.ts

@@ -1,12 +1,17 @@
 /**
  * Atom Feed Routes
  *
- * Feed hierarchy:
- * - /feed                  — site main feed (latest or featured, site-configurable)
- * - /feed/latest           — latest public posts
- * - /feed/featured        — featured posts only
- * - /{slug}/feed          — single-collection feed (handled in page routes)
+ * Feed hierarchy (resource-first: a feed is a sub-resource of the page it
+ * represents, so it lives at `{page}/feed`):
+ * - /feed                    — site main feed (latest or featured, site-configurable; feed of `/`)
+ * - /latest/feed             — latest public posts (handled in pages/latest)
+ * - /featured/feed           — featured posts only (handled in pages/featured)
+ * - /archive/feed            — full archive incl. Hidden-from-Latest (handled in pages/archive)
+ * - /{slug}/feed             — single-collection feed (handled in page routes)
  * - /collections/{slug}/feed — combined collection feed (handled in collection routes)
+ *
+ * Legacy: /feed/latest and /feed/featured 308-redirect to the canonical
+ * /latest/feed and /featured/feed. Kept indefinitely for old subscribers.
  */
 
 import { msg } from "@lingui/core/macro";
@@ -255,11 +260,15 @@ async function buildFeaturedFeedData(
 /**
  * Build FeedData from the Hono context.
  *
+ * Exported so the canonical latest/featured feeds (served from the
+ * `/latest/feed` and `/featured/feed` page route groups) can reuse the
+ * same feed-building logic.
+ *
  * @param c - Hono context
  * @param opts - Filter options for the feed
  * @returns Feed data ready for rendering
  */
-async function buildFeedData(
+export async function buildFeedData(
   c: Context<Env>,
   opts: FeedOptions,
 ): Promise<FeedData> {
@@ -311,7 +320,7 @@ async function buildFeedData(
  * Parse and validate the `format` query parameter.
  * Returns a valid Format or undefined if missing/invalid.
  */
-function parseFormatQuery(c: Context<Env>): Format | undefined {
+export function parseFormatQuery(c: Context<Env>): Format | undefined {
   const raw = c.req.query("format");
   if (raw && (FORMATS as readonly string[]).includes(raw)) {
     return raw as Format;
@@ -319,7 +328,7 @@ function parseFormatQuery(c: Context<Env>): Format | undefined {
   return undefined;
 }
 
-function renderFeed(xml: string) {
+export function renderFeed(xml: string) {
   return new Response(xml, {
     headers: {
       "Content-Type": "application/atom+xml; charset=utf-8",
@@ -335,24 +344,24 @@ feedRoutes.get("/", async (c) => {
   return renderFeed(defaultFeedRenderer(feedData));
 });
 
-// Atom — /feed/latest
-feedRoutes.get("/latest", async (c) => {
-  const format = parseFormatQuery(c);
-  const feedData = await buildFeedData(c, {
-    kind: "latest",
-    selfPath: "/feed/latest",
-    format,
-  });
-  return renderFeed(defaultFeedRenderer(feedData));
+// Legacy — /feed/latest moved to the canonical /latest/feed. Kept
+// indefinitely as a 308 so old subscribers don't break; preserves the
+// ?format= query string.
+feedRoutes.get("/latest", (c) => {
+  const sitePathPrefix = c.var.appConfig.sitePathPrefix;
+  const qs = c.req.url.includes("?")
+    ? c.req.url.slice(c.req.url.indexOf("?"))
+    : "";
+  return c.redirect(
+    `${toPublicPath("/latest/feed", sitePathPrefix)}${qs}`,
+    308,
+  );
 });
 
-// Atom — /feed/featured
-feedRoutes.get("/featured", async (c) => {
-  const feedData = await buildFeedData(c, {
-    kind: "featured",
-    selfPath: "/feed/featured",
-  });
-  return renderFeed(defaultFeedRenderer(feedData));
+// Legacy — /feed/featured moved to the canonical /featured/feed.
+feedRoutes.get("/featured", (c) => {
+  const sitePathPrefix = c.var.appConfig.sitePathPrefix;
+  return c.redirect(toPublicPath("/featured/feed", sitePathPrefix), 308);
 });
 
 // Legacy aliases
@@ -362,7 +371,7 @@ feedRoutes.get("/all", (c) => {
     ? c.req.url.slice(c.req.url.indexOf("?"))
     : "";
   return c.redirect(
-    `${toPublicPath("/feed/latest", sitePathPrefix)}${qs}`,
+    `${toPublicPath("/latest/feed", sitePathPrefix)}${qs}`,
     308,
   );
 });
@@ -374,13 +383,13 @@ feedRoutes.get("/atom.xml", (c) => {
 });
 feedRoutes.get("/latest/atom.xml", (c) => {
   const sitePathPrefix = c.var.appConfig.sitePathPrefix;
-  return c.redirect(toPublicPath("/feed/latest", sitePathPrefix), 308);
+  return c.redirect(toPublicPath("/latest/feed", sitePathPrefix), 308);
 });
 feedRoutes.get("/featured/atom.xml", (c) => {
   const sitePathPrefix = c.var.appConfig.sitePathPrefix;
-  return c.redirect(toPublicPath("/feed/featured", sitePathPrefix), 308);
+  return c.redirect(toPublicPath("/featured/feed", sitePathPrefix), 308);
 });
 feedRoutes.get("/all/atom.xml", (c) => {
   const sitePathPrefix = c.var.appConfig.sitePathPrefix;
-  return c.redirect(toPublicPath("/feed/latest", sitePathPrefix), 308);
+  return c.redirect(toPublicPath("/latest/feed", sitePathPrefix), 308);
 });

package/src/routes/pages/featured.tsx

@@ -15,6 +15,8 @@ import { buildPageTitle } from "../../lib/page-title.js";
 import { renderPublicPage } from "../../lib/render.js";
 import { assembleFeaturedTimeline } from "../../lib/timeline.js";
 import { toPublicPath } from "../../lib/url.js";
+import { defaultFeedRenderer } from "../../lib/feed.js";
+import { buildFeedData, renderFeed } from "../feed/feed.js";
 import { FeaturedPage } from "../../ui/pages/FeaturedPage.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
@@ -58,3 +60,18 @@ featuredRoutes.get("/", async (c) => {
     ),
   });
 });
+
+// Atom — /featured/feed (canonical featured feed)
+featuredRoutes.get("/feed", async (c) => {
+  const feedData = await buildFeedData(c, {
+    kind: "featured",
+    selfPath: "/featured/feed",
+  });
+  return renderFeed(defaultFeedRenderer(feedData));
+});
+
+// Legacy atom.xml suffix → canonical /featured/feed
+featuredRoutes.get("/feed/atom.xml", (c) => {
+  const sitePathPrefix = c.var.appConfig.sitePathPrefix;
+  return c.redirect(toPublicPath("/featured/feed", sitePathPrefix), 308);
+});

package/src/routes/pages/latest.tsx

@@ -18,6 +18,8 @@ import { buildPageTitle } from "../../lib/page-title.js";
 import { renderPublicPage } from "../../lib/render.js";
 import { assembleTimeline } from "../../lib/timeline.js";
 import { toPublicPath } from "../../lib/url.js";
+import { defaultFeedRenderer } from "../../lib/feed.js";
+import { buildFeedData, parseFormatQuery, renderFeed } from "../feed/feed.js";
 import { HomePage } from "../../ui/pages/HomePage.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
@@ -65,3 +67,26 @@ latestRoutes.get("/", async (c) => {
     ),
   });
 });
+
+// Atom — /latest/feed (canonical latest feed; accepts ?format=note|link|quote)
+latestRoutes.get("/feed", async (c) => {
+  const format = parseFormatQuery(c);
+  const feedData = await buildFeedData(c, {
+    kind: "latest",
+    selfPath: "/latest/feed",
+    format,
+  });
+  return renderFeed(defaultFeedRenderer(feedData));
+});
+
+// Legacy atom.xml suffix → canonical /latest/feed (preserves ?format=)
+latestRoutes.get("/feed/atom.xml", (c) => {
+  const sitePathPrefix = c.var.appConfig.sitePathPrefix;
+  const qs = c.req.url.includes("?")
+    ? c.req.url.slice(c.req.url.indexOf("?"))
+    : "";
+  return c.redirect(
+    `${toPublicPath("/latest/feed", sitePathPrefix)}${qs}`,
+    308,
+  );
+});