@jant/core 0.3.32 → 0.3.34

package/src/routes/dash/pages.tsx

@@ -1,7 +1,7 @@
 /**
- * Dashboard Pages & Navigation Routes
+ * Dashboard Pages Routes
  *
- * Unified management for pages and navigation items.
+ * Page CRUD management.
  */
 
 import { Hono } from "hono";
@@ -13,8 +13,7 @@ import { DashLayout } from "../../ui/layouts/DashLayout.js";
 import { PageForm, ActionButtons, DangerZone } from "../../ui/dash/index.js";
 import { dsRedirect, dsToast } from "../../lib/sse.js";
 import { CreatePageSchema } from "../../lib/schemas.js";
-import { UnifiedPagesContent } from "../../ui/dash/pages/UnifiedPagesContent.js";
-import { LinkFormContent } from "../../ui/dash/pages/LinkFormContent.js";
+import { PagesContent } from "../../ui/dash/pages/PagesContent.js";
 import { getI18n } from "../../i18n/index.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
@@ -107,10 +106,7 @@ function EditPageContent({ page }: { page: Page }) {
 // =============================================================================
 
 pagesRoutes.get("/", async (c) => {
-  const [navItems, otherPages] = await Promise.all([
-    c.var.services.navItems.list(),
-    c.var.services.pages.listNotInNav(),
-  ]);
+  const pages = await c.var.services.pages.list();
   const siteName = c.var.appConfig.siteName;
 
   return c.html(
@@ -120,7 +116,7 @@ pagesRoutes.get("/", async (c) => {
       siteName={siteName}
       currentPath="/dash/pages"
     >
-      <UnifiedPagesContent navItems={navItems} otherPages={otherPages} />
+      <PagesContent pages={pages} />
     </DashLayout>,
   );
 });
@@ -139,123 +135,6 @@ pagesRoutes.get("/new", async (c) => {
   );
 });
 
-pagesRoutes.get("/links/new", async (c) => {
-  const siteName = c.var.appConfig.siteName;
-  return c.html(
-    <DashLayout
-      c={c}
-      title="New Link"
-      siteName={siteName}
-      currentPath="/dash/pages"
-    >
-      <LinkFormContent />
-    </DashLayout>,
-  );
-});
-
-pagesRoutes.post("/links", async (c) => {
-  const i18n = getI18n(c);
-  const body = await c.req.json<{ label: string; url: string }>();
-  if (!body.label || !body.url) {
-    return dsToast(
-      i18n._(
-        msg({
-          message: "Label and URL are required",
-          comment: "@context: Error toast when nav link fields are empty",
-        }),
-      ),
-      "error",
-    );
-  }
-
-  await c.var.services.navItems.create({
-    type: "link",
-    label: body.label,
-    url: body.url,
-  });
-  return dsRedirect("/dash/pages");
-});
-
-pagesRoutes.post("/reorder", async (c) => {
-  const i18n = getI18n(c);
-  const body = await c.req.json<{ ids: number[] }>();
-  if (!Array.isArray(body.ids)) {
-    return dsToast(
-      i18n._(
-        msg({
-          message: "Invalid request",
-          comment: "@context: Error toast when reorder request is malformed",
-        }),
-      ),
-      "error",
-    );
-  }
-  await c.var.services.navItems.reorder(body.ids);
-  return dsToast(
-    i18n._(
-      msg({
-        message: "Order saved",
-        comment: "@context: Toast after saving navigation item order",
-      }),
-    ),
-  );
-});
-
-pagesRoutes.get("/links/:id/edit", async (c) => {
-  const id = parseInt(c.req.param("id"), 10);
-  if (isNaN(id)) return c.notFound();
-
-  const item = await c.var.services.navItems.getById(id);
-  if (!item) return c.notFound();
-
-  const siteName = c.var.appConfig.siteName;
-  return c.html(
-    <DashLayout
-      c={c}
-      title="Edit Link"
-      siteName={siteName}
-      currentPath="/dash/pages"
-    >
-      <LinkFormContent item={item} isEdit />
-    </DashLayout>,
-  );
-});
-
-pagesRoutes.post("/links/:id", async (c) => {
-  const i18n = getI18n(c);
-  const id = parseInt(c.req.param("id"), 10);
-  if (isNaN(id)) return c.notFound();
-
-  const body = await c.req.json<{ label: string; url: string }>();
-  if (!body.label || !body.url) {
-    return dsToast(
-      i18n._(
-        msg({
-          message: "Label and URL are required",
-          comment: "@context: Error toast when nav link fields are empty",
-        }),
-      ),
-      "error",
-    );
-  }
-
-  const updated = await c.var.services.navItems.update(id, {
-    label: body.label,
-    url: body.url,
-  });
-  if (!updated) return c.notFound();
-
-  return dsRedirect("/dash/pages");
-});
-
-pagesRoutes.post("/links/:id/delete", async (c) => {
-  const id = parseInt(c.req.param("id"), 10);
-  if (!isNaN(id)) {
-    await c.var.services.navItems.delete(id);
-  }
-  return dsRedirect("/dash/pages");
-});
-
 pagesRoutes.post("/", async (c) => {
   const i18n = getI18n(c);
   const raw = await c.req.json();
@@ -282,30 +161,6 @@ pagesRoutes.post("/", async (c) => {
   return dsRedirect(`/dash/pages/${page.id}`);
 });
 
-pagesRoutes.post("/:id/add-to-nav", async (c) => {
-  const id = parseInt(c.req.param("id"), 10);
-  if (isNaN(id)) return c.notFound();
-
-  const page = await c.var.services.pages.getById(id);
-  if (!page) return c.notFound();
-
-  await c.var.services.navItems.create({
-    type: "page",
-    label: page.title || page.slug,
-    url: `/${page.slug}`,
-    pageId: page.id,
-  });
-  return dsRedirect("/dash/pages");
-});
-
-pagesRoutes.post("/:id/remove-from-nav", async (c) => {
-  const pageId = parseInt(c.req.param("id"), 10);
-  if (isNaN(pageId)) return c.notFound();
-
-  await c.var.services.navItems.deleteByPageId(pageId);
-  return dsRedirect("/dash/pages");
-});
-
 pagesRoutes.get("/:id", async (c) => {
   const id = parseInt(c.req.param("id"), 10);
   if (isNaN(id)) return c.notFound();

package/src/routes/dash/posts.tsx

@@ -21,6 +21,11 @@ import {
 } from "../../ui/dash/index.js";
 import * as sqid from "../../lib/sqid.js";
 import { dsRedirect } from "../../lib/sse.js";
+import {
+  CreatePostSchema,
+  UpdatePostSchema,
+  parseValidated,
+} from "../../lib/schemas.js";
 import {
   toPostViewsFromPosts,
   toPostViewFromPost,
@@ -103,25 +108,18 @@ postsRoutes.get("/new", async (c) => {
 // Create post
 postsRoutes.post("/", async (c) => {
   const wantsJson = c.req.header("Accept")?.includes("application/json");
-  const body = await c.req.json<{
-    format: string;
-    title?: string;
-    body: string;
-    status: string;
-    featured?: boolean;
-    pinned?: boolean;
-    url?: string;
-    quoteText?: string;
-    rating?: number;
-    collectionIds?: number[];
-    mediaIds?: string[];
-  }>();
+  const body = parseValidated(CreatePostSchema, await c.req.json());
+
+  // Validate media IDs before creating post
+  if (body.mediaIds && body.mediaIds.length > 0) {
+    await c.var.services.media.validateIds(body.mediaIds);
+  }
 
   const post = await c.var.services.posts.create({
-    format: body.format as Post["format"],
+    format: body.format,
     title: body.title || undefined,
     body: body.body,
-    status: body.status as Post["status"],
+    status: body.status,
     featured: body.featured,
     pinned: body.pinned,
     url: body.url || undefined,
@@ -289,25 +287,18 @@ postsRoutes.post("/:id", async (c) => {
 
   const wantsJson = c.req.header("Accept")?.includes("application/json");
 
-  const body = await c.req.json<{
-    format: string;
-    title?: string;
-    body?: string;
-    status: string;
-    featured?: boolean;
-    pinned?: boolean;
-    url?: string;
-    quoteText?: string;
-    rating?: number;
-    collectionIds?: number[];
-    mediaIds?: string[];
-  }>();
+  const body = parseValidated(UpdatePostSchema, await c.req.json());
+
+  // Validate media IDs if provided
+  if (body.mediaIds !== undefined) {
+    await c.var.services.media.validateIds(body.mediaIds);
+  }
 
   await c.var.services.posts.update(id, {
-    format: body.format as Post["format"],
+    format: body.format,
     title: body.title || null,
     body: body.body || null,
-    status: body.status as Post["status"],
+    status: body.status,
     featured: body.featured,
     pinned: body.pinned,
     url: body.url || null,
@@ -334,8 +325,10 @@ postsRoutes.post("/:id/delete", async (c) => {
   const id = sqid.decode(c.req.param("id"));
   if (!id) return c.notFound();
 
-  await c.var.services.media.detachFromPost(id);
-  await c.var.services.posts.delete(id);
+  await c.var.services.posts.delete(id, {
+    media: c.var.services.media,
+    storage: c.var.storage,
+  });
 
   return dsRedirect("/dash/posts");
 });

package/src/routes/dash/redirects.tsx

@@ -5,6 +5,7 @@
  */
 
 import { Hono } from "hono";
+import { z } from "zod";
 import { useLingui } from "@lingui/react/macro";
 import type { Bindings, Redirect } from "../../types.js";
 import type { AppVariables } from "../../types/app-context.js";
@@ -12,9 +13,16 @@ import { DashLayout } from "../../ui/layouts/DashLayout.js";
 import { EmptyState, ListItemRow, ActionButtons } from "../../ui/dash/index.js";
 import { SettingsNav } from "../../ui/dash/settings/SettingsNav.js";
 import { dsRedirect } from "../../lib/sse.js";
+import { RedirectTypeSchema, parseValidated } from "../../lib/schemas.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
+const CreateRedirectBody = z.object({
+  fromPath: z.string().min(1),
+  toPath: z.string().min(1),
+  type: RedirectTypeSchema,
+});
+
 export const redirectsRoutes = new Hono<Env>();
 
 function RedirectsListContent({ redirects }: { redirects: Redirect[] }) {
@@ -22,9 +30,6 @@ function RedirectsListContent({ redirects }: { redirects: Redirect[] }) {
 
   return (
     <>
-      <h1 class="text-2xl font-semibold mb-2">
-        {t({ message: "Settings", comment: "@context: Dashboard heading" })}
-      </h1>
       <SettingsNav currentTab="redirects" />
 
       <div class="flex items-center justify-between mb-6">
@@ -88,9 +93,6 @@ function NewRedirectContent() {
 
   return (
     <>
-      <h1 class="text-2xl font-semibold mb-2">
-        {t({ message: "Settings", comment: "@context: Dashboard heading" })}
-      </h1>
       <SettingsNav currentTab="redirects" />
 
       <h2 class="text-lg font-medium mb-6">
@@ -236,11 +238,7 @@ redirectsRoutes.get("/new", async (c) => {
 
 // Create redirect
 redirectsRoutes.post("/", async (c) => {
-  const body = await c.req.json<{
-    fromPath: string;
-    toPath: string;
-    type: string;
-  }>();
+  const body = parseValidated(CreateRedirectBody, await c.req.json());
 
   const type = parseInt(body.type, 10) as 301 | 302;
   await c.var.services.redirects.create(body.fromPath, body.toPath, type);

package/src/routes/dash/settings.tsx

@@ -11,10 +11,9 @@ import type { AppVariables } from "../../types/app-context.js";
 import { DashLayout } from "../../ui/layouts/DashLayout.js";
 import { sse, dsRedirect, dsToast } from "../../lib/sse.js";
 import { getI18n } from "../../i18n/index.js";
-import { arrayBufferToBase64 } from "../../lib/favicon.js";
 import { TIMEZONES } from "../../lib/timezones.js";
 import { escapeHtml } from "../../lib/html.js";
-import { validateUploadFile, generateStorageKey } from "../../lib/upload.js";
+import { ValidationError } from "../../lib/errors.js";
 import { GeneralContent } from "../../ui/dash/settings/GeneralContent.js";
 import { AccountContent } from "../../ui/dash/settings/AccountContent.js";
 
@@ -46,7 +45,6 @@ settingsRoutes.get("/", async (c) => {
         siteName={dbSiteName || ""}
         siteDescription={dbSiteDescription || ""}
         siteLanguage={appConfig.siteLanguage}
-        homeDefaultView={appConfig.homeDefaultView}
         siteNameFallback={appConfig.fallbacks.siteName}
         siteDescriptionFallback={appConfig.fallbacks.siteDescription}
         siteAvatarUrl={appConfig.siteAvatarUrl}
@@ -67,52 +65,16 @@ settingsRoutes.post("/", async (c) => {
     siteDescription: string;
     siteFooter: string;
     siteLanguage: string;
-    homeDefaultView: string;
+    homeDefaultView?: string;
+    headerNavMaxVisible?: string;
     timeZone: string;
   }>();
 
-  const { settings } = c.var.services;
-
-  const oldLanguage = c.var.allSettings["SITE_LANGUAGE"] ?? "en";
-
-  if (body.siteName.trim()) {
-    await settings.set("SITE_NAME", body.siteName.trim());
-  } else {
-    await settings.remove("SITE_NAME");
-  }
-
-  if (body.siteDescription.trim()) {
-    await settings.set("SITE_DESCRIPTION", body.siteDescription.trim());
-  } else {
-    await settings.remove("SITE_DESCRIPTION");
-  }
-
-  // Footer
-  if (body.siteFooter?.trim()) {
-    await settings.set("SITE_FOOTER", body.siteFooter.trim());
-  } else {
-    await settings.remove("SITE_FOOTER");
-  }
-
-  await settings.set("SITE_LANGUAGE", body.siteLanguage);
-
-  // Save homepage default view (only store if non-default)
-  if (body.homeDefaultView === "featured") {
-    await settings.set("HOME_DEFAULT_VIEW", body.homeDefaultView);
-  } else {
-    await settings.remove("HOME_DEFAULT_VIEW");
-  }
-
-  // Timezone
-  if (body.timeZone && body.timeZone !== "UTC") {
-    await settings.set("TIME_ZONE", body.timeZone);
-  } else {
-    await settings.remove("TIME_ZONE");
-  }
-
-  const languageChanged = oldLanguage !== body.siteLanguage;
-  const displayName =
-    body.siteName.trim() || c.var.appConfig.fallbacks.siteName;
+  const { languageChanged, displayName } =
+    await c.var.services.settings.updateGeneral(body, {
+      oldLanguage: c.var.allSettings["SITE_LANGUAGE"] ?? "en",
+      fallbackSiteName: c.var.appConfig.fallbacks.siteName,
+    });
 
   // ── JSON response mode (used by Lit settings bridge) ──────────────
   const wantsJson = c.req.header("accept")?.includes("application/json");
@@ -160,7 +122,6 @@ settingsRoutes.post("/", async (c) => {
         _orig_siteDescription: body.siteDescription,
         _orig_siteFooter: body.siteFooter,
         _orig_siteLanguage: body.siteLanguage,
-        _orig_homeDefaultView: body.homeDefaultView,
         _orig_timeZone: body.timeZone,
         _generalDirty: false,
       });
@@ -245,64 +206,30 @@ settingsRoutes.post("/avatar", async (c) => {
     );
   }
 
-  const uploadError = validateUploadFile(file);
-  if (uploadError) {
-    return dsToast(uploadError, "error");
-  }
-
-  const { id, filename, storageKey } = generateStorageKey(file.name);
+  const faviconFile = formData.get("favicon") as File | null;
+  const appleTouchFile = formData.get("appleTouch") as File | null;
 
   try {
-    await storage.put(storageKey, file.stream(), {
-      contentType: file.type,
-    });
-
-    await c.var.services.media.create({
-      id,
-      filename,
-      originalName: file.name,
-      mimeType: file.type,
-      size: file.size,
-      storageKey,
-      provider: c.var.appConfig.storageDriver,
-    });
-
-    await c.var.services.settings.set("SITE_AVATAR", storageKey);
-
-    // Store favicon ICO as base64 in settings (tiny file, accessed every page load)
-    const faviconFile = formData.get("favicon") as File | null;
-    if (faviconFile) {
-      const b64 = arrayBufferToBase64(await faviconFile.arrayBuffer());
-      await c.var.services.settings.set("SITE_FAVICON_ICO", b64);
-    }
-
-    // Store apple-touch-icon in R2 (180x180 PNG, not tiny enough for base64)
-    const appleTouchFile = formData.get("appleTouch") as File | null;
-    if (appleTouchFile) {
-      const appleTouchKey = "favicon/apple-touch-icon.png";
-      await storage.put(
-        appleTouchKey,
-        new Uint8Array(await appleTouchFile.arrayBuffer()),
-        { contentType: "image/png" },
-      );
-      await c.var.services.settings.set(
-        "SITE_FAVICON_APPLE_TOUCH",
-        appleTouchKey,
-      );
-    }
-
-    // Set favicon version for cache-busting
-    const now = new Date();
-    const version =
-      String(now.getUTCFullYear()) +
-      String(now.getUTCMonth() + 1).padStart(2, "0") +
-      String(now.getUTCDate()).padStart(2, "0") +
-      String(now.getUTCHours()).padStart(2, "0") +
-      String(now.getUTCMinutes()).padStart(2, "0");
-    await c.var.services.settings.set("SITE_FAVICON_VERSION", version);
+    await c.var.services.settings.uploadAvatar(
+      {
+        file,
+        faviconIco: faviconFile ? await faviconFile.arrayBuffer() : undefined,
+        appleTouchIcon: appleTouchFile
+          ? await appleTouchFile.arrayBuffer()
+          : undefined,
+      },
+      {
+        media: c.var.services.media,
+        storage,
+        storageProvider: c.var.appConfig.storageDriver,
+      },
+    );
 
     return dsRedirect("/dash/settings?saved");
-  } catch {
+  } catch (e) {
+    if (e instanceof ValidationError) {
+      return dsToast(e.message, "error");
+    }
     return dsToast(
       i18n._(
         msg({
@@ -316,16 +243,7 @@ settingsRoutes.post("/avatar", async (c) => {
 });
 
 settingsRoutes.post("/avatar/remove", async (c) => {
-  const storage = c.var.storage;
-  const appleTouchKey = c.var.allSettings["SITE_FAVICON_APPLE_TOUCH"];
-  if (storage && appleTouchKey) {
-    await storage.delete(appleTouchKey);
-  }
-
-  await c.var.services.settings.remove("SITE_AVATAR");
-  await c.var.services.settings.remove("SITE_FAVICON_ICO");
-  await c.var.services.settings.remove("SITE_FAVICON_APPLE_TOUCH");
-  await c.var.services.settings.remove("SITE_FAVICON_VERSION");
+  await c.var.services.settings.removeAvatar(c.var.storage);
 
   // ── JSON response mode (used by Lit settings bridge) ──────────────
   const wantsJson = c.req.header("accept")?.includes("application/json");

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

@@ -6,6 +6,7 @@ import { createTestDatabase } from "../../../__tests__/helpers/db.js";
 import { createPostService } from "../../../services/post.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";
 
@@ -15,7 +16,10 @@ function createFeedTestApp(envOverrides: Partial<Bindings> = {}) {
   const { db } = createTestDatabase();
 
   const services = {
-    posts: createPostService(db as never),
+    posts: createPostService(
+      db as never,
+      createPathRegistryService(db as never),
+    ),
     settings: createSettingsService(db as never),
     media: createMediaService(db as never),
   };

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

@@ -10,6 +10,7 @@ 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", () => {
@@ -21,7 +22,7 @@ describe("Collections Listing Page - Data Logic", () => {
     const testDb = createTestDatabase();
     db = testDb.db as unknown as Database;
     collectionService = createCollectionService(db);
-    postService = createPostService(db);
+    postService = createPostService(db, createPathRegistryService(db));
   });
 
   it("returns collections with post counts", async () => {

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

@@ -9,6 +9,7 @@
 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", () => {
@@ -18,7 +19,7 @@ describe("Featured Page - Data Logic", () => {
   beforeEach(() => {
     const testDb = createTestDatabase();
     db = testDb.db as unknown as Database;
-    postService = createPostService(db);
+    postService = createPostService(db, createPathRegistryService(db));
   });
 
   it("returns only featured published posts", async () => {

package/src/routes/pages/page.tsx

@@ -1,9 +1,10 @@
 /**
  * Custom Page Route
  *
- * Serves pages from the pages table and posts with custom paths.
+ * Serves pages and posts with custom paths via the path registry.
  * This is a catch-all route mounted at "/" - must be registered last.
- * Supports multi-level paths (e.g. /2024/my-post) for posts.
+ * The path registry eliminates ambiguity: each path maps to exactly
+ * one entity (page, post, or redirect).
  */
 
 import { Hono } from "hono";
@@ -25,34 +26,28 @@ pageRoutes.get("/*", async (c) => {
   const fullPath = c.req.path.slice(1); // Remove leading /
   if (!fullPath) return c.notFound();
 
-  const isMultiSegment = fullPath.includes("/");
+  const entry = await c.var.services.pathRegistry.getByPath(fullPath);
 
-  // Pages only have single-level slugs; skip page lookup for multi-segment paths
-  if (!isMultiSegment) {
-    const page = await c.var.services.pages.getBySlug(fullPath);
-
-    if (page) {
-      if (page.status === "draft") {
-        return c.notFound();
-      }
+  if (entry?.ownerType === "page") {
+    const page = await c.var.services.pages.getById(entry.ownerId);
+    if (!page || page.status === "draft") {
+      return c.notFound();
+    }
 
-      const navData = await getNavigationData(c);
-      const pageView = toPageView(page);
+    const navData = await getNavigationData(c);
+    const pageView = toPageView(page);
 
-      return renderPublicPage(c, {
-        title: `${page.title || fullPath} - ${navData.siteName}`,
-        description: page.body?.slice(0, 160),
-        navData,
-        content: <SinglePage page={pageView} />,
-      });
-    }
+    return renderPublicPage(c, {
+      title: `${page.title || fullPath} - ${navData.siteName}`,
+      description: page.body?.slice(0, 160),
+      navData,
+      content: <SinglePage page={pageView} />,
+    });
   }
 
-  // Posts support multi-level paths
-  const post = await c.var.services.posts.getByPath(fullPath);
-
-  if (post) {
-    if (post.status === "draft") {
+  if (entry?.ownerType === "post") {
+    const post = await c.var.services.posts.getById(entry.ownerId);
+    if (!post || post.status === "draft") {
       return c.notFound();
     }
 

package/src/services/__tests__/collection.test.ts

@@ -2,6 +2,7 @@ import { describe, it, expect, beforeEach } from "vitest";
 import { createTestDatabase } from "../../__tests__/helpers/db.js";
 import { createCollectionService } from "../collection.js";
 import { createPostService } from "../post.js";
+import { createPathRegistryService } from "../path-registry.js";
 import type { Database } from "../../db/index.js";
 
 describe("CollectionService", () => {
@@ -13,7 +14,7 @@ describe("CollectionService", () => {
     const testDb = createTestDatabase();
     db = testDb.db as unknown as Database;
     collectionService = createCollectionService(db);
-    postService = createPostService(db);
+    postService = createPostService(db, createPathRegistryService(db));
   });
 
   describe("create", () => {