@jant/core 0.3.32 → 0.3.34

package/src/routes/api/__tests__/settings.test.ts

@@ -23,7 +23,7 @@ describe("Settings API Routes", () => {
       expect(body.settings).toBeDefined();
       expect(body.settings.SITE_NAME).toBe("Jant");
       expect(body.settings.SITE_DESCRIPTION).toBe(
-        "A microblog powered by Jant",
+        "Thoughts, links, and quotes — one post at a time",
       );
       expect(body.settings.SITE_LANGUAGE).toBe("en");
     });

package/src/routes/api/posts.ts

@@ -9,7 +9,6 @@ import * as sqid from "../../lib/sqid.js";
 import {
   CreatePostSchema,
   UpdatePostSchema,
-  validateMediaCount,
   parseValidated,
 } from "../../lib/schemas.js";
 import { requireAuthApi } from "../../middleware/auth.js";
@@ -64,24 +63,6 @@ function toMediaAttachment(
   };
 }
 
-/**
- * Validates media IDs: checks count limit and verifies all IDs exist.
- */
-async function validateMediaIds(
-  mediaIds: string[],
-  getByIds: (ids: string[]) => Promise<Media[]>,
-): Promise<void> {
-  const countError = validateMediaCount(mediaIds);
-  if (countError) throw new ValidationError(countError);
-
-  if (mediaIds.length > 0) {
-    const existing = await getByIds(mediaIds);
-    if (existing.length !== mediaIds.length) {
-      throw new ValidationError("One or more media IDs are invalid");
-    }
-  }
-}
-
 // List posts
 postsApiRoutes.get("/", async (c) => {
   const format = c.req.query("format") as Format | undefined;
@@ -142,9 +123,7 @@ postsApiRoutes.post("/", requireAuthApi(), async (c) => {
 
   // Validate media IDs
   if (body.mediaIds) {
-    await validateMediaIds(body.mediaIds, (ids) =>
-      c.var.services.media.getByIds(ids),
-    );
+    await c.var.services.media.validateIds(body.mediaIds);
   }
 
   const post = await c.var.services.posts.create({
@@ -194,9 +173,7 @@ postsApiRoutes.put("/:id", requireAuthApi(), async (c) => {
 
   // Validate media IDs if provided
   if (body.mediaIds !== undefined) {
-    await validateMediaIds(body.mediaIds, (ids) =>
-      c.var.services.media.getByIds(ids),
-    );
+    await c.var.services.media.validateIds(body.mediaIds);
   }
 
   const post = assertFound(
@@ -241,10 +218,10 @@ postsApiRoutes.delete("/:id", requireAuthApi(), async (c) => {
   const id = sqid.decode(c.req.param("id"));
   if (!id) throw new ValidationError("Invalid ID");
 
-  // Detach media before deleting
-  await c.var.services.media.detachFromPost(id);
-
-  const success = await c.var.services.posts.delete(id);
+  const success = await c.var.services.posts.delete(id, {
+    media: c.var.services.media,
+    storage: c.var.storage,
+  });
   if (!success) throw new NotFoundError("Post");
 
   return c.json({ success: true });

package/src/routes/api/upload.ts

@@ -281,21 +281,9 @@ uploadApiRoutes.get("/", async (c) => {
 // Delete a file
 uploadApiRoutes.delete("/:id", async (c) => {
   const id = c.req.param("id");
-  const media = assertFound(await c.var.services.media.getById(id), "Media");
+  assertFound(await c.var.services.media.getById(id), "Media");
 
-  // Delete from storage
-  const storage = c.var.storage;
-  if (storage) {
-    try {
-      await storage.delete(media.storageKey);
-    } catch (err) {
-      // eslint-disable-next-line no-console -- Error logging is intentional
-      console.error("Storage delete error:", err);
-    }
-  }
-
-  // Delete from database
-  await c.var.services.media.delete(id);
+  await c.var.services.media.delete(id, c.var.storage);
 
   return c.json({ success: true });
 });

package/src/routes/auth/__tests__/setup.test.ts

@@ -3,6 +3,7 @@ import { createTestDatabase } from "../../../__tests__/helpers/db.js";
 import { createPageService } from "../../../services/page.js";
 import { createSettingsService } from "../../../services/settings.js";
 import { createNavItemService } from "../../../services/navigation.js";
+import { createPathRegistryService } from "../../../services/path-registry.js";
 import type { Database } from "../../../db/index.js";
 import type { PageService } from "../../../services/page.js";
 import type { SettingsService } from "../../../services/settings.js";
@@ -22,7 +23,7 @@ async function runSetupSeed(services: {
   await services.navItems.create({
     type: "link",
     label: "Collections",
-    url: "/collections",
+    url: "/c",
   });
   await services.navItems.create({
     type: "link",
@@ -62,7 +63,7 @@ describe("Setup seed logic", () => {
     const testDb = createTestDatabase();
     const db = testDb.db as unknown as Database;
     services = {
-      pages: createPageService(db),
+      pages: createPageService(db, createPathRegistryService(db)),
       settings: createSettingsService(db),
       navItems: createNavItemService(db),
     };

package/src/routes/auth/setup.tsx

@@ -198,7 +198,7 @@ setupRoutes.post("/setup", async (c) => {
     await c.var.services.navItems.create({
       type: "link",
       label: "Collections",
-      url: "/collections",
+      url: "/c",
     });
     // Seed default navigation items
     await c.var.services.navItems.create({

package/src/routes/compose.tsx

@@ -11,7 +11,8 @@ import { msg } from "@lingui/core/macro";
 import type { Bindings, Post } from "../types.js";
 import type { AppVariables } from "../types/app-context.js";
 import { requireAuth } from "../middleware/auth.js";
-import { CreatePostSchema, validateMediaCount } from "../lib/schemas.js";
+import { CreatePostSchema } from "../lib/schemas.js";
+import { ValidationError } from "../lib/errors.js";
 import { sse, dsToast } from "../lib/sse.js";
 import { getI18n } from "../i18n/index.js";
 import {
@@ -105,11 +106,18 @@ composeRoutes.post("/", async (c) => {
 
   const data = result.data;
 
-  // Validate media count
+  // Validate media IDs
   if (data.mediaIds) {
-    const mediaError = validateMediaCount(data.mediaIds);
-    if (mediaError) {
-      return dsToast(mediaError, "error");
+    try {
+      await c.var.services.media.validateIds(data.mediaIds);
+    } catch (e) {
+      if (e instanceof ValidationError) {
+        if (wantsJson) {
+          return c.json({ status: "error" as const, error: e.message }, 422);
+        }
+        return dsToast(e.message, "error");
+      }
+      throw e;
     }
   }
 

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

@@ -10,6 +10,7 @@ import { describe, it, expect, beforeEach } from "vitest";
 import { createTestDatabase } from "../../../__tests__/helpers/db.js";
 import { createPageService } from "../../../services/page.js";
 import { createNavItemService } from "../../../services/navigation.js";
+import { createPathRegistryService } from "../../../services/path-registry.js";
 import type { Database } from "../../../db/index.js";
 
 describe("Dashboard Pages - Nav Management Logic", () => {
@@ -20,7 +21,7 @@ describe("Dashboard Pages - Nav Management Logic", () => {
   beforeEach(() => {
     const testDb = createTestDatabase();
     db = testDb.db as unknown as Database;
-    pageService = createPageService(db);
+    pageService = createPageService(db, createPathRegistryService(db));
     navItemService = createNavItemService(db);
   });
 

package/src/routes/dash/__tests__/settings-avatar.test.ts

@@ -1,12 +1,12 @@
 /**
- * Tests for avatar upload with favicon variant storage.
+ * Tests for avatar upload/removal service methods.
  *
  * Note: Route handlers that import JSX components with @lingui/react/macro
  * cannot run in vitest (requires SWC plugin). These tests verify the
- * service-layer and storage operations that the routes orchestrate.
+ * service-layer operations that the routes delegate to.
  */
 
-import { describe, it, expect, beforeEach } from "vitest";
+import { describe, it, expect, beforeEach, vi } from "vitest";
 import { createTestDatabase } from "../../../__tests__/helpers/db.js";
 import { createSettingsService } from "../../../services/settings.js";
 import { createMediaService } from "../../../services/media.js";
@@ -15,6 +15,28 @@ import {
   base64ToUint8Array,
 } from "../../../lib/favicon.js";
 import type { Database } from "../../../db/index.js";
+import type { StorageDriver } from "../../../lib/storage.js";
+
+function createMockStorage(): StorageDriver {
+  return {
+    put: vi.fn().mockResolvedValue(undefined),
+    get: vi.fn().mockResolvedValue(null),
+    delete: vi.fn().mockResolvedValue(undefined),
+  };
+}
+
+function createMockFile(
+  name: string,
+  type: string,
+  size: number,
+): { stream(): ReadableStream; name: string; type: string; size: number } {
+  return {
+    name,
+    type,
+    size,
+    stream: () => new ReadableStream(),
+  };
+}
 
 describe("Dashboard Settings - Avatar Upload Logic", () => {
   let db: Database;
@@ -28,29 +50,47 @@ describe("Dashboard Settings - Avatar Upload Logic", () => {
     mediaService = createMediaService(db);
   });
 
-  describe("avatar upload with favicon variants", () => {
+  describe("uploadAvatar", () => {
     it("stores avatar media and sets SITE_AVATAR to storageKey", async () => {
-      const storageKey = "media/2026/02/test-avatar-id.png";
-      await mediaService.create({
-        id: "test-avatar-id",
-        filename: "test-avatar-id.png",
-        originalName: "logo.png",
-        mimeType: "image/png",
-        size: 5000,
-        storageKey,
-        provider: "r2",
-      });
-
-      await settingsService.set("SITE_AVATAR", storageKey);
+      const storage = createMockStorage();
+      const file = createMockFile("logo.png", "image/png", 5000);
+
+      await settingsService.uploadAvatar(
+        { file },
+        { media: mediaService, storage, storageProvider: "r2" },
+      );
 
       const avatarKey = await settingsService.get("SITE_AVATAR");
-      expect(avatarKey).toBe(storageKey);
+      expect(avatarKey).not.toBeNull();
+      expect(avatarKey).toContain("media/");
+      expect(storage.put).toHaveBeenCalled();
+    });
+
+    it("creates media record for the avatar", async () => {
+      const storage = createMockStorage();
+      const file = createMockFile("logo.png", "image/png", 5000);
+
+      await settingsService.uploadAvatar(
+        { file },
+        { media: mediaService, storage, storageProvider: "r2" },
+      );
+
+      const mediaList = await mediaService.list();
+      expect(mediaList).toHaveLength(1);
+      expect(mediaList[0].originalName).toBe("logo.png");
+      expect(mediaList[0].mimeType).toBe("image/png");
+      expect(mediaList[0].provider).toBe("r2");
     });
 
     it("stores favicon ICO as base64 in settings", async () => {
+      const storage = createMockStorage();
+      const file = createMockFile("logo.png", "image/png", 5000);
       const fakeIcoData = new Uint8Array([0, 0, 1, 0, 1, 0, 32, 32]);
-      const b64 = arrayBufferToBase64(fakeIcoData.buffer);
-      await settingsService.set("SITE_FAVICON_ICO", b64);
+
+      await settingsService.uploadAvatar(
+        { file, faviconIco: fakeIcoData.buffer },
+        { media: mediaService, storage, storageProvider: "r2" },
+      );
 
       const stored = await settingsService.get("SITE_FAVICON_ICO");
       expect(stored).not.toBeNull();
@@ -58,25 +98,63 @@ describe("Dashboard Settings - Avatar Upload Logic", () => {
       expect(Array.from(decoded)).toEqual(Array.from(fakeIcoData));
     });
 
-    it("stores apple-touch-icon as R2 storage key in settings", async () => {
-      const appleTouchKey = "favicon/apple-touch-icon.png";
-      await settingsService.set("SITE_FAVICON_APPLE_TOUCH", appleTouchKey);
+    it("stores apple-touch-icon in storage and sets key in settings", async () => {
+      const storage = createMockStorage();
+      const file = createMockFile("logo.png", "image/png", 5000);
+      const appleTouchData = new Uint8Array([137, 80, 78, 71]).buffer;
+
+      await settingsService.uploadAvatar(
+        { file, appleTouchIcon: appleTouchData },
+        { media: mediaService, storage, storageProvider: "r2" },
+      );
 
       const stored = await settingsService.get("SITE_FAVICON_APPLE_TOUCH");
-      expect(stored).toBe(appleTouchKey);
+      expect(stored).toBe("favicon/apple-touch-icon.png");
+      // storage.put should be called twice: avatar file + apple-touch-icon
+      expect(storage.put).toHaveBeenCalledTimes(2);
     });
 
     it("sets SITE_FAVICON_VERSION on upload", async () => {
-      const version = "202602191430";
-      await settingsService.set("SITE_FAVICON_VERSION", version);
+      const storage = createMockStorage();
+      const file = createMockFile("logo.png", "image/png", 5000);
+
+      await settingsService.uploadAvatar(
+        { file },
+        { media: mediaService, storage, storageProvider: "r2" },
+      );
 
       const stored = await settingsService.get("SITE_FAVICON_VERSION");
-      expect(stored).toBe(version);
+      expect(stored).not.toBeNull();
+      expect(stored).toMatch(/^\d{12}$/);
+    });
+
+    it("throws ValidationError for disallowed file type", async () => {
+      const storage = createMockStorage();
+      const file = createMockFile("doc.pdf", "application/pdf", 5000);
+
+      await expect(
+        settingsService.uploadAvatar(
+          { file },
+          { media: mediaService, storage, storageProvider: "r2" },
+        ),
+      ).rejects.toThrow("File type not allowed");
+    });
+
+    it("throws ValidationError for oversized file", async () => {
+      const storage = createMockStorage();
+      const file = createMockFile("big.png", "image/png", 20 * 1024 * 1024);
+
+      await expect(
+        settingsService.uploadAvatar(
+          { file },
+          { media: mediaService, storage, storageProvider: "r2" },
+        ),
+      ).rejects.toThrow("File too large");
     });
   });
 
-  describe("avatar removal cleans up favicon settings", () => {
-    it("removes all favicon-related settings including version", async () => {
+  describe("removeAvatar", () => {
+    it("removes all favicon-related settings", async () => {
       await settingsService.set("SITE_AVATAR", "media/2026/02/some-id.png");
       await settingsService.set("SITE_FAVICON_ICO", "base64data");
       await settingsService.set(
@@ -85,16 +163,56 @@ describe("Dashboard Settings - Avatar Upload Logic", () => {
       );
       await settingsService.set("SITE_FAVICON_VERSION", "202602191430");
 
-      // Simulate avatar removal
-      await settingsService.remove("SITE_AVATAR");
-      await settingsService.remove("SITE_FAVICON_ICO");
-      await settingsService.remove("SITE_FAVICON_APPLE_TOUCH");
-      await settingsService.remove("SITE_FAVICON_VERSION");
+      await settingsService.removeAvatar();
 
       expect(await settingsService.get("SITE_AVATAR")).toBeNull();
       expect(await settingsService.get("SITE_FAVICON_ICO")).toBeNull();
       expect(await settingsService.get("SITE_FAVICON_APPLE_TOUCH")).toBeNull();
       expect(await settingsService.get("SITE_FAVICON_VERSION")).toBeNull();
     });
+
+    it("deletes apple-touch-icon from storage when storage is provided", async () => {
+      const storage = createMockStorage();
+      await settingsService.set(
+        "SITE_FAVICON_APPLE_TOUCH",
+        "favicon/apple-touch-icon.png",
+      );
+
+      await settingsService.removeAvatar(storage);
+
+      expect(storage.delete).toHaveBeenCalledWith(
+        "favicon/apple-touch-icon.png",
+      );
+    });
+
+    it("skips storage delete when no apple-touch-icon key exists", async () => {
+      const storage = createMockStorage();
+
+      await settingsService.removeAvatar(storage);
+
+      expect(storage.delete).not.toHaveBeenCalled();
+    });
+
+    it("handles null storage gracefully", async () => {
+      await settingsService.set("SITE_AVATAR", "media/2026/02/some-id.png");
+      await settingsService.set(
+        "SITE_FAVICON_APPLE_TOUCH",
+        "favicon/apple-touch-icon.png",
+      );
+
+      await settingsService.removeAvatar(null);
+
+      expect(await settingsService.get("SITE_AVATAR")).toBeNull();
+      expect(await settingsService.get("SITE_FAVICON_APPLE_TOUCH")).toBeNull();
+    });
+  });
+
+  describe("arrayBufferToBase64 / base64ToUint8Array roundtrip", () => {
+    it("encodes and decodes correctly", () => {
+      const original = new Uint8Array([0, 0, 1, 0, 1, 0, 32, 32]);
+      const b64 = arrayBufferToBase64(original.buffer);
+      const decoded = base64ToUint8Array(b64);
+      expect(Array.from(decoded)).toEqual(Array.from(original));
+    });
   });
 });

package/src/routes/dash/appearance.tsx

@@ -1,7 +1,7 @@
 /**
  * Dashboard Appearance Routes
  *
- * Sub-pages: Color Theme, Font Theme, Advanced (Custom CSS)
+ * Sub-pages: Navigation (default), Color Theme, Font Theme, Advanced (Custom CSS)
  */
 
 import { Hono } from "hono";
@@ -16,6 +16,7 @@ import { getAvailableThemes } from "../../lib/theme.js";
 import { BUILTIN_FONT_THEMES } from "../../ui/font-themes.js";
 import { ColorThemeContent } from "../../ui/dash/appearance/ColorThemeContent.js";
 import { FontThemeContent } from "../../ui/dash/appearance/FontThemeContent.js";
+import { NavigationContent } from "../../ui/dash/appearance/NavigationContent.js";
 import { AdvancedContent } from "../../ui/dash/appearance/AdvancedContent.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
@@ -23,10 +24,76 @@ type Env = { Bindings: Bindings; Variables: AppVariables };
 export const appearanceRoutes = new Hono<Env>();
 
 // ===========================================================================
-// Color Theme
+// Navigation (default tab)
 // ===========================================================================
 
 appearanceRoutes.get("/", async (c) => {
+  const [navItems, availablePages] = await Promise.all([
+    c.var.services.navItems.list(),
+    c.var.services.pages.listNotInNav(),
+  ]);
+  const siteName = c.var.appConfig.siteName;
+  const headerNavMaxVisible = c.var.appConfig.headerNavMaxVisible;
+  const homeDefaultView = c.var.appConfig.homeDefaultView;
+
+  return c.html(
+    <DashLayout
+      c={c}
+      title="Appearance"
+      siteName={siteName}
+      currentPath="/dash/appearance"
+    >
+      <NavigationContent
+        navItems={navItems}
+        availablePages={availablePages}
+        headerNavMaxVisible={headerNavMaxVisible}
+        homeDefaultView={homeDefaultView}
+        siteName={siteName}
+      />
+    </DashLayout>,
+  );
+});
+
+// ===========================================================================
+// Nav max visible links
+// ===========================================================================
+
+appearanceRoutes.post("/nav-max-visible", async (c) => {
+  const body = await c.req.json<{ value: number }>();
+  const { settings } = c.var.services;
+
+  const navMax = Math.max(0, Math.min(5, body.value ?? 3));
+  if (navMax !== 3) {
+    await settings.set("HEADER_NAV_MAX_VISIBLE", String(navMax));
+  } else {
+    await settings.remove("HEADER_NAV_MAX_VISIBLE");
+  }
+
+  return c.json({ ok: true });
+});
+
+// ===========================================================================
+// Home default view
+// ===========================================================================
+
+appearanceRoutes.post("/home-default-view", async (c) => {
+  const body = await c.req.json<{ value: string }>();
+  const { settings } = c.var.services;
+
+  if (body.value === "featured") {
+    await settings.set("HOME_DEFAULT_VIEW", "featured");
+  } else {
+    await settings.remove("HOME_DEFAULT_VIEW");
+  }
+
+  return c.json({ ok: true });
+});
+
+// ===========================================================================
+// Color Theme
+// ===========================================================================
+
+appearanceRoutes.get("/color", async (c) => {
   const siteName = c.var.appConfig.siteName;
   const defaultThemeId = c.var.appConfig.fallbacks.defaultTheme;
   const currentThemeId =
@@ -47,7 +114,7 @@ appearanceRoutes.get("/", async (c) => {
   );
 });
 
-appearanceRoutes.post("/", async (c) => {
+appearanceRoutes.post("/color", async (c) => {
   const i18n = getI18n(c);
   const body = await c.req.json<{ theme: string }>();
   const { settings } = c.var.services;
@@ -73,7 +140,7 @@ appearanceRoutes.post("/", async (c) => {
     await settings.set(SETTINGS_KEYS.THEME, validTheme.id);
   }
 
-  return dsRedirect("/dash/appearance?saved");
+  return dsRedirect("/dash/appearance/color?saved");
 });
 
 // ===========================================================================

package/src/routes/dash/collections.tsx

@@ -3,11 +3,16 @@
  */
 
 import { Hono } from "hono";
-import type { Bindings, SortOrder } from "../../types.js";
+import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../types/app-context.js";
 import { DashLayout } from "../../ui/layouts/DashLayout.js";
 import { DangerZone } from "../../ui/dash/index.js";
 import { dsRedirect } from "../../lib/sse.js";
+import {
+  CreateCollectionSchema,
+  UpdateCollectionSchema,
+  parseValidated,
+} from "../../lib/schemas.js";
 import { createMediaContext, toPostViewsFromPosts } from "../../lib/view.js";
 import { slugify } from "../../lib/url.js";
 import { CollectionsListContent } from "../../ui/dash/collections/CollectionsListContent.js";
@@ -63,23 +68,18 @@ collectionsRoutes.get("/new", async (c) => {
 // Create collection
 collectionsRoutes.post("/", async (c) => {
   const wantsJson = c.req.header("Accept")?.includes("application/json");
-  const body = await c.req.json<{
-    title: string;
-    slug: string;
-    description?: string;
-    icon?: string;
-    sortOrder?: string;
-  }>();
-
-  // Auto-generate slug from title if empty
-  const slug = body.slug || slugify(body.title);
+  const raw = await c.req.json();
+  const body = parseValidated(CreateCollectionSchema, {
+    ...raw,
+    slug: raw.slug || slugify(raw.title ?? ""),
+  });
 
   const collection = await c.var.services.collections.create({
     title: body.title,
-    slug,
+    slug: body.slug,
     description: body.description || undefined,
     icon: body.icon || undefined,
-    sortOrder: (body.sortOrder as SortOrder) || undefined,
+    sortOrder: body.sortOrder || undefined,
   });
 
   const redirectUrl = `/dash/collections/${collection.id}`;
@@ -182,20 +182,14 @@ collectionsRoutes.post("/:id", async (c) => {
   if (isNaN(id)) return c.notFound();
 
   const wantsJson = c.req.header("Accept")?.includes("application/json");
-  const body = await c.req.json<{
-    title: string;
-    slug: string;
-    description?: string;
-    icon?: string;
-    sortOrder?: string;
-  }>();
+  const body = parseValidated(UpdateCollectionSchema, await c.req.json());
 
   await c.var.services.collections.update(id, {
     title: body.title,
     slug: body.slug,
     description: body.description || null,
     icon: body.icon || null,
-    sortOrder: (body.sortOrder as SortOrder) || undefined,
+    sortOrder: body.sortOrder || undefined,
   });
 
   const redirectUrl = `/dash/collections/${id}`;

package/src/routes/dash/media.tsx

@@ -126,19 +126,7 @@ mediaRoutes.post("/:id/delete", async (c) => {
   const media = await c.var.services.media.getById(id);
   if (!media) return c.notFound();
 
-  // Delete from storage
-  const storage = c.var.storage;
-  if (storage) {
-    try {
-      await storage.delete(media.storageKey);
-    } catch (err) {
-      // eslint-disable-next-line no-console -- Error logging is intentional
-      console.error("Storage delete error:", err);
-    }
-  }
-
-  // Delete from database
-  await c.var.services.media.delete(id);
+  await c.var.services.media.delete(id, c.var.storage);
 
   return dsRedirect("/dash/media");
 });