@diagrammo/dgmo 0.52.0 → 0.54.0

package/dist/{chunk-ONU3U4GL.js → chunk-LRSW4JLE.js}

@@ -8,14 +8,17 @@ import {
   LEGEND_PILL_FONT_SIZE,
   LEGEND_PILL_PAD,
   measureLegendText
-} from "./chunk-QOOUC2J5.js";
+} from "./chunk-Q5IHQ4NW.js";
 import {
   measureText,
   wrapTextToWidth
-} from "./chunk-WCT3NYCV.js";
+} from "./chunk-4ASYQ347.js";
 import {
   tagAttrKey
-} from "./chunk-HHKO6SKY.js";
+} from "./chunk-AHTTKERF.js";
+import {
+  legendSuppressed
+} from "./chunk-3FRO35WW.js";
 
 // src/c4/layout.ts
 import dagre from "@dagrejs/dagre";
@@ -37,6 +40,23 @@ var MARGIN = 40;
 var BOUNDARY_PAD = 40;
 var GROUP_BOUNDARY_PAD = 24;
 var EDGE_NODE_COLLISION_WEIGHT = 5e3;
+function transposeGraph(g) {
+  for (const name of g.nodes()) {
+    const pos = gNode(g, name);
+    if (!pos) continue;
+    [pos.x, pos.y] = [pos.y, pos.x];
+    [pos.width, pos.height] = [pos.height, pos.width];
+  }
+}
+function reduceCrossingsForDirection(g, direction, edgeList, nodeGroupMap) {
+  if (direction === "LR") {
+    transposeGraph(g);
+    reduceCrossings(g, edgeList, nodeGroupMap);
+    transposeGraph(g);
+    return;
+  }
+  reduceCrossings(g, edgeList, nodeGroupMap);
+}
 function computeEdgePenalty(edgeList, nodePositions, degrees, nodeGeometry) {
   let penalty = 0;
   for (const edge of edgeList) {
@@ -467,9 +487,10 @@ function layoutC4Context(parsed, activeTagGroup) {
   }
   const contextRels = rollUpContextRelationships(parsed);
   const spacing = computeAdaptiveSpacing(contextRels);
+  const direction = parsed.direction;
   const g = new dagre.graphlib.Graph();
   g.setGraph({
-    rankdir: "TB",
+    rankdir: direction,
     nodesep: spacing.nodesep,
     ranksep: spacing.ranksep,
     edgesep: spacing.edgesep
@@ -489,8 +510,9 @@ function layoutC4Context(parsed, activeTagGroup) {
     }
   }
   dagre.layout(g);
-  reduceCrossings(
+  reduceCrossingsForDirection(
     g,
+    direction,
     validRels.map((r) => ({ source: r.sourceName, target: r.targetName }))
   );
   const nodes = contextElements.map(
@@ -570,7 +592,9 @@ function layoutC4Context(parsed, activeTagGroup) {
   }
   let totalWidth = nodes.length > 0 ? maxX - minX + MARGIN * 2 : 0;
   let totalHeight = nodes.length > 0 ? maxY - minY + MARGIN * 2 : 0;
-  const legendGroups = computeLegendGroups(parsed.tagGroups);
+  const legendGroups = computeLegendGroups(
+    legendSuppressed(parsed.options) ? [] : parsed.tagGroups
+  );
   if (legendGroups.length > 0) {
     const legendY = totalHeight + MARGIN;
     let legendX = MARGIN;
@@ -666,6 +690,7 @@ function layoutC4Containers(parsed, systemName, activeTagGroup) {
     }
   }
   const hasGroups = elementToGroup.size > 0;
+  const direction = parsed.direction;
   const g = hasGroups ? new dagre.graphlib.Graph({ compound: true }) : new dagre.graphlib.Graph();
   g.setDefaultEdgeLabel(() => ({}));
   if (hasGroups) {
@@ -734,7 +759,7 @@ function layoutC4Containers(parsed, systemName, activeTagGroup) {
   }
   const spacing = computeAdaptiveSpacing(containerRels);
   g.setGraph({
-    rankdir: "TB",
+    rankdir: direction,
     nodesep: spacing.nodesep,
     ranksep: spacing.ranksep,
     edgesep: spacing.edgesep
@@ -746,8 +771,9 @@ function layoutC4Containers(parsed, systemName, activeTagGroup) {
   }
   dagre.layout(g);
   const nodeGroupMap = hasGroups ? new Map([...elementToGroup.entries()].map(([k, v]) => [k, v.name])) : void 0;
-  reduceCrossings(
+  reduceCrossingsForDirection(
     g,
+    direction,
     containerRels.filter(
       (r) => nameToElement.has(r.sourceName) && nameToElement.has(r.targetName)
     ).map((r) => ({ source: r.sourceName, target: r.targetName })),
@@ -925,7 +951,9 @@ function layoutC4Containers(parsed, systemName, activeTagGroup) {
   }
   let totalWidth = maxX - minX + MARGIN * 2;
   let totalHeight = maxY - minY + MARGIN * 2;
-  const legendGroups = computeLegendGroups(parsed.tagGroups);
+  const legendGroups = computeLegendGroups(
+    legendSuppressed(parsed.options) ? [] : parsed.tagGroups
+  );
   if (legendGroups.length > 0) {
     const legendY = totalHeight + MARGIN;
     let legendX = MARGIN;
@@ -1073,6 +1101,7 @@ function layoutC4Components(parsed, systemName, containerName, activeTagGroup) {
     }
   }
   const hasGroups = elementToGroup.size > 0;
+  const direction = parsed.direction;
   const g = hasGroups ? new dagre.graphlib.Graph({ compound: true }) : new dagre.graphlib.Graph();
   g.setDefaultEdgeLabel(() => ({}));
   if (hasGroups) {
@@ -1147,7 +1176,7 @@ function layoutC4Components(parsed, systemName, containerName, activeTagGroup) {
   }
   const spacing = computeAdaptiveSpacing(componentRels);
   g.setGraph({
-    rankdir: "TB",
+    rankdir: direction,
     nodesep: spacing.nodesep,
     ranksep: spacing.ranksep,
     edgesep: spacing.edgesep
@@ -1159,8 +1188,9 @@ function layoutC4Components(parsed, systemName, containerName, activeTagGroup) {
   }
   dagre.layout(g);
   const nodeGroupMap = hasGroups ? new Map([...elementToGroup.entries()].map(([k, v]) => [k, v.name])) : void 0;
-  reduceCrossings(
+  reduceCrossingsForDirection(
     g,
+    direction,
     componentRels.filter(
       (r) => nameToElement.has(r.sourceName) && nameToElement.has(r.targetName)
     ).map((r) => ({ source: r.sourceName, target: r.targetName })),
@@ -1340,7 +1370,9 @@ function layoutC4Components(parsed, systemName, containerName, activeTagGroup) {
   }
   let totalWidth = maxX - minX + MARGIN * 2;
   let totalHeight = maxY - minY + MARGIN * 2;
-  const legendGroups = computeLegendGroups(parsed.tagGroups);
+  const legendGroups = computeLegendGroups(
+    legendSuppressed(parsed.options) ? [] : parsed.tagGroups
+  );
   if (legendGroups.length > 0) {
     const legendY = totalHeight + MARGIN;
     let legendX = MARGIN;
@@ -1449,6 +1481,7 @@ function layoutC4Deployment(parsed, activeTagGroup) {
   for (const r of refEntries) {
     nameToElement.set(r.element.name, r.element);
   }
+  const direction = parsed.direction;
   const g = new dagre.graphlib.Graph({ compound: true });
   g.setDefaultEdgeLabel(() => ({}));
   for (const [infraId] of infraIds) {
@@ -1483,7 +1516,7 @@ function layoutC4Deployment(parsed, activeTagGroup) {
   }
   const spacing = computeAdaptiveSpacing(deployRels);
   g.setGraph({
-    rankdir: "TB",
+    rankdir: direction,
     nodesep: spacing.nodesep,
     ranksep: spacing.ranksep,
     edgesep: spacing.edgesep
@@ -1496,8 +1529,9 @@ function layoutC4Deployment(parsed, activeTagGroup) {
   dagre.layout(g);
   const nodeInfraMap = /* @__PURE__ */ new Map();
   for (const r of refEntries) nodeInfraMap.set(r.element.name, r.infraId);
-  reduceCrossings(
+  reduceCrossingsForDirection(
     g,
+    direction,
     deployRels.filter(
       (r) => nameToElement.has(r.sourceName) && nameToElement.has(r.targetName)
     ).map((r) => ({ source: r.sourceName, target: r.targetName })),
@@ -1649,7 +1683,9 @@ function layoutC4Deployment(parsed, activeTagGroup) {
   }
   let totalWidth = maxX - minX + MARGIN * 2;
   let totalHeight = maxY - minY + MARGIN * 2;
-  const legendGroups = computeLegendGroups(parsed.tagGroups);
+  const legendGroups = computeLegendGroups(
+    legendSuppressed(parsed.options) ? [] : parsed.tagGroups
+  );
   if (legendGroups.length > 0) {
     const legendY = totalHeight + MARGIN;
     let legendX = MARGIN;
@@ -1682,4 +1718,4 @@ export {
   layoutC4Components,
   layoutC4Deployment
 };
-//# sourceMappingURL=chunk-ONU3U4GL.js.map
+//# sourceMappingURL=chunk-LRSW4JLE.js.map

package/dist/{chunk-TPFKKXCB.js → chunk-M24VXUFG.js}

@@ -1,12 +1,12 @@
 import {
   tryCollectNote
-} from "./chunk-ARGMQ3H4.js";
+} from "./chunk-WWHECSYZ.js";
 import {
   resolveNotes
-} from "./chunk-FMDSF3OV.js";
+} from "./chunk-QZAW5SFH.js";
 import {
   validateLabelCharacters
-} from "./chunk-FFUN5D66.js";
+} from "./chunk-WF64MW5G.js";
 import {
   displayName,
   normalizeName
@@ -16,16 +16,16 @@ import {
   measureIndent,
   parseFirstLine,
   tryParseSharedOption
-} from "./chunk-BRENJ2BQ.js";
+} from "./chunk-3FRO35WW.js";
 import {
   resolveColorWithDiagnostic
-} from "./chunk-TLVIHFRO.js";
+} from "./chunk-ZKPPI6BF.js";
 import {
   NAME_DIAGNOSTIC_CODES,
   formatDgmoError,
   makeDgmoError,
   nameMergedMessage
-} from "./chunk-CXK4DZH3.js";
+} from "./chunk-4W2PE66Q.js";
 
 // src/class/parser.ts
 function classId(name) {
@@ -445,4 +445,4 @@ export {
   looksLikeClassDiagram,
   extractSymbols
 };
-//# sourceMappingURL=chunk-TPFKKXCB.js.map
+//# sourceMappingURL=chunk-M24VXUFG.js.map

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

@@ -1,22 +1,22 @@
 import {
   inferParticipantType
 } from "./chunk-C3Z4DX3V.js";
-import {
-  AUTO_TAG_COLOR_SENTINEL,
-  finalizeAutoTagColors,
-  matchTagBlockHeading,
-  stripDefaultModifier,
-  validateTagGroupNames,
-  validateTagValues
-} from "./chunk-HHKO6SKY.js";
 import {
   parseArrow,
   parseInArrowLabel
-} from "./chunk-FFUN5D66.js";
+} from "./chunk-WF64MW5G.js";
 import {
   displayName,
   normalizeName
 } from "./chunk-NOTA6TEI.js";
+import {
+  AUTO_TAG_COLOR_SENTINEL,
+  finalizeAutoTagColors,
+  matchTagBlockHeading,
+  stripDefaultModifier,
+  validateTagGroupNames,
+  validateTagValues
+} from "./chunk-AHTTKERF.js";
 import {
   FILL_FAMILY_TOKENS,
   OPTION_NOCOLON_RE,
@@ -24,10 +24,11 @@ import {
   extractColor,
   measureIndent,
   parseFirstLine,
+  peelTrailingCollapsedFlag,
   splitNameAndMeta,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-BRENJ2BQ.js";
+} from "./chunk-3FRO35WW.js";
 import {
   NAME_DIAGNOSTIC_CODES,
   formatDgmoError,
@@ -35,7 +36,7 @@ import {
   makeFail,
   nameMergedMessage,
   suggest
-} from "./chunk-CXK4DZH3.js";
+} from "./chunk-4W2PE66Q.js";
 
 // src/sequence/parser.ts
 var KNOWN_SEQ_OPTIONS = /* @__PURE__ */ new Set(["active-tag"]);
@@ -43,7 +44,8 @@ var KNOWN_SEQ_BOOLEANS = /* @__PURE__ */ new Set([
   "fill-tint",
   "fill-solid",
   "fill-outline",
-  "no-title"
+  "no-title",
+  "no-legend"
 ]);
 var NO_PREFIX_ONLY_BOOLEANS = /* @__PURE__ */ new Set(["activations"]);
 var VALID_PARTICIPANT_TYPES = /* @__PURE__ */ new Set([
@@ -358,8 +360,13 @@ function parseSequenceDgmo(content, palette) {
       const groupName = groupMatch[1].trim();
       const groupColor = groupMatch[2]?.trim();
       let groupMeta;
-      const afterBracket = groupMatch[3]?.trim() || "";
+      let afterBracket = groupMatch[3]?.trim() || "";
       let isCollapsed = false;
+      const barePeel = peelTrailingCollapsedFlag(afterBracket);
+      if (barePeel.collapsed) {
+        isCollapsed = true;
+        afterBracket = barePeel.rest;
+      }
       if (afterBracket) {
         const groupRegistry = withTagAliases(
           SEQUENCE_REGISTRY,
@@ -1032,4 +1039,4 @@ export {
   parseSequenceDgmo,
   looksLikeSequence
 };
-//# sourceMappingURL=chunk-QJMKPUYK.js.map
+//# sourceMappingURL=chunk-M3H7ZE6C.js.map

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

@@ -3,7 +3,7 @@ import {
 } from "./chunk-RT7ACF77.js";
 import {
   makeDgmoError
-} from "./chunk-CXK4DZH3.js";
+} from "./chunk-4W2PE66Q.js";
 
 // src/sketch/geometry.ts
 var SKETCH_PHI = (1 + Math.sqrt(5)) / 2;
@@ -449,4 +449,4 @@ export {
   collapseSketch,
   layoutSketch
 };
-//# sourceMappingURL=chunk-QVENJMNX.js.map
+//# sourceMappingURL=chunk-MEQYZZFR.js.map

package/dist/{chunk-75G3Q4DK.js → chunk-MTZOXISJ.js}

@@ -1,17 +1,17 @@
 import {
   buildCoupleQuotient
 } from "./chunk-QQJUTGQH.js";
+import {
+  displayName,
+  normalizeName
+} from "./chunk-NOTA6TEI.js";
 import {
   AUTO_TAG_COLOR_SENTINEL,
   finalizeAutoTagColors,
   matchTagBlockHeading,
   stripDefaultModifier,
   tagAttrKey
-} from "./chunk-HHKO6SKY.js";
-import {
-  displayName,
-  normalizeName
-} from "./chunk-NOTA6TEI.js";
+} from "./chunk-AHTTKERF.js";
 import {
   FAMILY_PERSON_REGISTRY,
   FAMILY_UNION_REGISTRY,
@@ -26,14 +26,14 @@ import {
   tokenizeQuoteAware,
   tryParseSharedOption,
   withTagAliases
-} from "./chunk-BRENJ2BQ.js";
+} from "./chunk-3FRO35WW.js";
 import {
   nord,
   resolveColor
-} from "./chunk-TLVIHFRO.js";
+} from "./chunk-ZKPPI6BF.js";
 import {
   emit
-} from "./chunk-CXK4DZH3.js";
+} from "./chunk-4W2PE66Q.js";
 
 // src/family/diagnostics.ts
 var FAMILY_DX = {
@@ -571,4 +571,4 @@ export {
   FAMILY_DIAGNOSTICS,
   parseFamily
 };
-//# sourceMappingURL=chunk-75G3Q4DK.js.map
+//# sourceMappingURL=chunk-MTZOXISJ.js.map