tsConversion: fix DiagramAPI

src/diagram-api/diagramAPI.ts

@@ -1,44 +1,62 @@
-// @ts-nocheck
 import c4Db from '../diagrams/c4/c4Db';
 import c4Renderer from '../diagrams/c4/c4Renderer';
+// @ts-ignore
 import c4Parser from '../diagrams/c4/parser/c4Diagram';
 import classDb from '../diagrams/class/classDb';
 import classRenderer from '../diagrams/class/classRenderer';
 import classRendererV2 from '../diagrams/class/classRenderer-v2';
+// @ts-ignore
 import classParser from '../diagrams/class/parser/classDiagram';
 import erDb from '../diagrams/er/erDb';
 import erRenderer from '../diagrams/er/erRenderer';
+// @ts-ignore
 import erParser from '../diagrams/er/parser/erDiagram';
 import flowDb from '../diagrams/flowchart/flowDb';
 import flowRenderer from '../diagrams/flowchart/flowRenderer';
 import flowRendererV2 from '../diagrams/flowchart/flowRenderer-v2';
+// @ts-ignore
 import flowParser from '../diagrams/flowchart/parser/flow';
 import ganttDb from '../diagrams/gantt/ganttDb';
 import ganttRenderer from '../diagrams/gantt/ganttRenderer';
+// @ts-ignore
 import ganttParser from '../diagrams/gantt/parser/gantt';
 import infoDb from '../diagrams/info/infoDb';
 import infoRenderer from '../diagrams/info/infoRenderer';
+// @ts-ignore
 import infoParser from '../diagrams/info/parser/info';
+// @ts-ignore
 import pieParser from '../diagrams/pie/parser/pie';
 import pieDb from '../diagrams/pie/pieDb';
 import pieRenderer from '../diagrams/pie/pieRenderer';
+// @ts-ignore
 import requirementParser from '../diagrams/requirement/parser/requirementDiagram';
 import requirementDb from '../diagrams/requirement/requirementDb';
 import requirementRenderer from '../diagrams/requirement/requirementRenderer';
+// @ts-ignore
 import sequenceParser from '../diagrams/sequence/parser/sequenceDiagram';
 import sequenceDb from '../diagrams/sequence/sequenceDb';
 import sequenceRenderer from '../diagrams/sequence/sequenceRenderer';
+// @ts-ignore
 import stateParser from '../diagrams/state/parser/stateDiagram';
 import stateDb from '../diagrams/state/stateDb';
 import stateRenderer from '../diagrams/state/stateRenderer';
 import stateRendererV2 from '../diagrams/state/stateRenderer-v2';
 import journeyDb from '../diagrams/user-journey/journeyDb';
 import journeyRenderer from '../diagrams/user-journey/journeyRenderer';
+// @ts-ignore
 import journeyParser from '../diagrams/user-journey/parser/journey';
-import { addDetector } from './detectType';
+import { addDetector, DiagramDetector } from './detectType';
 import { log } from '../logger';
+import { MermaidConfig } from '../config.type';
 
