@escape-game-over/atlas 0.1.99 → 0.1.101

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@escape-game-over/atlas",
-    "version": "0.1.99",
+    "version": "0.1.101",
     "type": "module",
     "description": "Typed, data-driven machinery for static multi-locale, multi-deployment Astro sites.",
     "private": false,

package/src/astro/client.ts

@@ -10,8 +10,11 @@
  */
 
 export {
+    formatTime,
+    type HourCycle,
     type OpenStatus,
     openStatus,
+    type TimeFormat,
     type VenueNow,
 } from "../hours.ts";
 export * from "./attribution.ts";

package/src/contact-form.ts

@@ -28,8 +28,10 @@ export type ContactFormType =
     | "birthday_party"
     | "board_games"
     | "group_booking"
+    | "school_trips"
     | "team_building"
-    | "voucher";
+    | "voucher"
+    | "vr_games";
 
 /** Where a deployment's contact mail goes. */
 export interface MailEndpoint {

package/src/hours.ts

@@ -164,6 +164,13 @@ export function groupHours(
     return [...groups.values()];
 }
 
+/**
+ * Which clock times print on: `"h23"` as written (`14:00`), `"h12"` on a
+ * 12-hour clock (`2:00 PM`). Never the locale's default, which gives Greek a
+ * 12-hour clock nobody there uses on a door.
+ */
+export type HourCycle = "h12" | "h23";
+
 /**
  * How to print a week. Day names come from `Intl` in `locale`; "closed" is
  * copy, so the caller translates it.
@@ -175,12 +182,8 @@ export interface HoursFormat {
     weekday?: "short" | "long";
     /** The word for a day the venue is shut. */
     closed: string;
-    /**
-     * Times print as written (`14:00`) unless this is `"h12"` (`2:00 PM`).
-     * Not the locale's default, which gives Greek a 12-hour clock nobody there
-     * uses on a door.
-     */
-    hourCycle?: "h12";
+    /** As written (`"h23"`) when absent. */
+    hourCycle?: HourCycle;
     /** Between the ends of a span: `Mon–Thu`, `14:00–23:30`. */
     between?: string;
     /** Between spans: `Mon–Thu, Sun`. */
@@ -226,17 +229,41 @@ export function formatHours(
     }));
 }
 
+/** How to say a week in a sentence: `HoursFormat` without its separators. */
+export type HoursSentenceFormat = Omit<HoursFormat, "and">;
+
 /**
- * How to say a week in a sentence: `HoursFormat` without the separators it
- * picks from `Intl`, plus the one `Intl` has no word for.
+ * Each language's semicolon, between one group of days and the next. `Intl`
+ * has no list form for it, and it is punctuation rather than copy, so it lives
+ * here. A language missing from this table throws rather than borrowing the
+ * English one: add it here.
  */
-export interface HoursSentenceFormat extends Omit<HoursFormat, "and"> {
-    /**
-     * Between one group of days and the next: `"; "` in English, `"؛ "` in
-     * Arabic. Copy, so the caller translates it; `Intl` has no list form
-     * for it.
-     */
-    readonly separator: string;
+const SEMICOLONS: Readonly<Record<string, string>> = {
+    ar: "؛ ",
+    de: "; ",
+    el: "· ",
+    en: "; ",
+    es: "; ",
+    // A narrow no-break space before it, as French sets it.
+    fr: "\u202F; ",
+    hu: "; ",
+    it: "; ",
+    pt: "; ",
+    ru: "; ",
+    sv: "; ",
+};
+
+function semicolonFor(locale: string): string {
+    const { language } = new Intl.Locale(locale);
+    const semicolon = Object.hasOwn(SEMICOLONS, language)
+        ? SEMICOLONS[language]
+        : undefined;
+    if (semicolon === undefined) {
+        throw new Error(
+            `hoursSentence has no semicolon for "${language}" (${locale}). Add it to SEMICOLONS in hours.ts.`
+        );
+    }
+    return semicolon;
 }
 
 /**
@@ -245,13 +272,15 @@ export interface HoursSentenceFormat extends Omit<HoursFormat, "and"> {
  *
  * Days and times join with the locale's own "and" (`Intl.ListFormat`), so a
  * sentence in Arabic reads `الاثنين–الخميس والأحد` rather than borrowing an
- * English comma. No closing full stop: the copy around it decides that.
+ * English comma; groups with the language's semicolon (`؛` in Arabic). No
+ * closing full stop: the copy around it decides that.
  */
 export function hoursSentence(
     hours: WeeklyHours,
     format: HoursSentenceFormat
 ): string {
     const between = format.between ?? "–";
+    const semicolon = semicolonFor(format.locale);
     const { dayName, time } = printer(format);
     const list = new Intl.ListFormat(format.locale, {
         type: "conjunction",
@@ -275,7 +304,34 @@ export function hoursSentence(
                       );
             return `${days} ${times}`;
         })
-        .join(format.separator);
+        .join(semicolon);
+}
+
+/** How `formatTime` prints a time. */
+export interface TimeFormat {
+    /** The language the clock is read in, e.g. `"en-US"`. */
+    readonly locale: string;
+    /** As written (`"h23"`) when absent. */
+    readonly hourCycle?: HourCycle;
+}
+
+/**
+ * One time as the hours print it: as written (`14:00`), or on a 12-hour clock
+ * (`2:00 PM`). For a line that quotes a single time, such as "open until",
+ * so it reads like the table beside it.
+ */
+export function formatTime(at: TimeOfDay, format: TimeFormat): string {
+    if (format.hourCycle !== "h12") return at;
+    return new Intl.DateTimeFormat(format.locale, {
+        hour: "numeric",
+        minute: "2-digit",
+        hourCycle: "h12",
+        timeZone: "UTC",
+    }).format(
+        new Date(
+            Date.UTC(2024, 0, 1, Number(at.slice(0, 2)), Number(at.slice(3, 5)))
+        )
+    );
 }
 
 /** Day names and times as `format` prints them. */
@@ -289,29 +345,7 @@ function printer(
     });
     const dayName = (day: Weekday): string =>
         names.format(new Date(Date.UTC(2024, 0, 1 + WEEK.indexOf(day))));
-    const clock =
-        format.hourCycle === "h12"
-            ? new Intl.DateTimeFormat(format.locale, {
-                  hour: "numeric",
-                  minute: "2-digit",
-                  hourCycle: "h12",
-                  timeZone: "UTC",
-              })
-            : undefined;
-    const time = (at: TimeOfDay): string =>
-        clock === undefined
-            ? at
-            : clock.format(
-                  new Date(
-                      Date.UTC(
-                          2024,
-                          0,
-                          1,
-                          Number(at.slice(0, 2)),
-                          Number(at.slice(3, 5))
-                      )
-                  )
-              );
+    const time = (at: TimeOfDay): string => formatTime(at, format);
     return { dayName, time };
 }
 

package/src/index.ts

@@ -120,13 +120,16 @@ export {
     type DayHours,
     type FormattedHours,
     formatHours,
+    formatTime,
     groupHours,
+    type HourCycle,
     type HoursFormat,
     type HoursGroup,
     type HoursSentenceFormat,
     hoursSentence,
     type OpenStatus,
     openStatus,
+    type TimeFormat,
     type TimeOfDay,
     type TimeRange,
     type VenueNow,