@jant/core 0.3.20 → 0.3.22

package/dist/routes/api/timeline.js

@@ -7,7 +7,8 @@ import { jsx as _jsx } from "hono/jsx/jsx-runtime";
 import { sse } from "../../lib/sse.js";
 import { buildMediaMap } from "../../lib/media-helpers.js";
 import { TimelineItem } from "../../theme/components/timeline/TimelineItem.js";
-import { ThreadPreview } from "../../theme/components/timeline/ThreadPreview.js";
+import { ThreadPreview as DefaultThreadPreview } from "../../theme/components/timeline/ThreadPreview.js";
+import { createMediaContext, toPostView, toPostViews } from "../../lib/view.js";
 const PAGE_SIZE = 20;
 export const timelineApiRoutes = new Hono();
 timelineApiRoutes.get("/", async (c)=>{
@@ -41,10 +42,8 @@ timelineApiRoutes.get("/", async (c)=>{
     // Build media map
     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 s3PublicUrl = c.env.S3_PUBLIC_URL;
-    const mediaMap = buildMediaMap(rawMediaMap, r2PublicUrl, imageTransformUrl, s3PublicUrl);
+    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);
@@ -57,42 +56,47 @@ timelineApiRoutes.get("/", async (c)=>{
             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 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 = displayPosts.map((post)=>{
-        const postWithMedia = {
+        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: postWithMedia,
+                post: postView,
                 threadPreview: {
-                    replies: previewReplies.map((r)=>({
+                    replies: toPostViews(previewReplies.map((r)=>({
                             ...r,
                             mediaAttachments: previewMediaMap.get(r.id) ?? []
-                        })),
+                        })), mediaCtx),
                     totalReplyCount: replyCount
                 }
             };
         }
         return {
-            post: postWithMedia
+            post: postView
         };
     });
+    // Resolve theme components for card rendering
+    const theme = c.var.config.theme?.components;
+    const ResolvedThreadPreview = theme?.ThreadPreview ?? DefaultThreadPreview;
     // Render items to HTML
     const itemsHtml = items.map((item)=>{
         if (item.threadPreview) {
-            return /*#__PURE__*/ _jsx(ThreadPreview, {
+            return /*#__PURE__*/ _jsx(ResolvedThreadPreview, {
                 rootPost: item.post,
                 previewReplies: item.threadPreview.replies,
-                totalReplyCount: item.threadPreview.totalReplyCount
+                totalReplyCount: item.threadPreview.totalReplyCount,
+                theme: theme
             });
         }
         return /*#__PURE__*/ _jsx(TimelineItem, {
-            item: item
+            item: item,
+            theme: theme
         });
     }).map((jsx)=>jsx.toString()).join("");
     // Determine next cursor

package/dist/routes/dash/collections.js

@@ -86,6 +86,7 @@ function NewCollectionContent() {
             /*#__PURE__*/ _jsxs("form", {
                 "data-signals": "{title: '', path: '', description: ''}",
                 "data-on:submit__prevent": "@post('/dash/collections')",
+                "data-indicator": "_loading",
                 class: "flex flex-col gap-4 max-w-lg",
                 children: [
                     /*#__PURE__*/ _jsxs("div", {
@@ -161,13 +162,26 @@ function NewCollectionContent() {
                     /*#__PURE__*/ _jsxs("div", {
                         class: "flex gap-2",
                         children: [
-                            /*#__PURE__*/ _jsx("button", {
+                            /*#__PURE__*/ _jsxs("button", {
                                 type: "submit",
                                 class: "btn",
-                                children: $__i18n._({
-                                    id: "Pbm2/N",
-                                    message: "Create Collection"
-                                })
+                                "data-attr-disabled": "$_loading",
+                                children: [
+                                    /*#__PURE__*/ _jsx("span", {
+                                        "data-show": "!$_loading",
+                                        children: $__i18n._({
+                                            id: "Pbm2/N",
+                                            message: "Create Collection"
+                                        })
+                                    }),
+                                    /*#__PURE__*/ _jsx("span", {
+                                        "data-show": "$_loading",
+                                        children: $__i18n._({
+                                            id: "k1ifdL",
+                                            message: "Processing..."
+                                        })
+                                    })
+                                ]
                             }),
                             /*#__PURE__*/ _jsx("a", {
                                 href: "/dash/collections",
@@ -304,6 +318,7 @@ function EditCollectionContent({ collection }) {
             /*#__PURE__*/ _jsxs("form", {
                 "data-signals": signals,
                 "data-on:submit__prevent": `@post('/dash/collections/${collection.id}')`,
+                "data-indicator": "_loading",
                 class: "flex flex-col gap-4 max-w-lg",
                 children: [
                     /*#__PURE__*/ _jsxs("div", {
@@ -364,13 +379,26 @@ function EditCollectionContent({ collection }) {
                     /*#__PURE__*/ _jsxs("div", {
                         class: "flex gap-2",
                         children: [
-                            /*#__PURE__*/ _jsx("button", {
+                            /*#__PURE__*/ _jsxs("button", {
                                 type: "submit",
                                 class: "btn",
-                                children: $__i18n._({
-                                    id: "7Mk+/h",
-                                    message: "Update Collection"
-                                })
+                                "data-attr-disabled": "$_loading",
+                                children: [
+                                    /*#__PURE__*/ _jsx("span", {
+                                        "data-show": "!$_loading",
+                                        children: $__i18n._({
+                                            id: "7Mk+/h",
+                                            message: "Update Collection"
+                                        })
+                                    }),
+                                    /*#__PURE__*/ _jsx("span", {
+                                        "data-show": "$_loading",
+                                        children: $__i18n._({
+                                            id: "k1ifdL",
+                                            message: "Processing..."
+                                        })
+                                    })
+                                ]
                             }),
                             /*#__PURE__*/ _jsx("a", {
                                 href: `/dash/collections/${collection.id}`,

package/dist/routes/dash/navigation.js

@@ -102,6 +102,7 @@ function NavigationFormContent({ link, isEdit }) {
             /*#__PURE__*/ _jsxs("form", {
                 "data-signals": signals,
                 "data-on:submit__prevent": `@post('${action}')`,
+                "data-indicator": "_loading",
                 class: "flex flex-col gap-4 max-w-lg",
                 children: [
                     /*#__PURE__*/ _jsxs("div", {
@@ -159,16 +160,29 @@ function NavigationFormContent({ link, isEdit }) {
                     /*#__PURE__*/ _jsxs("div", {
                         class: "flex gap-2",
                         children: [
-                            /*#__PURE__*/ _jsx("button", {
+                            /*#__PURE__*/ _jsxs("button", {
                                 type: "submit",
                                 class: "btn",
-                                children: isEdit ? $__i18n._({
-                                    id: "IUwGEM",
-                                    message: "Save Changes"
-                                }) : $__i18n._({
-                                    id: "kd7eBB",
-                                    message: "Create Link"
-                                })
+                                "data-attr-disabled": "$_loading",
+                                children: [
+                                    /*#__PURE__*/ _jsx("span", {
+                                        "data-show": "!$_loading",
+                                        children: isEdit ? $__i18n._({
+                                            id: "IUwGEM",
+                                            message: "Save Changes"
+                                        }) : $__i18n._({
+                                            id: "kd7eBB",
+                                            message: "Create Link"
+                                        })
+                                    }),
+                                    /*#__PURE__*/ _jsx("span", {
+                                        "data-show": "$_loading",
+                                        children: $__i18n._({
+                                            id: "k1ifdL",
+                                            message: "Processing..."
+                                        })
+                                    })
+                                ]
                             }),
                             /*#__PURE__*/ _jsx("a", {
                                 href: "/dash/navigation",

package/dist/routes/dash/redirects.js

@@ -83,6 +83,7 @@ function NewRedirectContent() {
             /*#__PURE__*/ _jsxs("form", {
                 "data-signals": "{fromPath: '', toPath: '', type: '301'}",
                 "data-on:submit__prevent": "@post('/dash/redirects')",
+                "data-indicator": "_loading",
                 class: "flex flex-col gap-4 max-w-lg",
                 children: [
                     /*#__PURE__*/ _jsxs("div", {
@@ -172,13 +173,26 @@ function NewRedirectContent() {
                     /*#__PURE__*/ _jsxs("div", {
                         class: "flex gap-2",
                         children: [
-                            /*#__PURE__*/ _jsx("button", {
+                            /*#__PURE__*/ _jsxs("button", {
                                 type: "submit",
                                 class: "btn",
-                                children: $__i18n._({
-                                    id: "Mhf/H/",
-                                    message: "Create Redirect"
-                                })
+                                "data-attr-disabled": "$_loading",
+                                children: [
+                                    /*#__PURE__*/ _jsx("span", {
+                                        "data-show": "!$_loading",
+                                        children: $__i18n._({
+                                            id: "Mhf/H/",
+                                            message: "Create Redirect"
+                                        })
+                                    }),
+                                    /*#__PURE__*/ _jsx("span", {
+                                        "data-show": "$_loading",
+                                        children: $__i18n._({
+                                            id: "k1ifdL",
+                                            message: "Processing..."
+                                        })
+                                    })
+                                ]
                             }),
                             /*#__PURE__*/ _jsx("a", {
                                 href: "/dash/redirects",

package/dist/routes/dash/settings.js

@@ -78,6 +78,7 @@ function GeneralContent({ siteName, siteDescription, siteLanguage, siteNameFallb
                 children: /*#__PURE__*/ _jsxs("form", {
                     "data-signals": generalSignals,
                     "data-on:submit__prevent": "@post('/dash/settings')",
+                    "data-indicator": "_loading",
                     children: [
                         /*#__PURE__*/ _jsxs("div", {
                             class: "card",
@@ -167,13 +168,26 @@ function GeneralContent({ siteName, siteDescription, siteLanguage, siteNameFallb
                                 })
                             ]
                         }),
-                        /*#__PURE__*/ _jsx("button", {
+                        /*#__PURE__*/ _jsxs("button", {
                             type: "submit",
                             class: "btn mt-4",
-                            children: $__i18n._({
-                                id: "UGT5vp",
-                                message: "Save Settings"
-                            })
+                            "data-attr-disabled": "$_loading",
+                            children: [
+                                /*#__PURE__*/ _jsx("span", {
+                                    "data-show": "!$_loading",
+                                    children: $__i18n._({
+                                        id: "UGT5vp",
+                                        message: "Save Settings"
+                                    })
+                                }),
+                                /*#__PURE__*/ _jsx("span", {
+                                    "data-show": "$_loading",
+                                    children: $__i18n._({
+                                        id: "k1ifdL",
+                                        message: "Processing..."
+                                    })
+                                })
+                            ]
                         })
                     ]
                 })
@@ -334,6 +348,7 @@ function AccountContent({ userName }) {
                     /*#__PURE__*/ _jsxs("form", {
                         "data-signals": profileSignals,
                         "data-on:submit__prevent": "@post('/dash/settings/account')",
+                        "data-indicator": "_profileLoading",
                         children: [
                             /*#__PURE__*/ _jsxs("div", {
                                 class: "card",
@@ -369,19 +384,33 @@ function AccountContent({ userName }) {
                                     })
                                 ]
                             }),
-                            /*#__PURE__*/ _jsx("button", {
+                            /*#__PURE__*/ _jsxs("button", {
                                 type: "submit",
                                 class: "btn mt-4",
-                                children: $__i18n._({
-                                    id: "ssqvZi",
-                                    message: "Save Profile"
-                                })
+                                "data-attr-disabled": "$_profileLoading",
+                                children: [
+                                    /*#__PURE__*/ _jsx("span", {
+                                        "data-show": "!$_profileLoading",
+                                        children: $__i18n._({
+                                            id: "ssqvZi",
+                                            message: "Save Profile"
+                                        })
+                                    }),
+                                    /*#__PURE__*/ _jsx("span", {
+                                        "data-show": "$_profileLoading",
+                                        children: $__i18n._({
+                                            id: "k1ifdL",
+                                            message: "Processing..."
+                                        })
+                                    })
+                                ]
                             })
                         ]
                     }),
                     /*#__PURE__*/ _jsxs("form", {
                         "data-signals": "{currentPassword: '', newPassword: '', confirmPassword: ''}",
                         "data-on:submit__prevent": "@post('/dash/settings/password')",
+                        "data-indicator": "_passwordLoading",
                         children: [
                             /*#__PURE__*/ _jsxs("div", {
                                 class: "card",
@@ -460,13 +489,26 @@ function AccountContent({ userName }) {
                                     })
                                 ]
                             }),
-                            /*#__PURE__*/ _jsx("button", {
+                            /*#__PURE__*/ _jsxs("button", {
                                 type: "submit",
                                 class: "btn mt-4",
-                                children: $__i18n._({
-                                    id: "VhMDMg",
-                                    message: "Change Password"
-                                })
+                                "data-attr-disabled": "$_passwordLoading",
+                                children: [
+                                    /*#__PURE__*/ _jsx("span", {
+                                        "data-show": "!$_passwordLoading",
+                                        children: $__i18n._({
+                                            id: "VhMDMg",
+                                            message: "Change Password"
+                                        })
+                                    }),
+                                    /*#__PURE__*/ _jsx("span", {
+                                        "data-show": "$_passwordLoading",
+                                        children: $__i18n._({
+                                            id: "k1ifdL",
+                                            message: "Processing..."
+                                        })
+                                    })
+                                ]
                             })
                         ]
                     })

package/dist/routes/feed/rss.js

@@ -1,18 +1,19 @@
 /**
  * RSS Feed Routes
  */ import { Hono } from "hono";
-import * as sqid from "../../lib/sqid.js";
-import * as time from "../../lib/time.js";
-import { getMediaUrl, getPublicUrlForProvider } from "../../lib/image.js";
+import { defaultRssRenderer, defaultAtomRenderer } from "../../lib/feed.js";
+import { getSiteLanguage } from "../../lib/config.js";
+import { buildMediaMap } from "../../lib/media-helpers.js";
+import { createMediaContext, toPostViews } from "../../lib/view.js";
 export const rssRoutes = new Hono();
-// RSS 2.0 Feed - main feed at /feed
-rssRoutes.get("/", async (c)=>{
+/**
+ * Build FeedData from the Hono context.
+ */ async function buildFeedData(c) {
     const all = await c.var.services.settings.getAll();
     const siteName = all["SITE_NAME"] ?? "Jant";
     const siteDescription = all["SITE_DESCRIPTION"] ?? "";
     const siteUrl = c.env.SITE_URL;
-    const r2PublicUrl = c.env.R2_PUBLIC_URL;
-    const s3PublicUrl = c.env.S3_PUBLIC_URL;
+    const siteLanguage = await getSiteLanguage(c);
     const posts = await c.var.services.posts.list({
         visibility: [
             "featured",
@@ -22,36 +23,28 @@ rssRoutes.get("/", async (c)=>{
     });
     // 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.storageKey, getPublicUrlForProvider(firstMedia.provider, r2PublicUrl, s3PublicUrl))}" 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>${enclosure}
-    </item>`;
-    }).join("");
-    const rss = `<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
-  <channel>
-    <title>${escapeXml(siteName)}</title>
-    <link>${siteUrl}</link>
-    <description>${escapeXml(siteDescription)}</description>
-    <language>en</language>
-    <atom:link href="${siteUrl}/feed" rel="self" type="application/rss+xml"/>
-    ${items}
-  </channel>
-</rss>`;
-    return new Response(rss, {
+    const rawMediaMap = await c.var.services.media.getByPostIds(postIds);
+    const mediaCtx = createMediaContext(c);
+    const mediaMap = buildMediaMap(rawMediaMap, mediaCtx.r2PublicUrl, mediaCtx.imageTransformUrl, mediaCtx.s3PublicUrl);
+    // Transform to PostView[] with media
+    const postViews = toPostViews(posts.map((p)=>({
+            ...p,
+            mediaAttachments: mediaMap.get(p.id) ?? []
+        })), mediaCtx);
+    return {
+        siteName,
+        siteDescription,
+        siteUrl,
+        siteLanguage,
+        posts: postViews
+    };
+}
+// RSS 2.0 Feed - main feed at /feed
+rssRoutes.get("/", async (c)=>{
+    const feedData = await buildFeedData(c);
+    const renderer = c.var.config.theme?.feed?.rss ?? defaultRssRenderer;
+    const xml = renderer(feedData);
+    return new Response(xml, {
         headers: {
             "Content-Type": "application/rss+xml; charset=utf-8"
         }
@@ -59,49 +52,12 @@ rssRoutes.get("/", async (c)=>{
 });
 // Atom Feed
 rssRoutes.get("/atom.xml", async (c)=>{
-    const all = await c.var.services.settings.getAll();
-    const siteName = all["SITE_NAME"] ?? "Jant";
-    const siteDescription = all["SITE_DESCRIPTION"] ?? "";
-    const siteUrl = c.env.SITE_URL;
-    const posts = await c.var.services.posts.list({
-        visibility: [
-            "featured",
-            "quiet"
-        ],
-        limit: 50
-    });
-    const entries = posts.map((post)=>{
-        const link = `${siteUrl}/p/${sqid.encode(post.id)}`;
-        const title = post.title || `Post #${post.id}`;
-        const updated = time.toISOString(post.updatedAt);
-        const published = time.toISOString(post.publishedAt);
-        return `
-  <entry>
-    <title>${escapeXml(title)}</title>
-    <link href="${link}" rel="alternate"/>
-    <id>${link}</id>
-    <published>${published}</published>
-    <updated>${updated}</updated>
-    <content type="html"><![CDATA[${post.contentHtml || ""}]]></content>
-  </entry>`;
-    }).join("");
-    const now = time.toISOString(time.now());
-    const atom = `<?xml version="1.0" encoding="UTF-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-  <title>${escapeXml(siteName)}</title>
-  <subtitle>${escapeXml(siteDescription)}</subtitle>
-  <link href="${siteUrl}" rel="alternate"/>
-  <link href="${siteUrl}/feed/atom.xml" rel="self"/>
-  <id>${siteUrl}/</id>
-  <updated>${now}</updated>
-  ${entries}
-</feed>`;
-    return new Response(atom, {
+    const feedData = await buildFeedData(c);
+    const renderer = c.var.config.theme?.feed?.atom ?? defaultAtomRenderer;
+    const xml = renderer(feedData);
+    return new Response(xml, {
         headers: {
             "Content-Type": "application/atom+xml; charset=utf-8"
         }
     });
 });
-function escapeXml(str) {
-    return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
-}

package/dist/routes/feed/sitemap.js

@@ -1,8 +1,8 @@
 /**
  * Sitemap Routes
  */ import { Hono } from "hono";
-import * as sqid from "../../lib/sqid.js";
-import * as time from "../../lib/time.js";
+import { defaultSitemapRenderer } from "../../lib/feed.js";
+import { createMediaContext, toPostViewsFromPosts } from "../../lib/view.js";
 export const sitemapRoutes = new Hono();
 // XML Sitemap
 sitemapRoutes.get("/sitemap.xml", async (c)=>{
@@ -14,30 +14,15 @@ sitemapRoutes.get("/sitemap.xml", async (c)=>{
         ],
         limit: 1000
     });
-    const urls = posts.map((post)=>{
-        const loc = `${siteUrl}/p/${sqid.encode(post.id)}`;
-        const lastmod = time.toISOString(post.updatedAt).split("T")[0];
-        const priority = post.visibility === "featured" ? "0.8" : "0.6";
-        return `
-  <url>
-    <loc>${loc}</loc>
-    <lastmod>${lastmod}</lastmod>
-    <priority>${priority}</priority>
-  </url>`;
-    }).join("");
-    // Add homepage
-    const homepageUrl = `
-  <url>
-    <loc>${siteUrl}/</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-  </url>`;
-    const sitemap = `<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-  ${homepageUrl}
-  ${urls}
-</urlset>`;
-    return new Response(sitemap, {
+    // Transform to PostView[]
+    const mediaCtx = createMediaContext(c);
+    const postViews = toPostViewsFromPosts(posts, mediaCtx);
+    const renderer = c.var.config.theme?.feed?.sitemap ?? defaultSitemapRenderer;
+    const xml = renderer({
+        siteUrl,
+        posts: postViews
+    });
+    return new Response(xml, {
         headers: {
             "Content-Type": "application/xml; charset=utf-8"
         }