@diagrammo/dgmo 0.80.0 → 0.82.0

package/dist/{chunk-KJKJTU6T.js → chunk-ITDRR5JA.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-FWNJDD4U.js";
 import {
   layoutInlineHeader
-} from "./chunk-GJ6XD5T7.js";
+} from "./chunk-MV4NT6ZS.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -11,37 +11,37 @@ import {
 } from "./chunk-VLC6WNRD.js";
 import {
   renderIntegratedLegend
-} from "./chunk-HVNIHFEC.js";
+} from "./chunk-3URBJ3MT.js";
 import {
   getLegendExtent,
   getMaxLegendReservedHeight
-} from "./chunk-TR5BFNRR.js";
+} from "./chunk-A77XE4DY.js";
 import {
   FONT_FAMILY
 } from "./chunk-ICLB27PZ.js";
 import {
   LEGEND_GROUP_GAP
-} from "./chunk-UDUJVGCZ.js";
+} from "./chunk-USSW5NJX.js";
 import {
   measureText
 } from "./chunk-YC6GVLTI.js";
 import {
   resolveTagColor,
   tagAttrKey
-} from "./chunk-LDJFPEQ5.js";
+} from "./chunk-L5AFONQU.js";
 import {
   contrastText,
   getSeriesColors,
   mix,
   shapeFill,
   themeBaseBg
-} from "./chunk-ARUQ55BK.js";
+} from "./chunk-7HWY4QAJ.js";
 import {
   resolveColor
-} from "./chunk-3NGB6XAX.js";
+} from "./chunk-2M4IGSCY.js";
 import {
   makeDgmoError
-} from "./chunk-OAQE624Z.js";
+} from "./chunk-BYU54C3S.js";
 
 // src/bracket/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -1001,4 +1001,4 @@ export {
   renderBracket,
   renderBracketForExport
 };
-//# sourceMappingURL=chunk-KJKJTU6T.js.map
+//# sourceMappingURL=chunk-ITDRR5JA.js.map

package/dist/{chunk-TU5ZNZWE.js → chunk-J64NZ6NF.js}

@@ -1,10 +1,10 @@
 import {
   extractColor,
   measureIndent
-} from "./chunk-OD42CAXD.js";
+} from "./chunk-44GP7PD5.js";
 import {
   makeDgmoError
-} from "./chunk-OAQE624Z.js";
+} from "./chunk-BYU54C3S.js";
 
 // src/utils/notes/parse.ts
 function parseNoteHeader(rest) {
@@ -73,4 +73,4 @@ function tryCollectNote(lines, index, indent, palette, diagnostics) {
 export {
   tryCollectNote
 };
-//# sourceMappingURL=chunk-TU5ZNZWE.js.map
+//# sourceMappingURL=chunk-J64NZ6NF.js.map

package/dist/{chunk-A57MQC7M.js → chunk-JIPUBFAM.js}

@@ -30,10 +30,10 @@ import {
   getSeriesColors,
   mix,
   themeBaseBg
-} from "./chunk-ARUQ55BK.js";
+} from "./chunk-7HWY4QAJ.js";
 import {
   resolveColor
-} from "./chunk-3NGB6XAX.js";
+} from "./chunk-2M4IGSCY.js";
 
 // src/countdown/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -1029,4 +1029,4 @@ export {
   renderCountdown,
   renderCountdownForExport
 };
-//# sourceMappingURL=chunk-A57MQC7M.js.map
+//# sourceMappingURL=chunk-JIPUBFAM.js.map

package/dist/{chunk-W4EKQ2P6.js → chunk-JLGN6S4B.js}

@@ -3,6 +3,41 @@ import {
   NODE_WIDTH
 } from "./chunk-WTTIODDV.js";
 
