@diagrammo/dgmo 0.50.2 → 0.52.0

package/dist/{chunk-P7CE7LXL.js → chunk-AAXZDUOV.js}

@@ -1,13 +1,13 @@
 import {
   layoutClassDiagram
-} from "./chunk-CMCR5WBW.js";
+} from "./chunk-WBRZJOEC.js";
 import {
   NOTE_BADGE_RADIUS,
   noteConnectorPoints,
   renderNoteBadge,
   renderNoteBox,
   renderNoteConnector
-} from "./chunk-JEUJOX5X.js";
+} from "./chunk-J7TLCB2Q.js";
 import {
   extractExportSvg,
   runInExportContainer
@@ -21,7 +21,7 @@ import {
 } from "./chunk-YYVTBZZC.js";
 import {
   renderIntegratedLegend
-} from "./chunk-HEVYAHLW.js";
+} from "./chunk-AUIM2NVH.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -32,17 +32,20 @@ import {
 } from "./chunk-6KFWC4CO.js";
 import {
   LEGEND_HEIGHT
-} from "./chunk-HQCHYB5F.js";
+} from "./chunk-QOOUC2J5.js";
 import {
   measureText
-} from "./chunk-5LWQH6QV.js";
+} from "./chunk-WCT3NYCV.js";
 import {
   contrastText,
   shapeFill
-} from "./chunk-P6T66CCZ.js";
+} from "./chunk-WBM7ZNDI.js";
 import {
   parseClassDiagram
-} from "./chunk-GL5UZ6NY.js";
+} from "./chunk-TPFKKXCB.js";
+import {
+  fillModeFromOptions
+} from "./chunk-BRENJ2BQ.js";
 
 // src/class/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -68,11 +71,9 @@ function modifierColor(modifier, palette, colorOff) {
       return palette.colors.teal;
   }
 }
