@jant/core 0.3.6 → 0.3.8

package/dist/routes/pages/post.js

@@ -1,61 +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 { getNavigationData } from "../../lib/navigation.js";
 export const postRoutes = new Hono();
-function PostContent({ post }) {
+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 || ""
-                        }
+                    /*#__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"
-                    })
-                })
             })
         ]
     });
@@ -78,14 +67,38 @@ postRoutes.get("/:id", async (c)=>{
     if (post.visibility === "draft") {
         return c.notFound();
     }
-    const siteName = await getSiteName(c);
-    const title = post.title || siteName;
+    // Load media attachments
+    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)=>({
+            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 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
+        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/collection.js

@@ -103,6 +103,19 @@ export function createCollectionService(db) {
                 collection: collections
             }).from(postCollections).innerJoin(collections, eq(postCollections.collectionId, collections.id)).where(eq(postCollections.postId, postId));
             return rows.map((r)=>toCollection(r.collection));
+        },
+        async syncPostCollections (postId, collectionIds) {
+            const current = await this.getCollectionsForPost(postId);
+            const currentIds = new Set(current.map((c)=>c.id));
+            const desiredIds = new Set(collectionIds);
+            const toAdd = collectionIds.filter((id)=>!currentIds.has(id));
+            const toRemove = current.map((c)=>c.id).filter((id)=>!desiredIds.has(id));
+            for (const collectionId of toAdd){
+                await this.addPost(collectionId, postId);
+            }
+            for (const collectionId of toRemove){
+                await this.removePost(collectionId, postId);
+            }
         }
     };
 }

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

@@ -2,7 +2,7 @@
  * Media Service
  *
  * Handles media upload and management with R2 storage
- */ import { eq, desc } from "drizzle-orm";
+ */ import { eq, desc, inArray, asc } from "drizzle-orm";
 import { uuidv7 } from "uuidv7";
 import { media } from "../db/schema.js";
 import { now } from "../lib/time.js";
@@ -19,6 +19,8 @@ export function createMediaService(db) {
             width: row.width,
             height: row.height,
             alt: row.alt,
+            position: row.position,
+            blurhash: row.blurhash,
             createdAt: row.createdAt
         };
     }
@@ -27,6 +29,33 @@ export function createMediaService(db) {
             const result = await db.select().from(media).where(eq(media.id, id)).limit(1);
             return result[0] ? toMedia(result[0]) : null;
         },
+        async getByIds (ids) {
+            if (ids.length === 0) return [];
+            const rows = await db.select().from(media).where(inArray(media.id, ids));
+            return rows.map(toMedia);
+        },
+        async getByPostId (postId) {
+            const rows = await db.select().from(media).where(eq(media.postId, postId)).orderBy(asc(media.position));
+            return rows.map(toMedia);
+        },
+        async getByPostIds (postIds) {
+            const result = new Map();
+            if (postIds.length === 0) return result;
+            const rows = await db.select().from(media).where(inArray(media.postId, postIds)).orderBy(asc(media.position));
+            for (const row of rows){
+                const m = toMedia(row);
+                if (m.postId === null) continue;
+                const list = result.get(m.postId);
+                if (list) {
+                    list.push(m);
+                } else {
+                    result.set(m.postId, [
+                        m
+                    ]);
+                }
+            }
+            return result;
+        },
         async getByR2Key (r2Key) {
             const result = await db.select().from(media).where(eq(media.r2Key, r2Key)).limit(1);
             return result[0] ? toMedia(result[0]) : null;
@@ -36,7 +65,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,
@@ -49,11 +78,35 @@ export function createMediaService(db) {
                 width: data.width ?? null,
                 height: data.height ?? null,
                 alt: data.alt ?? null,
+                position: data.position ?? 0,
+                blurhash: data.blurhash ?? null,
                 createdAt: timestamp
             }).returning();
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- DB insert with .returning() always returns inserted row
             return toMedia(result[0]);
         },
