@jant/core 0.3.7 → 0.3.9

package/src/i18n/locales/zh-Hant.ts

@@ -1 +1 @@
-/*eslint-disable*/import type{Messages}from"@lingui/core";export const messages=JSON.parse("{\"+7Wr2a\":[\"Edit: \",[\"title\"]],\"+MACwa\":[\"尚未有任何收藏。\"],\"+owNNn\":[\"文章\"],\"+zy2Nq\":[\"類型\"],\"/0D1Xp\":[\"編輯收藏集\"],\"/Rj5P4\":[\"您的姓名\"],\"07Epll\":[\"這將為您的網站和儀表板設置主題。所有顏色主題都支持深色模式。\"],\"0JkyS7\":[\"建立您的第一個頁面\"],\"0a6MpL\":[\"新重定向\"],\"1CU1Td\":[\"網址安全識別碼（小寫、數字、連字符）\"],\"1DBGsz\":[\"筆記\"],\"1o+wgo\":[\"e.g. The Verge, John Doe\"],\"2N0qpv\":[\"文章標題...\"],\"2fUwEY\":[\"Select Media\"],\"2q/Q7x\":[\"可見性\"],\"2rJGtU\":[\"頁面標題...\"],\"3Yvsaz\":[\"302（臨時）\"],\"4/SFQS\":[\"查看網站\"],\"40TVQj\":[\"自訂路徑（選填）\"],\"4KzVT6\":[\"刪除頁面\"],\"4b3oEV\":[\"內容\"],\"4mDPGp\":[\"此頁面的 URL 路徑。使用小寫字母、數字和連字符。\"],\"6WdDG7\":[\"頁面\"],\"6YtxFj\":[\"名稱\"],\"7G4SBz\":[\"頁面內容（支持Markdown）...\"],\"7Mk+/h\":[\"更新收藏集\"],\"7Q1KKN\":[\"來源路徑\"],\"7aECQB\":[\"無效或已過期的連結\"],\"7nGhhM\":[\"你在想什麼？\"],\"7p5kLi\":[\"儀表板\"],\"7vhWI8\":[\"新密碼\"],\"8ZsakT\":[\"密碼\"],\"90Luob\":[[\"count\"],\" 條回覆\"],\"A1taO8\":[\"搜尋\"],\"AeXO77\":[\"帳戶\"],\"AyHO4m\":[\"這個收藏是關於什麼的？\"],\"B373X+\":[\"編輯文章\"],\"B495Gs\":[\"檔案館\"],\"BjF0Jv\":[\"僅限小寫字母、數字和連字符\"],\"D9Oea+\":[\"永久鏈接\"],\"DCKkhU\":[\"當前密碼\"],\"DHhJ7s\":[\"上一頁\"],\"DPfwMq\":[\"Done\"],\"DoJzLz\":[\"收藏夾\"],\"E80cJw\":[\"刪除此媒體將永久從存儲中移除它。\"],\"EEYbdt\":[\"發佈\"],\"EGwzOK\":[\"完成設置\"],\"EkH9pt\":[\"更新\"],\"FGrimz\":[\"新帖子\"],\"FkMol5\":[\"精選\"],\"Fxf4jq\":[\"描述（可選）\"],\"GA5A5H\":[\"刪除收藏夾\"],\"GX2VMa\":[\"建立您的管理員帳戶。\"],\"GbVAnd\":[\"此密碼重設連結無效或已過期。請生成一個新的連結。\"],\"GorKul\":[\"歡迎來到 Jant\"],\"GrZ6fH\":[\"新頁面\"],\"GxkJXS\":[\"上傳中...\"],\"HfyyXl\":[\"My Blog\"],\"HiETwV\":[\"安靜（正常）\"],\"Hzi9AA\":[\"未找到任何帖子。\"],\"I6gXOa\":[\"路徑\"],\"I8hDlV\":[\"At least 1 image required for image posts.\"],\"IagCbF\":[\"網址\"],\"J4FNfC\":[\"此集合中沒有帖子。\"],\"JIBC/T\":[\"Supported formats: JPEG, PNG, GIF, WebP, SVG. Max size: 10MB.\"],\"Jed1wB\":[\"需要幫助嗎？請訪問<0>文檔</0>。\"],\"JiP4aa\":[\"已發佈的頁面可以通過其路徑訪問。草稿不可見。\"],\"K9NcLu\":[\"使用此 URL 將媒體嵌入到您的帖子中。\"],\"KbS2K9\":[\"重設密碼\"],\"KiJn9B\":[\"備註\"],\"L85WcV\":[\"縮略名\"],\"LkvLQe\":[\"尚未有頁面。\"],\"M1RvTd\":[\"點擊圖片以查看完整大小\"],\"M8kJqa\":[\"草稿\"],\"M9xgHy\":[\"重定向\"],\"MHrjPM\":[\"標題\"],\"MWBOxm\":[\"Collections (optional)\"],\"MZbQHL\":[\"未找到結果。\"],\"Mhf/H/\":[\"建立重定向\"],\"MqghUt\":[\"搜尋帖子...\"],\"N40H+G\":[\"所有\"],\"O3oNi5\":[\"電子郵件\"],\"OCNZaU\":[\"重定向來源的路徑\"],\"ODiSoW\":[\"尚未有帖子。\"],\"ONWvwQ\":[\"上傳\"],\"Pbm2/N\":[\"創建收藏夾\"],\"RDjuBN\":[\"Setup\"],\"Rj01Fz\":[\"連結\"],\"RwGhWy\":[\"包含 \",[\"count\"],\" 則帖子的主題\"],\"SJmfuf\":[\"網站名稱\"],\"ST+lN2\":[\"尚未上傳任何媒體。\"],\"Tt5T6+\":[\"文章\"],\"TxE+Mj\":[\"1 條回覆\"],\"Tz0i8g\":[\"設定\"],\"U5v6Gh\":[\"編輯頁面\"],\"UDMjsP\":[\"快速操作\"],\"UGT5vp\":[\"保存設定\"],\"VUSy8D\":[\"Search failed. Please try again.\"],\"VhMDMg\":[\"更改密碼\"],\"WDcQq9\":[\"不公開\"],\"Weq9zb\":[\"一般設定\"],\"WmZ/rP\":[\"到路徑\"],\"Y+7JGK\":[\"創建頁面\"],\"Z3FXyt\":[\"Loading...\"],\"ZQKLI1\":[\"危險區域\"],\"ZhhOwV\":[\"引用\"],\"aAIQg2\":[\"外觀\"],\"an5hVd\":[\"圖片\"],\"b+/jO6\":[\"301（永久）\"],\"bHYIks\":[\"登出\"],\"biOepV\":[\"← 返回首頁\"],\"cnGeoo\":[\"刪除\"],\"dEgA5A\":[\"取消\"],\"e6Jr7Q\":[\"← 返回收藏夾\"],\"ePK91l\":[\"編輯\"],\"eWLklq\":[\"引用\"],\"eneWvv\":[\"草稿\"],\"er8+x7\":[\"示範帳戶已預填。只需點擊登入。\"],\"f6e0Ry\":[\"文章\"],\"fG7BxZ\":[\"Upload images via the API: POST /api/upload with a file form field.\"],\"fttd2R\":[\"我的收藏\"],\"hG89Ed\":[\"圖片\"],\"hWOZIv\":[\"請輸入您的新密碼。\"],\"hXzOVo\":[\"下一頁\"],\"he3ygx\":[\"複製\"],\"iH8pgl\":[\"返回\"],\"ig4hg2\":[\"Let's set up your site.\"],\"jpctdh\":[\"查看\"],\"k1ifdL\":[\"處理中...\"],\"mTOYla\":[\"查看所有文章 →\"],\"n1ekoW\":[\"登入\"],\"oJFOZk\":[\"Source Name (optional)\"],\"oYPBa0\":[\"更新頁面\"],\"p2/GCq\":[\"確認密碼\"],\"pRhYH2\":[\"收藏中的帖子 (\",[\"count\"],\")\"],\"pZq3aX\":[\"上傳失敗。請再試一次。\"],\"qMyM2u\":[\"來源網址（選填）\"],\"qiXmlF\":[\"Add Media\"],\"r1MpXi\":[\"安靜\"],\"rFmBG3\":[\"顏色主題\"],\"rdUucN\":[\"預覽\"],\"rzNUSl\":[\"包含 1 則貼文的主題\"],\"sGajR7\":[\"線程開始\"],\"ssqvZi\":[\"保存個人資料\"],\"t/YqKh\":[\"移除\"],\"tfrt7B\":[\"未配置任何重定向。\"],\"tiq7kl\":[\"頁面 \",[\"page\"]],\"u2f7vd\":[\"網站描述\"],\"u3wRF+\":[\"已發佈\"],\"u6Hp4N\":[\"Markdown\"],\"uAQUqI\":[\"狀態\"],\"vERlcd\":[\"個人資料\"],\"vXIe7J\":[\"語言\"],\"vzU4k9\":[\"新收藏集\"],\"wEF6Ix\":[\"目的地路徑或 URL\"],\"wK4OTM\":[\"標題（選填）\"],\"wM5UXj\":[\"刪除媒體\"],\"wRR604\":[\"頁面\"],\"wja8aL\":[\"無標題\"],\"x+doid\":[\"圖片會自動優化：調整大小至最大 1920 像素，轉換為 WebP 格式，並去除元數據。\"],\"x0mzE0\":[\"創建你的第一篇帖子\"],\"x4RuFo\":[\"回到首頁\"],\"xYilR2\":[\"媒體\"],\"y28hnO\":[\"文章\"],\"yQ2kGp\":[\"載入更多\"],\"yjkELF\":[\"確認新密碼\"],\"yzF66j\":[\"連結\"],\"z8ajIE\":[\"找到 1 個結果\"],\"zH6KqE\":[\"找到 \",[\"count\"],\" 個結果\"]}")as Messages;
+/*eslint-disable*/import type{Messages}from"@lingui/core";export const messages=JSON.parse("{\"+7Wr2a\":[\"Edit: \",[\"title\"]],\"+MACwa\":[\"尚未有任何收藏。\"],\"+bHzpy\":[\"顯示連結的文字\"],\"+owNNn\":[\"文章\"],\"+zy2Nq\":[\"類型\"],\"/0D1Xp\":[\"編輯收藏集\"],\"/Rj5P4\":[\"您的姓名\"],\"07Epll\":[\"這將為您的網站和儀表板設置主題。所有顏色主題都支持深色模式。\"],\"0JkyS7\":[\"建立您的第一個頁面\"],\"0a6MpL\":[\"新重定向\"],\"1CU1Td\":[\"網址安全識別碼（小寫、數字、連字符）\"],\"1DBGsz\":[\"筆記\"],\"1o+wgo\":[\"例如：The Verge，約翰·多伊\"],\"2N0qpv\":[\"文章標題...\"],\"2fUwEY\":[\"選擇媒體\"],\"2q/Q7x\":[\"可見性\"],\"2rJGtU\":[\"頁面標題...\"],\"3Yvsaz\":[\"302（臨時）\"],\"4/SFQS\":[\"查看網站\"],\"40TVQj\":[\"自訂路徑（選填）\"],\"4KzVT6\":[\"刪除頁面\"],\"4b3oEV\":[\"內容\"],\"4mDPGp\":[\"此頁面的 URL 路徑。使用小寫字母、數字和連字符。\"],\"6WdDG7\":[\"頁面\"],\"6YtxFj\":[\"名稱\"],\"7G4SBz\":[\"頁面內容（支持Markdown）...\"],\"7Mk+/h\":[\"更新收藏集\"],\"7Q1KKN\":[\"來源路徑\"],\"7aECQB\":[\"無效或已過期的連結\"],\"7nGhhM\":[\"你在想什麼？\"],\"7p5kLi\":[\"儀表板\"],\"7vhWI8\":[\"新密碼\"],\"87a/t/\":[\"標籤\"],\"8ZsakT\":[\"密碼\"],\"90Luob\":[[\"count\"],\" 條回覆\"],\"A1taO8\":[\"搜尋\"],\"AeXO77\":[\"帳戶\"],\"AyHO4m\":[\"這個收藏是關於什麼的？\"],\"B373X+\":[\"編輯文章\"],\"B495Gs\":[\"檔案館\"],\"BjF0Jv\":[\"僅限小寫字母、數字和連字符\"],\"D9Oea+\":[\"永久鏈接\"],\"DCKkhU\":[\"當前密碼\"],\"DHhJ7s\":[\"上一頁\"],\"DPfwMq\":[\"完成\"],\"DoJzLz\":[\"收藏夾\"],\"E80cJw\":[\"刪除此媒體將永久從存儲中移除它。\"],\"EEYbdt\":[\"發佈\"],\"EGwzOK\":[\"完成設置\"],\"EkH9pt\":[\"更新\"],\"FGrimz\":[\"新帖子\"],\"FkMol5\":[\"精選\"],\"Fxf4jq\":[\"描述（可選）\"],\"GA5A5H\":[\"刪除收藏夾\"],\"GX2VMa\":[\"建立您的管理員帳戶。\"],\"GbVAnd\":[\"此密碼重設連結無效或已過期。請生成一個新的連結。\"],\"GorKul\":[\"歡迎來到 Jant\"],\"GrZ6fH\":[\"新頁面\"],\"GxkJXS\":[\"上傳中...\"],\"HfyyXl\":[\"My Blog\"],\"HiETwV\":[\"安靜（正常）\"],\"Hzi9AA\":[\"未找到任何帖子。\"],\"I6gXOa\":[\"路徑\"],\"I8hDlV\":[\"至少需要 1 張圖片才能發佈圖片帖子。\"],\"IUwGEM\":[\"保存更改\"],\"IagCbF\":[\"網址\"],\"J4FNfC\":[\"此集合中沒有帖子。\"],\"JIBC/T\":[\"Supported formats: JPEG, PNG, GIF, WebP, SVG. Max size: 10MB.\"],\"Jed1wB\":[\"需要幫助嗎？請訪問<0>文檔</0>。\"],\"JiP4aa\":[\"已發佈的頁面可以通過其路徑訪問。草稿不可見。\"],\"K9NcLu\":[\"使用此 URL 將媒體嵌入到您的帖子中。\"],\"KbS2K9\":[\"重設密碼\"],\"KiJn9B\":[\"備註\"],\"KmGXnO\":[\"Are you sure you want to delete this post? This cannot be undone.\"],\"L85WcV\":[\"縮略名\"],\"LkvLQe\":[\"尚未有頁面。\"],\"M1RvTd\":[\"點擊圖片以查看完整大小\"],\"M8kJqa\":[\"草稿\"],\"M9xgHy\":[\"重定向\"],\"MHrjPM\":[\"標題\"],\"MWBOxm\":[\"收藏（可選）\"],\"MZbQHL\":[\"未找到結果。\"],\"Mhf/H/\":[\"建立重定向\"],\"MqghUt\":[\"搜尋帖子...\"],\"N40H+G\":[\"所有\"],\"O3oNi5\":[\"電子郵件\"],\"OCNZaU\":[\"重定向來源的路徑\"],\"ODiSoW\":[\"尚未有帖子。\"],\"ONWvwQ\":[\"上傳\"],\"Pbm2/N\":[\"創建收藏夾\"],\"QEbNBb\":[\"路徑（例如 /archive）或完整網址（例如 https://example.com）\"],\"RDjuBN\":[\"Setup\"],\"Rj01Fz\":[\"連結\"],\"RwGhWy\":[\"包含 \",[\"count\"],\" 則帖子的主題\"],\"SJmfuf\":[\"網站名稱\"],\"ST+lN2\":[\"尚未上傳任何媒體。\"],\"Tt5T6+\":[\"文章\"],\"TxE+Mj\":[\"1 條回覆\"],\"Tz0i8g\":[\"設定\"],\"U5v6Gh\":[\"編輯頁面\"],\"UDMjsP\":[\"快速操作\"],\"UGT5vp\":[\"保存設定\"],\"UxKoFf\":[\"導航\"],\"VUSy8D\":[\"Search failed. Please try again.\"],\"VhMDMg\":[\"更改密碼\"],\"WDcQq9\":[\"不公開\"],\"Weq9zb\":[\"一般設定\"],\"WmZ/rP\":[\"到路徑\"],\"Y+7JGK\":[\"創建頁面\"],\"Z3FXyt\":[\"載入中...\"],\"ZQKLI1\":[\"危險區域\"],\"ZhhOwV\":[\"引用\"],\"aAIQg2\":[\"外觀\"],\"aaGV/9\":[\"新連結\"],\"an5hVd\":[\"圖片\"],\"b+/jO6\":[\"301（永久）\"],\"bHYIks\":[\"登出\"],\"biOepV\":[\"← Back to home\"],\"cnGeoo\":[\"刪除\"],\"dEgA5A\":[\"取消\"],\"e6Jr7Q\":[\"← 返回收藏夾\"],\"ePK91l\":[\"編輯\"],\"eWLklq\":[\"引用\"],\"eneWvv\":[\"草稿\"],\"er8+x7\":[\"示範帳戶已預填。只需點擊登入。\"],\"f6e0Ry\":[\"文章\"],\"fG7BxZ\":[\"Upload images via the API: POST /api/upload with a file form field.\"],\"fttd2R\":[\"我的收藏\"],\"gDx5MG\":[\"編輯連結\"],\"hG89Ed\":[\"圖片\"],\"hWOZIv\":[\"請輸入您的新密碼。\"],\"hXzOVo\":[\"下一頁\"],\"he3ygx\":[\"複製\"],\"iH8pgl\":[\"返回\"],\"ig4hg2\":[\"Let's set up your site.\"],\"jpctdh\":[\"查看\"],\"k1ifdL\":[\"處理中...\"],\"kd7eBB\":[\"建立連結\"],\"mTOYla\":[\"View all posts →\"],\"n1ekoW\":[\"登入\"],\"oJFOZk\":[\"來源名稱（選填）\"],\"oYPBa0\":[\"更新頁面\"],\"p2/GCq\":[\"確認密碼\"],\"pRhYH2\":[\"收藏中的帖子 (\",[\"count\"],\")\"],\"pZq3aX\":[\"上傳失敗。請再試一次。\"],\"qMyM2u\":[\"來源網址（選填）\"],\"qiXmlF\":[\"添加媒體\"],\"r1MpXi\":[\"安靜\"],\"rFmBG3\":[\"顏色主題\"],\"rdUucN\":[\"預覽\"],\"rzNUSl\":[\"包含 1 則貼文的主題\"],\"sGajR7\":[\"線程開始\"],\"smzF8S\":[\"顯示 \",[\"remainingCount\"],\" 個更多 \",[\"0\"]],\"ssqvZi\":[\"保存個人資料\"],\"t/YqKh\":[\"移除\"],\"tfrt7B\":[\"未配置任何重定向。\"],\"tiq7kl\":[\"頁面 \",[\"page\"]],\"u2f7vd\":[\"網站描述\"],\"u3wRF+\":[\"已發佈\"],\"u6Hp4N\":[\"Markdown\"],\"uAQUqI\":[\"狀態\"],\"vERlcd\":[\"個人資料\"],\"vXIe7J\":[\"語言\"],\"vzU4k9\":[\"新收藏集\"],\"wEF6Ix\":[\"目的地路徑或 URL\"],\"wK4OTM\":[\"標題（選填）\"],\"wM5UXj\":[\"刪除媒體\"],\"wRR604\":[\"頁面\"],\"wdGjkd\":[\"未配置導航連結。\"],\"wja8aL\":[\"無標題\"],\"x+doid\":[\"圖片會自動優化：調整大小至最大 1920 像素，轉換為 WebP 格式，並去除元數據。\"],\"x0mzE0\":[\"創建你的第一篇帖子\"],\"x4RuFo\":[\"Back to home\"],\"xYilR2\":[\"媒體\"],\"y28hnO\":[\"文章\"],\"yQ2kGp\":[\"載入更多\"],\"yjkELF\":[\"確認新密碼\"],\"yzF66j\":[\"連結\"],\"z8ajIE\":[\"找到 1 個結果\"],\"zH6KqE\":[\"找到 \",[\"count\"],\" 個結果\"]}")as Messages;

