@escape-game-over/atlas 0.1.115 → 0.1.116

package/src/jsonld/organization.ts

@@ -8,7 +8,7 @@ import type { ImageAsset } from "../image.ts";
 import type { IsoDate } from "../types.ts";
 import { absoluteUrl, type HttpsUrl, joinUrl, type UrlPath } from "../url.ts";
 import { organizationId } from "./ids.ts";
-import { alternateName, type JsonLdNode } from "./node.ts";
+import { alternateName, type JsonLdNode, listed } from "./node.ts";
 import { postalAddress } from "./place.ts";
 
 export interface OrganizationInput {
@@ -172,36 +172,27 @@ export function organization(brand: OrganizationInput): JsonLdNode {
         "@id": organizationId(brand.url),
         name: brand.name,
         url: brand.url,
-        ...alternateName(brand.name, brand.alternateName),
-        ...(brand.description === undefined
-            ? {}
-            : { description: brand.description }),
-        ...(brand.foundingDate === undefined
-            ? {}
-            : { foundingDate: brand.foundingDate }),
-        ...(brand.logo === undefined
-            ? {}
-            : { logo: joinUrl(brand.url, brand.logo) }),
-        ...(brand.image === undefined || brand.image.length === 0
-            ? {}
-            : {
-                  image: brand.image.map((photo) =>
-                      absoluteUrl(brand.url, photo.src, "organization photo")
-                  ),
-              }),
-        ...(brand.legalName === undefined
-            ? {}
-            : { legalName: brand.legalName }),
-        ...(brand.vatID === undefined ? {} : { vatID: brand.vatID }),
+        alternateName: alternateName(brand.name, brand.alternateName),
+        description: brand.description,
+        foundingDate: brand.foundingDate,
+        logo:
+            brand.logo === undefined
+                ? undefined
+                : joinUrl(brand.url, brand.logo),
+        image: listed(brand.image)?.map((photo) =>
+            absoluteUrl(brand.url, photo.src, "organization photo")
+        ),
+        legalName: brand.legalName,
+        vatID: brand.vatID,
         // E.164, as on the business: the only form that identifies a number
         // unambiguously enough to match a company against a listing.
-        ...(brand.telephone === undefined
-            ? {}
-            : { telephone: e164(brand.telephone) }),
-        ...(brand.email === undefined ? {} : { email: brand.email }),
-        ...(brand.sameAs === undefined ? {} : { sameAs: brand.sameAs }),
-        ...(brand.address === undefined
-            ? {}
-            : { address: postalAddress(brand.address) }),
+        telephone:
+            brand.telephone === undefined ? undefined : e164(brand.telephone),
+        email: brand.email,
+        sameAs: brand.sameAs,
+        address:
+            brand.address === undefined
+                ? undefined
+                : postalAddress(brand.address),
     };
 }

package/src/jsonld/place.ts

@@ -37,13 +37,9 @@ export function postalAddress(address: PostalAddress): JsonLdNode {
         "@type": "PostalAddress",
         streetAddress: address.street,
         addressLocality: address.locality,
-        ...(address.postalCode === undefined
-            ? {}
-            : { postalCode: address.postalCode }),
+        postalCode: address.postalCode,
         addressCountry: address.country,
-        ...(address.region === undefined
-            ? {}
-            : { addressRegion: address.region }),
+        addressRegion: address.region,
     };
 }
 

package/src/jsonld/product.ts

