@escape-game-over/atlas 0.1.115 → 0.1.116

package/src/site/create.ts

@@ -2,7 +2,7 @@ import { consentVendors } from "../analytics/index.ts";
 import {
     type LocaleMeta,
     type LocalesOf,
-    mergeLocaleMeta,
+    resolveLocaleMeta,
     type SiteConfigShape,
 } from "../config.ts";
 import {
@@ -21,7 +21,7 @@ import {
     mergeCatalog,
     type OverrideCatalog,
 } from "../i18n/define.ts";
-import { createTranslateFactory } from "../i18n/translate.ts";
+import { createTranslate, type TranslateFor } from "../i18n/translate.ts";
 import type { ImageAsset } from "../image.ts";
 import { buildLlms, type LlmsItem, type LlmsSection } from "../llms.ts";
 import {
@@ -43,11 +43,7 @@ import {
     statusFor,
 } from "../redirects.ts";
 import { buildRobots, type RobotsGroup } from "../robots.ts";
-import type {
-    OrphanSectionPrefixOf,
-    RouteRegistry,
-    SectionPrefixOf,
-} from "../routes/define.ts";
+import type { RouteRegistry, SectionPrefixOf } from "../routes/define.ts";
 import {
     buildPath,
     listRouteEntries,
@@ -122,8 +118,7 @@ export function createSite<
     Published,
     MessagesOf<Cat>,
     ProjectRouteId<Routes, P>,
-    SectionPrefixOf<Routes, P["overrideRoutes"]>,
-    OrphanSectionPrefixOf<Routes, P["overrideRoutes"]>
+    SectionPrefixOf<Routes, P["overrideRoutes"]>
 > {
     // The locales this *project* publishes, from its catalog, not the
     // universe the site config declares: `pathFor("home", "el-GR")` must not
@@ -171,10 +166,10 @@ export function createSite<
     // narrowing inside the closures below, which a property access would not.
     const siteUrl = project.url;
 
-    const localeMeta = mergeLocaleMeta<L>(
+    const localeMeta = resolveLocaleMeta<L>(
         config_.locales as Readonly<Record<L, LocaleMeta>>,
-        project.overrideLocaleMeta,
-        locales
+        locales,
+        catalog.labels
     );
     const fonts = mergeFonts(config_.defaultFonts, project.overrideFonts);
     const pathContext: PathContext<L> = {
@@ -205,7 +200,6 @@ export function createSite<
         catalog.override,
         catalog.add
     );
-    const translateFactory = createTranslateFactory<Full, L>();
 
     const resolved = mergeRoutes<L, Routes>(routes, project.overrideRoutes);
 
@@ -283,9 +277,7 @@ export function createSite<
      * Three callers, and two of them want one string out of it: `robots()` and
      * `llms()` each advertise `entry.url`, so an unmemoised call derived every
      * URL on the site — each with its alternates, each joined to the origin —
-     * three times over to answer a question about a filename. `siteRoutes`
-     * then does the whole thing again on every dev-server request that hits a
-     * generated file.
+     * three times over to answer a question about a filename.
      *
      * Safe to hold because everything it reads is settled before this closure
      * exists: `entries`, `localeMeta` and the origin are fixed for the life of
@@ -783,17 +775,11 @@ export function createSite<
                 options.sectionHeading?.(parent, locale) ??
                 (owner === undefined ? parent : describe(owner, locale).name);
 
-            // The owning page, or the one nominated for a section that has
-            // none. Both may be absent — a family with no index page listed
-            // nowhere else — and the heading is then left unlinked rather than
-            // pointed at a URL this build never wrote.
-            const target = owner ?? options.sectionLink?.(parent, locale);
-
+            // Linked to the owning page; a section with none, a family with no
+            // index page, is left unlinked rather than pointed somewhere else.
             sections.push({
                 heading,
-                ...(target === undefined
-                    ? {}
-                    : { url: urlFor(target, locale) }),
+                ...(owner === undefined ? {} : { url: urlFor(owner, locale) }),
                 items: members.map(item),
             });
         }
@@ -888,7 +874,12 @@ export function createSite<
         translate: <const Values extends string = never>(
             locale: L,
             bind?: { readonly values?: Readonly<Record<Values, string>> }
-        ) => translateFactory<Values>(messages, locale, bind?.values),
+        ): TranslateFor<Full, Values> =>
+            createTranslate({
+                catalog: messages,
+                locale,
+                values: bind?.values,
+            }),
         rich: <
             const Links extends string = never,
             const Values extends string = never,

package/src/site/page.ts

@@ -89,16 +89,7 @@ export interface PageMeta {
  * the trail and had to be handed ids this project actually builds. The trail
  * now arrives finished, so nothing here mentions a route.
  */
-export type PageContent = MetaContent & PageExtras;
-
-/**
- * The two things a document cannot answer about itself.
- *
- * Split out because `MetaContent` is an intersection with a union — an
- * interface cannot extend one — and the union is what stops a page being both
- * an article and something else.
- */
-interface PageExtras {
+export interface PageContent extends MetaContent {
     /**
      * Which page of a paginated list this is, from 1.
      *