@diagrammo/dgmo 0.50.2 → 0.52.0

package/dist/{chunk-KQ57MHRO.js → chunk-ZEF5M5MB.js}

@@ -1,22 +1,22 @@
 import {
   parseGoal
-} from "./chunk-Q4V4XQWV.js";
+} from "./chunk-MUE65OTD.js";
 import {
   parseCountdown
-} from "./chunk-BTUTZMPT.js";
+} from "./chunk-FT3ZYWET.js";
 import {
   parseClock
-} from "./chunk-3XPUDB7B.js";
+} from "./chunk-FY5MSZAP.js";
 import {
   parseBracket
-} from "./chunk-QXKWYZNR.js";
+} from "./chunk-PRI2OD4E.js";
 import {
   allTasks,
   parseRaci
-} from "./chunk-PGEGPSCZ.js";
+} from "./chunk-4IHAV6O7.js";
 import {
   parseBody
-} from "./chunk-3UIKSPFB.js";
+} from "./chunk-Z5QVYKR7.js";
 import {
   EXTENDED_CHART_DOORS,
   parseChart,
@@ -25,120 +25,127 @@ import {
   parseHeatmap,
   parseSankey,
   parseScatter
-} from "./chunk-XEGTMVYY.js";
+} from "./chunk-EMLPOL77.js";
 import {
   parseWireframe
-} from "./chunk-I2WKW7C7.js";
+} from "./chunk-SMRFPVLQ.js";
 import {
   parseTechRadar
-} from "./chunk-TSA237IM.js";
+} from "./chunk-VILVLS7P.js";
 import {
   parseCycle
-} from "./chunk-6IAA2QQ2.js";
+} from "./chunk-7BIZCTAX.js";
 import {
   parseJourneyMap
-} from "./chunk-6HJBFVLO.js";
+} from "./chunk-XD6ZYURY.js";
 import {
   parsePyramid
-} from "./chunk-3P2DKJCG.js";
+} from "./chunk-ICPJPQ5C.js";
 import {
   parseRing
-} from "./chunk-3LKM6FMW.js";
+} from "./chunk-UNURMIQO.js";
 import {
   parseTreemap
-} from "./chunk-XJLKLU4D.js";
+} from "./chunk-ZNWAYU6N.js";
 import {
   parseBlock
-} from "./chunk-7L3R6I3U.js";
+} from "./chunk-4UNQ6X24.js";
 import {
   parseInfra
-} from "./chunk-VUJGMJE6.js";
+} from "./chunk-IM6PDDCE.js";
 import {
   parseGantt
-} from "./chunk-C2CVAM3U.js";
+} from "./chunk-QGATPIPX.js";
 import {
   parseMap
-} from "./chunk-GKC3HILQ.js";
+} from "./chunk-5NGAO4QK.js";
 import {
   parseBoxesAndLines
-} from "./chunk-DSWVNQVS.js";
+} from "./chunk-5RP7JRVP.js";
 import {
   parseSketch
-} from "./chunk-DZXYF2F5.js";
+} from "./chunk-HQQNCY7W.js";
 import {
   parseSwimlane
-} from "./chunk-OMNGQPEZ.js";
+} from "./chunk-LTXOLDUZ.js";
 import {
   parseFamily
-} from "./chunk-VBYSIOOY.js";
+} from "./chunk-75G3Q4DK.js";
 import {
   parseMindmap
-} from "./chunk-SXRTRMEE.js";
+} from "./chunk-AL672HNE.js";
 import {
   looksLikeERDiagram,
   parseERDiagram
-} from "./chunk-NU3XLTGP.js";
+} from "./chunk-REJAIQ5S.js";
 import {
   looksLikeOrg,
   parseOrg
-} from "./chunk-OTQKUHRS.js";
+} from "./chunk-NNS4E7CW.js";
 import {
   looksLikeSitemap,
   parseSitemap
-} from "./chunk-SQLNBA64.js";
+} from "./chunk-HBPDFCQY.js";
 import {
   looksLikePert,
   parsePert
-} from "./chunk-EAMEADTV.js";
+} from "./chunk-K4EOKJA6.js";
 import {
   parseEventLine
-} from "./chunk-HTMN2Z6U.js";
+} from "./chunk-J6QROYDA.js";
 import {
   parseTimelineEventLine
-} from "./chunk-I7F2A35O.js";
+} from "./chunk-R3YSD62R.js";
+import {
+  makeYearContext,
+  parseDateToken,
+  resolveTokenYear,
+  toInternal
+} from "./chunk-DAOFNU6J.js";
 import {
   parseVersionControl
-} from "./chunk-6BFZKBGD.js";
+} from "./chunk-3YRPZ7ZZ.js";
 import {
   parseKanban
-} from "./chunk-3Y2DRD7S.js";
+} from "./chunk-3QD7VP3U.js";
 import {
   parseC4
-} from "./chunk-QROYX7TT.js";
+} from "./chunk-BPY242XU.js";
 import {
   looksLikeSequence,
   parseSequenceDgmo
-} from "./chunk-BH3UYK36.js";
+} from "./chunk-QJMKPUYK.js";
 import {
   matchTagBlockHeading,
   stripDefaultModifier,
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-HHKO6SKY.js";
 import {
   looksLikeFlowchart,
   parseFlowchart
-} from "./chunk-GBE54KY6.js";
+} from "./chunk-6EJITS44.js";
 import {
   looksLikeState,
   parseState
-} from "./chunk-2C56LEML.js";
+} from "./chunk-ROOE4R4Y.js";
 import {
   looksLikeClassDiagram,
   parseClassDiagram
-} from "./chunk-GL5UZ6NY.js";
+} from "./chunk-TPFKKXCB.js";
 import {
   TIMELINE_REGISTRY,
   collectIndentedValues,
   extractColor,
+  fillModeFromToken,
   measureIndent,
   normalizeNumericToken,
   parseFirstLine,
   peelTrailingColorName,
   splitNameAndMeta,
   withTagAliases
-} from "./chunk-OTAL43EH.js";
+} from "./chunk-BRENJ2BQ.js";
 import {
   resolveColorWithDiagnostic
 } from "./chunk-TLVIHFRO.js";