+        async attachToPost (postId, mediaIds) {
+            // Clear existing attachments
+            await db.update(media).set({
+                postId: null,
+                position: 0
+            }).where(eq(media.postId, postId));
+            // Set new attachments with position = array index
+            for(let i = 0; i < mediaIds.length; i++){
+                const mediaId = mediaIds[i];
+                if (!mediaId) continue;
+                await db.update(media).set({
+                    postId,
+                    position: i
+                }).where(eq(media.id, mediaId));
+            }
+        },
+        async detachFromPost (postId) {
+            await db.update(media).set({
+                postId: null,
+                position: 0
+            }).where(eq(media.postId, postId));
+        },
         async delete (id) {
             const result = await db.delete(media).where(eq(media.id, id)).returning();
             return result.length > 0;

package/dist/services/navigation.js

@@ -0,0 +1,115 @@
+/**
+ * Navigation Link Service
+ *
+ * Manages navigation links displayed on public pages
+ */ import { eq, asc, sql } from "drizzle-orm";
+import { navigationLinks } from "../db/schema.js";
+import { now } from "../lib/time.js";
+export function createNavigationLinkService(db) {
+    function toNavigationLink(row) {
+        return {
+            id: row.id,
+            label: row.label,
+            url: row.url,
+            position: row.position,
+            createdAt: row.createdAt,
+            updatedAt: row.updatedAt
+        };
+    }
+    return {
+        async list () {
+            const rows = await db.select().from(navigationLinks).orderBy(asc(navigationLinks.position));
+            return rows.map(toNavigationLink);
+        },
+        async getById (id) {
+            const result = await db.select().from(navigationLinks).where(eq(navigationLinks.id, id)).limit(1);
+            return result[0] ? toNavigationLink(result[0]) : null;
+        },
+        async create (data) {
+            const timestamp = now();
+            let position = data.position;
+            if (position === undefined) {
+                const maxResult = await db.select({
+                    maxPos: sql`COALESCE(MAX(position), -1)`
+                }).from(navigationLinks);
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- aggregate always returns one row
+                position = maxResult[0].maxPos + 1;
+            }
+            const result = await db.insert(navigationLinks).values({
+                label: data.label,
+                url: data.url,
+                position,
+                createdAt: timestamp,
+                updatedAt: timestamp
+            }).returning();
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- DB insert with .returning() always returns inserted row
+            return toNavigationLink(result[0]);
+        },
+        async update (id, data) {
+            const existing = await db.select().from(navigationLinks).where(eq(navigationLinks.id, id)).limit(1);
+            if (!existing[0]) return null;
+            const timestamp = now();
+            const result = await db.update(navigationLinks).set({
+                ...data.label !== undefined && {
+                    label: data.label
+                },
+                ...data.url !== undefined && {
+                    url: data.url
+                },
+                ...data.position !== undefined && {
+                    position: data.position
+                },
+                updatedAt: timestamp
+            }).where(eq(navigationLinks.id, id)).returning();
+            return result[0] ? toNavigationLink(result[0]) : null;
+        },
+        async delete (id) {
+            const result = await db.delete(navigationLinks).where(eq(navigationLinks.id, id)).returning();
+            return result.length > 0;
+        },
+        async reorder (ids) {
+            const timestamp = now();
+            for(let i = 0; i < ids.length; i++){
+                await db.update(navigationLinks).set({
+                    position: i,
+                    updatedAt: timestamp
+                })// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- loop index guarantees element exists
+                .where(eq(navigationLinks.id, ids[i]));
+            }
+        },
+        async ensureDefaults () {
+            const existing = await db.select().from(navigationLinks).limit(1);
+            if (existing.length > 0) {
+                const rows = await db.select().from(navigationLinks).orderBy(asc(navigationLinks.position));
+                return rows.map(toNavigationLink);
+            }
+            const timestamp = now();
+            const defaults = [
+                {
+                    label: "Home",
+                    url: "/",
+                    position: 0
+                },
+                {
+                    label: "Archive",
+                    url: "/archive",
+                    position: 1
+                },
+                {
+                    label: "RSS",
+                    url: "/feed",
+                    position: 2
+                }
+            ];
+            for (const link of defaults){
+                await db.insert(navigationLinks).values({
+                    ...link,
+                    createdAt: timestamp,
+                    updatedAt: timestamp
+                });
+            }
+            const rows = await db.select().from(navigationLinks).orderBy(asc(navigationLinks.position));
+            return rows.map(toNavigationLink);
+        }
+    };
+}

package/dist/services/post.js

@@ -2,7 +2,7 @@
  * Post Service
  *
  * CRUD operations for posts with Thread support
- */ import { eq, and, isNull, desc, or, inArray, sql } from "drizzle-orm";
+ */ import { eq, and, isNull, desc, or, inArray, notInArray, sql } from "drizzle-orm";
 import { posts } from "../db/schema.js";
 import { now } from "../lib/time.js";
 import { extractDomain } from "../lib/url.js";
@@ -52,6 +52,10 @@ export function createPostService(db) {
             if (filters.type) {
                 conditions.push(eq(posts.type, filters.type));
             }
+            // Exclude types filter
+            if (filters.excludeTypes && filters.excludeTypes.length > 0) {
+                conditions.push(notInArray(posts.type, filters.excludeTypes));
+            }
             // Thread filter
             if (filters.threadId) {
                 conditions.push(eq(posts.threadId, filters.threadId));
@@ -186,6 +190,27 @@ export function createPostService(db) {
                 }
             }
             return counts;
+        },
+        async getThreadPreviews (rootIds, previewCount = 3) {
+            if (rootIds.length === 0) return new Map();
+            const rows = await db.select().from(posts).where(and(inArray(posts.threadId, rootIds), isNull(posts.deletedAt))).orderBy(posts.threadId, posts.createdAt);
+            // Partition by threadId, take first previewCount per thread
+            const result = new Map();
+            for (const row of rows){
+                const post = toPost(row);
+                if (post.threadId === null) continue;
+                const list = result.get(post.threadId);
+                if (list) {
+                    if (list.length < previewCount) {
+                        list.push(post);
+                    }
+                } else {
+                    result.set(post.threadId, [
+                        post
+                    ]);
+                }
+            }
+            return result;
         }
     };
 }

