@jant/core 0.3.6 → 0.3.8

package/dist/routes/dash/posts.js

@@ -30,7 +30,7 @@ function PostsListContent({ posts }) {
         ]
     });
 }
-function NewPostContent() {
+function NewPostContent({ collections }) {
     const { i18n: $__i18n, _: $__ } = $_useLingui();
     return /*#__PURE__*/ _jsxs(_Fragment, {
         children: [
@@ -42,7 +42,8 @@ function NewPostContent() {
                 })
             }),
             /*#__PURE__*/ _jsx(PostForm, {
-                action: "/dash/posts"
+                action: "/dash/posts",
+                collections: collections
             })
         ]
     });
@@ -71,12 +72,15 @@ postsRoutes.get("/", async (c)=>{
 // New post form
 postsRoutes.get("/new", async (c)=>{
     const siteName = await getSiteName(c);
+    const collections = await c.var.services.collections.list();
     return c.html(/*#__PURE__*/ _jsx(DashLayout, {
         c: c,
         title: "New Post",
         siteName: siteName,
         currentPath: "/dash/posts",
-        children: /*#__PURE__*/ _jsx(NewPostContent, {})
+        children: /*#__PURE__*/ _jsx(NewPostContent, {
+            collections: collections
+        })
     }));
 });
 // Create post
@@ -88,8 +92,17 @@ postsRoutes.post("/", async (c)=>{
         content: body.content,
         visibility: body.visibility,
         sourceUrl: body.sourceUrl || undefined,
+        sourceName: body.sourceName || undefined,
         path: body.path || undefined
     });
+    // Attach media if provided
+    if (body.mediaIds && body.mediaIds.length > 0) {
+        await c.var.services.media.attachToPost(post.id, body.mediaIds);
+    }
+    // Sync collection associations
+    if (body.collectionIds) {
+        await c.var.services.collections.syncPostCollections(post.id, body.collectionIds);
+    }
     return dsRedirect(`/dash/posts/${sqid.encode(post.id)}`);
 });
 function ViewPostContent({ post }) {
@@ -135,7 +148,7 @@ function ViewPostContent({ post }) {
         ]
     });
 }
-function EditPostContent({ post }) {
+function EditPostContent({ post, mediaAttachments, r2PublicUrl, imageTransformUrl, collections, postCollectionIds }) {
     const { i18n: $__i18n, _: $__ } = $_useLingui();
     return /*#__PURE__*/ _jsxs(_Fragment, {
         children: [
@@ -148,7 +161,12 @@ function EditPostContent({ post }) {
             }),
             /*#__PURE__*/ _jsx(PostForm, {
                 post: post,
-                action: `/dash/posts/${sqid.encode(post.id)}`
+                action: `/dash/posts/${sqid.encode(post.id)}`,
+                mediaAttachments: mediaAttachments,
+                r2PublicUrl: r2PublicUrl,
+                imageTransformUrl: imageTransformUrl,
+                collections: collections,
+                postCollectionIds: postCollectionIds
             })
         ]
     });
@@ -178,13 +196,24 @@ postsRoutes.get("/:id/edit", async (c)=>{
     const post = await c.var.services.posts.getById(id);
     if (!post) return c.notFound();
     const siteName = await getSiteName(c);
+    const mediaAttachments = await c.var.services.media.getByPostId(post.id);
+    const r2PublicUrl = c.env.R2_PUBLIC_URL;
+    const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
+    const collections = await c.var.services.collections.list();
+    const postCollections = await c.var.services.collections.getCollectionsForPost(post.id);
+    const postCollectionIds = postCollections.map((col)=>col.id);
     return c.html(/*#__PURE__*/ _jsx(DashLayout, {
         c: c,
         title: `Edit: ${post.title || "Post"}`,
         siteName: siteName,
         currentPath: "/dash/posts",
         children: /*#__PURE__*/ _jsx(EditPostContent, {
-            post: post
+            post: post,
+            mediaAttachments: mediaAttachments,
+            r2PublicUrl: r2PublicUrl,
+            imageTransformUrl: imageTransformUrl,
+            collections: collections,
+            postCollectionIds: postCollectionIds
         })
     }));
 });
@@ -199,14 +228,24 @@ postsRoutes.post("/:id", async (c)=>{
         content: body.content || null,
         visibility: body.visibility,
         sourceUrl: body.sourceUrl || null,
+        sourceName: body.sourceName || null,
         path: body.path || null
     });
+    // Update media attachments if provided
+    if (body.mediaIds !== undefined) {
+        await c.var.services.media.attachToPost(id, body.mediaIds);
+    }
+    // Sync collection associations
+    if (body.collectionIds !== undefined) {
+        await c.var.services.collections.syncPostCollections(id, body.collectionIds);
+    }
     return dsRedirect(`/dash/posts/${sqid.encode(id)}`);
 });
 // Delete post
 postsRoutes.post("/:id/delete", async (c)=>{
     const id = sqid.decode(c.req.param("id"));
     if (!id) return c.notFound();
+    await c.var.services.media.detachFromPost(id);
     await c.var.services.posts.delete(id);
     return dsRedirect("/dash/posts");
 });

