@diagrammo/dgmo 0.7.0 → 0.7.1

package/dist/index.js

@@ -1495,24 +1495,26 @@ function parseSeriesNames(value, lines, lineIndex, palette) {
   }
   return { series, names, nameColors, newIndex };
 }
-function parsePipeMetadata(segments, aliasMap = /* @__PURE__ */ new Map()) {
+function parsePipeMetadata(segments, aliasMap = /* @__PURE__ */ new Map(), warnMultiplePipes) {
+  if (segments.length > 2 && warnMultiplePipes) {
+    warnMultiplePipes();
+  }
   const metadata = {};
-  for (let j = 1; j < segments.length; j++) {
-    for (const part of segments[j].split(",")) {
-      const trimmedPart = part.trim();
-      if (!trimmedPart) continue;
-      const colonIdx = trimmedPart.indexOf(":");
-      if (colonIdx > 0) {
-        const rawKey = trimmedPart.substring(0, colonIdx).trim().toLowerCase();
-        const key = aliasMap.get(rawKey) ?? rawKey;
-        const value = trimmedPart.substring(colonIdx + 1).trim();
-        metadata[key] = value;
-      }
+  const raw = segments.slice(1).join(",");
+  for (const part of raw.split(",")) {
+    const trimmedPart = part.trim();
+    if (!trimmedPart) continue;
+    const colonIdx = trimmedPart.indexOf(":");
+    if (colonIdx > 0) {
+      const rawKey = trimmedPart.substring(0, colonIdx).trim().toLowerCase();
+      const key = aliasMap.get(rawKey) ?? rawKey;
+      const value = trimmedPart.substring(colonIdx + 1).trim();
+      metadata[key] = value;
     }
   }
   return metadata;
 }
-var COLOR_SUFFIX_RE, CHART_TYPE_RE, TITLE_RE, OPTION_RE;
+var COLOR_SUFFIX_RE, CHART_TYPE_RE, TITLE_RE, OPTION_RE, MULTIPLE_PIPE_WARNING;
 var init_parsing = __esm({
   "src/utils/parsing.ts"() {
     "use strict";
@@ -1521,6 +1523,7 @@ var init_parsing = __esm({
     CHART_TYPE_RE = /^chart\s*:\s*(.+)/i;
     TITLE_RE = /^title\s*:\s*(.+)/i;
     OPTION_RE = /^([a-z][a-z0-9-]*)\s*:\s*(.+)$/i;
+    MULTIPLE_PIPE_WARNING = 'Use a single "|" to start metadata, then separate items with commas.';
   }
 });
 
@@ -2021,12 +2024,13 @@ function parseSequenceDgmo(content) {
   const participantGroupMap = /* @__PURE__ */ new Map();
   let currentTagGroup = null;
   const aliasMap = /* @__PURE__ */ new Map();
-  const splitPipe = (text) => {
+  const splitPipe = (text, ln) => {
     const idx = text.indexOf("|");
     if (idx < 0) return { core: text };
     const core = text.substring(0, idx).trimEnd();
     const segments = text.substring(idx).split("|");
-    const meta = parsePipeMetadata(segments, aliasMap);
+    const warnFn = ln != null ? () => pushWarning(ln, MULTIPLE_PIPE_WARNING) : void 0;
+    const meta = parsePipeMetadata(segments, aliasMap, warnFn);
     return Object.keys(meta).length > 0 ? { core, meta } : { core };
   };
   const blockStack = [];
@@ -2055,7 +2059,7 @@ function parseSequenceDgmo(content) {
       if (gpipeIdx >= 0) {
         const nameAndColor = groupName.substring(0, gpipeIdx).trimEnd();
         const segments = groupName.substring(gpipeIdx).split("|");
-        const meta = parsePipeMetadata(segments, aliasMap);
+        const meta = parsePipeMetadata(segments, aliasMap, () => pushWarning(lineNumber, MULTIPLE_PIPE_WARNING));
         if (Object.keys(meta).length > 0) groupMeta = meta;
         const colorSuffix = nameAndColor.match(/^(.+?)\(([^)]+)\)$/);
         if (colorSuffix) {
@@ -2178,7 +2182,7 @@ function parseSequenceDgmo(content) {
         continue;
       }
     }
-    const { core: isACore, meta: isAMeta } = splitPipe(trimmed);
+    const { core: isACore, meta: isAMeta } = splitPipe(trimmed, lineNumber);
     const isAMatch = isACore.match(IS_A_PATTERN);
     if (isAMatch) {
       contentStarted = true;
@@ -2215,7 +2219,7 @@ function parseSequenceDgmo(content) {
       }
       continue;
     }
-    const { core: posCore, meta: posMeta } = splitPipe(trimmed);
+    const { core: posCore, meta: posMeta } = splitPipe(trimmed, lineNumber);
     const posOnlyMatch = posCore.match(POSITION_ONLY_PATTERN);
     if (posOnlyMatch) {
       contentStarted = true;
@@ -2242,7 +2246,7 @@ function parseSequenceDgmo(content) {
       }
       continue;
     }
-    const { core: colorCore, meta: colorMeta } = splitPipe(trimmed);
+    const { core: colorCore, meta: colorMeta } = splitPipe(trimmed, lineNumber);
     const coloredMatch = colorCore.match(COLORED_PARTICIPANT_PATTERN);
     if (coloredMatch && !ARROW_PATTERN.test(colorCore)) {
       const id = coloredMatch[1];
@@ -2270,7 +2274,7 @@ function parseSequenceDgmo(content) {
       continue;
     }
     {
-      const { core: bareCore, meta: bareMeta } = splitPipe(trimmed);
+      const { core: bareCore, meta: bareMeta } = splitPipe(trimmed, lineNumber);
       const inGroup = activeGroup && measureIndent(raw) > 0;
       if (/^\S+$/.test(bareCore) && !ARROW_PATTERN.test(bareCore) && (inGroup || !contentStarted || bareMeta)) {
         contentStarted = true;
@@ -2306,7 +2310,7 @@ function parseSequenceDgmo(content) {
       }
       blockStack.pop();
     }
-    const { core: arrowCore, meta: arrowMeta } = splitPipe(trimmed);
+    const { core: arrowCore, meta: arrowMeta } = splitPipe(trimmed, lineNumber);
     const asyncPrefixMatch = arrowCore.match(/^async\s+(.+)$/i);
     if (asyncPrefixMatch && ARROW_PATTERN.test(asyncPrefixMatch[1])) {
       pushError(lineNumber, "Use ~> for async messages: A ~> B: message");
@@ -3757,7 +3761,12 @@ function parseERDiagram(content, palette) {
       table.lineNumber = lineNumber;
       const pipeStr = tableDecl[3]?.trim();
       if (pipeStr) {
-        const meta = parsePipeMetadata(["", pipeStr], aliasMap);
+        const pipeSegments = pipeStr.split("|");
+        const meta = parsePipeMetadata(
+          ["", ...pipeSegments],
+          aliasMap,
+          () => result.diagnostics.push(makeDgmoError(lineNumber, MULTIPLE_PIPE_WARNING, "warning"))
+        );
         Object.assign(table.metadata, meta);
       }
       currentTable = table;
@@ -5694,13 +5703,13 @@ function parseOrg(content, palette) {
       }
     } else if (metadataMatch && indentStack.length === 0) {
       if (indent === 0) {
-        const node = parseNodeLabel(trimmed, indent, lineNumber, palette, ++nodeCounter, aliasMap);
+        const node = parseNodeLabel(trimmed, indent, lineNumber, palette, ++nodeCounter, aliasMap, pushWarning);
         attachNode(node, indent, indentStack, result);
       } else {
         pushError(lineNumber, "Metadata has no parent node");
       }
     } else {
-      const node = parseNodeLabel(trimmed, indent, lineNumber, palette, ++nodeCounter, aliasMap);
+      const node = parseNodeLabel(trimmed, indent, lineNumber, palette, ++nodeCounter, aliasMap, pushWarning);
       attachNode(node, indent, indentStack, result);
     }
   }
@@ -5722,11 +5731,11 @@ function parseOrg(content, palette) {
   }
   return result;
 }
-function parseNodeLabel(trimmed, _indent, lineNumber, palette, counter, aliasMap = /* @__PURE__ */ new Map()) {
+function parseNodeLabel(trimmed, _indent, lineNumber, palette, counter, aliasMap = /* @__PURE__ */ new Map(), warnFn) {
   const segments = trimmed.split("|").map((s) => s.trim());
   let rawLabel = segments[0];
   const { label, color } = extractColor(rawLabel, palette);
-  const metadata = parsePipeMetadata(segments, aliasMap);
+  const metadata = parsePipeMetadata(segments, aliasMap, warnFn ? () => warnFn(lineNumber, MULTIPLE_PIPE_WARNING) : void 0);
   return {
     id: `node-${counter}`,
     label,
@@ -6268,7 +6277,7 @@ function parseC4(content, palette) {
         }
         const segments = trimmed.split("|").map((s) => s.trim());
         const nodeName = segments[0];
-        const metadata = parsePipeMetadata(segments, aliasMap);
+        const metadata = parsePipeMetadata(segments, aliasMap, () => pushError(lineNumber, MULTIPLE_PIPE_WARNING, "warning"));
         const shape = inferC4Shape(nodeName, metadata.tech ?? metadata.technology);
         const dNode = {
           name: nodeName,
@@ -6421,7 +6430,7 @@ function parseC4(content, palette) {
         }
         namePart = namePart.substring(0, isAMatch.index).trim();
       }
-      const metadata = parsePipeMetadata(segments, aliasMap);
+      const metadata = parsePipeMetadata(segments, aliasMap, () => pushError(lineNumber, MULTIPLE_PIPE_WARNING, "warning"));
       const shape = explicitShape ?? inferC4Shape(namePart, metadata.tech ?? metadata.technology);
       const element = {
         name: namePart,
@@ -7208,14 +7217,14 @@ function parseSitemap(content, palette) {
       }
     } else if (metadataMatch && indentStack.length === 0) {
       if (indent === 0) {
-        const node = parseNodeLabel2(trimmed, lineNumber, palette, ++nodeCounter, aliasMap);
+        const node = parseNodeLabel2(trimmed, lineNumber, palette, ++nodeCounter, aliasMap, pushWarning);
         attachNode2(node, indent, indentStack, result);
         labelToNode.set(node.label.toLowerCase(), node);
       } else {
         pushError(lineNumber, "Metadata has no parent node");
       }
     } else {
-      const node = parseNodeLabel2(trimmed, lineNumber, palette, ++nodeCounter, aliasMap);
+      const node = parseNodeLabel2(trimmed, lineNumber, palette, ++nodeCounter, aliasMap, pushWarning);
       attachNode2(node, indent, indentStack, result);
       labelToNode.set(node.label.toLowerCase(), node);
     }
@@ -7257,11 +7266,11 @@ function parseSitemap(content, palette) {
   }
   return result;
 }
-function parseNodeLabel2(trimmed, lineNumber, palette, counter, aliasMap = /* @__PURE__ */ new Map()) {
+function parseNodeLabel2(trimmed, lineNumber, palette, counter, aliasMap = /* @__PURE__ */ new Map(), warnFn) {
   const segments = trimmed.split("|").map((s) => s.trim());
   const rawLabel = segments[0];
   const { label, color } = extractColor(rawLabel, palette);
-  const metadata = parsePipeMetadata(segments, aliasMap);
+  const metadata = parsePipeMetadata(segments, aliasMap, warnFn ? () => warnFn(lineNumber, MULTIPLE_PIPE_WARNING) : void 0);
   return {
     id: `node-${counter}`,
     label,
@@ -7969,6 +7978,9 @@ function parseGantt(content, palette) {
   const warn = (line10, message) => {
     diagnostics.push(makeDgmoError(line10, message, "warning"));
   };
+  const softError = (line10, message) => {
+    diagnostics.push(makeDgmoError(line10, message, "error"));
+  };
   const aliasMap = /* @__PURE__ */ new Map();
   const blockStack = [];
   const currentContainer = () => {
@@ -8102,10 +8114,10 @@ function parseGantt(content, palette) {
         const targetName = depParts[0].trim();
         let offset;
         if (depParts.length > 1) {
-          const meta = parsePipeMetadata(["", ...depParts.slice(1)], aliasMap);
+          const meta = parsePipeMetadata(["", ...depParts.slice(1)], aliasMap, () => warn(lineNumber, MULTIPLE_PIPE_WARNING));
           if (meta.lag || meta.lead) {
             const key = meta.lag ? "lag" : "lead";
-            return fail(lineNumber, `Unknown keyword "${key}". Use "offset: ${meta[key]}" instead.`);
+            softError(lineNumber, `Unknown keyword "${key}". Use "offset: ${meta[key]}" instead.`);
           }
           if (meta.offset) {
             const raw = meta.offset;
@@ -8244,16 +8256,18 @@ function parseGantt(content, palette) {
     const groupMatch = line10.match(GROUP_RE2);
     if (groupMatch) {
       if (blockStack.length > 0 && blockStack[blockStack.length - 1].containerType === "task") {
-        return fail(lineNumber, `Cannot nest a group inside a task. Groups must be inside other groups or parallel blocks.`);
+        softError(lineNumber, `Cannot nest a group inside a task. Groups must be inside other groups or parallel blocks.`);
+        continue;
       }
       const afterBrackets = groupMatch[2].trim();
       const segments = afterBrackets ? afterBrackets.split("|") : [];
       let metadata = {};
       let color = null;
+      const pipeWarn = () => warn(lineNumber, MULTIPLE_PIPE_WARNING);
       if (segments.length > 0 && segments[0].trim()) {
-        metadata = parsePipeMetadata(["", ...segments], aliasMap);
+        metadata = parsePipeMetadata(["", ...segments], aliasMap, pipeWarn);
       } else if (segments.length > 1) {
-        metadata = parsePipeMetadata(["", ...segments.slice(1)], aliasMap);
+        metadata = parsePipeMetadata(["", ...segments.slice(1)], aliasMap, pipeWarn);
       }
       const nameExtracted = extractColor(groupMatch[1], palette);
       if (nameExtracted.color) {
@@ -8284,7 +8298,6 @@ function parseGantt(content, palette) {
       const uncertain = !!timelineDurMatch[4];
       const labelRaw = timelineDurMatch[5];
       const task = makeTask(labelRaw, { amount, unit }, uncertain, lineNumber, startDate);
-      if (result.error) return result;
       const taskNode = { kind: "task", ...task };
       currentContainer().push(taskNode);
       lastTaskNode = taskNode;
@@ -8298,7 +8311,6 @@ function parseGantt(content, palette) {
       const uncertain = !!durMatch[3];
       const labelRaw = durMatch[4];
       const task = makeTask(labelRaw, { amount, unit }, uncertain, lineNumber);
-      if (result.error) return result;
       const taskNode = { kind: "task", ...task };
       currentContainer().push(taskNode);
       lastTaskNode = taskNode;
@@ -8315,7 +8327,6 @@ function parseGantt(content, palette) {
         lineNumber,
         explicitDateMatch[1]
       );
-      if (result.error) return result;
       const taskNode = { kind: "task", ...task };
       currentContainer().push(taskNode);
       lastTaskNode = taskNode;
@@ -8325,13 +8336,14 @@ function parseGantt(content, palette) {
     const depMatch = line10.match(DEPENDENCY_RE);
     if (depMatch) {
       if (!lastTaskNode) {
-        return fail(lineNumber, `Dependency "-> ${depMatch[1]}" must be indented under a task.`);
+        softError(lineNumber, `Dependency "-> ${depMatch[1]}" must be indented under a task.`);
+        continue;
       }
       const depParts = depMatch[1].split("|");
       const targetName = depParts[0].trim();
       let offset;
       if (depParts.length > 1) {
-        const meta = parsePipeMetadata(["", ...depParts.slice(1)], aliasMap);
+        const meta = parsePipeMetadata(["", ...depParts.slice(1)], aliasMap, () => warn(lineNumber, MULTIPLE_PIPE_WARNING));
         if (meta.lag || meta.lead) {
           const key = meta.lag ? "lag" : "lead";
           warn(lineNumber, `"${key}" is deprecated \u2014 use "offset: ${meta[key]}" instead.${key === "lead" ? ' Negate the value for lead behavior: "offset: -...".' : ""}`);
@@ -8351,7 +8363,8 @@ function parseGantt(content, palette) {
       lastTaskNode.dependencies.push({ targetName, offset, lineNumber });
       continue;
     }
-    return fail(lineNumber, `Expected duration (e.g., "10d: Task"), group brackets (e.g., "[Group]"), or keyword. Got: "${line10}"`);
+    softError(lineNumber, `Expected duration (e.g., "10d: Task"), group brackets (e.g., "[Group]"), or keyword. Got: "${line10}"`);
+    continue;
   }
   if (currentTagGroup) {
     result.tagGroups.push(currentTagGroup);
@@ -8365,16 +8378,16 @@ function parseGantt(content, palette) {
     const segments = labelRaw.split("|");
     const label = segments[0].trim();
     if (label.toLowerCase() === "parallel") {
-      fail(ln, `"parallel" is a reserved keyword and cannot be used as a task name.`);
+      softError(ln, `"parallel" is a reserved keyword and cannot be used as a task name.`);
     }
-    const metadata = segments.length > 1 ? parsePipeMetadata(segments, aliasMap) : {};
+    const metadata = segments.length > 1 ? parsePipeMetadata(segments, aliasMap, () => warn(ln, MULTIPLE_PIPE_WARNING)) : {};
     let progress = null;
     if (metadata.progress) {
       progress = parseFloat(metadata.progress);
       delete metadata.progress;
     }
-    for (let j = 1; j < segments.length; j++) {
-      const seg = segments[j].trim();
+    for (const part of segments.slice(1).join(",").split(",")) {
+      const seg = part.trim();
       const progressMatch = seg.match(/^(\d+)%$/);
       if (progressMatch) {
         progress = parseInt(progressMatch[1], 10);
@@ -8382,7 +8395,7 @@ function parseGantt(content, palette) {
     }
     if (metadata.lag || metadata.lead) {
       const key = metadata.lag ? "lag" : "lead";
-      fail(ln, `Unknown keyword "${key}". Use "offset: ${metadata[key]}" instead.`);
+      softError(ln, `Unknown keyword "${key}". Use "offset: ${metadata[key]}" instead.`);
     }
     let taskOffset;
     if (metadata.offset) {
@@ -8469,7 +8482,7 @@ var init_parser10 = __esm({
     DEPENDENCY_RE = /^->\s*(.+)$/;
     COMMENT_RE = /^\/\//;
     ERA_RE = /^era\s+(\d{4}(?:-\d{2}(?:-\d{2})?)?)\s*->\s*(\d{4}(?:-\d{2}(?:-\d{2})?)?)\s*:\s*(.+)$/i;
-    MARKER_RE = /^marker\s+(\d{4}(?:-\d{2}(?:-\d{2})?)?)\s*:\s*(.+)$/i;
+    MARKER_RE = /^marker:\s+(\d{4}(?:-\d{2}(?:-\d{2})?)?)\s+(.+)$/i;
     HOLIDAY_DATE_RE = /^(\d{4}-\d{2}-\d{2}):\s*(.+)$/;
     HOLIDAY_RANGE_RE = /^(\d{4}-\d{2}-\d{2})\s*->\s*(\d{4}-\d{2}-\d{2}):\s*(.+)$/;
     WORKWEEK_RE = /^workweek:\s*(.+)$/i;
@@ -18882,11 +18895,8 @@ function calculateSchedule(parsed) {
     for (const dep of task.dependencies) {
       const resolved = resolveTaskName(dep.targetName, allTasks);
       if (isResolverError(resolved)) {
-        if (resolved.kind === "ambiguous") {
-          return fail(dep.lineNumber, `\`-> ${dep.targetName}\` \u2014 ${resolved.message}`);
-        } else {
-          return fail(dep.lineNumber, `\`-> ${dep.targetName}\` \u2014 ${resolved.message}`);
-        }
+        warn(dep.lineNumber, `\`-> ${dep.targetName}\` \u2014 ${resolved.message}`);
+        continue;
       }
       const targetNode = taskMap.get(resolved.task.id);
       if (targetNode) {
@@ -18901,14 +18911,26 @@ function calculateSchedule(parsed) {
       }
     }
   }
-  const sortedIds = topologicalSort(taskMap);
+  let sortedIds = topologicalSort(taskMap);
   if (!sortedIds) {
     const cycle = findCycle(taskMap);
     const cycleStr = cycle.map((id) => taskMap.get(id).task.label).join(" \u2192 ");
-    return fail(
+    warn(
       taskMap.get(cycle[0]).task.lineNumber,
-      `Circular dependency detected: ${cycleStr}`
+      `Circular dependency detected: ${cycleStr}. The cycle-creating dependency was dropped.`
     );
+    breakCycle(cycle, taskMap, depOffsetMap);
+    sortedIds = topologicalSort(taskMap);
+    let safety = 10;
+    while (!sortedIds && safety-- > 0) {
+      const nextCycle = findCycle(taskMap);
+      if (nextCycle.length === 0) break;
+      breakCycle(nextCycle, taskMap, depOffsetMap);
+      sortedIds = topologicalSort(taskMap);
+    }
+    if (!sortedIds) {
+      sortedIds = [...taskMap.keys()];
+    }
   }
   for (const taskId of sortedIds) {
     const node = taskMap.get(taskId);
@@ -19192,6 +19214,19 @@ function findCycle(taskMap) {
     return null;
   }
 }
+function breakCycle(cycle, taskMap, depOffsetMap) {
+  if (cycle.length < 3) return;
+  const fromId = cycle[cycle.length - 2];
+  const toId = cycle[0];
+  const toNode = taskMap.get(toId);
+  if (toNode) {
+    const idx = toNode.predecessors.indexOf(fromId);
+    if (idx !== -1) {
+      toNode.predecessors.splice(idx, 1);
+      depOffsetMap.delete(`${fromId}->${toId}`);
+    }
+  }
+}
 function computeCriticalPath(sortedIds, taskMap, depOffsetMap, holidays, holidaySet) {
   if (sortedIds.length === 0) return /* @__PURE__ */ new Set();
   const latestEnd = /* @__PURE__ */ new Map();
@@ -19280,10 +19315,10 @@ function buildResolvedGroups(nodes, taskMap, groups, depth) {
         if (!resolved?.startDate || !resolved?.endDate) continue;
         if (resolved.startDate.getTime() < minStart) minStart = resolved.startDate.getTime();
         if (resolved.endDate.getTime() > maxEnd) maxEnd = resolved.endDate.getTime();
+        const dur = resolved.endDate.getTime() - resolved.startDate.getTime();
+        totalDuration += dur;
         if (task.progress !== null) {
-          const dur = resolved.endDate.getTime() - resolved.startDate.getTime();
           totalProgress += task.progress * dur;
-          totalDuration += dur;
           hasProgress = true;
         }
       }
@@ -19328,7 +19363,7 @@ import * as d3Scale from "d3-scale";
 import * as d3Selection10 from "d3-selection";
 function renderGantt(container, resolved, palette, isDark, options, exportDims) {
   container.innerHTML = "";
-  if (resolved.error || resolved.tasks.length === 0) return;
+  if (resolved.tasks.length === 0) return;
   const onClickItem = options?.onClickItem;
   const collapsedGroups = options?.collapsedGroups;
   const onToggleGroup = options?.onToggleGroup;
@@ -19358,9 +19393,10 @@ function renderGantt(container, resolved, palette, isDark, options, exportDims)
   const titleHeight = title ? 50 : 20;
   const tagLegendReserve = resolved.tagGroups.length > 0 ? LEGEND_HEIGHT + 8 : 0;
   const topDateLabelReserve = 22;
+  const CONTENT_TOP_PAD = 16;
   const marginTop = titleHeight + tagLegendReserve + topDateLabelReserve;
   const contentH = isTagMode ? totalRows * (BAR_H + ROW_GAP) : totalRows * (BAR_H + ROW_GAP) + GROUP_GAP2 * resolved.groups.length;
-  const innerHeight = contentH;
+  const innerHeight = CONTENT_TOP_PAD + contentH;
   const outerHeight = marginTop + innerHeight + BOTTOM_MARGIN;
   const containerWidth = exportDims?.width ?? (container.clientWidth || 800);
   const innerWidth = containerWidth - leftMargin - RIGHT_MARGIN;
@@ -19398,7 +19434,8 @@ function renderGantt(container, resolved, palette, isDark, options, exportDims)
         },
         currentSwimlaneGroup,
         onSwimlaneChange,
-        viewMode
+        viewMode,
+        resolved.tasks
       );
     }
   }
@@ -19444,7 +19481,7 @@ function renderGantt(container, resolved, palette, isDark, options, exportDims)
       }
     }
   }
-  let yOffset = 0;
+  let yOffset = CONTENT_TOP_PAD;
   for (const row of rows) {
     if (row.type === "lane-header") {
       const laneColor = row.laneColor === "#999999" ? palette.textMuted : row.laneColor;
@@ -19493,7 +19530,8 @@ function renderGantt(container, resolved, palette, isDark, options, exportDims)
       const isCollapsed = collapsedGroups?.has(group.name) ?? false;
       const indent = "  ".repeat(group.depth);
       const toggleIcon = isCollapsed ? "\u25BA" : "\u25BC";
-      const groupColor = group.color || palette.textMuted;
+      const tagColor = resolveTagColor(group.metadata, resolved.tagGroups, currentActiveGroup, true);
+      const groupColor = tagColor && tagColor !== "#999999" ? tagColor : group.color || palette.textMuted;
       const labelG = svg.append("g").attr("class", "gantt-group-label").attr("data-group", group.name).attr("data-line-number", String(group.lineNumber)).style("cursor", onToggleGroup ? "pointer" : "default").on("click", () => {
         if (onToggleGroup) onToggleGroup(group.name);
       }).on("mouseenter", () => {
@@ -19549,7 +19587,11 @@ function renderGantt(container, resolved, palette, isDark, options, exportDims)
       const taskLabel = svg.append("text").attr("class", "gantt-task-label").attr("x", taskLabelX).attr("y", marginTop + yOffset + BAR_H / 2).attr("dy", "0.35em").attr("text-anchor", "start").attr("font-size", "11px").attr("fill", palette.text).attr("data-line-number", String(task.lineNumber)).attr("data-task-id", task.id).attr("data-group", topGroup).style("cursor", onClickItem ? "pointer" : "default").text(task.label).on("click", () => {
         if (onClickItem) onClickItem(task.lineNumber);
       }).on("mouseenter", () => {
-        highlightTask(g, svg, task.id);
+        if (rt.isMilestone) {
+          highlightMilestone(g, svg, task.id);
+        } else {
+          highlightTask(g, svg, task.id);
+        }
       }).on("mouseleave", () => {
         resetHighlight(g, svg);
       });
@@ -19563,14 +19605,14 @@ function renderGantt(container, resolved, palette, isDark, options, exportDims)
       if (rt.isMilestone) {
         const mx = xScale(dateToFractionalYear(rt.startDate));
         const my = yOffset + BAR_H / 2;
-        g.append("polygon").attr("class", "gantt-milestone").attr("points", diamondPoints(mx, my, MILESTONE_SIZE)).attr("fill", barColor).attr("stroke", barColor).attr("stroke-width", 1.5).attr("data-line-number", String(task.lineNumber)).attr("data-task-name", task.label).attr("data-group", topGroup).style("cursor", onClickItem ? "pointer" : "default").on("click", () => {
+        g.append("polygon").attr("class", "gantt-milestone").attr("points", diamondPoints(mx, my, MILESTONE_SIZE)).attr("fill", barColor).attr("stroke", barColor).attr("stroke-width", 1.5).attr("data-line-number", String(task.lineNumber)).attr("data-task-name", task.label).attr("data-task-id", task.id).attr("data-group", topGroup).style("cursor", onClickItem ? "pointer" : "default").on("click", () => {
           if (onClickItem) onClickItem(task.lineNumber);
         }).on("mouseenter", () => {
-          highlightTaskLabel(svg, task.lineNumber);
+          highlightMilestone(g, svg, task.id);
           showGanttDateIndicators(g, xScale, rt.startDate, null, innerHeight, barColor);
           g.append("text").attr("class", "gantt-milestone-hover-label").attr("x", mx - MILESTONE_SIZE - 4).attr("y", my).attr("dy", "0.35em").attr("text-anchor", "end").attr("font-size", "10px").attr("fill", barColor).attr("font-weight", "600").text(task.label);
         }).on("mouseleave", () => {
-          resetTaskLabels(svg);
+          resetHighlight(g, svg);
           hideGanttDateIndicators(g);
           g.selectAll(".gantt-milestone-hover-label").remove();
         });
@@ -19831,7 +19873,7 @@ function drawSwimlaneIcon(parent, x, y, isActive, palette) {
   }
   return iconG;
 }
-function renderTagLegend(svg, chartG, tagGroups, activeGroupName, chartLeftMargin, chartInnerWidth, legendY, palette, isDark, hasCriticalPath, criticalPathActive, onToggle, onToggleCriticalPath, currentSwimlaneGroup, onSwimlaneChange, legendViewMode) {
+function renderTagLegend(svg, chartG, tagGroups, activeGroupName, chartLeftMargin, chartInnerWidth, legendY, palette, isDark, hasCriticalPath, criticalPathActive, onToggle, onToggleCriticalPath, currentSwimlaneGroup, onSwimlaneChange, legendViewMode, resolvedTasks) {
   const groupBg = isDark ? mix(palette.surface, palette.bg, 50) : mix(palette.surface, palette.bg, 30);
   let visibleGroups;
   if (activeGroupName) {
@@ -19841,6 +19883,28 @@ function renderTagLegend(svg, chartG, tagGroups, activeGroupName, chartLeftMargi
   } else {
     visibleGroups = tagGroups;
   }
+  const usedValues = /* @__PURE__ */ new Map();
+  if (resolvedTasks) {
+    for (const group of visibleGroups) {
+      const key = group.name.toLowerCase();
+      const used = /* @__PURE__ */ new Set();
+      for (const rt of resolvedTasks) {
+        const val = rt.effectiveMetadata[key];
+        if (val) used.add(val.toLowerCase());
+      }
+      usedValues.set(key, used);
+    }
+  }
+  const filteredEntries = /* @__PURE__ */ new Map();
+  for (const group of visibleGroups) {
+    const key = group.name.toLowerCase();
+    const used = usedValues.get(key);
+    if (used && used.size > 0) {
+      filteredEntries.set(key, group.entries.filter((e) => used.has(e.value.toLowerCase())));
+    } else {
+      filteredEntries.set(key, group.entries);
+    }
+  }
   const groupWidths = [];
   let totalW = 0;
   for (const group of visibleGroups) {
@@ -19851,8 +19915,9 @@ function renderTagLegend(svg, chartG, tagGroups, activeGroupName, chartLeftMargi
     const pillW = group.name.length * LEGEND_PILL_FONT_W + LEGEND_PILL_PAD + iconReserve;
     let groupW = pillW;
     if (isActive) {
+      const entries = filteredEntries.get(group.name.toLowerCase()) ?? group.entries;
       let entriesW = 0;
-      for (const entry of group.entries) {
+      for (const entry of entries) {
         entriesW += LEGEND_DOT_R * 2 + LEGEND_ENTRY_DOT_GAP + entry.value.length * LEGEND_ENTRY_FONT_W + LEGEND_ENTRY_TRAIL;
       }
       groupW = LEGEND_CAPSULE_PAD * 2 + pillW + 4 + entriesW;
@@ -19911,8 +19976,9 @@ function renderTagLegend(svg, chartG, tagGroups, activeGroupName, chartLeftMargi
     }
     if (isActive) {
       const tagKey = group.name.toLowerCase();
+      const entries = filteredEntries.get(tagKey) ?? group.entries;
       let ex = pillXOff + pillW + LEGEND_CAPSULE_PAD + 4;
-      for (const entry of group.entries) {
+      for (const entry of entries) {
         const entryValue = entry.value.toLowerCase();
         const entryG = gEl.append("g").attr("class", "gantt-legend-entry").style("cursor", "pointer");
         entryG.append("circle").attr("cx", ex + LEGEND_DOT_R).attr("cy", LEGEND_HEIGHT / 2).attr("r", LEGEND_DOT_R).attr("fill", entry.color);
@@ -19996,13 +20062,26 @@ function renderErasAndMarkers(g, resolved, xScale, innerHeight, palette) {
     const color = marker.color || palette.accent || "#d08770";
     const mx = xScale(parseDateToFractionalYear(marker.date));
     const markerDate = parseDateStringToDate(marker.date);
-    const markerG = g.append("g").attr("class", "gantt-marker-group");
-    markerG.append("line").attr("class", "gantt-marker").attr("x1", mx).attr("y1", 0).attr("x2", mx).attr("y2", innerHeight).attr("stroke", color).attr("stroke-width", 1.5).attr("stroke-dasharray", "6 3").attr("opacity", 0.5);
-    markerG.append("polygon").attr("points", diamondPoints(mx, 6, 8)).attr("fill", color).attr("opacity", 0.5);
-    markerG.append("text").attr("class", "gantt-marker-label").attr("x", mx + 8).attr("y", 10).attr("font-size", "9px").attr("fill", color).attr("opacity", 0.7).attr("pointer-events", "none").text(marker.label);
+    const diamondSize = 5;
+    const labelY = -24;
+    const diamondY = labelY + 14;
+    const markerG = g.append("g").attr("class", "gantt-marker-group").style("cursor", "pointer");
+    markerG.append("rect").attr("x", mx - 40).attr("y", labelY - 12).attr("width", 80).attr("height", innerHeight - labelY + 12).attr("fill", "transparent").attr("pointer-events", "all");
+    markerG.append("text").attr("class", "gantt-marker-label").attr("x", mx).attr("y", labelY).attr("text-anchor", "middle").attr("font-size", "11px").attr("font-weight", "600").attr("fill", color).text(marker.label);
+    markerG.append("path").attr("d", `M${mx},${diamondY - diamondSize} l${diamondSize},${diamondSize} l-${diamondSize},${diamondSize} l-${diamondSize},-${diamondSize} Z`).attr("fill", color).attr("opacity", 0.9);
+    markerG.append("line").attr("class", "gantt-marker").attr("x1", mx).attr("y1", diamondY + diamondSize).attr("x2", mx).attr("y2", innerHeight).attr("stroke", color).attr("stroke-width", 1.5).attr("stroke-dasharray", "6 4").attr("opacity", 0.5);
+    const markerLine = markerG.select(".gantt-marker");
+    const markerLabel = markerG.select(".gantt-marker-label");
+    const markerDiamond = markerG.select("path");
     markerG.on("mouseenter", () => {
+      markerLine.attr("opacity", 0);
+      markerLabel.attr("opacity", 0);
+      markerDiamond.attr("opacity", 0);
       showGanttDateIndicators(g, xScale, markerDate, null, innerHeight, color);
     }).on("mouseleave", () => {
+      markerLine.attr("opacity", 0.5);
+      markerLabel.attr("opacity", 1);
+      markerDiamond.attr("opacity", 0.9);
       hideGanttDateIndicators(g);
     });
   }
@@ -20077,6 +20156,7 @@ function highlightGroup(g, svg, groupName) {
   });
   svg.selectAll(".gantt-lane-header").attr("opacity", FADE_OPACITY);
   g.selectAll(".gantt-lane-band, .gantt-lane-accent").attr("opacity", FADE_OPACITY);
+  g.selectAll(".gantt-marker-group").attr("opacity", FADE_OPACITY);
 }
 function highlightLane(g, svg, tagKey, laneName) {
   const tagAttr = `data-tag-${tagKey}`;
@@ -20103,6 +20183,7 @@ function highlightLane(g, svg, tagKey, laneName) {
   });
   g.selectAll(".gantt-group-bar, .gantt-group-summary").attr("opacity", FADE_OPACITY);
   svg.selectAll(".gantt-group-label").attr("opacity", FADE_OPACITY);
+  g.selectAll(".gantt-marker-group").attr("opacity", FADE_OPACITY);
 }
 function highlightTask(g, svg, taskId) {
   g.selectAll(".gantt-task").each(function() {
@@ -20119,6 +20200,24 @@ function highlightTask(g, svg, taskId) {
   svg.selectAll(".gantt-lane-header").attr("opacity", FADE_OPACITY);
   g.selectAll(".gantt-lane-band, .gantt-lane-accent, .gantt-lane-band-group").attr("opacity", FADE_OPACITY);
   g.selectAll(".gantt-dep-arrow, .gantt-dep-arrowhead").attr("opacity", FADE_OPACITY);
+  g.selectAll(".gantt-marker-group").attr("opacity", FADE_OPACITY);
+}
+function highlightMilestone(g, svg, taskId) {
+  g.selectAll(".gantt-task").attr("opacity", FADE_OPACITY);
+  g.selectAll(".gantt-milestone").each(function() {
+    const el = d3Selection10.select(this);
+    el.attr("opacity", el.attr("data-task-id") === taskId ? 1 : FADE_OPACITY);
+  });
+  svg.selectAll(".gantt-task-label").each(function() {
+    const el = d3Selection10.select(this);
+    el.attr("opacity", el.attr("data-task-id") === taskId ? 1 : FADE_OPACITY);
+  });
+  g.selectAll(".gantt-group-bar, .gantt-group-summary").attr("opacity", FADE_OPACITY);
+  svg.selectAll(".gantt-group-label").attr("opacity", FADE_OPACITY);
+  svg.selectAll(".gantt-lane-header").attr("opacity", FADE_OPACITY);
+  g.selectAll(".gantt-lane-band, .gantt-lane-accent, .gantt-lane-band-group").attr("opacity", FADE_OPACITY);
+  g.selectAll(".gantt-dep-arrow, .gantt-dep-arrowhead").attr("opacity", FADE_OPACITY);
+  g.selectAll(".gantt-marker-group").attr("opacity", FADE_OPACITY);
 }
 function highlightTaskLabel(svg, lineNumber) {
   const ln = String(lineNumber);
@@ -20138,6 +20237,7 @@ function resetHighlight(g, svg) {
   svg.selectAll(".gantt-lane-header").attr("opacity", 1);
   g.selectAll(".gantt-lane-band, .gantt-lane-accent, .gantt-lane-band-group").attr("opacity", 1);
   g.selectAll(".gantt-dep-arrow, .gantt-dep-arrowhead").attr("opacity", 0.5);
+  g.selectAll(".gantt-marker-group").attr("opacity", 1);
 }
 function buildRowList(resolved, collapsedGroups) {
   const rows = [];
@@ -20216,9 +20316,9 @@ function buildTagLaneRowList(resolved, swimlaneGroup, collapsedLanes) {
   for (const entry of tagGroup.entries) {
     const entryKey = entry.value.toLowerCase();
     const tasks = buckets.get(entryKey) ?? [];
+    if (tasks.length === 0) continue;
     tasks.sort((a, b) => a.startDate.getTime() - b.startDate.getTime());
-    const progressValues = tasks.map((t) => t.task.progress).filter((p) => p !== null);
-    const aggregateProgress = progressValues.length > 0 ? progressValues.reduce((a, b) => a + b, 0) / progressValues.length : null;
+    const aggregateProgress = durationWeightedProgress(tasks);
     const laneStartDate = tasks.length > 0 ? new Date(Math.min(...tasks.map((t) => t.startDate.getTime()))) : null;
     const laneEndDate = tasks.length > 0 ? new Date(Math.max(...tasks.map((t) => t.endDate.getTime()))) : null;
     const isCollapsed = collapsedLanes?.has(entry.value) ?? false;
@@ -20240,8 +20340,7 @@ function buildTagLaneRowList(resolved, swimlaneGroup, collapsedLanes) {
   }
   if (unbucketed.length > 0) {
     unbucketed.sort((a, b) => a.startDate.getTime() - b.startDate.getTime());
-    const progressValues = unbucketed.map((t) => t.task.progress).filter((p) => p !== null);
-    const aggregateProgress = progressValues.length > 0 ? progressValues.reduce((a, b) => a + b, 0) / progressValues.length : null;
+    const aggregateProgress = durationWeightedProgress(unbucketed);
     const noLaneStartDate = unbucketed.length > 0 ? new Date(Math.min(...unbucketed.map((t) => t.startDate.getTime()))) : null;
     const noLaneEndDate = unbucketed.length > 0 ? new Date(Math.max(...unbucketed.map((t) => t.endDate.getTime()))) : null;
     const noLaneName = `No ${tagGroup.name}`;
@@ -20264,6 +20363,20 @@ function buildTagLaneRowList(resolved, swimlaneGroup, collapsedLanes) {
   }
   return rows;
 }
+function durationWeightedProgress(tasks) {
+  let totalDuration = 0;
+  let totalProgress = 0;
+  let hasProgress = false;
+  for (const rt of tasks) {
+    const dur = rt.endDate.getTime() - rt.startDate.getTime();
+    totalDuration += dur;
+    if (rt.task.progress !== null) {
+      totalProgress += rt.task.progress * dur;
+      hasProgress = true;
+    }
+  }
+  return hasProgress && totalDuration > 0 ? totalProgress / totalDuration : null;
+}
 function dateToFractionalYear(d) {
   const y = d.getFullYear();
   const startOfYear = new Date(y, 0, 1);
@@ -20290,9 +20403,28 @@ function showGanttDateIndicators(g, xScale, startDate, endDate, innerHeight, col
   if (endDate && endDate.getTime() !== startDate.getTime()) {
     const endPos = xScale(dateToFractionalYear(endDate));
     const endLabel = formatGanttDate(endDate);
+    const minLabelGap = 90;
+    const gap = endPos - startPos;
+    let startLabelX = startPos;
+    let endLabelX = endPos;
+    let startAnchor = "middle";
+    let endAnchor = "middle";
+    if (gap < minLabelGap) {
+      const mid = (startPos + endPos) / 2;
+      startLabelX = mid - minLabelGap / 2;
+      endLabelX = mid + minLabelGap / 2;
+      startAnchor = "middle";
+      endAnchor = "middle";
+    }
     g.append("line").attr("class", "gantt-hover-date").attr("x1", endPos).attr("y1", -tickLen).attr("x2", endPos).attr("y2", innerHeight).attr("stroke", color).attr("stroke-width", 1.5).attr("stroke-dasharray", "4 4").attr("opacity", 0.6);
-    g.append("text").attr("class", "gantt-hover-date").attr("x", endPos).attr("y", -tickLen - 4).attr("text-anchor", "middle").attr("fill", color).attr("font-size", "10px").attr("font-weight", "600").text(endLabel);
-    g.append("text").attr("class", "gantt-hover-date").attr("x", endPos).attr("y", innerHeight + tickLen + 12).attr("text-anchor", "middle").attr("fill", color).attr("font-size", "10px").attr("font-weight", "600").text(endLabel);
+    g.selectAll("text.gantt-hover-date").each(function() {
+      const el = d3Selection10.select(this);
+      if (el.text() === startLabel) {
+        el.attr("x", startLabelX).attr("text-anchor", startAnchor);
+      }
+    });
+    g.append("text").attr("class", "gantt-hover-date").attr("x", endLabelX).attr("y", -tickLen - 4).attr("text-anchor", endAnchor).attr("fill", color).attr("font-size", "10px").attr("font-weight", "600").text(endLabel);
+    g.append("text").attr("class", "gantt-hover-date").attr("x", endLabelX).attr("y", innerHeight + tickLen + 12).attr("text-anchor", endAnchor).attr("fill", color).attr("font-size", "10px").attr("font-weight", "600").text(endLabel);
   }
 }
 function hideGanttDateIndicators(g) {
@@ -22348,7 +22480,7 @@ function parseVisualization(content, palette) {
         continue;
       }
       const markerMatch = line10.match(
-        /^marker\s+(\d{4}(?:-\d{2})?(?:-\d{2})?)\s*:\s*(.+?)(?:\s*\(([^)]+)\))?\s*$/
+        /^marker:\s+(\d{4}(?:-\d{2})?(?:-\d{2})?)\s+(.+?)(?:\s*\(([^)]+)\))?\s*$/
       );
       if (markerMatch) {
         const colorAnnotation = markerMatch[3]?.trim() || null;
@@ -22372,7 +22504,7 @@ function parseVisualization(content, palette) {
         const unit = durationMatch[3];
         const endDate = addDurationToDate(startDate, amount, unit);
         const segments = durationMatch[5].split("|");
-        const metadata = segments.length > 1 ? parsePipeMetadata(["", ...segments.slice(1)], timelineAliasMap) : {};
+        const metadata = segments.length > 1 ? parsePipeMetadata(["", ...segments.slice(1)], timelineAliasMap, () => warn(lineNumber, MULTIPLE_PIPE_WARNING)) : {};
         result.timelineEvents.push({
           date: startDate,
           endDate,
@@ -22389,7 +22521,7 @@ function parseVisualization(content, palette) {
       );
       if (rangeMatch) {
         const segments = rangeMatch[4].split("|");
-        const metadata = segments.length > 1 ? parsePipeMetadata(["", ...segments.slice(1)], timelineAliasMap) : {};
+        const metadata = segments.length > 1 ? parsePipeMetadata(["", ...segments.slice(1)], timelineAliasMap, () => warn(lineNumber, MULTIPLE_PIPE_WARNING)) : {};
         result.timelineEvents.push({
           date: rangeMatch[1],
           endDate: rangeMatch[2],
@@ -22406,7 +22538,7 @@ function parseVisualization(content, palette) {
       );
       if (pointMatch) {
         const segments = pointMatch[2].split("|");
-        const metadata = segments.length > 1 ? parsePipeMetadata(["", ...segments.slice(1)], timelineAliasMap) : {};
+        const metadata = segments.length > 1 ? parsePipeMetadata(["", ...segments.slice(1)], timelineAliasMap, () => warn(lineNumber, MULTIPLE_PIPE_WARNING)) : {};
         result.timelineEvents.push({
           date: pointMatch[1],
           endDate: null,
@@ -25358,9 +25490,8 @@ async function renderForExport(content, theme, palette, orgExportState, options)
     const { renderGantt: renderGantt2 } = await Promise.resolve().then(() => (init_renderer9(), renderer_exports9));
     const effectivePalette2 = await resolveExportPalette(theme, palette);
     const ganttParsed = parseGantt2(content, effectivePalette2);
-    if (ganttParsed.error) return "";
     const resolved = calculateSchedule2(ganttParsed);
-    if (resolved.error || resolved.tasks.length === 0) return "";
+    if (resolved.tasks.length === 0) return "";
     const EXPORT_W = 1200;
     const EXPORT_H = 800;
     const container2 = createExportContainer(EXPORT_W, EXPORT_H);