@diagrammo/dgmo 0.36.0 → 0.37.0

package/dist/advanced.js

@@ -16730,6 +16730,7 @@ function parseInfra(content) {
   let currentGroup = null;
   let currentTagGroup = null;
   let baseIndent = 0;
+  let firstLineConsumed = false;
   function finishCurrentNode() {
     if (!currentNode) return;
     const key = currentNode.id;
@@ -16737,7 +16738,8 @@ function parseInfra(content) {
     if (existing) {
       const incomingDisplay = displayName(currentNode.label);
       const existingDisplay = displayName(existing.label);
-      if (incomingDisplay !== existingDisplay) {
+      const isAliasRef = nameAliasMap.get(currentNode.label) === key;
+      if (incomingDisplay !== existingDisplay && !isAliasRef) {
         result.diagnostics.push(
           makeDgmoError(
             currentNode.lineNumber,
@@ -16803,19 +16805,22 @@ function parseInfra(content) {
       if (indent === 0 && currentNode && !trimmed.startsWith("-")) {
         finishCurrentNode();
       }
-      const firstLineResult = parseFirstLine(trimmed);
-      if (firstLineResult) {
-        if (firstLineResult.chartType !== "infra") {
-          setError(
-            lineNumber,
-            `Expected chart type 'infra', got '${firstLineResult.chartType}'`
-          );
-        }
-        if (firstLineResult.title) {
-          result.title = firstLineResult.title;
-          result.titleLineNumber = lineNumber;
+      if (!firstLineConsumed) {
+        firstLineConsumed = true;
+        const firstLineResult = parseFirstLine(trimmed);
+        if (firstLineResult) {
+          if (firstLineResult.chartType !== "infra") {
+            setError(
+              lineNumber,
+              `Expected chart type 'infra', got '${firstLineResult.chartType}'`
+            );
+          }
+          if (firstLineResult.title) {
+            result.title = firstLineResult.title;
+            result.titleLineNumber = lineNumber;
+          }
+          continue;
         }
-        continue;
       }
       if (/^direction-tb$/i.test(trimmed)) {
         result.direction = "TB";
@@ -16881,18 +16886,20 @@ function parseInfra(content) {
       if (compMatch) {
         finishCurrentNode();
         finishCurrentTagGroup();
-        const rawName = (compMatch[1] ?? compMatch[2] ?? "").trim();
+        const { qname, uname, alias: asAlias, meta } = compMatch.groups;
+        const rawName = (qname ?? uname ?? "").trim();
         const peeled = peelInfraDecorations(rawName, lineNumber);
         const name = peeled.label;
-        const rest = compMatch[3] || "";
+        const alias = asAlias ?? peeled.alias;
+        const rest = meta ?? "";
         const { tags } = extractPipeMetadata(rest);
         warnUnknownMetaKeys(
           tags,
           withTagAliases(INFRA_REGISTRY, tagAliasSet),
           (msg) => warn(lineNumber, msg)
         );
-        const id = nodeId2(name);
-        if (peeled.alias) nameAliasMap.set(peeled.alias, id);
+        const id = nameAliasMap.get(name) ?? nodeId2(name);
+        if (alias) nameAliasMap.set(alias, id);
         const isEdge = EDGE_NODE_NAMES.has(id.toLowerCase());
         currentNode = {
           id,
@@ -16976,18 +16983,20 @@ function parseInfra(content) {
       const compMatch = trimmed.match(COMPONENT_RE);
       if (compMatch) {
         finishCurrentTagGroup();
-        const rawName = (compMatch[1] ?? compMatch[2] ?? "").trim();
+        const { qname, uname, alias: asAlias, meta } = compMatch.groups;
+        const rawName = (qname ?? uname ?? "").trim();
         const peeled = peelInfraDecorations(rawName, lineNumber);
         const name = peeled.label;
-        const rest = compMatch[3] || "";
+        const alias = asAlias ?? peeled.alias;
+        const rest = meta ?? "";
         const { tags: nodeTags } = extractPipeMetadata(rest);
         warnUnknownMetaKeys(
           nodeTags,
           withTagAliases(INFRA_REGISTRY, tagAliasSet),
           (msg) => warn(lineNumber, msg)
         );
-        const id = nodeId2(name);
-        if (peeled.alias) nameAliasMap.set(peeled.alias, id);
+        const id = nameAliasMap.get(name) ?? nodeId2(name);
+        if (alias) nameAliasMap.set(alias, id);
         const tags = currentGroup.metadata ? { ...currentGroup.metadata, ...nodeTags } : nodeTags;
         currentNode = {
           id,
@@ -17178,6 +17187,11 @@ function parseInfra(content) {
           }
           continue;
         }
+        if (currentNode && tagAliasSet.has(normalizeName(key))) {
+          const mut = nodeMutableTags.get(currentNode.id);
+          if (mut) mut[tagAttrKey(key)] = rawVal;
+          continue;
+        }
         if (!INFRA_BEHAVIOR_KEYS.has(key) && !EDGE_ONLY_KEYS.has(key)) {
           const allKeys = [...INFRA_BEHAVIOR_KEYS, ...EDGE_ONLY_KEYS];
           const hint = suggest(key, allKeys);
@@ -17243,18 +17257,20 @@ function parseInfra(content) {
       finishCurrentNode();
       const compMatch = trimmed.match(COMPONENT_RE);
       if (compMatch) {
-        const rawName = (compMatch[1] ?? compMatch[2] ?? "").trim();
+        const { qname, uname, alias: asAlias, meta } = compMatch.groups;
+        const rawName = (qname ?? uname ?? "").trim();
         const peeled = peelInfraDecorations(rawName, lineNumber);
         const name = peeled.label;
-        const rest = compMatch[3] || "";
+        const alias = asAlias ?? peeled.alias;
+        const rest = meta ?? "";
         const { tags: nodeTags } = extractPipeMetadata(rest);
         warnUnknownMetaKeys(
           nodeTags,
           withTagAliases(INFRA_REGISTRY, tagAliasSet),
           (msg) => warn(lineNumber, msg)
         );
-        const id = nodeId2(name);
-        if (peeled.alias) nameAliasMap.set(peeled.alias, id);
+        const id = nameAliasMap.get(name) ?? nodeId2(name);
+        if (alias) nameAliasMap.set(alias, id);
         const tags = currentGroup.metadata ? { ...currentGroup.metadata, ...nodeTags } : nodeTags;
         currentNode = {
           id,
@@ -17276,18 +17292,20 @@ function parseInfra(content) {
         finishCurrentNode();
         finishCurrentTagGroup();
         currentGroup = null;
-        const rawName = (compMatch[1] ?? compMatch[2] ?? "").trim();
+        const { qname, uname, alias: asAlias, meta } = compMatch.groups;
+        const rawName = (qname ?? uname ?? "").trim();
         const peeled = peelInfraDecorations(rawName, lineNumber);
         const name = peeled.label;
-        const rest = compMatch[3] || "";
+        const alias = asAlias ?? peeled.alias;
+        const rest = meta ?? "";
         const { tags } = extractPipeMetadata(rest);
         warnUnknownMetaKeys(
           tags,
           withTagAliases(INFRA_REGISTRY, tagAliasSet),
           (msg) => warn(lineNumber, msg)
         );
-        const id = nodeId2(name);
-        if (peeled.alias) nameAliasMap.set(peeled.alias, id);
+        const id = nameAliasMap.get(name) ?? nodeId2(name);
+        if (alias) nameAliasMap.set(alias, id);
         currentNode = {
           id,
           label: name,
@@ -17487,7 +17505,7 @@ var init_parser15 = __esm({
     DEPRECATED_FANOUT_RE = /\bx(\d+)\s*$/;
     GROUP_RE = /^\[([^\]]+)\]\s*(?:as\s+([A-Za-z][A-Za-z0-9_]{0,11})\s*)?((?:\|.*)|(?:[a-zA-Z_]\w*\s*:.*))?$/;
     TAG_VALUE_RE = /^(\w[\w\s]+?)\s*$/;
-    COMPONENT_RE = /^(?:"([^"]+)"|([a-zA-Z_][\w -]*?))\s*((?:\|.*)|(?:[a-zA-Z_]\w*\s*:.*))?$/;
+    COMPONENT_RE = /^(?:"(?<qname>[^"]+)"|(?<uname>[a-zA-Z_][\w -]*?))(?:\s+as\s+(?<alias>[A-Za-z][A-Za-z0-9_]{0,11}))?\s*(?<meta>(?:\|.*)|(?:[a-zA-Z_]\w*\s*:.*))?$/;
     PIPE_META_RE = /[|,]\s*(\w+)\s*:\s*([^|,]+)/g;
     SAMELINE_META_RE = /(?:^|[\s,])(\w+)\s*:\s*([^,]+?)(?=\s*,|\s*$)/g;
     PROPERTY_RE = /^([\w-]+):\s*(.+)$/;
@@ -18971,8 +18989,8 @@ function parseMap(content, palette) {
       continue;
     }
     if (open.route && indent > open.route.indent) {
-      const leg = parseLeg(trimmed, lineNumber, open.route.route.style);
-      open.route.route.legs.push(leg);
+      const leg = parseLeg(trimmed, lineNumber);
+      if (leg) open.route.route.legs.push(leg);
       continue;
     }
     if (open.poi && indent > open.poi.indent) {
@@ -19001,6 +19019,14 @@ function parseMap(content, palette) {
         Object.assign(open.poi.poi.meta, split.meta);
         continue;
       }
+      if (split.name) {
+        const src = open.poi.poi.alias ?? poiName(open.poi.poi.pos) ?? "the poi";
+        pushError(
+          lineNumber,
+          `Malformed hub edge: "${trimmed}" \u2014 an indented line under a poi is an edge from "${src}" and needs an arrow glyph (\`-> dest\`, \`~> dest\`, or labeled \`-label-> dest\`). For a standalone place, declare it at the top level. (\xA724B.5)`
+        );
+        continue;
+      }
     }
     closeBlocks();
     const firstWord = trimmed.split(/\s+/)[0];
@@ -19249,31 +19275,44 @@ function parseMap(content, palette) {
     const { tags, meta } = partitionMeta(split.meta, tagGroupNames());
     const originLabel = meta["label"];
     const originValue = meta["value"];
-    const style = meta["style"] === "arc" ? "arc" : "straight";
+    if (meta["style"] !== void 0) {
+      pushError(
+        line11,
+        "route header no longer takes `style:` \u2014 set leg shape with the arrow glyph instead (`~\u2026~>` for an arc leg, `-\u2026->` for a straight one). (\xA724B.6)"
+      );
+    }
     const route = {
       origin: pos,
       ...split.alias !== void 0 && { originAlias: split.alias },
       ...originLabel !== void 0 && { originLabel },
       ...originValue !== void 0 && { originValue },
       originTags: tags,
-      style,
       legs: [],
       lineNumber: line11
     };
     routes.push(route);
     open.route = { route, indent };
   }
-  function parseLeg(trimmed, line11, headerStyle) {
-    let arrowStyle = "straight";
-    let label;
-    let rest = trimmed;
+  function parseLeg(trimmed, line11) {
     const m = trimmed.match(LEG_ARROW_RE);
-    if (m) {
-      const arr = classifyArrow(m[1], line11);
-      arrowStyle = arr.style;
-      label = arr.label;
-      rest = m[2];
+    if (!m) {
+      pushError(
+        line11,
+        `Malformed route leg: "${trimmed}" \u2014 a leg needs an arrow glyph (\`-> dest\`, \`~> dest\`, or labeled \`-label-> dest\` / \`~label~> dest\`). (\xA724B.6)`
+      );
+      return null;
     }
+    const arr = classifyArrow(m[1], line11);
+    if (!arr.directed) {
+      pushError(
+        line11,
+        `A route leg is directional \u2014 "${trimmed}" uses an undirected glyph; use \`-> \` (straight) or \`~> \` (arc). (\xA724B.6)`
+      );
+      return null;
+    }
+    const arrowStyle = arr.style;
+    const label = arr.label;
+    const rest = m[2];
     const split = splitNameAndMeta(
       rest,
       registry(),
@@ -19289,10 +19328,9 @@ function parseMap(content, palette) {
     const { tags, meta } = partitionMeta(split.meta, tagGroupNames());
     const value = meta["value"];
     const destLabel = meta["label"];
-    const style = arrowStyle === "arc" || headerStyle === "arc" ? "arc" : "straight";
     return {
       ...label !== void 0 && { label },
-      style,
+      style: arrowStyle,
       ...value !== void 0 && { value },
       dest: pos,
       ...split.alias !== void 0 && { destAlias: split.alias },
@@ -54107,13 +54145,15 @@ function layoutMap(resolvedIn, data, size, opts) {
         labelY: lp.y
       };
       const routeLabelStyle = leg.label !== void 0 ? labelOnFill(fillAt(bow.labelX, bow.labelY)) : void 0;
+      const routeVal = Number(leg.value);
       legs.push({
         d: legPath(a, b, bow.curved, bow.offset),
-        width: routeWidthFor(Number(leg.value)),
+        width: routeWidthFor(routeVal),
         color: lineColor(leg.tags) ?? mix(palette.text, palette.bg, 72),
         arrow: true,
         fromId: leg.fromId,
         toId: leg.toId,
+        ...Number.isFinite(routeVal) && routeVal > 0 && { value: routeVal },
         ...Object.keys(leg.tags).length > 0 && { tags: leg.tags },
         lineNumber: leg.lineNumber,
         ...leg.label !== void 0 && {
@@ -54160,6 +54200,7 @@ function layoutMap(resolvedIn, data, size, opts) {
         labelY: lp.y
       };
       const edgeLabelStyle = e.label !== void 0 ? labelOnFill(fillAt(bow.labelX, bow.labelY)) : void 0;
+      const edgeVal = Number(e.meta["value"]);
       legs.push({
         d: legPath(a, b, bow.curved, bow.offset),
         width: widthFor(e),
@@ -54167,6 +54208,7 @@ function layoutMap(resolvedIn, data, size, opts) {
         arrow: e.directed,
         fromId: e.fromId,
         toId: e.toId,
+        ...Number.isFinite(edgeVal) && edgeVal > 0 && { value: edgeVal },
         ...Object.keys(e.tags).length > 0 && { tags: e.tags },
         lineNumber: e.lineNumber,
         ...e.label !== void 0 && {
@@ -54324,18 +54366,49 @@ function layoutMap(resolvedIn, data, size, opts) {
     const SHORT_HOP_MAX = Math.max(46, Math.min(width, height) * 0.11);
     const STEP = 4;
     const HOP_GAP = 9;
+    const CLEAR_STEP = 6;
+    const CLEAR_MAX = SHORT_HOP_MAX * 3;
+    const CLEAR_TOL = CLEAR_STEP;
+    const clearanceAt = (px, py, ox, oy) => {
+      const baseAng = Math.atan2(oy, ox);
+      let minClear = CLEAR_MAX;
+      for (let k = -2; k <= 2; k++) {
+        const a = baseAng + k * Math.PI / 4;
+        const rx = Math.cos(a);
+        const ry = Math.sin(a);
+        let d = CLEAR_STEP;
+        for (; d <= CLEAR_MAX; d += CLEAR_STEP) {
+          const qx = px + rx * d;
+          const qy = py + ry * d;
+          if (qx < FIT_PAD || qy < topPad || qx > width - FIT_PAD || qy > height - FIT_PAD)
+            break;
+          if (fillAt(qx, qy) !== water) break;
+        }
+        if (d < minClear) minClear = d;
+      }
+      return minClear;
+    };
     const tryShortHopCallout = (cx, cy, fill2, name, value, font = FONT2, gap = HOP_GAP, maxLen = SHORT_HOP_MAX) => {
       const chipW = stackW(name, value, font);
       const chipH = stackH(value !== void 0, font);
+      const D = Math.SQRT1_2;
       const dirs = [
         [0, -1],
-        // north (over Canada)
+        // north
         [0, 1],
-        // south (over Mexico / Gulf)
+        // south
         [1, 0],
-        // east (Atlantic)
-        [-1, 0]
-        // west (Pacific)
+        // east
+        [-1, 0],
+        // west
+        [D, -D],
+        // NE
+        [D, D],
+        // SE
+        [-D, -D],
+        // NW
+        [-D, D]
+        // SW
       ];
       let best = null;
       for (const [dx, dy] of dirs) {
@@ -54385,13 +54458,16 @@ function layoutMap(resolvedIn, data, size, opts) {
           (p) => segmentRectOverlap(cx, cy, innerX, innerY, p)
         ))
           continue;
-        if (best === null || len < best.len)
+        const clear = clearanceAt(ccx, ccy, dx, dy);
+        const better = best === null || clear > best.clear + CLEAR_TOL || clear >= best.clear - CLEAR_TOL && len < best.len;
+        if (better)
           best = {
             x: ccx,
             y: ccy,
             rect,
             leader: [cx, cy, innerX, innerY],
-            len
+            len,
+            clear
           };
       }
       return best ? { x: best.x, y: best.y, rect: best.rect, leader: best.leader } : null;
@@ -55052,6 +55128,9 @@ function layoutMap(resolvedIn, data, size, opts) {
       const nx = -dy / len;
       const ny = dx / len;
       const perp = labelH + 2;
+      const stroke2 = lg.width ?? W_MIN;
+      const clearW = stroke2 / 2 + labelH / 2 + 3;
+      const offList = stroke2 >= 4 ? [clearW, -clearW, clearW + perp, -(clearW + perp), 0] : [0, perp, -perp, 2 * perp, -2 * perp];
       const pm = /^M(-?[\d.]+),(-?[\d.]+)(?:L(-?[\d.]+),(-?[\d.]+)|Q(-?[\d.]+),(-?[\d.]+) (-?[\d.]+),(-?[\d.]+))$/.exec(
         lg.d
       );
@@ -55071,7 +55150,7 @@ function layoutMap(resolvedIn, data, size, opts) {
         return [a.cx + dx * t, a.cy + dy * t];
       };
       const candidates = [];
-      for (const off of [0, perp, -perp, 2 * perp, -2 * perp])
+      for (const off of offList)
         for (const t of T_LIST) {
           const [bx, by] = pointAt(t);
           candidates.push([bx + nx * off, by + ny * off - 4]);
@@ -55822,6 +55901,12 @@ function renderMap(container, resolved, data, palette, isDark, onClickItem, expo
       }
     }
     wireSync(p, leg.lineNumber);
+    if (leg.value !== void 0) {
+      p.attr("data-value", leg.value);
+      p.append("title").text(
+        leg.label !== void 0 ? `${leg.label}: ${leg.value}` : `${leg.value}`
+      );
+    }
     if (arrowTri) {
       gLegs.append("path").attr("d", arrowTri).attr("fill", leg.color).attr("stroke", leg.color).attr("stroke-width", 1).attr("stroke-linejoin", "round").attr("data-from-id", leg.fromId).attr("data-to-id", leg.toId);
     }