@@ -212,6 +219,67 @@ function parseVisualizationFull(content, palette) {
     return fail(0, "Empty content");
   }
   const lines = content.split("\n");
+  let tlDateOrder = "mdy";
+  let tlNoCurrentYear = false;
+  let tlDirectiveYear = null;
+  for (const raw of lines) {
+    const t = raw.trim().toLowerCase();
+    if (t === "no-current-year") tlNoCurrentYear = true;
+    else if (t === "date-order dmy") tlDateOrder = "dmy";
+    else if (t === "date-order mdy") tlDateOrder = "mdy";
+    else {
+      const ym = t.match(/^year\s+(\d{1,4})$/);
+      if (ym) tlDirectiveYear = parseInt(ym[1], 10);
+    }
+  }
+  let tlPrescan = null;
+  for (const raw of lines) {
+    const t = raw.trim();
+    if (!t) continue;
+    const p = parseDateToken(t, { dateOrder: tlDateOrder });
+    if (p?.token.year != null) {
+      tlPrescan = p.token.sign * p.token.year;
+      break;
+    }
+  }
+  const tlYearCtx = makeYearContext({
+    order: tlDateOrder,
+    directiveYear: tlDirectiveYear,
+    prescanYear: tlPrescan,
+    noCurrentYear: tlNoCurrentYear
+  });
+  const tlDateCtx = {
+    order: tlDateOrder,
+    resolve: (tok) => resolveTokenYear(tok, tlYearCtx)
+  };
+  const isTlDateDirective = (t) => t === "no-current-year" || t === "date-order dmy" || t === "date-order mdy" || /^year\s+\d{1,4}$/.test(t);
+  const tlBaseYear = tlDirectiveYear ?? tlPrescan;
+  const tlCurrentYear = (/* @__PURE__ */ new Date()).getFullYear();
+  const tlResolveYear = (tok) => {
+    if (tok.year != null) return toInternal(tok, tok.year);
+    if (tlBaseYear == null && tlNoCurrentYear) return null;
+    return toInternal(tok, tlBaseYear ?? tlCurrentYear);
+  };
+  const TL_TRAILING_COLOR = /\s+(red|orange|yellow|green|blue|purple|teal|cyan|gray|black|white)\s*$/;
+  const splitTrailingColor = (s) => {
+    const m = s.match(TL_TRAILING_COLOR);
+    return m ? { label: s.slice(0, m.index).trim(), color: m[1].toLowerCase() } : { label: s.trim(), color: null };
+  };
+  const tlLeadingDate = (s) => {
+    const res = parseDateToken(s, { dateOrder: tlDateOrder });
+    if (!res || res.consumed === 0 || res.token.invalidTime) return null;
+    const iso = tlResolveYear(res.token);
+    return iso == null ? null : { iso, rest: s.slice(res.consumed) };
+  };
+  const tlLeadingRange = (s) => {
+    const a = tlLeadingDate(s);
+    if (!a) return null;
+    const arrow = a.rest.match(/^\s*(?:->|–>)\s*/);
+    if (!arrow) return null;
+    const b = tlLeadingDate(a.rest.slice(arrow[0].length));
+    if (!b) return null;
+    return { start: a.iso, end: b.iso, rest: b.rest };
+  };
   const freeformLines = [];
   let currentArcGroup = null;
   let currentTimelineGroup = null;
