@diagrammo/dgmo 0.50.2 → 0.52.0

package/dist/{chunk-C2CVAM3U.js → chunk-QGATPIPX.js}

@@ -1,21 +1,25 @@
 import {
   GANTT_BOOLEAN_SET,
   GANTT_OPTION_SET
-} from "./chunk-U2HGPLZS.js";
+} from "./chunk-FQ7HTV52.js";
 import {
   parseDuration,
   parseOffset,
   parseOffsetPrefix
 } from "./chunk-USZW2HHU.js";
+import {
+  parseDateToken,
+  toInternal
+} from "./chunk-DAOFNU6J.js";
 import {
   getSeriesColors
-} from "./chunk-P6T66CCZ.js";
+} from "./chunk-WBM7ZNDI.js";
 import {
   matchTagBlockHeading,
   stripDefaultModifier,
   tagAttrKey,
   validateTagGroupNames
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-HHKO6SKY.js";
 import {
   normalizeName
 } from "./chunk-NOTA6TEI.js";
@@ -28,7 +32,7 @@ import {
   splitNameAndMeta,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-OTAL43EH.js";
+} from "./chunk-BRENJ2BQ.js";
 import {
   formatDgmoError,
   makeDgmoError
@@ -38,13 +42,7 @@ import {
 var GROUP_RE = /^\[(.+?)\]\s*(.*)$/;
 var DEPENDENCY_RE = /^(?:-(.+?))?->\s*(.+)$/;
 var COMMENT_RE = /^\/\//;
-var ERA_RE = /^era\s+(\d{4}(?:-\d{2}(?:-\d{2}(?: \d{2}:\d{2})?)?)?)\s*(?:->|\u2013>)\s*(\d{4}(?:-\d{2}(?:-\d{2}(?: \d{2}:\d{2})?)?)?)\s+(.+)$/i;
-var MARKER_RE = /^marker\s+(\d{4}(?:-\d{2}(?:-\d{2}(?: \d{2}:\d{2})?)?)?)\s+(.+)$/i;
-var HOLIDAY_DATE_RE = /^(\d{4}-\d{2}-\d{2})\s+(.+)$/;
-var HOLIDAY_RANGE_RE = /^(\d{4}-\d{2}-\d{2})\s*(?:->|\u2013>)\s*(\d{4}-\d{2}-\d{2})\s+(.+)$/;
 var WORKWEEK_RE = /^workweek\s+(.+)$/i;
-var ERA_ENTRY_RE = /^(\d{4}(?:-\d{2}(?:-\d{2}(?: \d{2}:\d{2})?)?)?)\s*(?:->|\u2013>)\s*(\d{4}(?:-\d{2}(?:-\d{2}(?: \d{2}:\d{2})?)?)?)\s+(.+)$/;
-var MARKER_ENTRY_RE = /^(\d{4}(?:-\d{2}(?:-\d{2}(?: \d{2}:\d{2})?)?)?)\s+(.+)$/;
 var OFFSET_PREFIX_RE = /^\+(\d+(?:\.\d+)?(?:min|bd|d|w|m|q|y|h|s))\s+(.*)/;
 var DURATION_TOKEN_RE = /^(\d+(?:\.\d+)?)(min|bd|d|w|m|q|y|h|s)(\?)?$/;
 var LAG_ARROW_RE = /^-(\d+(?:\.\d+)?(?:min|bd|d|w|m|q|y|h|s))->\s*(.*)/;
@@ -68,9 +66,65 @@ var WEEKDAY_MAP = {
   saturday: "sat",
   sunday: "sun"
 };
+function prescanGanttYear(lines, order) {
+  for (const raw of lines) {
+    let cand = raw.trim();
+    if (!cand) continue;
+    cand = cand.replace(
+      /^(?:start|marker|holiday|era|sprint-start|today-marker)\s+/i,
+      ""
+    );
+    cand = cand.replace(/^(?:->|–>)\s*/, "");
+    const res = parseDateToken(cand, { dateOrder: order });
+    if (res?.token.year != null) return res.token.sign * res.token.year;
+  }
+  return null;
+}
 function parseGantt(content, palette) {
   const lines = content.split("\n");
   const diagnostics = [];
+  let dateOrder = "mdy";
+  let directiveYear = null;
+  let noCurrentYear = false;
+  for (const raw of lines) {
+    const t = raw.trim();
+    const dm = t.match(/^date-order\s+(mdy|dmy)$/i);
+    if (dm) dateOrder = dm[1].toLowerCase();
+    const ym = t.match(/^year\s+(\d{1,4})$/i);
+    if (ym) directiveYear = parseInt(ym[1], 10);
+    if (t.toLowerCase() === "no-current-year") noCurrentYear = true;
+  }
+  const currentYear = (/* @__PURE__ */ new Date()).getFullYear();
+  const baseYear = directiveYear ?? prescanGanttYear(lines, dateOrder);
+  const resolveToken = (tok) => {
+    if (tok.year != null) return toInternal(tok, tok.year);
+    if (baseYear == null && noCurrentYear) return null;
+    return toInternal(tok, baseYear ?? currentYear);
+  };
+  const wholeDate = (rawStr, minGrain = 1) => {
+    const s = rawStr.trim();
+    const res = parseDateToken(s, { dateOrder });
+    if (res?.consumed !== s.length || res.token.invalidTime) return null;
+    if (res.token.grain < minGrain) return null;
+    const iso = resolveToken(res.token);
+    return iso == null ? null : { iso, grain: res.token.grain, hasTime: res.token.hasTime };
+  };
+  const leadingDate = (s) => {
+    const res = parseDateToken(s, { dateOrder });
+    if (!res || res.consumed === 0 || res.token.invalidTime) return null;
+    const iso = resolveToken(res.token);
+    if (iso == null) return null;
+    return { iso, grain: res.token.grain, rest: s.slice(res.consumed) };
+  };
+  const leadingRange = (s) => {
+    const a = leadingDate(s);
+    if (!a) return null;
+    const arrow = a.rest.match(/^\s*(?:->|–>)\s*/);
+    if (!arrow) return null;
+    const b = leadingDate(a.rest.slice(arrow[0].length));
+    if (!b) return null;
+    return { start: a.iso, end: b.iso, rest: b.rest };
+  };
   const holidays = {
     dates: [],
     ranges: [],
@@ -98,7 +152,7 @@ function parseGantt(content, palette) {
       sprintNumber: null,
       sprintStart: null,
       sprintMode: null,
-      solidFill: false,
+      fillMode: void 0,
       noTitle: false
     },
     diagnostics,
@@ -207,21 +261,21 @@ function parseGantt(content, palette) {
       if (indent <= holidaysBlockIndent) {
         inHolidaysBlock = false;
       } else {
-        const rangeMatch = line.match(HOLIDAY_RANGE_RE);
-        if (rangeMatch) {
+        const rangeMatch = leadingRange(line);
+        if (rangeMatch && rangeMatch.rest.trim()) {
           holidays.ranges.push({
-            startDate: rangeMatch[1],
-            endDate: rangeMatch[2],
-            label: rangeMatch[3].trim(),
+            startDate: rangeMatch.start,
+            endDate: rangeMatch.end,
+            label: rangeMatch.rest.trim(),
             lineNumber
           });
           continue;
         }
-        const dateMatch = line.match(HOLIDAY_DATE_RE);
-        if (dateMatch) {
+        const dateMatch = leadingDate(line);
+        if (dateMatch?.grain === 3 && dateMatch.rest.trim()) {
           holidays.dates.push({
-            date: dateMatch[1],
-            label: dateMatch[2].trim(),
+            date: dateMatch.iso,
+            label: dateMatch.rest.trim(),
             lineNumber
           });
           continue;
@@ -252,9 +306,9 @@ function parseGantt(content, palette) {
         inEraBlock = false;
       } else {
         if (COMMENT_RE.test(line)) continue;
-        const eraEntryMatch = line.match(ERA_ENTRY_RE);
-        if (eraEntryMatch) {
-          const eraLabelRaw = eraEntryMatch[3].trim();
+        const eraEntryMatch = leadingRange(line);
+        if (eraEntryMatch && eraEntryMatch.rest.trim()) {
+          const eraLabelRaw = eraEntryMatch.rest.trim();
           const eraExtracted = extractColor(
             eraLabelRaw,
             palette,
@@ -262,8 +316,8 @@ function parseGantt(content, palette) {
             lineNumber
           );
           result.eras.push({
-            startDate: eraEntryMatch[1],
-            endDate: eraEntryMatch[2],
+            startDate: eraEntryMatch.start,
+            endDate: eraEntryMatch.end,
             label: eraExtracted.label,
             color: eraExtracted.color || null,
             lineNumber
@@ -282,9 +336,9 @@ function parseGantt(content, palette) {
         inMarkerBlock = false;
       } else {
         if (COMMENT_RE.test(line)) continue;
-        const markerEntryMatch = line.match(MARKER_ENTRY_RE);
-        if (markerEntryMatch) {
-          const markerLabelRaw = markerEntryMatch[2].trim();
+        const markerEntryMatch = leadingDate(line);
+        if (markerEntryMatch && markerEntryMatch.rest.trim()) {
+          const markerLabelRaw = markerEntryMatch.rest.trim();
           const markerExtracted = extractColor(
             markerLabelRaw,
             palette,
@@ -292,7 +346,7 @@ function parseGantt(content, palette) {
             lineNumber
           );
           result.markers.push({
-            date: markerEntryMatch[1],
+            date: markerEntryMatch.iso,
             label: markerExtracted.label,
             color: markerExtracted.color || null,
             lineNumber
@@ -543,23 +597,28 @@ function parseGantt(content, palette) {
       }
     }
     if (COMMENT_RE.test(line)) continue;
+    if (/^date-order\s+(mdy|dmy)$/i.test(line) || /^year\s+\d{1,4}$/i.test(line) || line.toLowerCase() === "no-current-year") {
+      result.options.optionLineNumbers[line.split(/\s+/)[0].toLowerCase()] = lineNumber;
+      continue;
+    }
     if (line.toLowerCase() === "holiday" || line.toLowerCase() === "holidays") {
       inHolidaysBlock = true;
       holidaysBlockIndent = indent;
       result.options.holidaysLineNumber = lineNumber;
       continue;
     }
-    const holidayInlineMatch = line.match(
-      /^holiday\s+(\d{4}-\d{2}-\d{2})\s+(.+)$/i
-    );
-    if (holidayInlineMatch) {
-      holidays.dates.push({
-        date: holidayInlineMatch[1],
-        label: holidayInlineMatch[2].trim(),
-        lineNumber
-      });
-      result.options.holidaysLineNumber ??= lineNumber;
-      continue;
+    const holidayInlinePrefix = line.match(/^holiday\s+(.+)$/i);
+    if (holidayInlinePrefix) {
+      const ld = leadingDate(holidayInlinePrefix[1]);
+      if (ld?.grain === 3 && ld.rest.trim()) {
+        holidays.dates.push({
+          date: ld.iso,
+          label: ld.rest.trim(),
+          lineNumber
+        });
+        result.options.holidaysLineNumber ??= lineNumber;
+        continue;
+      }
     }
     const tagMatch = matchTagBlockHeading(line);
     if (tagMatch) {
@@ -598,45 +657,51 @@ function parseGantt(content, palette) {
       eraBlockIndent = indent;
       continue;
     }
-    const eraMatch = line.match(ERA_RE);
-    if (eraMatch) {
-      const eraLabelRaw = eraMatch[3].trim();
-      const eraExtracted = extractColor(
-        eraLabelRaw,
-        palette,
-        diagnostics,
-        lineNumber
-      );
-      result.eras.push({
-        startDate: eraMatch[1],
-        endDate: eraMatch[2],
-        label: eraExtracted.label,
-        color: eraExtracted.color || null,
-        lineNumber
-      });
-      continue;
+    const eraInlinePrefix = line.match(/^era\s+(.+)$/i);
+    if (eraInlinePrefix) {
+      const eraMatch = leadingRange(eraInlinePrefix[1]);
+      if (eraMatch && eraMatch.rest.trim()) {
+        const eraLabelRaw = eraMatch.rest.trim();
+        const eraExtracted = extractColor(
+          eraLabelRaw,
+          palette,
+          diagnostics,
+          lineNumber
+        );
+        result.eras.push({
+          startDate: eraMatch.start,
+          endDate: eraMatch.end,
+          label: eraExtracted.label,
+          color: eraExtracted.color || null,
+          lineNumber
+        });
+        continue;
+      }
     }
     if (line.toLowerCase() === "marker") {
       inMarkerBlock = true;
       markerBlockIndent = indent;
       continue;
     }
-    const markerMatch = line.match(MARKER_RE);
-    if (markerMatch) {
-      const markerLabelRaw = markerMatch[2].trim();
-      const markerExtracted = extractColor(
-        markerLabelRaw,
-        palette,
-        diagnostics,
-        lineNumber
-      );
-      result.markers.push({
-        date: markerMatch[1],
-        label: markerExtracted.label,
-        color: markerExtracted.color || null,
-        lineNumber
-      });
-      continue;
+    const markerInlinePrefix = line.match(/^marker\s+(.+)$/i);
+    if (markerInlinePrefix) {
+      const markerMatch = leadingDate(markerInlinePrefix[1]);
+      if (markerMatch && markerMatch.rest.trim()) {
+        const markerLabelRaw = markerMatch.rest.trim();
+        const markerExtracted = extractColor(
+          markerLabelRaw,
+          palette,
+          diagnostics,
+          lineNumber
+        );
+        result.markers.push({
+          date: markerMatch.iso,
+          label: markerExtracted.label,
+          color: markerExtracted.color || null,
+          lineNumber
+        });
+        continue;
+      }
     }
     {
       const registry = withTagAliases(
@@ -677,14 +742,15 @@ function parseGantt(content, palette) {
         }
         let explicitStart;
         if (rawStart !== void 0) {
-          if (!/^\d{4}-\d{2}-\d{2}(?: \d{2}:\d{2})?$/.test(rawStart)) {
+          const sd = wholeDate(rawStart, 3);
+          if (!sd) {
             softError(
               lineNumber,
-              `Invalid start date: "${rawStart}". Expected YYYY-MM-DD or YYYY-MM-DD HH:MM.`
+              `Invalid start date: "${rawStart}". Expected a date like YYYY-MM-DD, 7/4, or Jul 4 (optionally with HH:MM).`
             );
             continue;
           }
-          explicitStart = rawStart;
+          explicitStart = sd.iso;
         }
         const taskName = split.name.trim();
         if (!taskName) {
@@ -729,8 +795,14 @@ function parseGantt(content, palette) {
         case "today-marker":
           result.options.todayMarker = "on";
           break;
-        case "solid-fill":
-          result.options.solidFill = true;
+        case "fill-solid":
+          result.options.fillMode = "solid";
+          break;
+        case "fill-outline":
+          result.options.fillMode = "outline";
+          break;
+        case "fill-tint":
+          result.options.fillMode = void 0;
           break;
         case "no-title":
           result.options.noTitle = true;
@@ -762,22 +834,24 @@ function parseGantt(content, palette) {
       result.options.optionLineNumbers[key] = lineNumber;
       switch (key) {
         case "start":
-          result.options.start = value;
+          result.options.start = wholeDate(value)?.iso ?? value;
           break;
         case "title":
           result.options.title = value;
           result.options.titleLineNumber = lineNumber;
           break;
-        case "today-marker":
-          if (/^\d{4}-\d{2}-\d{2}(?: \d{2}:\d{2})?$/.test(value)) {
-            result.options.todayMarker = value;
+        case "today-marker": {
+          const td = wholeDate(value, 3);
+          if (td) {
+            result.options.todayMarker = td.iso;
           } else {
             warn(
               lineNumber,
-              `Invalid today-marker value: "${value}". Expected YYYY-MM-DD.`
+              `Invalid today-marker value: "${value}". Expected a date like YYYY-MM-DD, 7/4, or Jul 4.`
             );
           }
           break;
+        }
         case "critical-path":
           result.options.criticalPath = true;
           break;
@@ -845,15 +919,16 @@ function parseGantt(content, palette) {
           break;
         }
         case "sprint-start": {
-          if (!/^\d{4}-\d{2}-\d{2}$/.test(value)) {
+          const ss = wholeDate(value, 3);
+          if (!ss || ss.hasTime) {
             warn(
               lineNumber,
-              `sprint-start requires a full date (YYYY-MM-DD), got "${value}".`
+              `sprint-start requires a full date (e.g. YYYY-MM-DD, 7/4, or Jul 4), got "${value}".`
             );
-          } else if (Number.isNaN((/* @__PURE__ */ new Date(value + "T00:00:00")).getTime())) {
+          } else if (Number.isNaN((/* @__PURE__ */ new Date(ss.iso + "T00:00:00")).getTime())) {
             warn(lineNumber, `sprint-start is not a valid date: "${value}".`);
           } else {
-            result.options.sprintStart = value;
+            result.options.sprintStart = ss.iso;
           }
           break;
         }
@@ -1061,10 +1136,14 @@ function parseGantt(content, palette) {
     }
     if (metadata["start"]) {
       const raw = metadata["start"];
-      if (!/^\d{4}-\d{2}-\d{2}(?: \d{2}:\d{2})?$/.test(raw)) {
-        softError(ln, `Invalid start date: "${raw}". Expected YYYY-MM-DD.`);
+      const sd = wholeDate(raw, 3);
+      if (!sd) {
+        softError(
+          ln,
+          `Invalid start date: "${raw}". Expected a date like YYYY-MM-DD, 7/4, or Jul 4.`
+        );
       } else {
-        explicitStart = raw;
+        explicitStart = sd.iso;
       }
       delete metadata["start"];
     }
@@ -1253,4 +1332,4 @@ export {
   GANTT_KNOWN_OPTIONS,
   GANTT_KNOWN_BOOLEANS
 };
-//# sourceMappingURL=chunk-C2CVAM3U.js.map
+//# sourceMappingURL=chunk-QGATPIPX.js.map

package/dist/{chunk-PZFVK3IH.js → chunk-QHXCAEMX.js}

@@ -18,12 +18,15 @@ import {
 import {
   CHAR_WIDTH_RATIO,
   measureText
-} from "./chunk-5LWQH6QV.js";
+} from "./chunk-WCT3NYCV.js";
 import {
   contrastText,
   getSeriesColors,
   shapeFill
-} from "./chunk-P6T66CCZ.js";
+} from "./chunk-WBM7ZNDI.js";
+import {
+  fillModeFromOptions
+} from "./chunk-BRENJ2BQ.js";
 import {
   resolveColor
 } from "./chunk-TLVIHFRO.js";
@@ -102,10 +105,10 @@ function renderRing(container, parsed, palette, isDark, onClickItem, exportDims)
     }
     return seriesColors[i % seriesColors.length];
   };
-  const solid = parsed.options["solid-fill"] === "on";
+  const fillMode = fillModeFromOptions(parsed.options);
   const layerColors = parsed.layers.map((l, i) => resolveLayerColor(l, i));
   const layerFills = layerColors.map(
-    (c) => shapeFill(palette, c, isDark, { solid })
+    (c) => shapeFill(palette, c, isDark, { mode: fillMode })
   );
   const diagramG = svg.append("g").attr("class", "ring-body");
   const strokeColor = palette.text;
@@ -293,4 +296,4 @@ export {
   renderRing,
   renderRingForExport
 };
-//# sourceMappingURL=chunk-PZFVK3IH.js.map
+//# sourceMappingURL=chunk-QHXCAEMX.js.map

package/dist/{chunk-BH3UYK36.js → chunk-QJMKPUYK.js}

@@ -8,7 +8,7 @@ import {
   stripDefaultModifier,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-HHKO6SKY.js";
 import {
   parseArrow,
   parseInArrowLabel
@@ -18,6 +18,7 @@ import {
   normalizeName
 } from "./chunk-NOTA6TEI.js";
 import {
+  FILL_FAMILY_TOKENS,
   OPTION_NOCOLON_RE,
   SEQUENCE_REGISTRY,
   extractColor,
@@ -26,7 +27,7 @@ import {
   splitNameAndMeta,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-OTAL43EH.js";
+} from "./chunk-BRENJ2BQ.js";
 import {
   NAME_DIAGNOSTIC_CODES,
   formatDgmoError,
@@ -38,7 +39,12 @@ import {
 
 // src/sequence/parser.ts
 var KNOWN_SEQ_OPTIONS = /* @__PURE__ */ new Set(["active-tag"]);
-var KNOWN_SEQ_BOOLEANS = /* @__PURE__ */ new Set(["solid-fill", "no-title"]);
+var KNOWN_SEQ_BOOLEANS = /* @__PURE__ */ new Set([
+  "fill-tint",
+  "fill-solid",
+  "fill-outline",
+  "no-title"
+]);
 var NO_PREFIX_ONLY_BOOLEANS = /* @__PURE__ */ new Set(["activations"]);
 var VALID_PARTICIPANT_TYPES = /* @__PURE__ */ new Set([
   "database",
@@ -549,7 +555,7 @@ function parseSequenceDgmo(content, palette) {
           continue;
         }
       }
-      if (KNOWN_SEQ_BOOLEANS.has(optLower) && (optLower === "solid-fill" || optLower === "no-title")) {
+      if (KNOWN_SEQ_BOOLEANS.has(optLower)) {
         if (contentStarted) {
           pushError(
             lineNumber,
@@ -557,6 +563,10 @@ function parseSequenceDgmo(content, palette) {
           );
           continue;
         }
+        if (FILL_FAMILY_TOKENS.has(optLower)) {
+          for (const t of FILL_FAMILY_TOKENS) delete result.options[t];
+          if (optLower === "fill-tint") continue;
+        }
         result.options[optLower] = "on";
         continue;
       }
@@ -1022,4 +1032,4 @@ export {
   parseSequenceDgmo,
   looksLikeSequence
 };
-//# sourceMappingURL=chunk-BH3UYK36.js.map
+//# sourceMappingURL=chunk-QJMKPUYK.js.map

package/dist/{chunk-HQCHYB5F.js → chunk-QOOUC2J5.js}

@@ -1,7 +1,7 @@
 import {
   measureText,
   truncateText
-} from "./chunk-5LWQH6QV.js";
+} from "./chunk-WCT3NYCV.js";
 
 // src/utils/legend-constants.ts
 var LEGEND_HEIGHT = 28;
@@ -49,4 +49,4 @@ export {
   LEGEND_TOGGLE_OFF_OPACITY,
   LEGEND_GEAR_PILL_W
 };
-//# sourceMappingURL=chunk-HQCHYB5F.js.map
+//# sourceMappingURL=chunk-QOOUC2J5.js.map

package/dist/{chunk-Z6XJQ6KO.js → chunk-QVENJMNX.js}

@@ -1,6 +1,6 @@
 import {
   SKETCH_DIAGNOSTIC_CODES
-} from "./chunk-XHVV4NVW.js";
+} from "./chunk-RT7ACF77.js";
 import {
   makeDgmoError
 } from "./chunk-CXK4DZH3.js";
@@ -449,4 +449,4 @@ export {
   collapseSketch,
   layoutSketch
 };
-//# sourceMappingURL=chunk-Z6XJQ6KO.js.map
+//# sourceMappingURL=chunk-QVENJMNX.js.map

package/dist/{chunk-IUMPEA64.js → chunk-QZX5S6R3.js}

@@ -11,15 +11,15 @@ import {
   LEGEND_PILL_FONT_SIZE,
   LEGEND_PILL_PAD,
   measureLegendText
-} from "./chunk-HQCHYB5F.js";
+} from "./chunk-QOOUC2J5.js";
 import {
   measureText
-} from "./chunk-5LWQH6QV.js";
+} from "./chunk-WCT3NYCV.js";
 import {
   injectDefaultTagMetadata,
   resolveTagColor,
   tagAttrKey
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-HHKO6SKY.js";
 
 // src/org/layout.ts
 import { hierarchy, tree } from "d3-hierarchy";
@@ -810,4 +810,4 @@ function layoutOrg(parsed, hiddenCounts, activeTagGroup, hiddenAttributes, expan
 export {
   layoutOrg
 };
-//# sourceMappingURL=chunk-IUMPEA64.js.map
+//# sourceMappingURL=chunk-QZX5S6R3.js.map