@jant/core 0.3.36 → 0.3.38

package/src/routes/feed/__tests__/rss.test.ts

@@ -4,9 +4,9 @@ import type { Bindings } from "../../../types.js";
 import type { AppVariables } from "../../../types/app-context.js";
 import { createTestDatabase } from "../../../__tests__/helpers/db.js";
 import { createPostService } from "../../../services/post.js";
+import { createPathService } from "../../../services/path.js";
 import { createSettingsService } from "../../../services/settings.js";
 import { createMediaService } from "../../../services/media.js";
-import { createPathRegistryService } from "../../../services/path-registry.js";
 import { resolveConfig } from "../../../lib/resolve-config.js";
 import { rssRoutes } from "../rss.js";
 
@@ -14,12 +14,11 @@ type Env = { Bindings: Bindings; Variables: AppVariables };
 
 function createFeedTestApp(envOverrides: Partial<Bindings> = {}) {
   const { db } = createTestDatabase();
+  const pathService = createPathService(db as never);
 
   const services = {
-    posts: createPostService(
-      db as never,
-      createPathRegistryService(db as never),
-    ),
+    paths: pathService,
+    posts: createPostService(db as never, { slugIdLength: 5 }, pathService),
     settings: createSettingsService(db as never),
     media: createMediaService(db as never),
   };
@@ -54,15 +53,15 @@ describe("RSS Feed Routes", () => {
       await services.posts.create({
         format: "note",
         title: "Regular Post",
-        body: "Not featured",
+        bodyMarkdown: "Not featured",
         status: "published",
       });
       await services.posts.create({
         format: "note",
         title: "Featured Post",
-        body: "This is featured",
+        bodyMarkdown: "This is featured",
         status: "published",
-        visibility: "featured",
+        featured: true,
       });
 
       const res = await app.request("/feed");
@@ -79,7 +78,7 @@ describe("RSS Feed Routes", () => {
       await services.posts.create({
         format: "note",
         title: "Regular Post",
-        body: "Not featured",
+        bodyMarkdown: "Not featured",
         status: "published",
       });
 
@@ -107,15 +106,15 @@ describe("RSS Feed Routes", () => {
       await services.posts.create({
         format: "note",
         title: "Regular Post",
-        body: "Not featured",
+        bodyMarkdown: "Not featured",
         status: "published",
       });
       await services.posts.create({
         format: "note",
         title: "Featured Post",
-        body: "This is featured",
+        bodyMarkdown: "This is featured",
         status: "published",
-        visibility: "featured",
+        featured: true,
       });
 
       const res = await app.request("/feed/atom.xml");
@@ -137,20 +136,20 @@ describe("RSS Feed Routes", () => {
       await services.posts.create({
         format: "note",
         title: "Regular Post",
-        body: "Not featured",
+        bodyMarkdown: "Not featured",
         status: "published",
       });
       await services.posts.create({
         format: "note",
         title: "Featured Post",
-        body: "This is featured",
+        bodyMarkdown: "This is featured",
         status: "published",
-        visibility: "featured",
+        featured: true,
       });
       await services.posts.create({
         format: "note",
         title: "Draft Post",
-        body: "Draft",
+        bodyMarkdown: "Draft",
         status: "draft",
       });
 
@@ -169,7 +168,7 @@ describe("RSS Feed Routes", () => {
       await services.posts.create({
         format: "note",
         title: "My Note",
-        body: "A note",
+        bodyMarkdown: "A note",
         status: "published",
       });
       await services.posts.create({
@@ -200,7 +199,7 @@ describe("RSS Feed Routes", () => {
       await services.posts.create({
         format: "note",
         title: "My Note",
-        body: "A note",
+        bodyMarkdown: "A note",
         status: "published",
       });
       await services.posts.create({
@@ -236,15 +235,15 @@ describe("RSS Feed Routes", () => {
       await services.posts.create({
         format: "note",
         title: "Regular Post",
-        body: "Not featured",
+        bodyMarkdown: "Not featured",
         status: "published",
       });
       await services.posts.create({
         format: "note",
         title: "Featured Post",
-        body: "This is featured",
+        bodyMarkdown: "This is featured",
         status: "published",
-        visibility: "featured",
+        featured: true,
       });
 
       const res = await app.request("/feed/all/atom.xml");
@@ -264,7 +263,7 @@ describe("RSS Feed Routes", () => {
       await services.posts.create({
         format: "note",
         title: "My Note",
-        body: "A note",
+        bodyMarkdown: "A note",
         status: "published",
       });
       await services.posts.create({
@@ -292,9 +291,9 @@ describe("RSS Feed Routes", () => {
         await services.posts.create({
           format: "note",
           title: `Post ${i}`,
-          body: `Body ${i}`,
+          bodyMarkdown: `Body ${i}`,
           status: "published",
-          visibility: "featured",
+          featured: true,
         });
       }
 
@@ -318,7 +317,7 @@ describe("RSS Feed Routes", () => {
         await services.posts.create({
           format: "note",
           title: `Post ${i}`,
-          body: `Body ${i}`,
+          bodyMarkdown: `Body ${i}`,
           status: "published",
         });
       }
@@ -346,7 +345,7 @@ describe("RSS Feed Routes", () => {
         await services.posts.create({
           format: "note",
           title: `Post ${i}`,
-          body: `Body ${i}`,
+          bodyMarkdown: `Body ${i}`,
           status: "published",
         });
       }
@@ -369,9 +368,9 @@ describe("RSS Feed Routes", () => {
         await services.posts.create({
           format: "note",
           title: `Post ${i}`,
-          body: `Body ${i}`,
+          bodyMarkdown: `Body ${i}`,
           status: "published",
-          visibility: "featured",
+          featured: true,
         });
       }
 

package/src/routes/feed/rss.ts

@@ -22,8 +22,9 @@ type Env = { Bindings: Bindings; Variables: AppVariables };
 export const rssRoutes = new Hono<Env>();
 
 interface FeedOptions {
-  visibility?: "featured";
+  featured?: boolean;
   excludeUnlisted?: boolean;
+  excludePrivate?: boolean;
   format?: Format;
 }
 
@@ -48,8 +49,9 @@ async function buildFeedData(
   const posts = await c.var.services.posts.list({
     status: "published",
     excludeReplies: true,
-    visibility: opts?.visibility,
+    featured: opts?.featured,
     excludeUnlisted: opts?.excludeUnlisted,
+    excludePrivate: opts?.excludePrivate ?? true,
     format: opts?.format,
     limit: feedLimit,
   });
@@ -99,7 +101,7 @@ function parseFormatQuery(c: Context<Env>): Format | undefined {
 
 // RSS 2.0 — /feed
 rssRoutes.get("/", async (c) => {
-  const feedData = await buildFeedData(c, { visibility: "featured" });
+  const feedData = await buildFeedData(c, { featured: true });
   const xml = defaultRssRenderer(feedData);
 
   return new Response(xml, {
@@ -111,7 +113,7 @@ rssRoutes.get("/", async (c) => {
 
 // Atom — /feed/atom.xml
 rssRoutes.get("/atom.xml", async (c) => {
-  const feedData = await buildFeedData(c, { visibility: "featured" });
+  const feedData = await buildFeedData(c, { featured: true });
   const xml = defaultAtomRenderer(feedData);
 
   return new Response(xml, {

package/src/routes/feed/sitemap.ts

@@ -6,11 +6,7 @@ import { Hono } from "hono";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../types/app-context.js";
 import { defaultSitemapRenderer } from "../../lib/feed.js";
-import {
-  createMediaContext,
-  toPostViewsFromPosts,
-  toPageView,
-} from "../../lib/view.js";
+import { createMediaContext, toPostViewsFromPosts } from "../../lib/view.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -24,23 +20,17 @@ sitemapRoutes.get("/sitemap.xml", async (c) => {
   const posts = await c.var.services.posts.list({
     status: "published",
     excludeReplies: true,
+    excludePrivate: true,
     limit: 1000,
   });
 
-  // Fetch published pages
-  const publishedPages = await c.var.services.pages.list({
-    status: "published",
-  });
-
   // Transform to View Models
   const mediaCtx = createMediaContext(appConfig);
   const postViews = toPostViewsFromPosts(posts, mediaCtx);
-  const pageViews = publishedPages.map(toPageView);
 
   const xml = defaultSitemapRenderer({
     siteUrl,
     posts: postViews,
-    pages: pageViews,
   });
 
   return new Response(xml, {

package/src/routes/pages/__tests__/collections.test.ts

@@ -10,7 +10,6 @@ import { describe, it, expect, beforeEach } from "vitest";
 import { createTestDatabase } from "../../../__tests__/helpers/db.js";
 import { createCollectionService } from "../../../services/collection.js";
 import { createPostService } from "../../../services/post.js";
-import { createPathRegistryService } from "../../../services/path-registry.js";
 import type { Database } from "../../../db/index.js";
 
 describe("Collections Listing Page - Data Logic", () => {
@@ -22,7 +21,7 @@ describe("Collections Listing Page - Data Logic", () => {
     const testDb = createTestDatabase();
     db = testDb.db as unknown as Database;
     collectionService = createCollectionService(db);
-    postService = createPostService(db, createPathRegistryService(db));
+    postService = createPostService(db, { slugIdLength: 5 });
   });
 
   it("returns collections with post counts", async () => {
@@ -38,11 +37,11 @@ describe("Collections Listing Page - Data Logic", () => {
     // Add posts to recipes collection via junction table
     const p1 = await postService.create({
       format: "note",
-      body: "Recipe 1",
+      bodyMarkdown: "Recipe 1",
     });
     const p2 = await postService.create({
       format: "note",
-      body: "Recipe 2",
+      bodyMarkdown: "Recipe 2",
     });
     await collectionService.addPost(recipes.id, p1.id);
     await collectionService.addPost(recipes.id, p2.id);
@@ -78,11 +77,11 @@ describe("Collections Listing Page - Data Logic", () => {
 
     const post = await postService.create({
       format: "note",
-      body: "Will be deleted",
+      bodyMarkdown: "Will be deleted",
     });
     const post2 = await postService.create({
       format: "note",
-      body: "Will remain",
+      bodyMarkdown: "Will remain",
     });
 
     await collectionService.addPost(col.id, post.id);

package/src/routes/pages/__tests__/featured.test.ts

@@ -9,7 +9,6 @@
 import { describe, it, expect, beforeEach } from "vitest";
 import { createTestDatabase } from "../../../__tests__/helpers/db.js";
 import { createPostService } from "../../../services/post.js";
-import { createPathRegistryService } from "../../../services/path-registry.js";
 import type { Database } from "../../../db/index.js";
 
 describe("Featured Page - Data Logic", () => {
@@ -19,76 +18,96 @@ describe("Featured Page - Data Logic", () => {
   beforeEach(() => {
     const testDb = createTestDatabase();
     db = testDb.db as unknown as Database;
-    postService = createPostService(db, createPathRegistryService(db));
+    postService = createPostService(db, { slugIdLength: 5 });
   });
 
   it("returns only featured published posts", async () => {
     await postService.create({
       format: "note",
-      body: "Featured post",
-      visibility: "featured",
+      bodyMarkdown: "Featured post",
+      featured: true,
       status: "published",
     });
     await postService.create({
       format: "note",
-      body: "Normal post",
+      bodyMarkdown: "Normal post",
       status: "published",
     });
     await postService.create({
       format: "note",
-      body: "Draft featured",
-      visibility: "featured",
+      bodyMarkdown: "Draft featured",
+      featured: true,
       status: "draft",
     });
 
     const posts = await postService.list({
-      visibility: "featured",
+      featured: true,
       status: "published",
-      excludeReplies: true,
     });
 
     expect(posts).toHaveLength(1);
-    expect(posts[0]?.body).toBe("Featured post");
+    expect(posts[0]?.bodyText).toBe("Featured post");
   });
 
   it("returns empty list when no featured posts exist", async () => {
     await postService.create({
       format: "note",
-      body: "Normal post",
+      bodyMarkdown: "Normal post",
       status: "published",
     });
 
     const posts = await postService.list({
-      visibility: "featured",
+      featured: true,
       status: "published",
-      excludeReplies: true,
     });
 
     expect(posts).toHaveLength(0);
   });
 
-  it("excludes replies from featured posts", async () => {
+  it("includes featured reply posts", async () => {
     const root = await postService.create({
       format: "note",
-      body: "Featured root",
-      visibility: "featured",
+      bodyMarkdown: "Root post",
       status: "published",
     });
 
-    // Reply inherits featured from root
-    await postService.create({
+    // Create a reply and feature it independently
+    const reply = await postService.create({
       format: "note",
-      body: "Reply to featured",
+      bodyMarkdown: "Reply to root",
       replyToId: root.id,
     });
+    await postService.update(reply.id, { featured: true });
 
     const posts = await postService.list({
-      visibility: "featured",
+      featured: true,
       status: "published",
-      excludeReplies: true,
     });
 
     expect(posts).toHaveLength(1);
-    expect(posts[0]?.body).toBe("Featured root");
+    expect(posts[0]?.bodyText).toBe("Reply to root");
+  });
+
+  it("featured root and featured reply both appear", async () => {
+    const root = await postService.create({
+      format: "note",
+      bodyMarkdown: "Featured root",
+      featured: true,
+      status: "published",
+    });
+
+    const reply = await postService.create({
+      format: "note",
+      bodyMarkdown: "Featured reply",
+      replyToId: root.id,
+    });
+    await postService.update(reply.id, { featured: true });
+
+    const posts = await postService.list({
+      featured: true,
+      status: "published",
+    });
+
+    expect(posts).toHaveLength(2);
   });
 });