@diagrammo/dgmo 0.50.2 → 0.52.0

package/dist/{chunk-3XPUDB7B.js → chunk-FY5MSZAP.js}

@@ -1,10 +1,13 @@
+import {
+  formatOffsetLabel,
+  parseFixedOffset,
+  zoneParts
+} from "./chunk-APKUAJ2L.js";
 import {
   extractColor,
+  fillModeFromToken,
   parseFirstLine
-} from "./chunk-OTAL43EH.js";
-import {
-  resolveColor
-} from "./chunk-TLVIHFRO.js";
+} from "./chunk-BRENJ2BQ.js";
 import {
   makeDgmoError,
   makeFail
@@ -145,6 +148,180 @@ function coordsFor(zone) {
   return ZONE_COORDS[zone] ?? null;
 }
 
+// src/clock/gazetteer.ts
+function normalizePlace(name) {
+  return name.normalize("NFD").replace(/[̀-ͯ]/g, "").toLowerCase().replace(/[.]/g, "").replace(/\s+/g, " ").trim();
+}
+function zoneCity(zone) {
+  const seg = zone.split("/").pop() ?? zone;
+  return seg.replace(/_/g, " ");
+}
+var ALIAS_SEED = [
+  // North America — abbreviations + metros not named by their zone segment
+  ["NYC", "America/New_York"],
+  ["New York City", "America/New_York"],
+  ["Boston", "America/New_York"],
+  ["Washington", "America/New_York"],
+  ["Washington DC", "America/New_York"],
+  ["DC", "America/New_York"],
+  ["Philadelphia", "America/New_York"],
+  ["Miami", "America/New_York"],
+  ["Atlanta", "America/New_York"],
+  ["LA", "America/Los_Angeles"],
+  ["Los Angeles", "America/Los_Angeles"],
+  ["San Francisco", "America/Los_Angeles"],
+  ["SF", "America/Los_Angeles"],
+  ["Seattle", "America/Los_Angeles"],
+  ["Portland", "America/Los_Angeles"],
+  ["San Diego", "America/Los_Angeles"],
+  ["Las Vegas", "America/Los_Angeles"],
+  ["Dallas", "America/Chicago"],
+  ["Houston", "America/Chicago"],
+  ["Austin", "America/Chicago"],
+  ["Chicago", "America/Chicago"],
+  ["Minneapolis", "America/Chicago"],
+  ["Denver", "America/Denver"],
+  ["Salt Lake City", "America/Denver"],
+  ["London, ON", "America/Toronto"],
+  ["Ottawa", "America/Toronto"],
+  ["Montreal", "America/Toronto"],
+  ["Honolulu", "Pacific/Honolulu"],
+  ["Hawaii", "Pacific/Honolulu"],
+  // Genuinely ambiguous: San Jose CA (Pacific) vs San José, Costa Rica.
+  ["San Jose", "America/Los_Angeles"],
+  ["San Jose", "America/Costa_Rica"],
+  // Europe
+  ["Kiev", "Europe/Kyiv"],
+  ["Kyiv", "Europe/Kyiv"],
+  ["Frankfurt", "Europe/Berlin"],
+  ["Munich", "Europe/Berlin"],
+  ["Hamburg", "Europe/Berlin"],
+  ["Milan", "Europe/Rome"],
+  ["Barcelona", "Europe/Madrid"],
+  ["Geneva", "Europe/Zurich"],
+  ["Saint Petersburg", "Europe/Moscow"],
+  ["St Petersburg", "Europe/Moscow"],
+  // Middle East / Asia — historic + colloquial names
+  ["Bombay", "Asia/Kolkata"],
+  ["Mumbai", "Asia/Kolkata"],
+  ["Delhi", "Asia/Kolkata"],
+  ["New Delhi", "Asia/Kolkata"],
+  ["Bangalore", "Asia/Kolkata"],
+  ["Bengaluru", "Asia/Kolkata"],
+  ["Chennai", "Asia/Kolkata"],
+  ["Madras", "Asia/Kolkata"],
+  ["Calcutta", "Asia/Kolkata"],
+  ["Hyderabad", "Asia/Kolkata"],
+  ["Saigon", "Asia/Ho_Chi_Minh"],
+  ["Ho Chi Minh City", "Asia/Ho_Chi_Minh"],
+  ["Beijing", "Asia/Shanghai"],
+  ["Peking", "Asia/Shanghai"],
+  ["Shenzhen", "Asia/Shanghai"],
+  ["Guangzhou", "Asia/Shanghai"],
+  ["Abu Dhabi", "Asia/Dubai"],
+  ["Tel Aviv", "Asia/Jerusalem"],
+  ["Osaka", "Asia/Tokyo"],
+  ["Kyoto", "Asia/Tokyo"],
+  // Oceania
+  ["Auckland", "Pacific/Auckland"],
+  ["Wellington", "Pacific/Auckland"]
+];
+var NAME_INDEX = /* @__PURE__ */ new Map();
+var CITY_LABEL = /* @__PURE__ */ new Map();
+var ALL_ENTRIES = [];
+function register(city, zone) {
+  const key = normalizePlace(city);
+  if (!key) return;
+  let set = NAME_INDEX.get(key);
+  if (!set) {
+    set = /* @__PURE__ */ new Set();
+    NAME_INDEX.set(key, set);
+    CITY_LABEL.set(key, city);
+  }
+  if (!set.has(zone)) {
+    set.add(zone);
+    ALL_ENTRIES.push({ city, zone });
+  }
+}
+for (const zone of Object.keys(ZONE_COORDS)) {
+  if (zone === "UTC") continue;
+  register(zoneCity(zone), zone);
+}
+for (const [name, zone] of ALIAS_SEED) register(name, zone);
+function editDistance(a, b, max) {
+  if (Math.abs(a.length - b.length) > max) return max + 1;
+  let prev = Array.from({ length: b.length + 1 }, (_, i) => i);
+  for (let i = 1; i <= a.length; i++) {
+    const curr = [i];
+    let rowMin = i;
+    for (let j = 1; j <= b.length; j++) {
+      const cost = a[i - 1] === b[j - 1] ? 0 : 1;
+      const v = Math.min(prev[j] + 1, curr[j - 1] + 1, prev[j - 1] + cost);
+      curr[j] = v;
+      if (v < rowMin) rowMin = v;
+    }
+    if (rowMin > max) return max + 1;
+    prev = curr;
+  }
+  return prev[b.length];
+}
+function didYouMean(key) {
+  let best = null;
+  let bestD = 3;
+  for (const [name, label] of CITY_LABEL) {
+    const d = editDistance(key, name, 2);
+    if (d < bestD) {
+      bestD = d;
+      best = label;
+    }
+  }
+  return best;
+}
+function resolvePlace(name) {
+  const key = normalizePlace(name);
+  const set = NAME_INDEX.get(key);
+  if (set?.size === 1) {
+    const zone = [...set][0];
+    return { kind: "ok", zone, city: zoneCity(zone) };
+  }
+  if (set && set.size > 1) {
+    const candidates = [...set].map((zone) => ({ city: zoneCity(zone), zone }));
+    return { kind: "ambiguous", candidates };
+  }
+  return { kind: "unknown", suggestion: didYouMean(key) };
+}
+function searchZones(query, nowMs, limit = 8) {
+  const q = normalizePlace(query);
+  if (!q) return [];
+  const seen = /* @__PURE__ */ new Set();
+  const scored = [];
+  const consider = (city, zone, haystack) => {
+    const dedup = `${normalizePlace(city)}|${zone}`;
+    if (seen.has(dedup)) return;
+    let score;
+    if (haystack === q) score = 0;
+    else if (haystack.startsWith(q)) score = 1;
+    else if (haystack.includes(q)) score = 2;
+    else return;
+    seen.add(dedup);
+    scored.push({ city, zone, score });
+  };
+  for (const e of ALL_ENTRIES) {
+    consider(e.city, e.zone, normalizePlace(e.city));
+  }
+  if (q.includes("/") || q.length >= 3) {
+    for (const e of ALL_ENTRIES) {
+      consider(e.city, e.zone, e.zone.toLowerCase());
+    }
+  }
+  scored.sort((a, b) => a.score - b.score || a.city.localeCompare(b.city));
+  return scored.slice(0, limit).map(({ city, zone }) => ({
+    city,
+    zone,
+    offsetLabel: zoneParts(zone, nowMs).offsetLabel || formatOffsetLabel(0)
+  }));
+}
+
 // src/clock/parser.ts
 var DIRECTIVES = /* @__PURE__ */ new Set([
   "analog",
@@ -154,7 +331,10 @@ var DIRECTIVES = /* @__PURE__ */ new Set([
   "time-24",
   "no-title",
   "direction",
-  "color-by"
+  "color-by",
+  "fill-tint",
+  "fill-solid",
+  "fill-outline"
 ]);
 var WEEKDAY_ABBR = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
 function weekdayIndex(token) {
@@ -186,9 +366,6 @@ function isValidZone(zone) {
     return false;
   }
 }
-function looksLikeZone(token) {
-  return token.includes("/") || token === "UTC" || coordsFor(token) !== null;
-}
 function defaultWorkDays() {
   return { Mon: true, Tue: true, Wed: true, Thu: true, Fri: true };
 }
@@ -218,7 +395,7 @@ function parseDays(rest) {
   }
   return any ? days : null;
 }
-function zoneCity(zone) {
+function zoneCity2(zone) {
   const seg = zone.split("/").pop() ?? zone;
   return seg.replace(/_/g, " ");
 }
@@ -322,6 +499,14 @@ function parseClock(content, palette) {
         case "no-title":
           result.noTitle = true;
           break;
+        case "fill-tint":
+        case "fill-solid":
+        case "fill-outline": {
+          const fm = fillModeFromToken(key);
+          if (fm === "solid" || fm === "outline") result.fillMode = fm;
+          else delete result.fillMode;
+          break;
+        }
         case "color-by": {
           const v = rest.trim().toLowerCase();
           const modes = ["place", "work", "daylight", "time", "none"];
@@ -343,50 +528,102 @@ function parseClock(content, palette) {
       }
       continue;
     }
-    const zoneIdx = tokens.findIndex((t) => looksLikeZone(t));
-    if (zoneIdx < 0) {
-      warn(
-        lineNum,
-        `No time zone found in "${trimmed}" \u2014 expected an IANA zone like America/New_York.`
-      );
-      continue;
-    }
-    const zone = tokens[zoneIdx];
-    const placeTokens = tokens.slice(0, zoneIdx);
+    const asIdx = tokens.findIndex((t) => t.toLowerCase() === "as");
+    let anchor;
     let label = null;
     let color;
-    const afterZone = tokens.slice(zoneIdx + 1);
-    const asIdx = afterZone.findIndex((t) => t.toLowerCase() === "as");
     if (asIdx >= 0) {
+      anchor = tokens.slice(0, asIdx).join(" ").trim();
       const ex = extractColor(
-        afterZone.slice(asIdx + 1).join(" ").trim(),
+        tokens.slice(asIdx + 1).join(" ").trim(),
         palette,
         void 0,
         lineNum
       );
       if (ex.label) label = ex.label;
       color = ex.color;
-    } else if (palette && afterZone.length === 1) {
-      color = resolveColor(afterZone[0], palette) ?? void 0;
+    } else {
+      const ex = extractColor(
+        tokens.join(" ").trim(),
+        palette,
+        void 0,
+        lineNum
+      );
+      anchor = ex.label.trim();
+      color = ex.color;
     }
-    const place = placeTokens.join(" ").trim() || zoneCity(zone);
-    if (!isValidZone(zone)) {
+    if (!anchor) {
       warn(
         lineNum,
-        `Unknown time zone "${zone}" \u2014 row skipped (use an IANA zone like America/New_York).`
+        `Empty zone on "${trimmed}" \u2014 expected a city, IANA zone, or UTC offset.`
       );
       continue;
     }
-    const coords = coordsFor(zone);
-    entries.push({
-      place,
-      zone,
-      label: label ?? place,
-      lat: coords?.lat ?? null,
-      lon: coords?.lon ?? null,
-      color: color ?? null,
-      lineNumber: lineNum
-    });
+    let entry;
+    const fixedOffset = parseFixedOffset(anchor);
+    if (fixedOffset !== null) {
+      const offLabel = formatOffsetLabel(fixedOffset);
+      entry = {
+        kind: "fixed",
+        place: offLabel,
+        zone: offLabel,
+        fixedOffsetMin: fixedOffset,
+        label: label ?? offLabel,
+        lat: null,
+        lon: null,
+        color: color ?? null,
+        lineNumber: lineNum
+      };
+    } else if (anchor.includes("/")) {
+      if (!isValidZone(anchor)) {
+        warn(
+          lineNum,
+          `Unknown IANA zone "${anchor}" \u2014 row skipped (e.g. America/New_York). Or give a UTC offset like UTC-5.`
+        );
+        continue;
+      }
+      const coords = coordsFor(anchor);
+      const place = zoneCity2(anchor);
+      entry = {
+        kind: "iana",
+        place,
+        zone: anchor,
+        fixedOffsetMin: null,
+        label: label ?? place,
+        lat: coords?.lat ?? null,
+        lon: coords?.lon ?? null,
+        color: color ?? null,
+        lineNumber: lineNum
+      };
+    } else {
+      const res = resolvePlace(anchor);
+      if (res.kind === "ambiguous") {
+        const list = res.candidates.map((c) => c.zone).join(", ");
+        softError(
+          lineNum,
+          `"${anchor}" is ambiguous \u2014 did you mean ${list}? Use the IANA zone to disambiguate.`
+        );
+        continue;
+      }
+      if (res.kind === "unknown") {
+        const hint = res.suggestion ? ` Did you mean ${res.suggestion}?` : " Give a city, an IANA zone (America/New_York), or a UTC offset (UTC-5).";
+        warn(lineNum, `Unknown place "${anchor}" \u2014 row skipped.${hint}`);
+        continue;
+      }
+      const coords = coordsFor(res.zone);
+      entry = {
+        kind: "iana",
+        place: res.city,
+        zone: res.zone,
+        fixedOffsetMin: null,
+        label: label ?? res.city,
+        lat: coords?.lat ?? null,
+        lon: coords?.lon ?? null,
+        color: color ?? null,
+        lineNumber: lineNum
+      };
+    }
+    entries.push(entry);
   }
   if (!headerParsed) {
     return fail(0, 'Expected "clock [Title]" as the first line.');
@@ -408,13 +645,16 @@ function parseClock(content, palette) {
   if (entries.length === 0) {
     softError(
       result.titleLineNumber ?? 1,
-      'A clock needs at least one place row (e.g. "London Europe/London").'
+      'A clock needs at least one zone row (e.g. "London as UK team").'
     );
   }
   return result;
 }
 
 export {
+  normalizePlace,
+  resolvePlace,
+  searchZones,
   parseClock
 };
-//# sourceMappingURL=chunk-3XPUDB7B.js.map
+//# sourceMappingURL=chunk-FY5MSZAP.js.map

package/dist/{chunk-M5RXSRO2.js → chunk-GCYTI3DE.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-PDKUANDZ.js";
 import {
   layoutGraph
-} from "./chunk-SCQ5VPUF.js";
+} from "./chunk-HFMYN6N2.js";
 import {
   appendArrowheadMarkers
 } from "./chunk-LP7EC4MI.js";
@@ -14,7 +14,7 @@ import {
   renderNoteBadge,
   renderNoteBox,
   renderNoteConnector
-} from "./chunk-JEUJOX5X.js";
+} from "./chunk-J7TLCB2Q.js";
 import {
   EDGE_STROKE_WIDTH,
   NODE_STROKE_WIDTH
@@ -32,14 +32,17 @@ import {
 } from "./chunk-6KFWC4CO.js";
 import {
   measureText
-} from "./chunk-5LWQH6QV.js";
+} from "./chunk-WCT3NYCV.js";
 import {
   contrastText,
   shapeFill
-} from "./chunk-P6T66CCZ.js";
+} from "./chunk-WBM7ZNDI.js";
 import {
   parseFlowchart
-} from "./chunk-GBE54KY6.js";
+} from "./chunk-6EJITS44.js";
+import {
+  fillModeFromOptions
+} from "./chunk-BRENJ2BQ.js";
 
 // src/graph/flowchart-renderer.ts
 import * as d3Selection from "d3-selection";
@@ -71,28 +74,34 @@ function shapeDefaultColor(shape, palette, isEndTerminal, colorOff) {
       return palette.colors.blue;
   }
 }
-function nodeFill(palette, isDark, shape, nodeColor, isEndTerminal, colorOff, solid) {
+function nodeFill(palette, isDark, shape, nodeColor, isEndTerminal, colorOff, fillMode) {
   const color = nodeColor ?? shapeDefaultColor(shape, palette, isEndTerminal, colorOff);
-  return shapeFill(palette, color, isDark, {
-    ...solid !== void 0 && { solid }
-  });
+  return shapeFill(palette, color, isDark, { mode: fillMode });
 }
 function nodeStroke(palette, shape, nodeColor, isEndTerminal, colorOff) {
   return nodeColor ?? shapeDefaultColor(shape, palette, isEndTerminal, colorOff);
 }
-function renderTerminal(g, node, palette, isDark, isEnd, colorOff, solid, sNodeStrokeWidth = NODE_STROKE_WIDTH) {
+function renderTerminal(g, node, palette, isDark, isEnd, colorOff, fillMode, sNodeStrokeWidth = NODE_STROKE_WIDTH) {
   const w = node.width;
   const h = node.height;
   const rx = h / 2;
   g.append("rect").attr("x", -w / 2).attr("y", -h / 2).attr("width", w).attr("height", h).attr("rx", rx).attr("ry", rx).attr(
     "fill",
-    nodeFill(palette, isDark, node.shape, node.color, isEnd, colorOff, solid)
+    nodeFill(
+      palette,
+      isDark,
+      node.shape,
+      node.color,
+      isEnd,
+      colorOff,
+      fillMode
+    )
   ).attr(
     "stroke",
     nodeStroke(palette, node.shape, node.color, isEnd, colorOff)
   ).attr("stroke-width", sNodeStrokeWidth);
 }
-function renderProcess(g, node, palette, isDark, colorOff, solid, sNodeStrokeWidth = NODE_STROKE_WIDTH) {
+function renderProcess(g, node, palette, isDark, colorOff, fillMode, sNodeStrokeWidth = NODE_STROKE_WIDTH) {
   const w = node.width;
   const h = node.height;
   g.append("rect").attr("x", -w / 2).attr("y", -h / 2).attr("width", w).attr("height", h).attr("rx", 3).attr("ry", 3).attr(
@@ -104,14 +113,14 @@ function renderProcess(g, node, palette, isDark, colorOff, solid, sNodeStrokeWid
       node.color,
       void 0,
       colorOff,
-      solid
+      fillMode
     )
   ).attr(
     "stroke",
     nodeStroke(palette, node.shape, node.color, void 0, colorOff)
   ).attr("stroke-width", sNodeStrokeWidth);
 }
-function renderDecision(g, node, palette, isDark, colorOff, solid, sNodeStrokeWidth = NODE_STROKE_WIDTH) {
+function renderDecision(g, node, palette, isDark, colorOff, fillMode, sNodeStrokeWidth = NODE_STROKE_WIDTH) {
   const w = node.width / 2;
   const h = node.height / 2;
   const points = [`${0},${-h}`, `${w},${0}`, `${0},${h}`, `${-w},${0}`].join(
@@ -126,14 +135,14 @@ function renderDecision(g, node, palette, isDark, colorOff, solid, sNodeStrokeWi
       node.color,
       void 0,
       colorOff,
-      solid
+      fillMode
     )
   ).attr(
     "stroke",
     nodeStroke(palette, node.shape, node.color, void 0, colorOff)
   ).attr("stroke-width", sNodeStrokeWidth);
 }
-function renderIO(g, node, palette, isDark, colorOff, solid, sNodeStrokeWidth = NODE_STROKE_WIDTH, sIoSkew = IO_SKEW) {
+function renderIO(g, node, palette, isDark, colorOff, fillMode, sNodeStrokeWidth = NODE_STROKE_WIDTH, sIoSkew = IO_SKEW) {
   const w = node.width / 2;
   const h = node.height / 2;
   const sk = sIoSkew;
@@ -152,14 +161,14 @@ function renderIO(g, node, palette, isDark, colorOff, solid, sNodeStrokeWidth =
       node.color,
       void 0,
       colorOff,
-      solid
+      fillMode
     )
   ).attr(
     "stroke",
     nodeStroke(palette, node.shape, node.color, void 0, colorOff)
   ).attr("stroke-width", sNodeStrokeWidth);
 }
-function renderSubroutine(g, node, palette, isDark, colorOff, solid, sNodeStrokeWidth = NODE_STROKE_WIDTH, sSubroutineInset = SUBROUTINE_INSET) {
+function renderSubroutine(g, node, palette, isDark, colorOff, fillMode, sNodeStrokeWidth = NODE_STROKE_WIDTH, sSubroutineInset = SUBROUTINE_INSET) {
   const w = node.width;
   const h = node.height;
   const s = nodeStroke(palette, node.shape, node.color, void 0, colorOff);
@@ -170,14 +179,14 @@ function renderSubroutine(g, node, palette, isDark, colorOff, solid, sNodeStroke
     node.color,
     void 0,
     colorOff,
-    solid
+    fillMode
   );
-  const innerStroke = solid ? contrastText(fill, palette.textOnFillLight, palette.textOnFillDark) : s;
+  const innerStroke = fillMode === "solid" ? contrastText(fill, palette.textOnFillLight, palette.textOnFillDark) : s;
   g.append("rect").attr("x", -w / 2).attr("y", -h / 2).attr("width", w).attr("height", h).attr("rx", 3).attr("ry", 3).attr("fill", fill).attr("stroke", s).attr("stroke-width", sNodeStrokeWidth);
   g.append("line").attr("x1", -w / 2 + sSubroutineInset).attr("y1", -h / 2).attr("x2", -w / 2 + sSubroutineInset).attr("y2", h / 2).attr("stroke", innerStroke).attr("stroke-width", sNodeStrokeWidth);
   g.append("line").attr("x1", w / 2 - sSubroutineInset).attr("y1", -h / 2).attr("x2", w / 2 - sSubroutineInset).attr("y2", h / 2).attr("stroke", innerStroke).attr("stroke-width", sNodeStrokeWidth);
 }
-function renderDocument(g, node, palette, isDark, colorOff, solid, sNodeStrokeWidth = NODE_STROKE_WIDTH, sDocWaveHeight = DOC_WAVE_HEIGHT) {
+function renderDocument(g, node, palette, isDark, colorOff, fillMode, sNodeStrokeWidth = NODE_STROKE_WIDTH, sDocWaveHeight = DOC_WAVE_HEIGHT) {
   const w = node.width;
   const h = node.height;
   const waveH = sDocWaveHeight;
@@ -201,14 +210,14 @@ function renderDocument(g, node, palette, isDark, colorOff, solid, sNodeStrokeWi
       node.color,
       void 0,
       colorOff,
-      solid
+      fillMode
     )
   ).attr(
     "stroke",
     nodeStroke(palette, node.shape, node.color, void 0, colorOff)
   ).attr("stroke-width", sNodeStrokeWidth);
 }
-function renderNodeShape(g, node, palette, isDark, endTerminalIds, colorOff, solid, sNodeStrokeWidth = NODE_STROKE_WIDTH, sIoSkew = IO_SKEW, sSubroutineInset = SUBROUTINE_INSET, sDocWaveHeight = DOC_WAVE_HEIGHT) {
+function renderNodeShape(g, node, palette, isDark, endTerminalIds, colorOff, fillMode, sNodeStrokeWidth = NODE_STROKE_WIDTH, sIoSkew = IO_SKEW, sSubroutineInset = SUBROUTINE_INSET, sDocWaveHeight = DOC_WAVE_HEIGHT) {
   switch (node.shape) {
     case "terminal":
       renderTerminal(
@@ -218,7 +227,7 @@ function renderNodeShape(g, node, palette, isDark, endTerminalIds, colorOff, sol
         isDark,
         endTerminalIds.has(node.id),
         colorOff,
-        solid,
+        fillMode,
         sNodeStrokeWidth
       );
       break;
@@ -229,7 +238,7 @@ function renderNodeShape(g, node, palette, isDark, endTerminalIds, colorOff, sol
         palette,
         isDark,
         colorOff,
-        solid,
+        fillMode,
         sNodeStrokeWidth
       );
       break;
@@ -240,7 +249,7 @@ function renderNodeShape(g, node, palette, isDark, endTerminalIds, colorOff, sol
         palette,
         isDark,
         colorOff,
-        solid,
+        fillMode,
         sNodeStrokeWidth
       );
       break;
@@ -251,7 +260,7 @@ function renderNodeShape(g, node, palette, isDark, endTerminalIds, colorOff, sol
         palette,
         isDark,
         colorOff,
-        solid,
+        fillMode,
         sNodeStrokeWidth,
         sIoSkew
       );
@@ -263,7 +272,7 @@ function renderNodeShape(g, node, palette, isDark, endTerminalIds, colorOff, sol
         palette,
         isDark,
         colorOff,
-        solid,
+        fillMode,
         sNodeStrokeWidth,
         sSubroutineInset
       );
@@ -275,7 +284,7 @@ function renderNodeShape(g, node, palette, isDark, endTerminalIds, colorOff, sol
         palette,
         isDark,
         colorOff,
-        solid,
+        fillMode,
         sNodeStrokeWidth,
         sDocWaveHeight
       );
@@ -408,7 +417,7 @@ function renderFlowchart(container, graph, layout, palette, isDark, onClickItem,
     }
   }
   const colorOff = graph.options?.["color"] === "off";
-  const solid = graph.options?.["solid-fill"] === "on";
+  const fillMode = fillModeFromOptions(graph.options ?? {});
   const noNotes = graph.options?.["no-notes"] === "on";
   for (const node of layout.nodes) {
     const nodeG = contentG.append("g").attr("transform", `translate(${node.x}, ${node.y})`).attr("class", "fc-node").attr("data-line-number", String(node.lineNumber)).attr("data-node-id", node.id);
@@ -425,7 +434,7 @@ function renderFlowchart(container, graph, layout, palette, isDark, onClickItem,
       isDark,
       endTerminalIds,
       colorOff,
-      solid,
+      fillMode,
       sNodeStrokeWidth,
       sIoSkew,
       sSubroutineInset,
@@ -439,7 +448,7 @@ function renderFlowchart(container, graph, layout, palette, isDark, onClickItem,
       node.color,
       isEnd,
       colorOff,
-      solid
+      fillMode
     );
     nodeG.append("text").attr("x", 0).attr("y", 0).attr("text-anchor", "middle").attr("dominant-baseline", "central").attr(
       "fill",
@@ -527,4 +536,4 @@ export {
   renderFlowchart,
   renderFlowchartForExport
 };
-//# sourceMappingURL=chunk-M5RXSRO2.js.map
+//# sourceMappingURL=chunk-GCYTI3DE.js.map