Fix for issues in errorhandling and class diagrams after refactoring

Merge pull request #3469 from mermaid-js/sidv/mergeRelease
Merge release 9.1.7
2025-09-16 22:09:57 +02:00 · 2022-09-16 14:05:15 +02:00 · 2022-09-16 11:22:35 +02:00 · 2022-09-16 08:54:38 +02:00 · 2022-09-16 08:53:12 +02:00 · 2022-09-16 08:44:01 +02:00
45 changed files with 219 additions and 953 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -63,6 +63,13 @@
      "rules": {
        "no-console": "off"
      }
    },
    {
      "files": ["./**/*.spec.{ts,js}", "./cypress/**", "./demos/**", "./**/docs/**"],
      "rules": {
        "jsdoc/require-jsdoc": "off",
        "@typescript-eslint/no-unused-vars": "off"
      }
    }
  ]
 }
--- a/cypress/platform/cyto.html
+++ b/cypress/platform/cyto.html
@@ -1,92 +0,0 @@
 <html>
  <head>
    <link href="https://fonts.googleapis.com/css?family=Montserrat&display=swap" rel="stylesheet" />
    <link href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css" rel="stylesheet" />
    <link
      rel="stylesheet"
      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"
    />
    <link
      href="https://fonts.googleapis.com/css?family=Noto+Sans+SC&display=swap"
      rel="stylesheet"
    />
    <style>
      body {
        /* background: rgb(221, 208, 208); */
        /* background:#333; */
        font-family: 'Arial';
        /* font-size: 18px !important; */
        width: 100%;
        /* display: flex; */
        /* flex-direction: column; */
        margin-left: 20px;
      }
      h1 {
        color: grey;
      }
      .mermaid2,
      .mermaid3 {
        display: none;
      }
      .mermaid {
      }
      .mermaid svg {
        border: 1px solid purple;
        /* font-size: 18px !important; */
        /* fontfamily: 'courier'; */
      }
      #cy {
        width: 300px;
        height: 300px;
        display: block;
      }
    </style>
  </head>
  <body>
    <div id="cy"></div>
    <pre class="mermaid" style="width: 50%">
 flowchart TD
 id1 --> id2--> id3[I am number 3 and I<br/>am a gigantic node<br/>am a gigantic node<br/>am a gigantic node<br/>am a gigantic node<br/>am a gigantic node]--> id4--> id5 --> id1
 id5 --> id4
 id5 --> id4
    </pre>
    <pre class="mermaid2" style="width: 50%">
 flowchart TD
 id1 --> id2--> id3
 id2 --> id1
    </pre>
    <script src="./mermaid.js"></script>
    <script>
      mermaid.parseError = function (err, hash) {
        // console.error('Mermaid error: ', err);
      };
      mermaid.initialize({
        maxTextSize: 900000,
        startOnLoad: true,
        securityLevel: 'loose',
        logLevel: 0,
        fontFamily: 'courier',
        flowchart: {
          // curve: 'curveLinear',
          useMaxWidth: true,
          htmlLabels: false,
          fontFamily: 'courier',
          defaultRenderer: 'cytoscape',
          // defaultRenderer: 'dagre-wrapper',
        },
      });
      function callback() {
        alert('It worked');
      }
      function clickByFlow(elemName) {
        const div = document.createElement('div');
        div.className = 'created-by-click';
        div.style = 'padding: 20px; background: green; color: white;';
        div.innerText = 'Clicked By Flow';
        document.getElementsByTagName('body')[0].appendChild(div);
      }
    </script>
  </body>
 </html>
--- a/cypress/platform/knsv.html
+++ b/cypress/platform/knsv.html
@@ -39,6 +39,14 @@
  </head>
  <body>
    <pre class="mermaid2" style="width: 50%">
 flowchart LR
  a ---
    </pre>
    <pre class="mermaid" style="width: 50%">
 flowchart LR
  a2 ---
    </pre>
    <pre class="mermaid2" style="width: 50%">
 flowchart LR
  classDef aPID stroke:#4e4403,fill:#fdde29,color:#4e4403,rx:5px,ry:5px;
  classDef crm stroke:#333333,fill:#DCDCDC,color:#333333,rx:5px,ry:5px;
@@ -71,12 +79,34 @@ flowchart TD
    end
    end
    </pre>
    --> id2 --> id3(I have a long text) --> id4 --> id5 --> id1
    <pre class="mermaid" style="width: 50%">
 flowchart TD
-id1
+
  release-branch[Create Release Branch]:::relClass
  develop-branch[Update Develop Branch]:::relClass
  github-release-draft[GitHub Release Draft]:::relClass
  trigger-pipeline[Trigger Jenkins pipeline]:::fixClass
  github-release[GitHub Release]:::postClass
  build-ready --> release-branch
  build-ready --> develop-branch
  release-branch --> jenkins-release-build
  jenkins-release-build --> github-release-draft
  jenkins-release-build --> install-release
  install-release --> verify-release
  jenkins-release-build --> announce
  github-release-draft --> github-release
  verify-release --> verify-check
  verify-check -- Yes --> github-release
  verify-check -- No --> release-fix
  release-fix --> release-branch-pr
  verify-check -- No --> delete-artifacts
  release-branch-pr --> trigger-pipeline
  delete-artifacts --> trigger-pipeline
  trigger-pipeline --> jenkins-release-build
    </pre>
    <pre id="cy" style="width: 50%"></pre>
    <pre class="mermaid2" style="width: 50%">
 flowchart LR
        a["<strong>Haiya</strong>"]===>b
@@ -101,7 +131,7 @@ flowchart TD
      class A someclass;
      class C someclass;
    </pre>
-    <pre class="mermaid2" style="width: 50%">
+    <pre class="mermaid" style="width: 50%">
   sequenceDiagram
      title: My Sequence Diagram Title
      accTitle: My Acc Sequence Diagram
@@ -111,14 +141,14 @@ flowchart TD
      John-->>Alice: Great!
      Alice-)John: See you later!
    </pre>
-    <pre class="mermaid2" style="width: 50%">
+    <pre class="mermaid" style="width: 50%">
 graph TD
    A -->|000| B
    B -->|111| C
    linkStyle 1 stroke:#ff3,stroke-width:4px,color:red;
    </pre>
-    <pre class="mermaid2" style="width: 100%">
+    <pre class="mermaid" style="width: 100%">
  journey
      accTitle: My User Journey Diagram
      accDescr: My User Journey Diagram Description
@@ -132,10 +162,10 @@ graph TD
        Go downstairs: 5: Me
        Sit down: 5: Me
    </pre>
-    <pre class="mermaid2" style="width: 100%">
+    <pre class="mermaid" style="width: 100%">
        info
    </pre>
-    <pre class="mermaid2" style="width: 100%">
+    <pre class="mermaid" style="width: 100%">
 requirementDiagram
      accTitle: My req Diagram
      accDescr: My req Diagram Description
@@ -176,7 +206,7 @@ requirementDiagram
    test_req - contains -> test_req3
    test_req <- copies - test_entity2
    </pre>
-    <pre class="mermaid2" style="width: 100%">
+    <pre class="mermaid" style="width: 100%">
 gantt
    dateFormat  YYYY-MM-DD
    title       Adding GANTT diagram functionality to mermaid
@@ -208,7 +238,7 @@ gantt
    Add gantt diagram to demo page      :20h
    Add another diagram to demo page    :48h
    </pre>
-    <pre class="mermaid2" style="width: 100%">
+    <pre class="mermaid" style="width: 100%">
 stateDiagram
  state Active {
    Idle
@@ -236,7 +266,7 @@ stateDiagram
          end
          B ->> A: Return
    </pre>
-    <pre class="mermaid2" style="width: 100%">
+    <pre class="mermaid" style="width: 100%">
 classDiagram
 accTitle: My class diagram
 accDescr: My class diagram Description
@@ -261,7 +291,7 @@ class Class10 {
        A->>Bob: Hola
        Bob-->A: Pasten !
    </pre>
-    <pre class="mermaid2" style="width: 100%">
+    <pre class="mermaid" style="width: 100%">
      gitGraph
       commit id: "ZERO"
       branch develop
@@ -290,7 +320,7 @@ flowchart TD
      C -->|Two| E[iPhone]
      C -->|Three| F[fa:fa-car Car]
    </pre>
-    <pre class="mermaid2" style="width: 100%">
+    <pre class="mermaid" style="width: 100%">
        classDiagram
          Animal "1" <|-- Duck
          Animal <|-- Fish
@@ -313,7 +343,7 @@ flowchart TD
            +run()
          }
    </pre>
-    <pre class="mermaid2" style="width: 100%">
+    <pre class="mermaid" style="width: 100%">
        erDiagram
    CAR ||--o{ NAMED-DRIVER : allows
    CAR {
@@ -345,8 +375,6 @@ flowchart TD
          useMaxWidth: true,
          htmlLabels: false,
          fontFamily: 'courier',
          defaultRenderer: 'cytoscape',
          // defaultRenderer: 'dagre-wrapper',
        },
      });
      function callback() {
@@ -361,6 +389,11 @@ flowchart TD
        document.getElementsByTagName('body')[0].appendChild(div);
      }
      mermaid.parseError = function (err, hash) {
        console.error('In parse error:');
        console.error(err);
      };
    </script>
  </body>
 </html>
--- a/cypress/platform/knsv2.html
+++ b/cypress/platform/knsv2.html
@@ -47,9 +47,17 @@
    <div>Security check</div>
    <div class="flex">
      <pre id="diagram" class="mermaid">
-sequenceDiagram
+    flowchart TD
-  Nothing:Valid;
+    A[myClass1] --> B[default] & C[default]
-      </pre>
+    B[default] & C[default] --> D[myClass2]
    classDef default stroke-width:2px,fill:none,stroke:silver
    classDef node color:red
    classDef myClass1 color:#0000ff
    classDef myClass2 stroke:#0000ff,fill:#ccccff
    class A myClass1
    class D myClass2
  </pre
      >
      <div id="res" class=""></div>
    </div>
    <script src="./mermaid.js"></script>
