@jant/core 0.3.23 → 0.3.25

package/src/routes/pages/archive.tsx

@@ -1,14 +1,14 @@
 /**
  * Archive Page Route
  *
- * Shows all posts, optionally filtered by type
+ * Shows all posts, optionally filtered by format or featured status
  */
 
 import { Hono } from "hono";
-import type { Bindings, PostType } from "../../types.js";
+import type { Bindings, Format } from "../../types.js";
 import type { AppVariables } from "../../app.js";
-import { POST_TYPES } from "../../types.js";
-import { ArchivePage as DefaultArchivePage } from "../../themes/minimal/pages/ArchivePage.js";
+import { FORMATS } 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";
@@ -21,9 +21,11 @@ export const archiveRoutes = new Hono<Env>();
 
 // Archive page - all posts
 archiveRoutes.get("/", async (c) => {
-  const typeParam = c.req.query("type") as PostType | undefined;
-  const type =
-    typeParam && POST_TYPES.includes(typeParam) ? typeParam : undefined;
+  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");
@@ -33,8 +35,9 @@ archiveRoutes.get("/", async (c) => {
 
   // Fetch one extra to check for more
   const posts = await c.var.services.posts.list({
-    type,
-    visibility: ["featured", "quiet"],
+    format,
+    status: "published",
+    featured,
     excludeReplies: true,
     cursor,
     limit: PAGE_SIZE + 1,
@@ -66,19 +69,16 @@ archiveRoutes.get("/", async (c) => {
   const mediaCtx = createMediaContext(c);
   const groups = toArchiveGroups(grouped, mediaCtx);
 
-  const components = c.var.config.theme?.components;
-  const Page = components?.ArchivePage ?? DefaultArchivePage;
-
   return renderPublicPage(c, {
     title: `Archive - ${navData.siteName}`,
     navData,
     content: (
-      <Page
+      <ArchivePage
         groups={groups}
         hasMore={hasMore}
         nextCursor={nextCursor}
-        type={type}
-        theme={components}
+        format={format}
+        featured={featured}
       />
     ),
   });

package/src/routes/pages/collection.tsx

@@ -5,7 +5,7 @@
 import { Hono } from "hono";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../app.js";
-import { CollectionPage as DefaultCollectionPage } from "../../themes/minimal/pages/CollectionPage.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";
@@ -14,28 +14,35 @@ type Env = { Bindings: Bindings; Variables: AppVariables };
 
 export const collectionRoutes = new Hono<Env>();
 
-collectionRoutes.get("/:path", async (c) => {
-  const path = c.req.param("path");
+collectionRoutes.get("/:slug", async (c) => {
+  const slug = c.req.param("slug");
 
-  const collection = await c.var.services.collections.getByPath(path);
+  const collection = await c.var.services.collections.getBySlug(slug);
   if (!collection) return c.notFound();
 
-  const posts = await c.var.services.collections.getPosts(collection.id);
+  // Fetch posts in this collection
+  const posts = await c.var.services.posts.list({
+    collectionId: collection.id,
+    status: "published",
+    excludeReplies: true,
+  });
+
   const navData = await getNavigationData(c);
 
   // Transform to View Models
   const mediaCtx = createMediaContext(c);
   const postViews = toPostViewsFromPosts(posts, mediaCtx);
 
-  const components = c.var.config.theme?.components;
-  const Page = components?.CollectionPage ?? DefaultCollectionPage;
-
   return renderPublicPage(c, {
     title: `${collection.title} - ${navData.siteName}`,
     description: collection.description ?? undefined,
     navData,
     content: (
-      <Page collection={collection} posts={postViews} theme={components} />
+      <CollectionPage
+        collection={collection}
+        posts={postViews}
+        hasMore={false}
+      />
     ),
   });
 });

package/src/routes/pages/collections.tsx

@@ -0,0 +1,36 @@
+/**
+ * Collections Listing Page Route
+ *
+ * Lists all collections with their post counts.
+ */
+
+import { Hono } from "hono";
+import type { Bindings } from "../../types.js";
+import type { AppVariables } from "../../app.js";
+import { getNavigationData } from "../../lib/navigation.js";
+import { renderPublicPage } from "../../lib/render.js";
+import { CollectionsPage } from "../../ui/pages/CollectionsPage.js";
+
+type Env = { Bindings: Bindings; Variables: AppVariables };
+
+export const collectionsPageRoutes = new Hono<Env>();
+
+collectionsPageRoutes.get("/", async (c) => {
+  const [allCollections, postCounts] = await Promise.all([
+    c.var.services.collections.list(),
+    c.var.services.collections.getPostCounts(),
+  ]);
+
+  const collections = allCollections.map((col) => ({
+    ...col,
+    postCount: postCounts.get(col.id) ?? 0,
+  }));
+
+  const navData = await getNavigationData(c);
+
+  return renderPublicPage(c, {
+    title: `Collections - ${navData.siteName}`,
+    navData,
+    content: <CollectionsPage collections={collections} />,
+  });
+});

package/src/routes/pages/featured.tsx

@@ -0,0 +1,38 @@
+/**
+ * Featured Page Route
+ *
+ * Shows featured posts as a timeline feed.
+ */
+
+import { Hono } from "hono";
+import type { Bindings } from "../../types.js";
+import type { AppVariables } from "../../app.js";
+import { getNavigationData } from "../../lib/navigation.js";
+import { renderPublicPage } from "../../lib/render.js";
+import { createMediaContext, toPostViewsFromPosts } from "../../lib/view.js";
+import { FeaturedPage } from "../../ui/pages/FeaturedPage.js";
+
+type Env = { Bindings: Bindings; Variables: AppVariables };
+
+export const featuredRoutes = new Hono<Env>();
+
+featuredRoutes.get("/", async (c) => {
+  const posts = await c.var.services.posts.list({
+    featured: true,
+    status: "published",
+    excludeReplies: true,
+  });
+
+  const navData = await getNavigationData(c);
+  const mediaCtx = createMediaContext(c);
+  const postViews = toPostViewsFromPosts(posts, mediaCtx);
+
+  // Convert to timeline items (simple — no thread previews)
+  const items = postViews.map((post) => ({ post }));
+
+  return renderPublicPage(c, {
+    title: `Featured - ${navData.siteName}`,
+    navData,
+    content: <FeaturedPage items={items} />,
+  });
+});

package/src/routes/pages/home.tsx

@@ -2,121 +2,50 @@
  * Home Page Route
  *
  * Timeline feed with per-type card components and thread previews.
+ * Uses page-based pagination.
  */
 
 import { Hono } from "hono";
-import type { Bindings, TimelineItemView } from "../../types.js";
+import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../app.js";
-import { buildMediaMap } from "../../lib/media-helpers.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
-import { HomePage as DefaultHomePage } from "../../themes/minimal/pages/HomePage.js";
-import { createMediaContext, toPostView, toPostViews } from "../../lib/view.js";
+import { assembleTimeline } from "../../lib/timeline.js";
+import { createMediaContext, toPostViewsFromPosts } from "../../lib/view.js";
+import { HomePage } from "../../ui/pages/HomePage.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
-const PAGE_SIZE = 20;
-
 export const homeRoutes = new Hono<Env>();
 
 homeRoutes.get("/", async (c) => {
-  const navData = await getNavigationData(c);
+  const pageParam = c.req.query("page");
+  const page = pageParam ? Math.max(1, parseInt(pageParam, 10) || 1) : 1;
 
-  // Fetch one extra to determine if there are more
-  const posts = await c.var.services.posts.list({
-    visibility: ["featured", "quiet"],
-    excludeReplies: true,
-    excludeTypes: ["page"],
-    limit: PAGE_SIZE + 1,
+  const { items, currentPage, totalPages } = await assembleTimeline(c, {
+    page,
   });
 
-  const hasMore = posts.length > PAGE_SIZE;
-  const displayPosts = hasMore ? posts.slice(0, PAGE_SIZE) : posts;
-
-  // Batch load media attachments
-  const postIds = displayPosts.map((p) => p.id);
-  const rawMediaMap = await c.var.services.media.getByPostIds(postIds);
-  const mediaCtx = createMediaContext(c);
-  const mediaMap = buildMediaMap(
-    rawMediaMap,
-    mediaCtx.r2PublicUrl,
-    mediaCtx.imageTransformUrl,
-    mediaCtx.s3PublicUrl,
-  );
-
-  // Get reply counts to identify thread roots
-  const replyCounts = await c.var.services.posts.getReplyCounts(postIds);
-  const threadRootIds = postIds.filter((id) => (replyCounts.get(id) ?? 0) > 0);
-
-  // Batch load thread previews
-  const threadPreviews = await c.var.services.posts.getThreadPreviews(
-    threadRootIds,
-    3,
-  );
-
-  // Batch load media for preview replies
-  const previewReplyIds: number[] = [];
-  for (const replies of threadPreviews.values()) {
-    for (const reply of replies) {
-      previewReplyIds.push(reply.id);
-    }
-  }
-  const previewMediaMap =
-    previewReplyIds.length > 0
-      ? buildMediaMap(
-          await c.var.services.media.getByPostIds(previewReplyIds),
-          mediaCtx.r2PublicUrl,
-          mediaCtx.imageTransformUrl,
-          mediaCtx.s3PublicUrl,
-        )
-      : new Map();
-
-  // Assemble timeline items with View Models
-  const items: TimelineItemView[] = displayPosts.map((post) => {
-    const postView = toPostView(
-      { ...post, mediaAttachments: mediaMap.get(post.id) ?? [] },
-      mediaCtx,
-    );
-
-    const replyCount = replyCounts.get(post.id) ?? 0;
-    const previewReplies = threadPreviews.get(post.id);
-
-    if (replyCount > 0 && previewReplies) {
-      return {
-        post: postView,
-        threadPreview: {
-          replies: toPostViews(
-            previewReplies.map((r) => ({
-              ...r,
-              mediaAttachments: previewMediaMap.get(r.id) ?? [],
-            })),
-            mediaCtx,
-          ),
-          totalReplyCount: replyCount,
-        },
-      };
-    }
+  const navData = await getNavigationData(c);
 
-    return { post: postView };
+  // Fetch pinned posts
+  const pinnedPosts = await c.var.services.posts.list({
+    pinned: true,
+    status: "published",
+    excludeReplies: true,
   });
-
-  // Determine next cursor
-  const lastPost = displayPosts[displayPosts.length - 1];
-  const nextCursor = hasMore && lastPost ? lastPost.id : undefined;
-
-  // Resolve page component
-  const components = c.var.config.theme?.components;
-  const Page = components?.HomePage ?? DefaultHomePage;
+  const mediaCtx = createMediaContext(c);
+  const pinnedItems = toPostViewsFromPosts(pinnedPosts, mediaCtx);
 
   return renderPublicPage(c, {
     title: navData.siteName,
     navData,
     content: (
-      <Page
+      <HomePage
         items={items}
-        hasMore={hasMore}
-        nextCursor={nextCursor}
-        theme={components}
+        pinnedItems={pinnedItems}
+        currentPage={currentPage}
+        totalPages={totalPages}
       />
     ),
   });

package/src/routes/pages/page.tsx

@@ -1,51 +1,86 @@
 /**
  * Custom Page Route
  *
- * Catch-all route for custom pages accessible via their path field
+ * Serves pages from the pages table and posts with custom paths.
+ * This is a catch-all route mounted at "/" - must be registered last.
+ * Supports multi-level paths (e.g. /2024/my-post) for posts.
  */
 
 import { Hono } from "hono";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../app.js";
-import { SinglePage as DefaultSinglePage } from "../../themes/minimal/pages/SinglePage.js";
+import { SinglePage } from "../../ui/pages/SinglePage.js";
+import { PostPage } from "../../ui/pages/PostPage.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
-import { createMediaContext, toPostViewFromPost } from "../../lib/view.js";
+import { buildMediaMap } from "../../lib/media-helpers.js";
+import { createMediaContext, toPageView, toPostView } from "../../lib/view.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
 export const pageRoutes = new Hono<Env>();
 
-// Catch-all for custom page paths
-pageRoutes.get("/:path", async (c) => {
-  const path = c.req.param("path");
+// Catch-all for custom page slugs and post paths (including multi-level)
+pageRoutes.get("/*", async (c) => {
+  const fullPath = c.req.path.slice(1); // Remove leading /
+  if (!fullPath) return c.notFound();
 
-  // Look up page by path
-  const page = await c.var.services.posts.getByPath(path);
+  const isMultiSegment = fullPath.includes("/");
 
-  // Not found or not a page
-  if (!page || page.type !== "page") {
-    return c.notFound();
-  }
+  // Pages only have single-level slugs; skip page lookup for multi-segment paths
+  if (!isMultiSegment) {
+    const page = await c.var.services.pages.getBySlug(fullPath);
+
+    if (page) {
+      if (page.status === "draft") {
+        return c.notFound();
+      }
 
-  // Don't show drafts
-  if (page.visibility === "draft") {
-    return c.notFound();
+      const navData = await getNavigationData(c);
+      const pageView = toPageView(page);
+
+      return renderPublicPage(c, {
+        title: `${page.title || fullPath} - ${navData.siteName}`,
+        description: page.body?.slice(0, 160),
+        navData,
+        content: <SinglePage page={pageView} />,
+      });
+    }
   }
 
-  const navData = await getNavigationData(c);
+  // Posts support multi-level paths
+  const post = await c.var.services.posts.getByPath(fullPath);
+
+  if (post) {
+    if (post.status === "draft") {
+      return c.notFound();
+    }
 
-  // Transform to View Model
-  const mediaCtx = createMediaContext(c);
-  const pageView = toPostViewFromPost(page, mediaCtx);
+    // Load media attachments
+    const rawMediaMap = await c.var.services.media.getByPostIds([post.id]);
+    const mediaCtx = createMediaContext(c);
+    const mediaMap = buildMediaMap(
+      rawMediaMap,
+      mediaCtx.r2PublicUrl,
+      mediaCtx.imageTransformUrl,
+      mediaCtx.s3PublicUrl,
+    );
 
-  const components = c.var.config.theme?.components;
-  const Page = components?.SinglePage ?? DefaultSinglePage;
+    const postView = toPostView(
+      { ...post, mediaAttachments: mediaMap.get(post.id) ?? [] },
+      mediaCtx,
+    );
+
+    const navData = await getNavigationData(c);
+    const title = post.title || navData.siteName;
+
+    return renderPublicPage(c, {
+      title,
+      description: post.body?.slice(0, 160),
+      navData,
+      content: <PostPage post={postView} />,
+    });
+  }
 
-  return renderPublicPage(c, {
-    title: `${page.title} - ${navData.siteName}`,
-    description: page.content?.slice(0, 160),
-    navData,
-    content: <Page page={pageView} theme={components} />,
-  });
+  return c.notFound();
 });

package/src/routes/pages/post.tsx

@@ -5,7 +5,7 @@
 import { Hono } from "hono";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../app.js";
-import { PostPage as DefaultPostPage } from "../../themes/minimal/pages/PostPage.js";
+import { PostPage } from "../../ui/pages/PostPage.js";
 import * as sqid from "../../lib/sqid.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
@@ -19,24 +19,15 @@ export const postRoutes = new Hono<Env>();
 postRoutes.get("/:id", async (c) => {
   const paramId = c.req.param("id");
 
-  // Try to decode as sqid first
-  let id = sqid.decode(paramId);
-
-  // If not a valid sqid, try to find by path
-  if (!id) {
-    const post = await c.var.services.posts.getByPath(paramId);
-    if (post) {
-      id = post.id;
-    }
-  }
-
+  // Decode sqid to numeric ID
+  const id = sqid.decode(paramId);
   if (!id) return c.notFound();
 
   const post = await c.var.services.posts.getById(id);
   if (!post) return c.notFound();
 
   // Don't show drafts on public site
-  if (post.visibility === "draft") {
+  if (post.status === "draft") {
     return c.notFound();
   }
 
@@ -59,13 +50,10 @@ postRoutes.get("/:id", async (c) => {
   const navData = await getNavigationData(c);
   const title = post.title || navData.siteName;
 
-  const components = c.var.config.theme?.components;
-  const Page = components?.PostPage ?? DefaultPostPage;
-
   return renderPublicPage(c, {
     title,
-    description: post.content?.slice(0, 160),
+    description: post.body?.slice(0, 160),
     navData,
-    content: <Page post={postView} theme={components} />,
+    content: <PostPage post={postView} />,
   });
 });

package/src/routes/pages/search.tsx

@@ -5,7 +5,7 @@
 import { Hono } from "hono";
 import type { Bindings, SearchResult } from "../../types.js";
 import type { AppVariables } from "../../app.js";
-import { SearchPage as DefaultSearchPage } from "../../themes/minimal/pages/SearchPage.js";
+import { SearchPage } from "../../ui/pages/SearchPage.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
 import { createMediaContext, toSearchResultViews } from "../../lib/view.js";
@@ -34,7 +34,7 @@ searchRoutes.get("/", async (c) => {
       results = await c.var.services.search.search(query, {
         limit: PAGE_SIZE + 1,
         offset: (page - 1) * PAGE_SIZE,
-        visibility: ["featured", "quiet"],
+        status: ["published"],
       });
 
       hasMore = results.length > PAGE_SIZE;
@@ -52,22 +52,18 @@ searchRoutes.get("/", async (c) => {
   const mediaCtx = createMediaContext(c);
   const resultViews = toSearchResultViews(results, mediaCtx);
 
-  const components = c.var.config.theme?.components;
-  const Page = components?.SearchPage ?? DefaultSearchPage;
-
   return renderPublicPage(c, {
     title: query
       ? `Search: ${query} - ${navData.siteName}`
       : `Search - ${navData.siteName}`,
     navData,
     content: (
-      <Page
+      <SearchPage
         query={query}
         results={resultViews}
         error={error}
         hasMore={hasMore}
         page={page}
-        theme={components}
       />
     ),
   });