package/src/index.ts

@@ -23,11 +23,16 @@ export type {
   PostCollection,
   Redirect,
   Setting,
+  NavigationLink,
   CreatePost,
   UpdatePost,
   JantConfig,
   JantTheme,
   ThemeComponents,
+  TimelineCardProps,
+  ThreadPreviewProps,
+  TimelineItemData,
+  TimelineFeedProps,
 } from "./types.js";
 
 export {

package/src/lib/__tests__/image.test.ts

@@ -0,0 +1,96 @@
+import { describe, it, expect } from "vitest";
+import { getMediaUrl, getImageUrl, getPublicUrlForProvider } from "../image.js";
+
+describe("getPublicUrlForProvider", () => {
+  it("returns r2PublicUrl for r2 provider", () => {
+    const result = getPublicUrlForProvider(
+      "r2",
+      "https://r2.example.com",
+      "https://s3.example.com",
+    );
+    expect(result).toBe("https://r2.example.com");
+  });
+
+  it("returns s3PublicUrl for s3 provider", () => {
+    const result = getPublicUrlForProvider(
+      "s3",
+      "https://r2.example.com",
+      "https://s3.example.com",
+    );
+    expect(result).toBe("https://s3.example.com");
+  });
+
+  it("returns undefined when r2 provider has no r2PublicUrl", () => {
+    const result = getPublicUrlForProvider(
+      "r2",
+      undefined,
+      "https://s3.example.com",
+    );
+    expect(result).toBeUndefined();
+  });
+
+  it("returns undefined when s3 provider has no s3PublicUrl", () => {
+    const result = getPublicUrlForProvider(
+      "s3",
+      "https://r2.example.com",
+      undefined,
+    );
+    expect(result).toBeUndefined();
+  });
+
+  it("defaults to r2PublicUrl for unknown providers", () => {
+    const result = getPublicUrlForProvider(
+      "unknown",
+      "https://r2.example.com",
+      "https://s3.example.com",
+    );
+    expect(result).toBe("https://r2.example.com");
+  });
+});
+
+describe("getMediaUrl", () => {
+  it("returns local proxy URL when no publicUrl provided", () => {
+    const result = getMediaUrl(
+      "01902a9f-1a2b-7c3d",
+      "media/2025/01/01902a9f-1a2b-7c3d.webp",
+    );
+    expect(result).toBe("/media/01902a9f-1a2b-7c3d.webp");
+  });
+
+  it("returns CDN URL when publicUrl is provided", () => {
+    const result = getMediaUrl(
+      "01902a9f-1a2b-7c3d",
+      "media/2025/01/01902a9f-1a2b-7c3d.webp",
+      "https://cdn.example.com",
+    );
+    expect(result).toBe(
+      "https://cdn.example.com/media/2025/01/01902a9f-1a2b-7c3d.webp",
+    );
+  });
+});
+
+describe("getImageUrl", () => {
+  it("returns original URL when no transform URL provided", () => {
+    const result = getImageUrl("/media/test.jpg", undefined, { width: 200 });
+    expect(result).toBe("/media/test.jpg");
+  });
+
+  it("returns transformed URL with options", () => {
+    const result = getImageUrl(
+      "/media/test.jpg",
+      "https://example.com/cdn-cgi/image",
+      { width: 200, quality: 80, format: "auto" },
+    );
+    expect(result).toBe(
+      "https://example.com/cdn-cgi/image/width=200,quality=80,format=auto//media/test.jpg",
+    );
+  });
+
+  it("returns original URL when no options provided", () => {
+    const result = getImageUrl(
+      "/media/test.jpg",
+      "https://example.com/cdn-cgi/image",
+    );
+    expect(result).toBe("/media/test.jpg");
+  });
+});

package/src/lib/__tests__/storage.test.ts

@@ -0,0 +1,162 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion -- Test assertions use ! for readability */
+import { describe, it, expect, vi } from "vitest";
+import { createR2Driver, createStorageDriver } from "../storage.js";
+import type { Bindings } from "../../types.js";
+
+describe("createStorageDriver", () => {
+  it("returns null when no storage is configured", () => {
+    const env = { DB: {} } as Bindings;
+    const driver = createStorageDriver(env);
+    expect(driver).toBeNull();
+  });
+
+  it("returns R2 driver when R2 binding is present", () => {
+    const env = {
+      DB: {},
+      R2: { put: vi.fn(), get: vi.fn(), delete: vi.fn() },
+    } as unknown as Bindings;
+    const driver = createStorageDriver(env);
+    expect(driver).not.toBeNull();
+  });
+
+  it("returns R2 driver by default even with STORAGE_DRIVER unset", () => {
+    const env = {
+      DB: {},
+      R2: { put: vi.fn(), get: vi.fn(), delete: vi.fn() },
+    } as unknown as Bindings;
+    const driver = createStorageDriver(env);
+    expect(driver).not.toBeNull();
+  });
+
+  it("returns null for S3 driver when S3 config is incomplete", () => {
+    const env = {
+      DB: {},
+      STORAGE_DRIVER: "s3",
+      S3_ENDPOINT: "https://s3.example.com",
+      // Missing S3_BUCKET, S3_ACCESS_KEY_ID, S3_SECRET_ACCESS_KEY
+    } as unknown as Bindings;
+    const driver = createStorageDriver(env);
+    expect(driver).toBeNull();
+  });
+
+  it("returns S3 driver when fully configured", () => {
+    const env = {
+      DB: {},
+      STORAGE_DRIVER: "s3",
+      S3_ENDPOINT: "https://s3.example.com",
+      S3_BUCKET: "my-bucket",
+      S3_ACCESS_KEY_ID: "access-key",
+      S3_SECRET_ACCESS_KEY: "secret-key",
+      S3_REGION: "us-east-1",
+    } as unknown as Bindings;
+    const driver = createStorageDriver(env);
+    expect(driver).not.toBeNull();
+  });
+
+  it("defaults S3_REGION to 'auto' when not set", () => {
+    const env = {
+      DB: {},
+      STORAGE_DRIVER: "s3",
+      S3_ENDPOINT: "https://s3.example.com",
+      S3_BUCKET: "my-bucket",
+      S3_ACCESS_KEY_ID: "access-key",
+      S3_SECRET_ACCESS_KEY: "secret-key",
+    } as unknown as Bindings;
+    // Should not throw - region defaults to "auto"
+    const driver = createStorageDriver(env);
+    expect(driver).not.toBeNull();
+  });
+
+  it("prefers S3 driver over R2 when STORAGE_DRIVER=s3", () => {
+    const env = {
+      DB: {},
+      R2: { put: vi.fn(), get: vi.fn(), delete: vi.fn() },
+      STORAGE_DRIVER: "s3",
+      S3_ENDPOINT: "https://s3.example.com",
+      S3_BUCKET: "my-bucket",
+      S3_ACCESS_KEY_ID: "access-key",
+      S3_SECRET_ACCESS_KEY: "secret-key",
+    } as unknown as Bindings;
+    const driver = createStorageDriver(env);
+    expect(driver).not.toBeNull();
+  });
+});
+
+describe("createR2Driver", () => {
+  it("delegates put to R2 bucket", async () => {
+    const mockR2 = {
+      put: vi.fn().mockResolvedValue(undefined),
+      get: vi.fn(),
+      delete: vi.fn(),
+    } as unknown as R2Bucket;
+
+    const driver = createR2Driver(mockR2);
+    const body = new ReadableStream();
+    await driver.put("media/test.jpg", body, { contentType: "image/jpeg" });
+
+    expect(mockR2.put).toHaveBeenCalledWith("media/test.jpg", body, {
+      httpMetadata: { contentType: "image/jpeg" },
+    });
+  });
+
+  it("delegates put without contentType", async () => {
+    const mockR2 = {
+      put: vi.fn().mockResolvedValue(undefined),
+      get: vi.fn(),
+      delete: vi.fn(),
+    } as unknown as R2Bucket;
+
+    const driver = createR2Driver(mockR2);
+    await driver.put("media/test.jpg", new ReadableStream());
+
+    expect(mockR2.put).toHaveBeenCalledWith(
+      "media/test.jpg",
+      expect.any(ReadableStream),
+      { httpMetadata: undefined },
+    );
+  });
+
+  it("delegates get and returns body and contentType", async () => {
+    const mockBody = new ReadableStream();
+    const mockR2 = {
+      put: vi.fn(),
+      get: vi.fn().mockResolvedValue({
+        body: mockBody,
+        httpMetadata: { contentType: "image/jpeg" },
+      }),
+      delete: vi.fn(),
+    } as unknown as R2Bucket;
+
+    const driver = createR2Driver(mockR2);
+    const result = await driver.get("media/test.jpg");
+
+    expect(result).not.toBeNull();
+    expect(result!.body).toBe(mockBody);
+    expect(result!.contentType).toBe("image/jpeg");
+  });
+
+  it("returns null when R2 get returns null", async () => {
+    const mockR2 = {
+      put: vi.fn(),
+      get: vi.fn().mockResolvedValue(null),
+      delete: vi.fn(),
+    } as unknown as R2Bucket;
+
+    const driver = createR2Driver(mockR2);
+    const result = await driver.get("nonexistent");
+    expect(result).toBeNull();
+  });
+
+  it("delegates delete to R2 bucket", async () => {
+    const mockR2 = {
+      put: vi.fn(),
+      get: vi.fn(),
+      delete: vi.fn().mockResolvedValue(undefined),
+    } as unknown as R2Bucket;
+
+    const driver = createR2Driver(mockR2);
+    await driver.delete("media/test.jpg");
+
+    expect(mockR2.delete).toHaveBeenCalledWith("media/test.jpg");
+  });
+});

package/src/lib/__tests__/theme-components.test.ts

@@ -0,0 +1,107 @@
+import { describe, it, expect } from "vitest";
+import {
+  resolveCardComponent,
+  resolveThreadPreview,
+  resolveTimelineFeed,
+} from "../theme-components.js";
+import type {
+  ThemeComponents,
+  TimelineCardProps,
+  ThreadPreviewProps,
+  TimelineFeedProps,
+  PostType,
+} from "../../types.js";
+import type { FC } from "hono/jsx";
+
+// Create simple mock components for testing (avoids importing .tsx files with i18n)
+const MockNoteCard: FC<TimelineCardProps> = () => null;
+const MockArticleCard: FC<TimelineCardProps> = () => null;
+const MockLinkCard: FC<TimelineCardProps> = () => null;
+const MockQuoteCard: FC<TimelineCardProps> = () => null;
+const MockImageCard: FC<TimelineCardProps> = () => null;
+const MockThreadPreview: FC<ThreadPreviewProps> = () => null;
+const MockTimelineFeed: FC<TimelineFeedProps> = () => null;
+
+const DEFAULT_CARD_MAP: Record<PostType, FC<TimelineCardProps>> = {
+  note: MockNoteCard,
+  article: MockArticleCard,
+  link: MockLinkCard,
+  quote: MockQuoteCard,
+  image: MockImageCard,
+  page: MockNoteCard,
+};
+
+describe("theme-components", () => {
+  describe("resolveCardComponent", () => {
+    it("returns default NoteCard for note type", () => {
+      expect(resolveCardComponent("note", DEFAULT_CARD_MAP)).toBe(MockNoteCard);
+    });
+
+    it("returns default ArticleCard for article type", () => {
+      expect(resolveCardComponent("article", DEFAULT_CARD_MAP)).toBe(
+        MockArticleCard,
+      );
+    });
+
+    it("returns default LinkCard for link type", () => {
+      expect(resolveCardComponent("link", DEFAULT_CARD_MAP)).toBe(MockLinkCard);
+    });
+
+    it("returns default QuoteCard for quote type", () => {
+      expect(resolveCardComponent("quote", DEFAULT_CARD_MAP)).toBe(
+        MockQuoteCard,
+      );
+    });
+
+    it("returns default ImageCard for image type", () => {
+      expect(resolveCardComponent("image", DEFAULT_CARD_MAP)).toBe(
+        MockImageCard,
+      );
+    });
+
+    it("returns NoteCard as fallback for page type", () => {
+      expect(resolveCardComponent("page", DEFAULT_CARD_MAP)).toBe(MockNoteCard);
+    });
+
+    it("returns theme override when provided", () => {
+      const CustomNote: FC<TimelineCardProps> = () => null;
+      const overrides: ThemeComponents = { NoteCard: CustomNote };
+      expect(resolveCardComponent("note", DEFAULT_CARD_MAP, overrides)).toBe(
+        CustomNote,
+      );
+    });
+
+    it("returns default when theme has no override for type", () => {
+      const overrides: ThemeComponents = {};
+      expect(resolveCardComponent("article", DEFAULT_CARD_MAP, overrides)).toBe(
+        MockArticleCard,
+      );
+    });
+  });
+
+  describe("resolveThreadPreview", () => {
+    it("returns default ThreadPreview when no override", () => {
+      expect(resolveThreadPreview(MockThreadPreview)).toBe(MockThreadPreview);
+    });
+
+    it("returns theme override when provided", () => {
+      const Custom: FC<ThreadPreviewProps> = () => null;
+      expect(
+        resolveThreadPreview(MockThreadPreview, { ThreadPreview: Custom }),
+      ).toBe(Custom);
+    });
+  });
+
+  describe("resolveTimelineFeed", () => {
+    it("returns default TimelineFeed when no override", () => {
+      expect(resolveTimelineFeed(MockTimelineFeed)).toBe(MockTimelineFeed);
+    });
+
+    it("returns theme override when provided", () => {
+      const Custom: FC<TimelineFeedProps> = () => null;
+      expect(
+        resolveTimelineFeed(MockTimelineFeed, { TimelineFeed: Custom }),
+      ).toBe(Custom);
+    });
+  });
+});

package/src/lib/image.ts

@@ -71,37 +71,67 @@ export function getImageUrl(
   return `${transformUrl}/${params.join(",")}/${originalUrl}`;
 }
 
+/**
+ * Returns the appropriate public URL base for a given storage provider.
+ *
+ * For `"s3"` provider, returns `s3PublicUrl`. For all other providers
+ * (including `"r2"`), returns `r2PublicUrl`. Falls back to `undefined`
+ * if the matching URL is not configured.
+ *
+ * @param provider - The storage provider identifier (e.g., `"r2"`, `"s3"`)
+ * @param r2PublicUrl - Optional R2 public URL
+ * @param s3PublicUrl - Optional S3 public URL
+ * @returns The public URL base for the provider, or undefined
+ *
+ * @example
+ * ```ts
+ * getPublicUrlForProvider("r2", "https://r2.example.com", "https://s3.example.com");
+ * // Returns: "https://r2.example.com"
+ *
+ * getPublicUrlForProvider("s3", "https://r2.example.com", "https://s3.example.com");
+ * // Returns: "https://s3.example.com"
+ * ```
+ */
+export function getPublicUrlForProvider(
+  provider: string,
+  r2PublicUrl?: string,
+  s3PublicUrl?: string,
+): string | undefined {
+  if (provider === "s3") return s3PublicUrl;
+  return r2PublicUrl;
+}
+
 /**
  * Generates a media URL using UUIDv7-based paths.
  *
- * Returns a public URL for a media file. If `r2PublicUrl` is set, uses that directly
- * with the r2Key. Otherwise, generates a `/media/{id}.{ext}` URL.
+ * Returns a public URL for a media file. If `publicUrl` is set, uses that directly
+ * with the storage key. Otherwise, generates a `/media/{id}.{ext}` local proxy URL.
  *
  * @param mediaId - The UUIDv7 database ID of the media
- * @param r2Key - The R2 storage key (used to extract extension)
- * @param r2PublicUrl - Optional R2 public URL for direct CDN access
+ * @param storageKey - The storage object key (used to build CDN path and extract extension)
+ * @param publicUrl - Optional public URL base for direct CDN access
  * @returns The public URL for the media file
  *
  * @example
  * ```ts
- * // Without R2 public URL - uses UUID with extension
- * getMediaUrl("01902a9f-1a2b-7c3d-8e4f-5a6b7c8d9e0f", "uploads/file.webp");
- * // Returns: "/media/01902a9f-1a2b-7c3d-8e4f-5a6b7c8d9e0f.webp"
+ * // Without public URL - uses local proxy with UUID and extension
+ * getMediaUrl("01902a9f-1a2b-7c3d", "media/2025/01/01902a9f-1a2b-7c3d.webp");
+ * // Returns: "/media/01902a9f-1a2b-7c3d.webp"
  *
- * // With R2 public URL - uses direct CDN
- * getMediaUrl("01902a9f-1a2b-7c3d-8e4f-5a6b7c8d9e0f", "uploads/file.webp", "https://cdn.example.com");
- * // Returns: "https://cdn.example.com/uploads/file.webp"
+ * // With public URL - uses direct CDN
+ * getMediaUrl("01902a9f-1a2b-7c3d", "media/2025/01/01902a9f-1a2b-7c3d.webp", "https://cdn.example.com");
+ * // Returns: "https://cdn.example.com/media/2025/01/01902a9f-1a2b-7c3d.webp"
  * ```
  */
 export function getMediaUrl(
   mediaId: string,
-  r2Key: string,
-  r2PublicUrl?: string,
+  storageKey: string,
+  publicUrl?: string,
 ): string {
-  if (r2PublicUrl) {
-    return `${r2PublicUrl}/${r2Key}`;
+  if (publicUrl) {
+    return `${publicUrl.replace(/\/+$/, "")}/${storageKey}`;
   }
-  // Extract extension from r2Key
-  const ext = r2Key.split(".").pop() || "bin";
+  // Extract extension from storage key
+  const ext = storageKey.split(".").pop() || "bin";
   return `/media/${mediaId}.${ext}`;
 }

package/src/lib/media-helpers.ts

@@ -0,0 +1,65 @@
+/**
+ * Media Helper Utilities
+ *
+ * Shared logic for building MediaAttachment maps from raw media data.
+ */
+
+import type { Media, MediaAttachment } from "../types.js";
+import { getMediaUrl, getImageUrl, getPublicUrlForProvider } from "./image.js";
+
+/**
+ * Builds a map of post IDs to MediaAttachment arrays from raw media data.
+ *
+ * Transforms raw Media objects (with storage keys) into MediaAttachment objects
+ * (with public URLs and preview URLs) suitable for rendering.
+ * Automatically resolves the correct public URL based on each media item's
+ * storage provider (`"r2"` or `"s3"`).
+ *
+ * @param rawMediaMap - Map of post IDs to raw Media arrays from the media service
+ * @param r2PublicUrl - Optional R2 public URL for direct CDN access
+ * @param imageTransformUrl - Optional image transformation service URL
+ * @param s3PublicUrl - Optional S3 public URL for direct CDN access
+ * @returns Map of post IDs to MediaAttachment arrays
+ *
+ * @example
+ * ```ts
+ * const rawMediaMap = await services.media.getByPostIds(postIds);
+ * const mediaMap = buildMediaMap(rawMediaMap, c.env.R2_PUBLIC_URL, c.env.IMAGE_TRANSFORM_URL, c.env.S3_PUBLIC_URL);
+ * ```
+ */
+export function buildMediaMap(
+  rawMediaMap: Map<number, Media[]>,
+  r2PublicUrl?: string,
+  imageTransformUrl?: string,
+  s3PublicUrl?: string,
+): Map<number, MediaAttachment[]> {
+  const mediaMap = new Map<number, MediaAttachment[]>();
+  for (const [postId, mediaList] of rawMediaMap) {
+    mediaMap.set(
+      postId,
+      mediaList.map((m) => {
+        const publicUrl = getPublicUrlForProvider(
+          m.provider,
+          r2PublicUrl,
+          s3PublicUrl,
+        );
+        return {
+          id: m.id,
+          url: getMediaUrl(m.id, m.storageKey, publicUrl),
+          previewUrl: getImageUrl(
+            getMediaUrl(m.id, m.storageKey, publicUrl),
+            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,
+        };
+      }),
+    );
+  }
+  return mediaMap;
+}

package/src/lib/nav-reorder.ts

@@ -0,0 +1,26 @@
+/**
+ * Navigation Link Reorder
+ *
+ * Initializes SortableJS on the navigation links list in the dashboard.
+ * Auto-detects the list element and only activates when present.
+ */
+
+import Sortable from "sortablejs";
+
+const list = document.getElementById("nav-links-list");
+if (list) {
+  Sortable.create(list, {
+    animation: 150,
+    handle: "[data-id]",
+    onEnd() {
+      const ids = [...list.querySelectorAll<HTMLElement>("[data-id]")].map(
+        (el) => Number(el.dataset.id),
+      );
+      fetch("/dash/navigation/reorder", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ ids }),
+      });
+    },
+  });
+}

