@dr2rai/raid-canvas 0.1.0 → 0.2.0

package/src/RaiBridge.ts

@@ -147,6 +147,8 @@ export class RaiBridge {
         ...(targetPort !== undefined ? { targetPort } : {}),
         ...(label !== undefined ? { label } : {}),
         ...(customData.stereotype !== undefined ? { stereotype: customData.stereotype } : {}),
+        ...(customData.sourceCardinality !== undefined ? { sourceCardinality: customData.sourceCardinality } : {}),
+        ...(customData.targetCardinality !== undefined ? { targetCardinality: customData.targetCardinality } : {}),
         bendPoints,
       };
 
@@ -266,8 +268,66 @@ export class RaiBridge {
       const bendsAttr = el.getAttribute(AimSvgContract.ATTR_BENDS) ?? '';
       const bendPoints = this.parseBendPoints(bendsAttr);
 
-      const sourcePort = el.getAttribute(AimSvgContract.ATTR_SOURCE_PORT) ?? undefined;
-      const targetPort = el.getAttribute(AimSvgContract.ATTR_TARGET_PORT) ?? undefined;
+      const label =
+        el.getAttribute('aim-label') ??
+        el.querySelector('text')?.textContent?.trim() ??
+        undefined;
+
+      let sourcePort = el.getAttribute(AimSvgContract.ATTR_SOURCE_PORT) ?? undefined;
+      let targetPort = el.getAttribute(AimSvgContract.ATTR_TARGET_PORT) ?? undefined;
+
+      const sourceNode = nodes.find((n) => n.id === sourceId);
+      const targetNode = nodes.find((n) => n.id === targetId);
+
+      // Infer optimal orthogonal docking ports if not explicitly declared
+      if (sourceNode && targetNode) {
+        const dx =
+          targetNode.bounds.x +
+          targetNode.bounds.width / 2 -
+          (sourceNode.bounds.x + sourceNode.bounds.width / 2);
+        const dy =
+          targetNode.bounds.y +
+          targetNode.bounds.height / 2 -
+          (sourceNode.bounds.y + sourceNode.bounds.height / 2);
+
+        if (!sourcePort) {
+          sourcePort =
+            Math.abs(dx) >= Math.abs(dy)
+              ? dx >= 0
+                ? 'port-right'
+                : 'port-left'
+              : dy >= 0
+                ? 'port-bottom'
+                : 'port-top';
+        }
+        if (!targetPort) {
+          targetPort =
+            Math.abs(dx) >= Math.abs(dy)
+              ? dx >= 0
+                ? 'port-left'
+                : 'port-right'
+              : dy >= 0
+                ? 'port-top'
+                : 'port-bottom';
+        }
+      }
+
+      // If bendPoints contains only the 2 terminal endpoints of a straight connector,
+      // clear them so the orthogonal router doesn't treat the terminals as obstacle waypoints
+      const isTerminalOnly =
+        bendPoints.length === 2 &&
+        sourceNode &&
+        targetNode &&
+        ((Math.abs(bendPoints[0]!.y - bendPoints[1]!.y) < 2 &&
+          Math.abs(bendPoints[0]!.y - (sourceNode.bounds.y + sourceNode.bounds.height / 2)) < 40) ||
+          (Math.abs(bendPoints[0]!.x - bendPoints[1]!.x) < 2 &&
+            Math.abs(bendPoints[0]!.x - (sourceNode.bounds.x + sourceNode.bounds.width / 2)) < 40));
+      const effectiveBendPoints = isTerminalOnly ? [] : bendPoints;
+
+      const sourceCardinality =
+        el.getAttribute('aim-source-cardinality') ?? undefined;
+      const targetCardinality =
+        el.getAttribute('aim-target-cardinality') ?? undefined;
 
       edges.push({
         id,
@@ -276,7 +336,10 @@ export class RaiBridge {
         targetId,
         ...(sourcePort !== undefined ? { sourcePort } : {}),
         ...(targetPort !== undefined ? { targetPort } : {}),
-        bendPoints,
+        ...(label !== undefined ? { label } : {}),
+        ...(sourceCardinality !== undefined ? { sourceCardinality } : {}),
+        ...(targetCardinality !== undefined ? { targetCardinality } : {}),
+        bendPoints: effectiveBendPoints,
       });
     }
 
@@ -370,6 +433,16 @@ export class RaiBridge {
         el.setAttribute(AimSvgContract.ATTR_BENDS, bendsString);
         el.setAttribute(AimSvgContract.ATTR_EDGE, 'true');
         el.setAttribute(AimSvgContract.ATTR_EDGE_KIND, edge.kind);
+
+        if (edge.stereotype !== undefined) {
+          el.setAttribute(AimSvgContract.ATTR_STEREOTYPE, edge.stereotype);
+        }
+        if (edge.sourceCardinality !== undefined) {
+          el.setAttribute('aim-source-cardinality', edge.sourceCardinality);
+        }
+        if (edge.targetCardinality !== undefined) {
+          el.setAttribute('aim-target-cardinality', edge.targetCardinality);
+        }
       }
     }