@jant/core 0.3.35 → 0.3.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jant/core",
-  "version": "0.3.35",
+  "version": "0.3.36",
   "description": "A modern, open-source microblogging platform built on Cloudflare Workers",
   "type": "module",
   "exports": {
@@ -23,16 +23,25 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.987.0",
+    "@emoji-mart/data": "^1.2.1",
     "@lingui/core": "^5.9.0",
     "@lingui/react": "^5.9.0",
     "@tailwindcss/typography": "^0.5.19",
+    "@tiptap/core": "^3.20.0",
+    "@tiptap/extension-image": "^3.20.0",
+    "@tiptap/extension-placeholder": "^3.20.0",
+    "@tiptap/extension-table": "^3.20.0",
+    "@tiptap/pm": "^3.20.0",
+    "@tiptap/starter-kit": "^3.20.0",
+    "@tiptap/suggestion": "^3.20.0",
     "basecoat-css": "^0.3.10",
     "better-auth": "^1.4.18",
     "drizzle-orm": "^0.45.1",
+    "emoji-mart": "^5.6.0",
+    "limax": "^4.2.2",
     "lit": "^3.3.2",
     "lucide-static": "^0.574.0",
     "marked": "^17.0.1",
-    "pinyin-pro": "^3.28.0",
     "sortablejs": "^1.15.6",
     "sqids": "^0.3.0",
     "uuidv7": "^1.1.0",
@@ -50,13 +59,13 @@
     "@lingui/format-po": "^5.9.0",
     "@lingui/swc-plugin": "^5.10.1",
     "@swc/core": "^1.15.11",
+    "@tailwindcss/vite": "^4.1.18",
     "@types/better-sqlite3": "^7.6.13",
     "@types/node": "^25.1.0",
     "better-sqlite3": "^12.6.2",
     "drizzle-kit": "^0.31.8",
     "glob": "^13.0.0",
     "happy-dom": "^20.6.3",
-    "@tailwindcss/vite": "^4.1.18",
     "tailwindcss": "^4.1.18",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
@@ -98,7 +107,7 @@
     "i18n:compile": "lingui compile --typescript",
     "i18n:build": "pnpm i18n:extract && pnpm i18n:compile",
     "dev": "pnpm db:migrate:local && vite dev",
-    "dev:debug": "pnpm db:migrate:local && vite dev --port 19019",
+    "dev:debug": "pnpm db:migrate:local && vite dev --port 19020",
     "db:migrate:local": "echo y | wrangler d1 migrations apply DB --local",
     "db:migrate:remote": "wrangler d1 migrations apply DB --remote",
     "test": "vitest run",

package/src/__tests__/helpers/app.ts

@@ -69,7 +69,7 @@ export function createTestApp(options: TestAppOptions = {}) {
   app.use("*", async (c, next) => {
     // Provide mock env bindings so c.env.* works in route handlers
     c.env = {
-      SITE_URL: "http://localhost:9019",
+      SITE_URL: "http://localhost:9020",
     } as AppVariables["services"] extends never ? never : Bindings;
 
     c.set("services", services as AppVariables["services"]);

package/src/__tests__/helpers/db.ts

@@ -122,6 +122,12 @@ export function createTestDatabase(options?: { fts?: boolean }) {
   // Apply 0011: path registry
   applyMigration(sqlite, "0011_add_path_registry.sql");
 
+  // Apply 0012: Tiptap columns (summary)
+  applyMigration(sqlite, "0012_add_tiptap_columns.sql");
+
+  // Apply 0013: Replace featured with visibility
+  applyMigration(sqlite, "0013_replace_featured_with_visibility.sql");
+
   const db = drizzle(sqlite, { schema });
 
   // Polyfill D1 batch() for test compatibility.

package/src/app.tsx

@@ -32,8 +32,6 @@ import { pagesRoutes as dashPagesRoutes } from "./routes/dash/pages.js";
 import { mediaRoutes as dashMediaRoutes } from "./routes/dash/media.js";
 import { settingsRoutes as dashSettingsRoutes } from "./routes/dash/settings.js";
 import { redirectsRoutes as dashRedirectsRoutes } from "./routes/dash/redirects.js";
-import { collectionsRoutes as dashCollectionsRoutes } from "./routes/dash/collections.js";
-import { appearanceRoutes as dashAppearanceRoutes } from "./routes/dash/appearance.js";
 
 // Routes - API
 import { postsApiRoutes } from "./routes/api/posts.js";
@@ -247,10 +245,8 @@ export function createApp(): App {
   app.route("/dash/pages", dashPagesRoutes);
   app.route("/dash/media", dashMediaRoutes);
   app.route("/dash/settings", dashSettingsRoutes);
-  app.route("/dash/appearance", dashAppearanceRoutes);
   app.route("/dash/settings/redirects", dashRedirectsRoutes);
-  app.route("/dash/collections", dashCollectionsRoutes);
-  // API routes
+  // Protected API routes
   app.route("/api/upload", uploadApiRoutes);
   app.route("/api/search", searchApiRoutes);
 

package/src/{lib → client}/avatar-upload.ts

@@ -9,7 +9,7 @@
  * Uses the `[data-avatar-upload]` attribute on file inputs.
  */
 
-import { encodeIco } from "./favicon.js";
+import { encodeIco } from "../lib/favicon.js";
 
 /**
  * Load an image from a File object

package/src/{lib → client}/collection-form-bridge.ts

@@ -6,8 +6,8 @@
  * redirects on success. Displays toasts on failure.
  */
 
-import type { CollectionSubmitDetail } from "../ui/components/collection-types.js";
-import type { JantCollectionForm } from "../ui/components/jant-collection-form.js";
+import type { CollectionSubmitDetail } from "./components/collection-types.js";
+import type { JantCollectionForm } from "./components/jant-collection-form.js";
 import { showToast } from "./toast.js";
 
 document.addEventListener("jant:collection-submit", async (event: Event) => {

package/src/{ui → client}/components/__tests__/jant-collection-form.test.ts

@@ -1,6 +1,20 @@
 // @vitest-environment happy-dom
 
-import { describe, it, expect, beforeEach } from "vitest";
+import { describe, it, expect, beforeEach, vi } from "vitest";
+
+vi.mock("../../lazy-slugify.js", () => ({
+  slugify: (text: string) =>
+    Promise.resolve(
+      text
+        .toLowerCase()
+        .trim()
+        .replace(/[^\w\s-]/g, "")
+        .replace(/[\s_-]+/g, "-")
+        .replace(/^-+|-+$/g, ""),
+    ),
+  preloadSlug: () => {},
+}));
+
 import type {
   CollectionFormInitial,
   CollectionFormLabels,
@@ -16,12 +30,11 @@ const labels: CollectionFormLabels = {
   slugHelp: "Help text",
   descriptionLabel: "Description",
   descriptionPlaceholder: "Placeholder Description",
-  iconLabel: "Icon",
-  chooseIcon: "Choose Icon",
   removeIcon: "Remove",
-  dialogTitle: "Choose Icon",
-  dialogClose: "Close",
+  iconsTab: "Icons",
+  emojisTab: "Emojis",
   searchIconsPlaceholder: "Search icons...",
+  searchEmojisPlaceholder: "Search emojis...",
   sortOrderLabel: "Sort Order",
   sortNewest: "Newest first",
   sortOldest: "Oldest first",
@@ -47,8 +60,8 @@ async function createElement(
   ) as JantCollectionForm;
   el.labels = labels;
   el.initial = initial;
-  el.action = "/dash/collections";
-  el.cancelHref = "/dash/collections";
+  el.action = "/api/collections";
+  el.cancelHref = "/api/collections";
   el.isEdit = false;
   Object.assign(el, overrides);
   document.body.appendChild(el);
@@ -82,6 +95,8 @@ describe("JantCollectionForm", () => {
 
     titleInput.value = "My Great Collection!";
     titleInput.dispatchEvent(new Event("input", { bubbles: true }));
+    // slugify is async — flush the microtask then wait for Lit re-render
+    await new Promise((r) => setTimeout(r, 0));
     await el.updateComplete;
 
     expect(slugInput.value).toBe("my-great-collection");
@@ -143,11 +158,13 @@ describe("JantCollectionForm", () => {
 
     expect(detail).not.toBeNull();
     const d = detail as unknown as CollectionSubmitDetail;
-    expect(d.endpoint).toBe("/dash/collections");
+    expect(d.endpoint).toBe("/api/collections");
     expect(d.data.title).toBe("Books");
     expect(d.data.slug).toBe("books");
     expect(d.data.description).toBe("All about books");
     expect(d.data.sortOrder).toBe("rating_desc");
-    expect(d.data.icon).toBeUndefined();
+    // Default icon is auto-selected in create mode (library icon with gray color)
+    expect(d.data.icon).toBeDefined();
+    expect(d.data.icon).toContain('"name":"library"');
   });
 });

package/src/{ui → client}/components/__tests__/jant-compose-dialog.test.ts

@@ -42,7 +42,8 @@ const labels: ComposeLabels = {
   attachedTextHint: "Supplementary content",
   done: "Done",
   media: "Media",
-  score: "Score",
+  rate: "Rate",
+  emoji: "Emoji",
   title: "Title",
   collection: "Collection",
   searchCollections: "Search...",
@@ -55,6 +56,7 @@ const labels: ComposeLabels = {
   addMore: "Add",
   uploading: "Uploading...",
   published: "Published!",
+  retryAll: "Click to retry all",
 };
 
 const collections: ComposeCollection[] = [
@@ -135,7 +137,12 @@ describe("JantComposeDialog", () => {
       el.querySelector<JantComposeEditor>("jant-compose-editor"),
       "expected compose editor",
     );
-    editor._body = "Hello world";
+    editor._bodyJson = {
+      type: "doc",
+      content: [
+        { type: "paragraph", content: [{ type: "text", text: "Hello world" }] },
+      ],
+    };
     await editor.updateComplete;
 
     let receivedDetail: ComposeSubmitDetail | null = null;
@@ -153,7 +160,7 @@ describe("JantComposeDialog", () => {
     expect(receivedDetail).not.toBeNull();
     const detail = receivedDetail as unknown as ComposeSubmitDetail;
     expect(detail.format).toBe("note");
-    expect(detail.body).toBe("Hello world");
+    expect(detail.body).toContain("Hello world");
     expect(detail.status).toBe("published");
     expect(detail.collectionIds).toEqual([]);
     expect(detail.mediaIds).toEqual([]);
@@ -233,7 +240,15 @@ describe("JantComposeDialog", () => {
       el.querySelector<JantComposeEditor>("jant-compose-editor"),
       "expected compose editor",
     );
-    editor._body = "Draft content";
+    editor._bodyJson = {
+      type: "doc",
+      content: [
+        {
+          type: "paragraph",
+          content: [{ type: "text", text: "Draft content" }],
+        },
+      ],
+    };
     await editor.updateComplete;
 
     let receivedDetail: ComposeSubmitDetail | null = null;
@@ -319,10 +334,10 @@ describe("JantComposeDialog", () => {
     expect(editor.querySelector(".compose-attachment-thumb")).not.toBeNull();
     // ALT button should be visible
     expect(editor.querySelector(".compose-attachment-alt")).not.toBeNull();
-    // Media tool button should show "Add" label
+    // Media tool button should show inline "Add" label
     const mediaBtn =
       editor.querySelector<HTMLButtonElement>(".compose-tool-btn");
-    expect(mediaBtn?.querySelector(".compose-tool-tip")?.textContent).toBe(
+    expect(mediaBtn?.querySelector(".compose-tool-label")?.textContent).toBe(
       "Add",
     );
 
@@ -397,20 +412,21 @@ describe("JantComposeDialog", () => {
     );
     altBtn.click();
     await editor.updateComplete;
+    await el.updateComplete;
 
-    // Alt panel should be visible
-    expect(editor.querySelector(".compose-alt-panel")).not.toBeNull();
+    // Alt panel should be visible in the dialog (covers entire dialog)
+    expect(el.querySelector(".compose-alt-panel")).not.toBeNull();
     expect(editor._showAltPanel).toBe(true);
 
     // Click done to close
-    const doneBtn = editor.querySelector<HTMLButtonElement>(
+    const doneBtn = el.querySelector<HTMLButtonElement>(
       ".compose-alt-panel .compose-post-btn",
     );
     doneBtn?.click();
-    await editor.updateComplete;
+    await el.updateComplete;
 
-    expect(editor._showAltPanel).toBe(false);
-    expect(editor.querySelector(".compose-alt-panel")).toBeNull();
+    expect(editor._showAltPanel).toBe(true); // Editor still tracks its own state
+    expect(el.querySelector(".compose-alt-panel")).toBeNull();
 
     URL.revokeObjectURL(previewUrl);
   });
@@ -437,7 +453,15 @@ describe("JantComposeDialog", () => {
         error: null,
       },
     ];
-    editor._body = "Post with image";
+    editor._bodyJson = {
+      type: "doc",
+      content: [
+        {
+          type: "paragraph",
+          content: [{ type: "text", text: "Post with image" }],
+        },
+      ],
+    };
     await editor.updateComplete;
 
     let receivedDetail: ComposeSubmitDetail | null = null;
@@ -481,7 +505,15 @@ describe("JantComposeDialog", () => {
         error: null,
       },
     ];
-    editor._body = "Post with pending upload";
+    editor._bodyJson = {
+      type: "doc",
+      content: [
+        {
+          type: "paragraph",
+          content: [{ type: "text", text: "Post with pending upload" }],
+        },
+      ],
+    };
     await editor.updateComplete;
 
     let deferredEvent: CustomEvent | null = null;

package/src/{ui → client}/components/__tests__/jant-compose-editor.test.ts

@@ -48,7 +48,8 @@ const labels: ComposeLabels = {
   attachedTextHint: "Supplementary content",
   done: "Done",
   media: "Media",
-  score: "Score",
+  rate: "Rate",
+  emoji: "Emoji",
   title: "Title",
   collection: "Collection",
   searchCollections: "Search...",
@@ -61,6 +62,7 @@ const labels: ComposeLabels = {
   addMore: "Add",
   uploading: "Uploading...",
   published: "Published!",
+  retryAll: "Click to retry all",
 };
 
 async function createElement(
@@ -81,11 +83,11 @@ describe("JantComposeEditor", () => {
 
   it("renders note fields by default", async () => {
     const el = await createElement("note");
-    const textarea = requireElement(
-      el.querySelector<HTMLTextAreaElement>(".compose-body-input"),
-      "expected compose body textarea",
+    const tiptapContainer = requireElement(
+      el.querySelector<HTMLElement>(".compose-tiptap-body"),
+      "expected compose Tiptap body container",
     );
-    expect(textarea.placeholder).toBe("What's on your mind...");
+    expect(tiptapContainer).toBeTruthy();
   });
 
   it("renders link fields when format is link", async () => {
@@ -158,9 +160,12 @@ describe("JantComposeEditor", () => {
     expect(el._rating).toBe(0);
   });
 
-  it("toggles attached text panel", async () => {
+  it("dispatches attached panel open event", async () => {
     const el = await createElement("note");
 
+    const events: Event[] = [];
+    el.addEventListener("jant:attached-panel-open", (e) => events.push(e));
+
     // Click attached text tool button
     const toolBtns =
       el.querySelectorAll<HTMLButtonElement>(".compose-tool-btn");
@@ -172,16 +177,8 @@ describe("JantComposeEditor", () => {
     attachedBtn.click();
     await el.updateComplete;
 
-    expect(el.querySelector(".compose-attached-panel")).not.toBeNull();
-
-    // Click done button to close
-    const doneBtn = el.querySelector<HTMLButtonElement>(
-      ".compose-attached-panel .compose-post-btn",
-    );
-    doneBtn?.click();
-    await el.updateComplete;
-
-    expect(el.querySelector(".compose-attached-panel")).toBeNull();
+    expect(events).toHaveLength(1);
+    expect(el._showAttachedText).toBe(true);
   });
 
   it("shows title toggle only in note mode", async () => {
@@ -197,13 +194,19 @@ describe("JantComposeEditor", () => {
   it("getData returns current field values", async () => {
     const el = await createElement("note");
     el._title = "Test Title";
-    el._body = "Test Body";
+    el._showTitle = true;
+    el._bodyJson = {
+      type: "doc",
+      content: [
+        { type: "paragraph", content: [{ type: "text", text: "Test Body" }] },
+      ],
+    };
     el._rating = 4;
     el._attachedText = "Some attached text";
 
     const data = el.getData();
     expect(data.title).toBe("Test Title");
-    expect(data.body).toBe("Test Body");
+    expect(data.body).toContain("Test Body");
     expect(data.rating).toBe(4);
     expect(data.attachedText).toBe("Some attached text");
     expect(data.url).toBe("");
@@ -211,10 +214,42 @@ describe("JantComposeEditor", () => {
     expect(data.quoteAuthor).toBe("");
   });
 
+  it("getData omits title when showTitle is off in note mode", async () => {
+    const el = await createElement("note");
+    el._title = "Hidden Title";
+    el._showTitle = false;
+
+    const data = el.getData();
+    expect(data.title).toBe("");
+  });
+
+  it("preserves title in memory when toggling off and restores on toggle on", async () => {
+    const el = await createElement("note");
+    el._title = "My Title";
+    el._showTitle = true;
+    await el.updateComplete;
+
+    // Toggle off — title stays in memory
+    el._showTitle = false;
+    await el.updateComplete;
+    expect(el._title).toBe("My Title");
+    expect(el.getData().title).toBe("");
+
+    // Toggle back on — title restored
+    el._showTitle = true;
+    await el.updateComplete;
+    expect(el.getData().title).toBe("My Title");
+  });
+
   it("reset clears all fields", async () => {
     const el = await createElement("note");
     el._title = "Test";
-    el._body = "Body";
+    el._bodyJson = {
+      type: "doc",
+      content: [
+        { type: "paragraph", content: [{ type: "text", text: "Body" }] },
+      ],
+    };
     el._rating = 3;
     el._showRating = true;
     el._attachedText = "text";
@@ -223,7 +258,7 @@ describe("JantComposeEditor", () => {
     el.reset();
 
     expect(el._title).toBe("");
-    expect(el._body).toBe("");
+    expect(el._bodyJson).toBeNull();
     expect(el._rating).toBe(0);
     expect(el._showRating).toBe(false);
     expect(el._attachedText).toBe("");
@@ -240,12 +275,12 @@ describe("JantComposeEditor", () => {
     expect(badge?.textContent).toContain("chars");
   });
 
-  it("media button highlights when attachments are present", async () => {
+  it("media button shows inline add label when attachments are present", async () => {
     const el = await createElement("note");
 
-    // Media button should not be active initially
+    // Media button should not have add style initially
     const mediaBtn = el.querySelector<HTMLButtonElement>(".compose-tool-btn");
-    expect(mediaBtn?.classList.contains("compose-tool-btn-active")).toBe(false);
+    expect(mediaBtn?.classList.contains("compose-tool-btn-add")).toBe(false);
 
     // Add an attachment
     const blob = new Blob(["fake"], { type: "image/png" });
@@ -265,8 +300,13 @@ describe("JantComposeEditor", () => {
 
     const mediaBtnAfter =
       el.querySelector<HTMLButtonElement>(".compose-tool-btn");
-    expect(mediaBtnAfter?.classList.contains("compose-tool-btn-active")).toBe(
+    expect(mediaBtnAfter?.classList.contains("compose-tool-btn-add")).toBe(
       true,
     );
+
+    // Should show inline label, not tooltip
+    const label = mediaBtnAfter?.querySelector(".compose-tool-label");
+    expect(label).not.toBeNull();
+    expect(label?.textContent).toBe("Add");
   });
 });

package/src/{ui → client}/components/__tests__/jant-post-form.test.ts

@@ -31,7 +31,10 @@ const labels: PostFormLabels = {
   statusLabel: "Status",
   statusPublished: "Published",
   statusDraft: "Draft",
-  featuredLabel: "Featured",
+  visibilityLabel: "Visibility",
+  visibilityListed: "Listed",
+  visibilityFeatured: "Featured",
+  visibilityUnlisted: "Unlisted",
   pinnedLabel: "Pinned",
   collectionsLabel: "Collections",
   submitLabel: "Publish",
@@ -50,7 +53,7 @@ const initial: PostFormInitial = {
   url: "",
   quoteText: "",
   status: "published",
-  featured: false,
+  visibility: "listed",
   pinned: false,
   rating: 0,
   collectionIds: [],
@@ -119,21 +122,28 @@ describe("JantPostForm", () => {
     titleInput.value = "Sample Post";
     titleInput.dispatchEvent(new Event("input", { bubbles: true }));
 
-    const bodyTextarea =
-      el.querySelector<HTMLTextAreaElement>("textarea.textarea");
-    expect(bodyTextarea).not.toBeNull();
-    if (!bodyTextarea) throw new Error("Body textarea not found");
-    bodyTextarea.value = "Hello world";
-    bodyTextarea.dispatchEvent(new Event("input", { bubbles: true }));
+    // Set body via Tiptap JSON state (Tiptap editor may not init in happy-dom)
+    el._bodyJson = {
+      type: "doc",
+      content: [
+        { type: "paragraph", content: [{ type: "text", text: "Hello world" }] },
+      ],
+    };
+    el._body = JSON.stringify(el._bodyJson);
+
+    // Set visibility to "featured" via the select dropdown
+    const visibilitySelect =
+      el.querySelectorAll<HTMLSelectElement>("select.select")[2]; // [0]=format, [1]=status, [2]=visibility
+    expect(visibilitySelect).not.toBeNull();
+    if (!visibilitySelect) throw new Error("Visibility select not found");
+    visibilitySelect.value = "featured";
+    visibilitySelect.dispatchEvent(new Event("change", { bubbles: true }));
 
     const checkboxList =
       el.querySelectorAll<HTMLInputElement>("input.checkbox");
     expect(checkboxList.length).toBeGreaterThan(0);
-    const checkbox = checkboxList[0];
-    checkbox.checked = true;
-    checkbox.dispatchEvent(new Event("change", { bubbles: true }));
 
-    const collectionCheckbox = checkboxList.item(2);
+    const collectionCheckbox = checkboxList.item(1);
     expect(collectionCheckbox).not.toBeNull();
     if (!collectionCheckbox) throw new Error("Collection checkbox missing");
     collectionCheckbox.checked = true;
@@ -154,8 +164,8 @@ describe("JantPostForm", () => {
     const d = detail as unknown as PostSubmitDetail;
     expect(d.endpoint).toBe("/dash/posts");
     expect(d.data.title).toBe("Sample Post");
-    expect(d.data.body).toBe("Hello world");
-    expect(d.data.featured).toBe(true);
+    expect(d.data.body).toContain("Hello world");
+    expect(d.data.visibility).toBe("featured");
     expect(d.data.collectionIds).toEqual([collections[0].id]);
     expect(d.data.mediaIds).toEqual(["m1"]);
   });

package/src/{ui → client}/components/__tests__/jant-settings-general.test.ts

@@ -188,7 +188,7 @@ describe("JantSettingsGeneral", () => {
 
     expect(detail).not.toBeNull();
     const d = detail as unknown as SettingsSaveDetail;
-    expect(d.endpoint).toBe("/dash/settings");
+    expect(d.endpoint).toBe("/dash/settings/general");
     expect(d.section).toBe("general");
     expect(d.data.siteName).toBe("New Name");
   });
@@ -255,7 +255,7 @@ describe("JantSettingsGeneral", () => {
 
     expect(detail).not.toBeNull();
     const d = detail as unknown as SettingsSaveDetail;
-    expect(d.endpoint).toBe("/dash/settings");
+    expect(d.endpoint).toBe("/dash/settings/general");
     expect(d.section).toBe("general");
     expect(d.data.siteFooter).toBe("New footer");
   });
@@ -286,7 +286,7 @@ describe("JantSettingsGeneral", () => {
 
     expect(detail).not.toBeNull();
     const d = detail as unknown as SettingsSaveDetail;
-    expect(d.endpoint).toBe("/dash/settings/seo");
+    expect(d.endpoint).toBe("/dash/settings/general/seo");
     expect(d.section).toBe("seo");
   });
 

package/src/client/components/collection-sidebar-types.ts

@@ -0,0 +1,45 @@
+/**
+ * Type definitions for the collection sidebar Lit component.
+ */
+
+import type { CollectionFormLabels } from "./collection-types.js";
+
+export interface CollectionSidebarLabels {
+  collections: string;
+  reorder: string;
+  done: string;
+  addDivider: string;
+  newCollection: string;
+  edit: string;
+  deleteDivider: string;
+  moreActions: string;
+  deleteCollection: string;
+  confirmDelete: string;
+  // Toast messages
+  orderSaved: string;
+  saved: string;
+  saveFailed: string;
+  deleted: string;
+  // Collection form labels (passed through to jant-collection-form)
+  formLabels: CollectionFormLabels;
+}
+
+export interface SidebarCollection {
+  id: number;
+  slug: string;
+  title: string;
+  description: string | null;
+  icon: string | null;
+  sortOrder: string;
+  position: number;
+  postCount: number;
+}
+
+export interface SidebarDivider {
+  id: number;
+  position: number;
+}
+
+export type SidebarItem =
+  | { kind: "collection"; data: SidebarCollection }
+  | { kind: "divider"; data: SidebarDivider };

package/src/{ui → client}/components/collection-types.ts

@@ -9,12 +9,11 @@ export interface CollectionFormLabels {
   slugHelp: string;
   descriptionLabel: string;
   descriptionPlaceholder: string;
-  iconLabel: string;
-  chooseIcon: string;
   removeIcon: string;
-  dialogTitle: string;
-  dialogClose: string;
+  iconsTab: string;
+  emojisTab: string;
   searchIconsPlaceholder: string;
+  searchEmojisPlaceholder: string;
   sortOrderLabel: string;
   sortNewest: string;
   sortOldest: string;