@diagrammo/dgmo 0.50.2 → 0.52.0

package/dist/{chunk-YNRDWYZP.js → chunk-OQKP2X3D.js}

@@ -1,6 +1,102 @@
 // src/countdown/resolve.ts
 var DAY_MS = 864e5;
 var WEEK_MS = 7 * DAY_MS;
+var ZONE_WD = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+function zoneFields(ms, tz) {
+  const d = new Date(ms);
+  if (!tz) {
+    return {
+      year: d.getFullYear(),
+      month: d.getMonth(),
+      day: d.getDate(),
+      hour: d.getHours(),
+      minute: d.getMinutes(),
+      second: d.getSeconds(),
+      weekday: d.getDay()
+    };
+  }
+  try {
+    const o = {};
+    new Intl.DateTimeFormat("en-US", {
+      timeZone: tz,
+      hour12: false,
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit",
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit",
+      weekday: "short"
+    }).formatToParts(d).forEach((x) => {
+      o[x.type] = x.value;
+    });
+    return {
+      year: Number(o["year"]),
+      month: Number(o["month"]) - 1,
+      day: Number(o["day"]),
+      hour: Number(o["hour"]) % 24,
+      minute: Number(o["minute"]),
+      second: Number(o["second"]),
+      weekday: Math.max(0, ZONE_WD.indexOf(o["weekday"] ?? "Sun"))
+    };
+  } catch {
+    return {
+      year: d.getUTCFullYear(),
+      month: d.getUTCMonth(),
+      day: d.getUTCDate(),
+      hour: d.getUTCHours(),
+      minute: d.getUTCMinutes(),
+      second: d.getUTCSeconds(),
+      weekday: d.getUTCDay()
+    };
+  }
+}
+function zoneOffsetMs(tz, ms) {
+  const f = zoneFields(ms, tz);
+  const asUTC = Date.UTC(f.year, f.month, f.day, f.hour, f.minute, f.second);
+  return asUTC - Math.floor(ms / 1e3) * 1e3;
+}
+function wallToMs(y, mo, d, h, mi, tz) {
+  if (!tz) return new Date(y, mo, d, h, mi).getTime();
+  const guess = Date.UTC(y, mo, d, h, mi);
+  const off1 = zoneOffsetMs(tz, guess);
+  const ms = guess - off1;
+  const off2 = zoneOffsetMs(tz, ms);
+  return off2 === off1 ? ms : guess - off2;
+}
+function zoneOffsetLabel(ms, tz) {
+  if (!tz) return "";
+  try {
+    const off = new Intl.DateTimeFormat("en-US", {
+      timeZone: tz,
+      timeZoneName: "shortOffset"
+    }).formatToParts(new Date(ms)).find((x) => x.type === "timeZoneName");
+    return off ? off.value.replace("GMT", "UTC") : "";
+  } catch {
+    return "";
+  }
+}
+var DATE_ONLY_RE = /^\d{4}-\d{2}-\d{2}$/;
+var LOCAL_DT_RE = /^(\d{4})-(\d{2})-(\d{2})[T ](\d{2}):(\d{2})(?::(\d{2}))?$/;
+function targetToMs(target, tz = null) {
+  const s = target.trim();
+  if (DATE_ONLY_RE.test(s)) {
+    const [y, m, d] = s.split("-").map(Number);
+    return wallToMs(y, m - 1, d, 0, 0, tz);
+  }
+  const dt = LOCAL_DT_RE.exec(s);
+  if (dt) {
+    return wallToMs(
+      Number(dt[1]),
+      Number(dt[2]) - 1,
+      Number(dt[3]),
+      Number(dt[4]),
+      Number(dt[5]),
+      tz
+    );
+  }
+  return new Date(s).getTime();
+}
 function monthIndex(token) {
   const t = token.trim().toLowerCase().slice(0, 3);
   const i = [
@@ -37,16 +133,24 @@ function ordinalWord(n) {
 function applyOrdinalTemplate(template, n) {
   return template.replace(/\bNth\b/g, ordinalWord(n)).replace(/\bN\b/g, String(n));
 }
-function dayStart(ms) {
-  const d = new Date(ms);
-  return new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime();
+function dayStart(ms, tz = null) {
+  const f = zoneFields(ms, tz);
+  return wallToMs(f.year, f.month, f.day, 0, 0, tz);
+}
+function dayDelta(a, b, tz = null) {
+  return Math.round((dayStart(b, tz) - dayStart(a, tz)) / DAY_MS);
+}
+function sameDay(a, b, tz = null) {
+  const x = zoneFields(a, tz);
+  const y = zoneFields(b, tz);
+  return x.year === y.year && x.month === y.month && x.day === y.day;
 }
-function nthWeekdayOfMonth(year, month, weekday, nth, hour, minute) {
+function nthWeekdayOfMonth(year, month, weekday, nth, hour, minute, tz) {
   if (nth < 0) {
     const last = new Date(year, month + 1, 0).getDate();
     for (let d = last; d >= 1; d--) {
       if (new Date(year, month, d).getDay() === weekday) {
-        return new Date(year, month, d, hour, minute).getTime();
+        return wallToMs(year, month, d, hour, minute, tz);
       }
     }
     return null;
@@ -55,20 +159,21 @@ function nthWeekdayOfMonth(year, month, weekday, nth, hour, minute) {
   const offset = (weekday - firstDow + 7) % 7;
   const day = 1 + offset + (nth - 1) * 7;
   if (day > new Date(year, month + 1, 0).getDate()) return null;
-  return new Date(year, month, day, hour, minute).getTime();
+  return wallToMs(year, month, day, hour, minute, tz);
 }
 function resolveNext(rule, now) {
-  const nowD = new Date(now);
+  const tz = rule.tz ?? null;
+  const nowF = zoneFields(now, tz);
   const { hour, minute } = rule;
-  const passes = rule.allDay ? (t) => dayStart(t) >= dayStart(now) : (t) => t > now;
+  const passes = rule.allDay ? (t) => dayStart(t, tz) >= dayStart(now, tz) : (t) => t > now;
   const dayExists = (y, m, d) => new Date(y, m, d).getMonth() === m;
   switch (rule.kind) {
     case "month-day": {
       const month = rule.month;
       const day = rule.day;
-      for (let y = nowD.getFullYear(); ; y++) {
+      for (let y = nowF.year; ; y++) {
         if (!dayExists(y, month, day)) continue;
-        const t = new Date(y, month, day, hour, minute).getTime();
+        const t = wallToMs(y, month, day, hour, minute, tz);
         if (passes(t)) return t;
       }
     }
@@ -76,10 +181,10 @@ function resolveNext(rule, now) {
     case "last-weekday": {
       const weekday = rule.weekday;
       const nth = rule.kind === "last-weekday" ? -1 : rule.nth;
-      let y = nowD.getFullYear();
-      let m = nowD.getMonth();
+      let y = nowF.year;
+      let m = nowF.month;
       for (let i = 0; i < 24; i++) {
-        const t = nthWeekdayOfMonth(y, m, weekday, nth, hour, minute);
+        const t = nthWeekdayOfMonth(y, m, weekday, nth, hour, minute, tz);
         if (t !== null && passes(t)) return t;
         m++;
         if (m > 11) {
@@ -92,14 +197,17 @@ function resolveNext(rule, now) {
     case "weekly": {
       const weekday = rule.weekday;
       for (let i = 0; i < 8; i++) {
-        const d = new Date(
-          nowD.getFullYear(),
-          nowD.getMonth(),
-          nowD.getDate() + i,
+        const cal = new Date(nowF.year, nowF.month, nowF.day + i);
+        if (cal.getDay() !== weekday) continue;
+        const t = wallToMs(
+          cal.getFullYear(),
+          cal.getMonth(),
+          cal.getDate(),
           hour,
-          minute
+          minute,
+          tz
         );
-        if (d.getDay() === weekday && passes(d.getTime())) return d.getTime();
+        if (passes(t)) return t;
       }
       return now + WEEK_MS;
     }
@@ -107,15 +215,15 @@ function resolveNext(rule, now) {
       const n = rule.intervalN ?? 1;
       const anchor = rule.anchorMs ?? now;
       if (rule.intervalUnit === "month") {
-        const a = new Date(anchor);
-        const day = a.getDate();
+        const a = zoneFields(anchor, tz);
+        const day = a.day;
         for (let k = 0; ; k++) {
-          const y = a.getFullYear();
-          const m = a.getMonth() + k * n;
+          const y = a.year;
+          const m = a.month + k * n;
           const yy = y + Math.floor(m / 12);
           const mm = (m % 12 + 12) % 12;
           if (!dayExists(yy, mm, day)) continue;
-          const t2 = new Date(yy, mm, day, hour, minute).getTime();
+          const t2 = wallToMs(yy, mm, day, hour, minute, tz);
           if (passes(t2)) return t2;
         }
       }
@@ -176,6 +284,10 @@ function formatCount(remainingMs, opts) {
   const dayPrefix = has("d") && days > 0 ? `${days}d${clock ? " " : ""}` : "";
   return dayPrefix + clock || plural(days, "day");
 }
+function splitClockSeconds(s) {
+  const m = /^(.+:\d{2}):(\d{2})$/.exec(s);
+  return m ? { lead: m[1], sec: ":" + m[2] } : { lead: s, sec: null };
+}
 function formatWordsDetail(remainingMs) {
   const totalMin = Math.floor(Math.max(0, remainingMs) / 6e4);
   const d = Math.floor(totalMin / 1440);
@@ -187,15 +299,15 @@ function formatWordsDetail(remainingMs) {
   parts.push(`${m} minute${m === 1 ? "" : "s"}`);
   return parts.join(" ");
 }
-function breakdown(nowMs, targetMs) {
-  const n = new Date(nowMs);
-  const t = new Date(targetMs);
-  let y = t.getFullYear() - n.getFullYear();
-  let mo = t.getMonth() - n.getMonth();
-  let d = t.getDate() - n.getDate();
-  let h = t.getHours() - n.getHours();
-  let mi = t.getMinutes() - n.getMinutes();
-  let s = t.getSeconds() - n.getSeconds();
+function breakdown(nowMs, targetMs, tz = null) {
+  const n = zoneFields(nowMs, tz);
+  const t = zoneFields(targetMs, tz);
+  let y = t.year - n.year;
+  let mo = t.month - n.month;
+  let d = t.day - n.day;
+  let h = t.hour - n.hour;
+  let mi = t.minute - n.minute;
+  let s = t.second - n.second;
   if (s < 0) {
     s += 60;
     mi--;
@@ -209,7 +321,7 @@ function breakdown(nowMs, targetMs) {
     d--;
   }
   if (d < 0) {
-    d += new Date(t.getFullYear(), t.getMonth(), 0).getDate();
+    d += new Date(t.year, t.month, 0).getDate();
     mo--;
   }
   if (mo < 0) {
@@ -218,8 +330,8 @@ function breakdown(nowMs, targetMs) {
   }
   return { years: y, months: mo, days: d, hours: h, minutes: mi, seconds: s };
 }
-function humanUnits(nowMs, targetMs) {
-  const b = breakdown(nowMs, targetMs);
+function humanUnits(nowMs, targetMs, tz = null) {
+  const b = breakdown(nowMs, targetMs, tz);
   return [
     [b.years, "year"],
     [b.months, "month"],
@@ -228,8 +340,8 @@ function humanUnits(nowMs, targetMs) {
     [b.minutes, "minute"]
   ];
 }
-function formatHuman(nowMs, targetMs) {
-  const units = humanUnits(nowMs, targetMs);
+function formatHuman(nowMs, targetMs, tz = null) {
+  const units = humanUnits(nowMs, targetMs, tz);
   let i = 0;
   while (i < units.length - 1 && units[i][0] === 0) i++;
   const rest = units.slice(i);
@@ -238,8 +350,8 @@ function formatHuman(nowMs, targetMs) {
   const secondary = rest.slice(2).filter((p) => p[0] > 0);
   return { big: say(primary) || "now", sub: say(secondary) };
 }
-function formatCompound(nowMs, targetMs, maxUnits = 2) {
-  const all = humanUnits(nowMs, targetMs);
+function formatCompound(nowMs, targetMs, maxUnits = 2, tz = null) {
+  const all = humanUnits(nowMs, targetMs, tz);
   let i = 0;
   while (i < all.length - 1 && all[i][0] === 0) i++;
   const chosen = all.slice(i, i + maxUnits).filter((p, idx) => p[0] > 0 || idx === 0);
@@ -261,35 +373,42 @@ var MONTH_ABBR = [
   "Nov",
   "Dec"
 ];
-function formatDate(ms) {
-  const d = new Date(ms);
-  return `${WEEKDAY_ABBR[d.getDay()]} ${MONTH_ABBR[d.getMonth()]} ${d.getDate()} ${d.getFullYear()}`;
+function formatDate(ms, tz = null) {
+  const f = zoneFields(ms, tz);
+  return `${WEEKDAY_ABBR[f.weekday]} ${MONTH_ABBR[f.month]} ${f.day} ${f.year}`;
 }
-function formatDateShort(ms) {
-  const d = new Date(ms);
-  return `${MONTH_ABBR[d.getMonth()]} ${d.getDate()} ${d.getFullYear()}`;
+function formatDateShort(ms, tz = null) {
+  const f = zoneFields(ms, tz);
+  return `${MONTH_ABBR[f.month]} ${f.day} ${f.year}`;
 }
-function formatFooter(resolvedMs, hasTime) {
-  const parts = [formatDate(resolvedMs)];
+function formatFooter(resolvedMs, hasTime, tz = null) {
+  const parts = [formatDate(resolvedMs, tz)];
   if (hasTime) {
-    const d = new Date(resolvedMs);
-    parts.push(`${pad2(d.getHours())}:${pad2(d.getMinutes())}`);
+    const f = zoneFields(resolvedMs, tz);
+    parts.push(`${pad2(f.hour)}:${pad2(f.minute)}`);
+    const label = zoneOffsetLabel(resolvedMs, tz);
+    if (label) parts.push(label);
   }
   return parts.join(" \xB7 ");
 }
 
 export {
   DAY_MS,
+  targetToMs,
   monthIndex,
   weekdayIndex,
   applyOrdinalTemplate,
+  dayStart,
+  dayDelta,
+  sameDay,
   resolveNext,
   ordinalFor,
   formatCount,
+  splitClockSeconds,
   formatWordsDetail,
   formatHuman,
   formatCompound,
   formatDateShort,
   formatFooter
 };
-//# sourceMappingURL=chunk-YNRDWYZP.js.map
+//# sourceMappingURL=chunk-OQKP2X3D.js.map

package/dist/{chunk-AHGF2YYA.js → chunk-OTOHI4JO.js}

@@ -1,6 +1,6 @@
 import {
   measureText
-} from "./chunk-5LWQH6QV.js";
+} from "./chunk-WCT3NYCV.js";
 
 // src/utils/card.ts
 function renderNodeCard(container, opts) {
@@ -44,4 +44,4 @@ export {
   renderNodeCard,
   renderCollapseBar
 };
-//# sourceMappingURL=chunk-AHGF2YYA.js.map
+//# sourceMappingURL=chunk-OTOHI4JO.js.map

package/dist/{chunk-EOFPYPAU.js → chunk-P3NRSSUU.js}

@@ -9,7 +9,12 @@ import {
 } from "./chunk-I5IGB56C.js";
 import {
   MAP_DX
-} from "./chunk-HHXOONLX.js";
+} from "./chunk-4B5YISOR.js";
+import {
+  formatOffsetLabel,
+  isValidZone,
+  parseFixedOffset
+} from "./chunk-APKUAJ2L.js";
 import {
   emit,
   formatDgmoError,
@@ -311,13 +316,13 @@ function resolveMap(parsed, data) {
       diagnostics.push(emit(MAP_DX.UNKNOWN_PLACE, line, { name, hint }));
       return { kind: "miss" };
     }
-    let cands = idxs.map((i) => data.gazetteer.cities[i]);
+    let cands = idxs.map((i) => ({ i, c: data.gazetteer.cities[i] }));
     const scopeUse = scope ?? scopeHint;
     if (scopeUse) {
       const bareState = usStateFromBareScope(scopeUse);
       const subScope = /^[A-Za-z]{2}-/.test(scopeUse) ? scopeUse : bareState;
       const filtered = cands.filter(
-        (c2) => subScope ? c2[5] === subScope : c2[2] === scopeUse
+        ({ c: c2 }) => subScope ? c2[5] === subScope : c2[2] === scopeUse
       );
       if (filtered.length) cands = filtered;
       else if (scope) {
@@ -331,10 +336,10 @@ function resolveMap(parsed, data) {
       if (!allowAmbiguous && !scopeUse) {
         return { kind: "defer" };
       }
-      cands = [...cands].sort((a, b) => b[3] - a[3]);
+      cands = [...cands].sort((a, b) => b.c[3] - a.c[3]);
       if (!scope) diagnostics.push(emit(MAP_DX.AMBIGUOUS_NAME, line, { name }));
     }
-    const c = cands[0];
+    const { i: cityIdx, c } = cands[0];
     if (data.airports?.airportIata?.[f] !== void 0 && !shadowedAirports.has(f)) {
       shadowedAirports.add(f);
       const code = name.toUpperCase();
@@ -342,7 +347,15 @@ function resolveMap(parsed, data) {
         emit(MAP_DX.AIRPORT_SHADOWED_BY_CITY, line, { name, code })
       );
     }
-    return { kind: "ok", lat: c[0], lon: c[1], iso: c[2] };
+    const zoneId = data.gazetteer.tz?.[cityIdx];
+    const gazTz = zoneId !== void 0 && zoneId >= 0 ? data.gazetteer.zones?.[zoneId] : void 0;
+    return {
+      kind: "ok",
+      lat: c[0],
+      lon: c[1],
+      iso: c[2],
+      ...gazTz !== void 0 && { tz: gazTz }
+    };
   };
   const poiIdFor = (pos, alias) => {
     if (alias) return fold(alias);
@@ -377,7 +390,7 @@ function resolveMap(parsed, data) {
     );
     if (got.kind === "ok") {
       noteCountry(got.iso);
-      addResolvedPoi(got.lat, got.lon, p);
+      addResolvedPoi(got.lat, got.lon, p, got.tz);
     } else if (got.kind === "defer") {
       deferred.push(p);
     }
@@ -395,12 +408,13 @@ function resolveMap(parsed, data) {
     );
     if (got.kind === "ok") {
       noteCountry(got.iso);
-      addResolvedPoi(got.lat, got.lon, p);
+      addResolvedPoi(got.lat, got.lon, p, got.tz);
     }
   }
-  function addResolvedPoi(lat, lon, p) {
+  function addResolvedPoi(lat, lon, p, gazTz) {
     const id = poiIdFor(p.pos, p.alias);
     const name = p.pos.kind === "name" ? p.pos.name : p.alias;
+    const tz = resolveTz(p, gazTz);
     const poi = {
       id,
       ...name !== void 0 && { name },
@@ -410,10 +424,36 @@ function resolveMap(parsed, data) {
       ...p.color !== void 0 && { color: p.color },
       tags: p.tags,
       meta: p.meta,
-      lineNumber: p.lineNumber
+      lineNumber: p.lineNumber,
+      ...tz !== void 0 && { tz: tz.zone },
+      ...tz?.fixedOffsetMin !== void 0 && {
+        tzFixedOffsetMin: tz.fixedOffsetMin
+      }
     };
     registerPoi(id, poi, p.lineNumber);
   }
+  function resolveTz(p, gazTz) {
+    if (!p.clock) return void 0;
+    const raw = p.meta["clock"]?.trim();
+    const line = p.lineNumber;
+    if (raw) {
+      const off = parseFixedOffset(raw);
+      if (off !== null)
+        return { zone: formatOffsetLabel(off), fixedOffsetMin: off };
+      if (isValidZone(raw)) {
+        if (gazTz && raw !== gazTz)
+          diagnostics.push(
+            emit(MAP_DX.CLOCK_TZ_OVERRIDE, line, { name: raw, tz: gazTz })
+          );
+        return { zone: raw };
+      }
+      diagnostics.push(emit(MAP_DX.CLOCK_TZ_INVALID, line, { name: raw }));
+      return void 0;
+    }
+    if (gazTz) return { zone: gazTz };
+    diagnostics.push(emit(MAP_DX.CLOCK_TZ_NEEDED, line, {}));
+    return void 0;
+  }
   const declaredByName = /* @__PURE__ */ new Map();
   for (const p of pois) {
     const fn = p.name ? fold(p.name) : void 0;
@@ -735,4 +775,4 @@ export {
   isSubNationalUsExtent,
   resolveMap
 };
-//# sourceMappingURL=chunk-EOFPYPAU.js.map
+//# sourceMappingURL=chunk-P3NRSSUU.js.map

package/dist/{chunk-QXKWYZNR.js → chunk-PRI2OD4E.js}

@@ -8,13 +8,14 @@ import {
   resolveActiveTagGroup,
   stripDefaultModifier,
   tagAttrKey
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-HHKO6SKY.js";
 import {
   extractColor,
+  fillModeFromToken,
   measureIndent,
   parseFirstLine,
   splitNameAndMeta
-} from "./chunk-OTAL43EH.js";
+} from "./chunk-BRENJ2BQ.js";
 import {
   makeDgmoError,
   makeFail
@@ -216,6 +217,12 @@ function parseBracket(content, palette) {
       result.noRounds = true;
       continue;
     }
+    const fm = fillModeFromToken(lower);
+    if (fm !== null) {
+      if (fm === "tint") delete result.fillMode;
+      else result.fillMode = fm;
+      continue;
+    }
     const accentM = trimmed.match(/^accent\s+(.+)$/i);
     if (accentM) {
       const { color } = extractColor(
@@ -376,4 +383,4 @@ function parseBracket(content, palette) {
 export {
   parseBracket
 };
-//# sourceMappingURL=chunk-QXKWYZNR.js.map
+//# sourceMappingURL=chunk-PRI2OD4E.js.map

package/dist/{chunk-U6EQI3U6.js → chunk-QBZYACOG.js}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-6KFWC4CO.js";
 import {
   getSeriesColors
-} from "./chunk-P6T66CCZ.js";
+} from "./chunk-WBM7ZNDI.js";
 
 // src/utils/d3-helpers.ts
 import * as d3Selection from "d3-selection";
@@ -87,7 +87,7 @@ var EXPORT_WIDTH = 1200;
 var EXPORT_HEIGHT = 800;
 async function resolveExportPalette(theme, palette) {
   if (palette) return palette;
-  const { getPalette } = await import("./palettes-PRJ2RI6D.js");
+  const { getPalette } = await import("./palettes-UDLZ2SA4.js");
   return theme === "dark" ? getPalette("nord").dark : getPalette("nord").light;
 }
 function createExportContainer(width, height) {
@@ -127,4 +127,4 @@ export {
   createExportContainer,
   finalizeSvgExport
 };
-//# sourceMappingURL=chunk-U6EQI3U6.js.map
+//# sourceMappingURL=chunk-QBZYACOG.js.map