@loopstack/loopstack-studio 0.29.5 → 0.31.0

package/dist/node_modules/mermaid/dist/chunks/mermaid.core/gitGraphDiagram-PVQCEYII.js

@@ -1,6 +1,6 @@
+import select_default from "../../../../d3-selection/src/select.js";
 import { __name, log } from "./chunk-AGHRB4JF.js";
 import { clear, common_default, defaultConfig_default, getAccDescription, getAccTitle, getConfig, getConfig2, getDiagramTitle, setAccDescription, setAccTitle, setDiagramTitle, setupGraphViewbox2 } from "./chunk-CSCIHK7Q.js";
-import select_default from "../../../../d3-selection/src/select.js";
 import "../../../../d3/src/index.js";
 import { cleanAndMerge, random, utils_default } from "./chunk-5ZQYHXKU.js";
 import { populateCommonDb } from "./chunk-4BX2VUAB.js";
@@ -56,13 +56,13 @@ var setDirection = /* @__PURE__ */ __name(function(i) {
 }, "setOptions"), getOptions = /* @__PURE__ */ __name(function() {
 	return state.records.options;
 }, "getOptions"), commit = /* @__PURE__ */ __name(function(i) {
-	let P = i.msg, I = i.id, L = i.type, R = i.tags;
-	log.info("commit", P, I, L, R), log.debug("Entering commit:", P, I, L, R);
+	let N = i.msg, F = i.id, L = i.type, R = i.tags;
+	log.info("commit", N, F, L, R), log.debug("Entering commit:", N, F, L, R);
 	let z = getConfig3();
-	I = common_default.sanitizeText(I, z), P = common_default.sanitizeText(P, z), R = R?.map((i) => common_default.sanitizeText(i, z));
+	F = common_default.sanitizeText(F, z), N = common_default.sanitizeText(N, z), R = R?.map((i) => common_default.sanitizeText(i, z));
 	let B = {
-		id: I || state.records.seq + "-" + getID(),
-		message: P,
+		id: F || state.records.seq + "-" + getID(),
+		message: N,
 		seq: state.records.seq++,
 		type: L ?? commitType.NORMAL,
 		tags: R ?? [],
@@ -71,100 +71,100 @@ var setDirection = /* @__PURE__ */ __name(function(i) {
 	};
 	state.records.head = B, log.info("main branch", z.mainBranchName), state.records.commits.has(B.id) && log.warn(`Commit ID ${B.id} already exists`), state.records.commits.set(B.id, B), state.records.branches.set(state.records.currBranch, B.id), log.debug("in pushCommit " + B.id);
 }, "commit"), branch = /* @__PURE__ */ __name(function(i) {
-	let P = i.name, I = i.order;
-	if (P = common_default.sanitizeText(P, getConfig3()), state.records.branches.has(P)) throw Error(`Trying to create an existing branch. (Help: Either use a new name if you want create a new branch or try using "checkout ${P}")`);
-	state.records.branches.set(P, state.records.head == null ? null : state.records.head.id), state.records.branchConfig.set(P, {
-		name: P,
-		order: I
-	}), checkout(P), log.debug("in createBranch");
+	let N = i.name, F = i.order;
+	if (N = common_default.sanitizeText(N, getConfig3()), state.records.branches.has(N)) throw Error(`Trying to create an existing branch. (Help: Either use a new name if you want create a new branch or try using "checkout ${N}")`);
+	state.records.branches.set(N, state.records.head == null ? null : state.records.head.id), state.records.branchConfig.set(N, {
+		name: N,
+		order: F
+	}), checkout(N), log.debug("in createBranch");
 }, "branch"), merge = /* @__PURE__ */ __name((i) => {
-	let P = i.branch, I = i.id, L = i.type, R = i.tags, z = getConfig3();
-	P = common_default.sanitizeText(P, z), I &&= common_default.sanitizeText(I, z);
-	let B = state.records.branches.get(state.records.currBranch), V = state.records.branches.get(P), H = B ? state.records.commits.get(B) : void 0, U = V ? state.records.commits.get(V) : void 0;
-	if (H && U && H.branch === P) throw Error(`Cannot merge branch '${P}' into itself.`);
-	if (state.records.currBranch === P) {
+	let N = i.branch, F = i.id, L = i.type, R = i.tags, z = getConfig3();
+	N = common_default.sanitizeText(N, z), F &&= common_default.sanitizeText(F, z);
+	let B = state.records.branches.get(state.records.currBranch), V = state.records.branches.get(N), H = B ? state.records.commits.get(B) : void 0, U = V ? state.records.commits.get(V) : void 0;
+	if (H && U && H.branch === N) throw Error(`Cannot merge branch '${N}' into itself.`);
+	if (state.records.currBranch === N) {
 		let i = /* @__PURE__ */ Error("Incorrect usage of \"merge\". Cannot merge a branch to itself");
 		throw i.hash = {
-			text: `merge ${P}`,
-			token: `merge ${P}`,
+			text: `merge ${N}`,
+			token: `merge ${N}`,
 			expected: ["branch abc"]
 		}, i;
 	}
 	if (H === void 0 || !H) {
 		let i = /* @__PURE__ */ Error(`Incorrect usage of "merge". Current branch (${state.records.currBranch})has no commits`);
 		throw i.hash = {
-			text: `merge ${P}`,
-			token: `merge ${P}`,
+			text: `merge ${N}`,
+			token: `merge ${N}`,
 			expected: ["commit"]
 		}, i;
 	}
-	if (!state.records.branches.has(P)) {
-		let i = /* @__PURE__ */ Error("Incorrect usage of \"merge\". Branch to be merged (" + P + ") does not exist");
+	if (!state.records.branches.has(N)) {
+		let i = /* @__PURE__ */ Error("Incorrect usage of \"merge\". Branch to be merged (" + N + ") does not exist");
 		throw i.hash = {
-			text: `merge ${P}`,
-			token: `merge ${P}`,
-			expected: [`branch ${P}`]
+			text: `merge ${N}`,
+			token: `merge ${N}`,
+			expected: [`branch ${N}`]
 		}, i;
 	}
 	if (U === void 0 || !U) {
-		let i = /* @__PURE__ */ Error("Incorrect usage of \"merge\". Branch to be merged (" + P + ") has no commits");
+		let i = /* @__PURE__ */ Error("Incorrect usage of \"merge\". Branch to be merged (" + N + ") has no commits");
 		throw i.hash = {
-			text: `merge ${P}`,
-			token: `merge ${P}`,
+			text: `merge ${N}`,
+			token: `merge ${N}`,
 			expected: ["\"commit\""]
 		}, i;
 	}
 	if (H === U) {
 		let i = /* @__PURE__ */ Error("Incorrect usage of \"merge\". Both branches have same head");
 		throw i.hash = {
-			text: `merge ${P}`,
-			token: `merge ${P}`,
+			text: `merge ${N}`,
+			token: `merge ${N}`,
 			expected: ["branch abc"]
 		}, i;
 	}
-	if (I && state.records.commits.has(I)) {
-		let i = /* @__PURE__ */ Error("Incorrect usage of \"merge\". Commit with id:" + I + " already exists, use different custom id");
+	if (F && state.records.commits.has(F)) {
+		let i = /* @__PURE__ */ Error("Incorrect usage of \"merge\". Commit with id:" + F + " already exists, use different custom id");
 		throw i.hash = {
-			text: `merge ${P} ${I} ${L} ${R?.join(" ")}`,
-			token: `merge ${P} ${I} ${L} ${R?.join(" ")}`,
-			expected: [`merge ${P} ${I}_UNIQUE ${L} ${R?.join(" ")}`]
+			text: `merge ${N} ${F} ${L} ${R?.join(" ")}`,
+			token: `merge ${N} ${F} ${L} ${R?.join(" ")}`,
+			expected: [`merge ${N} ${F}_UNIQUE ${L} ${R?.join(" ")}`]
 		}, i;
 	}
 	let W = V || "", G = {
-		id: I || `${state.records.seq}-${getID()}`,
-		message: `merged branch ${P} into ${state.records.currBranch}`,
+		id: F || `${state.records.seq}-${getID()}`,
+		message: `merged branch ${N} into ${state.records.currBranch}`,
 		seq: state.records.seq++,
 		parents: state.records.head == null ? [] : [state.records.head.id, W],
 		branch: state.records.currBranch,
 		type: commitType.MERGE,
 		customType: L,
-		customId: !!I,
+		customId: !!F,
 		tags: R ?? []
 	};
 	state.records.head = G, state.records.commits.set(G.id, G), state.records.branches.set(state.records.currBranch, G.id), log.debug(state.records.branches), log.debug("in mergeBranch");
 }, "merge"), cherryPick = /* @__PURE__ */ __name(function(i) {
-	let P = i.id, I = i.targetId, L = i.tags, R = i.parent;
-	log.debug("Entering cherryPick:", P, I, L);
+	let N = i.id, F = i.targetId, L = i.tags, R = i.parent;
+	log.debug("Entering cherryPick:", N, F, L);
 	let z = getConfig3();
-	if (P = common_default.sanitizeText(P, z), I = common_default.sanitizeText(I, z), L = L?.map((i) => common_default.sanitizeText(i, z)), R = common_default.sanitizeText(R, z), !P || !state.records.commits.has(P)) {
+	if (N = common_default.sanitizeText(N, z), F = common_default.sanitizeText(F, z), L = L?.map((i) => common_default.sanitizeText(i, z)), R = common_default.sanitizeText(R, z), !N || !state.records.commits.has(N)) {
 		let i = /* @__PURE__ */ Error("Incorrect usage of \"cherryPick\". Source commit id should exist and provided");
 		throw i.hash = {
-			text: `cherryPick ${P} ${I}`,
-			token: `cherryPick ${P} ${I}`,
+			text: `cherryPick ${N} ${F}`,
+			token: `cherryPick ${N} ${F}`,
 			expected: ["cherry-pick abc"]
 		}, i;
 	}
-	let B = state.records.commits.get(P);
+	let B = state.records.commits.get(N);
 	if (B === void 0 || !B) throw Error("Incorrect usage of \"cherryPick\". Source commit id should exist and provided");
 	if (R && !(Array.isArray(B.parents) && B.parents.includes(R))) throw /* @__PURE__ */ Error("Invalid operation: The specified parent commit is not an immediate parent of the cherry-picked commit.");
 	let V = B.branch;
 	if (B.type === commitType.MERGE && !R) throw /* @__PURE__ */ Error("Incorrect usage of cherry-pick: If the source commit is a merge commit, an immediate parent commit must be specified.");
-	if (!I || !state.records.commits.has(I)) {
+	if (!F || !state.records.commits.has(F)) {
 		if (V === state.records.currBranch) {
 			let i = /* @__PURE__ */ Error("Incorrect usage of \"cherryPick\". Source commit is already on current branch");
 			throw i.hash = {
-				text: `cherryPick ${P} ${I}`,
-				token: `cherryPick ${P} ${I}`,
+				text: `cherryPick ${N} ${F}`,
+				token: `cherryPick ${N} ${F}`,
 				expected: ["cherry-pick abc"]
 			}, i;
 		}
@@ -172,17 +172,17 @@ var setDirection = /* @__PURE__ */ __name(function(i) {
 		if (i === void 0 || !i) {
 			let i = /* @__PURE__ */ Error(`Incorrect usage of "cherry-pick". Current branch (${state.records.currBranch})has no commits`);
 			throw i.hash = {
-				text: `cherryPick ${P} ${I}`,
-				token: `cherryPick ${P} ${I}`,
+				text: `cherryPick ${N} ${F}`,
+				token: `cherryPick ${N} ${F}`,
 				expected: ["cherry-pick abc"]
 			}, i;
 		}
-		let F = state.records.commits.get(i);
-		if (F === void 0 || !F) {
+		let I = state.records.commits.get(i);
+		if (I === void 0 || !I) {
 			let i = /* @__PURE__ */ Error(`Incorrect usage of "cherry-pick". Current branch (${state.records.currBranch})has no commits`);
 			throw i.hash = {
-				text: `cherryPick ${P} ${I}`,
-				token: `cherryPick ${P} ${I}`,
+				text: `cherryPick ${N} ${F}`,
+				token: `cherryPick ${N} ${F}`,
 				expected: ["cherry-pick abc"]
 			}, i;
 		}
@@ -217,23 +217,23 @@ function upsert(i, N, P) {
 }
 __name(upsert, "upsert");
 function prettyPrintCommitHistory(i) {
-	let P = i.reduce((i, N) => i.seq > N.seq ? i : N, i[0]), F = "";
+	let N = i.reduce((i, N) => i.seq > N.seq ? i : N, i[0]), F = "";
 	i.forEach(function(i) {
-		i === P ? F += "	*" : F += "	|";
+		i === N ? F += "	*" : F += "	|";
 	});
 	let I = [
 		F,
-		P.id,
-		P.seq
+		N.id,
+		N.seq
 	];
-	for (let i in state.records.branches) state.records.branches.get(i) === P.id && I.push(i);
-	if (log.debug(I.join(" ")), P.parents && P.parents.length == 2 && P.parents[0] && P.parents[1]) {
-		let N = state.records.commits.get(P.parents[0]);
-		upsert(i, P, N), P.parents[1] && i.push(state.records.commits.get(P.parents[1]));
-	} else if (P.parents.length == 0) return;
-	else if (P.parents[0]) {
-		let N = state.records.commits.get(P.parents[0]);
-		upsert(i, P, N);
+	for (let i in state.records.branches) state.records.branches.get(i) === N.id && I.push(i);
+	if (log.debug(I.join(" ")), N.parents && N.parents.length == 2 && N.parents[0] && N.parents[1]) {
+		let P = state.records.commits.get(N.parents[0]);
+		upsert(i, N, P), N.parents[1] && i.push(state.records.commits.get(N.parents[1]));
+	} else if (N.parents.length == 0) return;
+	else if (N.parents[0]) {
+		let P = state.records.commits.get(N.parents[0]);
+		upsert(i, N, P);
 	}
 	i = uniqBy(i, (i) => i.id), prettyPrintCommitHistory(i);
 }
@@ -293,15 +293,15 @@ var prettyPrint = /* @__PURE__ */ __name(function() {
 }, populate = /* @__PURE__ */ __name((i, N) => {
 	populateCommonDb(i, N), i.dir && N.setDirection(i.dir);
 	for (let P of i.statements) parseStatement(P, N);
-}, "populate"), parseStatement = /* @__PURE__ */ __name((P, F) => {
+}, "populate"), parseStatement = /* @__PURE__ */ __name((i, F) => {
 	let I = {
 		Commit: /* @__PURE__ */ __name((i) => F.commit(parseCommit(i)), "Commit"),
 		Branch: /* @__PURE__ */ __name((i) => F.branch(parseBranch(i)), "Branch"),
 		Merge: /* @__PURE__ */ __name((i) => F.merge(parseMerge(i)), "Merge"),
 		Checkout: /* @__PURE__ */ __name((i) => F.checkout(parseCheckout(i)), "Checkout"),
 		CherryPicking: /* @__PURE__ */ __name((i) => F.cherryPick(parseCherryPicking(i)), "CherryPicking")
-	}[P.$type];
-	I ? I(P) : log.error(`Unknown statement type: ${P.$type}`);
+	}[i.$type];
+	I ? I(i) : log.error(`Unknown statement type: ${i.$type}`);
 }, "parseStatement"), parseCommit = /* @__PURE__ */ __name((i) => ({
 	id: i.id,
 	msg: i.message ?? "",
@@ -321,8 +321,8 @@ var prettyPrint = /* @__PURE__ */ __name(function() {
 	tags: i.tags?.length === 0 ? void 0 : i.tags,
 	parent: i.parent
 }), "parseCherryPicking"), parser = { parse: /* @__PURE__ */ __name(async (i) => {
-	let P = await parse("gitGraph", i);
-	log.debug(P), populate(P, db);
+	let N = await parse("gitGraph", i);
+	log.debug(N), populate(N, db);
 }, "parse") }, LAYOUT_OFFSET = 10, COMMIT_STEP = 40, PX = 4, PY = 2, THEME_COLOR_LIMIT = 8, REDUX_GEOMETRY_THEMES = /* @__PURE__ */ new Set([
 	"redux",
 	"redux-dark",
@@ -341,9 +341,9 @@ var prettyPrint = /* @__PURE__ */ __name(function() {
 		let P = document.createElementNS("http://www.w3.org/2000/svg", "tspan");
 		P.setAttributeNS("http://www.w3.org/XML/1998/namespace", "xml:space", "preserve"), P.setAttribute("dy", "1em"), P.setAttribute("x", "0"), P.setAttribute("class", "row"), P.textContent = i.trim(), N.appendChild(P);
 	}), N;
-}, "drawText"), findClosestParent = /* @__PURE__ */ __name((N) => {
+}, "drawText"), findClosestParent = /* @__PURE__ */ __name((i) => {
 	let P, F, I;
-	return dir === "BT" ? (F = /* @__PURE__ */ __name((i, N) => i <= N, "comparisonFunc"), I = Infinity) : (F = /* @__PURE__ */ __name((i, N) => i >= N, "comparisonFunc"), I = 0), N.forEach((i) => {
+	return dir === "BT" ? (F = /* @__PURE__ */ __name((i, N) => i <= N, "comparisonFunc"), I = Infinity) : (F = /* @__PURE__ */ __name((i, N) => i >= N, "comparisonFunc"), I = 0), i.forEach((i) => {
 		let N = dir === "TB" || dir == "BT" ? commitPos.get(i)?.y : commitPos.get(i)?.x;
 		N !== void 0 && F(N, I) && (P = i, I = N);
 	}), P;
@@ -399,18 +399,18 @@ var prettyPrint = /* @__PURE__ */ __name(function() {
 		y: I
 	});
 }, "setRootPosition"), drawCommitBullet = /* @__PURE__ */ __name((i, N, P, F, I, L) => {
-	let { theme: R } = getConfig2(), z = REDUX_GEOMETRY_THEMES.has(R ?? ""), V = COLOR_THEMES.has(R ?? ""), H = DARK_THEMES.has(R ?? "");
-	if (L === commitType.HIGHLIGHT) i.append("rect").attr("x", P.x - 10 + (z ? 3 : 0)).attr("y", P.y - 10 + (z ? 3 : 0)).attr("width", z ? 14 : 20).attr("height", z ? 14 : 20).attr("class", `commit ${N.id} commit-highlight${calcColorIndex(I, THEME_COLOR_LIMIT, V)} ${F}-outer`), i.append("rect").attr("x", P.x - 6 + (z ? 2 : 0)).attr("y", P.y - 6 + (z ? 2 : 0)).attr("width", z ? 8 : 12).attr("height", z ? 8 : 12).attr("class", `commit ${N.id} commit${calcColorIndex(I, THEME_COLOR_LIMIT, V)} ${F}-inner`);
+	let { theme: R } = getConfig2(), z = REDUX_GEOMETRY_THEMES.has(R ?? ""), B = COLOR_THEMES.has(R ?? ""), H = DARK_THEMES.has(R ?? "");
+	if (L === commitType.HIGHLIGHT) i.append("rect").attr("x", P.x - 10 + (z ? 3 : 0)).attr("y", P.y - 10 + (z ? 3 : 0)).attr("width", z ? 14 : 20).attr("height", z ? 14 : 20).attr("class", `commit ${N.id} commit-highlight${calcColorIndex(I, THEME_COLOR_LIMIT, B)} ${F}-outer`), i.append("rect").attr("x", P.x - 6 + (z ? 2 : 0)).attr("y", P.y - 6 + (z ? 2 : 0)).attr("width", z ? 8 : 12).attr("height", z ? 8 : 12).attr("class", `commit ${N.id} commit${calcColorIndex(I, THEME_COLOR_LIMIT, B)} ${F}-inner`);
 	else if (L === commitType.CHERRY_PICK) i.append("circle").attr("cx", P.x).attr("cy", P.y).attr("r", z ? 7 : 10).attr("class", `commit ${N.id} ${F}`), i.append("circle").attr("cx", P.x - 3).attr("cy", P.y + 2).attr("r", z ? 2.5 : 2.75).attr("fill", H ? "#000000" : "#fff").attr("class", `commit ${N.id} ${F}`), i.append("circle").attr("cx", P.x + 3).attr("cy", P.y + 2).attr("r", z ? 2.5 : 2.75).attr("fill", H ? "#000000" : "#fff").attr("class", `commit ${N.id} ${F}`), i.append("line").attr("x1", P.x + 3).attr("y1", P.y + 1).attr("x2", P.x).attr("y2", P.y - 5).attr("stroke", H ? "#000000" : "#fff").attr("class", `commit ${N.id} ${F}`), i.append("line").attr("x1", P.x - 3).attr("y1", P.y + 1).attr("x2", P.x).attr("y2", P.y - 5).attr("stroke", H ? "#000000" : "#fff").attr("class", `commit ${N.id} ${F}`);
 	else {
 		let R = i.append("circle");
-		if (R.attr("cx", P.x), R.attr("cy", P.y), R.attr("r", z ? 7 : 10), R.attr("class", `commit ${N.id} commit${calcColorIndex(I, THEME_COLOR_LIMIT, V)}`), L === commitType.MERGE) {
+		if (R.attr("cx", P.x), R.attr("cy", P.y), R.attr("r", z ? 7 : 10), R.attr("class", `commit ${N.id} commit${calcColorIndex(I, THEME_COLOR_LIMIT, B)}`), L === commitType.MERGE) {
 			let L = i.append("circle");
-			L.attr("cx", P.x), L.attr("cy", P.y), L.attr("r", z ? 5 : 6), L.attr("class", `commit ${F} ${N.id} commit${calcColorIndex(I, THEME_COLOR_LIMIT, V)}`);
+			L.attr("cx", P.x), L.attr("cy", P.y), L.attr("r", z ? 5 : 6), L.attr("class", `commit ${F} ${N.id} commit${calcColorIndex(I, THEME_COLOR_LIMIT, B)}`);
 		}
 		if (L === commitType.REVERSE) {
 			let L = i.append("path"), R = z ? 4 : 5;
-			L.attr("d", `M ${P.x - R},${P.y - R}L${P.x + R},${P.y + R}M${P.x - R},${P.y + R}L${P.x + R},${P.y - R}`).attr("class", `commit ${F} ${N.id} commit${calcColorIndex(I, THEME_COLOR_LIMIT, V)}`);
+			L.attr("d", `M ${P.x - R},${P.y - R}L${P.x + R},${P.y + R}M${P.x - R},${P.y + R}L${P.x + R},${P.y - R}`).attr("class", `commit ${F} ${N.id} commit${calcColorIndex(I, THEME_COLOR_LIMIT, B)}`);
 		}
 	}
 }, "drawCommitBullet"), drawCommitLabel = /* @__PURE__ */ __name((i, N, P, F, I) => {
@@ -488,8 +488,8 @@ var prettyPrint = /* @__PURE__ */ __name(function() {
 		y: dir === "TB" || dir === "BT" ? F : I + (R ? REDUX_BRANCH_LABEL_PADDING_Y / 2 + 1 : -2),
 		posWithOffset: F
 	};
-}, "getCommitPosition"), drawCommits = /* @__PURE__ */ __name((N, P, F, I) => {
-	let L = N.append("g").attr("class", "commit-bullets"), R = N.append("g").attr("class", "commit-labels"), z = dir === "TB" || dir === "BT" ? defaultPos : 0, B = [...P.keys()], V = I.parallelCommits ?? !1, H = /* @__PURE__ */ __name((i, N) => {
+}, "getCommitPosition"), drawCommits = /* @__PURE__ */ __name((i, P, F, I) => {
+	let L = i.append("g").attr("class", "commit-bullets"), R = i.append("g").attr("class", "commit-labels"), z = dir === "TB" || dir === "BT" ? defaultPos : 0, B = [...P.keys()], V = I.parallelCommits ?? !1, H = /* @__PURE__ */ __name((i, N) => {
 		let F = P.get(i)?.seq, I = P.get(N)?.seq;
 		return F !== void 0 && I !== void 0 ? F - I : 0;
 	}, "sortKeys"), U = B.sort(H);
@@ -510,8 +510,8 @@ var prettyPrint = /* @__PURE__ */ __name(function() {
 			y: B.y
 		}), z = dir === "BT" && V ? z + COMMIT_STEP : z + COMMIT_STEP + LAYOUT_OFFSET, z > maxPos && (maxPos = z);
 	});
-}, "drawCommits"), shouldRerouteArrow = /* @__PURE__ */ __name((N, P, F, I, L) => {
-	let R = (dir === "TB" || dir === "BT" ? F.x < I.x : F.y < I.y) ? P.branch : N.branch, z = /* @__PURE__ */ __name((i) => i.branch === R, "isOnBranchToGetCurve"), B = /* @__PURE__ */ __name((i) => i.seq > N.seq && i.seq < P.seq, "isBetweenCommits");
+}, "drawCommits"), shouldRerouteArrow = /* @__PURE__ */ __name((i, P, F, I, L) => {
+	let R = (dir === "TB" || dir === "BT" ? F.x < I.x : F.y < I.y) ? P.branch : i.branch, z = /* @__PURE__ */ __name((i) => i.branch === R, "isOnBranchToGetCurve"), B = /* @__PURE__ */ __name((N) => N.seq > i.seq && N.seq < P.seq, "isBetweenCommits");
 	return [...L.values()].some((i) => B(i) && z(i));
 }, "shouldRerouteArrow"), findLane = /* @__PURE__ */ __name((i, N, P = 0) => {
 	let F = i + Math.abs(i - N) / 2;
@@ -519,10 +519,10 @@ var prettyPrint = /* @__PURE__ */ __name(function() {
 }, "findLane"), drawArrow = /* @__PURE__ */ __name((i, N, P, F) => {
 	let { theme: I } = getConfig2(), L = COLOR_THEMES.has(I ?? ""), R = commitPos.get(N.id), z = commitPos.get(P.id);
 	if (R === void 0 || z === void 0) throw Error(`Commit positions not found for commits ${N.id} and ${P.id}`);
-	let V = shouldRerouteArrow(N, P, R, z, F), H = "", U = "", W = 0, G = 0, K = branchPos.get(P.branch)?.index;
+	let B = shouldRerouteArrow(N, P, R, z, F), H = "", U = "", W = 0, G = 0, K = branchPos.get(P.branch)?.index;
 	P.type === commitType.MERGE && N.id !== P.parents[0] && (K = branchPos.get(N.branch)?.index);
 	let q;
-	if (V) {
+	if (B) {
 		H = "A 10 10, 0, 0, 0,", U = "A 10 10, 0, 0, 1,", W = 10, G = 10;
 		let i = R.y < z.y ? findLane(R.y, z.y) : findLane(z.y, R.y), P = R.x < z.x ? findLane(R.x, z.x) : findLane(z.x, R.x);
 		dir === "TB" ? R.x < z.x ? q = `M ${R.x} ${R.y} L ${P - W} ${R.y} ${U} ${P} ${R.y + G} L ${P} ${z.y - W} ${H} ${P + G} ${z.y} L ${z.x} ${z.y}` : (K = branchPos.get(N.branch)?.index, q = `M ${R.x} ${R.y} L ${P + W} ${R.y} ${H} ${P} ${R.y + G} L ${P} ${z.y - W} ${U} ${P - G} ${z.y} L ${z.x} ${z.y}`) : dir === "BT" ? R.x < z.x ? q = `M ${R.x} ${R.y} L ${P - W} ${R.y} ${H} ${P} ${R.y - G} L ${P} ${z.y + W} ${U} ${P + G} ${z.y} L ${z.x} ${z.y}` : (K = branchPos.get(N.branch)?.index, q = `M ${R.x} ${R.y} L ${P + W} ${R.y} ${U} ${P} ${R.y - G} L ${P} ${z.y + W} ${H} ${P - G} ${z.y} L ${z.x} ${z.y}`) : R.y < z.y ? q = `M ${R.x} ${R.y} L ${R.x} ${i - W} ${H} ${R.x + G} ${i} L ${z.x - W} ${i} ${U} ${z.x} ${i + G} L ${z.x} ${z.y}` : (K = branchPos.get(N.branch)?.index, q = `M ${R.x} ${R.y} L ${R.x} ${i + W} ${U} ${R.x + G} ${i} L ${z.x - W} ${i} ${H} ${z.x} ${i - G} L ${z.x} ${z.y}`);
@@ -538,46 +538,46 @@ var prettyPrint = /* @__PURE__ */ __name(function() {
 		});
 	});
 }, "drawArrows"), drawBranches = /* @__PURE__ */ __name((i, N, P, F) => {
-	let { look: I, theme: L, themeVariables: R } = getConfig2(), { dropShadow: z, THEME_COLOR_LIMIT: V } = R, H = REDUX_GEOMETRY_THEMES.has(L ?? ""), U = COLOR_THEMES.has(L ?? ""), W = i.append("g");
+	let { look: I, theme: L, themeVariables: R } = getConfig2(), { dropShadow: z, THEME_COLOR_LIMIT: B } = R, H = REDUX_GEOMETRY_THEMES.has(L ?? ""), U = COLOR_THEMES.has(L ?? ""), W = i.append("g");
 	N.forEach((i, N) => {
-		let L = calcColorIndex(N, H ? V : THEME_COLOR_LIMIT, U), R = branchPos.get(i.name)?.pos;
+		let L = calcColorIndex(N, H ? B : THEME_COLOR_LIMIT, U), R = branchPos.get(i.name)?.pos;
 		if (R === void 0) throw Error(`Position not found for branch ${i.name}`);
-		let B = dir === "TB" || dir === "BT" ? R : H ? R + REDUX_BRANCH_LABEL_PADDING_Y / 2 + 1 : R - 2, G = W.append("line");
-		G.attr("x1", 0), G.attr("y1", B), G.attr("x2", maxPos), G.attr("y2", B), G.attr("class", "branch branch" + L), dir === "TB" ? (G.attr("y1", defaultPos), G.attr("x1", R), G.attr("y2", maxPos), G.attr("x2", R)) : dir === "BT" && (G.attr("y1", maxPos), G.attr("x1", R), G.attr("y2", defaultPos), G.attr("x2", R)), lanes.push(B);
+		let V = dir === "TB" || dir === "BT" ? R : H ? R + REDUX_BRANCH_LABEL_PADDING_Y / 2 + 1 : R - 2, G = W.append("line");
+		G.attr("x1", 0), G.attr("y1", V), G.attr("x2", maxPos), G.attr("y2", V), G.attr("class", "branch branch" + L), dir === "TB" ? (G.attr("y1", defaultPos), G.attr("x1", R), G.attr("y2", maxPos), G.attr("x2", R)) : dir === "BT" && (G.attr("y1", maxPos), G.attr("x1", R), G.attr("y2", defaultPos), G.attr("x2", R)), lanes.push(V);
 		let K = i.name, q = drawText(K), J = W.insert("rect"), Y = W.insert("g").attr("class", "branchLabel").insert("g").attr("class", "label branch-label" + L);
 		Y.node().appendChild(q);
 		let X = q.getBBox(), Z = H ? 0 : 4, Q = H ? 16 : 0, $ = H ? REDUX_BRANCH_LABEL_PADDING_Y : 0;
-		I === "neo" && J.attr("data-look", "neo"), J.attr("class", "branchLabelBkg label" + L).attr("style", I === "neo" ? `filter:${H ? `url(#${F}-drop-shadow)` : z}` : "").attr("rx", Z).attr("ry", Z).attr("x", -X.width - 4 - (P.rotateCommitLabel === !0 ? 30 : 0)).attr("y", -X.height / 2 + 10).attr("width", X.width + 18 + Q).attr("height", X.height + 4 + $), Y.attr("transform", "translate(" + (-X.width - 14 - (P.rotateCommitLabel === !0 ? 30 : 0) + Q / 2) + ", " + (B - X.height / 2 - 2) + ")"), dir === "TB" ? (J.attr("x", R - X.width / 2 - 10).attr("y", 0), Y.attr("transform", "translate(" + (R - X.width / 2 - 5) + ", 0)"), H && (J.attr("transform", `translate(${-Q / 2 - 3}, ${-$ - 10})`), Y.attr("transform", "translate(" + (R - X.width / 2 - 5) + ", " + (-$ * 2 + 7) + ")"))) : dir === "BT" ? (J.attr("x", R - X.width / 2 - 10).attr("y", maxPos), Y.attr("transform", "translate(" + (R - X.width / 2 - 5) + ", " + maxPos + ")"), H && (J.attr("transform", `translate(${-Q / 2 - 3}, ${$ + 10})`), Y.attr("transform", "translate(" + (R - X.width / 2 - 5) + ", " + (maxPos + $ * 2 + 4) + ")"))) : J.attr("transform", "translate(-19, " + (B - 12 - $ / 2) + ")");
+		I === "neo" && J.attr("data-look", "neo"), J.attr("class", "branchLabelBkg label" + L).attr("style", I === "neo" ? `filter:${H ? `url(#${F}-drop-shadow)` : z}` : "").attr("rx", Z).attr("ry", Z).attr("x", -X.width - 4 - (P.rotateCommitLabel === !0 ? 30 : 0)).attr("y", -X.height / 2 + 10).attr("width", X.width + 18 + Q).attr("height", X.height + 4 + $), Y.attr("transform", "translate(" + (-X.width - 14 - (P.rotateCommitLabel === !0 ? 30 : 0) + Q / 2) + ", " + (V - X.height / 2 - 2) + ")"), dir === "TB" ? (J.attr("x", R - X.width / 2 - 10).attr("y", 0), Y.attr("transform", "translate(" + (R - X.width / 2 - 5) + ", 0)"), H && (J.attr("transform", `translate(${-Q / 2 - 3}, ${-$ - 10})`), Y.attr("transform", "translate(" + (R - X.width / 2 - 5) + ", " + (-$ * 2 + 7) + ")"))) : dir === "BT" ? (J.attr("x", R - X.width / 2 - 10).attr("y", maxPos), Y.attr("transform", "translate(" + (R - X.width / 2 - 5) + ", " + maxPos + ")"), H && (J.attr("transform", `translate(${-Q / 2 - 3}, ${$ + 10})`), Y.attr("transform", "translate(" + (R - X.width / 2 - 5) + ", " + (maxPos + $ * 2 + 4) + ")"))) : J.attr("transform", "translate(-19, " + (V - 12 - $ / 2) + ")");
 	});
 }, "drawBranches"), setBranchPosition = /* @__PURE__ */ __name(function(i, N, P, F, I) {
 	return branchPos.set(i, {
 		pos: N,
 		index: P
 	}), N += 50 + (I ? 40 : 0) + (dir === "TB" || dir === "BT" ? F.width / 2 : 0), N;
-}, "setBranchPosition"), gitGraphRenderer_default = { draw: /* @__PURE__ */ __name(function(i, P, F, I) {
-	clear3(), log.debug("in gitgraph renderer", i + "\n", "id:", P, F);
-	let L = I.db;
-	if (!L.getConfig) {
+}, "setBranchPosition"), gitGraphRenderer_default = { draw: /* @__PURE__ */ __name(function(N, F, I, L) {
+	clear3(), log.debug("in gitgraph renderer", N + "\n", "id:", F, I);
+	let R = L.db;
+	if (!R.getConfig) {
 		log.error("getConfig method is not available on db");
 		return;
 	}
-	let R = L.getConfig(), z = R.rotateCommitLabel ?? !1;
-	allCommitsDict = L.getCommits();
-	let V = L.getBranchesAsObjArray();
-	dir = L.getDirection();
-	let H = select_default(`[id="${P}"]`), { look: U, theme: W, themeVariables: q } = getConfig2(), { useGradient: J, gradientStart: X, gradientStop: Z, filterColor: Q } = q;
+	let z = R.getConfig(), B = z.rotateCommitLabel ?? !1;
+	allCommitsDict = R.getCommits();
+	let H = R.getBranchesAsObjArray();
+	dir = R.getDirection();
+	let U = select_default(`[id="${F}"]`), { look: W, theme: G, themeVariables: q } = getConfig2(), { useGradient: J, gradientStart: X, gradientStop: Z, filterColor: Q } = q;
 	if (J) {
-		let i = H.append("defs").append("linearGradient").attr("id", P + "-gradient").attr("gradientUnits", "objectBoundingBox").attr("x1", "0%").attr("y1", "0%").attr("x2", "100%").attr("y2", "0%");
+		let i = U.append("defs").append("linearGradient").attr("id", F + "-gradient").attr("gradientUnits", "objectBoundingBox").attr("x1", "0%").attr("y1", "0%").attr("x2", "100%").attr("y2", "0%");
 		i.append("stop").attr("offset", "0%").attr("stop-color", X).attr("stop-opacity", 1), i.append("stop").attr("offset", "100%").attr("stop-color", Z).attr("stop-opacity", 1);
 	}
-	U === "neo" && REDUX_GEOMETRY_THEMES.has(W ?? "") && H.append("defs").append("filter").attr("id", P + "-drop-shadow").attr("height", "130%").attr("width", "130%").append("feDropShadow").attr("dx", "4").attr("dy", "4").attr("stdDeviation", 0).attr("flood-opacity", "0.06").attr("flood-color", Q);
+	W === "neo" && REDUX_GEOMETRY_THEMES.has(G ?? "") && U.append("defs").append("filter").attr("id", F + "-drop-shadow").attr("height", "130%").attr("width", "130%").append("feDropShadow").attr("dx", "4").attr("dy", "4").attr("stdDeviation", 0).attr("flood-opacity", "0.06").attr("flood-color", Q);
 	let $ = 0;
-	V.forEach((i, N) => {
-		let P = drawText(i.name), F = H.append("g"), I = F.insert("g").attr("class", "branchLabel"), L = I.insert("g").attr("class", "label branch-label");
+	H.forEach((i, N) => {
+		let P = drawText(i.name), F = U.append("g"), I = F.insert("g").attr("class", "branchLabel"), L = I.insert("g").attr("class", "label branch-label");
 		L.node()?.appendChild(P);
 		let R = P.getBBox();
-		$ = setBranchPosition(i.name, $, N, R, z), L.remove(), I.remove(), F.remove();
-	}), drawCommits(H, allCommitsDict, !1, R), R.showBranches && drawBranches(H, V, R, P), drawArrows(H, allCommitsDict), drawCommits(H, allCommitsDict, !0, R), utils_default.insertTitle(H, "gitTitleText", R.titleTopMargin ?? 0, L.getDiagramTitle()), setupGraphViewbox2(void 0, H, R.diagramPadding, R.useMaxWidth);
+		$ = setBranchPosition(i.name, $, N, R, B), L.remove(), I.remove(), F.remove();
+	}), drawCommits(U, allCommitsDict, !1, z), z.showBranches && drawBranches(U, H, z, F), drawArrows(U, allCommitsDict), drawCommits(U, allCommitsDict, !0, z), utils_default.insertTitle(U, "gitTitleText", z.titleTopMargin ?? 0, R.getDiagramTitle()), setupGraphViewbox2(void 0, U, z.diagramPadding, z.useMaxWidth);
 }, "draw") }, GIT_NAMED_COLOR_COUNT = 8, REDUX_GEOMETRY_THEMES2 = /* @__PURE__ */ new Set([
 	"redux",
 	"redux-dark",