@@ -59,6 +67,7 @@ sequenceDiagram
      };
      mermaid.initialize({
        startOnLoad: false,
        logLevel: 0,
        // themeVariables: {relationLabelColor: 'red'}
      });
      function callback() {
--- a/docs/index.html
+++ b/docs/index.html
@@ -21,22 +21,13 @@
      rel="stylesheet"
      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.9.0/css/all.min.css"
    />
-    <script src="//cdn.jsdelivr.net/npm/mermaid@9.1.6/dist/mermaid.min.js"></script>
+    <script src="//cdn.jsdelivr.net/npm/mermaid@9.1.7/dist/mermaid.min.js"></script>
    <!-- <script src="http://localhost:9000/mermaid.js"></script> -->
-    <script>
+    <script
-      // prettier-ignore
+      defer
-      (function (i, s, o, g, r, a, m) {
+      data-domain="mermaid-js.github.io"
-      i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
+      src="https://plausible.io/js/plausible.js"
-        (i[r].q = i[r].q || []).push(arguments)
+    ></script>
      }, i[r].l = 1 * new Date(); a = s.createElement(o),
        m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)
    })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
      ga('create', 'UA-153180559-1', 'auto');
      if (location) {
        ga('send', 'pageview', location.hash);
      }
    </script>
    <script>
      var require = {
        paths: { vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.29.1/min/vs' },
--- a/package.json
+++ b/package.json
@@ -64,17 +64,16 @@
  },
  "dependencies": {
    "@braintree/sanitize-url": "^6.0.0",
    "cytoscape": "^3.23.0",
    "d3": "^7.0.0",
    "dagre": "^0.8.5",
    "dagre-d3": "^0.6.4",
-    "dompurify": "2.3.10",
+    "dompurify": "2.4.0",
    "fast-clone": "^1.5.13",
    "graphlib": "^2.1.8",
    "khroma": "^2.0.0",
    "moment-mini": "^2.24.0",
    "non-layered-tidy-tree-layout": "^2.0.2",
-    "stylis": "^4.0.10"
+    "stylis": "^4.1.2"
  },
  "devDependencies": {
    "@applitools/eyes-cypress": "^3.25.7",
@@ -127,7 +126,7 @@
    "unist-util-flatmap": "^1.0.0",
    "webpack": "^5.53.0",
    "webpack-cli": "^4.7.2",
-    "webpack-dev-server": "^4.10.1",
+    "webpack-dev-server": "^4.11.0",
    "webpack-merge": "^5.8.0",
    "webpack-node-externals": "^3.0.0"
  },
--- a/src/dagre-wrapper/createLabel.js
+++ b/src/dagre-wrapper/createLabel.js
@@ -1,11 +1,9 @@
 import { select } from 'd3';
 import { log } from '../logger';
 import { getConfig } from '../config';
-import { sanitizeText, evaluate } from '../diagrams/common/common';
+import { evaluate } from '../diagrams/common/common';
 import { decodeEntities } from '../mermaidAPI';
 const sanitizeTxt = (txt) => sanitizeText(txt, getConfig());
 /**
 * @param dom
 * @param styleFn
--- a/src/dagre-wrapper/markers.js
+++ b/src/dagre-wrapper/markers.js
@@ -119,7 +119,7 @@ const dependency = (elem, type) => {
    .append('path')
    .attr('d', 'M 18,7 L9,13 L14,7 L9,1 Z');
 };
-const lollipop = (elem, type, id) => {
+const lollipop = (elem, type) => {
  elem
    .append('defs')
    .append('marker')
--- a/src/dagre-wrapper/nodes.js
+++ b/src/dagre-wrapper/nodes.js
@@ -6,7 +6,7 @@ import intersect from './intersect/index.js';
 import createLabel from './createLabel';
 import note from './shapes/note';
 import { parseMember } from '../diagrams/class/svgDraw';
-import { evaluate, sanitizeText as sanitize } from '../diagrams/common/common';
+import { evaluate } from '../diagrams/common/common';
 const question = (parent, node) => {
  const { shapeSvg, bbox } = labelHelper(parent, node, undefined, true);
@@ -346,7 +346,7 @@ const rect = (parent, node) => {
 };
 const labelRect = (parent, node) => {
-  const { shapeSvg, bbox, halfPadding } = labelHelper(parent, node, 'label', true);
+  const { shapeSvg } = labelHelper(parent, node, 'label', true);
  log.trace('Classes = ', node.classes);
  // add the rect
@@ -1062,7 +1062,6 @@ export const insertNode = (elem, node, dir) => {
  if (node.haveCallback) {
    nodeElems[node.id].attr('class', nodeElems[node.id].attr('class') + ' clickable');
  }
  return newEl;
 };
 export const setNodeElem = (elem, node) => {
  nodeElems[node.id] = elem;
--- a/src/defaultConfig.ts
+++ b/src/defaultConfig.ts
@@ -228,9 +228,9 @@ const config: Partial<MermaidConfig> = {
     * Decides which rendering engine that is to be used for the rendering. Legal values are:
     * dagre-d3 dagre-wrapper - wrapper for dagre implemented in mermaid
     *
-     * Default value: 'dagre-d3'
+     * Default value: 'dagre-wrapper'
     */
-    defaultRenderer: 'dagre-d3',
+    defaultRenderer: 'dagre-wrapper',
  },
  /** The object containing configurations specific for sequence diagrams */
