@jant/core 0.3.27 → 0.3.28

package/src/routes/feed/rss.ts

@@ -5,10 +5,10 @@
 import { Hono } from "hono";
 import type { Context } from "hono";
 import type { Bindings, FeedData } from "../../types.js";
-import type { AppVariables } from "../../app.js";
+import type { AppVariables } from "../../types/app-context.js";
 import { defaultRssRenderer, defaultAtomRenderer } from "../../lib/feed.js";
-import { getSiteLanguage } from "../../lib/config.js";
 import { buildMediaMap } from "../../lib/media-helpers.js";
+
 import { createMediaContext, toPostViews } from "../../lib/view.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
@@ -19,13 +19,12 @@ export const rssRoutes = new Hono<Env>();
  * Build FeedData from the Hono context.
  */
 async function buildFeedData(c: Context<Env>): Promise<FeedData> {
-  const all = await c.var.services.settings.getAll();
-  const siteName = all["SITE_NAME"] ?? "Jant";
-  const siteDescription = all["SITE_DESCRIPTION"] ?? "";
-  const siteUrl = c.env.SITE_URL;
-  const siteLanguage = await getSiteLanguage(c);
-
-  const feedLimit = parseInt(c.env.RSS_FEED_LIMIT ?? "50", 10) || 50;
+  const { appConfig } = c.var;
+  const siteName = appConfig.siteName;
+  const siteDescription = appConfig.siteDescription;
+  const siteUrl = appConfig.siteUrl;
+  const siteLanguage = appConfig.siteLanguage;
+  const feedLimit = appConfig.rssFeedLimit;
 
   const posts = await c.var.services.posts.list({
     status: "published",
@@ -36,7 +35,7 @@ async function buildFeedData(c: Context<Env>): Promise<FeedData> {
   // Batch load media for enclosures
   const postIds = posts.map((p) => p.id);
   const rawMediaMap = await c.var.services.media.getByPostIds(postIds);
-  const mediaCtx = createMediaContext(c);
+  const mediaCtx = createMediaContext(appConfig);
   const mediaMap = buildMediaMap(
     rawMediaMap,
     mediaCtx.r2PublicUrl,
@@ -65,9 +64,7 @@ async function buildFeedData(c: Context<Env>): Promise<FeedData> {
 // RSS 2.0 Feed - main feed at /feed
 rssRoutes.get("/", async (c) => {
   const feedData = await buildFeedData(c);
-
-  const renderer = c.var.config.feed?.rss ?? defaultRssRenderer;
-  const xml = renderer(feedData);
+  const xml = defaultRssRenderer(feedData);
 
   return new Response(xml, {
     headers: {
@@ -79,9 +76,7 @@ rssRoutes.get("/", async (c) => {
 // Atom Feed
 rssRoutes.get("/atom.xml", async (c) => {
   const feedData = await buildFeedData(c);
-
-  const renderer = c.var.config.feed?.atom ?? defaultAtomRenderer;
-  const xml = renderer(feedData);
+  const xml = defaultAtomRenderer(feedData);
 
   return new Response(xml, {
     headers: {

package/src/routes/feed/sitemap.ts

@@ -4,7 +4,7 @@
 
 import { Hono } from "hono";
 import type { Bindings } from "../../types.js";
-import type { AppVariables } from "../../app.js";
+import type { AppVariables } from "../../types/app-context.js";
 import { defaultSitemapRenderer } from "../../lib/feed.js";
 import {
   createMediaContext,
@@ -18,7 +18,8 @@ export const sitemapRoutes = new Hono<Env>();
 
 // XML Sitemap
 sitemapRoutes.get("/sitemap.xml", async (c) => {
-  const siteUrl = c.env.SITE_URL;
+  const { appConfig } = c.var;
+  const siteUrl = appConfig.siteUrl;
 
   const posts = await c.var.services.posts.list({
     status: "published",
@@ -27,16 +28,20 @@ sitemapRoutes.get("/sitemap.xml", async (c) => {
   });
 
   // Fetch published pages
-  const allPages = await c.var.services.pages.list();
-  const publishedPages = allPages.filter((p) => p.status === "published");
+  const publishedPages = await c.var.services.pages.list({
+    status: "published",
+  });
 
   // Transform to View Models
-  const mediaCtx = createMediaContext(c);
+  const mediaCtx = createMediaContext(appConfig);
   const postViews = toPostViewsFromPosts(posts, mediaCtx);
   const pageViews = publishedPages.map(toPageView);
 
-  const renderer = c.var.config.feed?.sitemap ?? defaultSitemapRenderer;
-  const xml = renderer({ siteUrl, posts: postViews, pages: pageViews });
+  const xml = defaultSitemapRenderer({
+    siteUrl,
+    posts: postViews,
+    pages: pageViews,
+  });
 
   return new Response(xml, {
     headers: {
@@ -47,8 +52,9 @@ sitemapRoutes.get("/sitemap.xml", async (c) => {
 
 // robots.txt
 sitemapRoutes.get("/robots.txt", async (c) => {
-  const siteUrl = c.env.SITE_URL;
-  const noindex = (await c.var.services.settings.get("NOINDEX")) === "true";
+  const { appConfig } = c.var;
+  const siteUrl = appConfig.siteUrl;
+  const noindex = appConfig.noindex;
 
   const directive = noindex ? "Disallow: /" : "Allow: /";
   const robots = `User-agent: *

package/src/routes/pages/__tests__/collections.test.ts

@@ -34,17 +34,17 @@ describe("Collections Listing Page - Data Logic", () => {
       title: "Travel",
     });
 
-    // Add posts to recipes collection
-    await postService.create({
+    // Add posts to recipes collection via junction table
+    const p1 = await postService.create({
       format: "note",
       body: "Recipe 1",
-      collectionId: recipes.id,
     });
-    await postService.create({
+    const p2 = await postService.create({
       format: "note",
       body: "Recipe 2",
-      collectionId: recipes.id,
     });
+    await collectionService.addPost(recipes.id, p1.id);
+    await collectionService.addPost(recipes.id, p2.id);
 
     // Simulate route handler logic
     const [allCollections, postCounts] = await Promise.all([
@@ -78,14 +78,15 @@ describe("Collections Listing Page - Data Logic", () => {
     const post = await postService.create({
       format: "note",
       body: "Will be deleted",
-      collectionId: col.id,
     });
-    await postService.create({
+    const post2 = await postService.create({
       format: "note",
       body: "Will remain",
-      collectionId: col.id,
     });
 
+    await collectionService.addPost(col.id, post.id);
+    await collectionService.addPost(col.id, post2.id);
+
     await postService.delete(post.id);
 
     const postCounts = await collectionService.getPostCounts();

package/src/routes/pages/archive.tsx

@@ -6,7 +6,7 @@
 
 import { Hono } from "hono";
 import type { Bindings, Format } from "../../types.js";
-import type { AppVariables } from "../../app.js";
+import type { AppVariables } from "../../types/app-context.js";
 import { FORMATS } from "../../types.js";
 import { ArchivePage } from "../../ui/pages/ArchivePage.js";
 import { getNavigationData } from "../../lib/navigation.js";
@@ -66,7 +66,7 @@ archiveRoutes.get("/", async (c) => {
   }
 
   // Transform to View Models
-  const mediaCtx = createMediaContext(c);
+  const mediaCtx = createMediaContext(c.var.appConfig);
   const groups = toArchiveGroups(grouped, mediaCtx);
 
   return renderPublicPage(c, {

package/src/routes/pages/collection.tsx

@@ -4,11 +4,18 @@
 
 import { Hono } from "hono";
 import type { Bindings } from "../../types.js";
-import type { AppVariables } from "../../app.js";
+import type { AppVariables } from "../../types/app-context.js";
 import { CollectionPage } from "../../ui/pages/CollectionPage.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
-import { createMediaContext, toPostViewsFromPosts } from "../../lib/view.js";
+import {
+  createMediaContext,
+  toPostViewsFromPosts,
+  toPostViews,
+} from "../../lib/view.js";
+import { defaultRssRenderer } from "../../lib/feed.js";
+import { buildMediaMap } from "../../lib/media-helpers.js";
+import { CollectionsSidebar } from "../../ui/shared/CollectionsSidebar.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -20,23 +27,29 @@ collectionRoutes.get("/:slug", async (c) => {
   const collection = await c.var.services.collections.getBySlug(slug);
   if (!collection) return c.notFound();
 
-  // Fetch posts in this collection
-  const posts = await c.var.services.posts.list({
-    collectionId: collection.id,
-    status: "published",
-    excludeReplies: true,
-  });
+  // Fetch posts and all collections in parallel
+  const [posts, allCollections] = await Promise.all([
+    c.var.services.posts.list({
+      collectionId: collection.id,
+      status: "published",
+      excludeReplies: true,
+    }),
+    c.var.services.collections.list(),
+  ]);
 
   const navData = await getNavigationData(c);
 
   // Transform to View Models
-  const mediaCtx = createMediaContext(c);
+  const mediaCtx = createMediaContext(c.var.appConfig);
   const postViews = toPostViewsFromPosts(posts, mediaCtx);
 
   return renderPublicPage(c, {
     title: `${collection.title} - ${navData.siteName}`,
     description: collection.description ?? undefined,
     navData,
+    sidebar: (
+      <CollectionsSidebar collections={allCollections} activeSlug={slug} />
+    ),
     content: (
       <CollectionPage
         collection={collection}
@@ -46,3 +59,57 @@ collectionRoutes.get("/:slug", async (c) => {
     ),
   });
 });
+
+// Collection RSS feed
+collectionRoutes.get("/:slug/feed", async (c) => {
+  const slug = c.req.param("slug");
+
+  const collection = await c.var.services.collections.getBySlug(slug);
+  if (!collection) return c.notFound();
+
+  const { appConfig } = c.var;
+  const siteName = appConfig.siteName;
+  const siteUrl = appConfig.siteUrl;
+  const siteLanguage = appConfig.siteLanguage;
+  const feedLimit = appConfig.rssFeedLimit;
+
+  const posts = await c.var.services.posts.list({
+    collectionId: collection.id,
+    status: "published",
+    excludeReplies: true,
+    limit: feedLimit,
+  });
+
+  // Batch load media for enclosures
+  const postIds = posts.map((p) => p.id);
+  const rawMediaMap = await c.var.services.media.getByPostIds(postIds);
+  const mediaCtx = createMediaContext(appConfig);
+  const mediaMap = buildMediaMap(
+    rawMediaMap,
+    mediaCtx.r2PublicUrl,
+    mediaCtx.imageTransformUrl,
+    mediaCtx.s3PublicUrl,
+  );
+
+  const postViews = toPostViews(
+    posts.map((p) => ({
+      ...p,
+      mediaAttachments: mediaMap.get(p.id) ?? [],
+    })),
+    mediaCtx,
+  );
+
+  const xml = defaultRssRenderer({
+    siteName: `${collection.title} - ${siteName}`,
+    siteDescription: collection.description ?? "",
+    siteUrl,
+    siteLanguage,
+    posts: postViews,
+  });
+
+  return new Response(xml, {
+    headers: {
+      "Content-Type": "application/rss+xml; charset=utf-8",
+    },
+  });
+});

package/src/routes/pages/collections.tsx

@@ -6,10 +6,11 @@
 
 import { Hono } from "hono";
 import type { Bindings } from "../../types.js";
-import type { AppVariables } from "../../app.js";
+import type { AppVariables } from "../../types/app-context.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
 import { CollectionsPage } from "../../ui/pages/CollectionsPage.js";
+import { CollectionsSidebar } from "../../ui/shared/CollectionsSidebar.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -31,6 +32,7 @@ collectionsPageRoutes.get("/", async (c) => {
   return renderPublicPage(c, {
     title: `Collections - ${navData.siteName}`,
     navData,
+    sidebar: <CollectionsSidebar collections={allCollections} />,
     content: <CollectionsPage collections={collections} />,
   });
 });

package/src/routes/pages/featured.tsx

@@ -6,7 +6,7 @@
 
 import { Hono } from "hono";
 import type { Bindings } from "../../types.js";
-import type { AppVariables } from "../../app.js";
+import type { AppVariables } from "../../types/app-context.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
 import { createMediaContext, toPostViewsFromPosts } from "../../lib/view.js";
@@ -30,7 +30,7 @@ featuredRoutes.get("/", async (c) => {
     excludeReplies: true,
   });
 
-  const mediaCtx = createMediaContext(c);
+  const mediaCtx = createMediaContext(c.var.appConfig);
   const postViews = toPostViewsFromPosts(posts, mediaCtx);
 
   // Convert to timeline items (simple — no thread previews)

package/src/routes/pages/home.tsx

@@ -10,7 +10,7 @@
 
 import { Hono } from "hono";
 import type { Bindings } from "../../types.js";
-import type { AppVariables } from "../../app.js";
+import type { AppVariables } from "../../types/app-context.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
 import { assembleTimeline } from "../../lib/timeline.js";
@@ -32,7 +32,7 @@ homeRoutes.get("/", async (c) => {
       status: "published",
       excludeReplies: true,
     });
-    const mediaCtx = createMediaContext(c);
+    const mediaCtx = createMediaContext(c.var.appConfig);
     const postViews = toPostViewsFromPosts(posts, mediaCtx);
     const items = postViews.map((post) => ({ post }));
 
@@ -57,7 +57,7 @@ homeRoutes.get("/", async (c) => {
     status: "published",
     excludeReplies: true,
   });
-  const mediaCtx = createMediaContext(c);
+  const mediaCtx = createMediaContext(c.var.appConfig);
   const pinnedItems = toPostViewsFromPosts(pinnedPosts, mediaCtx);
 
   return renderPublicPage(c, {

package/src/routes/pages/latest.tsx

@@ -9,7 +9,7 @@
 
 import { Hono } from "hono";
 import type { Bindings } from "../../types.js";
-import type { AppVariables } from "../../app.js";
+import type { AppVariables } from "../../types/app-context.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
 import { assembleTimeline } from "../../lib/timeline.js";
@@ -41,7 +41,7 @@ latestRoutes.get("/", async (c) => {
     status: "published",
     excludeReplies: true,
   });
-  const mediaCtx = createMediaContext(c);
+  const mediaCtx = createMediaContext(c.var.appConfig);
   const pinnedItems = toPostViewsFromPosts(pinnedPosts, mediaCtx);
 
   return renderPublicPage(c, {

package/src/routes/pages/page.tsx

@@ -8,7 +8,7 @@
 
 import { Hono } from "hono";
 import type { Bindings } from "../../types.js";
-import type { AppVariables } from "../../app.js";
+import type { AppVariables } from "../../types/app-context.js";
 import { SinglePage } from "../../ui/pages/SinglePage.js";
 import { PostPage } from "../../ui/pages/PostPage.js";
 import { getNavigationData } from "../../lib/navigation.js";
@@ -58,7 +58,7 @@ pageRoutes.get("/*", async (c) => {
 
     // Load media attachments
     const rawMediaMap = await c.var.services.media.getByPostIds([post.id]);
-    const mediaCtx = createMediaContext(c);
+    const mediaCtx = createMediaContext(c.var.appConfig);
     const mediaMap = buildMediaMap(
       rawMediaMap,
       mediaCtx.r2PublicUrl,

package/src/routes/pages/post.tsx

@@ -4,7 +4,7 @@
 
 import { Hono } from "hono";
 import type { Bindings } from "../../types.js";
-import type { AppVariables } from "../../app.js";
+import type { AppVariables } from "../../types/app-context.js";
 import { PostPage } from "../../ui/pages/PostPage.js";
 import * as sqid from "../../lib/sqid.js";
 import { getNavigationData } from "../../lib/navigation.js";
@@ -33,7 +33,7 @@ postRoutes.get("/:id", async (c) => {
 
   // Batch load media attachments
   const rawMediaMap = await c.var.services.media.getByPostIds([post.id]);
-  const mediaCtx = createMediaContext(c);
+  const mediaCtx = createMediaContext(c.var.appConfig);
   const mediaMap = buildMediaMap(
     rawMediaMap,
     mediaCtx.r2PublicUrl,

package/src/routes/pages/search.tsx

@@ -4,7 +4,7 @@
 
 import { Hono } from "hono";
 import type { Bindings, SearchResult } from "../../types.js";
-import type { AppVariables } from "../../app.js";
+import type { AppVariables } from "../../types/app-context.js";
 import { SearchPage } from "../../ui/pages/SearchPage.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
@@ -49,7 +49,7 @@ searchRoutes.get("/", async (c) => {
   }
 
   // Transform to View Models
-  const mediaCtx = createMediaContext(c);
+  const mediaCtx = createMediaContext(c.var.appConfig);
   const resultViews = toSearchResultViews(results, mediaCtx);
 
   return renderPublicPage(c, {