@jant/core 0.6.15 → 0.7.0

package/src/services/export.ts

@@ -27,8 +27,9 @@ import {
   getDefaultJantAppleTouchIconBytes,
   getDefaultJantFaviconIcoBytes,
 } from "../lib/jant-branding.js";
+import { getRootActivityAt } from "../db/thread-activity.js";
 import { tiptapJsonToMarkdown } from "../lib/tiptap-to-markdown.js";
-import { extractBodyText } from "../lib/summary.js";
+import { extractBodyText, extractTimelineSummary } from "../lib/summary.js";
 import { getMediaUrl, getPublicUrlForProvider } from "../lib/image.js";
 import { render as renderMarkdown } from "../lib/markdown.js";
 import { formatRelativeAge, toISOString } from "../lib/time.js";
@@ -84,6 +85,7 @@ import type { StorageDriver } from "../lib/storage.js";
 import { base64ToUint8Array } from "../lib/favicon.js";
 import {
   SYSTEM_NAV_KEYS,
+  isFeedNavKey,
   type Collection,
   type Media,
   type NavItem,
@@ -109,6 +111,10 @@ export interface SiteConfig {
   siteUrl: string;
   siteDescription: string;
   siteLanguage: string;
+  /** Whether the source site serves per-language browsing views. */
+  multilingualEnabled: boolean;
+  /** Non-primary content languages, in switcher order. */
+  additionalLanguages: readonly string[];
   showJantBrandingOnHome: boolean;
   /** Whether anonymous JSON reads are enabled on the source Jant site. */
   publicApiEnabled: boolean;
@@ -116,6 +122,8 @@ export interface SiteConfig {
   rssFeedsEnabled: boolean;
   /** "latest" or "featured" — drives the default RSS nav link in the exported site. */
   mainRssFeed: string;
+  /** "list" or "grid" — the layout the exported archive page opens with. */
+  archiveDefaultLayout: string;
   siteFooter: string;
   showHeaderAvatar: boolean;
   siteAvatarUrl: string;
@@ -136,7 +144,13 @@ export interface SiteConfig {
   sitePathPrefix?: string;
   navItems: Pick<
     NavItem,
-    "type" | "systemKey" | "label" | "url" | "position" | "placement"
+    | "type"
+    | "systemKey"
+    | "label"
+    | "targetTitle"
+    | "url"
+    | "position"
+    | "placement"
   >[];
   /** Items per page for Hugo pagination — kept in sync with the main site's PAGE_SIZE. */
   pageSize: number;
@@ -254,7 +268,10 @@ export function createExportService(
     async generateHugoFiles() {
       const collectionDirectoryDataPromise =
         typeof services.collections.listDirectoryData === "function"
-          ? services.collections.listDirectoryData()
+          ? // The export builds a public static site, so it sees what a
+            // signed-out reader sees. Language narrowing is not applied: the
+            // export walks every language itself.
+            services.collections.listDirectoryData({ isAuthenticated: false })
           : Promise.resolve(null);
 
       // 1. Query all data
@@ -303,14 +320,30 @@ export function createExportService(
         allPosts,
         collectionsByRoot,
       );
-      const exportedCollectionDirectoryItems =
-        buildExportedCollectionDirectoryItems(
-          collectionDirectoryData?.items ??
-            allCollections.map((collection) => ({
-              id: collection.id,
+      // Smart collections are left out of a static export. Their membership is
+      // a query, and the exported site has no database to run it against, so
+      // the honest options are "omit" or "freeze today's matches under a name
+      // that promises to keep updating". Round-tripping them is out of scope
+      // (see the smart collections design notes); omitting is what that
+      // decision means here.
+      const exportableDirectoryItems: ExportCollectionDirectorySourceItem[] =
+        collectionDirectoryData?.items
+          ? collectionDirectoryData.items
+              .filter((item) => item.type !== "smart_collection")
+              .map((item) => ({
+                type: item.type as "collection" | "divider" | "link",
+                label: item.label,
+                url: item.url,
+                description: item.description,
+                collection: item.collection,
+              }))
+          : allCollections.map((collection) => ({
               type: "collection" as const,
               collection,
-            })),
+            }));
+      const exportedCollectionDirectoryItems =
+        buildExportedCollectionDirectoryItems(
+          exportableDirectoryItems,
           collectionSlugMap,
           collectionMetrics,
         );
@@ -396,13 +429,28 @@ export function createExportService(
       const usedSlugs = new Set<string>();
       for (const s of slugMap.values()) usedSlugs.add(s);
       for (const s of collectionSlugMap.values()) usedSlugs.add(s);
-      if (!usedSlugs.has("featured")) {
+      const hasFeaturedSection = !usedSlugs.has("featured");
+      if (hasFeaturedSection) {
         exportFiles.push({
           path: "content/featured/_index.md",
           content: await buildFeaturedSection(siteConfig.rssFeedsEnabled),
         });
       }
 
+      // Feed subscribers are the one audience the export can lose silently:
+      // their reader polls a `/feed` address that this site does not serve.
+      // With feeds off there is nothing to redirect to, and the live site had
+      // no feeds to have been subscribed to either.
+      if (siteConfig.rssFeedsEnabled) {
+        exportFiles.push({
+          path: "static/_redirects",
+          content: buildFeedRedirects(
+            siteConfig.mainRssFeed,
+            hasFeaturedSection,
+          ),
+        });
+      }
+
       // Single data file consumed by templates via `hugo.Data.jant`. The
       // collection directory lives on the same object as `directory` so
       // everything Jant owns round-trips in one place.
@@ -545,7 +593,7 @@ export function createExportService(
 
       exportFiles.push({
         path: "README.md",
-        content: buildReadme(siteConfig.siteName),
+        content: buildReadme(siteConfig, hasFeaturedSection),
       });
       exportFiles.push({
         path: ".gitignore",
@@ -675,6 +723,25 @@ function buildExportedCollectionEntriesForThread(
   return resolved;
 }
 
+/**
+ * Whether the site's timeline cuts this post's text short.
+ *
+ * Shares the boundary with the served feed rather than approximating it: Hugo
+ * has its own summary rule and would cut somewhere else, so the answer is
+ * computed here and carried as front matter.
+ *
+ * @param post - The post being exported
+ * @returns true when the timeline shows less than the post's page
+ * @example
+ * isPostTruncated(longArticle); // true
+ */
+function isPostTruncated(post: Post): boolean {
+  return (
+    extractTimelineSummary(post.body, !!post.title, { namespace: post.id })
+      ?.hasMore === true
+  );
+}
+
 function collectionEntriesToRefs(
   entries: readonly ExportedCollectionEntry[],
 ): HugoCollectionRef[] {
@@ -885,7 +952,13 @@ async function buildThreadBundle(
     format: root.format,
     status: root.status,
     visibility: root.visibility,
+    // Language is Thread-uniform, so only the root emits it; the importer
+    // re-derives replies from their root. `translation_group` is an opaque
+    // shared key — importing the whole site keeps translated posts linked.
+    language: root.language ?? undefined,
+    translation_group: root.translationGroupId ?? undefined,
     summary_text: getArchiveSummaryText(root) ?? undefined,
+    truncated: isPostTruncated(root) || undefined,
     link_url: root.format === "link" && root.url ? root.url : undefined,
     source_name: root.format === "quote" && root.title ? root.title : undefined,
     source_url: root.format === "quote" && root.url ? root.url : undefined,
@@ -968,12 +1041,14 @@ async function buildThreadBundle(
       status: reply.status,
       visibility: reply.visibility,
       summary_text: getArchiveSummaryText(reply) ?? undefined,
+      truncated: isPostTruncated(reply) || undefined,
       link_url: reply.format === "link" && reply.url ? reply.url : undefined,
       source_name:
         reply.format === "quote" && reply.title ? reply.title : undefined,
       source_url: reply.format === "quote" && reply.url ? reply.url : undefined,
       quote_text: reply.quoteText ?? undefined,
       rating: reply.rating ?? undefined,
+      quiet_reply: reply.quietReply ? true : undefined,
       featured_at:
         reply.featuredAt !== null ? toISOString(reply.featuredAt) : undefined,
       pinned_at:
@@ -1326,11 +1401,7 @@ function buildExportedCollectionMetrics(
       continue;
     }
 
-    const activityAt =
-      post.lastActivityAt ??
-      post.publishedAt ??
-      post.updatedAt ??
-      post.createdAt;
+    const activityAt = getRootActivityAt(post);
     const threadCollections = collectionsByThread.get(post.id) ?? [];
 
     for (const collection of threadCollections) {
@@ -1358,13 +1429,21 @@ function buildExportedCollectionMetrics(
 // Nav item resolution
 // ---------------------------------------------------------------------------
 
+/**
+ * Label to bake into the static site.
+ *
+ * Mirrors `getNavItemDisplayLabel`: a stored label is the author's own words
+ * and wins, an empty one means the item follows what it points at. The export
+ * has no i18n runtime, so built-in destinations fall back to their English
+ * default rather than a translated one.
+ */
 function resolveNavItemLabel(item: SiteConfig["navItems"][number]): string {
   if (item.label) return item.label;
   if (item.systemKey) {
     const definition = SYSTEM_NAV_KEYS[item.systemKey as SystemNavKey];
     if (definition) return definition.defaultLabel;
   }
-  return item.label;
+  return item.targetTitle?.trim() || item.label;
 }
 
 /**
@@ -1391,7 +1470,10 @@ function resolveNavItemUrl(
   }
   if (item.systemKey === "collections") return "/collections/";
   if (item.systemKey === "archive") return "/archive/";
-  if (item.systemKey === "rss") {
+  // `subscribe` addresses a Jant route, and the exported site has no page at
+  // it. Rather than exporting a nav entry that 404s, it resolves to the feed
+  // that page would have recommended — the same file `rss` points at.
+  if (item.systemKey === "rss" || item.systemKey === "subscribe") {
     return mainRssFeed === "featured" ? "/featured/index.xml" : "/index.xml";
   }
   return item.url;
@@ -1470,6 +1552,7 @@ function buildHugoToml(config: SiteConfig): string {
     "[params]",
     `  description = "${escapeTomlString(config.siteDescription)}"`,
     `  main_rss_feed = "${escapeTomlString(config.mainRssFeed)}"`,
+    `  archive_default_layout = "${escapeTomlString(config.archiveDefaultLayout)}"`,
     `  public_api_enabled = ${config.publicApiEnabled}`,
     `  rss_feeds_enabled = ${config.rssFeedsEnabled}`,
     `  show_jant_branding_on_home = ${config.showJantBrandingOnHome}`,
@@ -1512,7 +1595,10 @@ function buildJantDataToml(
     `site_name = "${escapeTomlString(config.siteName)}"`,
     `site_description = "${escapeTomlString(config.siteDescription)}"`,
     `site_language = "${escapeTomlString(config.siteLanguage)}"`,
+    `multilingual_enabled = ${config.multilingualEnabled}`,
+    `additional_languages = "${escapeTomlString(config.additionalLanguages.join(","))}"`,
     `main_rss_feed = "${escapeTomlString(config.mainRssFeed)}"`,
+    `archive_default_layout = "${escapeTomlString(config.archiveDefaultLayout)}"`,
     `public_api_enabled = ${config.publicApiEnabled}`,
     `rss_feeds_enabled = ${config.rssFeedsEnabled}`,
     `show_jant_branding_on_home = ${config.showJantBrandingOnHome}`,
@@ -1552,10 +1638,12 @@ function buildJantDataToml(
     // `settings` is authenticated-only and has no corresponding page in the
     // static Hugo site — drop it at export time so it never shows up in nav.
     if (item.systemKey === "settings") continue;
+    // Both feed entries resolve to a feed file, so with feeds off both would
+    // export a link to something that was never written.
     if (
       !config.rssFeedsEnabled &&
       item.type === "system" &&
-      item.systemKey === "rss"
+      isFeedNavKey(item.systemKey)
     ) {
       continue;
     }
@@ -1616,9 +1704,95 @@ function buildJantDataToml(
 }
 
 // ---------------------------------------------------------------------------
-// README + .gitignore
+// README + .gitignore + _redirects
 // ---------------------------------------------------------------------------
 
+/**
+ * Build the `static/_redirects` file that keeps existing feed subscribers
+ * working after the site moves to this export.
+ *
+ * Jant serves its feeds under `/feed` (`/feed`, `/latest/feed`,
+ * `/featured/feed`, `/archive/feed`, `/{collection}/feed`); Hugo serves the
+ * same documents as `index.xml` inside each section. The two namespaces do
+ * not overlap, so every subscriber's saved address 404s the moment the
+ * exported site goes up.
+ *
+ * Hugo's `aliases:` mechanism cannot cover this the way it covers post URLs:
+ * an alias page is a meta-refresh plus a script, and feed readers fetch and
+ * parse XML without running either. Only an HTTP redirect reaches them, which
+ * is host configuration rather than Hugo output — so the export emits the one
+ * format two common static hosts read verbatim (Cloudflare Pages and Netlify).
+ * Hosts that do not read `_redirects` ignore the file; the README carries the
+ * rule for them to translate.
+ *
+ * @param mainRssFeed - The site's main feed setting, "latest" or "featured".
+ * @param hasFeaturedSection - Whether the export emitted a featured section.
+ *   It is skipped when a post or collection already owns the `featured` slug,
+ *   and pointing a redirect at a feed that was never built would turn a live
+ *   subscription into a 404 rather than leaving it merely stale.
+ * @returns The `_redirects` file body.
+ * @example
+ * buildFeedRedirects("latest", true); // "# ...\n/feed  /index.xml  301\n..."
+ */
+function buildFeedRedirects(
+  mainRssFeed: string,
+  hasFeaturedSection: boolean,
+): string {
+  const LATEST = "/index.xml";
+  const FEATURED = "/featured/index.xml";
+  // `/feed` follows the site's main-feed setting, mirroring `renderMainFeed`.
+  // Without a featured section there is nothing to point it at, so it falls
+  // back to the latest feed: a wider feed than the reader subscribed to, but
+  // a live one.
+  const main =
+    mainRssFeed === "featured" && hasFeaturedSection ? FEATURED : LATEST;
+  const featured = hasFeaturedSection ? FEATURED : LATEST;
+
+  const rules: [string, string][] = [
+    ["/feed", main],
+    ["/latest/feed", LATEST],
+    ["/featured/feed", featured],
+    ["/archive/feed", "/archive/index.xml"],
+  ];
+  const legacy: [string, string][] = [
+    ["/feed/latest", LATEST],
+    ["/feed/all", LATEST],
+    ["/feed/featured", featured],
+    ["/feed/atom.xml", main],
+    ["/feed/latest/atom.xml", LATEST],
+    ["/feed/all/atom.xml", LATEST],
+    ["/feed/featured/atom.xml", featured],
+  ];
+
+  // The format only needs whitespace between the columns; padding to the
+  // widest source path keeps the file readable for whoever has to translate
+  // it into another host's redirect syntax.
+  const width = Math.max(
+    ...[...rules, ...legacy].map(([from]) => from.length),
+    "/:slug/feed".length,
+  );
+  const line = ([from, to]: [string, string]) =>
+    `${from.padEnd(width)}  ${to}  301`;
+
+  return `# Feed addresses moved in this export.
+#
+# Jant served its feeds under /feed; Hugo serves them as index.xml inside each
+# section. Cloudflare Pages and Netlify read this file and issue the redirects
+# below, so readers who subscribed to the old addresses keep receiving posts.
+# Other hosts ignore this file — see README.md for the same rules to translate
+# into your host's configuration.
+
+${rules.map(line).join("\n")}
+
+# Aliases the live site answered with a 308. They would die at the same moment.
+${legacy.map(line).join("\n")}
+
+# Collection feeds, by slug. Collections are the only root-level sections that
+# emit Atom, so any other slug 404s here exactly as it did on the live site.
+${line(["/:slug/feed", "/:slug/index.xml"])}
+`;
+}
+
 function buildGitignore(): string {
   return `# Hugo build output
 public/
@@ -1636,7 +1810,90 @@ Thumbs.db
 `;
 }
 
-function buildReadme(siteName: string): string {
+/**
+ * Render a two-column Markdown table with padded cells.
+ *
+ * The values differ per site, so building the rows by hand would leave the
+ * committed README ragged for some exports and aligned for others.
+ *
+ * @param headers - The two column headers.
+ * @param rows - Cell pairs; each cell is wrapped in backticks.
+ * @returns The table as Markdown, without a trailing newline.
+ * @example
+ * renderMarkdownTable(["Jant", "This export"], [["/feed", "/index.xml"]]);
+ */
+function renderMarkdownTable(
+  headers: [string, string],
+  rows: [string, string][],
+): string {
+  const cells = rows.map(
+    ([from, to]) => [`\`${from}\``, `\`${to}\``] as [string, string],
+  );
+  const widths: [number, number] = [
+    Math.max(headers[0].length, ...cells.map((r) => r[0].length)),
+    Math.max(headers[1].length, ...cells.map((r) => r[1].length)),
+  ];
+  const line = (a: string, b: string) =>
+    `| ${a.padEnd(widths[0])} | ${b.padEnd(widths[1])} |`;
+  return [
+    line(headers[0], headers[1]),
+    `| ${"-".repeat(widths[0])} | ${"-".repeat(widths[1])} |`,
+    ...cells.map((r) => line(r[0], r[1])),
+  ].join("\n");
+}
+
+/**
+ * Build the export's README.
+ *
+ * @param config - The exported site's configuration.
+ * @param hasFeaturedSection - Whether a featured section was emitted, which
+ *   decides where the feed redirects point.
+ * @returns Markdown for `README.md` at the root of the export.
+ * @example
+ * buildReadme(config, true); // "# My Site — Hugo Export\n..."
+ */
+function buildReadme(config: SiteConfig, hasFeaturedSection: boolean): string {
+  const siteName = config.siteName;
+  const featuredFeed = hasFeaturedSection
+    ? "/featured/index.xml"
+    : "/index.xml";
+  const mainFeed =
+    config.mainRssFeed === "featured" ? featuredFeed : "/index.xml";
+  // Nothing to say about feeds on a site that publishes none, and no
+  // `_redirects` file was written for it either.
+  const staticListing = config.rssFeedsEnabled
+    ? "\n  _redirects              — Feed redirects (see Feeds above)"
+    : "";
+  // The Notes list below says post URLs survive the move. Left alone, that
+  // reads as a promise about every URL, and feed addresses are the exception.
+  const feedNote = config.rssFeedsEnabled
+    ? "\n- Feed addresses are the exception: they move to `index.xml` and stay reachable only through `static/_redirects`. See [Feeds](#feeds)."
+    : "";
+  // Nothing to say about feeds on a site that publishes none, and no
+  // `_redirects` file was written for it either.
+  const feedRows: [string, string][] = [
+    ["/feed", mainFeed],
+    ["/latest/feed", "/index.xml"],
+    ["/featured/feed", featuredFeed],
+    ["/archive/feed", "/archive/index.xml"],
+    ["/{collection}/feed", "/{collection}/index.xml"],
+  ];
+  const feedTable = renderMarkdownTable(["Jant", "This export"], feedRows);
+  const feedsSection = config.rssFeedsEnabled
+    ? `## Feeds
+
+The feed addresses changed. Jant served them under \`/feed\`; Hugo serves them as \`index.xml\` inside each section:
+
+${feedTable}
+
+A reader who is already subscribed holds one of the old addresses, and a feed reader that gets a 404 stops delivering posts. \`static/_redirects\` maps every old address to its new one with a 301. Cloudflare Pages and Netlify read that file as published; on any other host, translate its rules into that host's redirect configuration before you point the domain here.
+
+Hugo's \`aliases:\` cannot cover this. An alias page redirects with a meta refresh and a script, and feed readers fetch XML without running either — only an HTTP redirect reaches them.
+
+The **Subscribe** entry in the site navigation points at \`${mainFeed}\`. The exported site has no \`/subscribe\` page; that page belongs to the Jant runtime.
+
+`
+    : "";
   return `# ${siteName} — Hugo Export
 
 This is a static site exported from [Jant](https://github.com/jant-me/jant), ready to build with [Hugo](https://gohugo.io/).
@@ -1681,7 +1938,7 @@ hugo --minify
 
 The output goes to the \`public/\` directory. Upload it to any static host (Netlify, Vercel, Cloudflare Pages, GitHub Pages, etc.).
 
-## Project structure
+${feedsSection}## Project structure
 
 \`\`\`
 hugo.toml                 — Site configuration (baseURL, title, theme, params)
@@ -1697,7 +1954,7 @@ content/
 data/
   jant.toml               — Nav items, branding, display preferences, ordered collections directory
 themes/jant/              — Bundled Hugo theme (overrideable via layouts/ at the site root)
-static/                   — Copy files here to add them to the published site
+static/                   — Copy files here to add them to the published site${staticListing}
 \`\`\`
 
 ## Customizing
@@ -1723,7 +1980,7 @@ Safe to re-run; files already on disk are reused. Anything that fails to downloa
 ## Notes
 
 - Each thread is a Hugo branch bundle. Replies live as nested leaf bundles with \`build.render = "never"\` so they do not produce standalone URLs; they render inside the thread page.
-- \`/{reply-slug}/\` URLs are preserved via \`aliases:\` on the root post, so old links still land on the right thread anchor.
+- \`/{reply-slug}/\` URLs are preserved via \`aliases:\` on the root post, so old links still land on the right thread anchor.${feedNote}
 - Media is emitted under \`static/media/{id}.ext\` and referenced from a flat \`media:\` array on each post. When a storage provider has a configured public URL (R2/S3/local proxy), the exporter links to the provider URL instead of re-bundling the bytes.
 - Posts with \`draft: true\` in front matter are only built when you pass \`--buildDrafts\` to \`hugo\` / \`hugo serve\`.
 `;

package/src/services/index.ts

@@ -21,6 +21,10 @@ import {
   createCollectionService,
   type CollectionService,
 } from "./collection.js";
+import {
+  createSmartCollectionService,
+  type SmartCollectionService,
+} from "./smart-collection.js";
 import { createSearchService, type SearchService } from "./search.js";
 import { createNavItemService, type NavItemService } from "./navigation.js";
 import { createAuthService, type AuthService } from "./auth.js";
@@ -36,6 +40,7 @@ import {
   type SiteProfileService,
 } from "./site-profile.js";
 import { createAboutPageService, type AboutPageService } from "./about-page.js";
+import { createLanguageService, type LanguageService } from "./language.js";
 import {
   createUploadSessionService,
   type UploadSessionService,
@@ -57,6 +62,7 @@ export interface Services {
   media: MediaService;
   uploads: UploadSessionService;
   collections: CollectionService;
+  smartCollections: SmartCollectionService;
   search: SearchService;
   navItems: NavItemService;
   auth: AuthService;
@@ -66,6 +72,7 @@ export interface Services {
   siteMembers: SiteMemberService;
   siteProfile: SiteProfileService;
   aboutPage: AboutPageService;
+  language: LanguageService;
   githubAppInstallations: GitHubAppInstallationsService;
   telegram: TelegramService;
 }
@@ -82,6 +89,8 @@ export function createServices(
     siteResolutionMode?: "single-site" | "host-based";
     enforceHostedMediaQuota?: boolean;
     hostedControlPlane?: HostedControlPlaneClient | null;
+    /** Signing key for derived tokens, e.g. the account-deletion CSRF token. */
+    authSecret?: string;
   },
 ): Services {
   const databaseSchema = config?.schema ?? sqliteSchemaBundle;
@@ -89,7 +98,7 @@ export function createServices(
   const site = createSiteService(db, databaseSchema);
   const settings = createSettingsService(db, siteId, databaseSchema, dialect);
   const paths = createPathService(db, siteId, databaseSchema);
-  const navItems = createNavItemService(db, siteId, databaseSchema);
+  const navItems = createNavItemService(db, siteId, databaseSchema, paths);
   const posts = createPostService(
     db,
     {
@@ -100,12 +109,21 @@ export function createServices(
     paths,
     databaseSchema,
   );
+  const smartCollections = createSmartCollectionService(
+    db,
+    siteId,
+    paths,
+    posts,
+    databaseSchema,
+    config?.slugIdLength ?? 5,
+  );
   const collections = createCollectionService(
     db,
     siteId,
     paths,
     databaseSchema,
     dialect,
+    smartCollections,
   );
   const media = createMediaService(db, siteId, databaseSchema, dialect, {
     enforceHostedQuota: config?.enforceHostedMediaQuota ?? false,
@@ -121,6 +139,7 @@ export function createServices(
     media,
     uploads: createUploadSessionService(db, siteId, media, databaseSchema),
     collections,
+    smartCollections,
     search: createSearchService(rawQuery, siteId, dialect),
     navItems,
     auth: createAuthService(
@@ -128,13 +147,16 @@ export function createServices(
       settings,
       {
         databaseDialect: dialect,
+        authSecret: config?.authSecret,
       },
       databaseSchema,
     ),
     apiTokens: createApiTokenService(db, siteId, databaseSchema),
-    bootstrap: createBootstrapService(db, {
+    bootstrap: createBootstrapService(db, siteId, {
       schema: databaseSchema,
+      databaseDialect: dialect,
       bootstrapSite: config?.bootstrapSite,
+      siteResolutionMode: config?.siteResolutionMode,
     }),
     siteAdmin: createSiteAdminService(db, databaseSchema, dialect, {
       siteResolutionMode: config?.siteResolutionMode,
@@ -156,7 +178,9 @@ export function createServices(
       paths,
       posts,
       collections,
+      smartCollections,
     }),
+    language: createLanguageService({ settings, posts, paths }),
     githubAppInstallations: createGitHubAppInstallationsService(
       db,
       databaseSchema,
@@ -170,17 +194,24 @@ export type { SiteService } from "./site.js";
 export type { PathService } from "./path.js";
 export type { PostService, PostFilters, PostDeleteDeps } from "./post.js";
 export type { CustomUrlService } from "./custom-url.js";
+export type {
+  SmartCollectionService,
+  SmartCollectionViewer,
+} from "./smart-collection.js";
 export type { MediaService, MediaFilters } from "./media.js";
 export type { UploadSessionService } from "./upload-session.js";
 export type { CollectionService } from "./collection.js";
 export type { SearchService, SearchResult, SearchOptions } from "./search.js";
 export type { NavItemService } from "./navigation.js";
 export type { AboutPageService, AboutPageStatus } from "./about-page.js";
+export type { LanguageService, LanguageState } from "./language.js";
 export type { AuthService, DeleteAccountDeps } from "./auth.js";
 export type { ApiTokenService } from "./api-token.js";
 export type {
   BootstrapService,
-  CompleteInitialSetupData,
+  CompleteSiteSetupData,
+  CompleteSiteSetupDeps,
+  ProvisionOwnerAccountData,
 } from "./bootstrap.js";
 export type { SiteMemberService } from "./site-member.js";
 export type { SiteProfileService } from "./site-profile.js";