@jant/core 0.3.23 → 0.3.25

package/src/routes/dash/posts.tsx

@@ -7,13 +7,13 @@ import { Hono } from "hono";
 import { useLingui } from "@lingui/react/macro";
 import type { Bindings, Post, Media, Collection } from "../../types.js";
 import type { AppVariables } from "../../app.js";
-import { DashLayout } from "../../theme/layouts/index.js";
+import { DashLayout } from "../../ui/layouts/DashLayout.js";
 import {
   PostForm,
   PostList,
   CrudPageHeader,
   ActionButtons,
-} from "../../theme/components/index.js";
+} from "../../ui/dash/index.js";
 import * as sqid from "../../lib/sqid.js";
 import { dsRedirect } from "../../lib/sse.js";
 
@@ -53,7 +53,7 @@ function NewPostContent({ collections }: { collections: Collection[] }) {
 // List posts
 postsRoutes.get("/", async (c) => {
   const posts = await c.var.services.posts.list({
-    visibility: ["featured", "quiet", "unlisted", "draft"],
+    excludeReplies: true,
   });
   const siteName = await getSiteName(c);
 
@@ -89,25 +89,30 @@ postsRoutes.get("/new", async (c) => {
 // Create post
 postsRoutes.post("/", async (c) => {
   const body = await c.req.json<{
-    type: string;
+    format: string;
     title?: string;
-    content: string;
-    visibility: string;
-    sourceUrl?: string;
-    sourceName?: string;
-    path?: string;
+    body: string;
+    status: string;
+    featured?: boolean;
+    pinned?: boolean;
+    url?: string;
+    quoteText?: string;
+    rating?: number;
+    collectionId?: number;
     mediaIds?: string[];
-    collectionIds?: number[];
   }>();
 
   const post = await c.var.services.posts.create({
-    type: body.type as Post["type"],
+    format: body.format as Post["format"],
     title: body.title || undefined,
-    content: body.content,
-    visibility: body.visibility as Post["visibility"],
-    sourceUrl: body.sourceUrl || undefined,
-    sourceName: body.sourceName || undefined,
-    path: body.path || undefined,
+    body: body.body,
+    status: body.status as Post["status"],
+    featured: body.featured,
+    pinned: body.pinned,
+    url: body.url || undefined,
+    quoteText: body.quoteText || undefined,
+    rating: body.rating || undefined,
+    collectionId: body.collectionId || undefined,
   });
 
   // Attach media if provided
@@ -115,14 +120,6 @@ postsRoutes.post("/", async (c) => {
     await c.var.services.media.attachToPost(post.id, body.mediaIds);
   }
 
-  // Sync collection associations
-  if (body.collectionIds) {
-    await c.var.services.collections.syncPostCollections(
-      post.id,
-      body.collectionIds,
-    );
-  }
-
   return dsRedirect(`/dash/posts/${sqid.encode(post.id)}`);
 });
 
@@ -132,6 +129,7 @@ function ViewPostContent({ post }: { post: Post }) {
     message: "Post",
     comment: "@context: Default post title",
   });
+  const permalink = post.path ? `/${post.path}` : `/p/${sqid.encode(post.id)}`;
 
   return (
     <>
@@ -143,7 +141,7 @@ function ViewPostContent({ post }: { post: Post }) {
             message: "Edit",
             comment: "@context: Button to edit post",
           })}
-          viewHref={`/p/${sqid.encode(post.id)}`}
+          viewHref={permalink}
           viewLabel={t({
             message: "View",
             comment: "@context: Button to view post",
@@ -155,7 +153,7 @@ function ViewPostContent({ post }: { post: Post }) {
         <section>
           <div
             class="prose"
-            dangerouslySetInnerHTML={{ __html: post.contentHtml || "" }}
+            dangerouslySetInnerHTML={{ __html: post.bodyHtml || "" }}
           />
         </section>
       </div>
@@ -170,7 +168,6 @@ function EditPostContent({
   imageTransformUrl,
   s3PublicUrl,
   collections,
-  postCollectionIds,
 }: {
   post: Post;
   mediaAttachments: Media[];
@@ -178,7 +175,6 @@ function EditPostContent({
   imageTransformUrl?: string;
   s3PublicUrl?: string;
   collections: Collection[];
-  postCollectionIds: number[];
 }) {
   const { t } = useLingui();
   return (
@@ -194,7 +190,6 @@ function EditPostContent({
         imageTransformUrl={imageTransformUrl}
         s3PublicUrl={s3PublicUrl}
         collections={collections}
-        postCollectionIds={postCollectionIds}
       />
     </>
   );
@@ -237,9 +232,6 @@ postsRoutes.get("/:id/edit", async (c) => {
   const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
   const s3PublicUrl = c.env.S3_PUBLIC_URL;
   const collections = await c.var.services.collections.list();
-  const postCollections =
-    await c.var.services.collections.getCollectionsForPost(post.id);
-  const postCollectionIds = postCollections.map((col) => col.id);
 
   return c.html(
     <DashLayout
@@ -255,7 +247,6 @@ postsRoutes.get("/:id/edit", async (c) => {
         imageTransformUrl={imageTransformUrl}
         s3PublicUrl={s3PublicUrl}
         collections={collections}
-        postCollectionIds={postCollectionIds}
       />
     </DashLayout>,
   );
@@ -267,25 +258,30 @@ postsRoutes.post("/:id", async (c) => {
   if (!id) return c.notFound();
 
   const body = await c.req.json<{
-    type: string;
+    format: string;
     title?: string;
-    content?: string;
-    visibility: string;
-    sourceUrl?: string;
-    sourceName?: string;
-    path?: string;
+    body?: string;
+    status: string;
+    featured?: boolean;
+    pinned?: boolean;
+    url?: string;
+    quoteText?: string;
+    rating?: number;
+    collectionId?: number;
     mediaIds?: string[];
-    collectionIds?: number[];
   }>();
 
   await c.var.services.posts.update(id, {
-    type: body.type as Post["type"],
+    format: body.format as Post["format"],
     title: body.title || null,
-    content: body.content || null,
-    visibility: body.visibility as Post["visibility"],
-    sourceUrl: body.sourceUrl || null,
-    sourceName: body.sourceName || null,
-    path: body.path || null,
+    body: body.body || null,
+    status: body.status as Post["status"],
+    featured: body.featured,
+    pinned: body.pinned,
+    url: body.url || null,
+    quoteText: body.quoteText || null,
+    rating: body.rating || null,
+    collectionId: body.collectionId || null,
   });
 
   // Update media attachments if provided
@@ -293,14 +289,6 @@ postsRoutes.post("/:id", async (c) => {
     await c.var.services.media.attachToPost(id, body.mediaIds);
   }
 
-  // Sync collection associations
-  if (body.collectionIds !== undefined) {
-    await c.var.services.collections.syncPostCollections(
-      id,
-      body.collectionIds,
-    );
-  }
-
   return dsRedirect(`/dash/posts/${sqid.encode(id)}`);
 });
 

package/src/routes/dash/redirects.tsx

@@ -7,13 +7,13 @@ import { Hono } from "hono";
 import { useLingui } from "@lingui/react/macro";
 import type { Bindings, Redirect } from "../../types.js";
 import type { AppVariables } from "../../app.js";
-import { DashLayout } from "../../theme/layouts/index.js";
+import { DashLayout } from "../../ui/layouts/DashLayout.js";
 import {
   EmptyState,
   ListItemRow,
   ActionButtons,
   CrudPageHeader,
-} from "../../theme/components/index.js";
+} from "../../ui/dash/index.js";
 import { dsRedirect } from "../../lib/sse.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };

package/src/routes/dash/settings.tsx

@@ -8,7 +8,7 @@ import { Hono } from "hono";
 import { useLingui } from "@lingui/react/macro";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../app.js";
-import { DashLayout } from "../../theme/layouts/index.js";
+import { DashLayout } from "../../ui/layouts/DashLayout.js";
 import { sse, dsRedirect, dsToast } from "../../lib/sse.js";
 import {
   getSiteLanguage,
@@ -17,7 +17,7 @@ import {
 } from "../../lib/config.js";
 import { SETTINGS_KEYS } from "../../lib/constants.js";
 import { getAvailableThemes } from "../../lib/theme.js";
-import type { ColorTheme } from "../../theme/color-themes.js";
+import type { ColorTheme } from "../../ui/color-themes.js";
 
 /** Escape HTML special characters for safe insertion into HTML strings */
 function escapeHtml(str: string): string {
@@ -283,17 +283,21 @@ function ThemeCard({
 function AppearanceContent({
   themes,
   currentThemeId,
+  customCSS,
 }: {
   themes: ColorTheme[];
   currentThemeId: string;
+  customCSS: string;
 }) {
   const { t } = useLingui();
 
-  const signals = JSON.stringify({ theme: currentThemeId }).replace(
+  const themeSignals = JSON.stringify({ theme: currentThemeId }).replace(
     /</g,
     "\\u003c",
   );
 
+  const cssSignals = JSON.stringify({ customCSS }).replace(/</g, "\\u003c");
+
   return (
     <>
       <h1 class="text-2xl font-semibold mb-2">
@@ -302,7 +306,7 @@ function AppearanceContent({
       <SettingsNav currentTab="appearance" />
 
       <div
-        data-signals={signals}
+        data-signals={themeSignals}
         data-on:change="@post('/dash/settings/appearance')"
         class="max-w-3xl"
       >
@@ -332,6 +336,59 @@ function AppearanceContent({
           </div>
         </fieldset>
       </div>
+
+      <form
+        data-signals={cssSignals}
+        data-on:submit__prevent="@post('/dash/settings/custom-css')"
+        data-indicator="_cssLoading"
+        class="max-w-3xl mt-8"
+      >
+        <fieldset>
+          <legend class="text-lg font-semibold">
+            {t({
+              message: "Custom CSS",
+              comment: "@context: Appearance settings heading for custom CSS",
+            })}
+          </legend>
+          <p class="text-sm text-muted-foreground mb-4">
+            {t({
+              message:
+                "Add custom CSS to override any styles. Use data attributes like [data-page], [data-post], [data-format] to target specific elements.",
+              comment: "@context: Custom CSS settings description",
+            })}
+          </p>
+          <textarea
+            data-bind="customCSS"
+            class="textarea font-mono text-sm min-h-32"
+            rows={8}
+            placeholder={t({
+              message: "/* Your custom CSS here */",
+              comment: "@context: Custom CSS textarea placeholder",
+            })}
+          >
+            {customCSS}
+          </textarea>
+        </fieldset>
+        <button
+          type="submit"
+          class="btn mt-4"
+          data-attr-disabled="$_cssLoading"
+        >
+          <span data-show="!$_cssLoading">
+            {t({
+              message: "Save CSS",
+              comment: "@context: Button to save custom CSS",
+            })}
+          </span>
+          <span data-show="$_cssLoading">
+            {t({
+              message: "Processing...",
+              comment:
+                "@context: Loading text shown on submit button while request is in progress",
+            })}
+          </span>
+        </button>
+      </form>
     </>
   );
 }
@@ -585,6 +642,7 @@ settingsRoutes.get("/appearance", async (c) => {
   const { settings } = c.var.services;
   const siteName = await getSiteName(c);
   const currentThemeId = (await settings.get(SETTINGS_KEYS.THEME)) ?? "default";
+  const customCSS = (await settings.get(SETTINGS_KEYS.CUSTOM_CSS)) ?? "";
   const themes = getAvailableThemes(c.var.config);
   const saved = c.req.query("saved") !== undefined;
 
@@ -596,7 +654,11 @@ settingsRoutes.get("/appearance", async (c) => {
       currentPath="/dash/settings"
       toast={saved ? { message: "Theme saved successfully." } : undefined}
     >
-      <AppearanceContent themes={themes} currentThemeId={currentThemeId} />
+      <AppearanceContent
+        themes={themes}
+        currentThemeId={currentThemeId}
+        customCSS={customCSS}
+      />
     </DashLayout>,
   );
 });
@@ -621,6 +683,22 @@ settingsRoutes.post("/appearance", async (c) => {
   return dsRedirect("/dash/settings/appearance?saved");
 });
 
+// Save custom CSS
+settingsRoutes.post("/custom-css", async (c) => {
+  const body = await c.req.json<{ customCSS: string }>();
+  const { settings } = c.var.services;
+
+  const css = body.customCSS?.trim() ?? "";
+
+  if (css) {
+    await settings.set(SETTINGS_KEYS.CUSTOM_CSS, css);
+  } else {
+    await settings.remove(SETTINGS_KEYS.CUSTOM_CSS);
+  }
+
+  return dsToast("Custom CSS saved successfully.");
+});
+
 // Account page
 settingsRoutes.get("/account", async (c) => {
   const siteName = await getSiteName(c);

package/src/routes/feed/rss.ts

@@ -26,7 +26,8 @@ async function buildFeedData(c: Context<Env>): Promise<FeedData> {
   const siteLanguage = await getSiteLanguage(c);
 
   const posts = await c.var.services.posts.list({
-    visibility: ["featured", "quiet"],
+    status: "published",
+    excludeReplies: true,
     limit: 50,
   });
 
@@ -63,7 +64,7 @@ async function buildFeedData(c: Context<Env>): Promise<FeedData> {
 rssRoutes.get("/", async (c) => {
   const feedData = await buildFeedData(c);
 
-  const renderer = c.var.config.theme?.feed?.rss ?? defaultRssRenderer;
+  const renderer = c.var.config.feed?.rss ?? defaultRssRenderer;
   const xml = renderer(feedData);
 
   return new Response(xml, {
@@ -77,7 +78,7 @@ rssRoutes.get("/", async (c) => {
 rssRoutes.get("/atom.xml", async (c) => {
   const feedData = await buildFeedData(c);
 
-  const renderer = c.var.config.theme?.feed?.atom ?? defaultAtomRenderer;
+  const renderer = c.var.config.feed?.atom ?? defaultAtomRenderer;
   const xml = renderer(feedData);
 
   return new Response(xml, {

package/src/routes/feed/sitemap.ts

@@ -6,7 +6,11 @@ import { Hono } from "hono";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../app.js";
 import { defaultSitemapRenderer } from "../../lib/feed.js";
-import { createMediaContext, toPostViewsFromPosts } from "../../lib/view.js";
+import {
+  createMediaContext,
+  toPostViewsFromPosts,
+  toPageView,
+} from "../../lib/view.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -17,16 +21,22 @@ sitemapRoutes.get("/sitemap.xml", async (c) => {
   const siteUrl = c.env.SITE_URL;
 
   const posts = await c.var.services.posts.list({
-    visibility: ["featured", "quiet"],
+    status: "published",
+    excludeReplies: true,
     limit: 1000,
   });
 
-  // Transform to PostView[]
+  // Fetch published pages
+  const allPages = await c.var.services.pages.list();
+  const publishedPages = allPages.filter((p) => p.status === "published");
+
+  // Transform to View Models
   const mediaCtx = createMediaContext(c);
   const postViews = toPostViewsFromPosts(posts, mediaCtx);
+  const pageViews = publishedPages.map(toPageView);
 
-  const renderer = c.var.config.theme?.feed?.sitemap ?? defaultSitemapRenderer;
-  const xml = renderer({ siteUrl, posts: postViews });
+  const renderer = c.var.config.feed?.sitemap ?? defaultSitemapRenderer;
+  const xml = renderer({ siteUrl, posts: postViews, pages: pageViews });
 
   return new Response(xml, {
     headers: {

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

@@ -0,0 +1,94 @@
+/**
+ * Tests for the collections listing page data logic.
+ *
+ * Note: Route handler tests that import JSX components with @lingui/react/macro
+ * cannot run in vitest (requires SWC plugin). These tests verify the service
+ * layer operations that the collections route orchestrates.
+ */
+
+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 type { Database } from "../../../db/index.js";
+
+describe("Collections Listing Page - Data Logic", () => {
+  let db: Database;
+  let collectionService: ReturnType<typeof createCollectionService>;
+  let postService: ReturnType<typeof createPostService>;
+
+  beforeEach(() => {
+    const testDb = createTestDatabase();
+    db = testDb.db as unknown as Database;
+    collectionService = createCollectionService(db);
+    postService = createPostService(db);
+  });
+
+  it("returns collections with post counts", async () => {
+    const recipes = await collectionService.create({
+      slug: "recipes",
+      title: "Recipes",
+    });
+    await collectionService.create({
+      slug: "travel",
+      title: "Travel",
+    });
+
+    // Add posts to recipes collection
+    await postService.create({
+      format: "note",
+      body: "Recipe 1",
+      collectionId: recipes.id,
+    });
+    await postService.create({
+      format: "note",
+      body: "Recipe 2",
+      collectionId: recipes.id,
+    });
+
+    // Simulate route handler logic
+    const [allCollections, postCounts] = await Promise.all([
+      collectionService.list(),
+      collectionService.getPostCounts(),
+    ]);
+
+    const collections = allCollections.map((col) => ({
+      ...col,
+      postCount: postCounts.get(col.id) ?? 0,
+    }));
+
+    expect(collections).toHaveLength(2);
+    const recipesResult = collections.find((c) => c.slug === "recipes");
+    const travelResult = collections.find((c) => c.slug === "travel");
+    expect(recipesResult?.postCount).toBe(2);
+    expect(travelResult?.postCount).toBe(0);
+  });
+
+  it("returns empty list when no collections exist", async () => {
+    const allCollections = await collectionService.list();
+    expect(allCollections).toHaveLength(0);
+  });
+
+  it("does not count soft-deleted posts", async () => {
+    const col = await collectionService.create({
+      slug: "test",
+      title: "Test",
+    });
+
+    const post = await postService.create({
+      format: "note",
+      body: "Will be deleted",
+      collectionId: col.id,
+    });
+    await postService.create({
+      format: "note",
+      body: "Will remain",
+      collectionId: col.id,
+    });
+
+    await postService.delete(post.id);
+
+    const postCounts = await collectionService.getPostCounts();
+    expect(postCounts.get(col.id)).toBe(1);
+  });
+});

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

@@ -0,0 +1,94 @@
+/**
+ * Tests for the featured page data logic.
+ *
+ * Note: Route handler tests that import JSX components with @lingui/react/macro
+ * cannot run in vitest (requires SWC plugin). These tests verify the service
+ * layer operations that the featured route orchestrates.
+ */
+
+import { describe, it, expect, beforeEach } from "vitest";
+import { createTestDatabase } from "../../../__tests__/helpers/db.js";
+import { createPostService } from "../../../services/post.js";
+import type { Database } from "../../../db/index.js";
+
+describe("Featured Page - Data Logic", () => {
+  let db: Database;
+  let postService: ReturnType<typeof createPostService>;
+
+  beforeEach(() => {
+    const testDb = createTestDatabase();
+    db = testDb.db as unknown as Database;
+    postService = createPostService(db);
+  });
+
+  it("returns only featured published posts", async () => {
+    await postService.create({
+      format: "note",
+      body: "Featured post",
+      featured: true,
+      status: "published",
+    });
+    await postService.create({
+      format: "note",
+      body: "Normal post",
+      featured: false,
+      status: "published",
+    });
+    await postService.create({
+      format: "note",
+      body: "Draft featured",
+      featured: true,
+      status: "draft",
+    });
+
+    const posts = await postService.list({
+      featured: true,
+      status: "published",
+      excludeReplies: true,
+    });
+
+    expect(posts).toHaveLength(1);
+    expect(posts[0]?.body).toBe("Featured post");
+  });
+
+  it("returns empty list when no featured posts exist", async () => {
+    await postService.create({
+      format: "note",
+      body: "Normal post",
+      status: "published",
+    });
+
+    const posts = await postService.list({
+      featured: true,
+      status: "published",
+      excludeReplies: true,
+    });
+
+    expect(posts).toHaveLength(0);
+  });
+
+  it("excludes replies from featured posts", async () => {
+    const root = await postService.create({
+      format: "note",
+      body: "Featured root",
+      featured: true,
+      status: "published",
+    });
+
+    // Reply inherits featured from root
+    await postService.create({
+      format: "note",
+      body: "Reply to featured",
+      replyToId: root.id,
+    });
+
+    const posts = await postService.list({
+      featured: true,
+      status: "published",
+      excludeReplies: true,
+    });
+
+    expect(posts).toHaveLength(1);
+    expect(posts[0]?.body).toBe("Featured root");
+  });
+});