zombie-mermaid 2.2.2 → 2.2.3

package/dist/mcp.js

@@ -15556,21 +15556,29 @@ function renderSequenceAscii(text, config, colorMode, theme) {
 	}
 	const leftNoteWidth = new Array(diagram.actors.length).fill(0);
 	const rightNoteWidth = new Array(diagram.actors.length).fill(0);
-	for (const note of diagram.notes) {
-		if (note.position !== "left" && note.position !== "right") continue;
-		const aIdx = actorIdx.get(note.actorIds[0]) ?? 0;
+	const overNoteHalfLeft = new Array(diagram.actors.length).fill(0);
+	const overNoteHalfRight = new Array(diagram.actors.length).fill(0);
+	for (const note of diagram.notes) if (note.position === "left" || note.position === "right") {
+		const aIdx = actorIndexOf(note.actorIds[0]);
 		const w = noteBoxWidth(note);
 		if (note.position === "left") leftNoteWidth[aIdx] = Math.max(leftNoteWidth[aIdx], w);
 		else rightNoteWidth[aIdx] = Math.max(rightNoteWidth[aIdx], w);
+	} else if (note.position === "over" && note.actorIds.length === 1) {
+		const aIdx = actorIndexOf(note.actorIds[0]);
+		const w = noteBoxWidth(note);
+		const halfLeft = Math.floor(w / 2);
+		const halfRight = w - halfLeft;
+		overNoteHalfLeft[aIdx] = Math.max(overNoteHalfLeft[aIdx], halfLeft);
+		overNoteHalfRight[aIdx] = Math.max(overNoteHalfRight[aIdx], halfRight);
 	}
 	const minLifelineGap = paddingOffset(config.paddingX, 5, 10, 4);
-	const llX = [Math.max(halfBox[0] + (boxSpanOf[0] === -1 ? 0 : 2), leftNoteWidth[0] + 1)];
+	const llX = [Math.max(halfBox[0] + (boxSpanOf[0] === -1 ? 0 : 2), leftNoteWidth[0] + 1, overNoteHalfLeft[0])];
 	for (let i = 1; i < diagram.actors.length; i++) {
 		const prevSpan = boxSpanOf[i - 1];
 		const thisSpan = boxSpanOf[i];
 		const walls = prevSpan === thisSpan ? 0 : (prevSpan === -1 ? 0 : 1) + (thisSpan === -1 ? 0 : 1);
 		const wallExtra = walls === 0 ? 0 : walls * 2 - 1;
-		const noteGapNeed = Math.max(rightNoteWidth[i - 1], leftNoteWidth[i]) + 2;
+		const noteGapNeed = Math.max(rightNoteWidth[i - 1], leftNoteWidth[i], overNoteHalfRight[i - 1], overNoteHalfLeft[i]) + 2;
 		const gap = Math.max(halfBox[i - 1] + halfBox[i] + 2 + wallExtra, adjMaxWidth[i - 1] + 2, noteGapNeed, minLifelineGap);
 		llX[i] = llX[i - 1] + gap;
 	}
@@ -16375,27 +16383,90 @@ function renderClassAscii(text, config, colorMode, theme, options = {}) {
 	for (let lv = 0; lv <= maxLevel; lv++) {
 		const group = levelGroups[lv];
 		if (group.length === 0) continue;
+		const blockKeyOf = (id) => {
+			const pset = parents.get(id);
+			return pset && pset.size > 0 ? [...pset].sort().join(",") : `root:${id}`;
+		};
+		const blockMembers = /* @__PURE__ */ new Map();
+		for (const id of group) {
+			const key = blockKeyOf(id);
+			let members = blockMembers.get(key);
+			if (!members) {
+				members = [];
+				blockMembers.set(key, members);
+			}
+			members.push(id);
+		}
+		const baselineSlotLeft = /* @__PURE__ */ new Map();
+		const slotWidthOf = /* @__PURE__ */ new Map();
+		const leftPadOf = /* @__PURE__ */ new Map();
+		{
+			let x = 0;
+			for (const id of group) {
+				const w = classBoxW.get(id);
+				const reach = columnReach.get(id);
+				const leftPad = Math.max(0, reach.left - Math.floor(w / 2));
+				const rightPad = Math.max(0, reach.right - (w - 1 - Math.floor(w / 2)));
+				baselineSlotLeft.set(id, x);
+				slotWidthOf.set(id, leftPad + w + rightPad);
+				leftPadOf.set(id, leftPad);
+				x += leftPad + w + rightPad + hGap;
+			}
+		}
 		let currentX = 0;
 		let maxH = 0;
-		for (const id of group) {
+		/** Places one class's box at slot-left `slotLeft`, advancing `currentX`/`maxH`/`maxSlotEnd`. */
+		const placeAt = (id, slotLeft) => {
 			const cls = classById.get(id);
 			const w = classBoxW.get(id);
 			const h = classBoxH.get(id);
-			const reach = columnReach.get(id);
-			const leftPad = Math.max(0, reach.left - Math.floor(w / 2));
-			const rightPad = Math.max(0, reach.right - (w - 1 - Math.floor(w / 2)));
+			const leftPad = leftPadOf.get(id);
+			const slotWidth = slotWidthOf.get(id);
 			placed.set(id, {
 				cls,
 				sections: classSections.get(id),
-				x: currentX + leftPad,
+				x: slotLeft + leftPad,
 				y: currentY,
 				width: w,
 				height: h
 			});
-			const slotWidth = leftPad + w + rightPad;
-			maxSlotEnd = Math.max(maxSlotEnd, currentX + slotWidth);
-			currentX += slotWidth + hGap;
+			maxSlotEnd = Math.max(maxSlotEnd, slotLeft + slotWidth);
+			currentX = slotLeft + slotWidth + hGap;
 			maxH = Math.max(maxH, h);
+		};
+		const placedThisLevel = /* @__PURE__ */ new Set();
+		for (const id of group) {
+			if (placedThisLevel.has(id)) continue;
+			const key = blockKeyOf(id);
+			const pset = parents.get(id);
+			const qualifying = pset ? [...pset].filter((pid) => level.get(pid) < lv) : [];
+			if (qualifying.length === 0) {
+				placeAt(id, Math.max(baselineSlotLeft.get(id), currentX, 0));
+				placedThisLevel.add(id);
+				continue;
+			}
+			const members = blockMembers.get(key);
+			const parentCenters = qualifying.map((pid) => {
+				const p = placed.get(pid);
+				return p.x + Math.floor(p.width / 2);
+			});
+			const desiredCenter = Math.round(parentCenters.reduce((sum, c) => sum + c, 0) / parentCenters.length);
+			let totalWidth = 0;
+			for (let i = 0; i < members.length; i++) {
+				totalWidth += slotWidthOf.get(members[i]);
+				if (i < members.length - 1) totalWidth += hGap;
+			}
+			const firstLeftPad = leftPadOf.get(members[0]);
+			const lastMember = members[members.length - 1];
+			const lastRightPad = slotWidthOf.get(lastMember) - leftPadOf.get(lastMember) - classBoxW.get(lastMember);
+			const visibleWidth = totalWidth - firstLeftPad - lastRightPad;
+			const blockDesiredLeft = desiredCenter - firstLeftPad - Math.floor(visibleWidth / 2);
+			let memberX = Math.max(blockDesiredLeft, currentX, 0);
+			for (const memberId of members) {
+				placeAt(memberId, memberX);
+				placedThisLevel.add(memberId);
+				memberX = currentX;
+			}
 		}
 		currentY += maxH + vGap;
 	}