package/dist/theme/components/MediaGallery.js

@@ -0,0 +1,107 @@
+/**
+ * Media Gallery Component
+ *
+ * Renders media attachments on public post pages.
+ * Layout adapts based on the number of images.
+ */ import { jsx as _jsx, jsxs as _jsxs } from "hono/jsx/jsx-runtime";
+export const MediaGallery = ({ attachments })=>{
+    const images = attachments.filter((a)=>a.mimeType.startsWith("image/"));
+    if (images.length === 0) return null;
+    if (images.length === 1) {
+        const [img] = images;
+        if (!img) return null;
+        return /*#__PURE__*/ _jsx("div", {
+            class: "mt-3",
+            children: /*#__PURE__*/ _jsx("a", {
+                href: img.url,
+                target: "_blank",
+                rel: "noopener noreferrer",
+                children: /*#__PURE__*/ _jsx("img", {
+                    src: img.previewUrl,
+                    alt: img.alt || "",
+                    width: img.width ?? undefined,
+                    height: img.height ?? undefined,
+                    class: "rounded-lg max-w-full h-auto",
+                    loading: "lazy"
+                })
+            })
+        });
+    }
+    if (images.length === 2) {
+        return /*#__PURE__*/ _jsx("div", {
+            class: "mt-3 grid grid-cols-2 gap-1 rounded-lg overflow-hidden",
+            children: images.map((img)=>/*#__PURE__*/ _jsx("a", {
+                    href: img.url,
+                    target: "_blank",
+                    rel: "noopener noreferrer",
+                    class: "aspect-square",
+                    children: /*#__PURE__*/ _jsx("img", {
+                        src: img.previewUrl,
+                        alt: img.alt || "",
+                        class: "w-full h-full object-cover",
+                        loading: "lazy"
+                    })
+                }, img.id))
+        });
+    }
+    if (images.length === 3) {
+        const [first, ...rest] = images;
+        if (!first) return null;
+        return /*#__PURE__*/ _jsxs("div", {
+            class: "mt-3 grid grid-cols-2 gap-1 rounded-lg overflow-hidden",
+            children: [
+                /*#__PURE__*/ _jsx("a", {
+                    href: first.url,
+                    target: "_blank",
+                    rel: "noopener noreferrer",
+                    class: "row-span-2",
+                    children: /*#__PURE__*/ _jsx("img", {
+                        src: first.previewUrl,
+                        alt: first.alt || "",
+                        class: "w-full h-full object-cover",
+                        loading: "lazy"
+                    })
+                }),
+                rest.map((img)=>/*#__PURE__*/ _jsx("a", {
+                        href: img.url,
+                        target: "_blank",
+                        rel: "noopener noreferrer",
+                        class: "aspect-square",
+                        children: /*#__PURE__*/ _jsx("img", {
+                            src: img.previewUrl,
+                            alt: img.alt || "",
+                            class: "w-full h-full object-cover",
+                            loading: "lazy"
+                        })
+                    }, img.id))
+            ]
+        });
+    }
+    // 4+ images: 2-column grid, show first 4 with remaining count
+    const shown = images.slice(0, 4);
+    const remaining = images.length - 4;
+    return /*#__PURE__*/ _jsx("div", {
+        class: "mt-3 grid grid-cols-2 gap-1 rounded-lg overflow-hidden",
+        children: shown.map((img, i)=>/*#__PURE__*/ _jsxs("a", {
+                href: img.url,
+                target: "_blank",
+                rel: "noopener noreferrer",
+                class: "relative aspect-square",
+                children: [
+                    /*#__PURE__*/ _jsx("img", {
+                        src: img.previewUrl,
+                        alt: img.alt || "",
+                        class: "w-full h-full object-cover",
+                        loading: "lazy"
+                    }),
+                    i === 3 && remaining > 0 && /*#__PURE__*/ _jsxs("div", {
+                        class: "absolute inset-0 bg-black/50 flex items-center justify-center text-white text-xl font-semibold",
+                        children: [
+                            "+",
+                            remaining
+                        ]
+                    })
+                ]
+            }, img.id))
+    });
+};