@jant/core 0.6.15 → 0.7.0

package/src/lib/navigation.ts

@@ -6,7 +6,9 @@
 
 import type { Context } from "hono";
 import type { Collection, NavItem, NavItemView } from "../types.js";
+import { isFeedNavKey } from "../types/constants.js";
 import { toNavItemViews } from "./view.js";
+import { languageScopeBasePath, viewBasePath } from "./view-language.js";
 import { render as renderMarkdown, toPlainText } from "./markdown.js";
 
 /**
@@ -15,7 +17,15 @@ import { render as renderMarkdown, toPlainText } from "./markdown.js";
 export interface NavigationData {
   links: NavItemView[];
   currentPath: string;
+  /** Deployment path prefix, such as `/blog`. */
   sitePathPrefix: string;
+  /**
+   * Public path prefix for reader-facing surfaces. Equals `sitePathPrefix`
+   * outside a language view, and carries the language prefix inside one
+   * (`/blog/en`). Pass this — not `sitePathPrefix` — to anything building
+   * links to the home page, archive, search, feeds or collections.
+   */
+  basePath: string;
   siteName: string;
   /** Plain-text description for meta tags and RSS/Atom feeds */
   siteDescription: string;
@@ -23,11 +33,37 @@ export interface NavigationData {
   siteDescriptionHtml?: string;
   isAuthenticated: boolean;
   collections: Collection[];
-  siteAvatarUrl?: string;
+  /** Header/drawer mark, already sized down — not the canonical asset. */
+  siteAvatarThumbUrl?: string;
   showHeaderAvatar?: boolean;
   siteFooterHtml?: string;
 }
 
+/**
+ * Collect the collections and smart collections already placed in navigation.
+ *
+ * The directory offers both kinds the same "Add to Navigation" action, so it
+ * needs one list to check against; TypeID prefixes (`col_`, `smc_`) keep the
+ * two apart without a second field.
+ *
+ * @param links - Navigation items as rendered for this request
+ * @returns TypeIDs of every collection and smart collection in navigation
+ * @example
+ * const placed = collectNavigationCollectionIds(navData.links);
+ * // ["col_01abc", "smc_01xyz"]
+ */
+export function collectNavigationCollectionIds(links: NavItemView[]): string[] {
+  return links.flatMap((item) => {
+    if (item.type === "collection" && item.collectionId) {
+      return [item.collectionId];
+    }
+    if (item.type === "smart_collection" && item.smartCollectionId) {
+      return [item.smartCollectionId];
+    }
+    return [];
+  });
+}
+
 /**
  * Fetch navigation data for public pages.
  *
@@ -49,20 +85,45 @@ export interface NavigationData {
  */
 export async function getNavigationData(
   c: Context,
-  options?: { preloadedItems?: NavItem[]; includeCollections?: boolean },
+  options?: {
+    preloadedItems?: NavItem[];
+    includeCollections?: boolean;
+    /**
+     * Content language whose view the page's chrome should live in. Post
+     * pages pass their post's language here: their URLs carry no language
+     * prefix, so `viewLang` is never set on them, yet a Japanese post's
+     * logo and nav should lead to `/ja`, not to the primary view.
+     */
+    languageScope?: string | null;
+  },
 ): Promise<NavigationData> {
+  const appConfig = c.var.appConfig;
+  const langBase =
+    options?.languageScope !== undefined
+      ? languageScopeBasePath(c, options.languageScope)
+      : viewBasePath(c);
+  // An empty prefix means the primary language's view, whose nav items already
+  // point where they should — so the whole primary-language site, multilingual
+  // or not, never pays for the translation lookup.
+  const scopeLanguage = langBase
+    ? (options?.languageScope ?? c.var.viewLang ?? null)
+    : null;
+
   // Callers that already fetched nav items can pass them in to avoid a
   // redundant DB round-trip.
   const savedItems =
-    options?.preloadedItems ?? (await c.var.services.navItems.list());
+    options?.preloadedItems ??
+    (await c.var.services.navItems.list({ language: scopeLanguage }));
   const currentPath = c.var.publicPath;
-  const appConfig = c.var.appConfig;
-  // Keep the saved RSS item untouched so its placement and custom label come
-  // back when feeds are re-enabled. Only the rendered projection is filtered.
+  // Keep the saved feed items untouched so their placement and custom labels
+  // come back when feeds are re-enabled. Only the rendered projection is
+  // filtered. Both entries go: `rss` addresses a feed that is off, and
+  // `subscribe` a page that 404s without one.
   const items = appConfig.rssFeedsEnabled
     ? savedItems
     : savedItems.filter(
-        (item: NavItem) => item.type !== "system" || item.systemKey !== "rss",
+        (item: NavItem) =>
+          item.type !== "system" || !isFeedNavKey(item.systemKey),
       );
 
   const siteName = appConfig.siteName;
@@ -80,8 +141,10 @@ export async function getNavigationData(
       })
     : undefined;
 