@@ -253,6 +321,9 @@ function parseVisualizationFull(content, palette) {
       }
     }
     if (result.type === "timeline" && indent === 0) {
+      if (isTlDateDirective(line.toLowerCase())) {
+        continue;
+      }
       const tagBlockMatch = matchTagBlockHeading(line);
       if (tagBlockMatch) {
         const newGroup = {
@@ -449,18 +520,15 @@ function parseVisualizationFull(content, palette) {
         inTimelineEraBlock = false;
       } else {
         if (line.startsWith("//")) continue;
-        const eraEntryMatch = line.match(
-          /^(\d{4}(?:-\d{2})?(?:-\d{2}(?: \d{2}:\d{2})?)?)\s*(?:->|\u2013>)\s*(\d{4}(?:-\d{2})?(?:-\d{2}(?: \d{2}:\d{2})?)?)\s+(.+?)(?:\s+(red|orange|yellow|green|blue|purple|teal|cyan|gray|black|white))?\s*$/
-        );
-        if (eraEntryMatch) {
-          const colorAnnotation = eraEntryMatch[4]?.trim() || null;
+        const eraRange = tlLeadingRange(line);
+        const eraParsed = eraRange && splitTrailingColor(eraRange.rest);
+        if (eraRange && eraParsed && eraParsed.label) {
           result.timelineEras.push({
-            // Capture groups 1-3 guaranteed by the regex match.
-            startDate: eraEntryMatch[1],
-            endDate: eraEntryMatch[2],
-            label: eraEntryMatch[3].trim(),
-            color: colorAnnotation ? resolveColorWithDiagnostic(
-              colorAnnotation,
+            startDate: eraRange.start,
+            endDate: eraRange.end,
+            label: eraParsed.label,
+            color: eraParsed.color ? resolveColorWithDiagnostic(
+              eraParsed.color,
               lineNumber,
               result.diagnostics,
               palette
@@ -481,17 +549,14 @@ function parseVisualizationFull(content, palette) {
         inTimelineMarkerBlock = false;
       } else {
         if (line.startsWith("//")) continue;
-        const markerEntryMatch = line.match(
-          /^(\d{4}(?:-\d{2})?(?:-\d{2}(?: \d{2}:\d{2})?)?)\s+(.+?)(?:\s+(red|orange|yellow|green|blue|purple|teal|cyan|gray|black|white))?\s*$/
-        );
-        if (markerEntryMatch) {
-          const colorAnnotation = markerEntryMatch[3]?.trim() || null;
+        const markerLd = tlLeadingDate(line);
+        const markerParsed = markerLd && splitTrailingColor(markerLd.rest);
+        if (markerLd && markerParsed && markerParsed.label) {
           result.timelineMarkers.push({
-            // Capture groups 1-2 guaranteed by the regex match.
-            date: markerEntryMatch[1],
-            label: markerEntryMatch[2].trim(),
-            color: colorAnnotation ? resolveColorWithDiagnostic(
-              colorAnnotation,
+            date: markerLd.iso,
+            label: markerParsed.label,
+            color: markerParsed.color ? resolveColorWithDiagnostic(
+              markerParsed.color,
               lineNumber,
               result.diagnostics,
               palette
@@ -518,18 +583,16 @@ function parseVisualizationFull(content, palette) {
         timelineMarkerBlockIndent = indent;
         continue;
       }
-      const eraMatch = line.match(
-        /^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+(.+?)(?:\s+(red|orange|yellow|green|blue|purple|teal|cyan|gray|black|white))?\s*$/
-      );
-      if (eraMatch) {
-        const colorAnnotation = eraMatch[4]?.trim() || null;
+      const eraInline = line.match(/^era\s+(.+)$/i);
+      const eraInlineRange = eraInline && tlLeadingRange(eraInline[1]);
+      const eraInlineParsed = eraInlineRange && splitTrailingColor(eraInlineRange.rest);
+      if (eraInlineRange && eraInlineParsed && eraInlineParsed.label) {
         result.timelineEras.push({
-          // Capture groups 1-3 guaranteed by the regex match.
-          startDate: eraMatch[1],
-          endDate: eraMatch[2],
-          label: eraMatch[3].trim(),
-          color: colorAnnotation ? resolveColorWithDiagnostic(
-            colorAnnotation,
+          startDate: eraInlineRange.start,
+          endDate: eraInlineRange.end,
+          label: eraInlineParsed.label,
+          color: eraInlineParsed.color ? resolveColorWithDiagnostic(
+            eraInlineParsed.color,
             lineNumber,
             result.diagnostics,
             palette
@@ -538,17 +601,15 @@ function parseVisualizationFull(content, palette) {
         });
         continue;
       }
-      const markerMatch = line.match(
-        /^marker\s+(\d{4}(?:-\d{2})?(?:-\d{2}(?: \d{2}:\d{2})?)?)\s+(.+?)(?:\s+(red|orange|yellow|green|blue|purple|teal|cyan|gray|black|white))?\s*$/
-      );
-      if (markerMatch) {
-        const colorAnnotation = markerMatch[3]?.trim() || null;
+      const markerInline = line.match(/^marker\s+(.+)$/i);
+      const markerInlineLd = markerInline && tlLeadingDate(markerInline[1]);
+      const markerInlineParsed = markerInlineLd && splitTrailingColor(markerInlineLd.rest);
+      if (markerInlineLd && markerInlineParsed && markerInlineParsed.label) {
         result.timelineMarkers.push({
-          // Capture groups 1-2 guaranteed by the regex match.
-          date: markerMatch[1],
-          label: markerMatch[2].trim(),
-          color: colorAnnotation ? resolveColorWithDiagnostic(
-            colorAnnotation,
+          date: markerInlineLd.iso,
+          label: markerInlineParsed.label,
+          color: markerInlineParsed.color ? resolveColorWithDiagnostic(
+            markerInlineParsed.color,
             lineNumber,
             result.diagnostics,
             palette
@@ -604,7 +665,8 @@ function parseVisualizationFull(content, palette) {
         currentTimelineGroup,
         currentTimelineGroupMeta,
         timelineAliasMap,
-        tlRegistry
+        tlRegistry,
+        tlDateCtx
       );
       if (eventResult) {
         result.diagnostics.push(...eventResult.diagnostics);
@@ -613,7 +675,7 @@ function parseVisualizationFull(content, palette) {
         }
         continue;
       }
-      if (!/^(era|marker|tag|sort|active-tag|swimlanes|no-scale|lane-by)\b/i.test(
+      if (!/^(era|marker|tag|sort|active-tag|swimlanes|no-scale|lane-by|fill-tint|fill-solid|fill-outline)\b/i.test(
         line
       ) && !line.startsWith("[")) {
         warn(lineNumber, `Expected a date at the start \u2014 e.g., '1718 ${line}'`);
@@ -621,7 +683,9 @@ function parseVisualizationFull(content, palette) {
       }
     }
     if (result.type === "venn") {
-      if (/^(solid-fill|no-name|no-value|no-percent|no-title)$/i.test(line)) {
+      if (/^(fill-tint|fill-solid|fill-outline|no-name|no-value|no-percent|no-title)$/i.test(
+        line
+      )) {
       } else if (/\+/.test(line)) {
         const knownSetRefs = /* @__PURE__ */ new Set();
         for (const s of result.vennSets) {
@@ -655,7 +719,9 @@ function parseVisualizationFull(content, palette) {
           continue;
         }
       }
-      if (!/^(solid-fill|no-name|no-value|no-percent|no-title)$/i.test(line)) {
+      if (!/^(fill-tint|fill-solid|fill-outline|no-name|no-value|no-percent|no-title)$/i.test(
+        line
+      )) {
         const { label: lineWithoutColor, colorName } = peelTrailingColorName(line);
         let color = null;
         if (colorName) {
@@ -822,8 +888,10 @@ function parseVisualizationFull(content, palette) {
         result.noPercent = true;
         continue;
       }
-      if (bareToken === "solid-fill") {
-        result.solidFill = true;
+      const fillFamily = fillModeFromToken(bareToken);
+      if (fillFamily !== null) {
+        if (fillFamily === "tint") delete result.fillMode;
+        else result.fillMode = fillFamily;
         continue;
       }
       if (bareToken === "no-title") {
@@ -2162,4 +2230,4 @@ export {
   knownChartTypeIds,
   parseDgmo
 };
-//# sourceMappingURL=chunk-KQ57MHRO.js.map
+//# sourceMappingURL=chunk-ZEF5M5MB.js.map

package/dist/{chunk-LE4MYMLI.js → chunk-ZJV7GYR4.js}

@@ -8,28 +8,28 @@ import {
   rectsOverlap,
   segmentRectOverlap,
   segmentsCross
-} from "./chunk-HGN652MU.js";
+} from "./chunk-VL2O2F3W.js";
 import {
   compactNumber,
   computeLegendLayout
-} from "./chunk-7UEMZREK.js";
+} from "./chunk-YAA6IID3.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_Y
 } from "./chunk-A4GOY3PE.js";
 import {
   measureLegendText
-} from "./chunk-HQCHYB5F.js";
+} from "./chunk-QOOUC2J5.js";
 import {
   contrastRatio,
   mix,
   politicalTints,
   relativeLuminance,
   valueRampColor
-} from "./chunk-P6T66CCZ.js";
+} from "./chunk-WBM7ZNDI.js";
 import {
   tagAttrKey
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-HHKO6SKY.js";
 import {
   resolveColor
 } from "./chunk-TLVIHFRO.js";
@@ -3177,4 +3177,4 @@ export {
   albersSkewFallback,
   layoutMap
 };
-//# sourceMappingURL=chunk-LE4MYMLI.js.map
+//# sourceMappingURL=chunk-ZJV7GYR4.js.map

package/dist/{chunk-XJLKLU4D.js → chunk-ZNWAYU6N.js}

@@ -7,10 +7,11 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-HHKO6SKY.js";
 import {
   TREEMAP_REGISTRY,
   extractColor,
+  fillModeFromToken,
   measureIndent,
   parseFirstLine,
   peelRampColors,
@@ -18,7 +19,7 @@ import {
   stripQuotes,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-OTAL43EH.js";
+} from "./chunk-BRENJ2BQ.js";
 import {
   emit,
   formatDgmoError,
@@ -71,7 +72,7 @@ function parseTreemap(content, palette) {
     noPercent: false,
     noHeaders: false,
     noLegend: false,
-    solidFill: false,
+    fillMode: void 0,
     radial: false
   };
   const result = {
@@ -288,9 +289,12 @@ function handleDirective(trimmed, options, result, pushWarning, lineNumber) {
     else if (key === "legend") options.noLegend = true;
     return true;
   }
-  if (/^solid-fill\s*$/i.test(trimmed)) {
-    options.solidFill = true;
-    return true;
+  {
+    const fm = fillModeFromToken(trimmed);
+    if (fm !== null) {
+      options.fillMode = fm === "tint" ? void 0 : fm;
+      return true;
+    }
   }
   if (/^radial\s*$/i.test(trimmed)) {
     options.radial = true;
@@ -377,4 +381,4 @@ export {
   TREEMAP_DIAGNOSTICS,
   parseTreemap
 };
-//# sourceMappingURL=chunk-XJLKLU4D.js.map
+//# sourceMappingURL=chunk-ZNWAYU6N.js.map