@jant/core 0.3.24 → 0.3.26

package/dist/lib/navigation.js

@@ -2,12 +2,15 @@
  * Navigation Helper
  *
  * Provides shared data fetching for public page navigation.
- */ import { getSiteName } from "./config.js";
+ */ import { getSiteName, getHomeDefaultView, getSiteFooter } from "./config.js";
 import { toNavItemViews } from "./view.js";
+import { getMediaUrl, getPublicUrlForProvider } from "./image.js";
+import { render as renderMarkdown } from "./markdown.js";
 /**
  * Fetch navigation data for public pages.
  *
  * Returns NavItemView[] with pre-computed isActive/isExternal state.
+ * Also checks authentication status and loads collections for authenticated users.
  *
  * @param c - Hono context
  * @returns Navigation data for SiteLayout
@@ -24,11 +27,53 @@ import { toNavItemViews } from "./view.js";
  */ export async function getNavigationData(c) {
     const items = await c.var.services.navItems.list();
     const currentPath = new URL(c.req.url).pathname;
-    const siteName = await getSiteName(c);
+    const [siteName, homeDefaultView, siteFooter] = await Promise.all([
+        getSiteName(c),
+        getHomeDefaultView(c),
+        getSiteFooter(c)
+    ]);
+    // Only include description if explicitly set (DB or env), not the default
+    const dbDescription = await c.var.services.settings.get("SITE_DESCRIPTION");
+    const envDescription = c.env.SITE_DESCRIPTION;
+    const siteDescription = dbDescription || (typeof envDescription === "string" ? envDescription : "");
+    // Resolve avatar URL from storage key
+    const avatarKey = await c.var.services.settings.get("SITE_AVATAR");
+    const showHeaderAvatar = await c.var.services.settings.get("SHOW_HEADER_AVATAR") === "true";
+    let siteAvatarUrl;
+    if (avatarKey) {
+        const publicUrl = getPublicUrlForProvider(c.env.STORAGE_DRIVER || "r2", c.env.R2_PUBLIC_URL, c.env.S3_PUBLIC_URL);
+        siteAvatarUrl = getMediaUrl(avatarKey, publicUrl);
+    }
+    // Render footer markdown
+    const siteFooterHtml = siteFooter ? renderMarkdown(siteFooter) : undefined;
     const links = toNavItemViews(items, currentPath);
+    // Check auth status for compose button
+    let isAuthenticated = false;
+    let collections = [];
+    if (c.var.auth) {
+        try {
+            const session = await c.var.auth.api.getSession({
+                headers: c.req.raw.headers
+            });
+            isAuthenticated = !!session?.user;
+        } catch  {
+        // Not authenticated
+        }
+    }
+    // Only load collections when authenticated (for compose dialog)
+    if (isAuthenticated) {
+        collections = await c.var.services.collections.list();
+    }
     return {
         links,
         currentPath,
-        siteName
+        siteName,
+        siteDescription,
+        isAuthenticated,
+        collections,
+        homeDefaultView,
+        siteAvatarUrl,
+        showHeaderAvatar: showHeaderAvatar && !!siteAvatarUrl,
+        siteFooterHtml
     };
 }

package/dist/lib/pagination.js

@@ -0,0 +1,44 @@
+/**
+ * Pagination Utilities
+ *
+ * Pure utility functions for page-based pagination.
+ */ /**
+ * Computes which page numbers to display in a numbered pagination control.
+ * Always includes: first page, last page, current page, and 1 page on each side of current.
+ * Gaps between non-consecutive pages are represented by 0 (ellipsis marker).
+ *
+ * @param currentPage - The current active page (1-indexed)
+ * @param totalPages - Total number of pages
+ * @returns Array of page numbers, with 0 representing ellipsis gaps
+ *
+ * @example
+ * ```ts
+ * getPageNumbers(1, 5)    // [1, 2, 3, 4, 5]
+ * getPageNumbers(1, 20)   // [1, 2, 0, 20]
+ * getPageNumbers(10, 20)  // [1, 0, 9, 10, 11, 0, 20]
+ * ```
+ */ export function getPageNumbers(currentPage, totalPages) {
+    if (totalPages <= 7) {
+        return Array.from({
+            length: totalPages
+        }, (_, i)=>i + 1);
+    }
+    const pages = new Set();
+    pages.add(1);
+    pages.add(totalPages);
+    pages.add(currentPage);
+    if (currentPage > 1) pages.add(currentPage - 1);
+    if (currentPage < totalPages) pages.add(currentPage + 1);
+    const sorted = [
+        ...pages
+    ].sort((a, b)=>a - b);
+    // Insert 0 for gaps
+    const result = [];
+    for(let i = 0; i < sorted.length; i++){
+        if (i > 0 && sorted[i] - sorted[i - 1] > 1) {
+            result.push(0); // ellipsis marker
+        }
+        result.push(sorted[i]);
+    }
+    return result;
+}

