@aiderdesk/aiderdesk 0.61.0-dev → 0.61.1

package/out/renderer/assets/{gitGraphDiagram-K3NZZRJ6-CBQnBjEi.js → gitGraphDiagram-UUTBAWPF-De2eCfMN.js}

@@ -1,10 +1,9 @@
-import { p as populateCommonDb } from "./chunk-4BX2VUAB-ChcKNpL6.js";
-import { I as ImperativeState } from "./chunk-QZHKN3VN-8BpGifjS.js";
-import { q as getDiagramTitle, p as setDiagramTitle, s as setAccDescription, g as getAccDescription, a as getAccTitle, b as setAccTitle, _ as __name, l as log, d as select, u as utils_default, D as setupGraphViewbox2, z as clear, k as common_default, E as cleanAndMerge, F as defaultConfig_default, G as getConfig, H as random } from "./index-MDHavDF9.js";
-import { p as parse } from "./treemap-KZPCXAKY-W2a2L6ff.js";
-import "./_baseUniq-Z8t1Ab1g.js";
-import "./_basePickBy-BWoXHZ8Z.js";
-import "./clone-D9a-uIZa.js";
+import { p as populateCommonDb } from "./chunk-4BX2VUAB-0KM14cFd.js";
+import { I as ImperativeState } from "./chunk-QZHKN3VN-BT8kABWC.js";
+import { q as getDiagramTitle, p as setDiagramTitle, s as setAccDescription, g as getAccDescription, a as getAccTitle, b as setAccTitle, _ as __name, D as getConfig, l as log, d as select, c as getConfig2, u as utils_default, E as setupGraphViewbox2, z as clear, k as common_default, F as cleanAndMerge, G as defaultConfig_default, H as random } from "./index-BL-57WPa.js";
+import { p as parse } from "./wardley-RL74JXVD-DTbxPMj9.js";
+import "./min-DB8ixvoT.js";
+import "./_baseUniq-BPF2Herp.js";
 var commitType = {
   NORMAL: 0,
   REVERSE: 1,
@@ -13,7 +12,7 @@ var commitType = {
   CHERRY_PICK: 4
 };
 var DEFAULT_GITGRAPH_CONFIG = defaultConfig_default.gitGraph;
-var getConfig2 = /* @__PURE__ */ __name(() => {
+var getConfig3 = /* @__PURE__ */ __name(() => {
   const config = cleanAndMerge({
     ...DEFAULT_GITGRAPH_CONFIG,
     ...getConfig().gitGraph
@@ -21,7 +20,7 @@ var getConfig2 = /* @__PURE__ */ __name(() => {
   return config;
 }, "getConfig");
 var state = new ImperativeState(() => {
-  const config = getConfig2();
+  const config = getConfig3();
   const mainBranchName = config.mainBranchName;
   const mainBranchOrder = config.mainBranchOrder;
   return {
@@ -75,7 +74,7 @@ var commit = /* @__PURE__ */ __name(function(commitDB) {
   let tags = commitDB.tags;
   log.info("commit", msg, id, type, tags);
   log.debug("Entering commit:", msg, id, type, tags);
-  const config = getConfig2();
+  const config = getConfig3();
   id = common_default.sanitizeText(id, config);
   msg = common_default.sanitizeText(msg, config);
   tags = tags?.map((tag) => common_default.sanitizeText(tag, config));
@@ -100,7 +99,7 @@ var commit = /* @__PURE__ */ __name(function(commitDB) {
 var branch = /* @__PURE__ */ __name(function(branchDB) {
   let name = branchDB.name;
   const order = branchDB.order;
-  name = common_default.sanitizeText(name, getConfig2());
+  name = common_default.sanitizeText(name, getConfig3());
   if (state.records.branches.has(name)) {
     throw new Error(
       `Trying to create an existing branch. (Help: Either use a new name if you want create a new branch or try using "checkout ${name}")`
@@ -116,7 +115,7 @@ var merge = /* @__PURE__ */ __name((mergeDB) => {
   let customId = mergeDB.id;
   const overrideType = mergeDB.type;
   const customTags = mergeDB.tags;
-  const config = getConfig2();
+  const config = getConfig3();
   otherBranch = common_default.sanitizeText(otherBranch, config);
   if (customId) {
     customId = common_default.sanitizeText(customId, config);
@@ -216,7 +215,7 @@ var cherryPick = /* @__PURE__ */ __name(function(cherryPickDB) {
   let tags = cherryPickDB.tags;
   let parentCommitId = cherryPickDB.parent;
   log.debug("Entering cherryPick:", sourceId, targetId, tags);
-  const config = getConfig2();
+  const config = getConfig3();
   sourceId = common_default.sanitizeText(sourceId, config);
   targetId = common_default.sanitizeText(targetId, config);
   tags = tags?.map((tag) => common_default.sanitizeText(tag, config));
@@ -304,7 +303,7 @@ var cherryPick = /* @__PURE__ */ __name(function(cherryPickDB) {
   }
 }, "cherryPick");
 var checkout = /* @__PURE__ */ __name(function(branch2) {
-  branch2 = common_default.sanitizeText(branch2, getConfig2());
+  branch2 = common_default.sanitizeText(branch2, getConfig3());
   if (!state.records.branches.has(branch2)) {
     const error = new Error(
       `Trying to checkout branch which is not yet created. (Help try using "branch ${branch2}")`
@@ -420,7 +419,7 @@ var getHead = /* @__PURE__ */ __name(function() {
 }, "getHead");
 var db = {
   commitType,
-  getConfig: getConfig2,
+  getConfig: getConfig3,
   setDirection,
   setOptions,
   getOptions,
@@ -520,6 +519,16 @@ var COMMIT_STEP = 40;
 var PX = 4;
 var PY = 2;
 var THEME_COLOR_LIMIT = 8;
+var REDUX_GEOMETRY_THEMES = /* @__PURE__ */ new Set(["redux", "redux-dark", "redux-color", "redux-dark-color"]);
+var REDUX_BRANCH_LABEL_PADDING_Y = 12;
+var COLOR_THEMES = /* @__PURE__ */ new Set(["redux-color", "redux-dark-color"]);
+var DARK_THEMES = /* @__PURE__ */ new Set(["dark", "redux-dark", "redux-dark-color", "neo-dark"]);
+var calcColorIndex = /* @__PURE__ */ __name((rawIndex, limit, avoidDefaultColor = false) => {
+  if (avoidDefaultColor && rawIndex > 0) {
+    return (rawIndex - 1) % (limit - 1) + 1;
+  }
+  return rawIndex % limit;
+}, "calcColorIndex");
 var branchPos = /* @__PURE__ */ new Map();
 var commitPos = /* @__PURE__ */ new Map();
 var defaultPos = 30;
@@ -651,43 +660,54 @@ var setRootPosition = /* @__PURE__ */ __name((commit2, curPos, defaultPos2) => {
   commitPos.set(commit2.id, { x, y });
 }, "setRootPosition");
 var drawCommitBullet = /* @__PURE__ */ __name((gBullets, commit2, commitPosition, typeClass, branchIndex, commitSymbolType) => {
+  const { theme } = getConfig2();
+  const useReduxGeometry = REDUX_GEOMETRY_THEMES.has(theme ?? "");
+  const useColorTheme = COLOR_THEMES.has(theme ?? "");
+  const isDark = DARK_THEMES.has(theme ?? "");
   if (commitSymbolType === commitType.HIGHLIGHT) {
-    gBullets.append("rect").attr("x", commitPosition.x - 10).attr("y", commitPosition.y - 10).attr("width", 20).attr("height", 20).attr(
+    gBullets.append("rect").attr("x", commitPosition.x - 10 + (useReduxGeometry ? 3 : 0)).attr("y", commitPosition.y - 10 + (useReduxGeometry ? 3 : 0)).attr("width", useReduxGeometry ? 14 : 20).attr("height", useReduxGeometry ? 14 : 20).attr(
       "class",
-      `commit ${commit2.id} commit-highlight${branchIndex % THEME_COLOR_LIMIT} ${typeClass}-outer`
+      `commit ${commit2.id} commit-highlight${calcColorIndex(branchIndex, THEME_COLOR_LIMIT, useColorTheme)} ${typeClass}-outer`
     );
-    gBullets.append("rect").attr("x", commitPosition.x - 6).attr("y", commitPosition.y - 6).attr("width", 12).attr("height", 12).attr(
+    gBullets.append("rect").attr("x", commitPosition.x - 6 + (useReduxGeometry ? 2 : 0)).attr("y", commitPosition.y - 6 + (useReduxGeometry ? 2 : 0)).attr("width", useReduxGeometry ? 8 : 12).attr("height", useReduxGeometry ? 8 : 12).attr(
       "class",
-      `commit ${commit2.id} commit${branchIndex % THEME_COLOR_LIMIT} ${typeClass}-inner`
+      `commit ${commit2.id} commit${calcColorIndex(branchIndex, THEME_COLOR_LIMIT, useColorTheme)} ${typeClass}-inner`
     );
   } else if (commitSymbolType === commitType.CHERRY_PICK) {
-    gBullets.append("circle").attr("cx", commitPosition.x).attr("cy", commitPosition.y).attr("r", 10).attr("class", `commit ${commit2.id} ${typeClass}`);
-    gBullets.append("circle").attr("cx", commitPosition.x - 3).attr("cy", commitPosition.y + 2).attr("r", 2.75).attr("fill", "#fff").attr("class", `commit ${commit2.id} ${typeClass}`);
-    gBullets.append("circle").attr("cx", commitPosition.x + 3).attr("cy", commitPosition.y + 2).attr("r", 2.75).attr("fill", "#fff").attr("class", `commit ${commit2.id} ${typeClass}`);
-    gBullets.append("line").attr("x1", commitPosition.x + 3).attr("y1", commitPosition.y + 1).attr("x2", commitPosition.x).attr("y2", commitPosition.y - 5).attr("stroke", "#fff").attr("class", `commit ${commit2.id} ${typeClass}`);
-    gBullets.append("line").attr("x1", commitPosition.x - 3).attr("y1", commitPosition.y + 1).attr("x2", commitPosition.x).attr("y2", commitPosition.y - 5).attr("stroke", "#fff").attr("class", `commit ${commit2.id} ${typeClass}`);
+    gBullets.append("circle").attr("cx", commitPosition.x).attr("cy", commitPosition.y).attr("r", useReduxGeometry ? 7 : 10).attr("class", `commit ${commit2.id} ${typeClass}`);
+    gBullets.append("circle").attr("cx", commitPosition.x - 3).attr("cy", commitPosition.y + 2).attr("r", useReduxGeometry ? 2.5 : 2.75).attr("fill", isDark ? "#000000" : "#fff").attr("class", `commit ${commit2.id} ${typeClass}`);
+    gBullets.append("circle").attr("cx", commitPosition.x + 3).attr("cy", commitPosition.y + 2).attr("r", useReduxGeometry ? 2.5 : 2.75).attr("fill", isDark ? "#000000" : "#fff").attr("class", `commit ${commit2.id} ${typeClass}`);
+    gBullets.append("line").attr("x1", commitPosition.x + 3).attr("y1", commitPosition.y + 1).attr("x2", commitPosition.x).attr("y2", commitPosition.y - 5).attr("stroke", isDark ? "#000000" : "#fff").attr("class", `commit ${commit2.id} ${typeClass}`);
+    gBullets.append("line").attr("x1", commitPosition.x - 3).attr("y1", commitPosition.y + 1).attr("x2", commitPosition.x).attr("y2", commitPosition.y - 5).attr("stroke", isDark ? "#000000" : "#fff").attr("class", `commit ${commit2.id} ${typeClass}`);
   } else {
     const circle = gBullets.append("circle");
     circle.attr("cx", commitPosition.x);
     circle.attr("cy", commitPosition.y);
-    circle.attr("r", commit2.type === commitType.MERGE ? 9 : 10);
-    circle.attr("class", `commit ${commit2.id} commit${branchIndex % THEME_COLOR_LIMIT}`);
+    circle.attr("r", useReduxGeometry ? 7 : 10);
+    circle.attr(
+      "class",
+      `commit ${commit2.id} commit${calcColorIndex(branchIndex, THEME_COLOR_LIMIT, useColorTheme)}`
+    );
     if (commitSymbolType === commitType.MERGE) {
       const circle2 = gBullets.append("circle");
       circle2.attr("cx", commitPosition.x);
       circle2.attr("cy", commitPosition.y);
-      circle2.attr("r", 6);
+      circle2.attr("r", useReduxGeometry ? 5 : 6);
       circle2.attr(
         "class",
-        `commit ${typeClass} ${commit2.id} commit${branchIndex % THEME_COLOR_LIMIT}`
+        `commit ${typeClass} ${commit2.id} commit${calcColorIndex(branchIndex, THEME_COLOR_LIMIT, useColorTheme)}`
       );
     }
     if (commitSymbolType === commitType.REVERSE) {
       const cross = gBullets.append("path");
+      const constValue = useReduxGeometry ? 4 : 5;
       cross.attr(
         "d",
-        `M ${commitPosition.x - 5},${commitPosition.y - 5}L${commitPosition.x + 5},${commitPosition.y + 5}M${commitPosition.x - 5},${commitPosition.y + 5}L${commitPosition.x + 5},${commitPosition.y - 5}`
-      ).attr("class", `commit ${typeClass} ${commit2.id} commit${branchIndex % THEME_COLOR_LIMIT}`);
+        `M ${commitPosition.x - constValue},${commitPosition.y - constValue}L${commitPosition.x + constValue},${commitPosition.y + constValue}M${commitPosition.x - constValue},${commitPosition.y + constValue}L${commitPosition.x + constValue},${commitPosition.y - constValue}`
+      ).attr(
+        "class",
+        `commit ${typeClass} ${commit2.id} commit${calcColorIndex(branchIndex, THEME_COLOR_LIMIT, useColorTheme)}`
+      );
     }
   }
 }, "drawCommitBullet");
@@ -830,11 +850,13 @@ var calculatePosition = /* @__PURE__ */ __name((commit2, dir2, pos, commitPos2)
 }, "calculatePosition");
 var getCommitPosition = /* @__PURE__ */ __name((commit2, pos, isParallelCommits) => {
   const posWithOffset = dir === "BT" && isParallelCommits ? pos : pos + LAYOUT_OFFSET;
-  const y = dir === "TB" || dir === "BT" ? posWithOffset : branchPos.get(commit2.branch)?.pos;
+  const branchY = branchPos.get(commit2.branch)?.pos;
   const x = dir === "TB" || dir === "BT" ? branchPos.get(commit2.branch)?.pos : posWithOffset;
-  if (x === void 0 || y === void 0) {
+  if (x === void 0 || branchY === void 0) {
     throw new Error(`Position were undefined for commit ${commit2.id}`);
   }
+  const useReduxGeometry = REDUX_GEOMETRY_THEMES.has(getConfig2().theme ?? "");
+  const y = dir === "TB" || dir === "BT" ? posWithOffset : branchY + (useReduxGeometry ? REDUX_BRANCH_LABEL_PADDING_Y / 2 + 1 : -2);
   return { x, y, posWithOffset };
 }, "getCommitPosition");
 var drawCommits = /* @__PURE__ */ __name((svg, commits, modifyGraph, gitGraphConfig) => {
@@ -906,6 +928,8 @@ var findLane = /* @__PURE__ */ __name((y1, y2, depth = 0) => {
   return findLane(y1, y2 - diff / 5, depth + 1);
 }, "findLane");
 var drawArrow = /* @__PURE__ */ __name((svg, commitA, commitB, allCommits) => {
+  const { theme: arrowTheme } = getConfig2();
+  const useColorTheme = COLOR_THEMES.has(arrowTheme ?? "");
   const p1 = commitPos.get(commitA.id);
   const p2 = commitPos.get(commitB.id);
   if (p1 === void 0 || p2 === void 0) {
@@ -1022,7 +1046,10 @@ var drawArrow = /* @__PURE__ */ __name((svg, commitA, commitB, allCommits) => {
   if (lineDef === void 0) {
     throw new Error("Line definition not found");
   }
-  svg.append("path").attr("d", lineDef).attr("class", "arrow arrow" + colorClassNum % THEME_COLOR_LIMIT);
+  svg.append("path").attr("d", lineDef).attr(
+    "class",
+    "arrow arrow" + calcColorIndex(colorClassNum, THEME_COLOR_LIMIT, useColorTheme)
+  );
 }, "drawArrow");
 var drawArrows = /* @__PURE__ */ __name((svg, commits) => {
   const gArrows = svg.append("g").attr("class", "commit-arrows");
@@ -1035,19 +1062,28 @@ var drawArrows = /* @__PURE__ */ __name((svg, commits) => {
     }
   });
 }, "drawArrows");
-var drawBranches = /* @__PURE__ */ __name((svg, branches, gitGraphConfig) => {
+var drawBranches = /* @__PURE__ */ __name((svg, branches, gitGraphConfig, id) => {
+  const { look, theme, themeVariables } = getConfig2();
+  const { dropShadow, THEME_COLOR_LIMIT: themeColorLimit } = themeVariables;
+  const useReduxGeometry = REDUX_GEOMETRY_THEMES.has(theme ?? "");
+  const useColorTheme = COLOR_THEMES.has(theme ?? "");
   const g = svg.append("g");
   branches.forEach((branch2, index) => {
-    const adjustIndexForTheme = index % THEME_COLOR_LIMIT;
+    const adjustIndexForTheme = calcColorIndex(
+      index,
+      useReduxGeometry ? themeColorLimit : THEME_COLOR_LIMIT,
+      useColorTheme
+    );
     const pos = branchPos.get(branch2.name)?.pos;
     if (pos === void 0) {
       throw new Error(`Position not found for branch ${branch2.name}`);
     }
+    const spineY = dir === "TB" || dir === "BT" ? pos : useReduxGeometry ? pos + REDUX_BRANCH_LABEL_PADDING_Y / 2 + 1 : pos - 2;
     const line = g.append("line");
     line.attr("x1", 0);
-    line.attr("y1", pos);
+    line.attr("y1", spineY);
     line.attr("x2", maxPos);
-    line.attr("y2", pos);
+    line.attr("y2", spineY);
     line.attr("class", "branch branch" + adjustIndexForTheme);
     if (dir === "TB") {
       line.attr("y1", defaultPos);
@@ -1060,7 +1096,7 @@ var drawBranches = /* @__PURE__ */ __name((svg, branches, gitGraphConfig) => {
       line.attr("y2", defaultPos);
       line.attr("x2", pos);
     }
-    lanes.push(pos);
+    lanes.push(spineY);
     const name = branch2.name;
     const labelElement = drawText(name);
     const bkg = g.insert("rect");
@@ -1068,19 +1104,42 @@ var drawBranches = /* @__PURE__ */ __name((svg, branches, gitGraphConfig) => {
     const label = branchLabel.insert("g").attr("class", "label branch-label" + adjustIndexForTheme);
     label.node().appendChild(labelElement);
     const bbox = labelElement.getBBox();
-    bkg.attr("class", "branchLabelBkg label" + adjustIndexForTheme).attr("rx", 4).attr("ry", 4).attr("x", -bbox.width - 4 - (gitGraphConfig.rotateCommitLabel === true ? 30 : 0)).attr("y", -bbox.height / 2 + 8).attr("width", bbox.width + 18).attr("height", bbox.height + 4);
+    const borderRadius = useReduxGeometry ? 0 : 4;
+    const labelPaddingX = useReduxGeometry ? 16 : 0;
+    const labelPaddingY = useReduxGeometry ? REDUX_BRANCH_LABEL_PADDING_Y : 0;
+    if (look === "neo") {
+      bkg.attr("data-look", `neo`);
+    }
+    bkg.attr("class", "branchLabelBkg label" + adjustIndexForTheme).attr(
+      "style",
+      look === "neo" ? `filter:${useReduxGeometry ? `url(#${id}-drop-shadow)` : dropShadow}` : ""
+    ).attr("rx", borderRadius).attr("ry", borderRadius).attr("x", -bbox.width - 4 - (gitGraphConfig.rotateCommitLabel === true ? 30 : 0)).attr("y", -bbox.height / 2 + 10).attr("width", bbox.width + 18 + labelPaddingX).attr("height", bbox.height + 4 + labelPaddingY);
     label.attr(
       "transform",
-      "translate(" + (-bbox.width - 14 - (gitGraphConfig.rotateCommitLabel === true ? 30 : 0)) + ", " + (pos - bbox.height / 2 - 1) + ")"
+      "translate(" + (-bbox.width - 14 - (gitGraphConfig.rotateCommitLabel === true ? 30 : 0) + labelPaddingX / 2) + ", " + (spineY - bbox.height / 2 - 2) + ")"
     );
     if (dir === "TB") {
       bkg.attr("x", pos - bbox.width / 2 - 10).attr("y", 0);
       label.attr("transform", "translate(" + (pos - bbox.width / 2 - 5) + ", 0)");
+      if (useReduxGeometry) {
+        bkg.attr("transform", `translate(${-labelPaddingX / 2 - 3}, ${-labelPaddingY - 10})`);
+        label.attr(
+          "transform",
+          "translate(" + (pos - bbox.width / 2 - 5) + ", " + (-labelPaddingY * 2 + 7) + ")"
+        );
+      }
     } else if (dir === "BT") {
       bkg.attr("x", pos - bbox.width / 2 - 10).attr("y", maxPos);
       label.attr("transform", "translate(" + (pos - bbox.width / 2 - 5) + ", " + maxPos + ")");
+      if (useReduxGeometry) {
+        bkg.attr("transform", `translate(${-labelPaddingX / 2 - 3}, ${labelPaddingY + 10})`);
+        label.attr(
+          "transform",
+          "translate(" + (pos - bbox.width / 2 - 5) + ", " + (maxPos + labelPaddingY * 2 + 4) + ")"
+        );
+      }
     } else {
-      bkg.attr("transform", "translate(-19, " + (pos - bbox.height / 2) + ")");
+      bkg.attr("transform", "translate(-19, " + (spineY - 12 - labelPaddingY / 2) + ")");
     }
   });
 }, "drawBranches");
@@ -1103,6 +1162,16 @@ var draw = /* @__PURE__ */ __name(function(txt, id, ver, diagObj) {
   const branches = db2.getBranchesAsObjArray();
   dir = db2.getDirection();
   const diagram2 = select(`[id="${id}"]`);
+  const { look, theme, themeVariables } = getConfig2();
+  const { useGradient, gradientStart, gradientStop, filterColor } = themeVariables;
+  if (useGradient) {
+    const gradient = diagram2.append("defs").append("linearGradient").attr("id", id + "-gradient").attr("gradientUnits", "objectBoundingBox").attr("x1", "0%").attr("y1", "0%").attr("x2", "100%").attr("y2", "0%");
+    gradient.append("stop").attr("offset", "0%").attr("stop-color", gradientStart).attr("stop-opacity", 1);
+    gradient.append("stop").attr("offset", "100%").attr("stop-color", gradientStop).attr("stop-opacity", 1);
+  }
+  if (look === "neo" && REDUX_GEOMETRY_THEMES.has(theme ?? "")) {
+    diagram2.append("defs").append("filter").attr("id", id + "-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", filterColor);
+  }
   let pos = 0;
   branches.forEach((branch2, index) => {
     const labelElement = drawText(branch2.name);
@@ -1118,7 +1187,7 @@ var draw = /* @__PURE__ */ __name(function(txt, id, ver, diagObj) {
   });
   drawCommits(diagram2, allCommitsDict, false, gitGraphConfig);
   if (gitGraphConfig.showBranches) {
-    drawBranches(diagram2, branches, gitGraphConfig);
+    drawBranches(diagram2, branches, gitGraphConfig, id);
   }
   drawArrows(diagram2, allCommitsDict);
   drawCommits(diagram2, allCommitsDict, true, gitGraphConfig);
@@ -1133,7 +1202,116 @@ var draw = /* @__PURE__ */ __name(function(txt, id, ver, diagObj) {
 var gitGraphRenderer_default = {
   draw
 };
-var getStyles = /* @__PURE__ */ __name((options) => `
+var GIT_NAMED_COLOR_COUNT = 8;
+var REDUX_GEOMETRY_THEMES2 = /* @__PURE__ */ new Set(["redux", "redux-dark", "redux-color", "redux-dark-color"]);
+var COLOR_THEMES2 = /* @__PURE__ */ new Set(["redux-color", "redux-dark-color"]);
+var NEO_THEMES = /* @__PURE__ */ new Set(["neo", "neo-dark"]);
+var DARK_THEMES2 = /* @__PURE__ */ new Set(["dark", "redux-dark", "redux-dark-color", "neo-dark"]);
+var NEO_COLOR_GEN_THEMES = /* @__PURE__ */ new Set([
+  "redux",
+  "redux-dark",
+  "redux-color",
+  "redux-dark-color",
+  "neo",
+  "neo-dark"
+]);
+var genGitGraphGradient = /* @__PURE__ */ __name((options) => {
+  const { svgId } = options;
+  let sections = "";
+  if (options.useGradient && svgId) {
+    for (let i = 0; i < options.THEME_COLOR_LIMIT; i++) {
+      sections += `
+      .label${i}  { fill: ${options.mainBkg}; stroke: url(${svgId}-gradient); stroke-width: ${options.strokeWidth};}
+             `;
+    }
+  }
+  return sections;
+}, "genGitGraphGradient");
+var genColor = /* @__PURE__ */ __name((options) => {
+  const config = getConfig();
+  const { theme, themeVariables } = config;
+  const { borderColorArray } = themeVariables;
+  const useReduxGeometry = REDUX_GEOMETRY_THEMES2.has(theme);
+  if (NEO_THEMES.has(theme)) {
+    let sections = "";
+    for (let i = 0; i < options.THEME_COLOR_LIMIT; i++) {
+      if (i === 0) {
+        sections += `
+        .branch-label${i} { fill: ${options.nodeBorder};}
+        .commit${i} { stroke: ${options.nodeBorder};   }
+        .commit-highlight${i} { stroke: ${options.nodeBorder}; fill: ${options.nodeBorder}; }
+        .arrow${i} { stroke: ${options.nodeBorder}; }
+        .commit-bullets { fill: ${options.nodeBorder}; }
+        .commit-cherry-pick${i} { stroke: ${options.nodeBorder}; }
+        ${genGitGraphGradient(options)}`;
+      } else {
+        const ci = i % GIT_NAMED_COLOR_COUNT;
+        sections += `
+        .branch-label${i} { fill: ${options["gitBranchLabel" + ci]}; }
+        .commit${i} { stroke: ${options["git" + ci]}; fill: ${options["git" + ci]}; }
+        .commit-highlight${i} { stroke: ${options["gitInv" + ci]}; fill: ${options["gitInv" + ci]}; }
+        .arrow${i} { stroke: ${options["git" + ci]}; }
+        `;
+      }
+    }
+    return sections;
+  } else if (!COLOR_THEMES2.has(theme)) {
+    let sections = "";
+    for (let i = 0; i < options.THEME_COLOR_LIMIT; i++) {
+      sections += `
+        .branch-label${i} { fill: ${options.nodeBorder}; ${useReduxGeometry ? `font-weight:${options.noteFontWeight}` : ""} }
+        .commit${i} { stroke: ${options.nodeBorder};   }
+        .commit-highlight${i} { stroke: ${options.nodeBorder}; fill: ${options.nodeBorder}; }
+        .label${i}  { fill: ${options.mainBkg}; stroke: ${options.nodeBorder}; stroke-width: ${options.strokeWidth}; ${useReduxGeometry ? `font-weight:${options.noteFontWeight}` : ""}}
+        .arrow${i} { stroke: ${options.nodeBorder}; }
+        .commit-bullets { fill: ${options.nodeBorder}; }
+        .commit-cherry-pick${i} { stroke: ${options.nodeBorder}; }
+        `;
+    }
+    return sections;
+  } else {
+    let sections = "";
+    for (let i = 0; i < options.THEME_COLOR_LIMIT; i++) {
+      if (i === 0) {
+        sections += `
+        .branch-label${i} { fill: ${options.nodeBorder}; ${useReduxGeometry ? `font-weight:${options.noteFontWeight}` : ""} }
+        .commit${i} { stroke: ${options.nodeBorder}; }
+        .commit-highlight${i} { stroke: ${options.nodeBorder}; fill: ${options.mainBkg}; }
+        .label${i}  { fill: ${options.mainBkg}; stroke: ${options.nodeBorder}; stroke-width: ${options.strokeWidth}; ${useReduxGeometry ? `font-weight:${options.noteFontWeight}` : ""} }
+        .arrow${i} { stroke: ${options.nodeBorder}; }
+        .commit-bullets { fill: ${options.nodeBorder}; }
+        `;
+      } else {
+        const colorIndex = i % borderColorArray.length;
+        sections += `
+        .branch-label${i} { fill: ${options.nodeBorder}; ${useReduxGeometry ? `font-weight:${options.noteFontWeight}` : ""} }
+        .commit${i} { stroke: ${borderColorArray[colorIndex]}; fill: ${borderColorArray[colorIndex]}; }
+        .commit-highlight${i} { stroke: ${borderColorArray[colorIndex]}; fill: ${borderColorArray[colorIndex]}; }
+        .label${i}  { fill: ${DARK_THEMES2.has(theme) ? options.mainBkg : borderColorArray[colorIndex]}; stroke: ${borderColorArray[colorIndex]};  stroke-width: ${options.strokeWidth}; }
+        .arrow${i} { stroke: ${borderColorArray[colorIndex]}; }
+        `;
+      }
+    }
+    return sections;
+  }
+}, "genColor");
+var normalTheme = /* @__PURE__ */ __name((options) => {
+  return `${Array.from({ length: options.THEME_COLOR_LIMIT }, (_, i) => i).map((i) => {
+    const ci = i % GIT_NAMED_COLOR_COUNT;
+    return `
+        .branch-label${i} { fill: ${options["gitBranchLabel" + ci]}; }
+        .commit${i} { stroke: ${options["git" + ci]}; fill: ${options["git" + ci]}; }
+        .commit-highlight${i} { stroke: ${options["gitInv" + ci]}; fill: ${options["gitInv" + ci]}; }
+        .label${i}  { fill: ${options["git" + ci]}; }
+        .arrow${i} { stroke: ${options["git" + ci]}; }
+        `;
+  }).join("\n")}`;
+}, "normalTheme");
+var getStyles = /* @__PURE__ */ __name((options) => {
+  const config = getConfig();
+  const { theme } = config;
+  const useNeoColorGen = NEO_COLOR_GEN_THEMES.has(theme);
+  return `
   .commit-id,
   .commit-msg,
   .branch-label {
@@ -1142,50 +1320,49 @@ var getStyles = /* @__PURE__ */ __name((options) => `
     font-family: 'trebuchet ms', verdana, arial, sans-serif;
     font-family: var(--mermaid-font-family);
   }
-  ${[0, 1, 2, 3, 4, 5, 6, 7].map(
-  (i) => `
-        .branch-label${i} { fill: ${options["gitBranchLabel" + i]}; }
-        .commit${i} { stroke: ${options["git" + i]}; fill: ${options["git" + i]}; }
-        .commit-highlight${i} { stroke: ${options["gitInv" + i]}; fill: ${options["gitInv" + i]}; }
-        .label${i}  { fill: ${options["git" + i]}; }
-        .arrow${i} { stroke: ${options["git" + i]}; }
-        `
-).join("\n")}
+  
+  ${useNeoColorGen ? genColor(options) : normalTheme(options)}
 
   .branch {
-    stroke-width: 1;
-    stroke: ${options.lineColor};
-    stroke-dasharray: 2;
+    stroke-width: ${options.strokeWidth};
+    stroke: ${options.commitLineColor ?? options.lineColor};
+    stroke-dasharray:  ${useNeoColorGen ? "4 2" : "2"};
   }
-  .commit-label { font-size: ${options.commitLabelFontSize}; fill: ${options.commitLabelColor};}
-  .commit-label-bkg { font-size: ${options.commitLabelFontSize}; fill: ${options.commitLabelBackground}; opacity: 0.5; }
+  .commit-label { font-size: ${options.commitLabelFontSize}; fill: ${useNeoColorGen ? options.nodeBorder : options.commitLabelColor}; ${useNeoColorGen ? `font-weight:${options.noteFontWeight};` : ""}}
+  .commit-label-bkg { font-size: ${options.commitLabelFontSize}; fill: ${useNeoColorGen ? "transparent" : options.commitLabelBackground}; opacity: ${useNeoColorGen ? "" : 0.5};  }
   .tag-label { font-size: ${options.tagLabelFontSize}; fill: ${options.tagLabelColor};}
-  .tag-label-bkg { fill: ${options.tagLabelBackground}; stroke: ${options.tagLabelBorder}; }
+  .tag-label-bkg { fill: ${useNeoColorGen ? options.mainBkg : options.tagLabelBackground}; stroke: ${useNeoColorGen ? options.nodeBorder : options.tagLabelBorder}; ${useNeoColorGen ? `filter:${options.dropShadow}` : ""}  }
   .tag-hole { fill: ${options.textColor}; }
 
   .commit-merge {
-    stroke: ${options.primaryColor};
-    fill: ${options.primaryColor};
+    stroke: ${useNeoColorGen ? options.mainBkg : options.primaryColor};
+    fill: ${useNeoColorGen ? options.mainBkg : options.primaryColor};
   }
   .commit-reverse {
-    stroke: ${options.primaryColor};
-    fill: ${options.primaryColor};
-    stroke-width: 3;
+    stroke: ${useNeoColorGen ? options.mainBkg : options.primaryColor};
+    fill: ${useNeoColorGen ? options.mainBkg : options.primaryColor};
+    stroke-width: ${useNeoColorGen ? options.strokeWidth : 3};
   }
   .commit-highlight-outer {
   }
   .commit-highlight-inner {
-    stroke: ${options.primaryColor};
-    fill: ${options.primaryColor};
+    stroke: ${useNeoColorGen ? options.mainBkg : options.primaryColor};
+    fill: ${useNeoColorGen ? options.mainBkg : options.primaryColor};
   }
 
-  .arrow { stroke-width: 8; stroke-linecap: round; fill: none}
+  .arrow {
+    /* Intentional: neo themes keep the bold 8px arrow (like classic themes); only redux-geometry themes use the thinner options.strokeWidth. */
+    stroke-width: ${REDUX_GEOMETRY_THEMES2.has(theme) ? options.strokeWidth : 8};
+    stroke-linecap: round;
+    fill: none
+  }
   .gitTitleText {
     text-anchor: middle;
     font-size: 18px;
     fill: ${options.textColor};
   }
-`, "getStyles");
+`;
+}, "getStyles");
 var styles_default = getStyles;
 var diagram = {
   parser,