@jant/core 0.6.11 → 0.6.13

package/src/preset.css

@@ -182,9 +182,9 @@ html {
   --tw-prose-quote-borders: var(--color-border);
   --tw-prose-captions: var(--color-muted-foreground);
   --tw-prose-kbd: var(--color-foreground);
-  --tw-prose-code: var(--color-foreground);
-  --tw-prose-pre-code: var(--color-muted-foreground);
-  --tw-prose-pre-bg: var(--color-muted);
+  --tw-prose-code: var(--site-code-text);
+  --tw-prose-pre-code: var(--site-code-text);
+  --tw-prose-pre-bg: var(--site-code-block-bg);
   --tw-prose-th-borders: var(--color-border);
   --tw-prose-td-borders: var(--color-border);
   font-family: var(--font-body);
@@ -213,14 +213,12 @@ html {
 
   :where(h2) {
     font-size: var(--type-content-title);
-    font-style: italic;
     margin-top: 2.1rem;
     margin-bottom: 1.4rem;
   }
 
   :where(h3) {
     font-size: var(--type-content-subtitle);
-    font-style: italic;
     margin-top: 2rem;
     margin-bottom: 1.4rem;
   }
@@ -236,12 +234,12 @@ html {
 
   :where(ul, ol) {
     margin: 1.25em 0;
-    padding-left: 1.625em;
+    padding-left: 1.4em;
   }
 
   :where(li, dt) {
-    margin-top: 1.2em;
-    margin-bottom: 1.2em;
+    margin-top: 0.65em;
+    margin-bottom: 0.65em;
   }
 
   /* Normalize li > p so list spacing is controlled by li alone,
@@ -257,18 +255,35 @@ html {
   :where(code, pre code) {
     font-size: var(--type-code);
     line-height: 1.42;
+    color: var(--site-code-text);
     overflow-wrap: break-word;
   }
 
   :where(:not(pre) > code) {
-    padding: 0.1em 0.35em;
-    background-color: var(--site-feed-card-bg);
-    border: 1px solid var(--site-feed-card-border);
-    border-radius: 0.25rem;
+    padding: 0.08em 0.28em;
+    background-color: var(--site-code-bg);
+    border-radius: 0.22em;
+    box-decoration-break: clone;
+    -webkit-box-decoration-break: clone;
+  }
+
+  :where(:not(pre) > code)::before,
+  :where(:not(pre) > code)::after {
+    content: none;
+  }
+
+  :where(pre) {
+    background-color: var(--site-code-block-bg);
+    border: 1px solid var(--site-code-block-border);
+    border-radius: 6px;
   }
 
   :where(pre code) {
     font-size: var(--type-code-block);
+    color: inherit;
+    background: transparent;
+    border: 0;
+    padding: 0;
   }
 
   :where(h1, h2, h3) :where(code) {
@@ -425,6 +440,37 @@ html {
   margin-bottom: 0;
 }
 
+/*
+ * Feed body headings
+ *
+ * In list contexts, the post title owns the card heading level. Authored
+ * headings inside the body should remain visible, but they should read as
+ * sections within the card rather than as peer post titles.
+ */
+[data-post]:not([data-page="post"]) [data-post-body].prose {
+  :where(h1, h2) {
+    font-size: calc(var(--type-content-body) * 1.12);
+    font-weight: var(--fw-medium);
+    margin-top: 1.45rem;
+    margin-bottom: 0.55rem;
+  }
+
+  :where(h3, h4) {
+    font-size: var(--type-content-body);
+    font-weight: var(--fw-medium);
+    margin-top: 1.2rem;
+    margin-bottom: 0.45rem;
+  }
+
+  :where(h5, h6) {
+    font-size: var(--type-secondary);
+    font-weight: var(--fw-medium);
+    color: var(--site-text-secondary);
+    margin-top: 1rem;
+    margin-bottom: 0.35rem;
+  }
+}
+
 /*
  * Detail-page reading prose
  *
@@ -455,12 +501,8 @@ html {
   );
   --tw-prose-captions: var(--site-reading-caption);
   --tw-prose-kbd: var(--site-reading-heading);
-  --tw-prose-code: var(--site-reading-heading);
-  --tw-prose-pre-code: color-mix(
-    in srgb,
-    var(--site-reading-caption) 86%,
-    var(--site-reading-body)
-  );
+  --tw-prose-code: var(--site-code-text);
+  --tw-prose-pre-code: var(--site-code-text);
   --tw-prose-th-borders: color-mix(
     in srgb,
     var(--site-divider) 88%,

package/src/routes/api/__tests__/nav-items.test.ts

@@ -77,6 +77,32 @@ describe("Nav Items API Routes", () => {
       expect(body.label).toBe("GitHub");
       expect(body.url).toBe("https://github.com");
       expect(body.type).toBe("link");
+      expect(body.headerHtml).toBeUndefined();
+    });
+
+    it("includes a site header fragment for navigation editor requests", async () => {
+      const { app } = createTestApp({ authenticated: true });
+      app.route("/api/nav-items", navItemsApiRoutes);
+
+      const res = await app.request("/api/nav-items", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          "X-Jant-Site-Header": "include",
+        },
+        body: JSON.stringify({
+          type: "link",
+          label: "Docs",
+          url: "/docs",
+        }),
+      });
+
+      expect(res.status).toBe(201);
+      const body = await res.json();
+      expect(body.label).toBe("Docs");
+      expect(body.headerHtml).toContain('data-site-header-fragment="header"');
+      expect(body.headerHtml).toContain('data-site-header-fragment="drawer"');
+      expect(body.headerHtml).toContain("Docs");
     });
 
     it("creates a system nav item when authenticated", async () => {

package/src/routes/api/export.ts

@@ -5,7 +5,6 @@
 import { Hono } from "hono";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../types/app-context.js";
-import { getHomeDefaultViewFromNavItems } from "../../lib/navigation.js";
 import { requireAuthApi } from "../../middleware/auth.js";
 import { createExportService } from "../../services/export.js";
 
@@ -25,7 +24,6 @@ exportApiRoutes.post("/hugo", requireAuthApi(), async (c) => {
       siteDescription: appConfig.siteDescription,
       siteLanguage: appConfig.siteLanguage,
       showJantBrandingOnHome: appConfig.showJantBrandingOnHome,
-      homeDefaultView: getHomeDefaultViewFromNavItems(navItems),
       mainRssFeed: appConfig.mainRssFeed,
       siteFooter: appConfig.siteFooter,
       showHeaderAvatar: appConfig.showHeaderAvatar,

package/src/routes/api/internal/__tests__/uploads.test.ts

@@ -136,7 +136,7 @@ describe("Internal upload admin routes", () => {
     expect(storage.files.has(row.tempStorageKey)).toBe(false);
   });
 
-  it("deletes orphaned media past the grace window and keeps fresh orphans", async () => {
+  it("keeps finalized unattached media during upload cleanup", async () => {
     const storage = createMockStorage();
     const { app, services, sqlite } = createTestApp({
       authenticated: false,
@@ -187,28 +187,24 @@ describe("Internal upload admin routes", () => {
     await expect(res.json()).resolves.toEqual({
       abortedMultipartUploads: 0,
       deletedSessions: 0,
-      deletedOrphanMedia: 1,
-      // The reaped orphan's object is freshly enqueued (30 days out), so the
-      // same sweep purges nothing yet.
+      deletedOrphanMedia: 0,
       purgedStorageObjects: 0,
     });
 
-    // Old orphan: DB row gone, original key freed immediately, bytes moved to
-    // a trash/ key recorded in storage_purge (recoverable within the window).
+    // Finalized media may be referenced from post body JSON without being a
+    // post attachment, so upload cleanup must not delete it from `postId IS
+    // NULL` alone.
     expect(
       sqlite.prepare("select id from media where id = ?").get(oldOrphan.id),
-    ).toBeUndefined();
-    expect(storage.files.has(oldStorageKey)).toBe(false);
-    expect([...storage.files.keys()].some((k) => k.startsWith("trash/"))).toBe(
-      true,
-    );
+    ).toBeDefined();
+    expect(storage.files.has(oldStorageKey)).toBe(true);
     expect(
       sqlite
         .prepare("select id from storage_purge where original_key = ?")
         .get(oldStorageKey),
-    ).toBeDefined();
+    ).toBeUndefined();
 
-    // Fresh orphan: untouched.
+    // Fresh unattached media is also untouched.
     expect(
       sqlite.prepare("select id from media where id = ?").get(freshOrphan.id),
     ).toBeDefined();

package/src/routes/api/internal/sites.ts

@@ -163,11 +163,11 @@ internalSitesRoutes.get(
   },
 );
 
-// Clean up a single managed site's expired upload sessions and orphaned media
-// (uploaded during compose but never published). Invoked per-site by the
-// hosted control plane's scheduled maintenance. Self-hosted operators use the
-// host-scoped `POST /api/internal/uploads/cleanup` route / `jant uploads
-// cleanup` CLI instead.
+// Clean up a single managed site's expired upload sessions and due trash
+// objects. Invoked per-site by the hosted control plane's scheduled
+// maintenance. Self-hosted operators use the host-scoped
+// `POST /api/internal/uploads/cleanup` route / `jant uploads cleanup` CLI
+// instead.
 internalSitesRoutes.post(
   "/:siteId/uploads/cleanup",
   requireInternalAdminApi(),

package/src/routes/api/nav-items.ts

@@ -3,6 +3,7 @@
  */
 
 import { Hono } from "hono";
+import type { Context } from "hono";
 import { z } from "zod";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../types/app-context.js";
@@ -16,16 +17,36 @@ import {
 import { assertFound, parseIdParam, NotFoundError } from "../../lib/errors.js";
 import { ID_PREFIX } from "../../lib/ids.js";
 import { getCollectionPagePath } from "../../lib/collection-paths.js";
+import { renderSiteHeaderHtml } from "../../lib/site-header-fragment.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
 export const navItemsApiRoutes = new Hono<Env>();
 
+const INCLUDE_SITE_HEADER_RESPONSE = "include";
+const SITE_HEADER_RESPONSE_HEADER = "x-jant-site-header";
+
 const MoveSchema = z.object({
   after: NavItemIdSchema.nullable().optional(),
   before: NavItemIdSchema.nullable().optional(),
 });
 
+async function withSiteHeaderHtml<T extends object>(
+  c: Context<Env>,
+  body: T,
+): Promise<T | (T & { headerHtml: string })> {
+  if (
+    c.req.header(SITE_HEADER_RESPONSE_HEADER) !== INCLUDE_SITE_HEADER_RESPONSE
+  ) {
+    return body;
+  }
+
+  return {
+    ...body,
+    headerHtml: await renderSiteHeaderHtml(c),
+  };
+}
+
 // List nav items
 navItemsApiRoutes.get("/", async (c) => {
   const items = await c.var.services.navItems.list();
@@ -46,7 +67,7 @@ navItemsApiRoutes.put("/:id/move", requireAuthApi(), async (c) => {
     "Nav item",
   );
 
-  return c.json(item);
+  return c.json(await withSiteHeaderHtml(c, item));
 });
 
 // Create nav item (requires auth)
@@ -82,7 +103,7 @@ navItemsApiRoutes.post("/", requireAuthApi(), async (c) => {
     });
   }
 
-  return c.json(item, 201);
+  return c.json(await withSiteHeaderHtml(c, item), 201);
 });
 
 // Update nav item (requires auth)
@@ -95,7 +116,7 @@ navItemsApiRoutes.put("/:id", requireAuthApi(), async (c) => {
     "Nav item",
   );
 
-  return c.json(item);
+  return c.json(await withSiteHeaderHtml(c, item));
 });
 
 // Delete nav item (requires auth)
@@ -105,5 +126,5 @@ navItemsApiRoutes.delete("/:id", requireAuthApi(), async (c) => {
   const success = await c.var.services.navItems.delete(id);
   if (!success) throw new NotFoundError("Nav item");
 
-  return c.json({ success: true });
+  return c.json(await withSiteHeaderHtml(c, { success: true }));
 });

package/src/routes/dash/settings.tsx

@@ -75,6 +75,7 @@ import {
   isSyncPending,
   markSyncPending,
   runBackgroundSync,
+  triggerGitHubSyncInline,
 } from "../../lib/github-sync-trigger.js";
 import { buildSyncSiteConfig } from "../../lib/github-sync-site-config.js";
 import {
@@ -117,6 +118,10 @@ function publicPath(c: Context<Env>, path: string): string {
   return toPublicPath(path, c.var.appConfig.sitePathPrefix);
 }
 
+function aboutEditPath(c: Context<Env>): string {
+  return `${publicPath(c, "/about")}?edit=1`;
+}
+
 /**
  * Breadcrumb labels for admin settings pages.
  *
@@ -184,7 +189,10 @@ function breadcrumbLabel(
       );
     case "account":
       return i18n._(
-        msg({ message: "Account", comment: "@context: Breadcrumb label" }),
+        msg({
+          message: "Account & Data",
+          comment: "@context: Breadcrumb label",
+        }),
       );
     case "sessions":
       return i18n._(
@@ -302,7 +310,10 @@ settingsRoutes.get("/general", async (c) => {
   const dbSiteDescription = allSettings["SITE_DESCRIPTION"] ?? "";
 
   const saved = c.req.query("saved") !== undefined;
-  const navData = await getNavigationData(c);
+  const [navData, aboutPage] = await Promise.all([
+    getNavigationData(c),
+    c.var.services.aboutPage.getStatus(),
+  ]);
   const siteUrlForDisplay =
     appConfig.siteUrl || new URL(publicPath(c, "/"), c.req.url).toString();
 
@@ -356,6 +367,9 @@ settingsRoutes.get("/general", async (c) => {
           noindex={appConfig.noindex}
           demoMode={appConfig.demoMode}
           timezones={TIMEZONES}
+          aboutPage={aboutPage}
+          aboutEditUrl={aboutEditPath(c)}
+          aboutCreateUrl={publicPath(c, "/settings/general/about-page")}
         />
       </>
     ),
@@ -534,6 +548,32 @@ settingsRoutes.post("/general/search", async (c) => {
   );
 });
 
+settingsRoutes.post("/general/about-page", async (c) => {
+  try {
+    await c.var.services.aboutPage.ensurePage();
+    await triggerGitHubSyncInline(c);
+  } catch (error) {
+    if (error instanceof ValidationError) {
+      const wantsJson = c.req.header("accept")?.includes("application/json");
+      if (wantsJson) {
+        return c.json({ error: error.message, code: error.code }, 400);
+      }
+      return c.text(error.message, 400);
+    }
+    throw error;
+  }
+
+  const wantsJson = c.req.header("accept")?.includes("application/json");
+  if (wantsJson) {
+    return c.json({
+      status: "redirect" as const,
+      url: aboutEditPath(c),
+    });
+  }
+
+  return c.redirect(aboutEditPath(c));
+});
+
 // ===========================================================================
 // Avatar
 // ===========================================================================
@@ -743,9 +783,13 @@ settingsRoutes.post("/avatar/display", async (c) => {
 // ===========================================================================
 
 settingsRoutes.get("/navigation", async (c) => {
-  const [navItems, directoryData] = await Promise.all([
+  const [navItems, directoryData, suggestedLinks] = await Promise.all([
     c.var.services.navItems.list(),
     c.var.services.collections.listDirectoryData(),
+    c.var.services.navItems.listSuggestedLinks({
+      siteOrigin: c.var.appConfig.siteOrigin,
+      sitePathPrefix: c.var.appConfig.sitePathPrefix,
+    }),
   ]);
   const navData = await getNavigationData(c);
 
@@ -762,6 +806,7 @@ settingsRoutes.get("/navigation", async (c) => {
         <NavigationContent
           navItems={navItems}
           directoryData={directoryData}
+          suggestedLinks={suggestedLinks}
           mainRssFeed={c.var.appConfig.mainRssFeed}
           siteName={navData.siteName}
           sitePathPrefix={c.var.appConfig.sitePathPrefix}

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

@@ -121,6 +121,48 @@ describe("Atom Feed Routes", () => {
       expect(xml).not.toContain("Hidden Post");
     });
 
+    it("ignores pinned ordering when the main feed is latest", async () => {
+      const { app, services } = createFeedTestApp({
+        RSS_FEED_LIMIT: "2",
+      });
+
+      await services.settings.set("MAIN_RSS_FEED", "latest");
+
+      await services.posts.create({
+        format: "note",
+        title: "Older pinned",
+        bodyMarkdown: "Pinned but old",
+        status: "published",
+        pinned: true,
+        publishedAt: 1000,
+      });
+      await services.posts.create({
+        format: "note",
+        title: "Newer unpinned",
+        bodyMarkdown: "Newer",
+        status: "published",
+        publishedAt: 2000,
+      });
+      await services.posts.create({
+        format: "note",
+        title: "Newest unpinned",
+        bodyMarkdown: "Newest",
+        status: "published",
+        publishedAt: 3000,
+      });
+
+      const res = await app.request("/feed");
+      expect(res.status).toBe(200);
+
+      const xml = await res.text();
+      expect(xml).toContain("Newest unpinned");
+      expect(xml).toContain("Newer unpinned");
+      expect(xml).not.toContain("Older pinned");
+      expect(xml.indexOf("Newest unpinned")).toBeLessThan(
+        xml.indexOf("Newer unpinned"),
+      );
+    });
+
     it("returns Atom content type", async () => {
       const { app } = createFeedTestApp();
 

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

@@ -345,19 +345,8 @@ describe("Sitemap Routes", () => {
       expect(xml).toContain(`${TEST_SITE_ORIGIN}/archive`);
     });
 
-    it("includes /latest when the homepage default is 'featured'", async () => {
-      const { app, services } = createSitemapTestApp();
-      await services.settings.set("HOME_DEFAULT_VIEW", "featured");
-
-      const xml = await (await app.request("/sitemap-pages.xml")).text();
-      expect(xml).toContain(`${TEST_SITE_ORIGIN}/latest`);
-      expect(xml).not.toContain(`${TEST_SITE_ORIGIN}/featured`);
-    });
-
-    it("includes /featured when the homepage default is 'latest'", async () => {
-      const { app, services } = createSitemapTestApp();
-      await services.settings.set("HOME_DEFAULT_VIEW", "latest");
-
+    it("includes /featured as the secondary aggregate page", async () => {
+      const { app } = createSitemapTestApp();
       const xml = await (await app.request("/sitemap-pages.xml")).text();
       expect(xml).toContain(`${TEST_SITE_ORIGIN}/featured`);
       expect(xml).not.toContain(`${TEST_SITE_ORIGIN}/latest`);

package/src/routes/feed/feed.ts

@@ -126,6 +126,7 @@ async function buildLatestFeedData(
     excludeLatestHidden: true,
     excludePrivate: true,
     format,
+    ignorePinnedSort: true,
     limit: feedLimit,
   });
 

package/src/routes/feed/sitemap.ts

@@ -185,7 +185,7 @@ sitemapRoutes.get("/sitemap-collections.xml", async (c) => {
 
 sitemapRoutes.get("/sitemap-pages.xml", async (c) => {
   const { appConfig } = c.var;
-  const { siteUrl, sitePathPrefix, homeDefaultView } = appConfig;
+  const { siteUrl, sitePathPrefix } = appConfig;
 
   const urls: SitemapUrlEntry[] = [
     {
@@ -200,12 +200,8 @@ sitemapRoutes.get("/sitemap-pages.xml", async (c) => {
     },
   ];
 
-  // Whichever of /latest and /featured is NOT the homepage default is a
-  // standalone URL worth indexing; the other 302-redirects to `/`.
-  const secondaryAggregate =
-    homeDefaultView === "featured" ? "/latest" : "/featured";
   urls.push({
-    loc: absoluteUrl(secondaryAggregate, siteUrl, sitePathPrefix),
+    loc: absoluteUrl("/featured", siteUrl, sitePathPrefix),
     priority: "0.6",
     changefreq: "daily",
   });

package/src/routes/pages/__tests__/draft-about-edit.test.ts

@@ -0,0 +1,65 @@
+import { describe, expect, it } from "vitest";
+import { createTestApp } from "../../../__tests__/helpers/app.js";
+import { pageRoutes } from "../page.js";
+
+function createPageTestApp(options: { authenticated?: boolean } = {}) {
+  const testApp = createTestApp(options);
+  const { app } = testApp;
+
+  app.use("*", async (c, next) => {
+    c.set("publicPath", c.req.path);
+    c.set("publicRequestUrl", c.req.url);
+    await next();
+  });
+
+  app.route("/", pageRoutes);
+
+  return testApp;
+}
+
+async function createDraftAbout(
+  services: ReturnType<typeof createTestApp>["services"],
+) {
+  return services.posts.create({
+    format: "note",
+    title: "About",
+    slug: "about",
+    bodyMarkdown: "Draft About body",
+    status: "draft",
+    visibility: "latest_hidden",
+  });
+}
+
+describe("draft About edit route", () => {
+  it("keeps draft About hidden from anonymous edit requests", async () => {
+    const { app, services } = createPageTestApp();
+    await createDraftAbout(services);
+
+    const res = await app.request("/about?edit=1");
+
+    expect(res.status).toBe(404);
+  });
+
+  it("keeps draft About hidden from normal authenticated page requests", async () => {
+    const { app, services } = createPageTestApp({ authenticated: true });
+    await createDraftAbout(services);
+
+    const res = await app.request("/about");
+
+    expect(res.status).toBe(404);
+  });
+
+  it("renders draft About for authenticated edit requests", async () => {
+    const { app, services } = createPageTestApp({ authenticated: true });
+    const post = await createDraftAbout(services);
+
+    const res = await app.request("/about?edit=1");
+
+    expect(res.status).toBe(200);
+    const html = await res.text();
+    expect(html).toContain(`data-post-id="${post.id}"`);
+    expect(html).toContain("data-authenticated");
+    expect(html).not.toContain('rel="canonical"');
+    expect(html).not.toContain("application/ld+json");
+  });
+});

package/src/routes/pages/archive.tsx

@@ -630,6 +630,7 @@ async function buildArchiveFeedData(
     hasMedia: params.hasMedia,
     hasTitle: params.hasTitle,
     hasReplies: params.hasReplies,
+    ignorePinnedSort: true,
     ...(params.validYear
       ? {
           publishedAfter: Date.UTC(params.validYear, 0, 1) / 1000,

package/src/routes/pages/collection.tsx

@@ -263,6 +263,7 @@ export async function renderCollectionFeed(
       {
         status: "published",
         excludePrivate: true,
+        ignoreCollectionPinnedSort: true,
         limit: feedLimit,
       },
     );

package/src/routes/pages/featured.tsx

@@ -27,10 +27,6 @@ featuredRoutes.get("/", async (c) => {
   const navData = await getNavigationData(c);
   const i18n = getI18n(c);
 
-  // When homepage already shows featured, redirect to avoid duplicate content
-  if (navData.homeDefaultView === "featured") {
-    return c.redirect(toPublicPath("/", navData.sitePathPrefix), 302);
-  }
   const page = parsePageNumber(c.req.query("page"));
   const featuredTitle = i18n._(
     msg({