@loopstack/loopstack-studio 0.25.1 → 0.26.0

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

@@ -1,678 +1,677 @@
-import { __name as e, log as t } from "./chunk-AGHRB4JF.js";
-import { clear as n, common_default as r, defaultConfig_default as i, getAccDescription as a, getAccTitle as o, getConfig as s, getConfig2 as c, getDiagramTitle as l, setAccDescription as u, setAccTitle as d, setDiagramTitle as f, setupGraphViewbox2 as p } from "./chunk-ICPOFSXX.js";
-import m 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-ICPOFSXX.js";
+import select_default from "../../../../d3-selection/src/select.js";
 import "../../../../d3/src/index.js";
-import { cleanAndMerge as h, random as g, utils_default as _ } from "./chunk-5PVQY5BW.js";
-import { populateCommonDb as v } from "./chunk-4BX2VUAB.js";
-import { parse as y } from "../../../../@mermaid-js/parser/dist/mermaid-parser.core.js";
-import { ImperativeState as b } from "./chunk-QZHKN3VN.js";
-//#region ../../node_modules/mermaid/dist/chunks/mermaid.core/gitGraphDiagram-UUTBAWPF.mjs
-var x = {
+import { cleanAndMerge, random, utils_default } from "./chunk-5PVQY5BW.js";
+import { populateCommonDb } from "./chunk-4BX2VUAB.js";
+import { parse } from "../../../../@mermaid-js/parser/dist/mermaid-parser.core.js";
+import { ImperativeState } from "./chunk-QZHKN3VN.js";
+var commitType = {
 	NORMAL: 0,
 	REVERSE: 1,
 	HIGHLIGHT: 2,
 	MERGE: 3,
 	CHERRY_PICK: 4
-}, ee = i.gitGraph, S = /* @__PURE__ */ e(() => h({
-	...ee,
-	...s().gitGraph
-}), "getConfig"), C = new b(() => {
-	let e = S(), t = e.mainBranchName, n = e.mainBranchOrder;
+}, DEFAULT_GITGRAPH_CONFIG = defaultConfig_default.gitGraph, getConfig3 = /* @__PURE__ */ __name(() => cleanAndMerge({
+	...DEFAULT_GITGRAPH_CONFIG,
+	...getConfig().gitGraph
+}), "getConfig"), state = new ImperativeState(() => {
+	let i = getConfig3(), N = i.mainBranchName, P = i.mainBranchOrder;
 	return {
-		mainBranchName: t,
+		mainBranchName: N,
 		commits: /* @__PURE__ */ new Map(),
 		head: null,
-		branchConfig: /* @__PURE__ */ new Map([[t, {
-			name: t,
-			order: n
+		branchConfig: /* @__PURE__ */ new Map([[N, {
+			name: N,
+			order: P
 		}]]),
-		branches: /* @__PURE__ */ new Map([[t, null]]),
-		currBranch: t,
+		branches: /* @__PURE__ */ new Map([[N, null]]),
+		currBranch: N,
 		direction: "LR",
 		seq: 0,
 		options: {}
 	};
 });
-function w() {
-	return g({ length: 7 });
+function getID() {
+	return random({ length: 7 });
 }
-e(w, "getID");
-function T(e, t) {
-	let n = /* @__PURE__ */ Object.create(null);
-	return e.reduce((e, r) => {
-		let i = t(r);
-		return n[i] || (n[i] = !0, e.push(r)), e;
+__name(getID, "getID");
+function uniqBy(i, N) {
+	let P = /* @__PURE__ */ Object.create(null);
+	return i.reduce((i, F) => {
+		let I = N(F);
+		return P[I] || (P[I] = !0, i.push(F)), i;
 	}, []);
 }
-e(T, "uniqBy");
-var te = /* @__PURE__ */ e(function(e) {
-	C.records.direction = e;
-}, "setDirection"), ne = /* @__PURE__ */ e(function(e) {
-	t.debug("options str", e), e = e?.trim(), e ||= "{}";
+__name(uniqBy, "uniqBy");
+var setDirection = /* @__PURE__ */ __name(function(i) {
+	state.records.direction = i;
+}, "setDirection"), setOptions = /* @__PURE__ */ __name(function(i) {
+	log.debug("options str", i), i = i?.trim(), i ||= "{}";
 	try {
-		C.records.options = JSON.parse(e);
-	} catch (e) {
-		t.error("error while parsing gitGraph options", e.message);
+		state.records.options = JSON.parse(i);
+	} catch (i) {
+		log.error("error while parsing gitGraph options", i.message);
 	}
-}, "setOptions"), re = /* @__PURE__ */ e(function() {
-	return C.records.options;
-}, "getOptions"), ie = /* @__PURE__ */ e(function(e) {
-	let n = e.msg, i = e.id, a = e.type, o = e.tags;
-	t.info("commit", n, i, a, o), t.debug("Entering commit:", n, i, a, o);
-	let s = S();
-	i = r.sanitizeText(i, s), n = r.sanitizeText(n, s), o = o?.map((e) => r.sanitizeText(e, s));
-	let c = {
-		id: i || C.records.seq + "-" + w(),
-		message: n,
-		seq: C.records.seq++,
-		type: a ?? x.NORMAL,
-		tags: o ?? [],
-		parents: C.records.head == null ? [] : [C.records.head.id],
-		branch: C.records.currBranch
+}, "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 z = getConfig3();
+	I = common_default.sanitizeText(I, z), P = common_default.sanitizeText(P, z), R = R?.map((i) => common_default.sanitizeText(i, z));
+	let B = {
+		id: I || state.records.seq + "-" + getID(),
+		message: P,
+		seq: state.records.seq++,
+		type: L ?? commitType.NORMAL,
+		tags: R ?? [],
+		parents: state.records.head == null ? [] : [state.records.head.id],
+		branch: state.records.currBranch
 	};
-	C.records.head = c, t.info("main branch", s.mainBranchName), C.records.commits.has(c.id) && t.warn(`Commit ID ${c.id} already exists`), C.records.commits.set(c.id, c), C.records.branches.set(C.records.currBranch, c.id), t.debug("in pushCommit " + c.id);
-}, "commit"), ae = /* @__PURE__ */ e(function(e) {
-	let n = e.name, i = e.order;
-	if (n = r.sanitizeText(n, S()), C.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}")`);
-	C.records.branches.set(n, C.records.head == null ? null : C.records.head.id), C.records.branchConfig.set(n, {
-		name: n,
-		order: i
-	}), E(n), t.debug("in createBranch");
-}, "branch"), oe = /* @__PURE__ */ e((e) => {
-	let n = e.branch, i = e.id, a = e.type, o = e.tags, s = S();
-	n = r.sanitizeText(n, s), i &&= r.sanitizeText(i, s);
-	let c = C.records.branches.get(C.records.currBranch), l = C.records.branches.get(n), u = c ? C.records.commits.get(c) : void 0, d = l ? C.records.commits.get(l) : void 0;
-	if (u && d && u.branch === n) throw Error(`Cannot merge branch '${n}' into itself.`);
-	if (C.records.currBranch === n) {
-		let e = /* @__PURE__ */ Error("Incorrect usage of \"merge\". Cannot merge a branch to itself");
-		throw e.hash = {
-			text: `merge ${n}`,
-			token: `merge ${n}`,
+	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");
+}, "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 i = /* @__PURE__ */ Error("Incorrect usage of \"merge\". Cannot merge a branch to itself");
+		throw i.hash = {
+			text: `merge ${P}`,
+			token: `merge ${P}`,
 			expected: ["branch abc"]
-		}, e;
+		}, i;
 	}
-	if (u === void 0 || !u) {
-		let e = /* @__PURE__ */ Error(`Incorrect usage of "merge". Current branch (${C.records.currBranch})has no commits`);
-		throw e.hash = {
-			text: `merge ${n}`,
-			token: `merge ${n}`,
+	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}`,
 			expected: ["commit"]
-		}, e;
+		}, i;
 	}
-	if (!C.records.branches.has(n)) {
-		let e = /* @__PURE__ */ Error("Incorrect usage of \"merge\". Branch to be merged (" + n + ") does not exist");
-		throw e.hash = {
-			text: `merge ${n}`,
-			token: `merge ${n}`,
-			expected: [`branch ${n}`]
-		}, e;
+	if (!state.records.branches.has(P)) {
+		let i = /* @__PURE__ */ Error("Incorrect usage of \"merge\". Branch to be merged (" + P + ") does not exist");
+		throw i.hash = {
+			text: `merge ${P}`,
+			token: `merge ${P}`,
+			expected: [`branch ${P}`]
+		}, i;
 	}
-	if (d === void 0 || !d) {
-		let e = /* @__PURE__ */ Error("Incorrect usage of \"merge\". Branch to be merged (" + n + ") has no commits");
-		throw e.hash = {
-			text: `merge ${n}`,
-			token: `merge ${n}`,
+	if (U === void 0 || !U) {
+		let i = /* @__PURE__ */ Error("Incorrect usage of \"merge\". Branch to be merged (" + P + ") has no commits");
+		throw i.hash = {
+			text: `merge ${P}`,
+			token: `merge ${P}`,
 			expected: ["\"commit\""]
-		}, e;
+		}, i;
 	}
-	if (u === d) {
-		let e = /* @__PURE__ */ Error("Incorrect usage of \"merge\". Both branches have same head");
-		throw e.hash = {
-			text: `merge ${n}`,
-			token: `merge ${n}`,
+	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}`,
 			expected: ["branch abc"]
-		}, e;
+		}, i;
 	}
-	if (i && C.records.commits.has(i)) {
-		let e = /* @__PURE__ */ Error("Incorrect usage of \"merge\". Commit with id:" + i + " already exists, use different custom id");
-		throw e.hash = {
-			text: `merge ${n} ${i} ${a} ${o?.join(" ")}`,
-			token: `merge ${n} ${i} ${a} ${o?.join(" ")}`,
-			expected: [`merge ${n} ${i}_UNIQUE ${a} ${o?.join(" ")}`]
-		}, e;
+	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");
+		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(" ")}`]
+		}, i;
 	}
-	let f = l || "", p = {
-		id: i || `${C.records.seq}-${w()}`,
-		message: `merged branch ${n} into ${C.records.currBranch}`,
-		seq: C.records.seq++,
-		parents: C.records.head == null ? [] : [C.records.head.id, f],
-		branch: C.records.currBranch,
-		type: x.MERGE,
-		customType: a,
-		customId: !!i,
-		tags: o ?? []
+	let W = V || "", G = {
+		id: I || `${state.records.seq}-${getID()}`,
+		message: `merged branch ${P} 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,
+		tags: R ?? []
 	};
-	C.records.head = p, C.records.commits.set(p.id, p), C.records.branches.set(C.records.currBranch, p.id), t.debug(C.records.branches), t.debug("in mergeBranch");
-}, "merge"), se = /* @__PURE__ */ e(function(e) {
-	let n = e.id, i = e.targetId, a = e.tags, o = e.parent;
-	t.debug("Entering cherryPick:", n, i, a);
-	let s = S();
-	if (n = r.sanitizeText(n, s), i = r.sanitizeText(i, s), a = a?.map((e) => r.sanitizeText(e, s)), o = r.sanitizeText(o, s), !n || !C.records.commits.has(n)) {
-		let e = /* @__PURE__ */ Error("Incorrect usage of \"cherryPick\". Source commit id should exist and provided");
-		throw e.hash = {
-			text: `cherryPick ${n} ${i}`,
-			token: `cherryPick ${n} ${i}`,
+	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 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)) {
+		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}`,
 			expected: ["cherry-pick abc"]
-		}, e;
+		}, i;
 	}
-	let c = C.records.commits.get(n);
-	if (c === void 0 || !c) throw Error("Incorrect usage of \"cherryPick\". Source commit id should exist and provided");
-	if (o && !(Array.isArray(c.parents) && c.parents.includes(o))) throw /* @__PURE__ */ Error("Invalid operation: The specified parent commit is not an immediate parent of the cherry-picked commit.");
-	let l = c.branch;
-	if (c.type === x.MERGE && !o) 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 || !C.records.commits.has(i)) {
-		if (l === C.records.currBranch) {
-			let e = /* @__PURE__ */ Error("Incorrect usage of \"cherryPick\". Source commit is already on current branch");
-			throw e.hash = {
-				text: `cherryPick ${n} ${i}`,
-				token: `cherryPick ${n} ${i}`,
+	let B = state.records.commits.get(P);
+	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 (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}`,
 				expected: ["cherry-pick abc"]
-			}, e;
+			}, i;
 		}
-		let e = C.records.branches.get(C.records.currBranch);
-		if (e === void 0 || !e) {
-			let e = /* @__PURE__ */ Error(`Incorrect usage of "cherry-pick". Current branch (${C.records.currBranch})has no commits`);
-			throw e.hash = {
-				text: `cherryPick ${n} ${i}`,
-				token: `cherryPick ${n} ${i}`,
+		let i = state.records.branches.get(state.records.currBranch);
+		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}`,
 				expected: ["cherry-pick abc"]
-			}, e;
+			}, i;
 		}
-		let r = C.records.commits.get(e);
-		if (r === void 0 || !r) {
-			let e = /* @__PURE__ */ Error(`Incorrect usage of "cherry-pick". Current branch (${C.records.currBranch})has no commits`);
-			throw e.hash = {
-				text: `cherryPick ${n} ${i}`,
-				token: `cherryPick ${n} ${i}`,
+		let F = state.records.commits.get(i);
+		if (F === void 0 || !F) {
+			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}`,
 				expected: ["cherry-pick abc"]
-			}, e;
+			}, i;
 		}
-		let s = {
-			id: C.records.seq + "-" + w(),
-			message: `cherry-picked ${c?.message} into ${C.records.currBranch}`,
-			seq: C.records.seq++,
-			parents: C.records.head == null ? [] : [C.records.head.id, c.id],
-			branch: C.records.currBranch,
-			type: x.CHERRY_PICK,
-			tags: a ? a.filter(Boolean) : [`cherry-pick:${c.id}${c.type === x.MERGE ? `|parent:${o}` : ""}`]
+		let z = {
+			id: state.records.seq + "-" + getID(),
+			message: `cherry-picked ${B?.message} into ${state.records.currBranch}`,
+			seq: state.records.seq++,
+			parents: state.records.head == null ? [] : [state.records.head.id, B.id],
+			branch: state.records.currBranch,
+			type: commitType.CHERRY_PICK,
+			tags: L ? L.filter(Boolean) : [`cherry-pick:${B.id}${B.type === commitType.MERGE ? `|parent:${R}` : ""}`]
 		};
-		C.records.head = s, C.records.commits.set(s.id, s), C.records.branches.set(C.records.currBranch, s.id), t.debug(C.records.branches), t.debug("in cherryPick");
+		state.records.head = z, state.records.commits.set(z.id, z), state.records.branches.set(state.records.currBranch, z.id), log.debug(state.records.branches), log.debug("in cherryPick");
 	}
-}, "cherryPick"), E = /* @__PURE__ */ e(function(e) {
-	if (e = r.sanitizeText(e, S()), C.records.branches.has(e)) {
-		C.records.currBranch = e;
-		let t = C.records.branches.get(C.records.currBranch);
-		t === void 0 || !t ? C.records.head = null : C.records.head = C.records.commits.get(t) ?? null;
+}, "cherryPick"), checkout = /* @__PURE__ */ __name(function(i) {
+	if (i = common_default.sanitizeText(i, getConfig3()), state.records.branches.has(i)) {
+		state.records.currBranch = i;
+		let N = state.records.branches.get(state.records.currBranch);
+		N === void 0 || !N ? state.records.head = null : state.records.head = state.records.commits.get(N) ?? null;
 	} else {
-		let t = /* @__PURE__ */ Error(`Trying to checkout branch which is not yet created. (Help try using "branch ${e}")`);
-		throw t.hash = {
-			text: `checkout ${e}`,
-			token: `checkout ${e}`,
-			expected: [`branch ${e}`]
-		}, t;
+		let N = /* @__PURE__ */ Error(`Trying to checkout branch which is not yet created. (Help try using "branch ${i}")`);
+		throw N.hash = {
+			text: `checkout ${i}`,
+			token: `checkout ${i}`,
+			expected: [`branch ${i}`]
+		}, N;
 	}
 }, "checkout");
-function D(e, t, n) {
-	let r = e.indexOf(t);
-	r === -1 ? e.push(n) : e.splice(r, 1, n);
+function upsert(i, N, P) {
+	let F = i.indexOf(N);
+	F === -1 ? i.push(P) : i.splice(F, 1, P);
 }
-e(D, "upsert");
-function O(e) {
-	let n = e.reduce((e, t) => e.seq > t.seq ? e : t, e[0]), r = "";
-	e.forEach(function(e) {
-		e === n ? r += "	*" : r += "	|";
+__name(upsert, "upsert");
+function prettyPrintCommitHistory(i) {
+	let P = i.reduce((i, N) => i.seq > N.seq ? i : N, i[0]), F = "";
+	i.forEach(function(i) {
+		i === P ? F += "	*" : F += "	|";
 	});
-	let i = [
-		r,
-		n.id,
-		n.seq
+	let I = [
+		F,
+		P.id,
+		P.seq
 	];
-	for (let e in C.records.branches) C.records.branches.get(e) === n.id && i.push(e);
-	if (t.debug(i.join(" ")), n.parents && n.parents.length == 2 && n.parents[0] && n.parents[1]) {
-		let t = C.records.commits.get(n.parents[0]);
-		D(e, n, t), n.parents[1] && e.push(C.records.commits.get(n.parents[1]));
-	} else if (n.parents.length == 0) return;
-	else if (n.parents[0]) {
-		let t = C.records.commits.get(n.parents[0]);
-		D(e, n, t);
+	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);
 	}
-	e = T(e, (e) => e.id), O(e);
+	i = uniqBy(i, (i) => i.id), prettyPrintCommitHistory(i);
 }
-e(O, "prettyPrintCommitHistory");
-var ce = /* @__PURE__ */ e(function() {
-	t.debug(C.records.commits);
-	let e = k()[0];
-	O([e]);
-}, "prettyPrint"), le = /* @__PURE__ */ e(function() {
-	C.reset(), n();
-}, "clear"), ue = /* @__PURE__ */ e(function() {
-	return [...C.records.branchConfig.values()].map((e, t) => e.order !== null && e.order !== void 0 ? e : {
-		...e,
-		order: parseFloat(`0.${t}`)
-	}).sort((e, t) => (e.order ?? 0) - (t.order ?? 0)).map(({ name: e }) => ({ name: e }));
-}, "getBranchesAsObjArray"), de = /* @__PURE__ */ e(function() {
-	return C.records.branches;
-}, "getBranches"), fe = /* @__PURE__ */ e(function() {
-	return C.records.commits;
-}, "getCommits"), k = /* @__PURE__ */ e(function() {
-	let e = [...C.records.commits.values()];
-	return e.forEach(function(e) {
-		t.debug(e.id);
-	}), e.sort((e, t) => e.seq - t.seq), e;
-}, "getCommitsArray"), A = {
-	commitType: x,
-	getConfig: S,
-	setDirection: te,
-	setOptions: ne,
-	getOptions: re,
-	commit: ie,
-	branch: ae,
-	merge: oe,
-	cherryPick: se,
-	checkout: E,
-	prettyPrint: ce,
-	clear: le,
-	getBranchesAsObjArray: ue,
-	getBranches: de,
-	getCommits: fe,
-	getCommitsArray: k,
-	getCurrentBranch: /* @__PURE__ */ e(function() {
-		return C.records.currBranch;
+__name(prettyPrintCommitHistory, "prettyPrintCommitHistory");
+var prettyPrint = /* @__PURE__ */ __name(function() {
+	log.debug(state.records.commits);
+	let i = getCommitsArray()[0];
+	prettyPrintCommitHistory([i]);
+}, "prettyPrint"), clear2 = /* @__PURE__ */ __name(function() {
+	state.reset(), clear();
+}, "clear"), getBranchesAsObjArray = /* @__PURE__ */ __name(function() {
+	return [...state.records.branchConfig.values()].map((i, N) => i.order !== null && i.order !== void 0 ? i : {
+		...i,
+		order: parseFloat(`0.${N}`)
+	}).sort((i, N) => (i.order ?? 0) - (N.order ?? 0)).map(({ name: i }) => ({ name: i }));
+}, "getBranchesAsObjArray"), getBranches = /* @__PURE__ */ __name(function() {
+	return state.records.branches;
+}, "getBranches"), getCommits = /* @__PURE__ */ __name(function() {
+	return state.records.commits;
+}, "getCommits"), getCommitsArray = /* @__PURE__ */ __name(function() {
+	let i = [...state.records.commits.values()];
+	return i.forEach(function(i) {
+		log.debug(i.id);
+	}), i.sort((i, N) => i.seq - N.seq), i;
+}, "getCommitsArray"), db = {
+	commitType,
+	getConfig: getConfig3,
+	setDirection,
+	setOptions,
+	getOptions,
+	commit,
+	branch,
+	merge,
+	cherryPick,
+	checkout,
+	prettyPrint,
+	clear: clear2,
+	getBranchesAsObjArray,
+	getBranches,
+	getCommits,
+	getCommitsArray,
+	getCurrentBranch: /* @__PURE__ */ __name(function() {
+		return state.records.currBranch;
 	}, "getCurrentBranch"),
-	getDirection: /* @__PURE__ */ e(function() {
-		return C.records.direction;
+	getDirection: /* @__PURE__ */ __name(function() {
+		return state.records.direction;
 	}, "getDirection"),
-	getHead: /* @__PURE__ */ e(function() {
-		return C.records.head;
+	getHead: /* @__PURE__ */ __name(function() {
+		return state.records.head;
 	}, "getHead"),
-	setAccTitle: d,
-	getAccTitle: o,
-	getAccDescription: a,
-	setAccDescription: u,
-	setDiagramTitle: f,
-	getDiagramTitle: l
-}, pe = /* @__PURE__ */ e((e, t) => {
-	v(e, t), e.dir && t.setDirection(e.dir);
-	for (let n of e.statements) me(n, t);
-}, "populate"), me = /* @__PURE__ */ e((n, r) => {
-	let i = {
-		Commit: /* @__PURE__ */ e((e) => r.commit(he(e)), "Commit"),
-		Branch: /* @__PURE__ */ e((e) => r.branch(ge(e)), "Branch"),
-		Merge: /* @__PURE__ */ e((e) => r.merge(_e(e)), "Merge"),
-		Checkout: /* @__PURE__ */ e((e) => r.checkout(ve(e)), "Checkout"),
-		CherryPicking: /* @__PURE__ */ e((e) => r.cherryPick(ye(e)), "CherryPicking")
-	}[n.$type];
-	i ? i(n) : t.error(`Unknown statement type: ${n.$type}`);
-}, "parseStatement"), he = /* @__PURE__ */ e((e) => ({
-	id: e.id,
-	msg: e.message ?? "",
-	type: e.type === void 0 ? x.NORMAL : x[e.type],
-	tags: e.tags ?? void 0
-}), "parseCommit"), ge = /* @__PURE__ */ e((e) => ({
-	name: e.name,
-	order: e.order ?? 0
-}), "parseBranch"), _e = /* @__PURE__ */ e((e) => ({
-	branch: e.branch,
-	id: e.id ?? "",
-	type: e.type === void 0 ? void 0 : x[e.type],
-	tags: e.tags ?? void 0
-}), "parseMerge"), ve = /* @__PURE__ */ e((e) => e.branch, "parseCheckout"), ye = /* @__PURE__ */ e((e) => ({
-	id: e.id,
+	setAccTitle,
+	getAccTitle,
+	getAccDescription,
+	setAccDescription,
+	setDiagramTitle,
+	getDiagramTitle
+}, 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) => {
+	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}`);
+}, "parseStatement"), parseCommit = /* @__PURE__ */ __name((i) => ({
+	id: i.id,
+	msg: i.message ?? "",
+	type: i.type === void 0 ? commitType.NORMAL : commitType[i.type],
+	tags: i.tags ?? void 0
+}), "parseCommit"), parseBranch = /* @__PURE__ */ __name((i) => ({
+	name: i.name,
+	order: i.order ?? 0
+}), "parseBranch"), parseMerge = /* @__PURE__ */ __name((i) => ({
+	branch: i.branch,
+	id: i.id ?? "",
+	type: i.type === void 0 ? void 0 : commitType[i.type],
+	tags: i.tags ?? void 0
+}), "parseMerge"), parseCheckout = /* @__PURE__ */ __name((i) => i.branch, "parseCheckout"), parseCherryPicking = /* @__PURE__ */ __name((i) => ({
+	id: i.id,
 	targetId: "",
-	tags: e.tags?.length === 0 ? void 0 : e.tags,
-	parent: e.parent
-}), "parseCherryPicking"), be = { parse: /* @__PURE__ */ e(async (e) => {
-	let n = await y("gitGraph", e);
-	t.debug(n), pe(n, A);
-}, "parse") }, j = 10, M = 40, N = 4, P = 2, F = 8, I = /* @__PURE__ */ new Set([
+	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);
+}, "parse") }, LAYOUT_OFFSET = 10, COMMIT_STEP = 40, PX = 4, PY = 2, THEME_COLOR_LIMIT = 8, REDUX_GEOMETRY_THEMES = /* @__PURE__ */ new Set([
 	"redux",
 	"redux-dark",
 	"redux-color",
 	"redux-dark-color"
-]), L = 12, R = /* @__PURE__ */ new Set(["redux-color", "redux-dark-color"]), xe = /* @__PURE__ */ new Set([
+]), REDUX_BRANCH_LABEL_PADDING_Y = 12, COLOR_THEMES = /* @__PURE__ */ new Set(["redux-color", "redux-dark-color"]), DARK_THEMES = /* @__PURE__ */ new Set([
 	"dark",
 	"redux-dark",
 	"redux-dark-color",
 	"neo-dark"
-]), z = /* @__PURE__ */ e((e, t, n = !1) => n && e > 0 ? (e - 1) % (t - 1) + 1 : e % t, "calcColorIndex"), B = /* @__PURE__ */ new Map(), V = /* @__PURE__ */ new Map(), H = 30, U = /* @__PURE__ */ new Map(), W = [], G = 0, K = "LR", q = /* @__PURE__ */ e(() => {
-	B.clear(), V.clear(), U.clear(), G = 0, W = [], K = "LR";
-}, "clear"), J = /* @__PURE__ */ e((e) => {
-	let t = document.createElementNS("http://www.w3.org/2000/svg", "text");
-	return (typeof e == "string" ? e.split(/\\n|\n|<br\s*\/?>/gi) : e).forEach((e) => {
-		let n = document.createElementNS("http://www.w3.org/2000/svg", "tspan");
-		n.setAttributeNS("http://www.w3.org/XML/1998/namespace", "xml:space", "preserve"), n.setAttribute("dy", "1em"), n.setAttribute("x", "0"), n.setAttribute("class", "row"), n.textContent = e.trim(), t.appendChild(n);
-	}), t;
-}, "drawText"), Y = /* @__PURE__ */ e((t) => {
-	let n, r, i;
-	return K === "BT" ? (r = /* @__PURE__ */ e((e, t) => e <= t, "comparisonFunc"), i = Infinity) : (r = /* @__PURE__ */ e((e, t) => e >= t, "comparisonFunc"), i = 0), t.forEach((e) => {
-		let t = K === "TB" || K == "BT" ? V.get(e)?.y : V.get(e)?.x;
-		t !== void 0 && r(t, i) && (n = e, i = t);
-	}), n;
-}, "findClosestParent"), Se = /* @__PURE__ */ e((e) => {
-	let t = "", n = Infinity;
-	return e.forEach((e) => {
-		let r = V.get(e).y;
-		r <= n && (t = e, n = r);
-	}), t || void 0;
-}, "findClosestParentBT"), Ce = /* @__PURE__ */ e((e, t, n) => {
-	let r = n, i = n, a = [];
-	e.forEach((e) => {
-		let n = t.get(e);
-		if (!n) throw Error(`Commit not found for key ${e}`);
-		n.parents.length ? (r = Te(n), i = Math.max(r, i)) : a.push(n), Ee(n, r);
-	}), r = i, a.forEach((e) => {
-		De(e, r, n);
-	}), e.forEach((e) => {
-		let n = t.get(e);
-		if (n?.parents.length) {
-			let e = Se(n.parents);
-			r = V.get(e).y - M, r <= i && (i = r);
-			let t = B.get(n.branch).pos, a = r - j;
-			V.set(n.id, {
-				x: t,
-				y: a
+]), calcColorIndex = /* @__PURE__ */ __name((i, N, P = !1) => P && i > 0 ? (i - 1) % (N - 1) + 1 : i % N, "calcColorIndex"), branchPos = /* @__PURE__ */ new Map(), commitPos = /* @__PURE__ */ new Map(), defaultPos = 30, allCommitsDict = /* @__PURE__ */ new Map(), lanes = [], maxPos = 0, dir = "LR", clear3 = /* @__PURE__ */ __name(() => {
+	branchPos.clear(), commitPos.clear(), allCommitsDict.clear(), maxPos = 0, lanes = [], dir = "LR";
+}, "clear"), drawText = /* @__PURE__ */ __name((i) => {
+	let N = document.createElementNS("http://www.w3.org/2000/svg", "text");
+	return (typeof i == "string" ? i.split(/\\n|\n|<br\s*\/?>/gi) : i).forEach((i) => {
+		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) => {
+	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) => {
+		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;
+}, "findClosestParent"), findClosestParentBT = /* @__PURE__ */ __name((i) => {
+	let N = "", P = Infinity;
+	return i.forEach((i) => {
+		let F = commitPos.get(i).y;
+		F <= P && (N = i, P = F);
+	}), N || void 0;
+}, "findClosestParentBT"), setParallelBTPos = /* @__PURE__ */ __name((i, N, P) => {
+	let F = P, I = P, L = [];
+	i.forEach((i) => {
+		let P = N.get(i);
+		if (!P) throw Error(`Commit not found for key ${i}`);
+		P.parents.length ? (F = calculateCommitPosition(P), I = Math.max(F, I)) : L.push(P), setCommitPosition(P, F);
+	}), F = I, L.forEach((i) => {
+		setRootPosition(i, F, P);
+	}), i.forEach((i) => {
+		let P = N.get(i);
+		if (P?.parents.length) {
+			let i = findClosestParentBT(P.parents);
+			F = commitPos.get(i).y - COMMIT_STEP, F <= I && (I = F);
+			let N = branchPos.get(P.branch).pos, L = F - LAYOUT_OFFSET;
+			commitPos.set(P.id, {
+				x: N,
+				y: L
 			});
 		}
 	});
-}, "setParallelBTPos"), we = /* @__PURE__ */ e((e) => {
-	let t = Y(e.parents.filter((e) => e !== null));
-	if (!t) throw Error(`Closest parent not found for commit ${e.id}`);
-	let n = V.get(t)?.y;
-	if (n === void 0) throw Error(`Closest parent position not found for commit ${e.id}`);
-	return n;
-}, "findClosestParentPos"), Te = /* @__PURE__ */ e((e) => we(e) + M, "calculateCommitPosition"), Ee = /* @__PURE__ */ e((e, t) => {
-	let n = B.get(e.branch);
-	if (!n) throw Error(`Branch not found for commit ${e.id}`);
-	let r = n.pos, i = t + j;
-	return V.set(e.id, {
-		x: r,
-		y: i
+}, "setParallelBTPos"), findClosestParentPos = /* @__PURE__ */ __name((i) => {
+	let N = findClosestParent(i.parents.filter((i) => i !== null));
+	if (!N) throw Error(`Closest parent not found for commit ${i.id}`);
+	let P = commitPos.get(N)?.y;
+	if (P === void 0) throw Error(`Closest parent position not found for commit ${i.id}`);
+	return P;
+}, "findClosestParentPos"), calculateCommitPosition = /* @__PURE__ */ __name((i) => findClosestParentPos(i) + COMMIT_STEP, "calculateCommitPosition"), setCommitPosition = /* @__PURE__ */ __name((i, N) => {
+	let P = branchPos.get(i.branch);
+	if (!P) throw Error(`Branch not found for commit ${i.id}`);
+	let F = P.pos, I = N + LAYOUT_OFFSET;
+	return commitPos.set(i.id, {
+		x: F,
+		y: I
 	}), {
-		x: r,
-		y: i
+		x: F,
+		y: I
 	};
-}, "setCommitPosition"), De = /* @__PURE__ */ e((e, t, n) => {
-	let r = B.get(e.branch);
-	if (!r) throw Error(`Branch not found for commit ${e.id}`);
-	let i = t + n, a = r.pos;
-	V.set(e.id, {
-		x: a,
-		y: i
+}, "setCommitPosition"), setRootPosition = /* @__PURE__ */ __name((i, N, P) => {
+	let F = branchPos.get(i.branch);
+	if (!F) throw Error(`Branch not found for commit ${i.id}`);
+	let I = N + P, L = F.pos;
+	commitPos.set(i.id, {
+		x: L,
+		y: I
 	});
-}, "setRootPosition"), Oe = /* @__PURE__ */ e((e, t, n, r, i, a) => {
-	let { theme: o } = c(), s = I.has(o ?? ""), l = R.has(o ?? ""), u = xe.has(o ?? "");
-	if (a === x.HIGHLIGHT) e.append("rect").attr("x", n.x - 10 + (s ? 3 : 0)).attr("y", n.y - 10 + (s ? 3 : 0)).attr("width", s ? 14 : 20).attr("height", s ? 14 : 20).attr("class", `commit ${t.id} commit-highlight${z(i, F, l)} ${r}-outer`), e.append("rect").attr("x", n.x - 6 + (s ? 2 : 0)).attr("y", n.y - 6 + (s ? 2 : 0)).attr("width", s ? 8 : 12).attr("height", s ? 8 : 12).attr("class", `commit ${t.id} commit${z(i, F, l)} ${r}-inner`);
-	else if (a === x.CHERRY_PICK) e.append("circle").attr("cx", n.x).attr("cy", n.y).attr("r", s ? 7 : 10).attr("class", `commit ${t.id} ${r}`), e.append("circle").attr("cx", n.x - 3).attr("cy", n.y + 2).attr("r", s ? 2.5 : 2.75).attr("fill", u ? "#000000" : "#fff").attr("class", `commit ${t.id} ${r}`), e.append("circle").attr("cx", n.x + 3).attr("cy", n.y + 2).attr("r", s ? 2.5 : 2.75).attr("fill", u ? "#000000" : "#fff").attr("class", `commit ${t.id} ${r}`), e.append("line").attr("x1", n.x + 3).attr("y1", n.y + 1).attr("x2", n.x).attr("y2", n.y - 5).attr("stroke", u ? "#000000" : "#fff").attr("class", `commit ${t.id} ${r}`), e.append("line").attr("x1", n.x - 3).attr("y1", n.y + 1).attr("x2", n.x).attr("y2", n.y - 5).attr("stroke", u ? "#000000" : "#fff").attr("class", `commit ${t.id} ${r}`);
+}, "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`);
+	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 o = e.append("circle");
-		if (o.attr("cx", n.x), o.attr("cy", n.y), o.attr("r", s ? 7 : 10), o.attr("class", `commit ${t.id} commit${z(i, F, l)}`), a === x.MERGE) {
-			let a = e.append("circle");
-			a.attr("cx", n.x), a.attr("cy", n.y), a.attr("r", s ? 5 : 6), a.attr("class", `commit ${r} ${t.id} commit${z(i, F, l)}`);
+		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) {
+			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)}`);
 		}
-		if (a === x.REVERSE) {
-			let a = e.append("path"), o = s ? 4 : 5;
-			a.attr("d", `M ${n.x - o},${n.y - o}L${n.x + o},${n.y + o}M${n.x - o},${n.y + o}L${n.x + o},${n.y - o}`).attr("class", `commit ${r} ${t.id} commit${z(i, F, l)}`);
+		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)}`);
 		}
 	}
-}, "drawCommitBullet"), ke = /* @__PURE__ */ e((e, t, n, r, i) => {
-	if (t.type !== x.CHERRY_PICK && (t.customId && t.type === x.MERGE || t.type !== x.MERGE) && i.showCommitLabel) {
-		let a = e.append("g"), o = a.insert("rect").attr("class", "commit-label-bkg"), s = a.append("text").attr("x", r).attr("y", n.y + 25).attr("class", "commit-label").text(t.id), c = s.node()?.getBBox();
-		if (c && (o.attr("x", n.posWithOffset - c.width / 2 - P).attr("y", n.y + 13.5).attr("width", c.width + 2 * P).attr("height", c.height + 2 * P), K === "TB" || K === "BT" ? (o.attr("x", n.x - (c.width + 4 * N + 5)).attr("y", n.y - 12), s.attr("x", n.x - (c.width + 4 * N)).attr("y", n.y + c.height - 12)) : s.attr("x", n.posWithOffset - c.width / 2), i.rotateCommitLabel)) if (K === "TB" || K === "BT") s.attr("transform", "rotate(-45, " + n.x + ", " + n.y + ")"), o.attr("transform", "rotate(-45, " + n.x + ", " + n.y + ")");
+}, "drawCommitBullet"), drawCommitLabel = /* @__PURE__ */ __name((i, N, P, F, I) => {
+	if (N.type !== commitType.CHERRY_PICK && (N.customId && N.type === commitType.MERGE || N.type !== commitType.MERGE) && I.showCommitLabel) {
+		let L = i.append("g"), R = L.insert("rect").attr("class", "commit-label-bkg"), z = L.append("text").attr("x", F).attr("y", P.y + 25).attr("class", "commit-label").text(N.id), B = z.node()?.getBBox();
+		if (B && (R.attr("x", P.posWithOffset - B.width / 2 - PY).attr("y", P.y + 13.5).attr("width", B.width + 2 * PY).attr("height", B.height + 2 * PY), dir === "TB" || dir === "BT" ? (R.attr("x", P.x - (B.width + 4 * PX + 5)).attr("y", P.y - 12), z.attr("x", P.x - (B.width + 4 * PX)).attr("y", P.y + B.height - 12)) : z.attr("x", P.posWithOffset - B.width / 2), I.rotateCommitLabel)) if (dir === "TB" || dir === "BT") z.attr("transform", "rotate(-45, " + P.x + ", " + P.y + ")"), R.attr("transform", "rotate(-45, " + P.x + ", " + P.y + ")");
 		else {
-			let e = -7.5 - (c.width + 10) / 25 * 9.5, t = 10 + c.width / 25 * 8.5;
-			a.attr("transform", "translate(" + e + ", " + t + ") rotate(-45, " + r + ", " + n.y + ")");
+			let i = -7.5 - (B.width + 10) / 25 * 9.5, N = 10 + B.width / 25 * 8.5;
+			L.attr("transform", "translate(" + i + ", " + N + ") rotate(-45, " + F + ", " + P.y + ")");
 		}
 	}
-}, "drawCommitLabel"), Ae = /* @__PURE__ */ e((e, t, n, r) => {
-	if (t.tags.length > 0) {
-		let i = 0, a = 0, o = 0, s = [];
-		for (let r of t.tags.reverse()) {
-			let t = e.insert("polygon"), c = e.append("circle"), l = e.append("text").attr("y", n.y - 16 - i).attr("class", "tag-label").text(r), u = l.node()?.getBBox();
-			if (!u) throw Error("Tag bbox not found");
-			a = Math.max(a, u.width), o = Math.max(o, u.height), l.attr("x", n.posWithOffset - u.width / 2), s.push({
-				tag: l,
-				hole: c,
-				rect: t,
-				yOffset: i
-			}), i += 20;
+}, "drawCommitLabel"), drawCommitTags = /* @__PURE__ */ __name((i, N, P, F) => {
+	if (N.tags.length > 0) {
+		let I = 0, L = 0, R = 0, z = [];
+		for (let F of N.tags.reverse()) {
+			let N = i.insert("polygon"), B = i.append("circle"), V = i.append("text").attr("y", P.y - 16 - I).attr("class", "tag-label").text(F), H = V.node()?.getBBox();
+			if (!H) throw Error("Tag bbox not found");
+			L = Math.max(L, H.width), R = Math.max(R, H.height), V.attr("x", P.posWithOffset - H.width / 2), z.push({
+				tag: V,
+				hole: B,
+				rect: N,
+				yOffset: I
+			}), I += 20;
 		}
-		for (let { tag: e, hole: t, rect: i, yOffset: c } of s) {
-			let s = o / 2, l = n.y - 19.2 - c;
-			if (i.attr("class", "tag-label-bkg").attr("points", `
-      ${r - a / 2 - N / 2},${l + P}  
-      ${r - a / 2 - N / 2},${l - P}
-      ${n.posWithOffset - a / 2 - N},${l - s - P}
-      ${n.posWithOffset + a / 2 + N},${l - s - P}
-      ${n.posWithOffset + a / 2 + N},${l + s + P}
-      ${n.posWithOffset - a / 2 - N},${l + s + P}`), t.attr("cy", l).attr("cx", r - a / 2 + N / 2).attr("r", 1.5).attr("class", "tag-hole"), K === "TB" || K === "BT") {
-				let o = r + c;
-				i.attr("class", "tag-label-bkg").attr("points", `
-        ${n.x},${o + 2}
-        ${n.x},${o - 2}
-        ${n.x + j},${o - s - 2}
-        ${n.x + j + a + 4},${o - s - 2}
-        ${n.x + j + a + 4},${o + s + 2}
-        ${n.x + j},${o + s + 2}`).attr("transform", "translate(12,12) rotate(45, " + n.x + "," + r + ")"), t.attr("cx", n.x + N / 2).attr("cy", o).attr("transform", "translate(12,12) rotate(45, " + n.x + "," + r + ")"), e.attr("x", n.x + 5).attr("y", o + 3).attr("transform", "translate(14,14) rotate(45, " + n.x + "," + r + ")");
+		for (let { tag: i, hole: N, rect: I, yOffset: B } of z) {
+			let z = R / 2, V = P.y - 19.2 - B;
+			if (I.attr("class", "tag-label-bkg").attr("points", `
+      ${F - L / 2 - PX / 2},${V + PY}  
+      ${F - L / 2 - PX / 2},${V - PY}
+      ${P.posWithOffset - L / 2 - PX},${V - z - PY}
+      ${P.posWithOffset + L / 2 + PX},${V - z - PY}
+      ${P.posWithOffset + L / 2 + PX},${V + z + PY}
+      ${P.posWithOffset - L / 2 - PX},${V + z + PY}`), N.attr("cy", V).attr("cx", F - L / 2 + PX / 2).attr("r", 1.5).attr("class", "tag-hole"), dir === "TB" || dir === "BT") {
+				let R = F + B;
+				I.attr("class", "tag-label-bkg").attr("points", `
+        ${P.x},${R + 2}
+        ${P.x},${R - 2}
+        ${P.x + LAYOUT_OFFSET},${R - z - 2}
+        ${P.x + LAYOUT_OFFSET + L + 4},${R - z - 2}
+        ${P.x + LAYOUT_OFFSET + L + 4},${R + z + 2}
+        ${P.x + LAYOUT_OFFSET},${R + z + 2}`).attr("transform", "translate(12,12) rotate(45, " + P.x + "," + F + ")"), N.attr("cx", P.x + PX / 2).attr("cy", R).attr("transform", "translate(12,12) rotate(45, " + P.x + "," + F + ")"), i.attr("x", P.x + 5).attr("y", R + 3).attr("transform", "translate(14,14) rotate(45, " + P.x + "," + F + ")");
 			}
 		}
 	}
-}, "drawCommitTags"), je = /* @__PURE__ */ e((e) => {
-	switch (e.customType ?? e.type) {
-		case x.NORMAL: return "commit-normal";
-		case x.REVERSE: return "commit-reverse";
-		case x.HIGHLIGHT: return "commit-highlight";
-		case x.MERGE: return "commit-merge";
-		case x.CHERRY_PICK: return "commit-cherry-pick";
+}, "drawCommitTags"), getCommitClassType = /* @__PURE__ */ __name((i) => {
+	switch (i.customType ?? i.type) {
+		case commitType.NORMAL: return "commit-normal";
+		case commitType.REVERSE: return "commit-reverse";
+		case commitType.HIGHLIGHT: return "commit-highlight";
+		case commitType.MERGE: return "commit-merge";
+		case commitType.CHERRY_PICK: return "commit-cherry-pick";
 		default: return "commit-normal";
 	}
-}, "getCommitClassType"), Me = /* @__PURE__ */ e((e, t, n, r) => {
-	let i = {
+}, "getCommitClassType"), calculatePosition = /* @__PURE__ */ __name((i, N, P, F) => {
+	let I = {
 		x: 0,
 		y: 0
 	};
-	if (e.parents.length > 0) {
-		let n = Y(e.parents);
-		if (n) {
-			let a = r.get(n) ?? i;
-			return t === "TB" ? a.y + M : t === "BT" ? (r.get(e.id) ?? i).y - M : a.x + M;
+	if (i.parents.length > 0) {
+		let P = findClosestParent(i.parents);
+		if (P) {
+			let L = F.get(P) ?? I;
+			return N === "TB" ? L.y + COMMIT_STEP : N === "BT" ? (F.get(i.id) ?? I).y - COMMIT_STEP : L.x + COMMIT_STEP;
 		}
-	} else if (t === "TB") return H;
-	else if (t === "BT") return (r.get(e.id) ?? i).y - M;
+	} else if (N === "TB") return defaultPos;
+	else if (N === "BT") return (F.get(i.id) ?? I).y - COMMIT_STEP;
 	else return 0;
 	return 0;
-}, "calculatePosition"), Ne = /* @__PURE__ */ e((e, t, n) => {
-	let r = K === "BT" && n ? t : t + j, i = B.get(e.branch)?.pos, a = K === "TB" || K === "BT" ? B.get(e.branch)?.pos : r;
-	if (a === void 0 || i === void 0) throw Error(`Position were undefined for commit ${e.id}`);
-	let o = I.has(c().theme ?? "");
+}, "calculatePosition"), getCommitPosition = /* @__PURE__ */ __name((i, N, P) => {
+	let F = dir === "BT" && P ? N : N + LAYOUT_OFFSET, I = branchPos.get(i.branch)?.pos, L = dir === "TB" || dir === "BT" ? branchPos.get(i.branch)?.pos : F;
+	if (L === void 0 || I === void 0) throw Error(`Position were undefined for commit ${i.id}`);
+	let R = REDUX_GEOMETRY_THEMES.has(getConfig2().theme ?? "");
 	return {
-		x: a,
-		y: K === "TB" || K === "BT" ? r : i + (o ? L / 2 + 1 : -2),
-		posWithOffset: r
+		x: L,
+		y: dir === "TB" || dir === "BT" ? F : I + (R ? REDUX_BRANCH_LABEL_PADDING_Y / 2 + 1 : -2),
+		posWithOffset: F
 	};
-}, "getCommitPosition"), X = /* @__PURE__ */ e((t, n, r, i) => {
-	let a = t.append("g").attr("class", "commit-bullets"), o = t.append("g").attr("class", "commit-labels"), s = K === "TB" || K === "BT" ? H : 0, c = [...n.keys()], l = i.parallelCommits ?? !1, u = /* @__PURE__ */ e((e, t) => {
-		let r = n.get(e)?.seq, i = n.get(t)?.seq;
-		return r !== void 0 && i !== void 0 ? r - i : 0;
-	}, "sortKeys"), d = c.sort(u);
-	K === "BT" && (l && Ce(d, n, s), d = d.reverse()), d.forEach((e) => {
-		let t = n.get(e);
-		if (!t) throw Error(`Commit not found for key ${e}`);
-		l && (s = Me(t, K, s, V));
-		let c = Ne(t, s, l);
-		if (r) {
-			let e = je(t), n = t.customType ?? t.type;
-			Oe(a, t, c, e, B.get(t.branch)?.index ?? 0, n), ke(o, t, c, s, i), Ae(o, t, c, s);
+}, "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) => {
+		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);
+	dir === "BT" && (V && setParallelBTPos(U, P, z), U = U.reverse()), U.forEach((i) => {
+		let N = P.get(i);
+		if (!N) throw Error(`Commit not found for key ${i}`);
+		V && (z = calculatePosition(N, dir, z, commitPos));
+		let B = getCommitPosition(N, z, V);
+		if (F) {
+			let i = getCommitClassType(N), P = N.customType ?? N.type;
+			drawCommitBullet(L, N, B, i, branchPos.get(N.branch)?.index ?? 0, P), drawCommitLabel(R, N, B, z, I), drawCommitTags(R, N, B, z);
 		}
-		K === "TB" || K === "BT" ? V.set(t.id, {
-			x: c.x,
-			y: c.posWithOffset
-		}) : V.set(t.id, {
-			x: c.posWithOffset,
-			y: c.y
-		}), s = K === "BT" && l ? s + M : s + M + j, s > G && (G = s);
+		dir === "TB" || dir === "BT" ? commitPos.set(N.id, {
+			x: B.x,
+			y: B.posWithOffset
+		}) : commitPos.set(N.id, {
+			x: B.posWithOffset,
+			y: B.y
+		}), z = dir === "BT" && V ? z + COMMIT_STEP : z + COMMIT_STEP + LAYOUT_OFFSET, z > maxPos && (maxPos = z);
 	});
-}, "drawCommits"), Pe = /* @__PURE__ */ e((t, n, r, i, a) => {
-	let o = (K === "TB" || K === "BT" ? r.x < i.x : r.y < i.y) ? n.branch : t.branch, s = /* @__PURE__ */ e((e) => e.branch === o, "isOnBranchToGetCurve"), c = /* @__PURE__ */ e((e) => e.seq > t.seq && e.seq < n.seq, "isBetweenCommits");
-	return [...a.values()].some((e) => c(e) && s(e));
-}, "shouldRerouteArrow"), Z = /* @__PURE__ */ e((e, t, n = 0) => {
-	let r = e + Math.abs(e - t) / 2;
-	return n > 5 ? r : W.every((e) => Math.abs(e - r) >= 10) ? (W.push(r), r) : Z(e, t - Math.abs(e - t) / 5, n + 1);
-}, "findLane"), Fe = /* @__PURE__ */ e((e, t, n, r) => {
-	let { theme: i } = c(), a = R.has(i ?? ""), o = V.get(t.id), s = V.get(n.id);
-	if (o === void 0 || s === void 0) throw Error(`Commit positions not found for commits ${t.id} and ${n.id}`);
-	let l = Pe(t, n, o, s, r), u = "", d = "", f = 0, p = 0, m = B.get(n.branch)?.index;
-	n.type === x.MERGE && t.id !== n.parents[0] && (m = B.get(t.branch)?.index);
-	let h;
-	if (l) {
-		u = "A 10 10, 0, 0, 0,", d = "A 10 10, 0, 0, 1,", f = 10, p = 10;
-		let e = o.y < s.y ? Z(o.y, s.y) : Z(s.y, o.y), n = o.x < s.x ? Z(o.x, s.x) : Z(s.x, o.x);
-		K === "TB" ? o.x < s.x ? h = `M ${o.x} ${o.y} L ${n - f} ${o.y} ${d} ${n} ${o.y + p} L ${n} ${s.y - f} ${u} ${n + p} ${s.y} L ${s.x} ${s.y}` : (m = B.get(t.branch)?.index, h = `M ${o.x} ${o.y} L ${n + f} ${o.y} ${u} ${n} ${o.y + p} L ${n} ${s.y - f} ${d} ${n - p} ${s.y} L ${s.x} ${s.y}`) : K === "BT" ? o.x < s.x ? h = `M ${o.x} ${o.y} L ${n - f} ${o.y} ${u} ${n} ${o.y - p} L ${n} ${s.y + f} ${d} ${n + p} ${s.y} L ${s.x} ${s.y}` : (m = B.get(t.branch)?.index, h = `M ${o.x} ${o.y} L ${n + f} ${o.y} ${d} ${n} ${o.y - p} L ${n} ${s.y + f} ${u} ${n - p} ${s.y} L ${s.x} ${s.y}`) : o.y < s.y ? h = `M ${o.x} ${o.y} L ${o.x} ${e - f} ${u} ${o.x + p} ${e} L ${s.x - f} ${e} ${d} ${s.x} ${e + p} L ${s.x} ${s.y}` : (m = B.get(t.branch)?.index, h = `M ${o.x} ${o.y} L ${o.x} ${e + f} ${d} ${o.x + p} ${e} L ${s.x - f} ${e} ${u} ${s.x} ${e - p} L ${s.x} ${s.y}`);
-	} else u = "A 20 20, 0, 0, 0,", d = "A 20 20, 0, 0, 1,", f = 20, p = 20, K === "TB" ? (o.x < s.x && (h = n.type === x.MERGE && t.id !== n.parents[0] ? `M ${o.x} ${o.y} L ${o.x} ${s.y - f} ${u} ${o.x + p} ${s.y} L ${s.x} ${s.y}` : `M ${o.x} ${o.y} L ${s.x - f} ${o.y} ${d} ${s.x} ${o.y + p} L ${s.x} ${s.y}`), o.x > s.x && (u = "A 20 20, 0, 0, 0,", d = "A 20 20, 0, 0, 1,", f = 20, p = 20, h = n.type === x.MERGE && t.id !== n.parents[0] ? `M ${o.x} ${o.y} L ${o.x} ${s.y - f} ${d} ${o.x - p} ${s.y} L ${s.x} ${s.y}` : `M ${o.x} ${o.y} L ${s.x + f} ${o.y} ${u} ${s.x} ${o.y + p} L ${s.x} ${s.y}`), o.x === s.x && (h = `M ${o.x} ${o.y} L ${s.x} ${s.y}`)) : K === "BT" ? (o.x < s.x && (h = n.type === x.MERGE && t.id !== n.parents[0] ? `M ${o.x} ${o.y} L ${o.x} ${s.y + f} ${d} ${o.x + p} ${s.y} L ${s.x} ${s.y}` : `M ${o.x} ${o.y} L ${s.x - f} ${o.y} ${u} ${s.x} ${o.y - p} L ${s.x} ${s.y}`), o.x > s.x && (u = "A 20 20, 0, 0, 0,", d = "A 20 20, 0, 0, 1,", f = 20, p = 20, h = n.type === x.MERGE && t.id !== n.parents[0] ? `M ${o.x} ${o.y} L ${o.x} ${s.y + f} ${u} ${o.x - p} ${s.y} L ${s.x} ${s.y}` : `M ${o.x} ${o.y} L ${s.x + f} ${o.y} ${d} ${s.x} ${o.y - p} L ${s.x} ${s.y}`), o.x === s.x && (h = `M ${o.x} ${o.y} L ${s.x} ${s.y}`)) : (o.y < s.y && (h = n.type === x.MERGE && t.id !== n.parents[0] ? `M ${o.x} ${o.y} L ${s.x - f} ${o.y} ${d} ${s.x} ${o.y + p} L ${s.x} ${s.y}` : `M ${o.x} ${o.y} L ${o.x} ${s.y - f} ${u} ${o.x + p} ${s.y} L ${s.x} ${s.y}`), o.y > s.y && (h = n.type === x.MERGE && t.id !== n.parents[0] ? `M ${o.x} ${o.y} L ${s.x - f} ${o.y} ${u} ${s.x} ${o.y - p} L ${s.x} ${s.y}` : `M ${o.x} ${o.y} L ${o.x} ${s.y + f} ${d} ${o.x + p} ${s.y} L ${s.x} ${s.y}`), o.y === s.y && (h = `M ${o.x} ${o.y} L ${s.x} ${s.y}`));
-	if (h === void 0) throw Error("Line definition not found");
-	e.append("path").attr("d", h).attr("class", "arrow arrow" + z(m, F, a));
-}, "drawArrow"), Ie = /* @__PURE__ */ e((e, t) => {
-	let n = e.append("g").attr("class", "commit-arrows");
-	[...t.keys()].forEach((e) => {
-		let r = t.get(e);
-		r.parents && r.parents.length > 0 && r.parents.forEach((e) => {
-			Fe(n, t.get(e), r, t);
+}, "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");
+	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;
+	return P > 5 ? F : lanes.every((i) => Math.abs(i - F) >= 10) ? (lanes.push(F), F) : findLane(i, N - Math.abs(i - N) / 5, P + 1);
+}, "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;
+	P.type === commitType.MERGE && N.id !== P.parents[0] && (K = branchPos.get(N.branch)?.index);
+	let q;
+	if (V) {
+		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}`);
+	} else H = "A 20 20, 0, 0, 0,", U = "A 20 20, 0, 0, 1,", W = 20, G = 20, dir === "TB" ? (R.x < z.x && (q = P.type === commitType.MERGE && N.id !== P.parents[0] ? `M ${R.x} ${R.y} L ${R.x} ${z.y - W} ${H} ${R.x + G} ${z.y} L ${z.x} ${z.y}` : `M ${R.x} ${R.y} L ${z.x - W} ${R.y} ${U} ${z.x} ${R.y + G} L ${z.x} ${z.y}`), R.x > z.x && (H = "A 20 20, 0, 0, 0,", U = "A 20 20, 0, 0, 1,", W = 20, G = 20, q = P.type === commitType.MERGE && N.id !== P.parents[0] ? `M ${R.x} ${R.y} L ${R.x} ${z.y - W} ${U} ${R.x - G} ${z.y} L ${z.x} ${z.y}` : `M ${R.x} ${R.y} L ${z.x + W} ${R.y} ${H} ${z.x} ${R.y + G} L ${z.x} ${z.y}`), R.x === z.x && (q = `M ${R.x} ${R.y} L ${z.x} ${z.y}`)) : dir === "BT" ? (R.x < z.x && (q = P.type === commitType.MERGE && N.id !== P.parents[0] ? `M ${R.x} ${R.y} L ${R.x} ${z.y + W} ${U} ${R.x + G} ${z.y} L ${z.x} ${z.y}` : `M ${R.x} ${R.y} L ${z.x - W} ${R.y} ${H} ${z.x} ${R.y - G} L ${z.x} ${z.y}`), R.x > z.x && (H = "A 20 20, 0, 0, 0,", U = "A 20 20, 0, 0, 1,", W = 20, G = 20, q = P.type === commitType.MERGE && N.id !== P.parents[0] ? `M ${R.x} ${R.y} L ${R.x} ${z.y + W} ${H} ${R.x - G} ${z.y} L ${z.x} ${z.y}` : `M ${R.x} ${R.y} L ${z.x + W} ${R.y} ${U} ${z.x} ${R.y - G} L ${z.x} ${z.y}`), R.x === z.x && (q = `M ${R.x} ${R.y} L ${z.x} ${z.y}`)) : (R.y < z.y && (q = P.type === commitType.MERGE && N.id !== P.parents[0] ? `M ${R.x} ${R.y} L ${z.x - W} ${R.y} ${U} ${z.x} ${R.y + G} L ${z.x} ${z.y}` : `M ${R.x} ${R.y} L ${R.x} ${z.y - W} ${H} ${R.x + G} ${z.y} L ${z.x} ${z.y}`), R.y > z.y && (q = P.type === commitType.MERGE && N.id !== P.parents[0] ? `M ${R.x} ${R.y} L ${z.x - W} ${R.y} ${H} ${z.x} ${R.y - G} L ${z.x} ${z.y}` : `M ${R.x} ${R.y} L ${R.x} ${z.y + W} ${U} ${R.x + G} ${z.y} L ${z.x} ${z.y}`), R.y === z.y && (q = `M ${R.x} ${R.y} L ${z.x} ${z.y}`));
+	if (q === void 0) throw Error("Line definition not found");
+	i.append("path").attr("d", q).attr("class", "arrow arrow" + calcColorIndex(K, THEME_COLOR_LIMIT, L));
+}, "drawArrow"), drawArrows = /* @__PURE__ */ __name((i, N) => {
+	let P = i.append("g").attr("class", "commit-arrows");
+	[...N.keys()].forEach((i) => {
+		let F = N.get(i);
+		F.parents && F.parents.length > 0 && F.parents.forEach((i) => {
+			drawArrow(P, N.get(i), F, N);
 		});
 	});
-}, "drawArrows"), Le = /* @__PURE__ */ e((e, t, n, r) => {
-	let { look: i, theme: a, themeVariables: o } = c(), { dropShadow: s, THEME_COLOR_LIMIT: l } = o, u = I.has(a ?? ""), d = R.has(a ?? ""), f = e.append("g");
-	t.forEach((e, t) => {
-		let a = z(t, u ? l : F, d), o = B.get(e.name)?.pos;
-		if (o === void 0) throw Error(`Position not found for branch ${e.name}`);
-		let c = K === "TB" || K === "BT" ? o : u ? o + L / 2 + 1 : o - 2, p = f.append("line");
-		p.attr("x1", 0), p.attr("y1", c), p.attr("x2", G), p.attr("y2", c), p.attr("class", "branch branch" + a), K === "TB" ? (p.attr("y1", H), p.attr("x1", o), p.attr("y2", G), p.attr("x2", o)) : K === "BT" && (p.attr("y1", G), p.attr("x1", o), p.attr("y2", H), p.attr("x2", o)), W.push(c);
-		let m = e.name, h = J(m), g = f.insert("rect"), _ = f.insert("g").attr("class", "branchLabel").insert("g").attr("class", "label branch-label" + a);
-		_.node().appendChild(h);
-		let v = h.getBBox(), y = u ? 0 : 4, b = u ? 16 : 0, x = u ? L : 0;
-		i === "neo" && g.attr("data-look", "neo"), g.attr("class", "branchLabelBkg label" + a).attr("style", i === "neo" ? `filter:${u ? `url(#${r}-drop-shadow)` : s}` : "").attr("rx", y).attr("ry", y).attr("x", -v.width - 4 - (n.rotateCommitLabel === !0 ? 30 : 0)).attr("y", -v.height / 2 + 10).attr("width", v.width + 18 + b).attr("height", v.height + 4 + x), _.attr("transform", "translate(" + (-v.width - 14 - (n.rotateCommitLabel === !0 ? 30 : 0) + b / 2) + ", " + (c - v.height / 2 - 2) + ")"), K === "TB" ? (g.attr("x", o - v.width / 2 - 10).attr("y", 0), _.attr("transform", "translate(" + (o - v.width / 2 - 5) + ", 0)"), u && (g.attr("transform", `translate(${-b / 2 - 3}, ${-x - 10})`), _.attr("transform", "translate(" + (o - v.width / 2 - 5) + ", " + (-x * 2 + 7) + ")"))) : K === "BT" ? (g.attr("x", o - v.width / 2 - 10).attr("y", G), _.attr("transform", "translate(" + (o - v.width / 2 - 5) + ", " + G + ")"), u && (g.attr("transform", `translate(${-b / 2 - 3}, ${x + 10})`), _.attr("transform", "translate(" + (o - v.width / 2 - 5) + ", " + (G + x * 2 + 4) + ")"))) : g.attr("transform", "translate(-19, " + (c - 12 - x / 2) + ")");
+}, "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");
+	N.forEach((i, N) => {
+		let L = calcColorIndex(N, H ? V : 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 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) + ")");
 	});
-}, "drawBranches"), Re = /* @__PURE__ */ e(function(e, t, n, r, i) {
-	return B.set(e, {
-		pos: t,
-		index: n
-	}), t += 50 + (i ? 40 : 0) + (K === "TB" || K === "BT" ? r.width / 2 : 0), t;
-}, "setBranchPosition"), ze = { draw: /* @__PURE__ */ e(function(e, n, r, i) {
-	q(), t.debug("in gitgraph renderer", e + "\n", "id:", n, r);
-	let a = i.db;
-	if (!a.getConfig) {
-		t.error("getConfig method is not available on db");
+}, "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) {
+		log.error("getConfig method is not available on db");
 		return;
 	}
-	let o = a.getConfig(), s = o.rotateCommitLabel ?? !1;
-	U = a.getCommits();
-	let l = a.getBranchesAsObjArray();
-	K = a.getDirection();
-	let u = m(`[id="${n}"]`), { look: d, theme: f, themeVariables: h } = c(), { useGradient: g, gradientStart: v, gradientStop: y, filterColor: b } = h;
-	if (g) {
-		let e = u.append("defs").append("linearGradient").attr("id", n + "-gradient").attr("gradientUnits", "objectBoundingBox").attr("x1", "0%").attr("y1", "0%").attr("x2", "100%").attr("y2", "0%");
-		e.append("stop").attr("offset", "0%").attr("stop-color", v).attr("stop-opacity", 1), e.append("stop").attr("offset", "100%").attr("stop-color", y).attr("stop-opacity", 1);
+	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;
+	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%");
+		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);
 	}
-	d === "neo" && I.has(f ?? "") && u.append("defs").append("filter").attr("id", n + "-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", b);
-	let x = 0;
-	l.forEach((e, t) => {
-		let n = J(e.name), r = u.append("g"), i = r.insert("g").attr("class", "branchLabel"), a = i.insert("g").attr("class", "label branch-label");
-		a.node()?.appendChild(n);
-		let o = n.getBBox();
-		x = Re(e.name, x, t, o, s), a.remove(), i.remove(), r.remove();
-	}), X(u, U, !1, o), o.showBranches && Le(u, l, o, n), Ie(u, U), X(u, U, !0, o), _.insertTitle(u, "gitTitleText", o.titleTopMargin ?? 0, a.getDiagramTitle()), p(void 0, u, o.diagramPadding, o.useMaxWidth);
-}, "draw") }, Q = 8, $ = /* @__PURE__ */ new Set([
+	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);
+	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");
+		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);
+}, "draw") }, GIT_NAMED_COLOR_COUNT = 8, REDUX_GEOMETRY_THEMES2 = /* @__PURE__ */ new Set([
 	"redux",
 	"redux-dark",
 	"redux-color",
 	"redux-dark-color"
-]), Be = /* @__PURE__ */ new Set(["redux-color", "redux-dark-color"]), Ve = /* @__PURE__ */ new Set(["neo", "neo-dark"]), He = /* @__PURE__ */ new Set([
+]), COLOR_THEMES2 = /* @__PURE__ */ new Set(["redux-color", "redux-dark-color"]), NEO_THEMES = /* @__PURE__ */ new Set(["neo", "neo-dark"]), DARK_THEMES2 = /* @__PURE__ */ new Set([
 	"dark",
 	"redux-dark",
 	"redux-dark-color",
 	"neo-dark"
-]), Ue = /* @__PURE__ */ new Set([
+]), NEO_COLOR_GEN_THEMES = /* @__PURE__ */ new Set([
 	"redux",
 	"redux-dark",
 	"redux-color",
 	"redux-dark-color",
 	"neo",
 	"neo-dark"
-]), We = /* @__PURE__ */ e((e) => {
-	let { svgId: t } = e, n = "";
-	if (e.useGradient && t) for (let r = 0; r < e.THEME_COLOR_LIMIT; r++) n += `
-      .label${r}  { fill: ${e.mainBkg}; stroke: url(${t}-gradient); stroke-width: ${e.strokeWidth};}
+]), genGitGraphGradient = /* @__PURE__ */ __name((i) => {
+	let { svgId: N } = i, P = "";
+	if (i.useGradient && N) for (let F = 0; F < i.THEME_COLOR_LIMIT; F++) P += `
+      .label${F}  { fill: ${i.mainBkg}; stroke: url(${N}-gradient); stroke-width: ${i.strokeWidth};}
              `;
-	return n;
-}, "genGitGraphGradient"), Ge = /* @__PURE__ */ e((e) => {
-	let { theme: t, themeVariables: n } = s(), { borderColorArray: r } = n, i = $.has(t);
-	if (Ve.has(t)) {
-		let t = "";
-		for (let n = 0; n < e.THEME_COLOR_LIMIT; n++) if (n === 0) t += `
-        .branch-label${n} { fill: ${e.nodeBorder};}
-        .commit${n} { stroke: ${e.nodeBorder};   }
-        .commit-highlight${n} { stroke: ${e.nodeBorder}; fill: ${e.nodeBorder}; }
-        .arrow${n} { stroke: ${e.nodeBorder}; }
-        .commit-bullets { fill: ${e.nodeBorder}; }
-        .commit-cherry-pick${n} { stroke: ${e.nodeBorder}; }
-        ${We(e)}`;
+	return P;
+}, "genGitGraphGradient"), genColor = /* @__PURE__ */ __name((i) => {
+	let { theme: N, themeVariables: P } = getConfig(), { borderColorArray: F } = P, I = REDUX_GEOMETRY_THEMES2.has(N);
+	if (NEO_THEMES.has(N)) {
+		let N = "";
+		for (let P = 0; P < i.THEME_COLOR_LIMIT; P++) if (P === 0) N += `
+        .branch-label${P} { fill: ${i.nodeBorder};}
+        .commit${P} { stroke: ${i.nodeBorder};   }
+        .commit-highlight${P} { stroke: ${i.nodeBorder}; fill: ${i.nodeBorder}; }
+        .arrow${P} { stroke: ${i.nodeBorder}; }
+        .commit-bullets { fill: ${i.nodeBorder}; }
+        .commit-cherry-pick${P} { stroke: ${i.nodeBorder}; }
+        ${genGitGraphGradient(i)}`;
 		else {
-			let r = n % Q;
-			t += `
-        .branch-label${n} { fill: ${e["gitBranchLabel" + r]}; }
-        .commit${n} { stroke: ${e["git" + r]}; fill: ${e["git" + r]}; }
-        .commit-highlight${n} { stroke: ${e["gitInv" + r]}; fill: ${e["gitInv" + r]}; }
-        .arrow${n} { stroke: ${e["git" + r]}; }
+			let F = P % GIT_NAMED_COLOR_COUNT;
+			N += `
+        .branch-label${P} { fill: ${i["gitBranchLabel" + F]}; }
+        .commit${P} { stroke: ${i["git" + F]}; fill: ${i["git" + F]}; }
+        .commit-highlight${P} { stroke: ${i["gitInv" + F]}; fill: ${i["gitInv" + F]}; }
+        .arrow${P} { stroke: ${i["git" + F]}; }
         `;
 		}
-		return t;
-	} else if (Be.has(t)) {
-		let n = "";
-		for (let a = 0; a < e.THEME_COLOR_LIMIT; a++) if (a === 0) n += `
-        .branch-label${a} { fill: ${e.nodeBorder}; ${i ? `font-weight:${e.noteFontWeight}` : ""} }
-        .commit${a} { stroke: ${e.nodeBorder}; }
-        .commit-highlight${a} { stroke: ${e.nodeBorder}; fill: ${e.mainBkg}; }
-        .label${a}  { fill: ${e.mainBkg}; stroke: ${e.nodeBorder}; stroke-width: ${e.strokeWidth}; ${i ? `font-weight:${e.noteFontWeight}` : ""} }
-        .arrow${a} { stroke: ${e.nodeBorder}; }
-        .commit-bullets { fill: ${e.nodeBorder}; }
+		return N;
+	} else if (COLOR_THEMES2.has(N)) {
+		let P = "";
+		for (let L = 0; L < i.THEME_COLOR_LIMIT; L++) if (L === 0) P += `
+        .branch-label${L} { fill: ${i.nodeBorder}; ${I ? `font-weight:${i.noteFontWeight}` : ""} }
+        .commit${L} { stroke: ${i.nodeBorder}; }
+        .commit-highlight${L} { stroke: ${i.nodeBorder}; fill: ${i.mainBkg}; }
+        .label${L}  { fill: ${i.mainBkg}; stroke: ${i.nodeBorder}; stroke-width: ${i.strokeWidth}; ${I ? `font-weight:${i.noteFontWeight}` : ""} }
+        .arrow${L} { stroke: ${i.nodeBorder}; }
+        .commit-bullets { fill: ${i.nodeBorder}; }
         `;
 		else {
-			let o = a % r.length;
-			n += `
-        .branch-label${a} { fill: ${e.nodeBorder}; ${i ? `font-weight:${e.noteFontWeight}` : ""} }
-        .commit${a} { stroke: ${r[o]}; fill: ${r[o]}; }
-        .commit-highlight${a} { stroke: ${r[o]}; fill: ${r[o]}; }
-        .label${a}  { fill: ${He.has(t) ? e.mainBkg : r[o]}; stroke: ${r[o]};  stroke-width: ${e.strokeWidth}; }
-        .arrow${a} { stroke: ${r[o]}; }
+			let R = L % F.length;
+			P += `
+        .branch-label${L} { fill: ${i.nodeBorder}; ${I ? `font-weight:${i.noteFontWeight}` : ""} }
+        .commit${L} { stroke: ${F[R]}; fill: ${F[R]}; }
+        .commit-highlight${L} { stroke: ${F[R]}; fill: ${F[R]}; }
+        .label${L}  { fill: ${DARK_THEMES2.has(N) ? i.mainBkg : F[R]}; stroke: ${F[R]};  stroke-width: ${i.strokeWidth}; }
+        .arrow${L} { stroke: ${F[R]}; }
         `;
 		}
-		return n;
+		return P;
 	} else {
-		let t = "";
-		for (let n = 0; n < e.THEME_COLOR_LIMIT; n++) t += `
-        .branch-label${n} { fill: ${e.nodeBorder}; ${i ? `font-weight:${e.noteFontWeight}` : ""} }
-        .commit${n} { stroke: ${e.nodeBorder};   }
-        .commit-highlight${n} { stroke: ${e.nodeBorder}; fill: ${e.nodeBorder}; }
-        .label${n}  { fill: ${e.mainBkg}; stroke: ${e.nodeBorder}; stroke-width: ${e.strokeWidth}; ${i ? `font-weight:${e.noteFontWeight}` : ""}}
-        .arrow${n} { stroke: ${e.nodeBorder}; }
-        .commit-bullets { fill: ${e.nodeBorder}; }
-        .commit-cherry-pick${n} { stroke: ${e.nodeBorder}; }
+		let N = "";
+		for (let P = 0; P < i.THEME_COLOR_LIMIT; P++) N += `
+        .branch-label${P} { fill: ${i.nodeBorder}; ${I ? `font-weight:${i.noteFontWeight}` : ""} }
+        .commit${P} { stroke: ${i.nodeBorder};   }
+        .commit-highlight${P} { stroke: ${i.nodeBorder}; fill: ${i.nodeBorder}; }
+        .label${P}  { fill: ${i.mainBkg}; stroke: ${i.nodeBorder}; stroke-width: ${i.strokeWidth}; ${I ? `font-weight:${i.noteFontWeight}` : ""}}
+        .arrow${P} { stroke: ${i.nodeBorder}; }
+        .commit-bullets { fill: ${i.nodeBorder}; }
+        .commit-cherry-pick${P} { stroke: ${i.nodeBorder}; }
         `;
-		return t;
+		return N;
 	}
-}, "genColor"), Ke = /* @__PURE__ */ e((e) => `${Array.from({ length: e.THEME_COLOR_LIMIT }, (e, t) => t).map((t) => {
-	let n = t % Q;
+}, "genColor"), normalTheme = /* @__PURE__ */ __name((i) => `${Array.from({ length: i.THEME_COLOR_LIMIT }, (i, N) => N).map((N) => {
+	let P = N % GIT_NAMED_COLOR_COUNT;
 	return `
-        .branch-label${t} { fill: ${e["gitBranchLabel" + n]}; }
-        .commit${t} { stroke: ${e["git" + n]}; fill: ${e["git" + n]}; }
-        .commit-highlight${t} { stroke: ${e["gitInv" + n]}; fill: ${e["gitInv" + n]}; }
-        .label${t}  { fill: ${e["git" + n]}; }
-        .arrow${t} { stroke: ${e["git" + n]}; }
+        .branch-label${N} { fill: ${i["gitBranchLabel" + P]}; }
+        .commit${N} { stroke: ${i["git" + P]}; fill: ${i["git" + P]}; }
+        .commit-highlight${N} { stroke: ${i["gitInv" + P]}; fill: ${i["gitInv" + P]}; }
+        .label${N}  { fill: ${i["git" + P]}; }
+        .arrow${N} { stroke: ${i["git" + P]}; }
         `;
-}).join("\n")}`, "normalTheme"), qe = {
-	parser: be,
-	db: A,
-	renderer: ze,
-	styles: /* @__PURE__ */ e((e) => {
-		let { theme: t } = s(), n = Ue.has(t);
+}).join("\n")}`, "normalTheme"), diagram = {
+	parser,
+	db,
+	renderer: gitGraphRenderer_default,
+	styles: /* @__PURE__ */ __name((i) => {
+		let { theme: N } = getConfig(), P = NEO_COLOR_GEN_THEMES.has(N);
 		return `
   .commit-id,
   .commit-msg,
@@ -683,48 +682,47 @@ var ce = /* @__PURE__ */ e(function() {
     font-family: var(--mermaid-font-family);
   }
   
-  ${n ? Ge(e) : Ke(e)}
+  ${P ? genColor(i) : normalTheme(i)}
 
   .branch {
-    stroke-width: ${e.strokeWidth};
-    stroke: ${e.commitLineColor ?? e.lineColor};
-    stroke-dasharray:  ${n ? "4 2" : "2"};
+    stroke-width: ${i.strokeWidth};
+    stroke: ${i.commitLineColor ?? i.lineColor};
+    stroke-dasharray:  ${P ? "4 2" : "2"};
   }
-  .commit-label { font-size: ${e.commitLabelFontSize}; fill: ${n ? e.nodeBorder : e.commitLabelColor}; ${n ? `font-weight:${e.noteFontWeight};` : ""}}
-  .commit-label-bkg { font-size: ${e.commitLabelFontSize}; fill: ${n ? "transparent" : e.commitLabelBackground}; opacity: ${n ? "" : .5};  }
-  .tag-label { font-size: ${e.tagLabelFontSize}; fill: ${e.tagLabelColor};}
-  .tag-label-bkg { fill: ${n ? e.mainBkg : e.tagLabelBackground}; stroke: ${n ? e.nodeBorder : e.tagLabelBorder}; ${n ? `filter:${e.dropShadow}` : ""}  }
-  .tag-hole { fill: ${e.textColor}; }
+  .commit-label { font-size: ${i.commitLabelFontSize}; fill: ${P ? i.nodeBorder : i.commitLabelColor}; ${P ? `font-weight:${i.noteFontWeight};` : ""}}
+  .commit-label-bkg { font-size: ${i.commitLabelFontSize}; fill: ${P ? "transparent" : i.commitLabelBackground}; opacity: ${P ? "" : .5};  }
+  .tag-label { font-size: ${i.tagLabelFontSize}; fill: ${i.tagLabelColor};}
+  .tag-label-bkg { fill: ${P ? i.mainBkg : i.tagLabelBackground}; stroke: ${P ? i.nodeBorder : i.tagLabelBorder}; ${P ? `filter:${i.dropShadow}` : ""}  }
+  .tag-hole { fill: ${i.textColor}; }
 
   .commit-merge {
-    stroke: ${n ? e.mainBkg : e.primaryColor};
-    fill: ${n ? e.mainBkg : e.primaryColor};
+    stroke: ${P ? i.mainBkg : i.primaryColor};
+    fill: ${P ? i.mainBkg : i.primaryColor};
   }
   .commit-reverse {
-    stroke: ${n ? e.mainBkg : e.primaryColor};
-    fill: ${n ? e.mainBkg : e.primaryColor};
-    stroke-width: ${n ? e.strokeWidth : 3};
+    stroke: ${P ? i.mainBkg : i.primaryColor};
+    fill: ${P ? i.mainBkg : i.primaryColor};
+    stroke-width: ${P ? i.strokeWidth : 3};
   }
   .commit-highlight-outer {
   }
   .commit-highlight-inner {
-    stroke: ${n ? e.mainBkg : e.primaryColor};
-    fill: ${n ? e.mainBkg : e.primaryColor};
+    stroke: ${P ? i.mainBkg : i.primaryColor};
+    fill: ${P ? i.mainBkg : i.primaryColor};
   }
 
   .arrow {
     /* Intentional: neo themes keep the bold 8px arrow (like classic themes); only redux-geometry themes use the thinner options.strokeWidth. */
-    stroke-width: ${$.has(t) ? e.strokeWidth : 8};
+    stroke-width: ${REDUX_GEOMETRY_THEMES2.has(N) ? i.strokeWidth : 8};
     stroke-linecap: round;
     fill: none
   }
   .gitTitleText {
     text-anchor: middle;
     font-size: 18px;
-    fill: ${e.textColor};
+    fill: ${i.textColor};
   }
 `;
 	}, "getStyles")
 };
-//#endregion
-export { qe as diagram };
+export { diagram };