@jant/core 0.3.7 → 0.3.9

package/dist/routes/pages/home.js

@@ -1,152 +1,110 @@
-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 { MediaGallery } from "../../theme/components/index.js";
-import * as sqid from "../../lib/sqid.js";
-import * as time from "../../lib/time.js";
-import { getSiteName } from "../../lib/config.js";
-import { getMediaUrl, getImageUrl } from "../../lib/image.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, mediaMap }) {
+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)=>{
-                    const attachments = mediaMap.get(post.id) ?? [];
-                    return /*#__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 || ""
-                                }
-                            }),
-                            attachments.length > 0 && /*#__PURE__*/ _jsx(MediaGallery, {
-                                attachments: attachments
-                            }),
-                            /*#__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 = posts.map((p)=>p.id);
+    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 = new Map();
-    for (const [postId, mediaList] of rawMediaMap){
-        mediaMap.set(postId, mediaList.map((m)=>({
-                id: m.id,
-                url: getMediaUrl(m.id, m.r2Key, r2PublicUrl),
-                previewUrl: getImageUrl(getMediaUrl(m.id, m.r2Key, r2PublicUrl), imageTransformUrl, {
-                    width: 400,
-                    quality: 80,
-                    format: "auto",
-                    fit: "cover"
-                }),
-                alt: m.alt,
-                blurhash: m.blurhash,
-                width: m.width,
-                height: m.height,
-                position: m.position,
-                mimeType: m.mimeType
-            })));
+    const s3PublicUrl = c.env.S3_PUBLIC_URL;
+    const mediaMap = buildMediaMap(rawMediaMap, r2PublicUrl, imageTransformUrl, 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 = [];
+    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, s3PublicUrl) : 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,
-            mediaMap: mediaMap
+        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
+            })
         })
     }));
 });

package/dist/routes/pages/post.js

@@ -1,66 +1,50 @@
 import { jsx as _jsx, jsxs as _jsxs } from "hono/jsx/jsx-runtime";
-import { getSiteName } from "../../lib/config.js";
 /**
  * Single Post 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 { MediaGallery } from "../../theme/components/index.js";
 import * as sqid from "../../lib/sqid.js";
 import * as time from "../../lib/time.js";
-import { getMediaUrl, getImageUrl } from "../../lib/image.js";
+import { getMediaUrl, getImageUrl, getPublicUrlForProvider } from "../../lib/image.js";
+import { getNavigationData } from "../../lib/navigation.js";
 export const postRoutes = new Hono();
 function PostContent({ post, mediaAttachments }) {
     const { i18n: $__i18n, _: $__ } = $_useLingui();
-    return /*#__PURE__*/ _jsxs("div", {
-        class: "container py-8",
+    return /*#__PURE__*/ _jsxs("article", {
+        class: "h-entry",
         children: [
-            /*#__PURE__*/ _jsxs("article", {
-                class: "h-entry",
+            post.title && /*#__PURE__*/ _jsx("h1", {
+                class: "p-name text-2xl font-semibold mb-4",
+                children: post.title
+            }),
+            /*#__PURE__*/ _jsx("div", {
+                class: "e-content prose",
+                dangerouslySetInnerHTML: {
+                    __html: post.contentHtml || ""
+                }
+            }),
+            mediaAttachments.length > 0 && /*#__PURE__*/ _jsx(MediaGallery, {
+                attachments: mediaAttachments
+            }),
+            /*#__PURE__*/ _jsxs("footer", {
+                class: "mt-6 pt-4 border-t text-sm text-muted-foreground",
                 children: [
-                    post.title && /*#__PURE__*/ _jsx("h1", {
-                        class: "p-name text-2xl font-semibold mb-4",
-                        children: post.title
-                    }),
-                    /*#__PURE__*/ _jsx("div", {
-                        class: "e-content prose",
-                        dangerouslySetInnerHTML: {
-                            __html: post.contentHtml || ""
-                        }
-                    }),
-                    mediaAttachments.length > 0 && /*#__PURE__*/ _jsx(MediaGallery, {
-                        attachments: mediaAttachments
+                    /*#__PURE__*/ _jsx("time", {
+                        class: "dt-published",
+                        datetime: time.toISOString(post.publishedAt),
+                        children: time.formatDate(post.publishedAt)
                     }),
-                    /*#__PURE__*/ _jsxs("footer", {
-                        class: "mt-6 pt-4 border-t text-sm text-muted-foreground",
-                        children: [
-                            /*#__PURE__*/ _jsx("time", {
-                                class: "dt-published",
-                                datetime: time.toISOString(post.publishedAt),
-                                children: time.formatDate(post.publishedAt)
-                            }),
-                            /*#__PURE__*/ _jsx("a", {
-                                href: `/p/${sqid.encode(post.id)}`,
-                                class: "u-url ml-4",
-                                children: $__i18n._({
-                                    id: "D9Oea+",
-                                    message: "Permalink"
-                                })
-                            })
-                        ]
+                    /*#__PURE__*/ _jsx("a", {
+                        href: `/p/${sqid.encode(post.id)}`,
+                        class: "u-url ml-4",
+                        children: $__i18n._({
+                            id: "D9Oea+",
+                            message: "Permalink"
+                        })
                     })
                 ]
-            }),
-            /*#__PURE__*/ _jsx("nav", {
-                class: "mt-8",
-                children: /*#__PURE__*/ _jsx("a", {
-                    href: "/",
-                    class: "text-sm hover:underline",
-                    children: $__i18n._({
-                        id: "biOepV",
-                        message: "← Back to home"
-                    })
-                })
             })
         ]
     });
@@ -87,10 +71,13 @@ postRoutes.get("/:id", async (c)=>{
     const rawMedia = await c.var.services.media.getByPostId(post.id);
     const r2PublicUrl = c.env.R2_PUBLIC_URL;
     const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
-    const mediaAttachments = rawMedia.map((m)=>({
+    const s3PublicUrl = c.env.S3_PUBLIC_URL;
+    const mediaAttachments = rawMedia.map((m)=>{
+        const publicUrl = getPublicUrlForProvider(m.provider, r2PublicUrl, s3PublicUrl);
+        return {
             id: m.id,
-            url: getMediaUrl(m.id, m.r2Key, r2PublicUrl),
-            previewUrl: getImageUrl(getMediaUrl(m.id, m.r2Key, r2PublicUrl), imageTransformUrl, {
+            url: getMediaUrl(m.id, m.storageKey, publicUrl),
+            previewUrl: getImageUrl(getMediaUrl(m.id, m.storageKey, publicUrl), imageTransformUrl, {
                 width: 400,
                 quality: 80,
                 format: "auto",
@@ -102,16 +89,20 @@ postRoutes.get("/:id", async (c)=>{
             height: m.height,
             position: m.position,
             mimeType: m.mimeType
-        }));
-    const siteName = await getSiteName(c);
-    const title = post.title || siteName;
+        };
+    });
+    const navData = await getNavigationData(c);
+    const title = post.title || navData.siteName;
     return c.html(/*#__PURE__*/ _jsx(BaseLayout, {
         title: title,
         description: post.content?.slice(0, 160),
         c: c,
-        children: /*#__PURE__*/ _jsx(PostContent, {
-            post: post,
-            mediaAttachments: mediaAttachments
+        children: /*#__PURE__*/ _jsx(SiteLayout, {
+            ...navData,
+            children: /*#__PURE__*/ _jsx(PostContent, {
+                post: post,
+                mediaAttachments: mediaAttachments
+            })
         })
     }));
 });

package/dist/routes/pages/search.js

@@ -1,13 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "hono/jsx/jsx-runtime";
-import { getSiteName } from "../../lib/config.js";
 /**
  * Search 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 { PagePagination } from "../../theme/components/index.js";
 import * as sqid from "../../lib/sqid.js";
 import * as time from "../../lib/time.js";
+import { getNavigationData } from "../../lib/navigation.js";
 const PAGE_SIZE = 10;
 export const searchRoutes = new Hono();
 function SearchContent({ query, results, error, hasMore, page }) {
@@ -17,7 +17,6 @@ function SearchContent({ query, results, error, hasMore, page }) {
         message: "Search"
     });
     return /*#__PURE__*/ _jsxs("div", {
-        class: "container py-8 max-w-2xl",
         children: [
             /*#__PURE__*/ _jsx("h1", {
                 class: "text-2xl font-semibold mb-6",
@@ -118,21 +117,6 @@ function SearchContent({ query, results, error, hasMore, page }) {
                         ]
                     })
                 ]
-            }),
-            /*#__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"
-                        })
-                    ]
-                })
             })
         ]
     });
@@ -141,7 +125,7 @@ searchRoutes.get("/", async (c)=>{
     const query = c.req.query("q") || "";
     const pageParam = c.req.query("page");
     const page = pageParam ? Math.max(1, parseInt(pageParam, 10) || 1) : 1;
-    const siteName = await getSiteName(c);
+    const navData = await getNavigationData(c);
     // Only search if there's a query
     let results = [];
     let error = null;
@@ -168,14 +152,17 @@ searchRoutes.get("/", async (c)=>{
         }
     }
     return c.html(/*#__PURE__*/ _jsx(BaseLayout, {
-        title: query ? `Search: ${query} - ${siteName}` : `Search - ${siteName}`,
+        title: query ? `Search: ${query} - ${navData.siteName}` : `Search - ${navData.siteName}`,
         c: c,
-        children: /*#__PURE__*/ _jsx(SearchContent, {
-            query: query,
-            results: results,
-            error: error,
-            hasMore: hasMore,
-            page: page
+        children: /*#__PURE__*/ _jsx(SiteLayout, {
+            ...navData,
+            children: /*#__PURE__*/ _jsx(SearchContent, {
+                query: query,
+                results: results,
+                error: error,
+                hasMore: hasMore,
+                page: page
+            })
         })
     }));
 });

package/dist/services/index.js

@@ -8,6 +8,7 @@ import { createRedirectService } from "./redirect.js";
 import { createMediaService } from "./media.js";
 import { createCollectionService } from "./collection.js";
 import { createSearchService } from "./search.js";
+import { createNavigationLinkService } from "./navigation.js";
 export function createServices(db, d1) {
     return {
         settings: createSettingsService(db),
@@ -15,6 +16,7 @@ export function createServices(db, d1) {
         redirects: createRedirectService(db),
         media: createMediaService(db),
         collections: createCollectionService(db),
-        search: createSearchService(d1)
+        search: createSearchService(d1),
+        navigationLinks: createNavigationLinkService(db)
     };
 }

package/dist/services/media.js

@@ -1,7 +1,7 @@
 /**
  * Media Service
  *
- * Handles media upload and management with R2 storage
+ * Handles media upload and management with pluggable storage backends.
  */ import { eq, desc, inArray, asc } from "drizzle-orm";
 import { uuidv7 } from "uuidv7";
 import { media } from "../db/schema.js";
@@ -15,7 +15,8 @@ export function createMediaService(db) {
             originalName: row.originalName,
             mimeType: row.mimeType,
             size: row.size,
-            r2Key: row.r2Key,
+            storageKey: row.storageKey,
+            provider: row.provider,
             width: row.width,
             height: row.height,
             alt: row.alt,
@@ -56,8 +57,8 @@ export function createMediaService(db) {
             }
             return result;
         },
-        async getByR2Key (r2Key) {
-            const result = await db.select().from(media).where(eq(media.r2Key, r2Key)).limit(1);
+        async getByStorageKey (storageKey) {
+            const result = await db.select().from(media).where(eq(media.storageKey, storageKey)).limit(1);
             return result[0] ? toMedia(result[0]) : null;
         },
         async list (limit = 100) {
@@ -65,7 +66,7 @@ export function createMediaService(db) {
             return rows.map(toMedia);
         },
         async create (data) {
-            const id = uuidv7();
+            const id = data.id ?? uuidv7();
             const timestamp = now();
             const result = await db.insert(media).values({
                 id,
@@ -74,7 +75,8 @@ export function createMediaService(db) {
                 originalName: data.originalName,
                 mimeType: data.mimeType,
                 size: data.size,
-                r2Key: data.r2Key,
+                storageKey: data.storageKey,
+                provider: data.provider ?? "r2",
                 width: data.width ?? null,
                 height: data.height ?? null,
                 alt: data.alt ?? null,