-  // Avatar URL and display flag come from appConfig
-  const siteAvatarUrl = appConfig.siteAvatarUrl || undefined;
+  // Avatar URL and display flag come from appConfig. The chrome takes the
+  // sized variant: the full-resolution asset belongs to the social card and
+  // the settings editor, not to a 32px mark on every page.
+  const siteAvatarThumbUrl = appConfig.siteAvatarThumbUrl || undefined;
   const showHeaderAvatar = appConfig.showHeaderAvatar;
 
   // Render footer markdown
@@ -107,6 +170,8 @@ export async function getNavigationData(
       ? await c.var.services.navItems.getCollectionFreshness(collectionNavIds)
       : undefined;
 
+  const basePath = `${appConfig.sitePathPrefix}${langBase}`;
+
   const links = toNavItemViews(
     items,
     currentPath,
@@ -114,6 +179,7 @@ export async function getNavigationData(
     appConfig.sitePathPrefix,
     collectionFreshness,
     appConfig.siteOrigin,
+    basePath,
   );
 
   // Only load collections when authenticated (for compose dialog)
@@ -125,13 +191,14 @@ export async function getNavigationData(
     links,
     currentPath,
     sitePathPrefix: appConfig.sitePathPrefix,
+    basePath,
     siteName,
     siteDescription,
     siteDescriptionHtml,
     isAuthenticated,
     collections,
-    siteAvatarUrl,
-    showHeaderAvatar: showHeaderAvatar && !!siteAvatarUrl,
+    siteAvatarThumbUrl,
+    showHeaderAvatar: showHeaderAvatar && !!siteAvatarThumbUrl,
     siteFooterHtml,
   };
 }

package/src/lib/pagination.ts

@@ -38,10 +38,18 @@ export function formatPageLabel(
   return `Page ${String(currentPage)}`;
 }
 
+/** Slots a numbered pagination control fills once there are more pages. */
+const PAGE_SLOT_COUNT = 7;
+
 /**
  * Computes which page numbers to display in a numbered pagination control.
- * Always includes: first page, last page, current page, and 1 page on each side of current.
- * Gaps between non-consecutive pages are represented by 0 (ellipsis marker).
+ *
+ * Seven or fewer pages are all shown. Past that, the control always fills
+ * exactly seven slots — the first page, the last page, and a three-page
+ * window around the current page — so it keeps the same width, and the
+ * Previous/Next links stay put, as the reader moves through pages. Skipped
+ * pages are represented by 0 (ellipsis marker). An ellipsis always stands in
+ * for at least two pages; where it would hide just one, that page is shown.
  *
  * @param currentPage - The current active page (1-indexed)
  * @param totalPages - Total number of pages
@@ -50,36 +58,32 @@ export function formatPageLabel(
  * @example
  * ```ts
  * getPageNumbers(1, 5)    // [1, 2, 3, 4, 5]
- * getPageNumbers(1, 20)   // [1, 2, 0, 20]
- * getPageNumbers(10, 20)  // [1, 0, 9, 10, 11, 0, 20]
+ * getPageNumbers(1, 19)   // [1, 2, 3, 4, 5, 0, 19]
+ * getPageNumbers(10, 19)  // [1, 0, 9, 10, 11, 0, 19]
+ * getPageNumbers(19, 19)  // [1, 0, 15, 16, 17, 18, 19]
  * ```
  */
 export function getPageNumbers(
   currentPage: number,
   totalPages: number,
 ): number[] {
-  if (totalPages <= 7) {
+  if (totalPages <= PAGE_SLOT_COUNT) {
     return Array.from({ length: totalPages }, (_, i) => i + 1);
   }
 
-  const pages = new Set<number>();
-  pages.add(1);
-  pages.add(totalPages);
-  pages.add(currentPage);
-  if (currentPage > 1) pages.add(currentPage - 1);
-  if (currentPage < totalPages) pages.add(currentPage + 1);
-
-  const sorted = [...pages].sort((a, b) => a - b);
-
-  // Insert 0 for gaps
-  const result: number[] = [];
-  for (let i = 0; i < sorted.length; i++) {
-    const current = sorted[i] as number;
-    if (i > 0 && current - (sorted[i - 1] as number) > 1) {
-      result.push(0); // ellipsis marker
-    }
-    result.push(current);
-  }
+  // The second slot holds page 2 or an ellipsis, and the second-to-last slot
+  // holds page totalPages - 1 or an ellipsis, so the window around the current
+  // page starts no earlier than page 3 and ends no later than totalPages - 2.
+  const windowStart = Math.min(Math.max(currentPage - 1, 3), totalPages - 4);
+  const windowEnd = windowStart + 2;
 
-  return result;
+  return [
+    1,
+    windowStart === 3 ? 2 : 0,
+    windowStart,
+    windowStart + 1,
+    windowEnd,
+    windowEnd === totalPages - 2 ? totalPages - 1 : 0,
+    totalPages,
+  ];
 }

package/src/lib/per-language-surfaces.ts

@@ -0,0 +1,67 @@
+/**
+ * Which reader surfaces exist once per language.
+ *
+ * Mirrors the `langGet()` table in `routes/pages/language.tsx` — the two must
+ * change together. Kept in its own module, free of server imports, because the
+ * client needs the same answer: `viewPath()` uses it to decide whether a link
+ * carries the current view's language prefix, and getting it wrong in either
+ * direction is a bug you can see — a missing prefix drops the reader into
+ * another language, an extra one lands on a 404.
+ *
+ * Everything not listed here — the dashboard, auth, collection editors, and
+ * post permalinks — has one address site-wide.
+ */
+
+/** Surfaces served per language at exactly this path. */
+const PER_LANGUAGE_SURFACES = new Set([
+  "/",
+  "/feed",
+  "/latest",
+  "/featured",
+  "/archive",
+  "/search",
+  "/subscribe",
+  "/collections",
+]);
+
+/**
+ * Surfaces whose sub-paths are all per-language too. `/collections/` is absent
+ * on purpose: aggregate selections and their feeds are, but nothing else
+ * nested under it is.
+ */
+const PER_LANGUAGE_SURFACE_PREFIXES = ["/latest/", "/featured/", "/archive/"];
+
+const COLLECTIONS_PREFIX = "/collections/";
+
+/** `/collections/{selection}` and its feed, and nothing else under it. */
+function isCollectionSelectionSurface(path: string): boolean {
+  const rest = path.slice(COLLECTIONS_PREFIX.length);
+  if (!rest) return false;
+
+  const segments = rest.split("/");
+  if (segments[0] === "") return false;
+  if (segments.length === 1) return true;
+  return segments.length === 2 && segments[1] === "feed";
+}
+
+/**
+ * Whether a path exists in every language's view.
+ *
+ * @param path - Internal app path, without any language prefix. A query string
+ *   or fragment is ignored, so callers can pass a built link as-is.
+ * @returns True when `/ja{path}` is a page rather than a 404
+ * @example
+ * isPerLanguageSurface("/archive?media=any"); // true — /ja/archive exists
+ * isPerLanguageSurface("/collections/a+b/feed"); // true — /ja/collections/a+b/feed exists
+ * isPerLanguageSurface("/settings/language"); // false — the dash is one place
+ */
+export function isPerLanguageSurface(path: string): boolean {
+  const bare = path.split(/[?#]/, 1)[0] ?? path;
+  if (PER_LANGUAGE_SURFACES.has(bare)) return true;
+  if (bare.startsWith(COLLECTIONS_PREFIX)) {
+    return isCollectionSelectionSurface(bare);
+  }
+  return PER_LANGUAGE_SURFACE_PREFIXES.some((prefix) =>
+    bare.startsWith(prefix),
+  );
+}

package/src/lib/post-display.ts

@@ -9,7 +9,7 @@ import type { Context } from "hono";
 import type { Bindings, Post, PostView } from "../types.js";
 import type { AppVariables } from "../types/app-context.js";
 import { buildMediaMap } from "./media-helpers.js";
-import { createMediaContext, toPostView } from "./view.js";
+import { createMediaContext, resolveDraftTailId, toPostView } from "./view.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -82,7 +82,12 @@ function resolvePostSocialImage(
 interface PostDisplayOptions {
   isAuthenticated?: boolean;
   allowDraft?: boolean;
-  /** Include draft members when assembling a thread for an authenticated preview. */
+  /**
+   * Force draft members into the assembled thread. The author already sees
+   * them whenever they are signed in; this only covers the draft-preview
+   * route, where the request is authenticated but `isAuthenticated` has
+   * already been forced to `true` for private-post access.
+   */
   includeDraftThread?: boolean;
 }
 
@@ -120,11 +125,16 @@ export async function assemblePostCardView(
   }
 
   const mediaCtx = createMediaContext(c.var.appConfig);
-  const [rawMediaMap, collectionsMap, lastPostMap, aliasesMap] =
+  const [rawMediaMap, collectionsMap, lastPostMap, draftTailMap, aliasesMap] =
     await Promise.all([
       c.var.services.media.getByPostIds([post.id]),
       c.var.services.collections.getCollectionsByPostIds([post.id]),
-      c.var.services.posts.getLastPostIdsByThread([post.threadId]),
+      c.var.services.posts.getThreadTailIds([post.threadId]),
+      c.var.isAuthenticated
+        ? c.var.services.posts.getThreadTailIds([post.threadId], {
+            includeDrafts: true,
+          })
+        : Promise.resolve(new Map<string, string>()),
       c.var.services.paths.getPostAliases([post.id]),
     ]);
 
@@ -144,6 +154,13 @@ export async function assemblePostCardView(
     aliasesMap.get(post.id)?.[0],
   );
 
+  const draftTailId = resolveDraftTailId(
+    post.threadId,
+    lastPostMap,
+    draftTailMap,
+  );
+  if (draftTailId) view.draftTailId = draftTailId;
+
   return view;
 }
 
@@ -170,12 +187,19 @@ export async function assemblePostPageDisplay(
   }
 
   const mediaCtx = createMediaContext(c.var.appConfig);
+  // Drafts render for the author so the thread they see ends where the server
+  // thinks it ends — otherwise a trailing draft silently blocks replies while
+  // staying invisible. Read the real auth state rather than the option, which
+  // callers force to `true` to bypass the private-post check.
+  const includeDrafts = Boolean(
+    options?.includeDraftThread || c.var.isAuthenticated,
+  );
   const threadPosts = (
     await c.var.services.posts.getThread(post.threadId)
   ).filter(
     (threadPost) =>
       threadPost.status === "published" ||
-      (options?.includeDraftThread && threadPost.status === "draft"),
+      (includeDrafts && threadPost.status === "draft"),
   );
 
   const allPostIds =
@@ -219,13 +243,22 @@ export async function assemblePostPageDisplay(
         )
       : undefined;
 
-  const socialImage = resolvePostSocialImage(postView, threadPostViews);
+  // Page metadata describes what a reader gets, so it never draws on drafts:
+  // an unpublished reply must not supply the og:image or bump the modified
+  // time. Falls back to the post itself when nothing in the thread is
+  // published (the draft-preview route, which is noindex anyway).
+  const publishedViews = threadPostViews?.filter(
+    (view) => view.status === "published",
+  );
+  const metaViews = publishedViews?.length ? publishedViews : [postView];
+
+  const socialImage = resolvePostSocialImage(postView, metaViews);
 
-  const rootView = threadPostViews?.[0] ?? postView;
-  const allViews = threadPostViews ?? [postView];
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- metaViews is never empty
+  const rootView = metaViews[0]!;
   // ISO 8601 strings from toISOString() are all UTC and zero-padded, so
   // lexical comparison matches chronological order.
-  const articleModifiedTime = allViews
+  const articleModifiedTime = metaViews
     .map((p) => p.updatedAt)
     .reduce((latest, t) => (t > latest ? t : latest));
 

package/src/lib/post-meta.ts

@@ -97,6 +97,25 @@ function getDescriptionCandidate(post: Post): string {
   return "";
 }
 
+/**
+ * What to call a Post in a list, when it may have no title of its own.
+ *
+ * Notes are usually untitled, so falling back to the slug would show readers
+ * and authors a URL fragment where they expect a sentence. The chain is the
+ * same one browser titles and Open Graph tags already use: title, then the
+ * quoted text, then the summary, then the opening of the body, then a link's
+ * domain.
+ *
+ * @param post - The Post to name
+ * @returns A short plain-text label, or an empty string when there is nothing
+ *   to derive one from
+ * @example
+ * getPostDisplayTitle(untitledNote); // "An untitled note about espresso."
+ */
+export function getPostDisplayTitle(post: Post): string {
+  return getTitleCandidate(post);
+}
+
 export interface PostMeta {
   title: string;
   description?: string;

package/src/lib/render.tsx

@@ -9,9 +9,20 @@ import type { Context } from "hono";
 import type { Child } from "hono/jsx";
 import type { SiteLayoutProps } from "../types.js";
 import { SETTINGS_KEYS } from "./constants.js";
-import { BaseLayout, type ToastProps } from "../ui/layouts/BaseLayout.js";
+import {
+  BaseLayout,
+  type PageFeedLink,
+  type ToastProps,
+} from "../ui/layouts/BaseLayout.js";
 import { SiteLayout } from "../ui/layouts/SiteLayout.js";
 import type { NavigationData } from "./navigation.js";
+import {
+  buildComposeLanguages,
+  buildLanguageSwitcher,
+  getViewLang,
+  type LanguageAlternate,
+  type LanguageSwitcherOption,
+} from "./view-language.js";
 
 export interface RenderPublicPageOptions {
   /** Page title for <title> tag */
@@ -45,6 +56,23 @@ export interface RenderPublicPageOptions {
    * thread root).
    */
   canonicalHref?: string;
+  /**
+   * `hreflang` alternates for this page. List surfaces pass
+   * `buildSurfaceAlternates(c)`; a post passes its translations. Pages that
+   * exist once for the whole site pass nothing.
+   */
+  alternateLanguages?: LanguageAlternate[];
+  /**
+   * The feed this page publishes, for `<link rel="alternate">` autodiscovery.
+   * Set on pages with a feed of their own — a collection, the archive — so a
+   * reader's extension finds that feed rather than only the site-wide ones.
+   */
+  pageFeed?: PageFeedLink;
+  /**
+   * Language switcher entries. Defaults to the current surface in each of the
+   * site's languages; a post overrides it with its translations.
+   */
+  languageSwitcher?: LanguageSwitcherOption[];
   /** Navigation data (from getNavigationData) */
   navData: NavigationData;
   /** Page content JSX to render inside SiteLayout */
@@ -57,14 +85,24 @@ export interface RenderPublicPageOptions {
   toast?: ToastProps;
   /** Whether to render the shared compose dialog shell */
   showComposeDialog?: boolean;
-  /** Override the site-wide crawler setting for sensitive utility pages. */
-  noindex?: boolean;
+  /**
+   * Override the site-wide crawler setting for this page. `true` means
+   * `noindex, nofollow`; `"follow"` keeps the URL unindexed while leaving its
+   * links crawlable. See `BaseLayoutProps["noindex"]`.
+   */
+  noindex?: boolean | "follow";
   /** Whether to render the site header */
   showHeader?: boolean;
   /** Whether to render the home branding credit after the site footer */
   showHomeBranding?: boolean;
   /** When set, the mobile compose FAB pre-selects this collection. */
   composeCollectionId?: string;
+  /**
+   * Content language of the page the composer opens from, for its default.
+   * List surfaces leave this unset and get the view language; a post page
+   * passes its post's language, since its URL carries no view prefix.
+   */
+  composeContextLanguage?: string | null;
 }
 
 /**
@@ -99,6 +137,9 @@ export function renderPublicPage(c: Context, options: RenderPublicPageOptions) {
     articleModifiedTime,
     jsonLd,
     canonicalHref,
+    alternateLanguages,
+    pageFeed,
+    languageSwitcher,
     navData,
     content,
     pageChrome,
@@ -109,6 +150,7 @@ export function renderPublicPage(c: Context, options: RenderPublicPageOptions) {
     showHeader,
     showHomeBranding,
     composeCollectionId,
+    composeContextLanguage,
   } = options;
 
   // Use siteDescription as meta description fallback when not explicitly provided
@@ -123,9 +165,10 @@ export function renderPublicPage(c: Context, options: RenderPublicPageOptions) {
     links: navData.links,
     currentPath: navData.currentPath,
     sitePathPrefix: navData.sitePathPrefix,
+    basePath: navData.basePath,
     isAuthenticated: navData.isAuthenticated,
     collections: navData.collections,
-    siteAvatarUrl: navData.siteAvatarUrl,
+    siteAvatarThumbUrl: navData.siteAvatarThumbUrl,
     showHeaderAvatar: navData.showHeaderAvatar,
     siteDescriptionHtml: navData.siteDescriptionHtml,
     siteFooterHtml: navData.siteFooterHtml,
@@ -141,11 +184,14 @@ export function renderPublicPage(c: Context, options: RenderPublicPageOptions) {
       allSettings[SETTINGS_KEYS.DISCOVERY_SLASH_COMMAND_AT],
     ),
     composeCollectionId,
+    languageSwitcher: languageSwitcher ?? buildLanguageSwitcher(c),
+    composeLanguages: buildComposeLanguages(c),
+    composeContextLanguage: composeContextLanguage ?? getViewLang(c),
   };
   const faviconUrl = appConfig.siteAvatarUrl || undefined;
   const faviconVersion = appConfig.faviconVersion || undefined;
-  const resolvedNoindex = noindex ?? appConfig.noindex;
-
+  // `noindex` is passed straight through: BaseLayout reads the site-wide
+  // setting from this same context and is the single place the two resolve.
   return c.html(
     <BaseLayout
       title={title}
@@ -162,9 +208,11 @@ export function renderPublicPage(c: Context, options: RenderPublicPageOptions) {
       articleModifiedTime={articleModifiedTime}
       jsonLd={jsonLd}
       canonicalHref={canonicalHref}
+      alternateLanguages={alternateLanguages}
+      pageFeed={pageFeed}
       faviconUrl={faviconUrl}
       faviconVersion={faviconVersion}
-      noindex={resolvedNoindex}
+      noindex={noindex}
       isAuthenticated={navData.isAuthenticated}
       toast={toast}
     >