@jant/core 0.3.23 → 0.3.25

package/dist/lib/view.js

@@ -1,22 +1,17 @@
 /**
- * View Model Conversions
+ * View Model Conversions (v2)
  *
  * Transforms raw database models into render-ready View types.
- * Theme components receive only View types — no lib/ imports needed.
+ * Theme components receive only View types -- no lib/ imports needed.
  */ import { encode } from "./sqid.js";
-import { toISOString, formatDate } from "./time.js";
+import { toISOString, formatDate, formatTime, formatRelativeTime } from "./time.js";
 import { getMediaUrl, getImageUrl, getPublicUrlForProvider } from "./image.js";
+import { getHtmlExcerpt } from "./excerpt.js";
 /**
  * Creates a MediaContext from Hono context environment variables.
  *
  * @param c - Hono context
  * @returns MediaContext with env values
- *
- * @example
- * ```ts
- * const mediaCtx = createMediaContext(c);
- * const postView = toPostView(post, mediaCtx);
- * ```
  */ export function createMediaContext(c) {
     return {
         r2PublicUrl: c.env.R2_PUBLIC_URL,
@@ -60,20 +55,22 @@ import { getMediaUrl, getImageUrl, getPublicUrlForProvider } from "./image.js";
  * Converts a PostWithMedia to a render-ready PostView.
  *
  * @param post - Post with media attachments from database
- * @param ctx - Media context with URL configuration
+ * @param _ctx - Media context with URL configuration
  * @returns Render-ready PostView with pre-computed fields
- *
- * @example
- * ```ts
- * const mediaCtx = createMediaContext(c);
- * const postView = toPostView({ ...post, mediaAttachments: [...] }, mediaCtx);
- * ```
  */ export function toPostView(post, _ctx) {
-    const permalink = `/p/${encode(post.id)}`;
-    // Pre-compute excerpt from raw content
+    const permalink = post.path ? `/${post.path}` : `/p/${encode(post.id)}`;
+    // Pre-compute excerpt from raw body
     let excerpt;
-    if (post.content) {
-        excerpt = post.content.length > 160 ? post.content.slice(0, 160) + "..." : post.content;
+    if (post.body) {
+        excerpt = post.body.length > 160 ? post.body.slice(0, 160) + "..." : post.body;
+    }
+    // Pre-compute HTML summary for article-style posts (with title)
+    let summaryHtml;
+    let summaryHasMore;
+    if (post.title && post.bodyHtml) {
+        const result = getHtmlExcerpt(post.bodyHtml);
+        summaryHtml = result.excerpt;
+        summaryHasMore = result.hasMore;
     }
     // Convert media attachments
     const media = post.mediaAttachments.map((m)=>({
@@ -88,39 +85,38 @@ import { getMediaUrl, getImageUrl, getPublicUrlForProvider } from "./image.js";
     return {
         id: post.id,
         permalink,
+        path: post.path ?? undefined,
         title: post.title ?? undefined,
-        contentHtml: post.contentHtml ?? undefined,
+        bodyHtml: post.bodyHtml ?? undefined,
         excerpt,
-        type: post.type,
-        visibility: post.visibility,
-        path: post.path ?? undefined,
+        summaryHtml,
+        summaryHasMore,
+        url: post.url ?? undefined,
+        quoteText: post.quoteText ?? undefined,
+        format: post.format,
+        status: post.status,
+        featured: post.featured === 1,
+        pinned: post.pinned === 1,
+        rating: post.rating ?? undefined,
+        collectionId: post.collectionId ?? undefined,
         publishedAt: toISOString(post.publishedAt),
         publishedAtFormatted: formatDate(post.publishedAt),
+        publishedAtTime: formatTime(post.publishedAt),
+        publishedAtRelative: formatRelativeTime(post.publishedAt),
         updatedAt: toISOString(post.updatedAt),
-        sourceUrl: post.sourceUrl ?? undefined,
-        sourceName: post.sourceName ?? undefined,
-        sourceDomain: post.sourceDomain ?? undefined,
         media,
         replyToId: post.replyToId ?? undefined,
         threadRootId: post.threadId ?? undefined,
-        content: post.content ?? undefined
+        body: post.body ?? undefined
     };
 }
 /**
  * Batch converts PostWithMedia[] to PostView[].
- *
- * @param posts - Array of posts with media
- * @param ctx - Media context
- * @returns Array of PostView
  */ export function toPostViews(posts, ctx) {
     return posts.map((p)=>toPostView(p, ctx));
 }
 /**
  * Converts a bare Post (no media) to a PostView with empty media array.
- *
- * @param post - Post without media
- * @param ctx - Media context (unused but kept for consistency)
- * @returns PostView with empty media
  */ export function toPostViewFromPost(post, ctx) {
     return toPostView({
         ...post,
@@ -129,58 +125,60 @@ import { getMediaUrl, getImageUrl, getPublicUrlForProvider } from "./image.js";
 }
 /**
  * Batch converts Post[] (no media) to PostView[].
- *
- * @param posts - Array of posts without media
- * @param ctx - Media context
- * @returns Array of PostView
  */ export function toPostViewsFromPosts(posts, ctx) {
     return posts.map((p)=>toPostViewFromPost(p, ctx));
 }
 // =============================================================================
+// Page Conversions
+// =============================================================================
+/**
+ * Converts a Page to a render-ready PageView.
+ */ export function toPageView(page) {
+    return {
+        id: page.id,
+        slug: page.slug,
+        title: page.title ?? undefined,
+        bodyHtml: page.bodyHtml ?? undefined,
+        status: page.status,
+        createdAt: toISOString(page.createdAt),
+        updatedAt: toISOString(page.updatedAt)
+    };
+}
+// =============================================================================
 // Navigation Conversions
 // =============================================================================
 /**
- * Converts a NavigationLink to a NavLinkView with pre-computed state.
- *
- * @param link - Raw navigation link from database
- * @param currentPath - Current page path for active state computation
- * @returns NavLinkView with isActive and isExternal pre-computed
- */ export function toNavLinkView(link, currentPath) {
-    const isExternal = link.url.startsWith("http://") || link.url.startsWith("https://");
+ * Converts a NavItem to a NavItemView with pre-computed state.
+ */ export function toNavItemView(item, currentPath) {
+    const isExternal = item.url.startsWith("http://") || item.url.startsWith("https://");
     let isActive = false;
     if (!isExternal) {
-        if (link.url === "/") {
+        if (item.url === "/") {
             isActive = currentPath === "/";
         } else {
-            isActive = currentPath === link.url || currentPath.startsWith(link.url + "/");
+            isActive = currentPath === item.url || currentPath.startsWith(item.url + "/");
         }
     }
     return {
-        id: link.id,
-        label: link.label,
-        url: link.url,
+        id: item.id,
+        type: item.type,
+        label: item.label,
+        url: item.url,
+        pageId: item.pageId ?? undefined,
         isActive,
         isExternal
     };
 }
 /**
- * Batch converts NavigationLink[] to NavLinkView[].
- *
- * @param links - Raw navigation links
- * @param currentPath - Current page path
- * @returns Array of NavLinkView
- */ export function toNavLinkViews(links, currentPath) {
-    return links.map((l)=>toNavLinkView(l, currentPath));
+ * Batch converts NavItem[] to NavItemView[].
+ */ export function toNavItemViews(items, currentPath) {
+    return items.map((item)=>toNavItemView(item, currentPath));
 }
 // =============================================================================
 // Search Result Conversions
 // =============================================================================
 /**
  * Converts a SearchResult to a SearchResultView with PostView.
- *
- * @param result - Raw search result
- * @param ctx - Media context
- * @returns SearchResultView with PostView
  */ export function toSearchResultView(result, ctx) {
     return {
         post: toPostViewFromPost(result.post, ctx),
@@ -190,10 +188,6 @@ import { getMediaUrl, getImageUrl, getPublicUrlForProvider } from "./image.js";
 }
 /**
  * Batch converts SearchResult[] to SearchResultView[].
- *
- * @param results - Raw search results
- * @param ctx - Media context
- * @returns Array of SearchResultView
  */ export function toSearchResultViews(results, ctx) {
     return results.map((r)=>toSearchResultView(r, ctx));
 }
@@ -202,16 +196,11 @@ import { getMediaUrl, getImageUrl, getPublicUrlForProvider } from "./image.js";
 // =============================================================================
 /**
  * Converts a grouped post map to typed ArchiveGroup[].
- *
- * @param grouped - Map of "YYYY-MM" keys to Post arrays
- * @param ctx - Media context
- * @returns Array of ArchiveGroup with pre-formatted labels
  */ export function toArchiveGroups(grouped, ctx) {
     const groups = [];
     for (const [yearMonth, posts] of grouped){
         const [year, month] = yearMonth.split("-");
         if (!year || !month) continue;
-        // Format label like "February 2024"
         const date = new Date(parseInt(year, 10), parseInt(month, 10) - 1);
         const label = date.toLocaleDateString("en-US", {
             year: "numeric",

package/dist/routes/api/collections.js

@@ -0,0 +1,124 @@
+/**
+ * Collections API Routes
+ */ import { Hono } from "hono";
+import { requireAuthApi } from "../../middleware/auth.js";
+import { z } from "zod";
+import { SORT_ORDERS } from "../../types.js";
+export const collectionsApiRoutes = new Hono();
+const SortOrderSchema = z.enum(SORT_ORDERS);
+const CreateCollectionSchema = z.object({
+    slug: z.string().min(1),
+    title: z.string().min(1),
+    description: z.string().optional(),
+    icon: z.string().optional(),
+    sortOrder: SortOrderSchema.optional(),
+    position: z.number().int().min(0).optional(),
+    showDivider: z.boolean().optional()
+});
+const UpdateCollectionSchema = z.object({
+    slug: z.string().min(1).optional(),
+    title: z.string().min(1).optional(),
+    description: z.string().nullable().optional(),
+    icon: z.string().nullable().optional(),
+    sortOrder: SortOrderSchema.optional(),
+    position: z.number().int().min(0).optional(),
+    showDivider: z.boolean().optional()
+});
+const ReorderSchema = z.object({
+    ids: z.array(z.number().int().positive())
+});
+// List collections (includes post counts)
+collectionsApiRoutes.get("/", async (c)=>{
+    const collections = await c.var.services.collections.list();
+    const postCounts = await c.var.services.collections.getPostCounts();
+    return c.json({
+        collections: collections.map((col)=>({
+                ...col,
+                postCount: postCounts.get(col.id) ?? 0
+            }))
+    });
+});
+// Get single collection
+collectionsApiRoutes.get("/:id", async (c)=>{
+    const id = parseInt(c.req.param("id"), 10);
+    if (isNaN(id)) return c.json({
+        error: "Invalid ID"
+    }, 400);
+    const collection = await c.var.services.collections.getById(id);
+    if (!collection) return c.json({
+        error: "Not found"
+    }, 404);
+    return c.json(collection);
+});
+// Reorder collections (requires auth) — must be before /:id
+collectionsApiRoutes.put("/reorder", requireAuthApi(), async (c)=>{
+    const rawBody = await c.req.json();
+    const parseResult = ReorderSchema.safeParse(rawBody);
+    if (!parseResult.success) {
+        return c.json({
+            error: "Validation failed",
+            details: parseResult.error.flatten()
+        }, 400);
+    }
+    await c.var.services.collections.reorder(parseResult.data.ids);
+    const collections = await c.var.services.collections.list();
+    return c.json({
+        collections
+    });
+});
+// Create collection (requires auth)
+collectionsApiRoutes.post("/", requireAuthApi(), async (c)=>{
+    const rawBody = await c.req.json();
+    const parseResult = CreateCollectionSchema.safeParse(rawBody);
+    if (!parseResult.success) {
+        return c.json({
+            error: "Validation failed",
+            details: parseResult.error.flatten()
+        }, 400);
+    }
+    const body = parseResult.data;
+    const collection = await c.var.services.collections.create({
+        slug: body.slug,
+        title: body.title,
+        description: body.description,
+        icon: body.icon,
+        sortOrder: body.sortOrder,
+        position: body.position,
+        showDivider: body.showDivider
+    });
+    return c.json(collection, 201);
+});
+// Update collection (requires auth)
+collectionsApiRoutes.put("/:id", requireAuthApi(), async (c)=>{
+    const id = parseInt(c.req.param("id"), 10);
+    if (isNaN(id)) return c.json({
+        error: "Invalid ID"
+    }, 400);
+    const rawBody = await c.req.json();
+    const parseResult = UpdateCollectionSchema.safeParse(rawBody);
+    if (!parseResult.success) {
+        return c.json({
+            error: "Validation failed",
+            details: parseResult.error.flatten()
+        }, 400);
+    }
+    const collection = await c.var.services.collections.update(id, parseResult.data);
+    if (!collection) return c.json({
+        error: "Not found"
+    }, 404);
+    return c.json(collection);
+});
+// Delete collection (requires auth)
+collectionsApiRoutes.delete("/:id", requireAuthApi(), async (c)=>{
+    const id = parseInt(c.req.param("id"), 10);
+    if (isNaN(id)) return c.json({
+        error: "Invalid ID"
+    }, 400);
+    const success = await c.var.services.collections.delete(id);
+    if (!success) return c.json({
+        error: "Not found"
+    }, 404);
+    return c.json({
+        success: true
+    });
+});

package/dist/routes/api/nav-items.js

@@ -0,0 +1,104 @@
+/**
+ * Nav Items API Routes
+ */ import { Hono } from "hono";
+import { requireAuthApi } from "../../middleware/auth.js";
+import { z } from "zod";
+export const navItemsApiRoutes = new Hono();
+const NavItemTypeSchema = z.enum([
+    "link",
+    "page"
+]);
+const CreateNavItemSchema = z.object({
+    type: NavItemTypeSchema,
+    label: z.string().min(1),
+    url: z.string().min(1),
+    pageId: z.number().int().positive().optional(),
+    position: z.number().int().min(0).optional()
+});
+const UpdateNavItemSchema = z.object({
+    type: NavItemTypeSchema.optional(),
+    label: z.string().min(1).optional(),
+    url: z.string().min(1).optional(),
+    pageId: z.number().int().positive().nullable().optional(),
+    position: z.number().int().min(0).optional()
+});
+const ReorderSchema = z.object({
+    ids: z.array(z.number().int().positive())
+});
+// List nav items
+navItemsApiRoutes.get("/", async (c)=>{
+    const items = await c.var.services.navItems.list();
+    return c.json({
+        navItems: items
+    });
+});
+// Reorder nav items (requires auth) — must be before /:id
+navItemsApiRoutes.put("/reorder", requireAuthApi(), async (c)=>{
+    const rawBody = await c.req.json();
+    const parseResult = ReorderSchema.safeParse(rawBody);
+    if (!parseResult.success) {
+        return c.json({
+            error: "Validation failed",
+            details: parseResult.error.flatten()
+        }, 400);
+    }
+    await c.var.services.navItems.reorder(parseResult.data.ids);
+    const items = await c.var.services.navItems.list();
+    return c.json({
+        navItems: items
+    });
+});
+// Create nav item (requires auth)
+navItemsApiRoutes.post("/", requireAuthApi(), async (c)=>{
+    const rawBody = await c.req.json();
+    const parseResult = CreateNavItemSchema.safeParse(rawBody);
+    if (!parseResult.success) {
+        return c.json({
+            error: "Validation failed",
+            details: parseResult.error.flatten()
+        }, 400);
+    }
+    const body = parseResult.data;
+    const item = await c.var.services.navItems.create({
+        type: body.type,
+        label: body.label,
+        url: body.url,
+        pageId: body.pageId,
+        position: body.position
+    });
+    return c.json(item, 201);
+});
+// Update nav item (requires auth)
+navItemsApiRoutes.put("/:id", requireAuthApi(), async (c)=>{
+    const id = parseInt(c.req.param("id"), 10);
+    if (isNaN(id)) return c.json({
+        error: "Invalid ID"
+    }, 400);
+    const rawBody = await c.req.json();
+    const parseResult = UpdateNavItemSchema.safeParse(rawBody);
+    if (!parseResult.success) {
+        return c.json({
+            error: "Validation failed",
+            details: parseResult.error.flatten()
+        }, 400);
+    }
+    const item = await c.var.services.navItems.update(id, parseResult.data);
+    if (!item) return c.json({
+        error: "Not found"
+    }, 404);
+    return c.json(item);
+});
+// Delete nav item (requires auth)
+navItemsApiRoutes.delete("/:id", requireAuthApi(), async (c)=>{
+    const id = parseInt(c.req.param("id"), 10);
+    if (isNaN(id)) return c.json({
+        error: "Invalid ID"
+    }, 400);
+    const success = await c.var.services.navItems.delete(id);
+    if (!success) return c.json({
+        error: "Not found"
+    }, 404);
+    return c.json({
+        success: true
+    });
+});

package/dist/routes/api/pages.js

@@ -0,0 +1,91 @@
+/**
+ * Pages API Routes
+ */ import { Hono } from "hono";
+import { requireAuthApi } from "../../middleware/auth.js";
+import { z } from "zod";
+import { StatusSchema } from "../../lib/schemas.js";
+export const pagesApiRoutes = new Hono();
+const CreatePageSchema = z.object({
+    slug: z.string().min(1),
+    title: z.string().optional(),
+    body: z.string().optional(),
+    status: StatusSchema.optional()
+});
+const UpdatePageSchema = z.object({
+    slug: z.string().min(1).optional(),
+    title: z.string().nullable().optional(),
+    body: z.string().nullable().optional(),
+    status: StatusSchema.optional()
+});
+// List pages
+pagesApiRoutes.get("/", async (c)=>{
+    const pages = await c.var.services.pages.list();
+    return c.json({
+        pages
+    });
+});
+// Get single page
+pagesApiRoutes.get("/:id", async (c)=>{
+    const id = parseInt(c.req.param("id"), 10);
+    if (isNaN(id)) return c.json({
+        error: "Invalid ID"
+    }, 400);
+    const page = await c.var.services.pages.getById(id);
+    if (!page) return c.json({
+        error: "Not found"
+    }, 404);
+    return c.json(page);
+});
+// Create page (requires auth)
+pagesApiRoutes.post("/", requireAuthApi(), async (c)=>{
+    const rawBody = await c.req.json();
+    const parseResult = CreatePageSchema.safeParse(rawBody);
+    if (!parseResult.success) {
+        return c.json({
+            error: "Validation failed",
+            details: parseResult.error.flatten()
+        }, 400);
+    }
+    const body = parseResult.data;
+    const page = await c.var.services.pages.create({
+        slug: body.slug,
+        title: body.title,
+        body: body.body,
+        status: body.status
+    });
+    return c.json(page, 201);
+});
+// Update page (requires auth)
+pagesApiRoutes.put("/:id", requireAuthApi(), async (c)=>{
+    const id = parseInt(c.req.param("id"), 10);
+    if (isNaN(id)) return c.json({
+        error: "Invalid ID"
+    }, 400);
+    const rawBody = await c.req.json();
+    const parseResult = UpdatePageSchema.safeParse(rawBody);
+    if (!parseResult.success) {
+        return c.json({
+            error: "Validation failed",
+            details: parseResult.error.flatten()
+        }, 400);
+    }
+    const page = await c.var.services.pages.update(id, parseResult.data);
+    if (!page) return c.json({
+        error: "Not found"
+    }, 404);
+    return c.json(page);
+});
+// Delete page (requires auth)
+pagesApiRoutes.delete("/:id", requireAuthApi(), async (c)=>{
+    const id = parseInt(c.req.param("id"), 10);
+    if (isNaN(id)) return c.json({
+        error: "Invalid ID"
+    }, 400);
+    const success = await c.var.services.pages.delete(id);
+    if (!success) return c.json({
+        error: "Not found"
+    }, 404);
+    return c.json({
+        success: true
+    });
+});

package/dist/routes/api/posts.js

@@ -2,7 +2,7 @@
  * Posts API Routes
  */ import { Hono } from "hono";
 import * as sqid from "../../lib/sqid.js";
-import { CreatePostSchema, UpdatePostSchema, validateMediaForPostType } from "../../lib/schemas.js";
+import { CreatePostSchema, UpdatePostSchema, validateMediaCount } from "../../lib/schemas.js";
 import { requireAuthApi } from "../../middleware/auth.js";
 import { getMediaUrl, getImageUrl, getPublicUrlForProvider } from "../../lib/image.js";
 export const postsApiRoutes = new Hono();
@@ -31,18 +31,13 @@ export const postsApiRoutes = new Hono();
 }
 // List posts
 postsApiRoutes.get("/", async (c)=>{
-    const type = c.req.query("type");
-    const visibility = c.req.query("visibility");
+    const format = c.req.query("format");
+    const status = c.req.query("status");
     const cursor = c.req.query("cursor");
     const limit = parseInt(c.req.query("limit") ?? "100", 10);
     const posts = await c.var.services.posts.list({
-        type,
-        visibility: visibility ? [
-            visibility
-        ] : [
-            "featured",
-            "quiet"
-        ],
+        format,
+        status: status ?? "published",
         cursor: cursor ? sqid.decode(cursor) ?? undefined : undefined,
         limit
     });
@@ -93,9 +88,9 @@ postsApiRoutes.post("/", requireAuthApi(), async (c)=>{
         }, 400);
     }
     const body = parseResult.data;
-    // Validate media for post type
+    // Validate media count
     if (body.mediaIds) {
-        const mediaError = validateMediaForPostType(body.type, body.mediaIds);
+        const mediaError = validateMediaCount(body.mediaIds);
         if (mediaError) {
             return c.json({
                 error: mediaError
@@ -112,13 +107,17 @@ postsApiRoutes.post("/", requireAuthApi(), async (c)=>{
         }
     }
     const post = await c.var.services.posts.create({
-        type: body.type,
+        format: body.format,
         title: body.title,
-        content: body.content,
-        visibility: body.visibility,
-        sourceUrl: body.sourceUrl || undefined,
-        sourceName: body.sourceName,
+        body: body.body,
         path: body.path || undefined,
+        status: body.status,
+        featured: body.featured,
+        pinned: body.pinned,
+        url: body.url || undefined,
+        quoteText: body.quoteText,
+        rating: body.rating || undefined,
+        collectionId: body.collectionId || undefined,
         replyToId: body.replyToId ? sqid.decode(body.replyToId) ?? undefined : undefined,
         publishedAt: body.publishedAt
     });
@@ -152,18 +151,9 @@ postsApiRoutes.put("/:id", requireAuthApi(), async (c)=>{
         }, 400);
     }
     const body = parseResult.data;
-    // Validate media for post type if mediaIds is provided
+    // Validate media count if mediaIds is provided
     if (body.mediaIds !== undefined) {
-        // Need the post type — use the new type if provided, else fetch existing
-        let postType = body.type;
-        if (!postType) {
-            const existing = await c.var.services.posts.getById(id);
-            if (!existing) return c.json({
-                error: "Not found"
-            }, 404);
-            postType = existing.type;
-        }
-        const mediaError = validateMediaForPostType(postType, body.mediaIds);
+        const mediaError = validateMediaCount(body.mediaIds);
         if (mediaError) {
             return c.json({
                 error: mediaError
@@ -180,13 +170,17 @@ postsApiRoutes.put("/:id", requireAuthApi(), async (c)=>{
         }
     }
     const post = await c.var.services.posts.update(id, {
-        type: body.type,
+        format: body.format,
         title: body.title,
-        content: body.content,
-        visibility: body.visibility,
-        sourceUrl: body.sourceUrl,
-        sourceName: body.sourceName,
+        body: body.body,
         path: body.path,
+        status: body.status,
+        featured: body.featured,
+        pinned: body.pinned,
+        url: body.url,
+        quoteText: body.quoteText,
+        rating: body.rating || undefined,
+        collectionId: body.collectionId || undefined,
         publishedAt: body.publishedAt
     });
     if (!post) return c.json({

package/dist/routes/api/search.js

@@ -21,21 +21,20 @@ searchApiRoutes.get("/", async (c)=>{
     try {
         const results = await c.var.services.search.search(query, {
             limit,
-            visibility: [
-                "featured",
-                "quiet"
+            status: [
+                "published"
             ]
         });
         return c.json({
             query,
             results: results.map((r)=>({
                     id: sqid.encode(r.post.id),
-                    type: r.post.type,
+                    format: r.post.format,
                     title: r.post.title,
                     path: r.post.path,
                     snippet: r.snippet,
                     publishedAt: r.post.publishedAt,
-                    url: `/p/${sqid.encode(r.post.id)}`
+                    url: r.post.path ? `/${r.post.path}` : `/p/${sqid.encode(r.post.id)}`
                 })),
             count: results.length
         });