@escape-game-over/atlas 0.1.92 → 0.1.94

package/package.json

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

package/src/analytics/google.ts

@@ -275,13 +275,19 @@ const CATEGORY_SIGNALS: Readonly<
     marketing: ["adStorage", "adUserData", "adPersonalization"],
 };
 
-/** The signals no answer grants — see `CATEGORY_SIGNALS`. */
-const UNASKED = SIGNAL_KEYS.filter(
-    (key) =>
-        !CONSENT_CATEGORIES.some((category) =>
-            CATEGORY_SIGNALS[category].includes(key)
-        )
-);
+/**
+ * The signals no answer grants — see `CATEGORY_SIGNALS`. A function, not a
+ * value worked out at import: browser bundles import this file for its
+ * consent constants and would otherwise compute it on every page.
+ */
+function unasked(): readonly (keyof ConsentDefaults)[] {
+    return SIGNAL_KEYS.filter(
+        (key) =>
+            !CONSENT_CATEGORIES.some((category) =>
+                CATEGORY_SIGNALS[category].includes(key)
+            )
+    );
+}
 
 /**
  * What `google-tag.ts` is handed: the settings, already in Google's own names.
@@ -435,7 +441,7 @@ export function googleScripts(
     }
 
     const consent = google.consent ?? DENIED_BY_DEFAULT;
-    for (const key of UNASKED) {
+    for (const key of unasked()) {
         if (consent.some((given) => given[key] === "denied")) {
             warn(
                 at,

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 };
     }

package/src/warn.ts

@@ -43,19 +43,22 @@ const RESET = `${ESC}[0m`;
  * `process` and simply gets colour, which is what a browser console renders
  * anyway.
  */
-const env = (
-    globalThis as {
-        process?: { env?: Readonly<Record<string, string | undefined>> };
-    }
-).process?.env;
+const env = () =>
+    (
+        globalThis as {
+            process?: { env?: Readonly<Record<string, string | undefined>> };
+        }
+    ).process?.env;
 
-const colour = env?.NO_COLOR === undefined;
+// Functions, not values worked out at import: a browser bundle that imports
+// anything near this file would otherwise run the reads on every page.
+const colour = (): boolean => env()?.NO_COLOR === undefined;
 
 /** Read per call rather than once, so a test can switch it. */
-const strict = (): boolean => env?.ATLAS_STRICT === "1";
+const strict = (): boolean => env()?.ATLAS_STRICT === "1";
 
 const paint = (code: string, text: string): string =>
-    colour ? `${code}${text}${RESET}` : text;
+    colour() ? `${code}${text}${RESET}` : text;
 
 /**
  * Warns about one page, or one file.