@@ -11,7 +11,7 @@ import {
 import type { NonEmpty } from "../types.ts";
 import type { HttpsUrl } from "../url.ts";
 import type { BusinessId, OrganizationId } from "./ids.ts";
-import { type JsonLdNode, schemaType } from "./node.ts";
+import { type JsonLdNode, reference, schemaType } from "./node.ts";
 import { quantitativeValue } from "./quantity.ts";
 
 export interface ProductInput {
@@ -91,7 +91,7 @@ export function product(item: ProductInput): JsonLdNode {
         name: item.name,
         description: item.description,
         url: item.url,
-        ...(item.image === undefined ? {} : { image: item.image }),
+        image: item.image,
         offers: offersFor(item),
     };
 }
@@ -116,30 +116,24 @@ function offerFor(
         "@type": "Offer",
         // An `Offer` is a `Thing`, so it can carry a `name`; it is what tells
         // the adults' price from the children's.
-        ...(name === undefined ? {} : { name }),
+        name,
         price: amount,
         priceCurrency: item.price.currency,
         availability: "https://schema.org/InStock",
         url: item.url,
-        ...(band === undefined
-            ? {}
-            : {
-                  // What makes two prices a table rather than a contradiction:
-                  // each one says the quantity it applies at.
-                  //
-                  // The quantity is passed as written, not through `tierRange`:
-                  // the two take the same `number | { min, max }`, and widening
-                  // first would publish a band of one as `minValue: 2,
-                  // maxValue: 2` — a range across a single size, where `value:
-                  // 2` is the same claim said plainly.
-                  eligibleQuantity: {
-                      ...quantitativeValue(band.quantity),
-                      ...(unit === undefined ? {} : { unitText: unit }),
-                  },
-              }),
-        ...(item.seller === undefined
-            ? {}
-            : { seller: { "@id": item.seller } }),
+        // What makes two prices a table rather than a contradiction:
+        // each one says the quantity it applies at.
+        //
+        // The quantity is passed as written, not through `tierRange`:
+        // the two take the same `number | { min, max }`, and widening
+        // first would publish a band of one as `minValue: 2,
+        // maxValue: 2` — a range across a single size, where `value:
+        // 2` is the same claim said plainly.
+        eligibleQuantity:
+            band === undefined
+                ? undefined
+                : { ...quantitativeValue(band.quantity), unitText: unit },
+        seller: reference(item.seller),
     };
 }
 

package/src/jsonld/service.ts

@@ -1,7 +1,7 @@
 import type { HttpsUrl } from "../url.ts";
 import type { BusinessId, OrganizationId } from "./ids.ts";
 import { serviceId } from "./ids.ts";
-import type { JsonLdNode } from "./node.ts";
+import { type JsonLdNode, listed, reference } from "./node.ts";
 
 /**
  * What a business *does*, for the sites that sell work rather than tickets.
@@ -82,29 +82,23 @@ export interface ServiceInput {
 }
 
 /** An `Audience` node, or nothing. See `ServiceInput.audience`. */
