@jant/core 0.6.15 → 0.7.0

package/src/routes/pages/collection.tsx

@@ -5,9 +5,8 @@
 import { Hono, type Context } from "hono";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../types/app-context.js";
-import { requireAuth } from "../../middleware/auth.js";
 import { CollectionPage } from "../../ui/pages/CollectionPage.js";
-import { CollectionEditorPage } from "../../ui/pages/CollectionEditorPage.js";
+import type { CollectionPageProps } from "../../types.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { formatPageLabel, parsePageNumber } from "../../lib/pagination.js";
 import { buildPageTitle } from "../../lib/page-title.js";
@@ -20,14 +19,24 @@ import {
 import { assembleCollectionTimeline } from "../../lib/timeline.js";
 import { defaultFeedRenderer } from "../../lib/feed.js";
 import {
+  buildFeedDiscoveryFields,
   getFeedEntryUpdatedAt,
+  getFeedLimit,
   getRssPublishedBefore,
-  RSS_FEED_CACHE_CONTROL,
+  renderFeed,
 } from "../../lib/feed-policy.js";
 import { toPlainText as markdownToPlainText } from "../../lib/markdown.js";
 import { buildMediaMap } from "../../lib/media-helpers.js";
 import { createMediaContext, toPostViews } from "../../lib/view.js";
-import { toAbsoluteSiteUrl, toPublicPath } from "../../lib/url.js";
+import { toAbsoluteSiteUrl } from "../../lib/url.js";
+import {
+  buildLanguageSwitcher,
+  buildSurfaceAlternates,
+  getViewLang,
+  toViewPath,
+  viewBasePath,
+} from "../../lib/view-language.js";
+import { getOrBuildEntry } from "../../i18n/supported-locales.js";
 import {
   getCollectionPagePath,
   getCollectionSelectionFeedPath,
@@ -58,52 +67,6 @@ function buildCollectionSelectionTitle(
   return collections.map((collection) => collection.title).join(" + ");
 }
 
-function resolveReturnHref(
-  value: string | undefined,
-  fallback: string,
-): string {
-  if (!value || !value.startsWith("/") || value.startsWith("//")) {
-    return fallback;
-  }
-
-  return value;
-}
-
-collectionRoutes.use("/:slug/edit", requireAuth());
-
-collectionRoutes.get("/:slug/edit", async (c) => {
-  const slug = c.req.param("slug");
-  if (isAggregateCollectionSelection(slug)) return c.notFound();
-
-  const [collection, navData] = await Promise.all([
-    c.var.services.collections.getBySlug(slug),
-    getNavigationData(c),
-  ]);
-  if (!collection) return c.notFound();
-
-  const defaultReturnHref = toPublicPath(
-    getCollectionPagePath(collection.slug),
-    navData.sitePathPrefix,
-  );
-  const cancelHref = resolveReturnHref(
-    c.req.query("returnTo"),
-    defaultReturnHref,
-  );
-
-  return renderPublicPage(c, {
-    title: buildPageTitle("Edit", collection.title, navData.siteName),
-    navData,
-    content: (
-      <CollectionEditorPage
-        mode="edit"
-        collection={collection}
-        cancelHref={cancelHref}
-        sitePathPrefix={navData.sitePathPrefix}
-      />
-    ),
-  });
-});
-
 /**
  * Render a collection selection page. Used by root-level single-collection
  * paths, collection aliases resolved through the path registry, and aggregate
@@ -133,10 +96,7 @@ export async function renderCollectionPage(
   // Only redirect for slug normalization when using the derived canonical path
   if (!pagePathOverride && slugExpression !== selection.slugExpression) {
     const search = new URL(c.req.url).search;
-    return c.redirect(
-      toPublicPath(`${canonicalPagePath}${search}`, navData.sitePathPrefix),
-      301,
-    );
+    return c.redirect(`${toViewPath(c, canonicalPagePath)}${search}`, 301);
   }
 
   const sortQuery = c.req.query("sort");
@@ -192,6 +152,34 @@ export async function renderCollectionPage(
     i18n,
   );
 
+  // An empty page in one language is only a dead end if the reader cannot see
+  // that the collection has something in another. The extra count runs only
+  // when this view came up empty.
+  const viewLang = getViewLang(c);
+  let emptyInLanguage: CollectionPageProps["emptyInLanguage"];
+  if (totalThreadCount === 0 && viewLang) {
+    const acrossLanguages =
+      await c.var.services.posts.countCollectionThreadRootsForCollections(
+        collectionIds,
+        { status: "published", excludePrivate: !navData.isAuthenticated },
+      );
+    if (acrossLanguages > 0) {
+      const alternatives = buildLanguageSwitcher(c, {
+        fallbackPath: canonicalPagePath,
+      }).filter((option) => !option.isCurrent);
+      if (alternatives.length > 0) {
+        emptyInLanguage = {
+          languageLabel: getOrBuildEntry(viewLang).native,
+          alternatives,
+        };
+      }
+    }
+  }
+
+  const feedHref = c.var.appConfig.rssFeedsEnabled
+    ? `${canonicalPagePath}/feed`
+    : undefined;
+
   return renderPublicPage(c, {
     title:
       page > 1
@@ -202,6 +190,10 @@ export async function renderCollectionPage(
       : primaryCollection.description
         ? markdownToPlainText(primaryCollection.description)
         : undefined,
+    alternateLanguages: buildSurfaceAlternates(c),
+    pageFeed: feedHref
+      ? { href: toViewPath(c, feedHref), title: selectionTitle }
+      : undefined,
     navData,
     composeCollectionId: !isAggregate ? primaryCollection.id : undefined,
     content: (
@@ -214,11 +206,8 @@ export async function renderCollectionPage(
         pagePath={canonicalPagePath}
         baseUrl={
           currentSort === defaultSort
-            ? toPublicPath(canonicalPagePath, navData.sitePathPrefix)
-            : toPublicPath(
-                `${canonicalPagePath}?sort=${currentSort}`,
-                navData.sitePathPrefix,
-              )
+            ? toViewPath(c, canonicalPagePath)
+            : toViewPath(c, `${canonicalPagePath}?sort=${currentSort}`)
         }
         currentSort={currentSort}
         defaultSort={defaultSort}
@@ -230,11 +219,9 @@ export async function renderCollectionPage(
             item.collectionId === primaryCollection.id,
         )}
         sitePathPrefix={navData.sitePathPrefix}
-        feedHref={
-          c.var.appConfig.rssFeedsEnabled
-            ? `${canonicalPagePath}/feed`
-            : undefined
-        }
+        basePath={navData.basePath}
+        emptyInLanguage={emptyInLanguage}
+        feedHref={feedHref}
       />
     ),
   });
@@ -255,20 +242,15 @@ export async function renderCollectionFeed(
 
   if (!feedPathOverride && slugExpression !== selection.slugExpression) {
     const search = new URL(c.req.url).search;
-    return c.redirect(
-      toPublicPath(
-        `${canonicalFeedPath}${search}`,
-        c.var.appConfig.sitePathPrefix,
-      ),
-      301,
-    );
+    return c.redirect(`${toViewPath(c, canonicalFeedPath)}${search}`, 301);
   }
 
   const { appConfig } = c.var;
   const siteName = appConfig.siteName;
   const siteUrl = appConfig.siteUrl;
-  const siteLanguage = appConfig.siteLanguage;
-  const feedLimit = appConfig.rssFeedLimit;
+  // A language view's feed is that language's feed, so it declares it.
+  const siteLanguage = getViewLang(c) ?? appConfig.siteLanguage;
+  const feedLimit = getFeedLimit(c);
   const publishedBefore = getRssPublishedBefore(
     appConfig.rssPublishDelaySeconds,
   );
@@ -281,6 +263,7 @@ export async function renderCollectionFeed(
       {
         status: "published",
         excludePrivate: true,
+        lang: getViewLang(c) ?? undefined,
         ignoreCollectionPinnedSort: true,
         publishedBefore,
         limit: feedLimit,
@@ -377,14 +360,19 @@ export async function renderCollectionFeed(
   );
 
   const xml = defaultFeedRenderer({
-    siteName: buildPageTitle(selectionTitle, siteName),
+    ...buildFeedDiscoveryFields(c),
+    siteName,
+    // Site name first, like every other feed: a reader's sidebar sorts by
+    // feed title, so leading with the collection would scatter one site's
+    // feeds across the alphabet.
+    title: buildPageTitle(siteName, selectionTitle),
     siteDescription:
       selection.collections.length === 1 && primaryCollection.description
         ? markdownToPlainText(primaryCollection.description)
         : "",
     siteUrl,
     selfUrl: toAbsoluteSiteUrl(
-      canonicalFeedPath,
+      `${viewBasePath(c)}${canonicalFeedPath}`,
       siteUrl,
       appConfig.sitePathPrefix,
     ),
@@ -392,17 +380,23 @@ export async function renderCollectionFeed(
     posts: postViews,
   });
 
-  return new Response(xml, {
-    headers: {
-      "Content-Type": "application/atom+xml; charset=utf-8",
-      "Cache-Control": RSS_FEED_CACHE_CONTROL,
-    },
-  });
+  return renderFeed(xml);
 }
 
-collectionRoutes.get("/:slug", async (c) => {
+/**
+ * Serve `/collections/{expression}` — the aggregate selection page.
+ *
+ * A single slug does not live here; it shares the root namespace with posts,
+ * so it is redirected to its canonical root-level address.
+ *
+ * @param c - Hono context
+ * @returns Collection page, a redirect, or 404
+ */
+export async function renderCollectionSelectionRoute(
+  c: Context<Env>,
+): Promise<Response> {
   const slugExpression = c.req.param("slug");
-  const sitePathPrefix = c.var.appConfig.sitePathPrefix;
+  if (!slugExpression) return c.notFound();
 
   if (!isAggregateCollectionSelection(slugExpression)) {
     const collection =
@@ -411,22 +405,26 @@ collectionRoutes.get("/:slug", async (c) => {
 
     const search = new URL(c.req.url).search;
     return c.redirect(
-      toPublicPath(
-        `${getCollectionPagePath(collection.slug)}${search}`,
-        sitePathPrefix,
-      ),
+      `${toViewPath(c, getCollectionPagePath(collection.slug))}${search}`,
       301,
     );
   }
 
   const result = await renderCollectionPage(c, slugExpression);
   return result ?? c.notFound();
-});
+}
 
-// Collection RSS feed
-collectionRoutes.get("/:slug/feed", async (c) => {
+/**
+ * Serve `/collections/{expression}/feed` — the aggregate selection's feed.
+ *
+ * @param c - Hono context
+ * @returns Atom feed, a redirect, or 404
+ */
+export async function renderCollectionSelectionFeedRoute(
+  c: Context<Env>,
+): Promise<Response> {
   const slugExpression = c.req.param("slug");
-  const sitePathPrefix = c.var.appConfig.sitePathPrefix;
+  if (!slugExpression) return c.notFound();
 
   if (!isAggregateCollectionSelection(slugExpression)) {
     const collection =
@@ -435,14 +433,14 @@ collectionRoutes.get("/:slug/feed", async (c) => {
 
     const search = new URL(c.req.url).search;
     return c.redirect(
-      toPublicPath(
-        `${getCollectionSelectionFeedPath(collection.slug)}${search}`,
-        sitePathPrefix,
-      ),
+      `${toViewPath(c, getCollectionSelectionFeedPath(collection.slug))}${search}`,
       301,
     );
   }
 
   const result = await renderCollectionFeed(c, slugExpression);
   return result ?? c.notFound();
-});
+}
+
+collectionRoutes.get("/:slug", renderCollectionSelectionRoute);
+collectionRoutes.get("/:slug/feed", renderCollectionSelectionFeedRoute);

package/src/routes/pages/collections.tsx

@@ -5,79 +5,67 @@
  */
 
 import { Hono } from "hono";
+import type { Context } from "hono";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../types/app-context.js";
-import { requireAuth } from "../../middleware/auth.js";
-import { getCollectionsDirectoryPath } from "../../lib/collection-paths.js";
-import { getNavigationData } from "../../lib/navigation.js";
+import {
+  collectNavigationCollectionIds,
+  getNavigationData,
+} from "../../lib/navigation.js";
 import { buildPageTitle } from "../../lib/page-title.js";
 import { renderPublicPage } from "../../lib/render.js";
-import { toPublicPath } from "../../lib/url.js";
-import { CollectionEditorPage } from "../../ui/pages/CollectionEditorPage.js";
+import {
+  buildSurfaceAlternates,
+  getViewLang,
+} from "../../lib/view-language.js";
 import { CollectionsPage } from "../../ui/pages/CollectionsPage.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
 export const collectionsPageRoutes = new Hono<Env>();
 
-function resolveReturnHref(
-  value: string | undefined,
-  fallback: string,
-): string {
-  if (!value || !value.startsWith("/") || value.startsWith("//")) {
-    return fallback;
-  }
-
-  return value;
-}
-
-collectionsPageRoutes.use("/new", requireAuth());
-
-collectionsPageRoutes.get("/new", async (c) => {
-  const navData = await getNavigationData(c);
-  const defaultReturnHref = toPublicPath(
-    getCollectionsDirectoryPath(),
-    navData.sitePathPrefix,
-  );
-  const cancelHref = resolveReturnHref(
-    c.req.query("returnTo"),
-    defaultReturnHref,
-  );
-
-  return renderPublicPage(c, {
-    title: buildPageTitle("New Collection", navData.siteName),
-    navData,
-    content: (
-      <CollectionEditorPage
-        mode="create"
-        cancelHref={cancelHref}
-        sitePathPrefix={navData.sitePathPrefix}
-      />
-    ),
-  });
-});
-
-collectionsPageRoutes.get("/", async (c) => {
+/**
+ * Render the collections directory.
+ *
+ * The directory itself is site skeleton: every collection is listed in every
+ * language view, because a collection that is empty in one language is still
+ * part of how the site is organized. Only its links carry the view prefix.
+ *
+ * @param c - Hono context
+ * @returns Collections directory response
+ */
+export async function renderCollectionsDirectory(
+  c: Context<Env>,
+): Promise<Response> {
+  // The numbers have to match the collection pages these rows link to, so they
+  // carry this reader's visibility and this view's language. Both come from the
+  // request rather than from `navData` — `navData.isAuthenticated` is
+  // `c.var.isAuthenticated` verbatim — so the two round trips stay parallel on
+  // the widest page under `/collections`.
   const [directoryData, navData] = await Promise.all([
-    c.var.services.collections.listDirectoryData(),
+    c.var.services.collections.listDirectoryData({
+      isAuthenticated: c.var.isAuthenticated,
+      lang: getViewLang(c) ?? undefined,
+    }),
     getNavigationData(c),
   ]);
 
   return renderPublicPage(c, {
     title: buildPageTitle("Collections", navData.siteName),
+    alternateLanguages: buildSurfaceAlternates(c),
     navData,
     content: (
       <CollectionsPage
         items={directoryData.items}
         isAuthenticated={navData.isAuthenticated ?? false}
-        navigationCollectionIds={navData.links.flatMap((item) =>
-          item.type === "collection" && item.collectionId
-            ? [item.collectionId]
-            : [],
-        )}
+        navigationCollectionIds={collectNavigationCollectionIds(navData.links)}
         sitePathPrefix={navData.sitePathPrefix}
+        basePath={navData.basePath}
         siteOrigin={c.var.appConfig.siteOrigin}
+        feedsEnabled={c.var.appConfig.rssFeedsEnabled}
       />
     ),
   });
-});
+}
+
+collectionsPageRoutes.get("/", renderCollectionsDirectory);

package/src/routes/pages/featured.tsx

@@ -5,6 +5,7 @@
  */
 
 import { Hono } from "hono";
+import type { Context } from "hono";
 import { msg } from "@lingui/core/macro";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../types/app-context.js";
@@ -14,16 +15,23 @@ import { formatPageLabel, parsePageNumber } from "../../lib/pagination.js";
 import { buildPageTitle } from "../../lib/page-title.js";
 import { renderPublicPage } from "../../lib/render.js";
 import { assembleFeaturedTimeline } from "../../lib/timeline.js";
-import { toPublicPath } from "../../lib/url.js";
+import { buildSurfaceAlternates, toViewPath } from "../../lib/view-language.js";
 import { defaultFeedRenderer } from "../../lib/feed.js";
-import { buildFeedData, renderFeed } from "../feed/feed.js";
+import { renderFeed } from "../../lib/feed-policy.js";
+import { buildFeedData } from "../feed/feed.js";
 import { FeaturedPage } from "../../ui/pages/FeaturedPage.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
 export const featuredRoutes = new Hono<Env>();
 
-featuredRoutes.get("/", async (c) => {
+/**
+ * Render the featured timeline for the current view language.
+ *
+ * @param c - Hono context
+ * @returns Featured page response
+ */
+export async function renderFeaturedPage(c: Context<Env>): Promise<Response> {
   const navData = await getNavigationData(c);
   const i18n = getI18n(c);
 
@@ -45,29 +53,40 @@ featuredRoutes.get("/", async (c) => {
       page > 1
         ? buildPageTitle(featuredTitle, paginatedPageTitle, navData.siteName)
         : buildPageTitle(featuredTitle, navData.siteName),
+    alternateLanguages: buildSurfaceAlternates(c),
     navData,
     content: (
       <FeaturedPage
         items={items}
         currentPage={currentPage}
         totalPages={totalPages}
-        baseUrl={toPublicPath("/featured", navData.sitePathPrefix)}
+        baseUrl={toViewPath(c, "/featured")}
       />
     ),
   });
-});
+}
 
-// Atom — /featured/feed (canonical featured feed)
-featuredRoutes.get("/feed", async (c) => {
+featuredRoutes.get("/", renderFeaturedPage);
+
+/**
+ * Render the featured Atom feed for the current view language.
+ *
+ * @param c - Hono context
+ * @returns Atom feed response
+ */
+export async function renderFeaturedFeed(c: Context<Env>): Promise<Response> {
   const feedData = await buildFeedData(c, {
     kind: "featured",
     selfPath: "/featured/feed",
   });
   return renderFeed(defaultFeedRenderer(feedData));
-});
+}
 
-// Legacy atom.xml suffix → canonical /featured/feed
-featuredRoutes.get("/feed/atom.xml", (c) => {
-  const sitePathPrefix = c.var.appConfig.sitePathPrefix;
-  return c.redirect(toPublicPath("/featured/feed", sitePathPrefix), 308);
-});
+/** Legacy atom.xml suffix → canonical /featured/feed, inside the same view. */
+export function redirectLegacyFeaturedFeed(c: Context<Env>): Response {
+  return c.redirect(toViewPath(c, "/featured/feed"), 308);
+}
+
+// Atom — /featured/feed (canonical featured feed)
+featuredRoutes.get("/feed", renderFeaturedFeed);
+featuredRoutes.get("/feed/atom.xml", redirectLegacyFeaturedFeed);

package/src/routes/pages/home.tsx

@@ -6,6 +6,7 @@
  */
 
 import { Hono } from "hono";
+import type { Context } from "hono";
 import { msg } from "@lingui/core/macro";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../types/app-context.js";
@@ -16,6 +17,11 @@ import { buildPageTitle } from "../../lib/page-title.js";
 import { renderPublicPage } from "../../lib/render.js";
 import { assembleTimeline } from "../../lib/timeline.js";
 import { toAbsoluteSiteUrl, toPublicPath } from "../../lib/url.js";
+import {
+  buildSurfaceAlternates,
+  toViewPath,
+  viewBasePath,
+} from "../../lib/view-language.js";
 import { buildWebSiteJsonLd } from "../../lib/structured-data.js";
 import { HomePage } from "../../ui/pages/HomePage.js";
 
@@ -23,7 +29,13 @@ type Env = { Bindings: Bindings; Variables: AppVariables };
 
 export const homeRoutes = new Hono<Env>();
 
-homeRoutes.get("/", async (c) => {
+/**
+ * Render the timeline home page for the current view language.
+ *
+ * @param c - Hono context
+ * @returns Home page response
+ */
+export async function renderHomePage(c: Context<Env>): Promise<Response> {
   const i18n = getI18n(c);
   const page = parsePageNumber(c.req.query("page"));
   const paginatedPageTitle = formatPageLabel(page);
@@ -46,9 +58,13 @@ homeRoutes.get("/", async (c) => {
     page === 1 && siteUrl
       ? buildWebSiteJsonLd({
           name: navData.siteName,
-          url: toAbsoluteSiteUrl("/", siteUrl, navData.sitePathPrefix),
+          url: toAbsoluteSiteUrl(
+            viewBasePath(c) || "/",
+            siteUrl,
+            navData.sitePathPrefix,
+          ),
           searchUrlTemplate: `${toAbsoluteSiteUrl(
-            "/search",
+            `${viewBasePath(c)}/search`,
             siteUrl,
             navData.sitePathPrefix,
           )}?q={search_term_string}`,
@@ -68,18 +84,21 @@ homeRoutes.get("/", async (c) => {
         ? buildPageTitle(latestTitle, paginatedPageTitle, navData.siteName)
         : navData.siteName,
     jsonLd: websiteJsonLd,
+    alternateLanguages: buildSurfaceAlternates(c),
     navData,
     showHomeBranding:
       c.var.appConfig.showJantBrandingOnHome && currentPage === 1,
     content: (
       <HomePage
         items={items}
-        baseUrl={toPublicPath("/", navData.sitePathPrefix)}
+        baseUrl={toViewPath(c, "/")}
         currentPage={currentPage}
         totalPages={totalPages}
         isAuthenticated={isAuthenticated}
-        signinUrl={`${toPublicPath("/signin", navData.sitePathPrefix)}?redirect=${encodeURIComponent(toPublicPath("/", navData.sitePathPrefix))}`}
+        signinUrl={`${toPublicPath("/signin", navData.sitePathPrefix)}?redirect=${encodeURIComponent(toViewPath(c, "/"))}`}
       />
     ),
   });
-});
+}
+
+homeRoutes.get("/", renderHomePage);