@escape-game-over/atlas 0.1.92 → 0.1.93

package/package.json

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

package/src/hours.ts

@@ -356,27 +356,18 @@ export function schemaDays(group: HoursGroup): readonly string[] {
 }
 
 /**
- * The day before each day, and the day after, written out rather than worked
- * out from positions in `WEEK`.
+ * The day `offset` days from `day`: -1 is yesterday, 1 is tomorrow.
+ *
+ * The week wraps around, so the index is taken modulo 7. The `+ 7` keeps it
+ * from going negative: the day before Monday is `(0 - 1 + 7) % 7 = 6`, Sunday.
  */
-const YESTERDAY: Readonly<Record<Weekday, Weekday>> = {
-    monday: "sunday",
-    tuesday: "monday",
-    wednesday: "tuesday",
-    thursday: "wednesday",
-    friday: "thursday",
-    saturday: "friday",
-    sunday: "saturday",
-};
-const TOMORROW: Readonly<Record<Weekday, Weekday>> = {
-    monday: "tuesday",
-    tuesday: "wednesday",
-    wednesday: "thursday",
-    thursday: "friday",
-    friday: "saturday",
-    saturday: "sunday",
-    sunday: "monday",
-};
+function dayFrom(day: Weekday, offset: -1 | 1): Weekday {
+    const next = WEEK[(WEEK.indexOf(day) + offset + 7) % 7];
+    if (next === undefined) {
+        throw new Error(`No day ${offset} from ${day}.`);
+    }
+    return next;
+}
 
 /**
  * The venue's wall clock at `now`: the day, and the time.
@@ -473,7 +464,7 @@ export function openStatus(
 function statusAt(hours: WeeklyHours, day: Weekday, time: string): OpenStatus {
     // 1. Still in last night's opening: yesterday has a span past midnight
     //    (`14:00`–`00:45`) and it is not yet 00:45.
-    const lateYesterday = spansOn(hours, YESTERDAY[day]).find(
+    const lateYesterday = spansOn(hours, dayFrom(day, -1)).find(
         (range) => pastMidnight(range) && time < range.closes
     );
     if (lateYesterday !== undefined) {
@@ -499,7 +490,7 @@ function statusAt(hours: WeeklyHours, day: Weekday, time: string): OpenStatus {
     }
 
     // 4. Done for today: when tomorrow's first span opens.
-    const [tomorrow] = spansOn(hours, TOMORROW[day]);
+    const [tomorrow] = spansOn(hours, dayFrom(day, 1));
     if (tomorrow !== undefined) {
         return { state: "opensTomorrow", time: tomorrow.opens };
     }