@escape-game-over/atlas 0.1.33 → 0.1.35

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@escape-game-over/atlas",
-    "version": "0.1.33",
+    "version": "0.1.35",
     "type": "module",
     "description": "Typed, data-driven machinery for static multi-locale, multi-deployment Astro sites.",
     "private": false,
@@ -54,7 +54,7 @@
         "@biomejs/biome": "2.5.14",
         "@types/node": "26.6.2",
         "@vitest/coverage-istanbul": "5.0.1",
-        "astro": "7.3.4",
+        "astro": "7.3.5",
         "typescript": "6.0.3",
         "vitest": "5.0.1"
     }

package/src/analytics/google.ts

@@ -1,3 +1,4 @@
+import type { NonEmpty } from "../types.ts";
 import { warn } from "../warn.ts";
 import { type AnalyticsTags, literal, preconnect } from "./tags.ts";
 
@@ -129,7 +130,7 @@ export interface GoogleSettings {
      * banner that loads slowly. See `DENIED_BY_DEFAULT` for exactly what the
      * unstated case emits.
      */
-    readonly consent?: readonly [ConsentDefaults, ...ConsentDefaults[]];
+    readonly consent?: NonEmpty<ConsentDefaults>;
 }
 
 /**

package/src/analytics/umami.ts

@@ -1,4 +1,5 @@
 import type { MetaTag } from "../meta/tag.ts";
+import type { NonEmpty } from "../types.ts";
 import { type HttpsUrl, joinUrl, type UrlPath } from "../url.ts";
 import { warn } from "../warn.ts";
 import { preconnect } from "./tags.ts";
@@ -142,7 +143,7 @@ export interface UmamiSettings {
      * `www.` traffic of every site serving both. Stating it is a moment's
      * thought; the alternative is a number that reads low forever.
      */
-    readonly domains: readonly [string, ...string[]];
+    readonly domains: NonEmpty<string>;
     /**
      * Where the collected data is *sent*, if not where the script came from.
      *

package/src/hours.ts

@@ -1,4 +1,4 @@
-import type { Digit } from "./types.ts";
+import type { Digit, NonEmpty } from "./types.ts";
 
 /**
  * When a venue is open, as a week rather than a sentence.
@@ -69,7 +69,7 @@ export interface TimeRange {
  *
  * Several spans cover a venue that shuts for the afternoon.
  */