package/dist/lib/render.js

@@ -3,17 +3,12 @@
  *
  * Provides a single entry point for rendering public pages with the
  * correct layout stack: BaseLayout > SiteLayout > content.
- *
- * BaseLayout is always the built-in implementation (handles Vite assets,
- * I18nProvider, toast). SiteLayout is resolved from theme components.
  */ import { jsx as _jsx } from "hono/jsx/jsx-runtime";
-import { BaseLayout } from "../theme/layouts/BaseLayout.js";
-import { ThreadsSiteLayout as DefaultSiteLayout } from "../themes/threads/ThreadsSiteLayout.js";
+import { BaseLayout } from "../ui/layouts/BaseLayout.js";
+import { SiteLayout } from "../ui/layouts/SiteLayout.js";
 /**
  * Render a public page with the standard layout stack.
  *
- * Always uses the built-in BaseLayout, resolves SiteLayout from theme config.
- *
  * @param c - Hono context
  * @param options - Page rendering options
  * @returns Hono HTML response
@@ -29,18 +24,28 @@ import { ThreadsSiteLayout as DefaultSiteLayout } from "../themes/threads/Thread
  * ```
  */ export function renderPublicPage(c, options) {
     const { title, description, navData, content } = options;
-    const components = c.var.config?.theme?.components;
-    const Layout = components?.SiteLayout ?? DefaultSiteLayout;
     const layoutProps = {
         siteName: navData.siteName,
+        siteDescription: navData.siteDescription,
         links: navData.links,
-        currentPath: navData.currentPath
+        currentPath: navData.currentPath,
+        isAuthenticated: navData.isAuthenticated,
+        collections: navData.collections,
+        homeDefaultView: navData.homeDefaultView,
+        siteAvatarUrl: navData.siteAvatarUrl,
+        showHeaderAvatar: navData.showHeaderAvatar,
+        siteFooterHtml: navData.siteFooterHtml
     };
+    // Read favicon and noindex from context (set by theme middleware)
+    const faviconUrl = c.get("faviconUrl");
+    const noindex = c.get("noindex");
     return c.html(/*#__PURE__*/ _jsx(BaseLayout, {
         title: title,
         description: description,
         c: c,
-        children: /*#__PURE__*/ _jsx(Layout, {
+        faviconUrl: faviconUrl,
+        noindex: noindex,
+        children: /*#__PURE__*/ _jsx(SiteLayout, {
             ...layoutProps,
             children: content
         })

package/dist/lib/schemas.js

@@ -31,12 +31,12 @@ import { FORMATS, STATUSES, SORT_ORDERS, NAV_ITEM_TYPES, MAX_MEDIA_ATTACHMENTS }
 ]);
 /**
  * Rating schema (1-5 integer)
- */ export const RatingSchema = z.coerce.number().int().min(1).max(5).optional().or(z.literal("").transform(()=>undefined));
+ */ export const RatingSchema = z.coerce.number().int().min(0).max(5).optional().or(z.literal("").transform(()=>undefined)).transform((v)=>v === 0 ? undefined : v);
 /**
  * API request body schema for creating a post
  */ export const CreatePostSchema = z.object({
     format: FormatSchema,
-    slug: z.string().regex(/^[a-z0-9][a-z0-9-]*[a-z0-9]$|^[a-z0-9]$/).optional().or(z.literal("").transform(()=>undefined)),
+    path: z.string().regex(/^[a-z0-9]([a-z0-9-]*[a-z0-9])?(\/[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/).optional().or(z.literal("").transform(()=>undefined)),
     title: z.string().optional(),
     body: z.string().optional(),
     status: StatusSchema.optional(),
@@ -51,7 +51,7 @@ import { FORMATS, STATUSES, SORT_ORDERS, NAV_ITEM_TYPES, MAX_MEDIA_ATTACHMENTS }
     url: z.url().optional().or(z.literal("")),
     quoteText: z.string().optional(),
     rating: RatingSchema,
-    collectionId: z.coerce.number().int().positive().optional().or(z.literal("").transform(()=>undefined)),
+    collectionId: z.coerce.number().int().min(0).optional().or(z.literal("").transform(()=>undefined)).transform((v)=>v === 0 ? undefined : v),
     replyToId: z.string().optional(),
     publishedAt: z.number().int().positive().optional(),
     mediaIds: z.array(z.string()).max(MAX_MEDIA_ATTACHMENTS).optional()
@@ -99,6 +99,37 @@ import { FORMATS, STATUSES, SORT_ORDERS, NAV_ITEM_TYPES, MAX_MEDIA_ATTACHMENTS }
 /**
  * API request body schema for updating a collection
  */ export const UpdateCollectionSchema = CreateCollectionSchema.partial();
+// =============================================================================
+// Auth Schemas
+// =============================================================================
+/**
+ * Setup form validation schema
+ */ export const SetupSchema = z.object({
+    name: z.string().min(1, "Name is required"),
+    email: z.string().email("Invalid email address"),
+    password: z.string().min(8, "Password must be at least 8 characters")
+});
+/**
+ * Sign-in form validation schema
+ */ export const SigninSchema = z.object({
+    email: z.string().email("Invalid email address"),
+    password: z.string().min(1, "Password is required")
+});
+/**
+ * Password reset form validation schema
+ */ export const ResetPasswordSchema = z.object({
+    password: z.string().min(8, "Password must be at least 8 characters"),
+    confirmPassword: z.string().min(1),
+    token: z.string().min(1)
+}).refine((d)=>d.password === d.confirmPassword, {
+    message: "Passwords do not match",
+    path: [
+        "confirmPassword"
+    ]
+});
+// =============================================================================
+// Form Data Helpers
+// =============================================================================
 /**
  * Form data helper: safely parse a FormData value with a schema
  *

package/dist/lib/theme.js

@@ -2,11 +2,11 @@
  * Theme Resolution Helpers
  *
  * Resolves the active color theme and builds CSS for injection into `<head>`.
- */ import { BUILTIN_COLOR_THEMES } from "../theme/color-themes.js";
+ */ import { BUILTIN_COLOR_THEMES } from "../ui/color-themes.js";
 /**
  * Get the list of available color themes.
  *
- * Returns `config.theme.colorThemes` if provided, otherwise the built-in list.
+ * Returns `config.colorThemes` if provided, otherwise the built-in list.
  *
  * @param config - The Jant configuration
  * @returns Array of available color themes
@@ -16,7 +16,7 @@
  * const themes = getAvailableThemes(c.var.config);
  * ```
  */ export function getAvailableThemes(config) {
-    return config.theme?.colorThemes ?? BUILTIN_COLOR_THEMES;
+    return config.colorThemes ?? BUILTIN_COLOR_THEMES;
 }
 /**
  * Build a `<style>` CSS string from a color theme and optional cssVariables overlay.
@@ -25,7 +25,7 @@
  *   BaseCoat defaults → selected theme → cssVariables
  *
  * @param theme - The active color theme (undefined = no theme overrides)
- * @param cssVariables - Extra CSS variable overrides from `createApp({ theme: { cssVariables } })`
+ * @param cssVariables - Extra CSS variable overrides from `createApp({ cssVariables })`
  * @returns CSS string to inject in `<head>`, or empty string if nothing to inject
  *
  * Uses `:root:root` and `:root.dark` selectors for higher specificity than

package/dist/lib/timeline.js

@@ -2,44 +2,51 @@
  * Timeline Data Assembly
  *
  * Shared helper for assembling timeline items with media and thread previews.
- * Used by both full-page rendering and load-more SSE responses.
+ * Used by page rendering with page-based pagination.
  */ import { buildMediaMap } from "./media-helpers.js";
 import { createMediaContext, toPostView, toPostViews } from "./view.js";
 const DEFAULT_PAGE_SIZE = 20;
 /**
  * Assembles a page of timeline items with media attachments and thread previews.
  *
- * Fetches posts, batch-loads media, identifies threads, and returns
- * render-ready `TimelineItemView[]` with pagination info.
+ * Fetches posts using offset-based pagination, batch-loads media, identifies
+ * threads, and returns render-ready `TimelineItemView[]` with page info.
  *
  * @param c - Hono context (provides services + env)
- * @param options - Optional cursor for pagination
+ * @param options - Optional page number (1-indexed, defaults to 1)
  * @returns Assembled timeline items with pagination info
  *
  * @example
  * ```ts
- * const { items, hasMore, nextCursor } = await assembleTimeline(c);
- * const { items, hasMore, nextCursor } = await assembleTimeline(c, { cursor: 42 });
+ * const { items, currentPage, totalPages } = await assembleTimeline(c);
+ * const { items, currentPage, totalPages } = await assembleTimeline(c, { page: 2 });
  * ```
  */ export async function assembleTimeline(c, options) {
     const pageSize = parseInt(c.env.PAGE_SIZE ?? String(DEFAULT_PAGE_SIZE), 10) || DEFAULT_PAGE_SIZE;
-    // Fetch one extra to determine if there are more
+    const page = Math.max(1, options?.page ?? 1);
+    const offset = (page - 1) * pageSize;
+    // Get total count for pagination
+    const totalCount = await c.var.services.posts.count({
+        status: "published",
+        excludeReplies: true
+    });
+    const totalPages = Math.max(1, Math.ceil(totalCount / pageSize));
+    // Fetch posts for the current page
     const posts = await c.var.services.posts.list({
         status: "published",
         excludeReplies: true,
-        limit: pageSize + 1,
-        cursor: options?.cursor
+        limit: pageSize,
+        offset
     });
-    const hasMore = posts.length > pageSize;
-    const displayPosts = hasMore ? posts.slice(0, pageSize) : posts;
-    if (displayPosts.length === 0) {
+    if (posts.length === 0) {
         return {
             items: [],
-            hasMore: false
+            currentPage: page,
+            totalPages
         };
     }
     // Batch load media attachments
-    const postIds = displayPosts.map((p)=>p.id);
+    const postIds = posts.map((p)=>p.id);
     const rawMediaMap = await c.var.services.media.getByPostIds(postIds);
     const mediaCtx = createMediaContext(c);
     const mediaMap = buildMediaMap(rawMediaMap, mediaCtx.r2PublicUrl, mediaCtx.imageTransformUrl, mediaCtx.s3PublicUrl);
@@ -57,7 +64,7 @@ const DEFAULT_PAGE_SIZE = 20;
     }
     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 items = posts.map((post)=>{
         const postView = toPostView({
             ...post,
             mediaAttachments: mediaMap.get(post.id) ?? []
@@ -80,40 +87,9 @@ const DEFAULT_PAGE_SIZE = 20;
             post: postView
         };
     });
-    // Determine next cursor
-    const lastPost = displayPosts[displayPosts.length - 1];
-    const nextCursor = hasMore && lastPost ? lastPost.id : undefined;
     return {
         items,
-        hasMore,
-        nextCursor
+        currentPage: page,
+        totalPages
     };
 }
-/**
- * Groups timeline items by their publication date (YYYY-MM-DD).
- *
- * @param items - Timeline items to group
- * @returns Array of date groups, each containing items published on the same day
- *
- * @example
- * ```ts
- * const groups = groupByDate(items);
- * // [{ dateKey: "2024-02-01", label: "Feb 1, 2024", items: [...] }, ...]
- * ```
- */ export function groupByDate(items) {
-    const groups = [];
-    let current = null;
-    for (const item of items){
-        const dateKey = item.post.publishedAt.slice(0, 10);
-        if (!current || current.dateKey !== dateKey) {
-            current = {
-                dateKey,
-                label: item.post.publishedAtFormatted,
-                items: []
-            };
-            groups.push(current);
-        }
-        current.items.push(item);
-    }
-    return groups;
-}