+// src/boxes-and-lines/edge-clip.ts
+function rectBorderPoint(rect, toward) {
+  const dx = toward.x - rect.x;
+  const dy = toward.y - rect.y;
+  const sx = dx === 0 ? Infinity : rect.w / 2 / Math.abs(dx);
+  const sy = dy === 0 ? Infinity : rect.h / 2 / Math.abs(dy);
+  const s = Math.min(sx, sy);
+  if (!Number.isFinite(s)) return { x: rect.x, y: rect.y };
+  return { x: rect.x + dx * s, y: rect.y + dy * s };
+}
+function isInsideRect(p, rect) {
+  const EPS = 0.5;
+  return Math.abs(p.x - rect.x) < rect.w / 2 - EPS && Math.abs(p.y - rect.y) < rect.h / 2 - EPS;
+}
+function clipEndpointsToNodes(pts, rectA, rectB) {
+  if (pts.length < 2) return pts;
+  const rects = [rectA, rectB].filter((r) => r !== void 0);
+  if (rects.length === 0) return pts;
+  const enclosing = (p) => rects.find((r) => isInsideRect(p, r));
+  let out = pts;
+  const head = enclosing(out[0]);
+  if (head) {
+    let k = 0;
+    while (k < out.length - 1 && isInsideRect(out[k], head)) k++;
+    out = [rectBorderPoint(head, out[k]), ...out.slice(k)];
+  }
+  const tail = enclosing(out[out.length - 1]);
+  if (tail) {
+    let k = out.length - 1;
+    while (k > 0 && isInsideRect(out[k], tail)) k--;
+    out = [...out.slice(0, k + 1), rectBorderPoint(tail, out[k])];
+  }
+  return out;
+}
+
 // src/boxes-and-lines/layout-grouped.ts
 var NODESEP = 50;
 var RANKSEP = 60;
@@ -555,6 +590,12 @@ function groupedTierCandidates(parsed, sizes, opts) {
         m(b.cross, ctr)
       ]);
     }