-function nodeFill(palette, isDark, modifier, nodeColor, colorOff, solid) {
+function nodeFill(palette, isDark, modifier, nodeColor, colorOff, fillMode) {
   const color = nodeColor ?? modifierColor(modifier, palette, colorOff);
-  return shapeFill(palette, color, isDark, {
-    ...solid !== void 0 && { solid }
-  });
+  return shapeFill(palette, color, isDark, { mode: fillMode });
 }
 function nodeStroke(palette, modifier, nodeColor, colorOff) {
   return nodeColor ?? modifierColor(modifier, palette, colorOff);
@@ -259,14 +260,14 @@ function renderClassDiagram(container, parsed, layout, palette, isDark, onClickI
     const colorOff = !!parsed.options?.["no-auto-color"];
     const neutralize = hasLegend && !isLegendExpanded && !node.color;
     const effectiveColor = neutralize ? palette.primary : node.color;
-    const solid = parsed.options?.["solid-fill"] === "on";
+    const fillMode = fillModeFromOptions(parsed.options ?? {});
     const fill = nodeFill(
       palette,
       isDark,
       node.modifier,
       effectiveColor,
       colorOff,
-      solid
+      fillMode
     );
     const stroke = nodeStroke(palette, node.modifier, effectiveColor, colorOff);
     const onFillText = contrastText(
@@ -289,14 +290,14 @@ function renderClassDiagram(container, parsed, layout, palette, isDark, onClickI
     const fields = node.members.filter((m) => !m.isMethod);
     const methods = node.members.filter((m) => m.isMethod);
     if (isEnum) {
-      nodeG.append("line").attr("x1", -w / 2).attr("y1", yPos).attr("x2", w / 2).attr("y2", yPos).attr("stroke", solid ? onFillText : stroke).attr("stroke-width", 0.5).attr("stroke-opacity", 0.5);
+      nodeG.append("line").attr("x1", -w / 2).attr("y1", yPos).attr("x2", w / 2).attr("y2", yPos).attr("stroke", fillMode === "solid" ? onFillText : stroke).attr("stroke-width", 0.5).attr("stroke-opacity", 0.5);
       let memberY = yPos + sCompartmentPaddingY;
       for (const member of node.members) {
         nodeG.append("text").attr("x", -w / 2 + sMemberPaddingX).attr("y", memberY + sMemberLineHeight / 2).attr("dominant-baseline", "central").attr("fill", onFillText).attr("font-size", sMemberFontSize).text(member.name);
         memberY += sMemberLineHeight;
       }
     } else {
-      nodeG.append("line").attr("x1", -w / 2).attr("y1", yPos).attr("x2", w / 2).attr("y2", yPos).attr("stroke", solid ? onFillText : stroke).attr("stroke-width", 0.5).attr("stroke-opacity", 0.5);
+      nodeG.append("line").attr("x1", -w / 2).attr("y1", yPos).attr("x2", w / 2).attr("y2", yPos).attr("stroke", fillMode === "solid" ? onFillText : stroke).attr("stroke-width", 0.5).attr("stroke-opacity", 0.5);
       if (fields.length > 0) {
         let memberY = yPos + sCompartmentPaddingY;
         for (const field of fields) {
@@ -312,7 +313,7 @@ function renderClassDiagram(container, parsed, layout, palette, isDark, onClickI
         }
       }
       yPos += node.fieldsHeight;
-      nodeG.append("line").attr("x1", -w / 2).attr("y1", yPos).attr("x2", w / 2).attr("y2", yPos).attr("stroke", solid ? onFillText : stroke).attr("stroke-width", 0.5).attr("stroke-opacity", 0.5);
+      nodeG.append("line").attr("x1", -w / 2).attr("y1", yPos).attr("x2", w / 2).attr("y2", yPos).attr("stroke", fillMode === "solid" ? onFillText : stroke).attr("stroke-width", 0.5).attr("stroke-opacity", 0.5);
       if (methods.length > 0) {
         let memberY = yPos + sCompartmentPaddingY;
         for (const method of methods) {
@@ -407,4 +408,4 @@ export {
   renderClassDiagram,
   renderClassDiagramForExport
 };
-//# sourceMappingURL=chunk-P7CE7LXL.js.map
+//# sourceMappingURL=chunk-AAXZDUOV.js.map

package/dist/{chunk-SXRTRMEE.js → chunk-AL672HNE.js}

@@ -10,7 +10,7 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-HHKO6SKY.js";
 import {
   MINDMAP_REGISTRY,
   OPTION_NOCOLON_RE,
@@ -21,7 +21,7 @@ import {
   tryParseSharedOption,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-OTAL43EH.js";
+} from "./chunk-BRENJ2BQ.js";
 import {
   formatDgmoError,
   makeDgmoError,
@@ -313,4 +313,4 @@ function findMetadataParent(indent, indentStack) {
 export {
   parseMindmap
 };
-//# sourceMappingURL=chunk-SXRTRMEE.js.map
+//# sourceMappingURL=chunk-AL672HNE.js.map

package/dist/chunk-APKUAJ2L.js

@@ -0,0 +1,220 @@
+// src/clock/resolve.ts
+var CLOCK_RAMP = [
+  [0, "#3d478f"],
+  [4, "#4a4d8c"],
+  [6, "#c98a6b"],
+  [8, "#d9a441"],
+  [11, "#e0b23c"],
+  [13, "#4f96c4"],
+  [16, "#cc7a33"],
+  [19, "#8a5aa0"],
+  [24, "#3d478f"]
+];
+function hexLerp(a, b, t) {
+  const pa = [1, 3, 5].map((i) => parseInt(a.slice(i, i + 2), 16));
+  const pb = [1, 3, 5].map((i) => parseInt(b.slice(i, i + 2), 16));
+  const c = pa.map(
+    (v, i) => Math.round(v + (pb[i] - v) * t).toString(16).padStart(2, "0")
+  );
+  return `#${c.join("")}`;
+}
+function rampColor(h) {
+  const hh = (h % 24 + 24) % 24;
+  for (let i = 0; i < CLOCK_RAMP.length - 1; i++) {
+    const [h0, c0] = CLOCK_RAMP[i];
+    const [h1, c1] = CLOCK_RAMP[i + 1];
+    if (hh >= h0 && hh <= h1) return hexLerp(c0, c1, (hh - h0) / (h1 - h0));
+  }
+  return CLOCK_RAMP[0][1];
+}
+var SOON_MIN = 60;
+var RAD = Math.PI / 180;
+var DAY_MS = 864e5;
+var J1970 = 2440588;
+var J2000 = 2451545;
+function zoneParts(zone, nowMs) {
+  const d = new Date(nowMs);
+  try {
+    const o = {};
+    new Intl.DateTimeFormat("en-US", {
+      timeZone: zone,
+      hour12: false,
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit",
+      weekday: "short"
+    }).formatToParts(d).forEach((x) => {
+      o[x.type] = x.value;
+    });
+    const off = new Intl.DateTimeFormat("en-US", {
+      timeZone: zone,
+      timeZoneName: "shortOffset"
+    }).formatToParts(d).find((x) => x.type === "timeZoneName");
+    return {
+      h: parseInt(o["hour"], 10) % 24,
+      m: parseInt(o["minute"], 10),
+      s: parseInt(o["second"], 10),
+      weekday: o["weekday"],
+      offsetLabel: off ? off.value.replace("GMT", "UTC") : ""
+    };
+  } catch {
+    return {
+      h: d.getUTCHours(),
+      m: d.getUTCMinutes(),
+      s: d.getUTCSeconds(),
+      weekday: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"][d.getUTCDay()],
+      offsetLabel: "UTC"
+    };
+  }
+}
+function pad2(n) {
+  return n < 10 ? "0" + n : String(n);
+}
+function isValidZone(zone) {
+  try {
+    new Intl.DateTimeFormat("en-US", { timeZone: zone });
+    return true;
+  } catch {
+    return false;
+  }
+}
+var WEEKDAY_SHORT = [
+  "Sun",
+  "Mon",
+  "Tue",
+  "Wed",
+  "Thu",
+  "Fri",
+  "Sat"
+];
+function parseFixedOffset(token) {
+  const m = token.trim().match(/^(?:UTC|GMT)\s*([+-])?\s*(\d{1,2})?(?::?(\d{2}))?$/i);
+  if (!m) return null;
+  if (!m[1] && !m[2] && !m[3]) return 0;
+  if (!m[1] || !m[2]) return null;
+  const sign = m[1] === "-" ? -1 : 1;
+  const h = Number(m[2]);
+  const mm = m[3] ? Number(m[3]) : 0;
+  if (h > 14 || mm > 59) return null;
+  const total = sign * (h * 60 + mm);
+  if (total < -12 * 60 || total > 14 * 60) return null;
+  return total;
+}
+function formatOffsetLabel(offsetMin) {
+  if (offsetMin === 0) return "UTC";
+  const sign = offsetMin < 0 ? "-" : "+";
+  const abs = Math.abs(offsetMin);
+  const h = Math.floor(abs / 60);
+  const mm = abs % 60;
+  return `UTC${sign}${h}${mm ? ":" + pad2(mm) : ""}`;
+}
+function fixedParts(offsetMin, nowMs) {
+  const d = new Date(nowMs + offsetMin * 6e4);
+  return {
+    h: d.getUTCHours(),
+    m: d.getUTCMinutes(),
+    s: d.getUTCSeconds(),
+    weekday: WEEKDAY_SHORT[d.getUTCDay()],
+    offsetLabel: formatOffsetLabel(offsetMin)
+  };
+}
+function formatTime(h, m, s, hours12) {
+  const sec = pad2(s);
+  if (hours12) {
+    const ap = h < 12 ? "am" : "pm";
+    let hr = h % 12;
+    if (hr === 0) hr = 12;
+    return { main: `${hr}:${pad2(m)}`, sec, ap };
+  }
+  return { main: `${pad2(h)}:${pad2(m)}`, sec, ap: "" };
+}
+function fmtDelta(ms) {
+  const m = Math.max(0, Math.round(ms / 6e4));
+  if (m < 90) return `${m}m`;
+  return `${Math.floor(m / 60)}h ${m % 60}m`;
+}
+function workStatus(parts, work) {
+  if (!work) return null;
+  const min = parts.h * 60 + parts.m;
+  if (!work.days[parts.weekday]) return { cls: "off", text: "Weekend" };
+  if (min < work.startMin) {
+    const d = work.startMin - min;
+    return {
+      cls: d <= SOON_MIN ? "soon" : "off",
+      text: `starts in ${fmtDelta(d * 6e4)}`
+    };
+  }
+  if (min < work.endMin) {
+    return { cls: "ok", text: `${fmtDelta((work.endMin - min) * 6e4)} left` };
+  }
+  return {
+    cls: "off",
+    text: `ended ${fmtDelta((min - work.endMin) * 6e4)} ago`
+  };
+}
+function toJulian(ms) {
+  return ms / DAY_MS - 0.5 + J1970;
+}
+function fromJulian(j) {
+  return (j + 0.5 - J1970) * DAY_MS;
+}
+function sunTimes(nowMs, lat, lon) {
+  const lw = -lon * RAD;
+  const phi = lat * RAD;
+  const J = toJulian(nowMs);
+  const n = Math.round(J - J2000 - 9e-4 - lw / (2 * Math.PI));
+  const Jn = J2000 + 9e-4 + lw / (2 * Math.PI) + n;
+  const M = (357.5291 + 0.98560028 * (Jn - J2000)) * RAD;
+  const C = (1.9148 * Math.sin(M) + 0.02 * Math.sin(2 * M) + 3e-4 * Math.sin(3 * M)) * RAD;
+  const L = M + C + Math.PI + 102.9372 * RAD;
+  const Jt = Jn + 53e-4 * Math.sin(M) - 69e-4 * Math.sin(2 * L);
+  const dec = Math.asin(Math.sin(L) * Math.sin(23.44 * RAD));
+  const cw = (Math.sin(-0.833 * RAD) - Math.sin(phi) * Math.sin(dec)) / (Math.cos(phi) * Math.cos(dec));
+  if (cw > 1) return { polar: "night" };
+  if (cw < -1) return { polar: "day" };
+  const w = Math.acos(cw);
+  const Jset = J2000 + 9e-4 + (w + lw) / (2 * Math.PI) + n + 53e-4 * Math.sin(M) - 69e-4 * Math.sin(2 * L);
+  return {
+    sunriseMs: fromJulian(Jt - (Jset - Jt)),
+    sunsetMs: fromJulian(Jset)
+  };
+}
+function sunLine(nowMs, lat, lon) {
+  const t = sunTimes(nowMs, lat, lon);
+  if (t.polar) {
+    return {
+      up: t.polar === "day",
+      text: t.polar === "day" ? "midnight sun" : "polar night"
+    };
+  }
+  if (nowMs < t.sunriseMs) {
+    return { up: false, text: `sunrise in ${fmtDelta(t.sunriseMs - nowMs)}` };
+  }
+  if (nowMs < t.sunsetMs) {
+    return { up: true, text: `sunset in ${fmtDelta(t.sunsetMs - nowMs)}` };
+  }
+  const tm = sunTimes(nowMs + DAY_MS, lat, lon);
+  if (tm.polar) return { up: false, text: "sunrise in \u2014" };
+  return { up: false, text: `sunrise in ${fmtDelta(tm.sunriseMs - nowMs)}` };
+}
+function handAngles(h, m, s) {
+  return {
+    hour: (h % 12 + m / 60) * 30,
+    minute: (m + s / 60) * 6,
+    second: s * 6
+  };
+}
+
+export {
+  rampColor,
+  zoneParts,
+  isValidZone,
+  parseFixedOffset,
+  formatOffsetLabel,
+  fixedParts,
+  formatTime,
+  workStatus,
+  sunLine,
+  handAngles
+};
+//# sourceMappingURL=chunk-APKUAJ2L.js.map

package/dist/{chunk-SCHXJTZL.js → chunk-ARGMQ3H4.js}

@@ -1,7 +1,7 @@
 import {
   extractColor,
   measureIndent
-} from "./chunk-OTAL43EH.js";
+} from "./chunk-BRENJ2BQ.js";
 import {
   makeDgmoError
 } from "./chunk-CXK4DZH3.js";
@@ -73,4 +73,4 @@ function tryCollectNote(lines, index, indent, palette, diagnostics) {
 export {
   tryCollectNote
 };
-//# sourceMappingURL=chunk-SCHXJTZL.js.map
+//# sourceMappingURL=chunk-ARGMQ3H4.js.map

package/dist/{chunk-HEVYAHLW.js → chunk-AUIM2NVH.js}

@@ -1,6 +1,6 @@
 import {
   computeLegendLayout
-} from "./chunk-7UEMZREK.js";
+} from "./chunk-YAA6IID3.js";
 import {
   FONT_FAMILY
 } from "./chunk-6KFWC4CO.js";
@@ -14,14 +14,14 @@ import {
   LEGEND_TOGGLE_DOT_R,
   LEGEND_TOGGLE_OFF_OPACITY,
   measureLegendText
-} from "./chunk-HQCHYB5F.js";
+} from "./chunk-QOOUC2J5.js";
 import {
   mix,
   valueRampStops
-} from "./chunk-P6T66CCZ.js";
+} from "./chunk-WBM7ZNDI.js";
 import {
   tagAttrKey
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-HHKO6SKY.js";
 
 // src/utils/legend-d3.ts
 var LEGEND_TEXT_DY = "0.32em";
@@ -293,4 +293,4 @@ export {
   renderLegendD3,
   renderIntegratedLegend
 };
-//# sourceMappingURL=chunk-HEVYAHLW.js.map
+//# sourceMappingURL=chunk-AUIM2NVH.js.map

package/dist/{chunk-3LH5CLP4.js → chunk-BKVOYV6I.js}

@@ -1,12 +1,25 @@
+import {
+  buildSwatches
+} from "./chunk-3LK5DNED.js";
 import {
   layoutMap,
   mapLegendConfig,
   mapLegendGroups,
   parsePathRings
-} from "./chunk-LE4MYMLI.js";
+} from "./chunk-ZJV7GYR4.js";
 import {
   renderIntegratedLegend
-} from "./chunk-HEVYAHLW.js";
+} from "./chunk-AUIM2NVH.js";
+import {
+  parseClock
+} from "./chunk-FY5MSZAP.js";
+import {
+  fixedParts,
+  formatTime,
+  sunLine,
+  workStatus,
+  zoneParts
+} from "./chunk-APKUAJ2L.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -17,13 +30,124 @@ import {
 } from "./chunk-6KFWC4CO.js";
 import {
   measureText
-} from "./chunk-5LWQH6QV.js";
+} from "./chunk-WCT3NYCV.js";
 import {
-  mix
-} from "./chunk-P6T66CCZ.js";
+  mix,
+  themeBaseBg
+} from "./chunk-WBM7ZNDI.js";
 
 // src/map/renderer.ts
 import * as d3Selection from "d3-selection";
+
+// src/map/clock-card.ts
+var WEEKDAY_ABBR = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+var clamp = (v, lo, hi) => Math.max(lo, Math.min(hi, v));
+function workFromDirectives(d) {
+  if (d.clockHours === void 0) return null;
+  const src = `clock
+hours ${d.clockHours}` + (d.clockDays !== void 0 ? `
+days ${d.clockDays}` : "");
+  const w = parseClock(src).work;
+  if (!w) return null;
+  return { startMin: w.startMin, endMin: w.endMin, days: w.days };
+}
+function partsFor(poi, now) {
+  return poi.tzFixedOffsetMin !== void 0 ? fixedParts(poi.tzFixedOffsetMin, now) : zoneParts(poi.tz, now);
+}
+function renderClockCards(gCards, layout, resolved, palette, isDark, now, frameW, frameH) {
+  const withTz = resolved.pois.filter((p) => p.tz !== void 0);
+  if (withTz.length === 0) return;
+  const byId = new Map(withTz.map((p) => [p.id, p]));
+  const baseBg = themeBaseBg(palette, isDark);
+  const muted = mix(palette.text, baseBg, 55);
+  const sw = buildSwatches(palette, muted);
+  const cardFill = mix(palette.text, palette.bg, 6);
+  const border = mix(palette.text, palette.bg, 32);
+  const work = workFromDirectives(resolved.directives);
+  const hours12 = true;
+  for (const lp of layout) {
+    const poi = byId.get(lp.id);
+    if (!poi) continue;
+    const parts = partsFor(poi, now);
+    const hasCoords = Number.isFinite(poi.lat) && Number.isFinite(poi.lon);
+    const isFixed = poi.tzFixedOffsetMin !== void 0;
+    const sun = !isFixed && hasCoords ? sunLine(now, poi.lat, poi.lon) : null;
+    const ts = formatTime(parts.h, parts.m, parts.s, hours12);
+    const status = workStatus(parts, work);
+    const viewerWeekday = WEEKDAY_ABBR[new Date(now).getDay()];
+    const showWeekday = parts.weekday !== viewerWeekday;
+    const line2 = [showWeekday ? parts.weekday : null, status?.text].filter(Boolean).join(" \xB7 ");
+    const mainFont = 18;
+    const sf = 8;
+    const advance = (s, f) => [...s].reduce((w, c) => w + f * (c === ":" ? 0.334 : 0.6), 0);
+    const mainW = advance(ts.main, mainFont);
+    const secW = advance(`:${ts.sec}`, sf);
+    const stackW = Math.max(secW, ts.ap ? measureText(ts.ap, sf) : 0);
+    const stackGap = 6;
+    const padX = 9;
+    const iconR = 3.5;
+    const iconGap = 5;
+    const line2Icon = status ? iconR * 2 + iconGap : 0;
+    const line1W = mainW + stackGap + stackW;
+    const line2W = line2Icon + measureText(line2, 10.5);
+    const cardW = Math.max(line1W, line2W) + padX * 2;
+    const cardH = 44;
+    const leaderGap = 7;
+    const M = 6;
+    const cx = lp.cx;
+    const below = lp.cy - lp.r - leaderGap - cardH < M;
+    const cardTop = clamp(
+      below ? lp.cy + lp.r + leaderGap : lp.cy - lp.r - leaderGap - cardH,
+      M,
+      frameH - cardH - M
+    );
+    const cardLeft = clamp(cx - cardW / 2, M, frameW - cardW - M);
+    const g = gCards.append("g").attr("data-dgmo-clock", "").attr("data-dgmo-clock-zone", poi.tz).attr("data-dgmo-clock-hours12", hours12 ? "1" : "0").attr("data-dgmo-clock-sun", sun ? "1" : "0").attr("data-line-number", poi.lineNumber).attr("data-poi-clock", poi.id).attr("data-dgmo-clock-c-day", sw.day).attr("data-dgmo-clock-c-night", sw.night).attr("data-dgmo-clock-c-day-soft", sw.dayTint).attr("data-dgmo-clock-c-night-soft", sw.nightTint).attr("data-dgmo-clock-c-ok", sw.ok).attr("data-dgmo-clock-c-soon", sw.soon).attr("data-dgmo-clock-c-off", sw.off).attr("data-dgmo-clock-c-ok-soft", sw.okSoft).attr("data-dgmo-clock-c-soon-soft", sw.soonSoft).attr("data-dgmo-clock-c-off-soft", sw.offSoft);
+    if (hasCoords) {
+      g.attr("data-dgmo-clock-lat", poi.lat).attr(
+        "data-dgmo-clock-lon",
+        poi.lon
+      );
+    }
+    if (isFixed) g.attr("data-dgmo-clock-fixed-offset", poi.tzFixedOffsetMin);
+    if (work) {
+      g.attr("data-dgmo-clock-work-start", work.startMin).attr("data-dgmo-clock-work-end", work.endMin).attr(
+        "data-dgmo-clock-work-days",
+        WEEKDAY_ABBR.filter((d) => work.days[d]).join(",")
+      );
+    }
+    const leaderX = clamp(cx, cardLeft + 10, cardLeft + cardW - 10);
+    g.append("line").attr("x1", cx).attr("y1", below ? lp.cy + lp.r : lp.cy - lp.r).attr("x2", leaderX).attr("y2", below ? cardTop : cardTop + cardH).attr("stroke", border).attr("stroke-width", 1);
+    g.append("rect").attr("x", cardLeft).attr("y", cardTop).attr("width", cardW).attr("height", cardH).attr("rx", 6).attr("fill", cardFill).attr("stroke", border).attr("stroke-width", 1);
+    const statusColor = (cls) => cls === "ok" ? sw.ok : cls === "soon" ? sw.soon : sw.off;
+    const line1Y = cardTop + 20;
+    const timeX = cardLeft + padX;
+    g.append("text").attr("data-dgmo-clock-digital-part", "main").attr("x", timeX).attr("y", line1Y).attr("font-family", FONT_FAMILY).attr("fill", palette.text).attr("font-size", mainFont).attr("font-weight", 600).attr("textLength", mainW).attr("lengthAdjust", "spacing").style("font-variant-numeric", "tabular-nums").text(ts.main);
+    const stackX = timeX + mainW + stackGap;
+    const capTop = line1Y - mainFont * 0.7;
+    g.append("text").attr("data-dgmo-clock-digital-part", "sec").attr("x", stackX).attr("y", capTop + sf * 0.72).attr("font-family", FONT_FAMILY).attr("fill", muted).attr("font-size", sf).attr("textLength", secW).attr("lengthAdjust", "spacing").style("font-variant-numeric", "tabular-nums").text(`:${ts.sec}`);
+    g.append("text").attr("data-dgmo-clock-digital-part", "ap").attr("x", stackX).attr("y", line1Y).attr("font-family", FONT_FAMILY).attr("fill", muted).attr("font-size", sf).text(ts.ap);
+    const line2Y = cardTop + 36;
+    if (status) {
+      g.append("circle").attr("data-dgmo-clock-status-icon", "").attr("cx", cardLeft + padX + iconR).attr("cy", line2Y - 3.5).attr("r", iconR).attr("fill", statusColor(status.cls));
+    }
+    const l2 = g.append("text").attr("x", cardLeft + padX + line2Icon).attr("y", line2Y).attr("font-family", FONT_FAMILY).attr("font-size", 10.5).attr("fill", muted);
+    let needSep = false;
+    if (showWeekday) {
+      l2.append("tspan").text(parts.weekday);
+      needSep = true;
+    }
+    if (status) {
+      if (needSep) l2.append("tspan").text(" \xB7 ");
+      l2.append("tspan").attr("data-dgmo-clock-status", "").attr(
+        "fill",
+        status.cls === "ok" ? sw.ok : status.cls === "soon" ? sw.soon : sw.off
+      ).text(status.text);
+    }
+  }
+}
+
+// src/map/renderer.ts
 var LABEL_FONT = 11;
 function pointInRing(px, py, ring) {
   let inside = false;
@@ -586,6 +710,19 @@ function renderMap(container, resolved, data, palette, isDark, onClickItem, expo
       );
     }
   }
+  if (resolved.pois.some((p) => p.tz !== void 0)) {
+    const gCards = svg.append("g").attr("class", "dgmo-map-clock-cards");
+    renderClockCards(
+      gCards,
+      layout.pois,
+      resolved,
+      palette,
+      isDark,
+      Date.now(),
+      width,
+      height
+    );
+  }
   if (layout.legend) {
     const legendY = (layout.title ? TITLE_Y + TITLE_FONT_SIZE : 0) + (layout.subtitle ? TITLE_FONT_SIZE : 0) + 8;
     const legendG = svg.append("g").attr("class", "dgmo-map-legend").attr("transform", `translate(0, ${legendY})`);
@@ -644,4 +781,4 @@ export {
   renderMap,
   renderMapForExport
 };
-//# sourceMappingURL=chunk-3LH5CLP4.js.map
+//# sourceMappingURL=chunk-BKVOYV6I.js.map

package/dist/{chunk-RZ6YKEUJ.js → chunk-BPIZNB5O.js}

@@ -1,9 +1,9 @@
 import {
   renderIntegratedLegend
-} from "./chunk-HEVYAHLW.js";
+} from "./chunk-AUIM2NVH.js";
 import {
   getMaxLegendReservedHeight
-} from "./chunk-7UEMZREK.js";
+} from "./chunk-YAA6IID3.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -14,20 +14,21 @@ import {
 } from "./chunk-6KFWC4CO.js";
 import {
   LEGEND_GROUP_GAP
-} from "./chunk-HQCHYB5F.js";
+} from "./chunk-QOOUC2J5.js";
 import {
   measureText
-} from "./chunk-5LWQH6QV.js";
+} from "./chunk-WCT3NYCV.js";
 import {
   isBlockNode
-} from "./chunk-NNAAJVBU.js";
+} from "./chunk-NR5HCAUD.js";
 import {
-  mix
-} from "./chunk-P6T66CCZ.js";
+  mix,
+  themeBaseBg
+} from "./chunk-WBM7ZNDI.js";
 import {
   resolveTagColor,
   tagAttrKey
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-HHKO6SKY.js";
 
 // src/block/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -223,7 +224,8 @@ function renderBlock(container, parsed, palette, isDark, exportDims, options = {
     activeGroup,
     activeKey: activeGroup ? tagAttrKey(activeGroup) : null,
     neutral,
-    solidFill: opts.solidFill,
+    fillMode: opts.fillMode,
+    isDark,
     onToggle: options.onToggle
   });
   if (legend) {
@@ -262,7 +264,7 @@ function clipLabel(s, maxWidth, fs) {
 }
 var clipCounter = 0;
 function drawItems(g, items, ctx, path = []) {
-  const { palette, solidFill: solid } = ctx;
+  const { palette, fillMode } = ctx;
   for (const it of items) {
     if (it.type === "empty") {
       g.append("rect").attr("x", it.x).attr("y", it.y).attr("width", it.w).attr("height", it.h).attr("rx", 7).attr("fill", "none").attr("stroke", ctx.neutral).attr("stroke-width", 1).attr("stroke-dasharray", "3 4").attr("opacity", 0.7);
@@ -280,17 +282,17 @@ function drawItems(g, items, ctx, path = []) {
       if (v) cell.attr(`data-tag-${ctx.activeKey}`, v);
     }
     if (it.type === "collapsed") {
-      const fill2 = color ? solid ? color : mix(color, palette.bg, 12) : palette.surface;
+      const fill2 = color ? fillMode === "solid" ? color : fillMode === "outline" ? themeBaseBg(palette, ctx.isDark) : mix(color, palette.bg, 12) : palette.surface;
       const cid = `dgmo-block-clip-${clipCounter++}`;
       cell.append("clipPath").attr("id", cid).append("rect").attr("x", it.x).attr("y", it.y).attr("width", it.w).attr("height", it.h).attr("rx", 10);
       cell.append("rect").attr("x", it.x).attr("y", it.y).attr("width", it.w).attr("height", it.h).attr("rx", 10).attr("fill", fill2).attr("stroke", stroke).attr("stroke-width", 1.5);
       cell.append("text").attr("x", it.x + it.w / 2).attr("y", it.y + it.h / 2 + 4).attr("text-anchor", "middle").attr("font-size", 12.5).attr("font-weight", 700).attr("fill", palette.text).text(clipLabel(it.label ?? "", it.w - 24, 12.5));
-      cell.append("rect").attr("x", it.x).attr("y", it.y + it.h - BLOCK_BAR_H).attr("width", it.w).attr("height", BLOCK_BAR_H).attr("fill", solid && color ? palette.text : stroke).attr("clip-path", `url(#${cid})`);
+      cell.append("rect").attr("x", it.x).attr("y", it.y + it.h - BLOCK_BAR_H).attr("width", it.w).attr("height", BLOCK_BAR_H).attr("fill", fillMode === "solid" && color ? palette.text : stroke).attr("clip-path", `url(#${cid})`);
       bindToggle(cell, it, ctx, it.h);
       continue;
     }
     if (it.type === "container") {
-      const fill2 = color ? solid ? color : mix(color, palette.bg, 7) : palette.surface;
+      const fill2 = color ? fillMode === "solid" ? color : fillMode === "outline" ? themeBaseBg(palette, ctx.isDark) : mix(color, palette.bg, 7) : palette.surface;
       cell.append("rect").attr("x", it.x).attr("y", it.y).attr("width", it.w).attr("height", it.h).attr("rx", 10).attr("fill", fill2).attr("stroke", stroke).attr("stroke-width", 1.5);
       const sizeMetric = Math.min(it.w, it.h * 2.5);
       const headerFs = Math.max(
@@ -305,7 +307,7 @@ function drawItems(g, items, ctx, path = []) {
       if (it.inner) drawItems(g, it.inner, ctx, itemPath);
       continue;
     }
-    const fill = color ? solid ? mix(color, palette.bg, 80) : mix(color, palette.bg, 14) : palette.bg;
+    const fill = color ? fillMode === "solid" ? mix(color, palette.bg, 80) : fillMode === "outline" ? themeBaseBg(palette, ctx.isDark) : mix(color, palette.bg, 14) : palette.bg;
     cell.attr("data-leaf", "true");
     cell.append("rect").attr("x", it.x).attr("y", it.y).attr("width", it.w).attr("height", it.h).attr("rx", 8).attr("fill", fill).attr("stroke", stroke).attr("stroke-width", 1.25);
     cell.append("text").attr("x", it.x + it.w / 2).attr("y", it.y + it.h / 2 + 5).attr("text-anchor", "middle").attr("font-size", 13).attr("font-weight", 600).attr("fill", palette.text).text(clipLabel(it.label ?? "", it.w - 16, 13));
@@ -359,4 +361,4 @@ export {
   renderBlock,
   authoredCollapsedIds
 };
-//# sourceMappingURL=chunk-RZ6YKEUJ.js.map
+//# sourceMappingURL=chunk-BPIZNB5O.js.map