-const diagrams = {
+export interface DiagramDefinition {
+  db: any;
+  renderer: any;
+  parser: any;
+  init?: (config: MermaidConfig) => void;
+}
+
+const diagrams: Record<string, DiagramDefinition> = {
   c4: {
     db: c4Db,
     renderer: c4Renderer,
@@ -52,6 +70,9 @@ const diagrams = {
     renderer: classRenderer,
     parser: classParser,
     init: (cnf) => {
+      if (!cnf.class) {
+        cnf.class = {};
+      }
       cnf.class.arrowMarkerAbsolute = cnf.arrowMarkerAbsolute;
       classDb.clear();
     },
@@ -61,6 +82,9 @@ const diagrams = {
     renderer: classRendererV2,
     parser: classParser,
     init: (cnf) => {
+      if (!cnf.class) {
+        cnf.class = {};
+      }
       cnf.class.arrowMarkerAbsolute = cnf.arrowMarkerAbsolute;
       classDb.clear();
     },
@@ -76,6 +100,9 @@ const diagrams = {
     parser: flowParser,
     init: (cnf) => {
       flowRenderer.setConf(cnf.flowchart);
+      if (!cnf.flowchart) {
+        cnf.flowchart = {};
+      }
       cnf.flowchart.arrowMarkerAbsolute = cnf.arrowMarkerAbsolute;
       flowDb.clear();
       flowDb.setGen('gen-1');
@@ -87,6 +114,9 @@ const diagrams = {
     parser: flowParser,
     init: (cnf) => {
       flowRendererV2.setConf(cnf.flowchart);
+      if (!cnf.flowchart) {
+        cnf.flowchart = {};
+      }
       cnf.flowchart.arrowMarkerAbsolute = cnf.arrowMarkerAbsolute;
       flowDb.clear();
       flowDb.setGen('gen-2');
@@ -96,15 +126,7 @@ const diagrams = {
     db: ganttDb,
     renderer: ganttRenderer,
     parser: ganttParser,
-    init: (cnf) => {
-      ganttRenderer.setConf(cnf.gantt);
-    },
   },
-  // git: {
-  //   db: gitGraphAst,
-  //   renderer: gitGraphRenderer,
-  //   parser: gitGraphParser,
-  // },
   info: {
     db: infoDb,
     renderer: infoRenderer,
@@ -125,11 +147,12 @@ const diagrams = {
     renderer: sequenceRenderer,
     parser: sequenceParser,
     init: (cnf) => {
+      if (!cnf.sequence) {
+        cnf.sequence = {};
+      }
       cnf.sequence.arrowMarkerAbsolute = cnf.arrowMarkerAbsolute;
-      if (cnf.sequenceDiagram) {
-        // backwards compatibility
-        sequenceRenderer.setConf(Object.assign(cnf.sequence, cnf.sequenceDiagram));
-        console.error(
+      if ('sequenceDiagram' in cnf) {
+        throw new Error(
           '`mermaid config.sequenceDiagram` has been renamed to `config.sequence`. Please update your mermaid config.'
         );
       }
@@ -142,6 +165,10 @@ const diagrams = {
     renderer: stateRenderer,
     parser: stateParser,
     init: (cnf) => {
+      // TODO Q: Why is state diagram init setting cnf.class.arrowMarkerAbsolute ?
+      if (!cnf.class) {
+        cnf.class = {};
+      }
       cnf.class.arrowMarkerAbsolute = cnf.arrowMarkerAbsolute;
       stateDb.clear();
     },
@@ -151,6 +178,10 @@ const diagrams = {
     renderer: stateRendererV2,
     parser: stateParser,
     init: (cnf) => {
+      // TODO Q: Why is state diagram init setting cnf.class.arrowMarkerAbsolute ?
+      if (!cnf.class) {
+        cnf.class = {};
+      }
       cnf.class.arrowMarkerAbsolute = cnf.arrowMarkerAbsolute;
       stateDb.clear();
     },
@@ -165,16 +196,22 @@ const diagrams = {
     },
   },
 };
-// console.log(sequenceDb);
-export const registerDiagram = (id, parser, db, renderer, init, detector) => {
+
+export const registerDiagram = (
+  id: string,
+  diagram: DiagramDefinition,
+  detector: DiagramDetector
+) => {
   if (diagrams[id]) {
     log.warn(`Diagram ${id} already registered.`);
   }
-  diagrams[id] = { parser, db, renderer, init };
+  diagrams[id] = diagram;
   addDetector(id, detector);
 };
 
-export const getDiagrams = () => {
-  // console.log('diagrams', diagrams);
-  return diagrams;
+export const getDiagram = (name: string): DiagramDefinition => {
+  if (name in diagrams) {
+    return diagrams[name];
+  }
+  throw new Error(`Diagram ${name} not found.`);
 };