-function audienceFor(audienceType: string | undefined): {
-    readonly audience?: JsonLdNode;
-} {
+function audienceFor(audienceType: string | undefined): JsonLdNode | undefined {
     return audienceType === undefined
-        ? {}
-        : { audience: { "@type": "Audience", audienceType } };
+        ? undefined
+        : { "@type": "Audience", audienceType };
 }
 
 /** `areaServed`, as `Place` nodes. See `ServiceArea`. */
-function areasFor(areas: readonly ServiceArea[] | undefined): {
-    readonly areaServed?: readonly JsonLdNode[];
-} {
+function areasFor(
+    areas: readonly ServiceArea[] | undefined
+): readonly JsonLdNode[] | undefined {
     // Length rather than presence: a service that serves nowhere in particular
     // says nothing, and an empty list is a claim to have been asked and had no
     // answer.
-    if (areas === undefined || areas.length === 0) return {};
-
-    return {
-        areaServed: areas.map((area) => ({
-            "@type": area.kind ?? "AdministrativeArea",
-            name: area.name,
-        })),
-    };
+    return listed(areas)?.map((area) => ({
+        "@type": area.kind ?? "AdministrativeArea",
+        name: area.name,
+    }));
 }
 
 /**
@@ -118,17 +112,11 @@ export function service(input: ServiceInput): JsonLdNode {
         "@id": serviceId(input.url),
         name: input.name,
         url: input.url,
-        ...(input.description === undefined
-            ? {}
-            : { description: input.description }),
-        ...(input.serviceType === undefined
-            ? {}
-            : { serviceType: input.serviceType }),
-        ...(input.provider === undefined
-            ? {}
-            : { provider: { "@id": input.provider } }),
-        ...audienceFor(input.audience),
-        ...areasFor(input.areaServed),
+        description: input.description,
+        serviceType: input.serviceType,
+        provider: reference(input.provider),
+        audience: audienceFor(input.audience),
+        areaServed: areasFor(input.areaServed),
     };
 }
 
@@ -212,9 +200,7 @@ export function offerCatalog(input: OfferCatalogInput): JsonLdNode {
     return {
         "@type": "OfferCatalog",
         name: input.name,
-        ...(input.description === undefined
-            ? {}
-            : { description: input.description }),
+        description: input.description,
         // Unconditional: this is the node's only link to anything.
         provider: { "@id": input.provider },
         itemListElement: input.entries.map((entry) => ({
@@ -224,13 +210,11 @@ export function offerCatalog(input: OfferCatalogInput): JsonLdNode {
                 // The id only where there is a page to hang it on. A fragment
                 // invented for an entry with no page would be an identity for
                 // something nothing else can ever refer to.
-                ...(entry.url === undefined
-                    ? {}
-                    : { "@id": serviceId(entry.url), url: entry.url }),
+                "@id":
+                    entry.url === undefined ? undefined : serviceId(entry.url),
+                url: entry.url,
                 name: entry.name,
-                ...(entry.description === undefined
-                    ? {}
-                    : { description: entry.description }),
+                description: entry.description,
             },
         })),
     };

package/src/jsonld/video.ts

@@ -227,13 +227,9 @@ export function videoObject(video: VideoInput): JsonLdNode {
             )
         ),
         uploadDate: video.uploadDate,
-        ...(video.description === undefined
-            ? {}
-            : { description: video.description }),
-        ...(duration === undefined ? {} : { duration }),
-        ...(video.contentUrl === undefined
-            ? {}
-            : { contentUrl: video.contentUrl }),
-        ...(video.embedUrl === undefined ? {} : { embedUrl: video.embedUrl }),
+        description: video.description,
+        duration,
+        contentUrl: video.contentUrl,
+        embedUrl: video.embedUrl,
     };
 }

package/src/jsonld/website.ts

@@ -1,6 +1,6 @@
 import type { HttpsUrl } from "../url.ts";
 import { type OrganizationId, websiteId } from "./ids.ts";
-import { alternateName, type JsonLdNode } from "./node.ts";
+import { alternateName, type JsonLdNode, reference } from "./node.ts";
 
 export interface WebsiteInput {
     /**
@@ -50,9 +50,7 @@ export function website(site: WebsiteInput): JsonLdNode {
         "@id": websiteId(site.url),
         name: site.name,
         url: site.url,
-        ...alternateName(site.name, site.alternateName),
-        ...(site.publisher === undefined
-            ? {}
-            : { publisher: { "@id": site.publisher } }),
+        alternateName: alternateName(site.name, site.alternateName),
+        publisher: reference(site.publisher),
     };
 }

package/src/meta/content.ts

@@ -9,32 +9,9 @@ import type { RobotsPolicy } from "./robots.ts";
 import type { ShareImage } from "./share-image.ts";
 
 /**
- * What only a consumer can supply: a page's words, and what kind of thing it is.
+ * What only a consumer can supply: a page's words, and whether it is an article.
  */
 
-/**
- * What kind of thing a page represents, for `og:type`.
- *
- * The whole vocabulary Open Graph defines, and a union for the reason
- * `RobotsDirective` is one: it is small and closed, and a value outside it is
- * not an error anywhere — a scraper that does not recognise `og:type` falls
- * back to `website` and renders a perfectly ordinary card. So `"artcile"` costs
- * you the article treatment and looks exactly like success.
- *
- * `website` is the default and the right answer for most pages. `article` is
- * the one that earns anything extra: it is what tells a scraper this is a dated
- * piece of writing rather than a section of the site.
- *
- * Reference: <https://ogp.me/#types>
- */
-export type OpenGraphType =
-    | "website"
-    | "article"
-    | "book"
-    | "profile"
-    | `music.${"song" | "album" | "playlist" | "radio_station"}`
-    | `video.${"movie" | "episode" | "tv_show" | "other"}`;
-
 /**
  * A page that is a dated piece of writing, said once.
  *
@@ -48,10 +25,11 @@ export type OpenGraphType =
  * Supplying this is what emits the `Article` node, `og:type: article` and the
  * `article:*` properties together. They are three statements of one fact, and a
  * page that could make them separately is a page that could make two of them.
- * That is why `MetaContent.type` cannot be set to `"article"`: saying a page is
- * an article without saying when it was published is the half-statement this
- * exists to prevent, and it is also the half that carries no benefit — the date
- * is the whole reason the type is worth claiming.
+ * That is why there is no `type` to set: saying a page is an article without
+ * saying when it was published is the half-statement this exists to prevent.
+ * Open Graph's other kinds (`book`, `profile`, `video.*`) each come with fields
+ * of their own; one would be added the same way, as a field that is the
+ * description, with the two made exclusive then.
  */
 export interface ArticleContent {
     /**
@@ -99,34 +77,8 @@ export interface ArticleContent {
     readonly images?: readonly ImageAsset[];
 }
 
-/**
- * What kind of page this is: an ordinary one, or an article.
- *
- * A union rather than two optional fields, so the pair cannot both be set. They
- * answer the same question — `article` decides `og:type` — and a page that
- * supplied both would have one of them silently ignored, which is the shape of
- * mistake this folder keeps removing rather than reporting.
- *
- * Both branches allow the fields to be absent, so an ordinary page writes
- * neither and gets `website`.
- */
-export type PageKind =
-    | {
-          readonly type?: Exclude<OpenGraphType, "article">;
-          readonly article?: never;
-      }
-    | {
-          readonly type?: never;
-          /**
-           * This page's publication details, if it is a dated piece of writing.
-           *
-           * One field, three outputs — see `ArticleContent`.
-           */
-          readonly article: ArticleContent;
-      };
-
-/** The fields every page has, whatever kind it is. */
-export interface MetaContentBase {
+/** What a page passes to `metaFor`: its words, its picture, and whether it is an article. */
+export interface MetaContent {
     readonly title: string;
     /**
      * Required: a page without a description leaves search engines and every
@@ -172,18 +124,14 @@ export interface MetaContentBase {
      * and never sees the page they end up on.
      */
     readonly jsonLd?: readonly JsonLdNode[];
+    /**
+     * This page's publication details, if it is a dated piece of writing:
+     * `og:type` becomes `article`, with its `article:*` properties and an
+     * `Article` node. Without it a page is a `website`. See `ArticleContent`.
+     */
+    readonly article?: ArticleContent;
 }
 
-/**
- * What a page passes to `metaFor`: its words, its picture, and what kind of
- * thing it is.
- *
- * An intersection rather than one interface because `PageKind` is a union, and
- * that union is the whole point — see it for why `type` and `article` cannot
- * both be written.
- */
-export type MetaContent = MetaContentBase & PageKind;
-
 /** Browser-UI tint. A single colour, or one per `prefers-color-scheme`. */
 export type ThemeColor =
     | string

package/src/meta/index.ts

@@ -37,7 +37,7 @@ import {
     serializeJsonLd,
 } from "../jsonld/index.ts";
 import type { HttpsUrl } from "../url.ts";
-import type { MetaContentBase, PageKind, ThemeColor } from "./content.ts";
+import type { MetaContent, ThemeColor } from "./content.ts";
 import { robotsContent, warnAboutRobots } from "./robots.ts";
 import {
     type OgImage,
@@ -47,13 +47,7 @@ import {
 import { link, type MetaTag, meta, preamble } from "./tag.ts";
 import { type SiteVerification, verificationTags } from "./verification.ts";
 
-export type {
-    ArticleContent,
-    MetaContent,
-    OpenGraphType,
-    PageKind,
-    ThemeColor,
-} from "./content.ts";
+export type { ArticleContent, MetaContent, ThemeColor } from "./content.ts";
 export type { RobotsDirective, RobotsPolicy } from "./robots.ts";
 export {
     fitDescription,
@@ -66,15 +60,8 @@ export {
 export type { MetaTag } from "./tag.ts";
 export type { SiteVerification } from "./verification.ts";
 
-/**
- * Everything the head needs: what the page supplies, plus what lib derives.
- *
- * `PageKind` is intersected rather than inherited so that `Omit` applies to the
- * base alone: omitting a key from a union would flatten it and lose the
- * exclusivity that union exists for.
- */
-export type MetaInput<L extends string> = Omit<MetaContentBase, "image"> &
-    PageKind &
+/** Everything the head needs: what the page supplies, plus what lib derives. */
+export type MetaInput<L extends string> = Omit<MetaContent, "image"> &
     MetaInputDerived<L>;
 
 interface MetaInputDerived<L extends string> extends ChromeInput {
@@ -90,14 +77,9 @@ interface MetaInputDerived<L extends string> extends ChromeInput {
     /** The share image, already resolved against the site origin. */
     readonly image: OgImage;
     /**
-     * `ArticleContent.images`, already resolved against the site origin.
-     *
-     * A sibling of `article` rather than a field inside it, because `PageKind`
-     * is a union and `Omit` on a union flattens it — which is the whole reason
-     * `MetaInput` intersects that union separately instead of omitting through
-     * it. So the resolved form arrives beside the page's own, exactly as
-     * `image` does: a page states `ShareImage`, lib hands `buildMeta` an
-     * `OgImage`.
+     * `ArticleContent.images`, already resolved against the site origin: the
+     * page states its crops, as it states `image`, and lib hands `buildMeta`
+     * their absolute URLs beside them.
      */
     readonly articleImages?: readonly HttpsUrl[];
     /**
@@ -288,16 +270,12 @@ export function buildMeta<L extends string>(input: MetaInput<L>): DocumentTags {
 
     // Open Graph
     //
-    // The type follows the content rather than being stated beside it: a page
-    // that described an article and called itself a website would be two claims
-    // about one thing, and only one of them could be right.
+    // The type follows the content rather than being stated beside it: an
+    // article is a page that describes one.
     tags.push(
         meta({
             property: "og:type",
-            content:
-                input.article === undefined
-                    ? (input.type ?? "website")
-                    : "article",
+            content: input.article === undefined ? "website" : "article",
         })
     );
     tags.push(meta({ property: "og:title", content: input.title }));

package/src/project.ts

@@ -1,6 +1,5 @@
 import type { AnalyticsSettings } from "./analytics/index.ts";
 import type {
-    LocaleMetaOverride,
     LocaleNotEnabled,
     LocalesOf,
     RoutingConfig,
@@ -131,10 +130,6 @@ export interface ProjectInput<L extends string, Routes> {
      * reads like the whole truth when it is only a patch.
      */
     readonly overrideRouting?: Partial<RoutingConfig<L>>;
-    /** Restates a locale's label. Its writing direction is not overridable. */
-    readonly overrideLocaleMeta?: Readonly<
-        Partial<Record<L, LocaleMetaOverride>>
-    >;
     /** Adds to the site's `defaultFonts`, or replaces one by key. */
     readonly overrideFonts?: Fonts;
     /**
@@ -237,8 +232,9 @@ export type ProjectChecks<
         // Against the published locales rather than the site's list: a
         // segment spelled for a language this deployment does not
         // publish is a word that appears in no URL it builds. Mapped
-        // over the keys written, for the reason `overrideLocaleMeta`
-        // below is.
+        // over the keys written: `T` is inferred from the literal, so a
+        // stray key just becomes part of `T` and there is no fresh object
+        // for excess-property checking to fire on.
         readonly pageSegmentByLocale?: {
             readonly [K in StringKeys<
                 NonNullable<T["overrideRouting"]>["pageSegmentByLocale"]
@@ -249,18 +245,8 @@ export type ProjectChecks<
         T["overrideRoutes"],
         StringKeys<Routes>
     >;
-    // Nested, so that `dir` is rejected inside each locale's entry.
-    // Declaring the field as `Pick<LocaleMeta, "label">` is not enough:
-    // `T` is *inferred* from the literal, so a stray `dir` just becomes
-    // part of `T` and there is no fresh object for excess-property
-    // checking to fire on.
-    readonly overrideLocaleMeta?: {
-        readonly [K in StringKeys<T["overrideLocaleMeta"]>]: K extends Published
-            ? NoExcessKeys<T["overrideLocaleMeta"][K], keyof LocaleMetaOverride>
-            : LocaleNotEnabled<K>;
-    };
     // The clock's locales must be ones this project publishes, as for
-    // `overrideLocaleMeta` above. That every one it publishes is there is
+    // `pageSegmentByLocale` above. That every one it publishes is there is
     // checked in `ProjectOverrideChecks`: a conditional on `T` here would make
     // the constraint circular.
     readonly formats?: {

package/src/routes/define.ts

@@ -353,19 +353,6 @@ export type SectionPrefixOf<Routes, Overrides> = FirstSegment<
     EnabledSlugs<Routes, Overrides>
 >;
 
-/**
- * The sections with no page of their own — a prefix that heads a group but is
- * not itself a slug anything is published at.
- *
- * These are the only sections whose link a consumer may choose. Where an index
- * page exists it is the answer, and offering a second one would invite a
- * heading that points somewhere other than the page it names.
- */
-export type OrphanSectionPrefixOf<Routes, Overrides> = Exclude<
-    SectionPrefixOf<Routes, Overrides>,
-    EnabledSlugs<Routes, Overrides>
->;
-
 /**
  * The route ids that survive a given override map, computed from literal types.
  *

package/src/site/api.ts

@@ -51,7 +51,6 @@ export interface LlmsOptions<
     RouteId extends string,
     L extends string,
     Prefix extends string = string,
-    OrphanPrefix extends string = Prefix,
 > {
     /**
      * This route's name and one-line summary, in the file's language.
@@ -88,21 +87,6 @@ export interface LlmsOptions<
      * comparison that quietly never matches and leaves the default in place.
      */
     sectionHeading?(prefix: Prefix, locale: L): string | undefined;
-    /**
-     * Where a section with no index page should link.
-     *
-     * Separate from the heading because it is an enrichment rather than half of
-     * one decision: a section can be renamed without being linked, and linked
-     * without being renamed.
-     *
-     * Only sections that *have* no page of their own are offered. Where an index
-     * page exists it is already the link, and `OrphanPrefix` excludes it — so
-     * pointing a named family somewhere other than the page it is named after is
-     * a compile error rather than a choice. Returning `undefined` leaves the
-     * heading unlinked, which is the right answer when those pages are listed
-     * nowhere else.
-     */
-    sectionLink?(prefix: OrphanPrefix, locale: L): RouteId | undefined;
     /** The `>` block under the title: what this site is, in a sentence or two. */
     readonly summary?: string;
     /**
@@ -132,8 +116,6 @@ export interface Site<
      * be, and no annotation should have to state it.
      */
     Prefix extends string = string,
-    /** Of those, the ones with no index page of their own. */
-    OrphanPrefix extends string = Prefix,
 > {
     readonly locales: readonly L[];
     readonly defaultLocale: L;
@@ -356,9 +338,7 @@ export interface Site<
      * the first time a route is switched off or a slug is retranslated, and
      * nothing reports it, because nothing reads the file during a build.
      */
-    llms(
-        options?: LlmsOptions<RouteId, L, Prefix, OrphanPrefix>
-    ): GeneratedFile;
+    llms(options?: LlmsOptions<RouteId, L, Prefix>): GeneratedFile;
 
     /**
      * Old URLs that must keep working, resolved — for `siteRoutes()` only.