Remove MermaidConfigWithDefaults

packages/mermaid/src/config.ts

@@ -6,10 +6,7 @@ import type { MermaidConfig } from './config.type.js';
 import { sanitizeDirective } from './utils/sanitizeDirective.js';
 import type { RequiredDeep } from 'type-fest';
 
-// I'd prefer this to be named MermaidConfig, so all the functions can use the shorter name.
-export type MermaidConfigWithDefaults = RequiredDeep<MermaidConfig>;
-
-export const defaultConfig: MermaidConfig = Object.freeze(config);
+export const defaultConfig: RequiredDeep<MermaidConfig> = Object.freeze(config);
 
 let siteConfig: MermaidConfig = assignWithDepth({}, defaultConfig);
 let configFromInitialize: MermaidConfig;
@@ -132,7 +129,7 @@ export const setConfig = (conf: MermaidConfig): MermaidConfig => {
  *
  * @returns The currentConfig
  */
-export const getConfig = (): MermaidConfigWithDefaults => {
+export const getConfig = (): MermaidConfig => {
   return assignWithDepth({}, currentConfig);
 };
 /**

packages/mermaid/src/diagrams/mindmap/mindmapDb.ts

@@ -3,6 +3,7 @@ import type { D3Element } from '../../mermaidAPI.js';
 import { sanitizeText } from '../../diagrams/common/common.js';
 import { log } from '../../logger.js';
 import type { MindmapNode } from './mindmapTypes.js';
+import { defaultConfig } from '../../config.js';
 
 let nodes: MindmapNode[] = [];
 let cnt = 0;
@@ -31,7 +32,7 @@ const getMindmap = () => {
 const addNode = (level: number, id: string, descr: string, type: number) => {
   log.info('addNode', level, id, descr, type);
   const conf = getConfig();
-  let padding: number = conf.mindmap.padding;
+  let padding: number = conf.mindmap?.padding ?? defaultConfig.mindmap.padding;
   switch (type) {
     case nodeType.ROUNDED_RECT:
     case nodeType.RECT:
@@ -46,7 +47,7 @@ const addNode = (level: number, id: string, descr: string, type: number) => {
     descr: sanitizeText(descr, conf),
     type,
     children: [],
-    width: conf.mindmap?.maxNodeWidth ?? 200,
+    width: conf.mindmap?.maxNodeWidth ?? defaultConfig.mindmap.maxNodeWidth,
     padding,
   } satisfies MindmapNode;
 

packages/mermaid/src/diagrams/mindmap/mindmapRenderer.ts

@@ -2,7 +2,6 @@ import cytoscape from 'cytoscape';
 // @ts-expect-error No types available
 import coseBilkent from 'cytoscape-cose-bilkent';
 import { select } from 'd3';
-import type { MermaidConfigWithDefaults } from '../../config.js';
 import type { MermaidConfig } from '../../config.type.js';
 import { getConfig } from '../../diagram-api/diagramAPI.js';
 import type { DrawDefinition } from '../../diagram-api/types.js';
@@ -12,6 +11,7 @@ import { selectSvgElement } from '../../rendering-util/selectSvgElement.js';
 import { setupGraphViewbox } from '../../setupGraphViewbox.js';
 import type { FilledMindMapNode, MindmapDB, MindmapNode } from './mindmapTypes.js';
 import { drawNode, positionNode } from './svgDraw.js';
+import { defaultConfig } from '../../config.js';
 
 // Inject the layout algorithm into cytoscape
 cytoscape.use(coseBilkent);
@@ -21,7 +21,7 @@ function drawNodes(
   svg: D3Element,
   mindmap: FilledMindMapNode,
   section: number,
-  conf: MermaidConfigWithDefaults
+  conf: MermaidConfig
 ) {
   drawNode(db, svg, mindmap, section, conf);
   if (mindmap.children) {
@@ -99,10 +99,7 @@ function addNodes(mindmap: MindmapNode, cy: cytoscape.Core, conf: MermaidConfig,
   }
 }
 
-function layoutMindmap(
-  node: MindmapNode,
-  conf: MermaidConfigWithDefaults
-): Promise<cytoscape.Core> {
+function layoutMindmap(node: MindmapNode, conf: MermaidConfig): Promise<cytoscape.Core> {
   return new Promise((resolve) => {
     // Add temporary render element
     const renderEl = select('body').append('div').attr('id', 'cy').attr('style', 'display:none');
@@ -160,17 +157,17 @@ function positionNodes(db: MindmapDB, cy: cytoscape.Core) {
 }
 
 export const draw: DrawDefinition = async (text, id, _version, diagObj) => {
-  const conf = getConfig();
-  const db = diagObj.db as MindmapDB;
-  conf.htmlLabels = false;
-
   log.debug('Rendering mindmap diagram\n' + text);
 
+  const db = diagObj.db as MindmapDB;
   const mm = db.getMindmap();
   if (!mm) {
     return;
   }
 
+  const conf = getConfig();
+  conf.htmlLabels = false;
+
   const svg = selectSvgElement(id);
 
   // Draw the graph and start with drawing the nodes without proper position
@@ -191,7 +188,12 @@ export const draw: DrawDefinition = async (text, id, _version, diagObj) => {
   positionNodes(db, cy);
 
   // Setup the view box and size of the svg element
-  setupGraphViewbox(undefined, svg, conf.mindmap.padding, conf.mindmap.useMaxWidth);
+  setupGraphViewbox(
+    undefined,
+    svg,
+    conf.mindmap?.padding ?? defaultConfig.mindmap.padding,
+    conf.mindmap?.useMaxWidth ?? defaultConfig.mindmap.useMaxWidth
+  );
 };
 
 export default {

packages/mermaid/src/diagrams/mindmap/styles.ts

@@ -1,7 +1,8 @@
 // @ts-expect-error Incorrect khroma types
 import { darken, lighten, isDark } from 'khroma';
+import type { DiagramStylesProvider } from '../../diagram-api/types.js';
 
-const genSections = (options: any) => {
+const genSections: DiagramStylesProvider = (options) => {
   let sections = '';
 
   for (let i = 0; i < options.THEME_COLOR_LIMIT; i++) {
@@ -51,7 +52,7 @@ const genSections = (options: any) => {
 };
 
 // TODO: These options seem incorrect.
-const getStyles = (options: any) =>
+const getStyles: DiagramStylesProvider = (options) =>
   `
   .edge {
     stroke-width: 3;

packages/mermaid/src/diagrams/mindmap/svgDraw.ts

@@ -1,9 +1,9 @@
 import type { D3Element } from '../../mermaidAPI.js';
 import { createText } from '../../rendering-util/createText.js';
 import type { FilledMindMapNode, MindmapDB } from './mindmapTypes.js';
-import type { MermaidConfigWithDefaults } from '../../config.js';
 import type { Point } from '../../types.js';
 import { parseFontSize } from '../../utils.js';
+import type { MermaidConfig } from '../../config.type.js';
 
 const MAX_SECTIONS = 12;
 
@@ -180,7 +180,7 @@ export const drawNode = function (
   elem: D3Element,
   node: FilledMindMapNode,
   fullSection: number,
-  conf: MermaidConfigWithDefaults
+  conf: MermaidConfig
 ): number {
   const htmlLabels = conf.htmlLabels;
   const section = fullSection % (MAX_SECTIONS - 1);