+    const nodeRect = (label) => {
+      const n = node.get(label);
+      if (!n) return void 0;
+      const c = coord(n);
+      return { x: c.x, y: c.y, w: n.realW, h: n.realH };
+    };
     const layoutEdges = [];
     for (let i = 0; i < parsed.edges.length; i++) {
       const e = parsed.edges[i];
@@ -563,12 +604,19 @@ function groupedTierCandidates(parsed, sizes, opts) {
       if (e.source === e.target) {
         const c = coord(node.get(e.source));
         points = [c, c];
-      } else if (backPoints.has(i)) points = backPoints.get(i);
-      else if (flatPoints.has(i)) points = flatPoints.get(i);
-      else {
-        const chain = chainById.get(i);
-        if (!chain) continue;
-        points = chain.map((id) => coord(node.get(id)));
+      } else {
+        if (backPoints.has(i)) points = backPoints.get(i);
+        else if (flatPoints.has(i)) points = flatPoints.get(i);
+        else {
+          const chain = chainById.get(i);
+          if (!chain) continue;
+          points = chain.map((id) => coord(node.get(id)));
+        }
+        points = clipEndpointsToNodes(
+          points,
+          nodeRect(e.source),
+          nodeRect(e.target)
+        );
       }
       layoutEdges.push({
         source: e.source,
@@ -686,7 +734,8 @@ function groupedTierCandidates(parsed, sizes, opts) {
 }
 
 export {
+  clipEndpointsToNodes,
   acyclicOrient,
   groupedTierCandidates
 };
-//# sourceMappingURL=chunk-W4EKQ2P6.js.map
+//# sourceMappingURL=chunk-JLGN6S4B.js.map

package/dist/{chunk-V4IRPJ6J.js → chunk-JQ57AWDL.js}

@@ -16,11 +16,11 @@ import {
   fillModeFromToken,
   measureIndent,
   parseFirstLine
-} from "./chunk-OD42CAXD.js";
+} from "./chunk-44GP7PD5.js";
 import {
   makeDgmoError,
   makeFail
-} from "./chunk-OAQE624Z.js";
+} from "./chunk-BYU54C3S.js";
 
 // src/countdown/parser.ts
 var RETIRED_SLOTS = /* @__PURE__ */ new Set(["on", "at", "from"]);
@@ -424,4 +424,4 @@ export {
   targetToMs2 as targetToMs,
   parseCountdown
 };
-//# sourceMappingURL=chunk-V4IRPJ6J.js.map
+//# sourceMappingURL=chunk-JQ57AWDL.js.map

package/dist/{chunk-SH6QDU4T.js → chunk-JRUEIRJB.js}

@@ -3,13 +3,13 @@ import {
 } from "./chunk-7TF3QOOD.js";
 import {
   tryCollectNote
-} from "./chunk-TU5ZNZWE.js";
+} from "./chunk-J64NZ6NF.js";
 import {
   resolveNotes
-} from "./chunk-VS5WMPWM.js";
+} from "./chunk-O753JUEZ.js";
 import {
   parseInArrowLabel
-} from "./chunk-IMA4D3ZK.js";
+} from "./chunk-N7VMGZCU.js";
 import {
   displayName,
   normalizeName
@@ -21,7 +21,7 @@ import {
   measureIndent,
   parseFirstLine,
   tryParseSharedOption
-} from "./chunk-OD42CAXD.js";
+} from "./chunk-44GP7PD5.js";
 import {
   NAME_DIAGNOSTIC_CODES,
   emit,
@@ -29,7 +29,7 @@ import {
   makeDgmoError,
   nameMergedMessage,
   suggest
-} from "./chunk-OAQE624Z.js";
+} from "./chunk-BYU54C3S.js";
 
 // src/graph/flowchart-parser.ts
 function nodeId(shape, label) {
@@ -474,4 +474,4 @@ export {
   looksLikeFlowchart,
   extractSymbols
 };
-//# sourceMappingURL=chunk-SH6QDU4T.js.map
+//# sourceMappingURL=chunk-JRUEIRJB.js.map

package/dist/{chunk-JOGEEMMO.js → chunk-JS2THRCB.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-YC6GVLTI.js";
 import {
   resolveNotes
-} from "./chunk-VS5WMPWM.js";
+} from "./chunk-O753JUEZ.js";
 
 // src/class/layout.ts
 import dagre from "@dagrejs/dagre";
@@ -201,4 +201,4 @@ function layoutClassDiagram(parsed, options) {
 export {
   layoutClassDiagram
 };
-//# sourceMappingURL=chunk-JOGEEMMO.js.map
+//# sourceMappingURL=chunk-JS2THRCB.js.map

package/dist/{chunk-VPSZKOKK.js → chunk-KABGWUND.js}

@@ -3,17 +3,14 @@ import {
 } from "./chunk-EOYPX6SF.js";
 import {
   parseClock
-} from "./chunk-X36EJABT.js";
+} from "./chunk-WP2RLGDI.js";
 import {
   parseBracket
-} from "./chunk-B66G5S4G.js";
-import {
-  parseRaci
-} from "./chunk-PYX7QA7B.js";
+} from "./chunk-ZUCXFXLD.js";
 import {
   BODY_DIAGNOSTICS,
   parseBody
-} from "./chunk-VHFZK72U.js";
+} from "./chunk-47E5UTXE.js";
 import {
   EXTENDED_CHART_DOORS,
   parseChart,
@@ -22,90 +19,94 @@ import {
   parseHeatmap,
   parseSankey,
   parseScatter
-} from "./chunk-WT65QX7I.js";
+} from "./chunk-7UDAIP6W.js";
 import {
   parseCycle
-} from "./chunk-I7BVPBPI.js";
+} from "./chunk-WQ6G6FFM.js";
 import {
   parseJourneyMap
-} from "./chunk-WV3RUC2Z.js";
+} from "./chunk-NF5YKFRH.js";
 import {
   parsePyramid
-} from "./chunk-37HNPLQA.js";
+} from "./chunk-PIXJL77H.js";
 import {
   parseRing
-} from "./chunk-HFIS5H44.js";
+} from "./chunk-3C2FWS2J.js";
 import {
   TREEMAP_DIAGNOSTICS,
   parseTreemap
-} from "./chunk-U3BJC66Q.js";
+} from "./chunk-P3SKSKJI.js";
 import {
   parseBlock
-} from "./chunk-JSQXK2X7.js";
+} from "./chunk-MY6GUH26.js";
 import {
   parseGoal
-} from "./chunk-IHOX6RQZ.js";
+} from "./chunk-BOO24UMJ.js";
 import {
   parseCountdown
-} from "./chunk-V4IRPJ6J.js";
+} from "./chunk-JQ57AWDL.js";
 import {
   parseMap
-} from "./chunk-BKM2CJBC.js";
+} from "./chunk-HTWH2XQL.js";
 import {
   parseBoxesAndLines
-} from "./chunk-3AWWQ2AI.js";
+} from "./chunk-MHAYUS65.js";
 import {
   parseSketch
-} from "./chunk-GCW3FSLR.js";
+} from "./chunk-RU725VCJ.js";
 import {
   SKETCH_DIAGNOSTICS
-} from "./chunk-EGY3TS62.js";
+} from "./chunk-DV2VEJCC.js";
 import {
   SWIMLANE_DIAGNOSTICS,
   parseSwimlane
-} from "./chunk-I26QNBHS.js";
+} from "./chunk-C7QRRTAW.js";
 import {
   FAMILY_DIAGNOSTICS,
   parseFamily
-} from "./chunk-23MSLKPP.js";
+} from "./chunk-FKZ2Y3Q5.js";
 import {
   parseMindmap
-} from "./chunk-2TTDR565.js";
+} from "./chunk-NGC3IZRY.js";
 import {
   parseTechRadar
-} from "./chunk-3KGW6JUX.js";
-import {
-  PERT_DIAGNOSTICS,
-  looksLikePert,
-  parsePert
-} from "./chunk-JN3OA44O.js";
-import {
-  isLiveLinkLine,
-  parseLiveLink
-} from "./chunk-7TTKMWTA.js";
+} from "./chunk-6K7RODXG.js";
 import {
   EVENT_LINE_DIAGNOSTICS,
   parseEventLine
-} from "./chunk-7EHMSQVV.js";
+} from "./chunk-66YFDTT6.js";
 import {
   parseTimelineEventLine
-} from "./chunk-54E35DTP.js";
+} from "./chunk-GDJW64XE.js";
 import {
   VERSION_CONTROL_DIAGNOSTICS,
   parseVersionControl
-} from "./chunk-3VUWBXW2.js";
+} from "./chunk-QFHWYWQL.js";
 import {
   parseKanban
-} from "./chunk-LA4FDGQO.js";
+} from "./chunk-GUYVKGFN.js";
 import {
   parseC4
-} from "./chunk-H4YK6Q7A.js";
+} from "./chunk-GSYZZFI5.js";
 import {
   parseInfra
-} from "./chunk-4ROEQ3XT.js";
+} from "./chunk-GUTZCRBT.js";
 import {
   parseGantt
-} from "./chunk-QQLY52Q7.js";
+} from "./chunk-BAZT6CIF.js";
+import {
+  parseDgmoChartType
+} from "./chunk-ECIXBEG2.js";
+import {
+  parseRaci
+} from "./chunk-3RYBTEF5.js";
+import {
+  PERT_DIAGNOSTICS,
+  parsePert
+} from "./chunk-UNNJCSSQ.js";
+import {
+  parseLiveLink
+} from "./chunk-HMWZQ53A.js";
 import {
   makeYearContext,
   parseDateToken,
@@ -113,52 +114,45 @@ import {
   toInternal
 } from "./chunk-DAOFNU6J.js";
 import {
-  looksLikeSequence,
   parseSequenceDgmo
-} from "./chunk-WRQ54IZS.js";
+} from "./chunk-6EV2F6W7.js";
 import {
-  looksLikeFlowchart,
   parseFlowchart
-} from "./chunk-SH6QDU4T.js";
+} from "./chunk-JRUEIRJB.js";
 import {
   GRAPH_DIAGNOSTICS
 } from "./chunk-7TF3QOOD.js";
 import {
-  looksLikeState,
   parseState
-} from "./chunk-O4CG5ZRH.js";
+} from "./chunk-AYOVY75O.js";
 import {
-  looksLikeClassDiagram,
   parseClassDiagram
-} from "./chunk-QMBVPA4R.js";
+} from "./chunk-A4XPI4YN.js";
 import {
-  looksLikeERDiagram,
   parseERDiagram
-} from "./chunk-WM2CR4NX.js";
+} from "./chunk-WPL5PFXE.js";
 import {
   ARROW_DIAGNOSTIC_CODES
-} from "./chunk-IMA4D3ZK.js";
+} from "./chunk-N7VMGZCU.js";
 import {
-  looksLikeOrg,
   parseOrg
-} from "./chunk-J5FSJRQN.js";
+} from "./chunk-FJNXXGTR.js";
 import {
-  looksLikeSitemap,
   parseSitemap
-} from "./chunk-XH4JUOYQ.js";
-import {
-  RACI_DIAGNOSTICS
-} from "./chunk-ALKJBGIV.js";
+} from "./chunk-UG2XG57E.js";
 import {
   parseWireframe
-} from "./chunk-3MNFBPFK.js";
+} from "./chunk-HSRQDWV7.js";
+import {
+  RACI_DIAGNOSTICS
+} from "./chunk-4WW3SGMH.js";
 import {
   matchTagBlockHeading,
   stripDefaultModifier,
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-LDJFPEQ5.js";
+} from "./chunk-L5AFONQU.js";
 import {
   ALIAS_DIAGNOSTICS,
   TIMELINE_REGISTRY,
@@ -172,11 +166,12 @@ import {
   peelTrailingColorName,
   splitNameAndMeta,
   withTagAliases
-} from "./chunk-OD42CAXD.js";
+} from "./chunk-44GP7PD5.js";
 import {
   resolveColorWithDiagnostic
-} from "./chunk-3NGB6XAX.js";
+} from "./chunk-2M4IGSCY.js";
 import {
+  MISTYPED_CHART_TYPE_DX,
   NEGATIVE_VALUE_DX,
   TITLE_DIRECTIVE_DX,
   dedupeDiagnostics,
@@ -186,7 +181,7 @@ import {
   makeDgmoError,
   nameMergedMessage,
   suggest
-} from "./chunk-OAQE624Z.js";
+} from "./chunk-BYU54C3S.js";
 
 // src/visualizations/types.ts
 var DEFAULT_CLOUD_OPTIONS = {
@@ -197,6 +192,7 @@ var DEFAULT_CLOUD_OPTIONS = {
 };
 
 // src/visualizations/parse.ts
+var allChartTypeIds = chartTypes.map((c) => c.id);
 function parseVisualization(content, palette) {
   return parseVisualizationFull(content, palette);
 }
@@ -1175,15 +1171,15 @@ function parseVisualizationFull(content, palette) {
     }
   }
   if (!result.type) {
-    const validD3Types = [...VALID_D3_TYPES];
     const firstNonEmpty = lines.find((l) => l.trim() && !l.trim().startsWith("//"))?.trim() ?? "";
-    const hint = suggest(
-      firstNonEmpty.split(/\s/)[0].toLowerCase(),
-      validD3Types
-    );
-    let msg = `Unsupported chart type: "${firstNonEmpty.split(/\s/)[0]}". Supported types: ${validD3Types.join(", ")}`;
-    if (hint) msg += `. ${hint}`;
-    return fail(1, msg);
+    const word = firstNonEmpty.split(/\s/)[0];
+    const hint = suggest(word.toLowerCase(), allChartTypeIds);
+    let msg = `'${word}' is not a chart type`;
+    msg += hint ? `. ${hint}` : ` \u2014 line 1 names the chart type, e.g. \`bar Sales\` or \`flowchart Deploy\`.`;
+    const diag = makeDgmoError(1, msg);
+    result.diagnostics.unshift(diag);
+    result.error = formatDgmoError(diag);
+    return result;
   }
   if (result.type === "sequence") {
     return result;
@@ -1593,6 +1589,7 @@ var UNIVERSAL_DIAGNOSTICS = [
     example: "org Team\nJane\n  Sam"
   },
   // ── Data-chart `title` directive (decision #48) ──
+  MISTYPED_CHART_TYPE_DX,
   TITLE_DIRECTIVE_DX,
   // ── Negative value on a magnitude channel (pie/polar-area/radar/funnel/
   //    sankey/arc/wordcloud/treemap size/map size:/width:) ──
@@ -1744,53 +1741,6 @@ function isExtendedChartParser(parse) {
 }
 
 // src/dgmo-router.ts
-var GANTT_DURATION_RE = /^\d+(?:\.\d+)?(?:min|bd|sp|d|w|m|q|y|h)(?:\?)?\s+/;
-var GANTT_DATE_RE = /^\d{4}-\d{2}-\d{2}(?:\s\d{2}:\d{2})?\s+/;
-function looksLikeGantt(content) {
-  const lines = content.split("\n");
-  for (const line of lines) {
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith("//")) continue;
-    if (GANTT_DURATION_RE.test(trimmed) || GANTT_DATE_RE.test(trimmed)) {
-      return true;
-    }
-  }
-  return false;
-}
-var C4_TYPE_RE = /\bis\s+an?\s+(person|system|container|component)\b/i;
-function looksLikeC4(content) {
-  const lines = content.split("\n");
-  for (const line of lines) {
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith("//")) continue;
-    if (C4_TYPE_RE.test(trimmed)) {
-      return true;
-    }
-  }
-  return false;
-}
-function parseDgmoChartType(content) {
-  const lines = content.split("\n");
-  for (const line of lines) {
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith("//")) continue;
-    const firstLineResult = parseFirstLine(trimmed);
-    if (firstLineResult) return firstLineResult.chartType;
-    if (isLiveLinkLine(trimmed)) return "live-link";
-    break;
-  }
-  if (looksLikeSequence(content)) return "sequence";
-  if (looksLikeFlowchart(content)) return "flowchart";
-  if (looksLikeClassDiagram(content)) return "class";
-  if (looksLikeERDiagram(content)) return "er";
-  if (looksLikeState(content)) return "state";
-  if (looksLikeSitemap(content)) return "sitemap";
-  if (looksLikeOrg(content)) return "org";
-  if (looksLikeC4(content)) return "c4";
-  if (looksLikeGantt(content)) return "gantt";
-  if (looksLikePert(content)) return "pert";
-  return null;
-}
 function getRenderCategory(chartType) {
   return REGISTRY_BY_ID.get(chartType.toLowerCase())?.category ?? null;
 }