package/src/lib/navigation.ts

@@ -0,0 +1,46 @@
+/**
+ * Navigation Helper
+ *
+ * Provides shared data fetching for public page navigation.
+ */
+
+import type { Context } from "hono";
+import { getSiteName } from "./config.js";
+import type { NavigationLink } from "../types.js";
+
+/**
+ * Navigation data needed by SiteLayout
+ */
+export interface NavigationData {
+  navigationLinks: NavigationLink[];
+  currentPath: string;
+  siteName: string;
+}
+
+/**
+ * Fetch navigation data for public pages.
+ *
+ * Ensures default links exist (Home, Archive, RSS) and returns
+ * the current path and site name alongside the links.
+ *
+ * @param c - Hono context
+ * @returns Navigation data for SiteLayout
+ *
+ * @example
+ * ```typescript
+ * const navData = await getNavigationData(c);
+ * return c.html(
+ *   <BaseLayout c={c}>
+ *     <SiteLayout {...navData}>
+ *       <MyContent />
+ *     </SiteLayout>
+ *   </BaseLayout>
+ * );
+ * ```
+ */
+export async function getNavigationData(c: Context): Promise<NavigationData> {
+  const navigationLinks = await c.var.services.navigationLinks.ensureDefaults();
+  const currentPath = new URL(c.req.url).pathname;
+  const siteName = await getSiteName(c);
+  return { navigationLinks, currentPath, siteName };
+}