@@ -387,7 +387,8 @@ const config: Partial<MermaidConfig> = {
     *
     * **Notes:**
     *
-     * This will display arrows that start and begin at the same node as right angles, rather than a curve
+     * This will display arrows that start and begin at the same node as right angles, rather than a
     * curve
     *
     * Default value: false
     */
@@ -802,7 +803,8 @@ const config: Partial<MermaidConfig> = {
     *
     * **Notes:**
     *
-     * This will display arrows that start and begin at the same node as right angles, rather than a curves
+     * This will display arrows that start and begin at the same node as right angles, rather than a
     * curves
     *
     * Default value: false
     */
--- a/src/diagram-api/diagram-orchestration.ts
+++ b/src/diagram-api/diagram-orchestration.ts
@@ -41,11 +41,9 @@ import erStyles from '../diagrams/er/styles';
 import flowParser from '../diagrams/flowchart/parser/flow';
 import { flowDetector } from '../diagrams/flowchart/flowDetector';
 import { flowDetectorV2 } from '../diagrams/flowchart/flowDetector-v2';
 import { flowDetectorV3 } from '../diagrams/flowchart/flowDetector-v3';
 import flowDb from '../diagrams/flowchart/flowDb';
 import flowRenderer from '../diagrams/flowchart/flowRenderer';
 import flowRendererV2 from '../diagrams/flowchart/flowRenderer-v2';
 import flowRendererV3 from '../diagrams/flowchart/flowRenderer-v3';
 import flowStyles from '../diagrams/flowchart/styles';
 // @ts-ignore: TODO Fix ts errors
@@ -99,7 +97,33 @@ import journeyDb from '../diagrams/user-journey/journeyDb';
 import journeyRenderer from '../diagrams/user-journey/journeyRenderer';
 import journeyStyles from '../diagrams/user-journey/styles';
 import errorRenderer from '../diagrams/error/errorRenderer';
 import errorStyles from '../diagrams/error/styles';
 export const addDiagrams = () => {
  registerDiagram(
    'error',
    // Special diagram with error messages but setup as a regular diagram
    {
      db: {
        clear: () => {
          // Quite ok, clear needs to be there for error to work as a regular diagram
        },
      },
      styles: errorStyles,
      renderer: errorRenderer,
      parser: {
        parser: { yy: {} },
        parse: () => {
          // no op
        },
      },
      init: () => {
        // no op
      },
    },
    (text) => text.toLowerCase().trim() === 'error'
  );
  registerDiagram(
    'c4',
    {
@@ -307,20 +331,6 @@ export const addDiagrams = () => {
    },
    flowDetectorV2
  );
  registerDiagram(
    'flowchart-v3',
    {
      parser: flowParser,
      db: flowDb,
      renderer: flowRendererV3,
      styles: flowStyles,
      init: () => {
        flowDb.clear();
        flowDb.setGen('gen-3');
      },
    },
    flowDetectorV3
  );
  registerDiagram(
    'gitGraph',
    { parser: gitGraphParser, db: gitGraphDb, renderer: gitGraphRenderer, styles: gitGraphStyles },
--- a/src/diagrams/c4/c4Db.js
+++ b/src/diagrams/c4/c4Db.js
@@ -1,6 +1,5 @@
 import mermaidAPI from '../../mermaidAPI';
 import * as configApi from '../../config';
 import { log } from '../../logger';
 import { sanitizeText } from '../common/common';
 import { setAccTitle, getAccTitle, getAccDescription, setAccDescription } from '../../commonDb';
@@ -21,7 +20,6 @@ let boundarys = [
 let rels = [];
 let title = '';
 let wrapEnabled = false;
 let description = '';
 let c4ShapeInRow = 4;
 let c4BoundaryInRow = 2;
 var c4Type;
@@ -636,13 +634,13 @@ export const updateLayoutConfig = function (typeC4Shape, c4ShapeInRowParam, c4Bo
  let c4BoundaryInRowValue = c4BoundaryInRow;
  if (typeof c4ShapeInRowParam === 'object') {
-    let [key, value] = Object.entries(c4ShapeInRowParam)[0];
+    const value = Object.values(c4ShapeInRowParam)[0];
    c4ShapeInRowValue = parseInt(value);
  } else {
    c4ShapeInRowValue = parseInt(c4ShapeInRowParam);
  }
  if (typeof c4BoundaryInRowParam === 'object') {
-    let [key, value] = Object.entries(c4BoundaryInRowParam)[0];
+    const value = Object.values(c4BoundaryInRowParam)[0];
    c4BoundaryInRowValue = parseInt(value);
  } else {
    c4BoundaryInRowValue = parseInt(c4BoundaryInRowParam);
@@ -721,7 +719,6 @@ export const clear = function () {
  boundaryParseStack = [''];
  title = '';
  wrapEnabled = false;
  description = '';
  c4ShapeInRow = 4;
  c4BoundaryInRow = 2;
 };
--- a/src/diagrams/c4/c4Renderer.js
+++ b/src/diagrams/c4/c4Renderer.js
@@ -1,5 +1,5 @@
 import { select } from 'd3';
-import svgDraw, { drawText, fixLifeLineHeights } from './svgDraw';
+import svgDraw from './svgDraw';
 import { log } from '../../logger';
 import { parser } from './parser/c4Diagram';
 import common from '../common/common';
@@ -298,7 +298,7 @@ export const drawC4ShapeArray = function (currentBounds, diagram, c4ShapeArray,
    currentBounds.insert(c4Shape);
-    const height = svgDraw.drawC4Shape(diagram, c4Shape, conf);
+    svgDraw.drawC4Shape(diagram, c4Shape, conf);
  }
  currentBounds.bumpLastMargin(conf.c4ShapeMargin);
@@ -616,7 +616,6 @@ export const draw = function (_text, id, _version, diagObj) {
  globalBoundaryMaxY = conf.diagramMarginY;
  const title = diagObj.db.getTitle();
  const c4type = diagObj.db.getC4Type();
  let currentBoundarys = diagObj.db.getBoundarys('');
  // switch (c4type) {
  //   case 'C4Context':
--- a/src/diagrams/c4/svgDraw.js
+++ b/src/diagrams/c4/svgDraw.js
@@ -1,5 +1,4 @@
 import common from '../common/common';
 import { addFunction } from '../../interactionDb';
 import { sanitizeUrl } from '@braintree/sanitize-url';
 export const drawRect = function (elem, rectData) {
--- a/src/diagrams/class/classRenderer-v2.js
+++ b/src/diagrams/class/classRenderer-v2.js
@@ -3,7 +3,6 @@ import graphlib from 'graphlib';
 import { log } from '../../logger';
 import { getConfig } from '../../config';
 import { render } from '../../dagre-wrapper/index.js';
 // import addHtmlLabel from 'dagre-d3/lib/label/add-html-label.js';
 import { curveLinear } from 'd3';
 import { interpolateToCurve, getStylesFromArray } from '../../utils';
 import { setupGraphViewbox } from '../../setupGraphViewbox';
@@ -11,7 +10,6 @@ import common from '../common/common';
 import addSVGAccessibilityFields from '../../accessibility';
 let idCache = {};
 const padding = 20;
 const sanitizeText = (txt) => common.sanitizeText(txt, getConfig());
@@ -235,20 +233,6 @@ export const addRelations = function (relations, g) {
  });
 };
 /**
 * Gets the ID with the same label as in the cache
 *
 * @param {string} label The label to look for
 * @returns {string} The resulting ID
 */
 const getGraphId = function (label) {
  const foundEntry = Object.entries(idCache).find((entry) => entry[1].label === label);
  if (foundEntry) {
    return foundEntry[0];
  }
 };
 /**
 * Merges the value of `conf` with the passed `cnf`
 *
--- a/src/diagrams/class/classRenderer.js
+++ b/src/diagrams/class/classRenderer.js
@@ -10,12 +10,6 @@ import addSVGAccessibilityFields from '../../accessibility';
 let idCache = {};
 const padding = 20;
 const confa = {
  dividerMargin: 10,
  padding: 5,
  textHeight: 10,
 };
 /**
 * Gets the ID with the same label as in the cache
 *
@@ -163,7 +157,6 @@ export const draw = function (text, id, _version, diagObj) {
    securityLevel === 'sandbox'
      ? select(sandboxElement.nodes()[0].contentDocument.body)
      : select('body');
  const doc = securityLevel === 'sandbox' ? sandboxElement.nodes()[0].contentDocument : document;
  // Fetch the default direction, use TD if none was found
  const diagram = root.select(`[id='${id}']`);
--- a/src/diagrams/er/erDb.js
+++ b/src/diagrams/er/erDb.js
@@ -1,7 +1,7 @@
 import { log } from '../../logger';
 import mermaidAPI from '../../mermaidAPI';
 import * as configApi from '../../config';
-import common from '../common/common';
+
 import {
  setAccTitle,
  getAccTitle,
@@ -12,8 +12,6 @@ import {
 let entities = {};
 let relationships = [];
 let title = '';
 let description = '';
 const Cardinality = {
  ZERO_OR_ONE: 'ZERO_OR_ONE',
@@ -78,7 +76,6 @@ const getRelationships = () => relationships;
 const clear = function () {
  entities = {};
  relationships = [];
  title = '';
  commonClear();
 };
--- a/src/diagrams/error/errorRenderer.ts
+++ b/src/diagrams/error/errorRenderer.ts
@@ -1,7 +1,7 @@
 /** Created by knut on 14-12-11. */
 import { select } from 'd3';
-import { log } from './logger';
+import { log } from '../../logger';
-import { getErrorMessage } from './utils';
+import { getErrorMessage } from '../../utils';
 let conf = {};
@@ -17,10 +17,11 @@ export const setConf = function (cnf: any) {
 /**
 * Draws a an info picture in the tag with id: id based on the graph definition in text.
 *
 * @param text
 * @param {string} id The text for the error
 * @param {string} mermaidVersion The version
 */
-export const draw = (id: string, mermaidVersion: string) => {
+export const draw = (text: string, id: string, mermaidVersion: string) => {
  try {
    log.debug('Renering svg for syntax error\n');
@@ -72,22 +73,22 @@ export const draw = (id: string, mermaidVersion: string) => {
    g.append('text') // text label for the x axis
      .attr('class', 'error-text')
-      .attr('x', 1240)
+      .attr('x', 1440)
      .attr('y', 250)
      .attr('font-size', '150px')
      .style('text-anchor', 'middle')
      .text('Syntax error in graph');
    g.append('text') // text label for the x axis
      .attr('class', 'error-text')
-      .attr('x', 1050)
+      .attr('x', 1250)
      .attr('y', 400)
      .attr('font-size', '100px')
      .style('text-anchor', 'middle')
      .text('mermaid version ' + mermaidVersion);
    svg.attr('height', 100);
-    svg.attr('width', 400);
+    svg.attr('width', 500);
-    svg.attr('viewBox', '768 0 512 512');
+    svg.attr('viewBox', '768 0 912 512');
  } catch (e) {
    log.error('Error while rendering info diagram');
    log.error(getErrorMessage(e));
--- a/src/diagrams/error/styles.js
+++ b/src/diagrams/error/styles.js
@@ -0,0 +1,3 @@
 const getStyles = () => ``;
 export default getStyles;
--- a/src/diagrams/flowchart/flowDetector-v2.ts
+++ b/src/diagrams/flowchart/flowDetector-v2.ts
@@ -1,23 +1,8 @@
 import type { DiagramDetector } from '../../diagram-api/detectType';
-import { log } from '../../diagram-api/diagramAPI';
+
 export const flowDetectorV2: DiagramDetector = (txt, config) => {
  log.info('Config in flowDetector-v2 defaultRenderer: ', config?.flowchart?.defaultRenderer);
  // If we have confgured to use cytoscape then we should always return false here
  if (config?.flowchart?.defaultRenderer === 'cytoscape') {
    log.info('flowDetector-v2 returning false');
    return false;
  } else {
    log.info('flowDetector-v2 not cytoscape');
  }
  // If we have confgured to use dagre-wrapper then we should return true in this function for graph code thus making it use the new flowchart diagram
  if (config?.flowchart?.defaultRenderer === 'dagre-wrapper' && txt.match(/^\s*graph/) !== null)
    return true;
  log.info('Config in flowDetector-v2 returning', txt.match(/^\s*flowchart/) !== null);
  return txt.match(/^\s*flowchart/) !== null;
 };
 /*
 if (((_a = config === null || config === void 0 ? void 0 : config.flowchart) === null || _a === void 0 ? void 0 : _a.defaultRenderer) === 'dagre-wrapper1' && txt.match(/^\s*graph/) !== null)
 */
--- a/src/diagrams/flowchart/flowDetector-v3.ts
+++ b/src/diagrams/flowchart/flowDetector-v3.ts
@@ -1,8 +0,0 @@
 import type { DiagramDetector } from '../../diagram-api/detectType';
 export const flowDetectorV3: DiagramDetector = (txt, config) => {
  // If we have confgured to use dagre-wrapper then we should return true in this function for graph code thus making it use the new flowchart diagram
  if (config?.flowchart?.defaultRenderer === 'cytoscape' && txt.match(/^\s*graph/) !== null)
    return true;
  return txt.match(/^\s*flowchart/) !== null;
 };
--- a/src/diagrams/flowchart/flowRenderer-v2.js
+++ b/src/diagrams/flowchart/flowRenderer-v2.js
@@ -12,7 +12,7 @@ import { interpolateToCurve, getStylesFromArray } from '../../utils';
 import { setupGraphViewbox } from '../../setupGraphViewbox';
 import addSVGAccessibilityFields from '../../accessibility';
-let conf = {};
+const conf = {};
 export const setConf = function (cnf) {
  const keys = Object.keys(cnf);
  for (let i = 0; i < keys.length; i++) {
@@ -351,7 +351,6 @@ export const getClasses = function (text, diagObj) {
 */
 export const draw = function (text, id, _version, diagObj) {
  // const conf = config.getConfig(_version);
  log.info('Drawing flowchart');
  diagObj.db.clear();
  flowDb.setGen('gen-2');
--- a/src/diagrams/flowchart/flowRenderer-v3.js
+++ b/src/diagrams/flowchart/flowRenderer-v3.js
@@ -1,549 +0,0 @@
 import graphlib from 'graphlib';
 import { select, curveLinear, selectAll } from 'd3';
 import flowDb from './flowDb';
 import { getConfig } from '../../config';
 import { insertNode } from '../../dagre-wrapper/nodes.js';
 import { render } from '../../dagre-wrapper/index.js';
 import addHtmlLabel from 'dagre-d3/lib/label/add-html-label.js';
 import { log } from '../../logger';
 import common, { evaluate } from '../common/common';
 import { interpolateToCurve, getStylesFromArray } from '../../utils';
 import { setupGraphViewbox } from '../../setupGraphViewbox';
 import addSVGAccessibilityFields from '../../accessibility';
 import cytoscape from 'cytoscape';
 const conf = {};
 export const setConf = function (cnf) {
  const keys = Object.keys(cnf);
  for (let i = 0; i < keys.length; i++) {
    conf[keys[i]] = cnf[keys[i]];
  }
 };
 // /**
 //  * Function that adds the vertices found during parsing to the graph to be rendered.
 //  *
 //  * @param vert Object containing the vertices.
 //  * @param g The graph that is to be drawn.
 //  * @param svgId
 //  * @param root
 //  * @param doc
 //  * @param diagObj
 //  */
 export const addVertices = function (vert, cy, svgId, root, doc, diagObj) {
  const svg = root.select(`[id="${svgId}"]`);
  const nodes = svg.insert('g').attr('class', 'nodes');
  const keys = Object.keys(vert);
  // Iterate through each item in the vertex object (containing all the vertices found) in the graph definition
  keys.forEach(function (id) {
    const vertex = vert[id];
    /**
     * Variable for storing the classes for the vertex
     *
     * @type {string}
     */
    let classStr = 'default';
    if (vertex.classes.length > 0) {
      classStr = vertex.classes.join(' ');
    }
    const styles = getStylesFromArray(vertex.styles);
    // Use vertex id as text in the box if no text is provided by the graph definition
    let vertexText = vertex.text !== undefined ? vertex.text : vertex.id;
    // We create a SVG label, either by delegating to addHtmlLabel or manually
    let vertexNode;
    if (evaluate(getConfig().flowchart.htmlLabels)) {
      // TODO: addHtmlLabel accepts a labelStyle. Do we possibly have that?
      const node = {
        label: vertexText.replace(
          /fa[lrsb]?:fa-[\w-]+/g,
          (s) => `<i class='${s.replace(':', ' ')}'></i>`
        ),
      };
      vertexNode = addHtmlLabel(svg, node).node();
      vertexNode.parentNode.removeChild(vertexNode);
    } else {
      const svgLabel = doc.createElementNS('http://www.w3.org/2000/svg', 'text');
      svgLabel.setAttribute('style', styles.labelStyle.replace('color:', 'fill:'));
      const rows = vertexText.split(common.lineBreakRegex);
      for (let j = 0; j < rows.length; j++) {
        const tspan = doc.createElementNS('http://www.w3.org/2000/svg', 'tspan');
        tspan.setAttributeNS('http://www.w3.org/XML/1998/namespace', 'xml:space', 'preserve');
        tspan.setAttribute('dy', '1em');
        tspan.setAttribute('x', '1');
        tspan.textContent = rows[j];
        svgLabel.appendChild(tspan);
      }
      vertexNode = svgLabel;
    }
    let radious = 0;
    let _shape = '';
    // Set the shape based parameters
    switch (vertex.type) {
      case 'round':
        radious = 5;
        _shape = 'rect';
        break;
      case 'square':
        _shape = 'rect';
        break;
      case 'diamond':
        _shape = 'question';
        break;
      case 'hexagon':
        _shape = 'hexagon';
        break;
      case 'odd':
        _shape = 'rect_left_inv_arrow';
        break;
      case 'lean_right':
        _shape = 'lean_right';
        break;
      case 'lean_left':
        _shape = 'lean_left';
        break;
      case 'trapezoid':
        _shape = 'trapezoid';
        break;
      case 'inv_trapezoid':
        _shape = 'inv_trapezoid';
        break;
      case 'odd_right':
        _shape = 'rect_left_inv_arrow';
        break;
      case 'circle':
        _shape = 'circle';
        break;
      case 'ellipse':
        _shape = 'ellipse';
        break;
      case 'stadium':
        _shape = 'stadium';
        break;
      case 'subroutine':
        _shape = 'subroutine';
        break;
      case 'cylinder':
        _shape = 'cylinder';
        break;
      case 'group':
        _shape = 'rect';
        break;
      case 'doublecircle':
        _shape = 'doublecircle';
        break;
      default:
        _shape = 'rect';
    }
    // // Add the node
    const node = {
      labelStyle: styles.labelStyle,
      shape: _shape,
      labelText: vertexText,
      rx: radious,
      ry: radious,
      class: classStr,
      style: styles.style,
      id: vertex.id,
      link: vertex.link,
      linkTarget: vertex.linkTarget,
      tooltip: diagObj.db.getTooltip(vertex.id) || '',
      domId: diagObj.db.lookUpDomId(vertex.id),
      haveCallback: vertex.haveCallback,
      width: vertex.type === 'group' ? 500 : undefined,
      dir: vertex.dir,
      type: vertex.type,
      props: vertex.props,
      padding: getConfig().flowchart.padding,
    };
    const nodeEl = insertNode(nodes, node, vertex.dir);
    const boundingBox = nodeEl.node().getBBox();
    cy.add({
      group: 'nodes',
      data: {
        id: vertex.id,
        labelStyle: styles.labelStyle,
        shape: _shape,
        labelText: vertexText,
        rx: radious,
        ry: radious,
        class: classStr,
        style: styles.style,
        link: vertex.link,
        linkTarget: vertex.linkTarget,
        tooltip: diagObj.db.getTooltip(vertex.id) || '',
        domId: diagObj.db.lookUpDomId(vertex.id),
        haveCallback: vertex.haveCallback,
        width: vertex.type === 'group' ? 500 : undefined,
        dir: vertex.dir,
        type: vertex.type,
        props: vertex.props,
        padding: getConfig().flowchart.padding,
        boundingBox,
        el: nodeEl,
      },
    });
    log.trace('setNode', {
      labelStyle: styles.labelStyle,
      shape: _shape,
      labelText: vertexText,
      rx: radious,
      ry: radious,
      class: classStr,
      style: styles.style,
      id: vertex.id,
      domId: diagObj.db.lookUpDomId(vertex.id),
      width: vertex.type === 'group' ? 500 : undefined,
      type: vertex.type,
      dir: vertex.dir,
      props: vertex.props,
      padding: getConfig().flowchart.padding,
    });
  });
 };
 /**
 * Add edges to graph based on parsed graph definition
 *
 * @param {object} edges The edges to add to the graph
 * @param {object} g The graph object
 * @param cy
 * @param diagObj
 */
 export const addEdges = function (edges, cy, diagObj) {
  // log.info('abc78 edges = ', edges);
  let cnt = 0;
  let linkIdCnt = {};
  let defaultStyle;
  let defaultLabelStyle;
  if (typeof edges.defaultStyle !== 'undefined') {
    const defaultStyles = getStylesFromArray(edges.defaultStyle);
    defaultStyle = defaultStyles.style;
    defaultLabelStyle = defaultStyles.labelStyle;
  }
  edges.forEach(function (edge) {
    cnt++;
    // Identify Link
    var linkIdBase = 'L-' + edge.start + '-' + edge.end;
    // count the links from+to the same node to give unique id
    if (typeof linkIdCnt[linkIdBase] === 'undefined') {
      linkIdCnt[linkIdBase] = 0;
      log.info('abc78 new entry', linkIdBase, linkIdCnt[linkIdBase]);
    } else {
      linkIdCnt[linkIdBase]++;
      log.info('abc78 new entry', linkIdBase, linkIdCnt[linkIdBase]);
    }
    let linkId = linkIdBase + '-' + linkIdCnt[linkIdBase];
    log.info('abc78 new link id to be used is', linkIdBase, linkId, linkIdCnt[linkIdBase]);
    var linkNameStart = 'LS-' + edge.start;
    var linkNameEnd = 'LE-' + edge.end;
    const edgeData = { style: '', labelStyle: '' };
    edgeData.minlen = edge.length || 1;
    //edgeData.id = 'id' + cnt;
    // Set link type for rendering
    if (edge.type === 'arrow_open') {
      edgeData.arrowhead = 'none';
    } else {
      edgeData.arrowhead = 'normal';
    }
    // Check of arrow types, placed here in order not to break old rendering
    edgeData.arrowTypeStart = 'arrow_open';
    edgeData.arrowTypeEnd = 'arrow_open';
    /* eslint-disable no-fallthrough */
    switch (edge.type) {
      case 'double_arrow_cross':
        edgeData.arrowTypeStart = 'arrow_cross';
      case 'arrow_cross':
        edgeData.arrowTypeEnd = 'arrow_cross';
        break;
      case 'double_arrow_point':
        edgeData.arrowTypeStart = 'arrow_point';
      case 'arrow_point':
        edgeData.arrowTypeEnd = 'arrow_point';
        break;
      case 'double_arrow_circle':
        edgeData.arrowTypeStart = 'arrow_circle';
      case 'arrow_circle':
        edgeData.arrowTypeEnd = 'arrow_circle';
        break;
    }
    let style = '';
    let labelStyle = '';
    switch (edge.stroke) {
      case 'normal':
        style = 'fill:none;';
        if (typeof defaultStyle !== 'undefined') {
          style = defaultStyle;
        }
        if (typeof defaultLabelStyle !== 'undefined') {
          labelStyle = defaultLabelStyle;
        }
        edgeData.thickness = 'normal';
        edgeData.pattern = 'solid';
        break;
      case 'dotted':
        edgeData.thickness = 'normal';
        edgeData.pattern = 'dotted';
        edgeData.style = 'fill:none;stroke-width:2px;stroke-dasharray:3;';
        break;
      case 'thick':
        edgeData.thickness = 'thick';
        edgeData.pattern = 'solid';
        edgeData.style = 'stroke-width: 3.5px;fill:none;';
        break;
    }
    if (typeof edge.style !== 'undefined') {
      const styles = getStylesFromArray(edge.style);
      style = styles.style;
      labelStyle = styles.labelStyle;
    }
    edgeData.style = edgeData.style += style;
    edgeData.labelStyle = edgeData.labelStyle += labelStyle;
    if (typeof edge.interpolate !== 'undefined') {
      edgeData.curve = interpolateToCurve(edge.interpolate, curveLinear);
    } else if (typeof edges.defaultInterpolate !== 'undefined') {
      edgeData.curve = interpolateToCurve(edges.defaultInterpolate, curveLinear);
    } else {
      edgeData.curve = interpolateToCurve(conf.curve, curveLinear);
    }
    if (typeof edge.text === 'undefined') {
      if (typeof edge.style !== 'undefined') {
        edgeData.arrowheadStyle = 'fill: #333';
      }
    } else {
      edgeData.arrowheadStyle = 'fill: #333';
      edgeData.labelpos = 'c';
    }
    edgeData.labelType = 'text';
    edgeData.label = edge.text.replace(common.lineBreakRegex, '\n');
    if (typeof edge.style === 'undefined') {
      edgeData.style = edgeData.style || 'stroke: #333; stroke-width: 1.5px;fill:none;';
    }
    edgeData.labelStyle = edgeData.labelStyle.replace('color:', 'fill:');
    edgeData.id = linkId;
    edgeData.classes = 'flowchart-link ' + linkNameStart + ' ' + linkNameEnd;
    // Add the edge to the graph
    cy.add({ group: 'edges', data: { source: edge.start, target: edge.end, edgeData, id: cnt } });
  });
 };
 /**
 * Returns the all the styles from classDef statements in the graph definition.
 *
 * @param text
 * @param diagObj
 * @returns {object} ClassDef styles
 */
 export const getClasses = function (text, diagObj) {
  log.info('Extracting classes');
  diagObj.db.clear();
  try {
    // Parse the graph definition
    diagObj.parse(text);
    return diagObj.db.getClasses();
  } catch (e) {
    return;
  }
 };
 /**
 * Draws a flowchart in the tag with id: id based on the graph definition in text.
 *
 * @param text
 * @param id
 */
 export const draw = function (text, id, _version, diagObj) {
  return new Promise(function (resolve, reject) {
    const cy = cytoscape({
      // styleEnabled: false,
      // animate: false,
      // ready: function () {
      //   log.info('Ready', this);
      // },
      container: document.getElementById('cy'), // container to render in
      elements: [
        // list of graph elements to start with
        // { // node a
        //   data: { id: 'a' }
        // },
        // { // node b
        //   data: { id: 'b' }
        // },
        // { // edge ab
        //   data: { id: 'ab', source: 'a', target: 'b' }
        // }
      ],
      style: [
        // the stylesheet for the graph
        {
          selector: 'node',
          style: {
            'background-color': '#666',
            label: 'data(labelText)',
          },
        },
        {
          selector: 'edge',
          style: {
            width: 3,
            'line-color': '#ccc',
            'target-arrow-color': '#ccc',
            'target-arrow-shape': 'triangle',
            'curve-style': 'bezier',
            label: 'data(id)',
          },
        },
      ],
      layout: {
        name: 'breadthfirst',
        rows: 1,
      },
    });
    log.info('Drawing flowchart using v3 renderer');
    // Fetch the default direction, use TD if none was found
    let dir = diagObj.db.getDirection();
    if (typeof dir === 'undefined') {
      dir = 'TD';
    }
    const { securityLevel, flowchart: conf } = getConfig();
    // const nodeSpacing = conf.nodeSpacing || 50;
    // const rankSpacing = conf.rankSpacing || 50;
    // Handle root and document for when rendering in sandbox mode
    let sandboxElement;
    if (securityLevel === 'sandbox') {
      sandboxElement = select('#i' + id);
    }
    const root =
      securityLevel === 'sandbox'
        ? select(sandboxElement.nodes()[0].contentDocument.body)
        : select('body');
    const doc = securityLevel === 'sandbox' ? sandboxElement.nodes()[0].contentDocument : document;
    const svg = root.select(`[id="${id}"]`);
    const edgesEl = svg.insert('g').attr('class', 'edges edgePath');
    // Fetch the vertices/nodes and edges/links from the parsed graph definition
    const vert = diagObj.db.getVertices();
    addVertices(vert, cy, id, root, doc, diagObj);
    // c.style();
    // Make cytoscape care about the dimensisions of the nodes
    cy.nodes().forEach(function (n) {
      n.layoutDimensions = () => {
        const boundingBox = n.data().boundingBox;
        return { w: boundingBox.width, h: boundingBox.height };
      };
    });
    const edges = diagObj.db.getEdges();
    addEdges(edges, cy, diagObj);
    cy.layout({
      // name: 'grid',
      // name: 'circle',
      name: 'cose',
      // name: 'breadthfirst',
      headless: true,
      styleEnabled: false,
      animate: false,
    }).run();
    log.info('Positions', cy.nodes().positions());
    window.cy = cy;
    cy.ready((e) => {
      log.info('Ready', e);
      setTimeout(() => {
        cy.nodes().map((node, id) => {
          const data = node.data();
          log.info('Position: (', node.position().x, ', ', node.position().y, ')', data);
          data.el.attr('transform', `translate(${node.position().x}, ${node.position().y})`);
          // document
          //   .querySelector(`[id="${data.domId}"]`)
          //   .setAttribute('transform', `translate(${node.position().x}, ${node.position().y})`);
          log.info('Id = ', data.domId, svg.select(`[id="${data.domId}"]`), data.el.node());
        });
        cy.edges().map((edge, id) => {
          const data = edge.data();
          if (edge[0]._private.bodyBounds) {
            const bounds = edge[0]._private.rscratch;
            log.info(
              id,
              // 'x:',
              // edge.controlPoints(),
              // 'y:',
              edge[0]._private.rscratch
              // 'w:',
              // edge.boundingbox().w,
              // 'h:',
              // edge.boundingbox().h,
              // edge.midPoint()
            );
            // data.el.attr('transform', `translate(${node.position().x}, ${node.position().y})`);
            // edgesEl
            //   .insert('line')
            //   .attr('x1', bounds.startX)
            //   .attr('y1', bounds.startY)
            //   .attr('x2', bounds.endX)
            //   .attr('y2', bounds.endY)
            //   .attr('class', 'path');
            edgesEl
              .insert('path')
              // Todo use regular line function
              .attr(
                'd',
                `M ${bounds.startX},${bounds.startY} L ${bounds.midX},${bounds.midY} L${bounds.endX},${bounds.endY} `
              )
              .attr('class', 'path')
              .attr('fill', 'none');
          }
        });
        log.info(cy.json());
        setupGraphViewbox({}, svg, conf.diagramPadding, conf.useMaxWidth);
        resolve();
      }, 500);
    });
  });
 };
 export default {
  // setConf,
  // addVertices,
  // addEdges,
  getClasses,
  draw,
 };
--- a/src/diagrams/flowchart/flowRenderer.js
+++ b/src/diagrams/flowchart/flowRenderer.js
@@ -29,8 +29,6 @@ export const setConf = function (cnf) {
 * @param diagObj
 */
 export const addVertices = function (vert, g, svgId, root, _doc, diagObj) {
  const securityLevel = getConfig().securityLevel;
  const svg = !root ? select(`[id="${svgId}"]`) : root.select(`[id="${svgId}"]`);
  const doc = !_doc ? document : _doc;
  const keys = Object.keys(vert);
--- a/src/diagrams/gantt/ganttDb.js
+++ b/src/diagrams/gantt/ganttDb.js
@@ -4,7 +4,7 @@ import { log } from '../../logger';
 import * as configApi from '../../config';
 import utils from '../../utils';
 import mermaidAPI from '../../mermaidAPI';
-import common from '../common/common';
+
 import {
  setAccTitle,
  getAccTitle,
@@ -21,8 +21,6 @@ let todayMarker = '';
 let includes = [];
 let excludes = [];
 let links = {};
 let title = '';
 let accDescription = '';
 let sections = [];
 let tasks = [];
 let currentSection = '';
@@ -34,10 +32,6 @@ let topAxis = false;
 // The serial order of the task in the script
 let lastOrder = 0;
 const sanitizeText = function (txt) {
  return common.sanitizeText(txt, configApi.getConfig());
 };
 export const parseDirective = function (statement, context, type) {
  mermaidAPI.parseDirective(this, statement, context, type);
 };
@@ -47,7 +41,6 @@ export const clear = function () {
  tasks = [];
  currentSection = '';
  funs = [];
  title = '';
  taskCnt = 0;
  lastTask = undefined;
  lastTaskID = undefined;
@@ -247,7 +240,8 @@ const getStartDate = function (prevTime, dateFormat, str) {
 * - `ms` for milliseconds
 *
 * @param {string} str - A string representing the duration.
- * @returns {moment.Duration} A moment duration, including an invalid moment for invalid input string.
+ * @returns {moment.Duration} A moment duration, including an invalid moment for invalid input
 *   string.
 */
 const parseDuration = function (str) {
  const statement = /^(\d+(?:\.\d+)?)([yMwdhms]|ms)$/.exec(str.trim());
--- a/src/diagrams/gantt/ganttRenderer.js
+++ b/src/diagrams/gantt/ganttRenderer.js
@@ -391,7 +391,6 @@ export const draw = function (text, id, version, diagObj) {
    if (securityLevel === 'sandbox') {
      let sandboxElement;
      sandboxElement = select('#i' + id);
      const root = select(sandboxElement.nodes()[0].contentDocument.body);
      const doc = sandboxElement.nodes()[0].contentDocument;
      rectangles
--- a/src/diagrams/git/gitGraphParserV2.spec.js
+++ b/src/diagrams/git/gitGraphParserV2.spec.js
@@ -372,14 +372,16 @@ describe('when parsing a gitGraph', function () {
    branch cherry-pick03
    branch branch/example-branch
    branch merge/test_merge
    %% single character branch name
    branch A
    `;
    parser.parse(str);
    const commits = parser.yy.getCommits();
    expect(Object.keys(commits).length).toBe(1);
-    expect(parser.yy.getCurrentBranch()).toBe('merge/test_merge');
+    expect(parser.yy.getCurrentBranch()).toBe('A');
    expect(parser.yy.getDirection()).toBe('LR');
-    expect(Object.keys(parser.yy.getBranches()).length).toBe(6);
+    expect(Object.keys(parser.yy.getBranches()).length).toBe(7);
    expect(Object.keys(parser.yy.getBranches())).toEqual(
      expect.arrayContaining([
        'branch01',
@@ -387,6 +389,7 @@ describe('when parsing a gitGraph', function () {
        'cherry-pick03',
        'branch/example-branch',
        'merge/test_merge',
        'A',
      ])
    );
  });
--- a/src/diagrams/git/gitGraphRenderer.js
+++ b/src/diagrams/git/gitGraphRenderer.js
@@ -5,7 +5,6 @@ import { getConfig } from '../../config';
 import addSVGAccessibilityFields from '../../accessibility';
 let allCommitsDict = {};
 let branchNum;
 const commitType = {
  NORMAL: 0,
@@ -83,7 +82,7 @@ const drawCommits = (svg, commits, modifyGraph) => {
  const sortedKeys = keys.sort((a, b) => {
    return commits[a].seq - commits[b].seq;
  });
-  sortedKeys.forEach((key, index) => {
+  sortedKeys.forEach((key) => {
    const commit = commits[key];
    const y = branchPos[commit.branch].pos;
@@ -92,7 +91,9 @@ const drawCommits = (svg, commits, modifyGraph) => {
    if (modifyGraph) {
      let typeClass;
      let commitSymbolType =
-        typeof commit.customType !== 'undefined' ? commit.customType : commit.type;
+        typeof commit.customType !== 'undefined' && commit.customType !== ''
          ? commit.customType
          : commit.type;
      switch (commitSymbolType) {
        case commitType.NORMAL:
          typeClass = 'commit-normal';
@@ -290,18 +291,15 @@ const drawCommits = (svg, commits, modifyGraph) => {
 };
 /**
- * Detect if there are other commits between commit1's x-position and commit2's x-position on the same
+ * Detect if there are other commits between commit1's x-position and commit2's x-position on the
- * branch as commit2.
+ * same branch as commit2.
 *
 * @param {any} commit1
 * @param {any} commit2
 * @param allCommits
- * @returns {boolean} if there are commits between commit1's x-position and commit2's x-position
+ * @returns {boolean} If there are commits between commit1's x-position and commit2's x-position
 */
 const hasOverlappingCommits = (commit1, commit2, allCommits) => {
  const commit1Pos = commitPos[commit2.id];
  const commit2Pos = commitPos[commit1.id];
  // Find commits on the same branch as commit2
  const keys = Object.keys(allCommits);
  const overlappingComits = keys.filter((key) => {
@@ -322,7 +320,7 @@ const hasOverlappingCommits = (commit1, commit2, allCommits) => {
 * @param {any} y1
 * @param {any} y2
 * @param {any} _depth
- * @returns {number} y value between y1 and y2
+ * @returns {number} Y value between y1 and y2
 */
 const findLane = (y1, y2, _depth) => {
  const depth = _depth || 0;
@@ -355,25 +353,11 @@ const findLane = (y1, y2, _depth) => {
 * @param {any} allCommits
 */
 const drawArrow = (svg, commit1, commit2, allCommits) => {
  const conf = getConfig();
  const p1 = commitPos[commit1.id];
  const p2 = commitPos[commit2.id];
  const overlappingCommits = hasOverlappingCommits(commit1, commit2, allCommits);
  // log.debug('drawArrow', p1, p2, overlappingCommits, commit1.id, commit2.id);
  let url = '';
  if (conf.arrowMarkerAbsolute) {
    url =
      window.location.protocol +
      '//' +
      window.location.host +
      window.location.pathname +
      window.location.search;
    url = url.replace(/\(/g, '\\(');
    url = url.replace(/\)/g, '\\)');
  }
  let arc = '';
  let arc2 = '';
  let radius = 0;
@@ -431,7 +415,7 @@ const drawArrow = (svg, commit1, commit2, allCommits) => {
      } ${p2.y}`;
    }
  }
-  const arrow = svg
+  svg
    .append('path')
    .attr('d', lineDef)
    .attr('class', 'arrow arrow' + (colorClassNum % THEME_COLOR_LIMIT));
@@ -439,10 +423,7 @@ const drawArrow = (svg, commit1, commit2, allCommits) => {
 const drawArrows = (svg, commits) => {
  const gArrows = svg.append('g').attr('class', 'commit-arrows');
-  let pos = 0;
+  Object.keys(commits).forEach((key) => {
  const k = Object.keys(commits);
  k.forEach((key, index) => {
    const commit = commits[key];
    if (commit.parents && commit.parents.length > 0) {
      commit.parents.forEach((parent) => {
--- a/src/diagrams/git/parser/gitGraph.jison
+++ b/src/diagrams/git/parser/gitGraph.jison
@@ -61,7 +61,7 @@ checkout(?=\s|$)                        return 'CHECKOUT';
 <string>["]                             this.popState();
 <string>[^"]*                           return 'STR';
 [0-9]+(?=\s|$)                          return 'NUM';
-\w[-\./\w]*[-\w]                        return 'ID'; // only a subset of https://git-scm.com/docs/git-check-ref-format
+\w([-\./\w]*[-\w])?                     return 'ID'; // only a subset of https://git-scm.com/docs/git-check-ref-format
 <<EOF>>                                 return 'EOF';
 \s+                                    /* skip all whitespace */ // lowest priority so we can use lookaheads in earlier regex
--- a/src/diagrams/info/infoRenderer.js
+++ b/src/diagrams/info/infoRenderer.js
@@ -27,7 +27,6 @@ export const draw = (text, id, version, diagObj) => {
      securityLevel === 'sandbox'
        ? select(sandboxElement.nodes()[0].contentDocument.body)
        : select('body');
    const doc = securityLevel === 'sandbox' ? sandboxElement.nodes()[0].contentDocument : document;
    // Parse the graph definition
    // parser.parse(text);
--- a/src/diagrams/mindmap/mindmapRenderer.js
+++ b/src/diagrams/mindmap/mindmapRenderer.js
@@ -2,7 +2,7 @@
 import { select } from 'd3';
 import { log, getConfig, setupGraphViewbox } from '../../diagram-api/diagramAPI';
 import svgDraw from './svgDraw';
-import { BoundingBox, Layout, Tree } from 'non-layered-tidy-tree-layout';
+import { BoundingBox, Layout } from 'non-layered-tidy-tree-layout';
 import clone from 'fast-clone';
 import * as db from './mindmapDb';
@@ -85,9 +85,8 @@ function rightToLeft(mindmap) {
 /**
 * @param mindmap
 * @param dir
 * @param conf
 */
-function layout(mindmap, dir, conf) {
+function layout(mindmap, dir) {
  const bb = new BoundingBox(30, 60);
  const layout = new Layout(bb);
@@ -192,8 +191,7 @@ function layoutMindmap(node, conf) {
  });
  // Merge the trees into a single tree
-  const result = mergeTrees(node, trees);
+  mergeTrees(node, trees);
  eachNode;
  return node;
 }
 /**
@@ -232,13 +230,11 @@ export const draw = (text, id, version, diagObj) => {
      securityLevel === 'sandbox'
        ? select(sandboxElement.nodes()[0].contentDocument.body)
        : select('body');
    const doc = securityLevel === 'sandbox' ? sandboxElement.nodes()[0].contentDocument : document;
    // Parse the graph definition
    const svg = root.select('#' + id);
-    const g = svg.append('g');
+    svg.append('g');
    const mm = diagObj.db.getMindmap();
    // Draw the graph and start with drawing the nodes without proper position
--- a/src/diagrams/mindmap/styles.js
+++ b/src/diagrams/mindmap/styles.js
@@ -1,4 +1,4 @@
-import { darken, lighten, adjust, invert, isDark } from 'khroma';
+import { darken, lighten, isDark } from 'khroma';
 const genSections = (options) => {
  let sections = '';
--- a/src/diagrams/mindmap/svgDraw.js
+++ b/src/diagrams/mindmap/svgDraw.js
@@ -47,9 +47,9 @@ function wrap(text, width) {
  });
 }
-const defaultBkg = function (elem, node, section, conf) {
+const defaultBkg = function (elem, node, section) {
  const rd = 5;
-  const r = elem
+  elem
    .append('path')
    .attr('id', 'node-' + node.id)
    .attr('class', 'node-bkg node-' + db.type2Str(node.type))
@@ -68,25 +68,22 @@ const defaultBkg = function (elem, node, section, conf) {
    .attr('x2', node.width)
    .attr('y2', node.height);
 };
-const rectBkg = function (elem, node, section, conf) {
+const rectBkg = function (elem, node) {
-  const r = elem
+  elem
    .append('rect')
    .attr('id', 'node-' + node.id)
    .attr('class', 'node-bkg node-' + db.type2Str(node.type))
    .attr('height', node.height)
    .attr('width', node.width);
 };
-const cloudBkg = function (elem, node, section, conf) {
+const cloudBkg = function (elem, node) {
  const rd = 5;
  const r = elem;
  const w = node.width;
  const h = node.height;
  const r0 = 0.1 * w;
  const r1 = 0.15 * w;
  const r2 = 0.25 * w;
  const r3 = 0.35 * w;
  const r4 = 0.2 * w;
-  const p = elem
+  elem
    .append('path')
    .attr('id', 'node-' + node.id)
    .attr('class', 'node-bkg node-' + db.type2Str(node.type))
@@ -109,12 +106,11 @@ const cloudBkg = function (elem, node, section, conf) {
    H0 V0 Z`
    );
 };
-const bangBkg = function (elem, node, section, conf) {
+const bangBkg = function (elem, node) {
  const rd = 5;
  const w = node.width;
  const h = node.height;
  const r = 0.15 * w;
-  const p = elem
+  elem
    .append('path')
    .attr('id', 'node-' + node.id)
    .attr('class', 'node-bkg node-' + db.type2Str(node.type))
@@ -141,16 +137,15 @@ const bangBkg = function (elem, node, section, conf) {
    H0 V0 Z`
    );
 };
-const circleBkg = function (elem, node, section, conf) {
+const circleBkg = function (elem, node) {
-  const r = elem
+  elem
    .append('circle')
    .attr('id', 'node-' + node.id)
    .attr('class', 'node-bkg node-' + db.type2Str(node.type))
    .attr('r', node.width / 2);
  // .attr('width', node.width);
 };
-const roundedRectBkg = function (elem, node, section, conf) {
+const roundedRectBkg = function (elem, node) {
-  const r = elem
+  elem
    .append('rect')
    .attr('id', 'node-' + node.id)
    .attr('class', 'node-bkg node-' + db.type2Str(node.type))
@@ -183,7 +178,6 @@ export const drawNode = function (elem, node, section, conf) {
    .append('text')
    .text(node.descr)
    .attr('dy', '1em')
    // .attr('dy', '0')
    .attr('alignment-baseline', 'middle')
    .attr('dominant-baseline', 'middle')
    .attr('text-anchor', 'middle')
@@ -195,18 +189,12 @@ export const drawNode = function (elem, node, section, conf) {
  if (node.icon) {
    if (node.type === db.nodeType.CIRCLE) {
      node.height += 50;
      const orgWidth = node.width;
      node.width += 50;
      // node.width = Math.max(orgWidth, 100);
      const widthDiff = Math.abs(node.width - orgWidth);
      const icon = nodeElem
        .append('foreignObject')
        .attr('height', '50px')
        .attr('width', node.width)
        .attr('style', 'text-align: center;');
      // .attr('x', 0)
      // .attr('y', 0)
      // .attr('class', 'node-icon ' + node.icon);
      icon
        .append('div')
        .attr('class', 'icon-container')
@@ -226,9 +214,7 @@ export const drawNode = function (elem, node, section, conf) {
        .attr('width', '60px')
        .attr('height', node.height)
        .attr('style', 'text-align: center;margin-top:' + heightDiff / 2 + 'px;');
-      // .attr('x', 0)
+
      // .attr('y', 0)
      // .attr('class', 'node-icon ' + node.icon);
      icon
        .append('div')
        .attr('class', 'icon-container')
@@ -258,15 +244,11 @@ export const drawNode = function (elem, node, section, conf) {
      circleBkg(bkgElem, node, section, conf);
      break;
    case db.nodeType.CLOUD:
      // bkgElem.attr('transform', 'translate(' + node.width / 2 + ', ' + +node.height / 2 + ')');
      cloudBkg(bkgElem, node, section, conf);
      break;
    case db.nodeType.BANG:
      // bkgElem.attr('transform', 'translate(' + node.width / 2 + ', ' + +node.height / 2 + ')');
      bangBkg(bkgElem, node, section, conf);
      break;
    default:
    // defaultBkg(bkgElem, node, section, conf);
  }
  // Position the node to its coordinate
@@ -277,17 +259,7 @@ export const drawNode = function (elem, node, section, conf) {
  return node.height;
 };
-export const drawEdge = function drawEdge(edgesElem, mindmap, parent, depth, section, conf) {
+export const drawEdge = function drawEdge(edgesElem, mindmap, parent, depth, section) {
  // edgesElem
  //   .append('line')
  //   .attr('x1', parent.x + parent.width / 2)
  //   .attr('y1', parent.y + parent.height / 2)
  //   .attr('x2', mindmap.x + mindmap.width / 2)
  //   .attr('y2', mindmap.y + mindmap.height / 2)
  //   .attr('class', 'edge section-edge-' + section + ' edge-depth-' + depth);
  //<path d="M100,250 Q250,100 400,250 T700,250" />
  const sx = parent.x + parent.width / 2;
  const sy = parent.y + parent.height / 2;
  const ex = mindmap.x + mindmap.width / 2;
@@ -308,7 +280,7 @@ export const drawEdge = function drawEdge(edgesElem, mindmap, parent, depth, sec
    .attr('class', 'edge section-edge-' + section + ' edge-depth-' + depth);
 };
-export const positionNode = function (node, conf) {
+export const positionNode = function (node) {
  const nodeElem = db.getElementById(node.id);
  const x = node.x || 0;
--- a/src/diagrams/pie/pieDb.js
+++ b/src/diagrams/pie/pieDb.js
@@ -13,8 +13,6 @@ import {
 } from '../../commonDb';
 let sections = {};
 let title = '';
 let description = '';
 let showData = false;
 export const parseDirective = function (statement, context, type) {
@@ -49,7 +47,6 @@ const cleanupValue = function (value) {
 const clear = function () {
  sections = {};
  title = '';
  showData = false;
  commonClear();
 };
--- a/src/diagrams/requirement/requirementDb.js
+++ b/src/diagrams/requirement/requirementDb.js
@@ -1,7 +1,7 @@
 import * as configApi from '../../config';
 import { log } from '../../logger';
 import mermaidAPI from '../../mermaidAPI';
-import common from '../common/common';
+
 import {
  setAccTitle,
  getAccTitle,
@@ -15,10 +15,6 @@ let latestRequirement = {};
 let requirements = {};
 let latestElement = {};
 let elements = {};
 let title = '';
 let accDescription = '';
 const sanitizeText = (txt) => common.sanitizeText(txt, configApi.getConfig());
 const RequirementType = {
  REQUIREMENT: 'Requirement',
--- a/src/diagrams/requirement/requirementRenderer.js
+++ b/src/diagrams/requirement/requirementRenderer.js
@@ -320,7 +320,6 @@ export const draw = (text, id, _version, diagObj) => {
    securityLevel === 'sandbox'
      ? select(sandboxElement.nodes()[0].contentDocument.body)
      : select('body');
  const doc = securityLevel === 'sandbox' ? sandboxElement.nodes()[0].contentDocument : document;
  const svg = root.select(`[id='${id}']`);
  markers.insertLineEndings(svg, conf);
--- a/src/diagrams/sequence/sequenceDb.js
+++ b/src/diagrams/sequence/sequenceDb.js
@@ -16,8 +16,6 @@ let prevActor = undefined;
 let actors = {};
 let messages = [];
 const notes = [];
 let diagramTitle = '';
 let description = '';
 let sequenceNumbersEnabled = false;
 let wrapEnabled;
@@ -153,7 +151,6 @@ export const clear = function () {
  actors = {};
  messages = [];
  sequenceNumbersEnabled = false;
  diagramTitle = '';
  commonClear();
 };
--- a/src/diagrams/state/stateDb.js
+++ b/src/diagrams/state/stateDb.js
@@ -11,8 +11,6 @@ import {
  clear as commonClear,
 } from '../../commonDb';
 const sanitizeText = (txt) => common.sanitizeText(txt, configApi.getConfig());
 const clone = (o) => JSON.parse(JSON.stringify(o));
 let rootDoc = [];
@@ -121,10 +119,6 @@ let documents = {
 let currentDocument = documents.root;
 let startCnt = 0;
 let endCnt = 0; // let stateCnt = 0;
 let title = 'State diagram';
 let description = '';
 /**
 * Function called by parser when a node definition has been found.
@@ -179,7 +173,6 @@ export const clear = function (saveCommon) {
  currentDocument = documents.root;
  startCnt = 0;
  endCnt = 0;
  classes = [];
  if (!saveCommon) {
    commonClear();
@@ -211,7 +204,6 @@ export const addRelation = function (_id1, _id2, title) {
    type1 = 'start';
  }
  if (_id2 === '[*]') {
    endCnt++;
    id2 = 'end' + startCnt;
    type2 = 'end';
  }
--- a/src/diagrams/state/stateRenderer-v2.js
+++ b/src/diagrams/state/stateRenderer-v2.js
@@ -283,7 +283,6 @@ export const draw = function (text, id, _version, diag) {
    securityLevel === 'sandbox'
      ? select(sandboxElement.nodes()[0].contentDocument.body)
      : select('body');
  const doc = securityLevel === 'sandbox' ? sandboxElement.nodes()[0].contentDocument : document;
  const svg = root.select(`[id="${id}"]`);
  // Run the renderer. This is what draws the final graph.
--- a/src/diagrams/user-journey/journeyDb.js
+++ b/src/diagrams/user-journey/journeyDb.js
@@ -1,6 +1,5 @@
 import mermaidAPI from '../../mermaidAPI';
 import * as configApi from '../../config';
 import common from '../common/common';
 import {
  setAccTitle,
  getAccTitle,
@@ -11,10 +10,6 @@ import {
  clear as commonClear,
 } from '../../commonDb';
 const sanitizeText = (txt) => common.sanitizeText(txt, configApi.getConfig());
 let title = '';
 let description = '';
 let currentSection = '';
 const sections = [];
@@ -29,8 +24,6 @@ export const clear = function () {
  sections.length = 0;
  tasks.length = 0;
  currentSection = '';
  title = '';
  description = '';
  rawTasks.length = 0;
  commonClear();
 };
--- a/src/mermaid.ts
+++ b/src/mermaid.ts
@@ -95,9 +95,11 @@ const initThrowsErrors = function (
  const idGenerator = new utils.initIdGenerator(conf.deterministicIds, conf.deterministicIDSeed);
  let txt;
  const errors = [];
  // element is the current div with mermaid class
  for (const element of Array.from(nodesToProcess)) {
    log.info('Rendering diagram: ' + element.id);
    /*! Check if previously processed */
    if (element.getAttribute('data-processed')) {
      continue;
@@ -135,9 +137,16 @@ const initThrowsErrors = function (
    } catch (error) {
      log.warn('Catching Error (bootstrap)', error);
      // @ts-ignore: TODO Fix ts errors
-      // TODO: We should be throwing an error object.
+      const mermaidError = { error, str: error.str, hash: error.hash, message: error.str };
-      throw { error, message: error.str };
+      if (typeof mermaid.parseError === 'function') {
        mermaid.parseError(mermaidError);
      }
      errors.push(mermaidError);
    }
  }
  if (errors.length > 0) {
    // TODO: We should be throwing an error object.
    throw errors[0];
  }
 };
--- a/src/mermaidAPI.ts
+++ b/src/mermaidAPI.ts
@@ -26,7 +26,7 @@ import flowDb from './diagrams/flowchart/flowDb';
 import flowRenderer from './diagrams/flowchart/flowRenderer';
 import ganttDb from './diagrams/gantt/ganttDb';
 import Diagram from './Diagram';
-import errorRenderer from './errorRenderer';
+import errorRenderer from './diagrams/error/errorRenderer';
 import { attachFunctions } from './interactionDb';
 import { log, setLogLevel } from './logger';
 import getStyles from './styles';
@@ -118,12 +118,16 @@ export const decodeEntities = function (text: string): string {
 *   element will be removed when rendering is completed.
 * @returns {void}
 */
-const render = async function (
+const render = function (
  id: string,
  text: string,
  cb: (svgCode: string, bindFunctions?: (element: Element) => void) => void,
  container?: Element
-): Promise<void> {
+): void {
  if (!hasLoadedDiagrams) {
    addDiagrams();
    hasLoadedDiagrams = true;
  }
  configApi.reset();
  text = text.replace(/\r\n?/g, '\n'); // parser problems on CRLF ignore all CR and leave LF;;
  const graphInit = utils.detectInit(text);
@@ -228,7 +232,14 @@ const render = async function (
  text = encodeEntities(text);
  // Important that we do not create the diagram until after the directives have been included
-  const diag = new Diagram(text);
+  let diag;
  let parseEncounteredException;
  try {
    diag = new Diagram(text);
  } catch (error) {
    diag = new Diagram('error');
    parseEncounteredException = error;
  }
  // Get the tmp element containing the the svg
  const element = root.select('#d' + id).node();
  const graphType = diag.type;
@@ -299,9 +310,9 @@ const render = async function (
  svg.insertBefore(style1, firstChild);
  try {
-    await diag.renderer.draw(text, id, pkg.version, diag);
+    diag.renderer.draw(text, id, pkg.version, diag);
  } catch (e) {
-    errorRenderer.draw(id, pkg.version);
+    errorRenderer.draw(text, id, pkg.version);
    throw e;
  }
@@ -371,6 +382,10 @@ const render = async function (
    node.remove();
  }
  if (parseEncounteredException) {
    throw parseEncounteredException;
  }
  return svgCode;
 };
--- a/src/styles.ts
+++ b/src/styles.ts
@@ -1,5 +1,6 @@
 import classDiagram from './diagrams/class/styles';
 import er from './diagrams/er/styles';
 import error from './diagrams/error/styles';
 import flowchart from './diagrams/flowchart/styles';
 import gantt from './diagrams/gantt/styles';
 // import gitGraph from './diagrams/git/styles';
@@ -28,6 +29,7 @@ const themes: Record<string, any> = {
  info,
  pie,
  er,
  error,
  journey,
  requirement,
  c4,
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -39,12 +39,10 @@ const directive =
  /[%]{2}[{]\s*(?:(?:(\w+)\s*:|(\w+))\s*(?:(?:(\w+))|((?:(?![}][%]{2}).|\r?\n)*))?\s*)(?:[}][%]{2})?/gi;
 const directiveWithoutOpen =
  /\s*(?:(?:(\w+)(?=:):|(\w+))\s*(?:(?:(\w+))|((?:(?![}][%]{2}).|\r?\n)*))?\s*)(?:[}][%]{2})?/gi;
 const anyComment = /\s*%%.*\n/gm;
 /**
 * @function detectInit Detects the init config object from the text
 * @param config
 * @param config
 *
 *   ```mermaid
 *
@@ -73,7 +71,7 @@ const anyComment = /\s*%%.*\n/gm;
 *    g-->h
 * ```
 * @param {string} text The text defining the graph
- * @param {any} cnf
+ * @param {any} config
 * @returns {object} The json object representing the init passed to mermaid.initialize()
 */
 export const detectInit = function (text: string, config?: MermaidConfig): MermaidConfig {
@@ -329,7 +327,6 @@ const calcLabelPosition = (points) => {
 const calcCardinalityPosition = (isRelationTypePresent, points, initialPosition) => {
  let prevPoint;
  let totalDistance = 0;
  log.info('our points', points);
  if (points[0] !== initialPosition) {
    points = points.reverse();
@@ -389,14 +386,12 @@ const calcTerminalLabelPosition = (terminalMarkerSize, position, _points) => {
  // Todo looking to faster cloning method
  let points = JSON.parse(JSON.stringify(_points));
  let prevPoint;
  let totalDistance = 0;
  log.info('our points', points);
  if (position !== 'start_left' && position !== 'start_right') {
    points = points.reverse();
  }
  points.forEach((point) => {
    totalDistance += distance(point, prevPoint);
    prevPoint = point;
  });
@@ -728,19 +723,6 @@ export const calculateTextDimensions = memoize(
  (text, config) => `${text}-${config.fontSize}-${config.fontWeight}-${config.fontFamily}`
 );
 /**
 * Applys d3 attributes
 *
 * @param {any} d3Elem D3 Element to apply the attributes onto
 * @param {[string, string][]} attrs Object.keys equivalent format of key to value mapping of
 *   attributes
 */
 const d3Attrs = function (d3Elem, attrs) {
  for (const attr of attrs) {
    d3Elem.attr(attr[0], attr[1]);
  }
 };
 export const initIdGenerator = class iterator {
  constructor(deterministic, seed) {
    this.deterministic = deterministic;
@@ -763,7 +745,7 @@ let decoder;
 * Decodes HTML, source: {@link https://github.com/shrpne/entity-decode/blob/v2.0.1/browser.js}
 *
 * @param {string} html HTML as a string
- * @returns Unescaped HTML
+ * @returns {string} Unescaped HTML
 */
 export const entityDecode = function (html) {
  decoder = decoder || document.createElement('div');
--- a/yarn.lock
+++ b/yarn.lock
@@ -4710,14 +4710,6 @@ cypress@9.7.0:
    untildify "^4.0.0"
    yauzl "^2.10.0"
 cytoscape@^3.23.0:
  version "3.23.0"
  resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.23.0.tgz#054ee05a6d0aa3b4f139382bbf2f4e5226df3c6d"
  integrity sha512-gRZqJj/1kiAVPkrVFvz/GccxsXhF3Qwpptl32gKKypO4IlqnKBjTOu+HbXtEggSGzC5KCaHp3/F7GgENrtsFkA==
  dependencies:
    heap "^0.2.6"
    lodash "^4.17.21"
 "d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.1.1.tgz#7797eb53ead6b9083c75a45a681e93fc41bc468c"
@@ -5378,10 +5370,10 @@ domhandler@^5.0.1, domhandler@^5.0.2:
  dependencies:
    domelementtype "^2.3.0"
-dompurify@2.3.10:
+dompurify@2.4.0:
-  version "2.3.10"
+  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.10.tgz#901f7390ffe16a91a5a556b94043314cd4850385"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.0.tgz#c9c88390f024c2823332615c9e20a453cf3825dd"
-  integrity sha512-o7Fg/AgC7p/XpKjf/+RC3Ok6k4St5F7Q6q6+Nnm3p2zGWioAY6dh0CbbuwOhH2UcSzKsdniE/YnE2/92JcsA+g==
+  integrity sha512-Be9tbQMZds4a3C6xTmz68NlMfeONA//4dOavl/1rNw50E+/QO0KVpbcU0PcaW0nsQxurXls9ZocqFxk8R2mWEA==
 domutils@^3.0.1:
  version "3.0.1"
@@ -6783,11 +6775,6 @@ he@^1.1.0:
  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 heap@^0.2.6:
  version "0.2.7"
  resolved "https://registry.yarnpkg.com/heap/-/heap-0.2.7.tgz#1e6adf711d3f27ce35a81fe3b7bd576c2260a8fc"
  integrity sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg==
 highlight.js@^10.5.0:
  version "10.7.3"
  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531"
@@ -11283,10 +11270,10 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
-stylis@^4.0.10:
+stylis@^4.1.2:
-  version "4.1.1"
+  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.1.1.tgz#e46c6a9bbf7c58db1e65bb730be157311ae1fe12"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.1.2.tgz#870b3c1c2275f51b702bb3da9e94eedad87bba41"
-  integrity sha512-lVrM/bNdhVX2OgBFNa2YJ9Lxj7kPzylieHd3TNjuGE0Re9JB7joL5VUKOVH1kdNNJTgGPpT8hmwIAPLaSyEVFQ==
+  integrity sha512-Nn2CCrG2ZaFziDxaZPN43CXqn+j7tcdjPFCkRBkFue8QYXC2HdEwnw5TCBo4yQZ2WxKYeSi0fdoOrtEqgDrXbA==
 subarg@^1.0.0:
  version "1.0.0"
@@ -12312,10 +12299,10 @@ webpack-dev-middleware@^5.3.1:
    range-parser "^1.2.1"
    schema-utils "^4.0.0"
-webpack-dev-server@^4.10.1:
+webpack-dev-server@^4.11.0:
-  version "4.10.1"
+  version "4.11.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.10.1.tgz#124ac9ac261e75303d74d95ab6712b4aec3e12ed"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.11.0.tgz#290ee594765cd8260adfe83b2d18115ea04484e7"
-  integrity sha512-FIzMq3jbBarz3ld9l7rbM7m6Rj1lOsgq/DyLGMX/fPEB1UBUPtf5iL/4eNfhx8YYJTRlzfv107UfWSWcBK5Odw==
+  integrity sha512-L5S4Q2zT57SK7tazgzjMiSMBdsw+rGYIX27MgPgx7LDhWO0lViPrHKoLS7jo5In06PWYAhlYu3PbyoC6yAThbw==
  dependencies:
    "@types/bonjour" "^3.5.9"
    "@types/connect-history-api-fallback" "^1.3.5"
Author	SHA1	Message	Date
Knut Sveidqvist	9c88c785cb	Fix for issues in errorhandling and class diagrams after refactoring	2022-09-16 14:05:15 +02:00
Knut Sveidqvist	2d9f25b163	Merge pull request #3469 from mermaid-js/sidv/mergeRelease Merge release 9.1.7	2022-09-16 11:22:35 +02:00
Knut Sveidqvist	10d9b88965	Merge pull request #3466 from mermaid-js/sidv/removeGA Replace GoogleAnalytics with Plausible	2022-09-16 08:54:38 +02:00
Knut Sveidqvist	207235ea83	Merge pull request #3464 from aloisklink/fix/3463-support-single-char-branch-names fix(git): support single character branch names	2022-09-16 08:53:12 +02:00
Knut Sveidqvist	97ab62514c	Merge pull request #3461 from mermaid-js/mindmap_warning Cleanup unused variables and some commented out code	2022-09-16 08:44:01 +02:00
Sidharth Vinod	5c2a45cd4d	Replace GoogleAnalytics with Plausible	2022-09-15 17:48:00 +05:30
dependabot[bot]	064c3134e5	chore(deps): bump dompurify from 2.3.10 to 2.4.0 (#3444 ) Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.3.10 to 2.4.0. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/2.3.10...2.4.0) --- updated-dependencies: - dependency-name: dompurify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-09-15 07:42:28 +02:00
dependabot[bot]	6340c157e8	chore(deps): bump stylis from 4.1.1 to 4.1.2 (#3439 ) Bumps [stylis](https://github.com/thysultan/stylis.js) from 4.1.1 to 4.1.2. - [Release notes](https://github.com/thysultan/stylis.js/releases) - [Commits](https://github.com/thysultan/stylis.js/compare/v4.1.1...v4.1.2) --- updated-dependencies: - dependency-name: stylis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-09-15 07:42:13 +02:00
dependabot[bot]	e9239f83e9	chore(deps-dev): bump webpack-dev-server from 4.10.1 to 4.11.0 (#3450 ) Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 4.10.1 to 4.11.0. - [Release notes](https://github.com/webpack/webpack-dev-server/releases) - [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-dev-server/compare/v4.10.1...v4.11.0) --- updated-dependencies: - dependency-name: webpack-dev-server dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Tested-by: Alois Klink <19716675+aloisklink@users.noreply.github.com>	2022-09-15 01:55:27 +01:00
Alois Klink	59c69600e8	fix(git): support single character branch names In gitGraph, add support branch names that only have a single character. The branch regex is checking for a starting character, and an ending character, so it currently needs at least two characters. I've wrapped everything except the first character in a `()?` to fix this. There are some really complicated regexes that do match what valid git branches are (see https://stackoverflow.com/a/12093994), but I'm reluctant to add them in, since it will be a pain to test all the different edgecases. Hopefully https://github.com/mermaid-js/mermaid/pull/3432 might be used in the future to make a better gitgraph parser!	2022-09-15 01:05:11 +01:00
Knut Sveidqvist	0ec7e006ec	Cleanup unused variables and some commented out code	2022-09-14 11:11:51 +02:00
Knut Sveidqvist	9acdc0bc2e	Cleanup fixing som lingering issues	2022-09-14 10:58:59 +02:00
Knut Sveidqvist	ac788a7e7d	Merge pull request #3453 from mermaid-js/sidv/cleanup Cleanup & fix eslint warnings	2022-09-14 10:35:16 +02:00
Sidharth Vinod	539ee49594	Merge remote-tracking branch 'origin/release/9.1.7' into sidv/mergeRelease * origin/release/9.1.7: Release 9.1.7 Fix for broken rendering test Fix for issue #3428, load the configured diagrams even when initialize has not been called.	2022-09-14 11:11:12 +05:30
Sidharth Vinod	3dff5a90f1	Apply suggestions from code review Co-authored-by: Alois Klink <alois@aloisklink.com>	2022-09-14 09:02:34 +05:30
Knut Sveidqvist	0c0468123f	Release 9.1.7	2022-09-13 19:55:34 +02:00
ashishj	50da58afe0	Fix for broken rendering test	2022-09-13 19:18:12 +02:00
Sidharth Vinod	4fc4d71350	chore: fix eslint warnings	2022-09-13 21:39:58 +05:30
Sidharth Vinod	b5dcb4f345	chore: Turn off eslint rules in spec, demos, etc.	2022-09-13 21:39:19 +05:30
Knut Sveidqvist	0f56c9a85d	Fix for issue #3428 , load the configured diagrams even when initialize has not been called.	2022-09-09 13:37:37 +02:00
Knut Sveidqvist	e5212c25f5	Merge pull request #3398 from mermaid-js/3395_fix_error_handling Re-enabling error graph	2022-09-05 15:13:49 +02:00
Knut Sveidqvist	5584fef1b0	#3395 Renabling the error graph which is rendered on error	2022-09-02 14:05:31 +02:00
Knut Sveidqvist	98f37d64ea	#3395 Fix for lopp stopping at first failure	2022-09-02 12:45:22 +02:00
		`@@ -0,0 +1,3 @@`
							const getStyles = () => ``;

							`export default getStyles;`