@@ -1833,8 +1783,10 @@ function parseDgmoUndeduped(content) {
   const parser = PARSER_BY_ID.get(chartType);
   if (parser) {
     const result2 = parser(content);
+    const mistyped = detectMistypedChartType(content, chartType);
     return {
       diagnostics: [
+        ...mistyped ? [mistyped] : [],
         ...result2.diagnostics,
         ...detectEmptyContent(content, chartType)
       ],
@@ -1850,6 +1802,27 @@ function parseDgmoUndeduped(content) {
     chartType
   };
 }
+var MERMAID_FIRST_WORDS = {
+  graph: "flowchart",
+  journey: "journey-map"
+};
+function detectMistypedChartType(content, resolved) {
+  const lines = content.split("\n");
+  for (let i = 0; i < lines.length; i++) {
+    const trimmed = lines[i].trim();
+    if (!trimmed || trimmed.startsWith("#") || trimmed.startsWith("//"))
+      continue;
+    const match = trimmed.match(/^([a-z][a-z0-9-]*)(?:\s|$)/);
+    if (!match) return null;
+    const word = match[1];
+    if (ALL_KNOWN_TYPES.has(word)) return null;
+    const alias = MERMAID_FIRST_WORDS[word];
+    const suggestion = alias ? `Did you mean '${alias}'?` : suggest(word, [...ALL_KNOWN_TYPES]);
+    if (!suggestion) return null;
+    return emit(MISTYPED_CHART_TYPE_DX, i + 1, { word, resolved, suggestion });
+  }
+  return null;
+}
 function detectColonChartType(content) {
   const lines = content.split("\n");
   for (let i = 0; i < lines.length; i++) {
@@ -1903,9 +1876,6 @@ export {
   parseQuadrant,
   listDiagnosticCodes,
   getDiagnosticSpec,
-  looksLikeGantt,
-  looksLikeC4,
-  parseDgmoChartType,
   getRenderCategory,
   isExtendedChartType,
   getAllChartTypes,
@@ -1914,4 +1884,4 @@ export {
   knownChartTypeIds,
   parseDgmo
 };
-//# sourceMappingURL=chunk-VPSZKOKK.js.map
+//# sourceMappingURL=chunk-KABGWUND.js.map