@dforge-core/diagram 0.0.6 → 0.0.8

package/dist/EntityNode.svelte

@@ -50,7 +50,9 @@
 </div>
 
 <style>
+	/* Fixed heights: 2px border + 28px header = the layout's 30px header, 22px rows (model-graph.ts, simple-layout.ts) */
 	.entity-node {
+		box-sizing: border-box;
 		background: var(--bs-body-bg, #fff);
 		border: 2px solid var(--module-color, #6c757d);
 		border-radius: 6px;
@@ -65,7 +67,8 @@
 		display: flex;
 		align-items: center;
 		gap: 0.35rem;
-		padding: 0.35rem 0.5rem;
+		height: 28px;
+		padding: 0 0.5rem;
 		background: var(--module-color, #6c757d);
 		color: #fff;
 		border-radius: 3px 3px 0 0;
@@ -95,7 +98,9 @@
 		display: flex;
 		align-items: center;
 		gap: 0.3rem;
-		padding: 0.15rem 0.5rem;
+		box-sizing: border-box;
+		height: 22px;
+		padding: 0 0.5rem;
 		border-bottom: 1px solid var(--bs-border-color-translucent, rgba(0, 0, 0, 0.08));
 		position: relative;
 	}

package/dist/SimpleDiagram/simple-layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simple-layout.d.ts","sourceRoot":"","sources":["../../src/lib/SimpleDiagram/simple-layout.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,EAAS,MAAM,kBAAkB,CAAC;AAetF,MAAM,MAAM,UAAU,GAAG,CAAC,EAAE,EAAE,MAAM,KAAK,WAAW,GAAG,SAAS,CAAC;AA0HjE;;GAEG;AACH,wBAAgB,YAAY,CAC3B,KAAK,EAAE,WAAW,EAAE,EACpB,KAAK,EAAE,WAAW,EAAE,GAClB;IAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAAC,KAAK,EAAE,YAAY,EAAE,CAAA;CAAE,CAejD;AAqFD;;;;GAIG;AACH,wBAAgB,YAAY,CAC3B,KAAK,EAAE,WAAW,EAAE,EACpB,KAAK,EAAE,WAAW,EAAE,GAClB;IAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAAC,KAAK,EAAE,YAAY,EAAE,CAAA;CAAE,CAmCjD;AA+GD;;GAEG;AACH,wBAAgB,SAAS,CACxB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,UAAU,GAChB,YAAY,CAcd;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC5B,KAAK,EAAE,WAAW,EAAE,EACpB,KAAK,EAAE,WAAW,EAAE,GAClB,YAAY,EAAE,CAIhB"}
+{"version":3,"file":"simple-layout.d.ts","sourceRoot":"","sources":["../../src/lib/SimpleDiagram/simple-layout.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,EAAS,MAAM,kBAAkB,CAAC;AAetF,MAAM,MAAM,UAAU,GAAG,CAAC,EAAE,EAAE,MAAM,KAAK,WAAW,GAAG,SAAS,CAAC;AA0HjE;;GAEG;AACH,wBAAgB,YAAY,CAC3B,KAAK,EAAE,WAAW,EAAE,EACpB,KAAK,EAAE,WAAW,EAAE,GAClB;IAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAAC,KAAK,EAAE,YAAY,EAAE,CAAA;CAAE,CAejD;AAqFD;;;;GAIG;AACH,wBAAgB,YAAY,CAC3B,KAAK,EAAE,WAAW,EAAE,EACpB,KAAK,EAAE,WAAW,EAAE,GAClB;IAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAAC,KAAK,EAAE,YAAY,EAAE,CAAA;CAAE,CAmCjD;AAqID;;GAEG;AACH,wBAAgB,SAAS,CACxB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,UAAU,GAChB,YAAY,CAcd;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC5B,KAAK,EAAE,WAAW,EAAE,EACpB,KAAK,EAAE,WAAW,EAAE,GAClB,YAAY,EAAE,CAIhB"}

package/dist/SimpleDiagram/simple-layout.js

@@ -307,6 +307,23 @@ function stubRoute(src, tgt, dir, srcNode, tgtNode) {
         tgt,
     ];
 }
+/** Route out of and into the same side of both nodes; null when a horizontal leg would cross the other node. */
+function sameSideRoute(side, srcNode, tgtNode, srcY, tgtY) {
+    const edgeX = (n) => side === 'L' ? n.x : n.x + n.width;
+    const outerX = side === 'L'
+        ? Math.min(srcNode.x, tgtNode.x) - STUB_LENGTH
+        : Math.max(srcNode.x + srcNode.width, tgtNode.x + tgtNode.width) + STUB_LENGTH;
+    const blocks = (y, from, other) => y > other.y - MIN_ROUTE_GAP && y < other.y + other.height + MIN_ROUTE_GAP
+        && (side === 'L' ? other.x < from.x : other.x + other.width > from.x + from.width);
+    if (blocks(srcY, srcNode, tgtNode) || blocks(tgtY, tgtNode, srcNode))
+        return null;
+    return [
+        { x: edgeX(srcNode), y: srcY },
+        { x: outerX, y: srcY },
+        { x: outerX, y: tgtY },
+        { x: edgeX(tgtNode), y: tgtY },
+    ];
+}
 /** Route a normal (non-self) edge with orthogonal H→V→H path. */
 function routeNormalEdge(edge, srcNode, tgtNode, srcY, tgtY) {
     const srcCenterX = srcNode.x + srcNode.width / 2;
@@ -323,7 +340,7 @@ function routeNormalEdge(edge, srcNode, tgtNode, srcY, tgtY) {
     };
     const gap = (tgt.x - src.x) * dir;
     let points;
-    if (gap > STUB_LENGTH * 2) {
+    if (gap > MIN_ROUTE_GAP) {
         const midX = (src.x + tgt.x) / 2;
         // Check if the vertical segment at midX would pass through either node
         const midXInSrc = midX > srcNode.x && midX < srcNode.x + srcNode.width;
@@ -342,7 +359,10 @@ function routeNormalEdge(edge, srcNode, tgtNode, srcY, tgtY) {
         }
     }
     else {
-        points = stubRoute(src, tgt, dir, srcNode, tgtNode);
+        // No channel between the facing sides — prefer leaving and entering on the same outer side
+        points = sameSideRoute(dir > 0 ? 'L' : 'R', srcNode, tgtNode, srcY, tgtY)
+            ?? sameSideRoute(dir > 0 ? 'R' : 'L', srcNode, tgtNode, srcY, tgtY)
+            ?? stubRoute(src, tgt, dir, srcNode, tgtNode);
     }
     return { ...edge, points };
 }

package/dist/model-graph.js

@@ -22,7 +22,7 @@ export const MODULE_COLORS = [
 ];
 export const getModuleColor = (index) => MODULE_COLORS[index % MODULE_COLORS.length];
 const NODE_WIDTH = 260;
-const NODE_HEIGHT_BASE = 60;
+const NODE_HEIGHT_BASE = 32; // 30px header (incl. top border) + 2px bottom border
 const ROW_HEIGHT = 22;
 /**
  * Build a diagram graph from the given modules.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dforge-core/diagram",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Entity-relationship and workspace diagram components for dForge models. Standalone Svelte 5 library with no dForge runtime dependencies.",
   "license": "MIT",
   "author": "dForge",