package/dist/routes/feed/rss.js

@@ -3,6 +3,7 @@
  */ import { Hono } from "hono";
 import * as sqid from "../../lib/sqid.js";
 import * as time from "../../lib/time.js";
+import { getMediaUrl } from "../../lib/image.js";
 export const rssRoutes = new Hono();
 // RSS 2.0 Feed - main feed at /feed
 rssRoutes.get("/", async (c)=>{
@@ -10,6 +11,7 @@ rssRoutes.get("/", async (c)=>{
     const siteName = all["SITE_NAME"] ?? "Jant";
     const siteDescription = all["SITE_DESCRIPTION"] ?? "";
     const siteUrl = c.env.SITE_URL;
+    const r2PublicUrl = c.env.R2_PUBLIC_URL;
     const posts = await c.var.services.posts.list({
         visibility: [
             "featured",
@@ -17,17 +19,24 @@ rssRoutes.get("/", async (c)=>{
         ],
         limit: 50
     });
+    // Batch load media for enclosures
+    const postIds = posts.map((p)=>p.id);
+    const mediaMap = await c.var.services.media.getByPostIds(postIds);
     const items = posts.map((post)=>{
         const link = `${siteUrl}/p/${sqid.encode(post.id)}`;
         const title = post.title || `Post #${post.id}`;
         const pubDate = new Date(post.publishedAt * 1000).toUTCString();
+        // Add enclosure for first media attachment
+        const postMedia = mediaMap.get(post.id);
+        const firstMedia = postMedia?.[0];
+        const enclosure = firstMedia ? `\n      <enclosure url="${getMediaUrl(firstMedia.id, firstMedia.r2Key, r2PublicUrl)}" length="${firstMedia.size}" type="${firstMedia.mimeType}"/>` : "";
         return `
     <item>
       <title><![CDATA[${escapeXml(title)}]]></title>
       <link>${link}</link>
       <guid isPermaLink="true">${link}</guid>
       <pubDate>${pubDate}</pubDate>
-      <description><![CDATA[${post.contentHtml || ""}]]></description>
+      <description><![CDATA[${post.contentHtml || ""}]]></description>${enclosure}
     </item>`;
     }).join("");
     const rss = `<?xml version="1.0" encoding="UTF-8"?>

package/dist/routes/pages/archive.js

@@ -1,16 +1,16 @@
 import { jsx as _jsx, jsxs as _jsxs } from "hono/jsx/jsx-runtime";
-import { getSiteName } from "../../lib/config.js";
 /**
  * Archive Page Route
  *
  * Shows all posts, optionally filtered by type
  */ import { Hono } from "hono";
 import { useLingui as $_useLingui } from "@jant/core/i18n";
-import { BaseLayout } from "../../theme/layouts/index.js";
+import { BaseLayout, SiteLayout } from "../../theme/layouts/index.js";
 import { Pagination } from "../../theme/components/index.js";
 import { POST_TYPES } from "../../types.js";
 import * as sqid from "../../lib/sqid.js";
 import * as time from "../../lib/time.js";
+import { getNavigationData } from "../../lib/navigation.js";
 const PAGE_SIZE = 50;
 export const archiveRoutes = new Hono();
 function getTypeLabel(type) {
@@ -89,7 +89,6 @@ function ArchiveContent({ displayPosts, hasMore, nextCursor, type, grouped, repl
         message: "Archive"
     });
     return /*#__PURE__*/ _jsxs("div", {
-        class: "container py-8",
         children: [
             /*#__PURE__*/ _jsxs("header", {
                 class: "mb-8",
@@ -183,21 +182,6 @@ function ArchiveContent({ displayPosts, hasMore, nextCursor, type, grouped, repl
                 baseUrl: type ? `/archive?type=${type}` : "/archive",
                 hasMore: hasMore,
                 nextCursor: nextCursor
-            }),
-            /*#__PURE__*/ _jsx("nav", {
-                class: "mt-4",
-                children: /*#__PURE__*/ _jsxs("a", {
-                    href: "/",
-                    class: "text-sm hover:underline",
-                    children: [
-                        "←",
-                        " ",
-                        $__i18n._({
-                            id: "x4RuFo",
-                            message: "Back to home"
-                        })
-                    ]
-                })
             })
         ]
     });
@@ -209,7 +193,7 @@ archiveRoutes.get("/", async (c)=>{
     // Parse cursor
     const cursorParam = c.req.query("cursor");
     const cursor = cursorParam ? parseInt(cursorParam, 10) : undefined;
-    const siteName = await getSiteName(c);
+    const navData = await getNavigationData(c);
     // Fetch one extra to check for more
     const posts = await c.var.services.posts.list({
         type,
@@ -240,15 +224,18 @@ archiveRoutes.get("/", async (c)=>{
         grouped.get(key).push(post);
     }
     return c.html(/*#__PURE__*/ _jsx(BaseLayout, {
-        title: `Archive - ${siteName}`,
+        title: `Archive - ${navData.siteName}`,
         c: c,
-        children: /*#__PURE__*/ _jsx(ArchiveContent, {
-            displayPosts: displayPosts,
-            hasMore: hasMore,
-            nextCursor: nextCursor,
-            type: type,
-            grouped: grouped,
-            replyCounts: replyCounts
+        children: /*#__PURE__*/ _jsx(SiteLayout, {
+            ...navData,
+            children: /*#__PURE__*/ _jsx(ArchiveContent, {
+                displayPosts: displayPosts,
+                hasMore: hasMore,
+                nextCursor: nextCursor,
+                type: type,
+                grouped: grouped,
+                replyCounts: replyCounts
+            })
         })
     }));
 });

package/dist/routes/pages/collection.js

@@ -1,17 +1,16 @@
 import { jsx as _jsx, jsxs as _jsxs } from "hono/jsx/jsx-runtime";
-import { getSiteName } from "../../lib/config.js";
 /**
  * Collection Page Route
  */ import { Hono } from "hono";
 import { useLingui as $_useLingui } from "@jant/core/i18n";
-import { BaseLayout } from "../../theme/layouts/index.js";
+import { BaseLayout, SiteLayout } from "../../theme/layouts/index.js";
 import * as sqid from "../../lib/sqid.js";
 import * as time from "../../lib/time.js";
+import { getNavigationData } from "../../lib/navigation.js";
 export const collectionRoutes = new Hono();
 function CollectionContent({ collection, posts }) {
     const { i18n: $__i18n, _: $__ } = $_useLingui();
     return /*#__PURE__*/ _jsxs("div", {
-        class: "container py-8",
         children: [
             /*#__PURE__*/ _jsxs("header", {
                 class: "mb-8",
@@ -61,17 +60,6 @@ function CollectionContent({ collection, posts }) {
                             })
                         ]
                     }, post.id))
-            }),
-            /*#__PURE__*/ _jsx("nav", {
-                class: "mt-8",
-                children: /*#__PURE__*/ _jsx("a", {
-                    href: "/",
-                    class: "text-sm hover:underline",
-                    children: $__i18n._({
-                        id: "biOepV",
-                        message: "← Back to home"
-                    })
-                })
             })
         ]
     });
@@ -81,14 +69,17 @@ collectionRoutes.get("/:path", async (c)=>{
     const collection = await c.var.services.collections.getByPath(path);
     if (!collection) return c.notFound();
     const posts = await c.var.services.collections.getPosts(collection.id);
-    const siteName = await getSiteName(c);
+    const navData = await getNavigationData(c);
     return c.html(/*#__PURE__*/ _jsx(BaseLayout, {
-        title: `${collection.title} - ${siteName}`,
+        title: `${collection.title} - ${navData.siteName}`,
         description: collection.description ?? undefined,
         c: c,
-        children: /*#__PURE__*/ _jsx(CollectionContent, {
-            collection: collection,
-            posts: posts
+        children: /*#__PURE__*/ _jsx(SiteLayout, {
+            ...navData,
+            children: /*#__PURE__*/ _jsx(CollectionContent, {
+                collection: collection,
+                posts: posts
+            })
         })
     }));
 });

package/dist/routes/pages/home.js

@@ -1,119 +1,109 @@
-import { jsx as _jsx, jsxs as _jsxs } from "hono/jsx/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment } from "hono/jsx/jsx-runtime";
 /**
  * Home Page Route
+ *
+ * Timeline feed with per-type card components and thread previews.
  */ import { Hono } from "hono";
 import { useLingui as $_useLingui } from "@jant/core/i18n";
-import { BaseLayout } from "../../theme/layouts/index.js";
-import * as sqid from "../../lib/sqid.js";
-import * as time from "../../lib/time.js";
-import { getSiteName } from "../../lib/config.js";
+import { BaseLayout, SiteLayout } from "../../theme/layouts/index.js";
+import { buildMediaMap } from "../../lib/media-helpers.js";
+import { resolveTimelineFeed } from "../../lib/theme-components.js";
+import { TimelineFeed as DefaultTimelineFeed } from "../../theme/components/timeline/TimelineFeed.js";
+import { getNavigationData } from "../../lib/navigation.js";
+const PAGE_SIZE = 20;
 export const homeRoutes = new Hono();
-function HomeContent({ siteName, posts }) {
+function HomeContent({ FeedComponent, feedProps }) {
     const { i18n: $__i18n, _: $__ } = $_useLingui();
-    return /*#__PURE__*/ _jsxs("div", {
-        class: "container py-8",
-        children: [
-            /*#__PURE__*/ _jsxs("header", {
-                class: "mb-8 flex items-center justify-between",
-                children: [
-                    /*#__PURE__*/ _jsx("h1", {
-                        class: "text-2xl font-semibold",
-                        children: siteName
-                    }),
-                    /*#__PURE__*/ _jsxs("nav", {
-                        class: "flex items-center gap-4 text-sm",
-                        children: [
-                            /*#__PURE__*/ _jsx("a", {
-                                href: "/archive",
-                                class: "text-muted-foreground hover:text-foreground",
-                                children: $__i18n._({
-                                    id: "B495Gs",
-                                    message: "Archive"
-                                })
-                            }),
-                            /*#__PURE__*/ _jsx("a", {
-                                href: "/feed",
-                                class: "text-muted-foreground hover:text-foreground",
-                                children: "RSS"
-                            })
-                        ]
-                    })
-                ]
-            }),
-            /*#__PURE__*/ _jsx("main", {
-                class: "flex flex-col gap-6",
-                children: posts.length === 0 ? /*#__PURE__*/ _jsx("p", {
-                    class: "text-muted-foreground",
-                    children: $__i18n._({
-                        id: "ODiSoW",
-                        message: "No posts yet."
-                    })
-                }) : posts.map((post)=>/*#__PURE__*/ _jsxs("article", {
-                        class: "h-entry",
-                        children: [
-                            post.title && /*#__PURE__*/ _jsx("h2", {
-                                class: "p-name text-lg font-medium mb-2",
-                                children: /*#__PURE__*/ _jsx("a", {
-                                    href: `/p/${sqid.encode(post.id)}`,
-                                    class: "u-url hover:underline",
-                                    children: post.title
-                                })
-                            }),
-                            /*#__PURE__*/ _jsx("div", {
-                                class: "e-content prose prose-sm",
-                                dangerouslySetInnerHTML: {
-                                    __html: post.contentHtml || ""
-                                }
-                            }),
-                            /*#__PURE__*/ _jsxs("footer", {
-                                class: "mt-2 text-sm text-muted-foreground",
-                                children: [
-                                    /*#__PURE__*/ _jsx("time", {
-                                        class: "dt-published",
-                                        datetime: time.toISOString(post.publishedAt),
-                                        children: time.formatDate(post.publishedAt)
-                                    }),
-                                    post.visibility === "featured" && /*#__PURE__*/ _jsx("span", {
-                                        class: "ml-2 text-xs",
-                                        children: $__i18n._({
-                                            id: "FkMol5",
-                                            message: "Featured"
-                                        })
-                                    })
-                                ]
-                            })
-                        ]
-                    }, post.id))
-            }),
-            posts.length >= 20 && /*#__PURE__*/ _jsx("nav", {
-                class: "mt-8 text-center",
-                children: /*#__PURE__*/ _jsx("a", {
-                    href: "/archive",
-                    class: "text-sm text-muted-foreground hover:text-foreground",
-                    children: $__i18n._({
-                        id: "mTOYla",
-                        message: "View all posts →"
-                    })
-                })
+    return /*#__PURE__*/ _jsx(_Fragment, {
+        children: feedProps.items.length === 0 ? /*#__PURE__*/ _jsx("p", {
+            class: "text-muted-foreground",
+            children: $__i18n._({
+                id: "ODiSoW",
+                message: "No posts yet."
             })
-        ]
+        }) : /*#__PURE__*/ _jsx(FeedComponent, {
+            ...feedProps
+        })
     });
 }
 homeRoutes.get("/", async (c)=>{
-    const siteName = await getSiteName(c);
+    const navData = await getNavigationData(c);
+    // Fetch one extra to determine if there are more
     const posts = await c.var.services.posts.list({
         visibility: [
             "featured",
             "quiet"
         ],
-        limit: 20
+        excludeReplies: true,
+        excludeTypes: [
+            "page"
+        ],
+        limit: PAGE_SIZE + 1
     });
+    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 r2PublicUrl = c.env.R2_PUBLIC_URL;
+    const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
+    const mediaMap = buildMediaMap(rawMediaMap, r2PublicUrl, imageTransformUrl);
+    // 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 = [];
+    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), r2PublicUrl, imageTransformUrl) : new Map();
+    // Assemble timeline items
+    const items = displayPosts.map((post)=>{
+        const postWithMedia = {
+            ...post,
+            mediaAttachments: mediaMap.get(post.id) ?? []
+        };
+        const replyCount = replyCounts.get(post.id) ?? 0;
+        const previewReplies = threadPreviews.get(post.id);
+        if (replyCount > 0 && previewReplies) {
+            return {
+                post: postWithMedia,
+                threadPreview: {
+                    replies: previewReplies.map((r)=>({
+                            ...r,
+                            mediaAttachments: previewMediaMap.get(r.id) ?? []
+                        })),
+                    totalReplyCount: replyCount
+                }
+            };
+        }
+        return {
+            post: postWithMedia
+        };
+    });
+    // Determine next cursor
+    const lastPost = displayPosts[displayPosts.length - 1];
+    const nextCursor = hasMore && lastPost ? lastPost.id : undefined;
+    // Resolve theme components
+    const Feed = resolveTimelineFeed(DefaultTimelineFeed, c.var.config.theme?.components);
+    const feedProps = {
+        items,
+        hasMore,
+        nextCursor
+    };
     return c.html(/*#__PURE__*/ _jsx(BaseLayout, {
-        title: siteName,
+        title: navData.siteName,
         c: c,
-        children: /*#__PURE__*/ _jsx(HomeContent, {
-            siteName: siteName,
-            posts: posts
+        children: /*#__PURE__*/ _jsx(SiteLayout, {
+            ...navData,
+            children: /*#__PURE__*/ _jsx(HomeContent, {
+                FeedComponent: Feed,
+                feedProps: feedProps
+            })
         })
     }));
 });

package/dist/routes/pages/page.js

@@ -1,47 +1,25 @@
 import { jsx as _jsx, jsxs as _jsxs } from "hono/jsx/jsx-runtime";
-import { getSiteName } from "../../lib/config.js";
 /**
  * Custom Page Route
  *
  * Catch-all route for custom pages accessible via their path field
  */ import { Hono } from "hono";
-import { useLingui as $_useLingui } from "@jant/core/i18n";
-import { BaseLayout } from "../../theme/layouts/index.js";
+import { BaseLayout, SiteLayout } from "../../theme/layouts/index.js";
+import { getNavigationData } from "../../lib/navigation.js";
 export const pageRoutes = new Hono();
 function PageContent({ page }) {
-    const { i18n: $__i18n, _: $__ } = $_useLingui();
-    return /*#__PURE__*/ _jsxs("div", {
-        class: "container py-8 max-w-2xl",
+    return /*#__PURE__*/ _jsxs("article", {
+        class: "h-entry",
         children: [
-            /*#__PURE__*/ _jsxs("article", {
-                class: "h-entry",
-                children: [
-                    page.title && /*#__PURE__*/ _jsx("h1", {
-                        class: "p-name text-3xl font-semibold mb-6",
-                        children: page.title
-                    }),
-                    /*#__PURE__*/ _jsx("div", {
-                        class: "e-content prose",
-                        dangerouslySetInnerHTML: {
-                            __html: page.contentHtml || ""
-                        }
-                    })
-                ]
+            page.title && /*#__PURE__*/ _jsx("h1", {
+                class: "p-name text-3xl font-semibold mb-6",
+                children: page.title
             }),
-            /*#__PURE__*/ _jsx("nav", {
-                class: "mt-8 pt-6 border-t",
-                children: /*#__PURE__*/ _jsxs("a", {
-                    href: "/",
-                    class: "text-sm hover:underline",
-                    children: [
-                        "←",
-                        " ",
-                        $__i18n._({
-                            id: "x4RuFo",
-                            message: "Back to home"
-                        })
-                    ]
-                })
+            /*#__PURE__*/ _jsx("div", {
+                class: "e-content prose",
+                dangerouslySetInnerHTML: {
+                    __html: page.contentHtml || ""
+                }
             })
         ]
     });
@@ -59,13 +37,16 @@ pageRoutes.get("/:path", async (c)=>{
     if (page.visibility === "draft") {
         return c.notFound();
     }
-    const siteName = await getSiteName(c);
+    const navData = await getNavigationData(c);
     return c.html(/*#__PURE__*/ _jsx(BaseLayout, {
-        title: `${page.title} - ${siteName}`,
+        title: `${page.title} - ${navData.siteName}`,
         description: page.content?.slice(0, 160),
         c: c,
-        children: /*#__PURE__*/ _jsx(PageContent, {
-            page: page
+        children: /*#__PURE__*/ _jsx(SiteLayout, {
+            ...navData,
+            children: /*#__PURE__*/ _jsx(PageContent, {
+                page: page
+            })
         })
     }));
 });