marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-23 17:29:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed config for user configs

Browse Source
This commit is contained in:
Austin Fulbright
2024-08-20 06:46:33 -04:00
parent 7a7b41557d
commit 94ee076aad
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/mermaid/src/diagrams/git/gitGraphAst.ts
View File

@@ -1,5 +1,6 @@
import { log } from '../../logger.js'; import { log } from '../../logger.js';
import { random } from '../../utils.js'; import { cleanAndMerge, random } from '../../utils.js';
import { getConfig as commonGetConfig } from '../../config.js';
import common from '../common/common.js'; import common from '../common/common.js';
import { import {
setAccTitle, setAccTitle,
@@ -37,12 +38,16 @@ interface GitGraphState {
} }
const DEFAULT_GITGRAPH_CONFIG: Required<GitGraphDiagramConfig> = DEFAULT_CONFIG.gitGraph; const DEFAULT_GITGRAPH_CONFIG: Required<GitGraphDiagramConfig> = DEFAULT_CONFIG.gitGraph;
const getConfig = (): Required<GitGraphDiagramConfig> => {
const mainBranchName = DEFAULT_GITGRAPH_CONFIG.mainBranchName; const config = cleanAndMerge({
const mainBranchOrder = DEFAULT_GITGRAPH_CONFIG.mainBranchOrder; ...DEFAULT_GITGRAPH_CONFIG,
const config: Required<GitGraphDiagramConfig> = structuredClone(DEFAULT_GITGRAPH_CONFIG); ...commonGetConfig().gitGraph,
});
const getConfig = (): Required<GitGraphDiagramConfig> => structuredClone(config); return config;
};
const config = getConfig();
const mainBranchName = config.mainBranchName;
const mainBranchOrder = config.mainBranchOrder;
const state = new ImperativeState<GitGraphState>(() => ({ const state = new ImperativeState<GitGraphState>(() => ({
commits: new Map(), commits: new Map(),