@jant/core 0.3.36 → 0.3.38

package/src/routes/api/upload.ts

@@ -60,7 +60,7 @@ function renderMediaCard(
         <button
           type="button"
           class="block w-full aspect-square bg-muted rounded-lg overflow-hidden border hover:border-primary cursor-pointer"
-          onclick="document.getElementById('lightbox-img').src = '${fullUrl}'; document.getElementById('lightbox').showModal()"
+          data-on:click="document.getElementById('lightbox-img').src = '${fullUrl}'; document.getElementById('lightbox').showModal()"
         >
           <img
             src="${thumbnailUrl}"
@@ -69,13 +69,9 @@ function renderMediaCard(
             loading="lazy"
           />
         </button>
-        <a
-          href="/dash/media/${media.id}"
-          class="block mt-2 text-xs truncate hover:underline"
-          title="${media.originalName}"
-        >
+        <span class="block mt-2 text-xs truncate" title="${media.originalName}">
           ${media.originalName}
-        </a>
+        </span>
         <div class="text-xs text-muted-foreground">${sizeStr}</div>
       </div>
     `.toString();
@@ -83,23 +79,18 @@ function renderMediaCard(
 
   return html`
     <div class="group relative" data-media-id="${media.id}">
-      <a
-        href="/dash/media/${media.id}"
-        class="block aspect-square bg-muted rounded-lg overflow-hidden border hover:border-primary"
+      <div
+        class="block aspect-square bg-muted rounded-lg overflow-hidden border"
       >
         <div
           class="w-full h-full flex items-center justify-center text-muted-foreground"
         >
           <span class="text-xs">${media.mimeType}</span>
         </div>
-      </a>
-      <a
-        href="/dash/media/${media.id}"
-        class="block mt-2 text-xs truncate hover:underline"
-        title="${media.originalName}"
-      >
+      </div>
+      <span class="block mt-2 text-xs truncate" title="${media.originalName}">
         ${media.originalName}
-      </a>
+      </span>
       <div class="text-xs text-muted-foreground">${sizeStr}</div>
     </div>
   `.toString();
@@ -179,11 +170,77 @@ uploadApiRoutes.post("/", async (c) => {
   const { id, filename, storageKey } = generateStorageKey(file.name);
 
   try {
-    // Upload to storage
-    await storage.put(storageKey, file.stream(), {
+    // Read optional summary (provided for text attachments)
+    let summary = (formData.get("summary") as string) || undefined;
+    let chars: number | undefined;
+    // Buffer for text files — file.stream() may not work after file.text()
+    let textBuffer: Uint8Array | undefined;
+
+    // Extract summary and char count BEFORE consuming the stream for storage,
+    // because file.text() may not work after file.stream() is consumed.
+    if (
+      file.type === "text/plain" ||
+      file.type === "text/markdown" ||
+      file.type === "text/csv"
+    ) {
+      try {
+        const textContent = await file.text();
+        textBuffer = new TextEncoder().encode(textContent);
+        chars = textContent.length;
+        if (!summary) {
+          summary = textContent.slice(0, 100).trim() || undefined;
+        }
+      } catch {
+        // Ignore — summary and chars are optional
+      }
+    } else if (file.type === "text/x-tiptap+json") {
+      try {
+        const raw = await file.text();
+        textBuffer = new TextEncoder().encode(raw);
+        const envelope = JSON.parse(raw) as {
+          json?: { content?: unknown[] };
+          html?: string;
+        };
+        // Walk the TipTap JSON tree to extract plain text
+        if (envelope.json) {
+          let text = "";
+          const walk = (node: Record<string, unknown>) => {
+            if (typeof node.text === "string") text += node.text;
+            if (Array.isArray(node.content))
+              (node.content as Record<string, unknown>[]).forEach(walk);
+          };
+          walk(envelope.json as Record<string, unknown>);
+          chars = text.length;
+        }
+      } catch {
+        // Ignore — chars is optional
+      }
+    }
+
+    // Upload to storage — use buffered bytes for text files (stream may be consumed)
+    await storage.put(storageKey, textBuffer ?? file.stream(), {
       contentType: file.type,
     });
 
+    // Read optional client-side metadata
+    const widthRaw = parseInt(formData.get("width") as string) || undefined;
+    const heightRaw = parseInt(formData.get("height") as string) || undefined;
+    const blurhashRaw = (formData.get("blurhash") as string) || undefined;
+    const waveformRaw = (formData.get("waveform") as string) || undefined;
+
+    // Upload poster frame for videos (if provided by client)
+    let posterKey: string | undefined;
+    const posterFile = formData.get("poster") as File | null;
+    if (posterFile && file.type.startsWith("video/")) {
+      const date = new Date();
+      const year = date.getUTCFullYear();
+      const month = String(date.getUTCMonth() + 1).padStart(2, "0");
+      posterKey = `media/${year}/${month}/${id}-poster.webp`;
+      await storage.put(posterKey, posterFile.stream(), {
+        contentType: "image/webp",
+      });
+    }
+
     // Save to database
     const media = await c.var.services.media.create({
       id,
@@ -193,6 +250,15 @@ uploadApiRoutes.post("/", async (c) => {
       size: file.size,
       storageKey,
       provider: c.var.appConfig.storageDriver,
+      width: widthRaw && widthRaw > 0 ? widthRaw : undefined,
+      height: heightRaw && heightRaw > 0 ? heightRaw : undefined,
+      blurhash:
+        blurhashRaw && blurhashRaw.length < 200 ? blurhashRaw : undefined,
+      waveform:
+        waveformRaw && waveformRaw.length < 2000 ? waveformRaw : undefined,
+      posterKey,
+      summary,
+      chars,
     });
 
     // SSE response for Datastar

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

@@ -1,20 +1,16 @@
 import { describe, it, expect, beforeEach } from "vitest";
 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";
 import type { NavItemService } from "../../../services/navigation.js";
 
 /**
- * Reproduces the seed logic from POST /setup to verify the default About page
- * and navigation items are created correctly.
+ * Reproduces the seed logic from POST /setup to verify the default
+ * navigation items are created correctly.
  */
 async function runSetupSeed(services: {
-  pages: PageService;
   settings: SettingsService;
   navItems: NavItemService;
 }) {
@@ -30,31 +26,20 @@ async function runSetupSeed(services: {
     label: "Archive",
     url: "/archive",
   });
-
-  const aboutPage = await services.pages.create({
-    slug: "about",
-    title: "About",
-    body: [
-      "Welcome to my corner of the internet.",
-      "",
-      "This is a place where I share my thoughts, ideas, and things I find interesting. Feel free to look around and get to know what this site is all about.",
-      "",
-      "If you'd like to get in touch, don't hesitate to reach out.",
-    ].join("\n"),
-    status: "published",
+  await services.navItems.create({
+    type: "system",
+    label: "RSS",
+    url: "/feed",
   });
-
   await services.navItems.create({
-    type: "page",
-    label: "About",
-    url: "/about",
-    pageId: aboutPage.id,
+    type: "system",
+    label: "Settings",
+    url: "/settings",
   });
 }
 
 describe("Setup seed logic", () => {
   let services: {
-    pages: PageService;
     settings: SettingsService;
     navItems: NavItemService;
   };
@@ -63,57 +48,32 @@ describe("Setup seed logic", () => {
     const testDb = createTestDatabase();
     const db = testDb.db as unknown as Database;
     services = {
-      pages: createPageService(db, createPathRegistryService(db)),
       settings: createSettingsService(db),
       navItems: createNavItemService(db),
     };
   });
 
-  it("creates a default About page with correct content", async () => {
-    await runSetupSeed(services);
-
-    const aboutPage = await services.pages.getBySlug("about");
-    expect(aboutPage).not.toBeNull();
-    expect(aboutPage?.title).toBe("About");
-    expect(aboutPage?.status).toBe("published");
-    expect(aboutPage?.body).toContain("Welcome to my corner of the internet");
-    expect(aboutPage?.bodyHtml).toBeTruthy();
-  });
-
-  it("adds About page to navigation as a page-type nav item", async () => {
+  it("creates four nav items: Collections, Archive, RSS, Settings", async () => {
     await runSetupSeed(services);
 
-    const aboutPage = await services.pages.getBySlug("about");
     const navItemsList = await services.navItems.list();
-
-    const aboutNavItem = navItemsList.find(
-      (item) => item.pageId === aboutPage?.id,
-    );
-    expect(aboutNavItem).toBeDefined();
-    expect(aboutNavItem?.type).toBe("page");
-    expect(aboutNavItem?.label).toBe("About");
-    expect(aboutNavItem?.url).toBe("/about");
-  });
-
-  it("creates three nav items total: Collections, Archive, About", async () => {
-    await runSetupSeed(services);
-
-    const navItemsList = await services.navItems.list();
-    expect(navItemsList).toHaveLength(3);
+    expect(navItemsList).toHaveLength(4);
 
     const labels = navItemsList.map((item) => item.label);
     expect(labels).toContain("Collections");
     expect(labels).toContain("Archive");
-    expect(labels).toContain("About");
+    expect(labels).toContain("RSS");
+    expect(labels).toContain("Settings");
   });
 
-  it("renders About page body as HTML", async () => {
+  it("creates link and system type nav items", async () => {
     await runSetupSeed(services);
 
-    const aboutPage = await services.pages.getBySlug("about");
-    expect(aboutPage?.bodyHtml).toContain("<p>");
-    expect(aboutPage?.bodyHtml).toContain(
-      "Welcome to my corner of the internet",
-    );
+    const navItemsList = await services.navItems.list();
+    const linkItems = navItemsList.filter((item) => item.type === "link");
+    const systemItems = navItemsList.filter((item) => item.type === "system");
+
+    expect(linkItems).toHaveLength(2);
+    expect(systemItems).toHaveLength(2);
   });
 });

package/src/routes/auth/setup.tsx

@@ -14,7 +14,8 @@ import { BaseLayout } from "../../ui/layouts/BaseLayout.js";
 import { dsRedirect, dsToast } from "../../lib/sse.js";
 import { SetupSchema } from "../../lib/schemas.js";
 import { mapIanaToTimezone } from "../../lib/timezones.js";
-import { getI18n } from "../../i18n/index.js";
+import { getI18n, baseLocale } from "../../i18n/index.js";
+import { detectLocaleFromHeader } from "../../i18n/detect.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -40,8 +41,8 @@ const SetupContent: FC = () => {
         </header>
         <section>
           <form
-            data-signals="{name: '', email: '', password: '', _timezone: ''}"
-            data-init="$_timezone = Intl.DateTimeFormat().resolvedOptions().timeZone || ''"
+            data-signals="{siteName: '', email: '', password: '', timezone: '', language: ''}"
+            data-init="$timezone = Intl.DateTimeFormat().resolvedOptions().timeZone || ''; $language = navigator.language || ''"
             data-on:submit__prevent="@post('/setup')"
             data-indicator="_loading"
             class="flex flex-col gap-4"
@@ -49,16 +50,16 @@ const SetupContent: FC = () => {
             <div class="field">
               <label class="label">
                 {t({
-                  message: "Your Name",
-                  comment: "@context: Setup form field - user name",
+                  message: "Site Name",
+                  comment: "@context: Setup form field - site name",
                 })}
               </label>
               <input
                 type="text"
-                data-bind="name"
+                data-bind="siteName"
                 class="input"
                 required
-                placeholder="John Doe"
+                placeholder="My Blog"
               />
             </div>
             <div class="field">
@@ -139,7 +140,8 @@ setupRoutes.post("/setup", async (c) => {
 
   const body = await c.req.json<Record<string, string>>();
   const parsed = SetupSchema.safeParse(body);
-  const browserTimezone = body._timezone;
+  const browserTimezone = body.timezone;
+  const browserLanguage = body.language;
 
   if (!parsed.success) {
     const errorMsg =
@@ -154,7 +156,7 @@ setupRoutes.post("/setup", async (c) => {
     return dsToast(errorMsg, "error");
   }
 
-  const { name, email, password } = parsed.data;
+  const { siteName, email, password } = parsed.data;
 
   if (!c.var.auth) {
     return dsToast(
@@ -171,7 +173,7 @@ setupRoutes.post("/setup", async (c) => {
 
   try {
     const signUpResponse = await c.var.auth.api.signUpEmail({
-      body: { name, email, password },
+      body: { name: siteName.trim(), email, password },
     });
 
     if (!signUpResponse || "error" in signUpResponse) {
@@ -189,6 +191,9 @@ setupRoutes.post("/setup", async (c) => {
 
     await c.var.services.settings.completeOnboarding();
 
+    // Save site name
+    await c.var.services.settings.set("SITE_NAME", siteName.trim());
+
     // Save auto-detected timezone
     if (browserTimezone) {
       const tz = mapIanaToTimezone(browserTimezone);
@@ -197,33 +202,21 @@ setupRoutes.post("/setup", async (c) => {
       }
     }
 
-    // Seed default navigation items (order: Collections, About, Archive, RSS, Dashboard)
+    // Save auto-detected language from browser's navigator.language
+    if (browserLanguage) {
+      const detectedLang = detectLocaleFromHeader(browserLanguage);
+      if (detectedLang !== baseLocale) {
+        await c.var.services.settings.set("SITE_LANGUAGE", detectedLang);
+      }
+    }
+
+    // Seed default navigation items (order: Collections, Archive, RSS, Settings)
     await c.var.services.navItems.create({
       type: "link",
       label: "Collections",
       url: "/c",
     });
 
-    const aboutPage = await c.var.services.pages.create({
-      slug: "about",
-      title: "About",
-      body: [
-        "Welcome to my corner of the internet.",
-        "",
-        "This is a place where I share my thoughts, ideas, and things I find interesting. Feel free to look around and get to know what this site is all about.",
-        "",
-        "If you'd like to get in touch, don't hesitate to reach out.",
-      ].join("\n"),
-      status: "published",
-    });
-
-    await c.var.services.navItems.create({
-      type: "page",
-      label: "About",
-      url: "/about",
-      pageId: aboutPage.id,
-    });
-
     await c.var.services.navItems.create({
       type: "link",
       label: "Archive",
@@ -238,8 +231,8 @@ setupRoutes.post("/setup", async (c) => {
 
     await c.var.services.navItems.create({
       type: "system",
-      label: "Dashboard",
-      url: "/dash",
+      label: "Settings",
+      url: "/settings",
     });
 
     return dsRedirect("/signin?setup");

package/src/routes/auth/signin.tsx

@@ -182,21 +182,17 @@ signinRoutes.post("/signin", async (c) => {
   }
 });
 
-signinRoutes.get("/signout", async (c) => {
+signinRoutes.post("/signout", async (c) => {
   if (c.var.auth) {
     try {
       const res = await c.var.auth.api.signOut({
         headers: c.req.raw.headers,
         asResponse: true,
       });
-      const redirect = c.redirect("/");
-      for (const cookie of res.headers.getSetCookie()) {
-        redirect.headers.append("Set-Cookie", cookie);
-      }
-      return redirect;
+      return dsRedirect("/", { headers: res.headers });
     } catch {
       // Ignore signout errors
     }
   }
-  return c.redirect("/");
+  return dsRedirect("/");
 });

package/src/routes/compose.tsx

@@ -2,26 +2,19 @@
  * Compose Route
  *
  * Handles post creation from the public-site compose dialog.
- * Published posts are prepended to the homepage timeline via SSE.
+ * On publish the client reloads the page to pick up the new post.
  * Drafts close the dialog and show a confirmation toast.
  */
 
-import { Hono, type Context } from "hono";
+import { Hono } from "hono";
 import { msg } from "@lingui/core/macro";
-import type { Bindings, Post } from "../types.js";
+import type { Bindings } from "../types.js";
 import type { AppVariables } from "../types/app-context.js";
 import { requireAuth } from "../middleware/auth.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 {
-  toPostView,
-  toPostViewFromPost,
-  createMediaContext,
-} from "../lib/view.js";
-import { buildMediaMap } from "../lib/media-helpers.js";
-import { TimelineItemFromPost } from "../ui/feed/TimelineItem.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -48,40 +41,7 @@ const INITIAL_SIGNALS = {
 
 /** Script fragment that closes the compose dialog and self-removes */
 const CLOSE_DIALOG_SCRIPT =
-  "<script data-effect=\"el.remove()\">document.getElementById('compose-dialog').close()</script>";
-
-/** Build a timeline card HTML string for a newly created post */
-async function buildTimelineCard(
-  c: Context<Env>,
-  post: Post,
-  mediaIds: string[] | undefined,
-): Promise<string> {
-  const mediaCtx = createMediaContext(c.var.appConfig);
-  let postView;
-
-  if (mediaIds && mediaIds.length > 0) {
-    const rawMediaMap = await c.var.services.media.getByPostIds([post.id]);
-    const mediaMap = buildMediaMap(
-      rawMediaMap,
-      mediaCtx.r2PublicUrl,
-      mediaCtx.imageTransformUrl,
-      mediaCtx.s3PublicUrl,
-    );
-    postView = toPostView(
-      { ...post, mediaAttachments: mediaMap.get(post.id) ?? [] },
-      mediaCtx,
-    );
-  } else {
-    postView = toPostViewFromPost(post, mediaCtx);
-  }
-
-  return (
-    <div>
-      <TimelineItemFromPost post={postView} />
-      <hr class="feed-divider" />
-    </div>
-  ).toString();
-}
+  "<div data-init=\"document.getElementById('compose-dialog').close(); el.remove()\"></div>";
 
 composeRoutes.post("/", async (c) => {
   const i18n = getI18n(c);
@@ -127,13 +87,15 @@ composeRoutes.post("/", async (c) => {
       format: data.format,
       title: data.title || undefined,
       body: data.body || undefined,
+      bodyMarkdown: data.bodyMarkdown || undefined,
       status: data.status ?? "published",
+      visibility: data.visibility || undefined,
+      featured: data.featured,
       url: data.url || undefined,
       quoteText: data.quoteText || undefined,
       rating: data.rating || undefined,
-      collectionIds: data.collectionIds?.length
-        ? data.collectionIds
-        : undefined,
+      collectionIds: data.collectionIds,
+      replyToId: data.replyToId,
     },
     {
       maxParagraphs: c.var.appConfig.summaryMaxParagraphs,
@@ -172,8 +134,7 @@ composeRoutes.post("/", async (c) => {
       });
     }
 
-    const cardHtml = await buildTimelineCard(c, post, data.mediaIds);
-    return c.json({ status: "published" as const, cardHtml });
+    return c.json({ status: "published" as const, permalink: `/${post.slug}` });
   }
 
   // ── SSE response mode (used by Datastar) ─────────────────────────
@@ -195,13 +156,7 @@ composeRoutes.post("/", async (c) => {
     });
   }
 
-  const cardHtml = await buildTimelineCard(c, post, data.mediaIds);
-
   return sse(c, async (stream) => {
-    await stream.patchElements(cardHtml, {
-      mode: "prepend",
-      selector: "#timeline-items",
-    });
     await stream.patchElements(CLOSE_DIALOG_SCRIPT, {
       mode: "append",
       selector: "body",

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

@@ -38,7 +38,7 @@ function createMockFile(
   };
 }
 
-describe("Dashboard Settings - Avatar Upload Logic", () => {
+describe("Settings - Avatar Upload Logic", () => {
   let db: Database;
   let settingsService: ReturnType<typeof createSettingsService>;
   let mediaService: ReturnType<typeof createMediaService>;