-export type DayHours = "closed" | readonly [TimeRange, ...TimeRange[]];
+export type DayHours = "closed" | NonEmpty<TimeRange>;
 
 /**
  * The whole week, every day stated.
@@ -83,7 +83,7 @@ export type WeeklyHours = Readonly<Record<Weekday, DayHours>>;
 /** Days that share the same hours, ready to be printed or serialised. */
 export interface HoursGroup {
     /** Every day in the group, in week order. */
-    readonly days: readonly [Weekday, ...Weekday[]];
+    readonly days: NonEmpty<Weekday>;
     /**
      * The same days as consecutive spans: `[["monday", "thursday"],
      * ["sunday", "sunday"]]` is what a footer renders as "Mon–Thu & Sun".

package/src/index.ts

@@ -160,7 +160,8 @@ export {
     type ArticleContent,
     buildMeta,
     buildNotFoundMeta,
-    META_LENGTH_LIMITS,
+    fitDescription,
+    fitTitle,
     type MetaContent,
     type MetaTag,
     type OpenGraphType,
@@ -233,7 +234,7 @@ export type {
     StaticPath,
 } from "./site/index.ts";
 export type { Sitemap, SitemapConfig } from "./sitemap.ts";
-export type { IsoDate, Letter, StringKeys } from "./types.ts";
+export type { IsoDate, Letter, NonEmpty, StringKeys } from "./types.ts";
 export {
     absoluteUrl,
     type Hash,

package/src/jsonld/business.ts

@@ -7,6 +7,7 @@ import {
 } from "../contact.ts";
 import type { WeeklyHours } from "../hours.ts";
 import type { ImageAsset } from "../image.ts";
+import type { NonEmpty } from "../types.ts";
 import { absoluteUrl, type HttpsUrl } from "../url.ts";
 import { businessId, type OrganizationId } from "./ids.ts";
 import { alternateName, type JsonLdNode, schemaType } from "./node.ts";
@@ -126,7 +127,7 @@ export interface LocalBusinessInput {
      * Reference:
      * <https://developers.google.com/search/docs/appearance/structured-data/local-business>
      */
-    readonly type?: string | readonly [string, ...string[]];
+    readonly type?: string | NonEmpty<string>;
     /**
      * Pages elsewhere that are unmistakably this same venue.
      *

package/src/jsonld/quantity.ts

@@ -5,6 +5,7 @@ import {
     quantitiesOf,
     quantityRange,
 } from "../money.ts";
+import type { NonEmpty } from "../types.ts";
 import type { JsonLdNode } from "./node.ts";
 
 /**
@@ -46,7 +47,7 @@ export function quantitativeValue(quantity: Quantity): JsonLdNode {
  * Reference: <https://schema.org/QuantitativeValue>
  */
 export function quantitiesFor(
-    tiers: readonly [PriceTier, ...PriceTier[]]
+    tiers: NonEmpty<PriceTier>
 ): JsonLdNode | readonly JsonLdNode[] {
     return isContiguous(tiers)
         ? quantitativeValue(quantityRange(tiers))

package/src/meta/index.ts

@@ -58,7 +58,8 @@ export type {
 } from "./content.ts";
 export type { RobotsDirective, RobotsPolicy } from "./robots.ts";
 export {
-    META_LENGTH_LIMITS,
+    fitDescription,
+    fitTitle,
     resolveShareImage,
     type ShareImage,
 } from "./share-image.ts";

package/src/meta/share-image.ts

@@ -1,4 +1,5 @@
 import type { ImageAsset } from "../image.ts";
+import type { NonEmpty } from "../types.ts";
 import { absoluteUrl, type HttpsUrl } from "../url.ts";
 import { warn } from "../warn.ts";
 import { link, type MetaTag } from "./tag.ts";
@@ -109,11 +110,8 @@ const NO_PREVIEW_BELOW = 200;
  * the tightest is the one that counts. Facebook's mobile preview is that: a line
  * under it survives everywhere, while a line written to Google's 160 is already
  * clipped in a share. A title is cut far sooner, by the surface people search on.
- *
- * Exported so a site that picks between copy variants fits them to these
- * numbers rather than a copy of them.
  */
-export const META_LENGTH_LIMITS = {
+const LENGTH_LIMITS = {
     title: {
         limit: 60,
         why: "a search result cuts a title around there, and the end of it is usually the part that identifies the page",
@@ -131,16 +129,43 @@ export const META_LENGTH_LIMITS = {
  * nobody notices without being told.
  */
 export function warnIfClipped(
-    field: keyof typeof META_LENGTH_LIMITS,
+    field: keyof typeof LENGTH_LIMITS,
     value: string,
     at: string
 ): void {
-    const { limit, why } = META_LENGTH_LIMITS[field];
+    const { limit, why } = LENGTH_LIMITS[field];
     if (value.length <= limit) return;
 
     warn(at, `${field} is ${value.length} characters, past ~${limit}: ${why}.`);
 }
 
+/**
+ * The first of several wordings, longest first, within the limit. When none
+ * fits, the last one — and `warnIfClipped` reports it once it reaches
+ * `buildMeta`.
+ */
+function firstFitting(
+    field: keyof typeof LENGTH_LIMITS,
+    variants: NonEmpty<string>
+): string {
+    const { limit } = LENGTH_LIMITS[field];
+    // `reduce` to the last, which a non-empty tuple always has; indexing it
+    // would type as possibly undefined.
+    return (
+        variants.find((text) => text.length <= limit) ??
+        variants.reduce((_, text) => text)
+    );
+}
+
+/** A title as the page will print it, suffix included. */
+export function fitTitle(variants: NonEmpty<string>): string {
+    return firstFitting("title", variants);
+}
+
+export function fitDescription(variants: NonEmpty<string>): string {
+    return firstFitting("description", variants);
+}
+
 /**
  * Warns about a share image rather than rejecting it.
  *

package/src/money.ts

@@ -1,3 +1,5 @@
+import type { NonEmpty } from "./types.ts";
+
 /**
  * An ISO 4217 currency code: `"EUR"`, `"RON"`, `"GBP"`.
  *
@@ -230,7 +232,7 @@ export interface TieredPrice {
      * The bands, cheapest quantity first. Never empty — a product with no price
      * at all is an offer of nothing.
      */
-    readonly tiers: readonly [PriceTier, ...PriceTier[]];
+    readonly tiers: NonEmpty<PriceTier>;
     /**
      * What the quantity counts: `"players"`, `"seats"`, `"nights"`.
      *
@@ -259,9 +261,7 @@ export function tierRange(tier: PriceTier): QuantityRange {
  * a caller wants is `formatQuantities` or `quantitiesFor`, which pick between
  * this and `quantitiesOf` by reading the tiers.
  */
-export function quantityRange(
-    tiers: readonly [PriceTier, ...PriceTier[]]
-): QuantityRange {
+export function quantityRange(tiers: NonEmpty<PriceTier>): QuantityRange {
     const first = tierRange(tiers[0]);
     const last = tiers.at(-1);
     return {
@@ -285,9 +285,7 @@ export function quantityRange(
  * different things: a contiguous table is one `QuantitativeValue` with a min and
  * a max, and a table with holes has to enumerate.
  */
-export function quantitiesOf(
-    tiers: readonly [PriceTier, ...PriceTier[]]
-): readonly number[] {
+export function quantitiesOf(tiers: NonEmpty<PriceTier>): readonly number[] {
     const sizes = new Set<number>();
     for (const tier of tiers) {
         const band = tierRange(tier);
@@ -305,9 +303,7 @@ export function quantitiesOf(
  * broken set has to be listed. Derived rather than declared, so it cannot
  * disagree with the tiers it describes.
  */
-export function isContiguous(
-    tiers: readonly [PriceTier, ...PriceTier[]]
-): boolean {
+export function isContiguous(tiers: NonEmpty<PriceTier>): boolean {
     const sizes = quantitiesOf(tiers);
     const first = sizes[0];
     const last = sizes.at(-1);
@@ -335,7 +331,7 @@ export function isContiguous(
  * language and no opinion about dashes.
  */
 export function formatQuantities(
-    tiers: readonly [PriceTier, ...PriceTier[]],
+    tiers: NonEmpty<PriceTier>,
     format: {
         /** Between the ends of a run: `2–6`. */
         readonly between?: string;

package/src/types.ts

@@ -13,6 +13,9 @@
  */
 export type StringKeys<T> = keyof T & string;
 
+/** A list with at least one item, so `list[0]` needs no `undefined` check. */
+export type NonEmpty<T> = readonly [T, ...T[]];
+
 /**
  * `true` when `T` is exactly `never`.
  *