@jant/core 0.3.35 → 0.3.37

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

@@ -4,9 +4,9 @@ import type { Bindings } from "../../../types.js";
 import type { AppVariables } from "../../../types/app-context.js";
 import { createTestDatabase } from "../../../__tests__/helpers/db.js";
 import { createPostService } from "../../../services/post.js";
+import { createPathService } from "../../../services/path.js";
 import { createSettingsService } from "../../../services/settings.js";
 import { createMediaService } from "../../../services/media.js";
-import { createPathRegistryService } from "../../../services/path-registry.js";
 import { resolveConfig } from "../../../lib/resolve-config.js";
 import { rssRoutes } from "../rss.js";
 
@@ -14,12 +14,11 @@ type Env = { Bindings: Bindings; Variables: AppVariables };
 
 function createFeedTestApp(envOverrides: Partial<Bindings> = {}) {
   const { db } = createTestDatabase();
+  const pathService = createPathService(db as never);
 
   const services = {
-    posts: createPostService(
-      db as never,
-      createPathRegistryService(db as never),
-    ),
+    paths: pathService,
+    posts: createPostService(db as never, { slugIdLength: 5 }, pathService),
     settings: createSettingsService(db as never),
     media: createMediaService(db as never),
   };
@@ -28,7 +27,7 @@ function createFeedTestApp(envOverrides: Partial<Bindings> = {}) {
 
   app.use("*", async (c, next) => {
     const env = {
-      SITE_URL: "http://localhost:9019",
+      SITE_URL: "http://localhost:9020",
       ...envOverrides,
     } as Bindings;
     c.env = env;
@@ -54,13 +53,13 @@ describe("RSS Feed Routes", () => {
       await services.posts.create({
         format: "note",
         title: "Regular Post",
-        body: "Not featured",
+        bodyMarkdown: "Not featured",
         status: "published",
       });
       await services.posts.create({
         format: "note",
         title: "Featured Post",
-        body: "This is featured",
+        bodyMarkdown: "This is featured",
         status: "published",
         featured: true,
       });
@@ -79,7 +78,7 @@ describe("RSS Feed Routes", () => {
       await services.posts.create({
         format: "note",
         title: "Regular Post",
-        body: "Not featured",
+        bodyMarkdown: "Not featured",
         status: "published",
       });
 
@@ -107,13 +106,13 @@ describe("RSS Feed Routes", () => {
       await services.posts.create({
         format: "note",
         title: "Regular Post",
-        body: "Not featured",
+        bodyMarkdown: "Not featured",
         status: "published",
       });
       await services.posts.create({
         format: "note",
         title: "Featured Post",
-        body: "This is featured",
+        bodyMarkdown: "This is featured",
         status: "published",
         featured: true,
       });
@@ -137,20 +136,20 @@ describe("RSS Feed Routes", () => {
       await services.posts.create({
         format: "note",
         title: "Regular Post",
-        body: "Not featured",
+        bodyMarkdown: "Not featured",
         status: "published",
       });
       await services.posts.create({
         format: "note",
         title: "Featured Post",
-        body: "This is featured",
+        bodyMarkdown: "This is featured",
         status: "published",
         featured: true,
       });
       await services.posts.create({
         format: "note",
         title: "Draft Post",
-        body: "Draft",
+        bodyMarkdown: "Draft",
         status: "draft",
       });
 
@@ -169,7 +168,7 @@ describe("RSS Feed Routes", () => {
       await services.posts.create({
         format: "note",
         title: "My Note",
-        body: "A note",
+        bodyMarkdown: "A note",
         status: "published",
       });
       await services.posts.create({
@@ -200,7 +199,7 @@ describe("RSS Feed Routes", () => {
       await services.posts.create({
         format: "note",
         title: "My Note",
-        body: "A note",
+        bodyMarkdown: "A note",
         status: "published",
       });
       await services.posts.create({
@@ -236,13 +235,13 @@ describe("RSS Feed Routes", () => {
       await services.posts.create({
         format: "note",
         title: "Regular Post",
-        body: "Not featured",
+        bodyMarkdown: "Not featured",
         status: "published",
       });
       await services.posts.create({
         format: "note",
         title: "Featured Post",
-        body: "This is featured",
+        bodyMarkdown: "This is featured",
         status: "published",
         featured: true,
       });
@@ -264,7 +263,7 @@ describe("RSS Feed Routes", () => {
       await services.posts.create({
         format: "note",
         title: "My Note",
-        body: "A note",
+        bodyMarkdown: "A note",
         status: "published",
       });
       await services.posts.create({
@@ -292,7 +291,7 @@ describe("RSS Feed Routes", () => {
         await services.posts.create({
           format: "note",
           title: `Post ${i}`,
-          body: `Body ${i}`,
+          bodyMarkdown: `Body ${i}`,
           status: "published",
           featured: true,
         });
@@ -318,7 +317,7 @@ describe("RSS Feed Routes", () => {
         await services.posts.create({
           format: "note",
           title: `Post ${i}`,
-          body: `Body ${i}`,
+          bodyMarkdown: `Body ${i}`,
           status: "published",
         });
       }
@@ -346,7 +345,7 @@ describe("RSS Feed Routes", () => {
         await services.posts.create({
           format: "note",
           title: `Post ${i}`,
-          body: `Body ${i}`,
+          bodyMarkdown: `Body ${i}`,
           status: "published",
         });
       }
@@ -369,7 +368,7 @@ describe("RSS Feed Routes", () => {
         await services.posts.create({
           format: "note",
           title: `Post ${i}`,
-          body: `Body ${i}`,
+          bodyMarkdown: `Body ${i}`,
           status: "published",
           featured: true,
         });

package/src/routes/feed/rss.ts

@@ -23,6 +23,8 @@ export const rssRoutes = new Hono<Env>();
 
 interface FeedOptions {
   featured?: boolean;
+  excludeUnlisted?: boolean;
+  excludePrivate?: boolean;
   format?: Format;
 }
 
@@ -48,6 +50,8 @@ async function buildFeedData(
     status: "published",
     excludeReplies: true,
     featured: opts?.featured,
+    excludeUnlisted: opts?.excludeUnlisted,
+    excludePrivate: opts?.excludePrivate ?? true,
     format: opts?.format,
     limit: feedLimit,
   });
@@ -124,7 +128,7 @@ rssRoutes.get("/atom.xml", async (c) => {
 // RSS 2.0 — /feed/all
 rssRoutes.get("/all", async (c) => {
   const format = parseFormatQuery(c);
-  const feedData = await buildFeedData(c, { format });
+  const feedData = await buildFeedData(c, { excludeUnlisted: true, format });
   const xml = defaultRssRenderer(feedData);
 
   return new Response(xml, {
@@ -137,7 +141,7 @@ rssRoutes.get("/all", async (c) => {
 // Atom — /feed/all/atom.xml
 rssRoutes.get("/all/atom.xml", async (c) => {
   const format = parseFormatQuery(c);
-  const feedData = await buildFeedData(c, { format });
+  const feedData = await buildFeedData(c, { excludeUnlisted: true, format });
   const xml = defaultAtomRenderer(feedData);
 
   return new Response(xml, {

package/src/routes/feed/sitemap.ts

@@ -6,11 +6,7 @@ import { Hono } from "hono";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../types/app-context.js";
 import { defaultSitemapRenderer } from "../../lib/feed.js";
-import {
-  createMediaContext,
-  toPostViewsFromPosts,
-  toPageView,
-} from "../../lib/view.js";
+import { createMediaContext, toPostViewsFromPosts } from "../../lib/view.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -24,23 +20,17 @@ sitemapRoutes.get("/sitemap.xml", async (c) => {
   const posts = await c.var.services.posts.list({
     status: "published",
     excludeReplies: true,
+    excludePrivate: true,
     limit: 1000,
   });
 
-  // Fetch published pages
-  const publishedPages = await c.var.services.pages.list({
-    status: "published",
-  });
-
   // Transform to View Models
   const mediaCtx = createMediaContext(appConfig);
   const postViews = toPostViewsFromPosts(posts, mediaCtx);
-  const pageViews = publishedPages.map(toPageView);
 
   const xml = defaultSitemapRenderer({
     siteUrl,
     posts: postViews,
-    pages: pageViews,
   });
 
   return new Response(xml, {

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

@@ -10,7 +10,6 @@ import { describe, it, expect, beforeEach } from "vitest";
 import { createTestDatabase } from "../../../__tests__/helpers/db.js";
 import { createCollectionService } from "../../../services/collection.js";
 import { createPostService } from "../../../services/post.js";
-import { createPathRegistryService } from "../../../services/path-registry.js";
 import type { Database } from "../../../db/index.js";
 
 describe("Collections Listing Page - Data Logic", () => {
@@ -22,7 +21,7 @@ describe("Collections Listing Page - Data Logic", () => {
     const testDb = createTestDatabase();
     db = testDb.db as unknown as Database;
     collectionService = createCollectionService(db);
-    postService = createPostService(db, createPathRegistryService(db));
+    postService = createPostService(db, { slugIdLength: 5 });
   });
 
   it("returns collections with post counts", async () => {
@@ -38,11 +37,11 @@ describe("Collections Listing Page - Data Logic", () => {
     // Add posts to recipes collection via junction table
     const p1 = await postService.create({
       format: "note",
-      body: "Recipe 1",
+      bodyMarkdown: "Recipe 1",
     });
     const p2 = await postService.create({
       format: "note",
-      body: "Recipe 2",
+      bodyMarkdown: "Recipe 2",
     });
     await collectionService.addPost(recipes.id, p1.id);
     await collectionService.addPost(recipes.id, p2.id);
@@ -78,11 +77,11 @@ describe("Collections Listing Page - Data Logic", () => {
 
     const post = await postService.create({
       format: "note",
-      body: "Will be deleted",
+      bodyMarkdown: "Will be deleted",
     });
     const post2 = await postService.create({
       format: "note",
-      body: "Will remain",
+      bodyMarkdown: "Will remain",
     });
 
     await collectionService.addPost(col.id, post.id);

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

@@ -9,7 +9,6 @@
 import { describe, it, expect, beforeEach } from "vitest";
 import { createTestDatabase } from "../../../__tests__/helpers/db.js";
 import { createPostService } from "../../../services/post.js";
-import { createPathRegistryService } from "../../../services/path-registry.js";
 import type { Database } from "../../../db/index.js";
 
 describe("Featured Page - Data Logic", () => {
@@ -19,25 +18,24 @@ describe("Featured Page - Data Logic", () => {
   beforeEach(() => {
     const testDb = createTestDatabase();
     db = testDb.db as unknown as Database;
-    postService = createPostService(db, createPathRegistryService(db));
+    postService = createPostService(db, { slugIdLength: 5 });
   });
 
   it("returns only featured published posts", async () => {
     await postService.create({
       format: "note",
-      body: "Featured post",
+      bodyMarkdown: "Featured post",
       featured: true,
       status: "published",
     });
     await postService.create({
       format: "note",
-      body: "Normal post",
-      featured: false,
+      bodyMarkdown: "Normal post",
       status: "published",
     });
     await postService.create({
       format: "note",
-      body: "Draft featured",
+      bodyMarkdown: "Draft featured",
       featured: true,
       status: "draft",
     });
@@ -45,51 +43,71 @@ describe("Featured Page - Data Logic", () => {
     const posts = await postService.list({
       featured: true,
       status: "published",
-      excludeReplies: true,
     });
 
     expect(posts).toHaveLength(1);
-    expect(posts[0]?.body).toBe("Featured post");
+    expect(posts[0]?.bodyText).toBe("Featured post");
   });
 
   it("returns empty list when no featured posts exist", async () => {
     await postService.create({
       format: "note",
-      body: "Normal post",
+      bodyMarkdown: "Normal post",
       status: "published",
     });
 
     const posts = await postService.list({
       featured: true,
       status: "published",
-      excludeReplies: true,
     });
 
     expect(posts).toHaveLength(0);
   });
 
-  it("excludes replies from featured posts", async () => {
+  it("includes featured reply posts", async () => {
     const root = await postService.create({
       format: "note",
-      body: "Featured root",
-      featured: true,
+      bodyMarkdown: "Root post",
       status: "published",
     });
 
-    // Reply inherits featured from root
-    await postService.create({
+    // Create a reply and feature it independently
+    const reply = await postService.create({
       format: "note",
-      body: "Reply to featured",
+      bodyMarkdown: "Reply to root",
       replyToId: root.id,
     });
+    await postService.update(reply.id, { featured: true });
 
     const posts = await postService.list({
       featured: true,
       status: "published",
-      excludeReplies: true,
     });
 
     expect(posts).toHaveLength(1);
-    expect(posts[0]?.body).toBe("Featured root");
+    expect(posts[0]?.bodyText).toBe("Reply to root");
+  });
+
+  it("featured root and featured reply both appear", async () => {
+    const root = await postService.create({
+      format: "note",
+      bodyMarkdown: "Featured root",
+      featured: true,
+      status: "published",
+    });
+
+    const reply = await postService.create({
+      format: "note",
+      bodyMarkdown: "Featured reply",
+      replyToId: root.id,
+    });
+    await postService.update(reply.id, { featured: true });
+
+    const posts = await postService.list({
+      featured: true,
+      status: "published",
+    });
+
+    expect(posts).toHaveLength(2);
   });
 });

package/src/routes/pages/archive.tsx

@@ -1,73 +1,211 @@
 /**
  * Archive Page Route
  *
- * Shows all posts, optionally filtered by format or featured status
+ * Tumblr-style archive grid with rich filtering:
+ * year, collection, format, media types, title presence.
+ * Page-based pagination with media-enriched post tiles.
  */
 
 import { Hono } from "hono";
-import type { Bindings, Format } from "../../types.js";
+import type {
+  Bindings,
+  Format,
+  MediaKind,
+  PostWithMedia,
+} from "../../types.js";
 import type { AppVariables } from "../../types/app-context.js";
-import { FORMATS } from "../../types.js";
+import type {
+  ArchiveFilters,
+  ArchiveView,
+  ArchiveVisibility,
+} from "../../types/props.js";
+import { FORMATS, MEDIA_KINDS } from "../../types.js";
 import { ArchivePage } from "../../ui/pages/ArchivePage.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
-import { createMediaContext, toArchiveGroups } from "../../lib/view.js";
+import {
+  createMediaContext,
+  toArchiveGroupsWithMedia,
+} from "../../lib/view.js";
+import { buildMediaMap } from "../../lib/media-helpers.js";
+import type { PostFilters } from "../../services/post.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
-const PAGE_SIZE = 50;
+const PAGE_SIZE = 60;
 
 export const archiveRoutes = new Hono<Env>();
 
-// Archive page - all posts
 archiveRoutes.get("/", async (c) => {
+  const { services, appConfig } = c.var;
+
+  // --- Parse query params ---------------------------------------------------
+
   const formatParam = c.req.query("format") as Format | undefined;
   const format =
     formatParam && FORMATS.includes(formatParam) ? formatParam : undefined;
-  const featuredParam = c.req.query("featured");
-  const featured = featuredParam === "true" ? true : undefined;
 
-  // Parse cursor
-  const cursorParam = c.req.query("cursor");
-  const cursor = cursorParam ? parseInt(cursorParam, 10) : undefined;
+  const yearParam = c.req.query("year");
+  const year = yearParam ? parseInt(yearParam, 10) : undefined;
+  const validYear = year && !isNaN(year) && year > 1970 ? year : undefined;
+
+  const collectionSlug = c.req.query("collection") || undefined;
+
+  const mediaParam = c.req.query("media") || undefined;
+  const mediaKinds = mediaParam
+    ? (mediaParam
+        .split(",")
+        .filter((m): m is MediaKind =>
+          (MEDIA_KINDS as readonly string[]).includes(m),
+        ) as MediaKind[])
+    : undefined;
+
+  const hasMediaParam = c.req.query("hasMedia");
+  const hasMedia =
+    hasMediaParam === "1" ? true : hasMediaParam === "0" ? false : undefined;
+
+  const hasTitleParam = c.req.query("hasTitle");
+  const hasTitle =
+    hasTitleParam === "1" ? true : hasTitleParam === "0" ? false : undefined;
+
+  const VALID_VISIBILITIES = ["public", "unlisted", "private", "featured"];
+  const visibilityParam = c.req.query("visibility");
+  const visibilityAll = visibilityParam === "all";
+  const visibility =
+    visibilityParam && VALID_VISIBILITIES.includes(visibilityParam)
+      ? (visibilityParam as ArchiveVisibility)
+      : undefined;
+
+  const viewParam = c.req.query("view") as ArchiveView | undefined;
+  const view =
+    viewParam && (viewParam === "grid" || viewParam === "list")
+      ? viewParam
+      : undefined;
+
+  const pageParam = c.req.query("page");
+  const currentPage = Math.max(1, parseInt(pageParam || "1", 10) || 1);
+
+  // --- Resolve collection slug to ID ----------------------------------------
+
+  const collection = collectionSlug
+    ? await services.collections.getBySlug(collectionSlug)
+    : undefined;
+  const collectionId = collection?.id;
+
+  // --- Build timestamp range for year filter --------------------------------
+
+  let publishedAfter: number | undefined;
+  let publishedBefore: number | undefined;
+  if (validYear) {
+    publishedAfter = Date.UTC(validYear, 0, 1) / 1000;
+    publishedBefore = Date.UTC(validYear + 1, 0, 1) / 1000;
+  }
+
+  // --- Build filters --------------------------------------------------------
 
   const navData = await getNavigationData(c);
 
-  // Fetch one extra to check for more
-  const posts = await c.var.services.posts.list({
+  // --- Map visibility filter to service-level filters -------------------------
+  // Visibility filter is only meaningful when authenticated — unauthenticated
+  // users cannot see unlisted or private posts regardless of the query param.
+
+  // Default to "public" when authenticated unless explicitly set to "all"
+  const effectiveVisibility = navData.isAuthenticated
+    ? visibilityAll
+      ? undefined
+      : (visibility ?? "public")
+    : undefined;
+
+  const filters: PostFilters = {
     format,
     status: "published",
-    featured,
     excludeReplies: true,
-    cursor,
-    limit: PAGE_SIZE + 1,
-  });
+    excludePrivate: !navData.isAuthenticated,
+    excludeUnlisted: !navData.isAuthenticated,
+    ...(effectiveVisibility === "featured"
+      ? { featured: true }
+      : effectiveVisibility
+        ? { visibility: effectiveVisibility }
+        : {}),
+    collectionId,
+    publishedAfter,
+    publishedBefore,
+    mediaKinds: mediaKinds && mediaKinds.length > 0 ? mediaKinds : undefined,
+    hasMedia,
+    hasTitle,
+  };
 
-  const hasMore = posts.length > PAGE_SIZE;
-  const displayPosts = hasMore ? posts.slice(0, PAGE_SIZE) : posts;
+  // --- Parallel data fetches ------------------------------------------------
 
-  // Get next cursor
-  const nextCursor =
-    hasMore && displayPosts.length > 0
-      ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- Length check above guarantees element exists
-        displayPosts[displayPosts.length - 1]!.id
-      : undefined;
+  const [totalCount, posts, availableYears, allCollections] = await Promise.all(
+    [
+      services.posts.count(filters),
+      services.posts.list({
+        ...filters,
+        limit: PAGE_SIZE,
+        offset: (currentPage - 1) * PAGE_SIZE,
+      }),
+      services.posts.getDistinctYears({
+        status: "published",
+        excludeReplies: true,
+      }),
+      services.collections.list(),
+    ],
+  );
+
+  const totalPages = Math.max(1, Math.ceil(totalCount / PAGE_SIZE));
 
-  // Group posts by year-month
-  const grouped = new Map<string, typeof displayPosts>();
-  for (const post of displayPosts) {
-    const date = new Date(post.publishedAt * 1000);
+  // --- Batch-load media for posts -------------------------------------------
+
+  const postIds = posts.map((p) => p.id);
+  const rawMediaMap = await services.media.getByPostIds(postIds);
+  const mediaCtx = createMediaContext(appConfig);
+  const mediaMap = buildMediaMap(
+    rawMediaMap,
+    mediaCtx.r2PublicUrl,
+    mediaCtx.imageTransformUrl,
+    mediaCtx.s3PublicUrl,
+  );
+
+  // --- Group posts by year-month with media ---------------------------------
+
+  const grouped = new Map<string, PostWithMedia[]>();
+  for (const post of posts) {
+    const publishedAt = post.publishedAt ?? post.updatedAt;
+    const date = new Date(publishedAt * 1000);
     const key = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}`;
     if (!grouped.has(key)) {
       grouped.set(key, []);
     }
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- Map.set() above guarantees key exists
-    grouped.get(key)!.push(post);
+    grouped.get(key)!.push({
+      ...post,
+      mediaAttachments: mediaMap.get(post.id) ?? [],
+    });
   }
 
-  // Transform to View Models
-  const mediaCtx = createMediaContext(c.var.appConfig);
-  const groups = toArchiveGroups(grouped, mediaCtx);
+  const groups = toArchiveGroupsWithMedia(grouped, mediaCtx);
+
+  // --- Build active filter state for UI -------------------------------------
+
+  const archiveFilters: ArchiveFilters = {
+    year: validYear,
+    collectionSlug,
+    collectionTitle: collection?.title,
+    collectionIcon: collection?.icon,
+    format,
+    mediaKinds: mediaKinds && mediaKinds.length > 0 ? mediaKinds : undefined,
+    hasMedia,
+    hasTitle,
+    visibility: effectiveVisibility,
+    view,
+  };
+
+  const availableCollectionsList = allCollections.map((col) => ({
+    slug: col.slug,
+    title: col.title,
+    icon: col.icon,
+  }));
 
   return renderPublicPage(c, {
     title: `Archive - ${navData.siteName}`,
@@ -75,10 +213,12 @@ archiveRoutes.get("/", async (c) => {
     content: (
       <ArchivePage
         groups={groups}
-        hasMore={hasMore}
-        nextCursor={nextCursor}
-        format={format}
-        featured={featured}
+        currentPage={currentPage}
+        totalPages={totalPages}
+        filters={archiveFilters}
+        availableYears={availableYears}
+        availableCollections={availableCollectionsList}
+        isAuthenticated={navData.isAuthenticated}
       />
     ),
   });