@dxos/diagram 0.13.0 → 0.14.0

package/dist/lib/chunk-parse.mjs

@@ -180,7 +180,11 @@ var ArrowHead = Schema.Literals([
 	"crowsfoot",
 	"none"
 ]);
-var ArrowTail = Schema.Literals(["none", "circle"]);
+var ArrowTail = Schema.Literals([
+	"none",
+	"circle",
+	"arrow"
+]);
 /**
 * What a connector means, in UML and ER terms; renderers derive its end markers and dash from it.
 * The source end is the subtype (inheritance, implementation), the whole (composition), the owner
@@ -264,7 +268,7 @@ var Arrow = Schema.Struct({
 	end: Schema.optional(Point).annotate({ description: "Explicit end (used when `to` is omitted)." }),
 	text: Schema.optional(Schema.String).annotate({ description: "Label at the arrow midpoint." }),
 	head: Schema.optional(ArrowHead).annotate({ description: "Marker at the target end (default arrow): triangle for inheritance, crowsfoot for has-many." }),
-	tail: Schema.optional(ArrowTail).annotate({ description: "Marker at the source end (default none): circle for containment." }),
+	tail: Schema.optional(ArrowTail).annotate({ description: "Marker at the source end (default none): circle for containment, arrow for a two-way connector." }),
 	relation: Schema.optional(Relation).annotate({ description: "What the connector means; sets its markers: inheritance and implementation (hollow triangle at the target), composition and aggregation (filled or hollow diamond at the source, the whole), one-to-many (bar at the source, crow’s foot at the target), many-to-many, dependency (dashed, open arrow), association." }),
 	...styleFields
 });
@@ -2807,7 +2811,10 @@ var HEADS = {
 	crowsfoot: "crow's foot head",
 	none: "no head"
 };
-var TAILS = { circle: "dot at the start" };
+var TAILS = {
+	circle: "dot at the start",
+	arrow: "arrowhead at the start"
+};
 /** A path's markers in words, e.g. "dashed, hollow triangle head", or undefined for a plain arrow. */
 var describe = (style) => {
 	const parts = [
@@ -4047,7 +4054,8 @@ var separate$1 = (lines, channel, paths, obstacles, spacing, margin) => {
 		if (!valid) continue;
 		const overlaps = pairCount(candidate, changed, shared, true);
 		const crossings = pairCount(candidate, changed, crosses$1);
-		if (overlaps >= pairCount(lines, changed, shared, true) || crossings > pairCount(lines, changed, crosses$1) || obstructed(candidate, changed) > obstructed(lines, changed)) continue;
+		const overlapsBefore = pairCount(lines, changed, shared, true);
+		if (overlaps >= overlapsBefore || crossings - pairCount(lines, changed, crosses$1) > overlapsBefore - overlaps || obstructed(candidate, changed) > obstructed(lines, changed)) continue;
 		const travel = [...offsets.values()].reduce((total, offset) => total + Math.abs(offset), 0);
 		if (!best || overlaps < best.overlaps || overlaps === best.overlaps && (crossings < best.crossings || crossings === best.crossings && (reversed < best.reversed || reversed === best.reversed && travel < best.travel))) best = {
 			lines: candidate,
@@ -7764,8 +7772,9 @@ var MAX_W = 192;
 var MIN_H = 96;
 var PAD_X = 32;
 var PAD_Y = 16;
-/** Frame inset around a group's members; the top band also holds the title. */
+/** Frame inset around a group's members, the same on every side; the title sits in the top inset. */
 var FRAME_PAD = 32;
+/** Room a frame's title takes above its members, when sizing the default pitch. */
 var FRAME_LABEL_H = 32;
 /** Extra gutter where two frames face each other across a row gutter, so packages read as separate. */
 var FRAME_STACK_GAP = 64;
@@ -7870,15 +7879,16 @@ var geometry = (diagram, cells, box, pitch) => {
 		});
 		return Math.max(stacked ? FRAME_STACK_GAP : 0, ...gaps);
 	};
+	const whole = (extra, step) => diagram.grid && extra > 0 ? Math.ceil(extra / step) * step : extra;
 	const colX = /* @__PURE__ */ new Map();
 	for (let col = minCol, x = minCol * pitch.w; col <= maxCol; col++) {
 		colX.set(col, x);
-		x += pitch.w + extraAfterCol(col);
+		x += pitch.w + whole(extraAfterCol(col), pitch.w);
 	}
 	const rowY = /* @__PURE__ */ new Map();
 	for (let row = minRow, y = minRow * pitch.h; row <= maxRow; row++) {
 		rowY.set(row, y);
-		y += pitch.h + extraAfterRow(row);
+		y += pitch.h + whole(extraAfterRow(row), pitch.h);
 	}
 	const at = (lookup, min, max, step, value) => value < min ? (lookup.get(min) ?? 0) - (min - value) * step : value > max ? (lookup.get(max) ?? 0) + (value - max) * step : lookup.get(value) ?? 0;
 	const fractional = (lookup, min, max, step, size) => (value) => {
@@ -7910,7 +7920,7 @@ var geometry = (diagram, cells, box, pitch) => {
 		const members = diagram.nodes.filter((node) => node.group === group.id).flatMap((node) => rects.get(node.id) ?? []);
 		if (members.length === 0) continue;
 		const x = Math.min(...members.map((rect) => rect.x)) - FRAME_PAD;
-		const y = Math.min(...members.map((rect) => rect.y)) - FRAME_PAD - FRAME_LABEL_H;
+		const y = Math.min(...members.map((rect) => rect.y)) - FRAME_PAD;
 		const right = Math.max(...members.map((rect) => rect.x + rect.w)) + FRAME_PAD;
 		const bottom = Math.max(...members.map((rect) => rect.y + rect.h)) + FRAME_PAD;
 		frames.set(group.id, {
@@ -7925,7 +7935,7 @@ var geometry = (diagram, cells, box, pitch) => {
 		const frame = frames.get(group.id);
 		return frame && group.label.trim() ? [{
 			x: frame.x + FRAME_PAD / 2,
-			y: frame.y + (FRAME_LABEL_H - LABEL_FONT.lineH) / 2,
+			y: frame.y + (FRAME_PAD - LABEL_FONT.lineH) / 2,
 			w: group.label.length * LABEL_FONT.charW,
 			h: LABEL_FONT.lineH
 		}] : [];
@@ -8065,7 +8075,7 @@ var draw = (diagram, geometry) => {
 					kind: "text",
 					id: "label",
 					x: FRAME_PAD / 2,
-					y: (FRAME_LABEL_H - LABEL_FONT.lineH) / 2,
+					y: (FRAME_PAD - LABEL_FONT.lineH) / 2,
 					text: group.label,
 					weight: "s",
 					color: "grey"