diff --git a/cypress/integration/rendering/block.spec.ts b/cypress/integration/rendering/block.spec.ts index 66299915c..9d62c642d 100644 --- a/cypress/integration/rendering/block.spec.ts +++ b/cypress/integration/rendering/block.spec.ts @@ -304,7 +304,7 @@ describe('Block diagram', () => { it('BL22: sizing - it should be possible to make a block wider', () => { imgSnapshotTest( `block-beta - A("rounded):2 + A("rounded"):2 B:2 C `, diff --git a/cypress/platform/knsv2.html b/cypress/platform/knsv2.html index 14d911b17..847a8bf24 100644 --- a/cypress/platform/knsv2.html +++ b/cypress/platform/knsv2.html @@ -65,7 +65,7 @@ 
       block-beta
-  blockArrowId<["`Label`"]>(right)
+  blockArrowId<["Label"]>(right)
   blockArrowId2<["Label"]>(left)
   blockArrowId3<["Label"]>(up)
   blockArrowId4<["Label"]>(down)
diff --git a/packages/mermaid/src/diagrams/block/parser/block.jison b/packages/mermaid/src/diagrams/block/parser/block.jison
index b90aabcee..a7039d2dc 100644
--- a/packages/mermaid/src/diagrams/block/parser/block.jison
+++ b/packages/mermaid/src/diagrams/block/parser/block.jison
@@ -79,7 +79,7 @@ accDescr\s*":"\s*                                               { this.pushState
 accDescr\s*"{"\s*                                { this.pushState("acc_descr_multiline");}
 [\}]                       { this.popState(); }
 [^\}]*                     return "acc_descr_multiline_value";
-
+"end"\b\s*            return 'end';
 
 // Node end of shape
 "((("             { this.popState();yy.getLogger().debug('Lex: (('); return "NODE_DEND"; }
@@ -229,8 +229,8 @@ nodeStatement
       {id: $3.id, label: $3.label, type: yy.typeStr2Type($3.typeStr), directions: $3.directions}
       ];
     }
-  | node SIZE { yy.getLogger().debug('Rule: nodeStatement (abc88 node size) ', $1, $2); $$ = {id: $1.id, label: $1.label, type: yy.typeStr2Type($1.typeStr), directions: $1.directions, w: parseInt($2,10)}; }
-  | node { yy.getLogger().debug('Rule: nodeStatement (node) ', $1); $$ = {id: $1.id, label: $1.label, type: yy.typeStr2Type($1.typeStr), directions: $1.directions, w:1}; }
+  | node SIZE { yy.getLogger().debug('Rule: nodeStatement (abc88 node size) ', $1, $2); $$ = {id: $1.id, label: $1.label, type: yy.typeStr2Type($1.typeStr), directions: $1.directions, widthInColumns: parseInt($2,10)}; }
+  | node { yy.getLogger().debug('Rule: nodeStatement (node) ', $1); $$ = {id: $1.id, label: $1.label, type: yy.typeStr2Type($1.typeStr), directions: $1.directions, widthInColumns:1}; }
   ;
 
 
diff --git a/packages/mermaid/src/diagrams/block/renderHelpers.ts b/packages/mermaid/src/diagrams/block/renderHelpers.ts
index f2fae73cb..ecb59981b 100644
--- a/packages/mermaid/src/diagrams/block/renderHelpers.ts
+++ b/packages/mermaid/src/diagrams/block/renderHelpers.ts
@@ -21,85 +21,80 @@ function getNodeFromBlock(block: Block, db: BlockDB, positioned = false) {
   classStr = classStr + ' flowchart-label';
 
   // We create a SVG label, either by delegating to addHtmlLabel or manually
-  let radious = 0;
-  let _shape = '';
+  let radius = 0;
+  let shape = '';
   let layoutOptions = {};
   let padding;
   // Set the shape based parameters
   switch (vertex.type) {
     case 'round':
-      radious = 5;
-      _shape = 'rect';
+      radius = 5;
+      shape = 'rect';
       break;
-    // case 'composite-subgraph':
-    //   radious = 0;
-    //   _shape = 'composite';
-    //   break;
     case 'composite':
-      radious = 0;
-      _shape = 'composite';
+      radius = 0;
+      shape = 'composite';
       padding = 0;
       break;
     case 'square':
-      _shape = 'rect';
+      shape = 'rect';
       break;
     case 'diamond':
-      _shape = 'question';
+      shape = 'question';
       layoutOptions = {
         portConstraints: 'FIXED_SIDE',
       };
       break;
     case 'hexagon':
-      _shape = 'hexagon';
+      shape = 'hexagon';
       break;
     case 'block_arrow':
-      _shape = 'block_arrow';
+      shape = 'block_arrow';
       break;
     case 'odd':
-      _shape = 'rect_left_inv_arrow';
+      shape = 'rect_left_inv_arrow';
       break;
     case 'lean_right':
-      _shape = 'lean_right';
+      shape = 'lean_right';
       break;
     case 'lean_left':
-      _shape = 'lean_left';
+      shape = 'lean_left';
       break;
     case 'trapezoid':
-      _shape = 'trapezoid';
+      shape = 'trapezoid';
       break;
     case 'inv_trapezoid':
-      _shape = 'inv_trapezoid';
+      shape = 'inv_trapezoid';
       break;
     case 'rect_left_inv_arrow':
-      _shape = 'rect_left_inv_arrow';
+      shape = 'rect_left_inv_arrow';
       break;
     case 'circle':
-      _shape = 'circle';
+      shape = 'circle';
       break;
     case 'ellipse':
-      _shape = 'ellipse';
+      shape = 'ellipse';
       break;
     case 'stadium':
-      _shape = 'stadium';
+      shape = 'stadium';
       break;
     case 'subroutine':
-      _shape = 'subroutine';
+      shape = 'subroutine';
       break;
     case 'cylinder':
-      _shape = 'cylinder';
+      shape = 'cylinder';
       break;
     case 'group':
-      _shape = 'rect';
+      shape = 'rect';
       break;
     case 'doublecircle':
-      _shape = 'doublecircle';
+      shape = 'doublecircle';
       break;
     default:
-      _shape = 'rect';
+      shape = 'rect';
   }
 
   const styles = getStylesFromArray(vertex?.styles || []);
-  // const styles = getStylesFromArray([]);
 
   // Use vertex id as text in the box if no text is provided by the graph definition
   const vertexText = vertex.label;
@@ -108,13 +103,12 @@ function getNodeFromBlock(block: Block, db: BlockDB, positioned = false) {
   // Add the node
   const node = {
     labelStyle: styles.labelStyle,
-    shape: _shape,
+    shape: shape,
     labelText: vertexText,
-    // labelType: vertex.labelType,
-    rx: radious,
-    ry: radious,
+    rx: radius,
+    ry: radius,
     class: classStr,
-    style: styles.style, // + 'fill:#9f9;stroke:#333;stroke-width:4px;',
+    style: styles.style,
     id: vertex.id,
     directions: vertex.directions,
     width: bounds.width,
@@ -124,8 +118,7 @@ function getNodeFromBlock(block: Block, db: BlockDB, positioned = false) {
     positioned,
     intersect: undefined,
     type: vertex.type,
-    // props: vertex.props,
-    padding: padding ?? (getConfig()?.flowchart?.padding || 0),
+    padding: padding ?? (getConfig()?.block?.padding || 0),
   };
   return node;
 }
diff --git a/packages/mermaid/src/diagrams/block/styles.ts b/packages/mermaid/src/diagrams/block/styles.ts
index e1194f0d1..bdc7614a1 100644
--- a/packages/mermaid/src/diagrams/block/styles.ts
+++ b/packages/mermaid/src/diagrams/block/styles.ts
@@ -1,8 +1,7 @@
-// import khroma from 'khroma';
 import * as khroma from 'khroma';
 
 /** Returns the styles given options */
-export interface FlowChartStyleOptions {
+export interface BlockChartStyleOptions {
   arrowheadColor: string;
   border2: string;
   clusterBkg: string;
@@ -30,7 +29,7 @@ const fade = (color: string, opacity: number) => {
   return khroma.rgba(r, g, b, opacity);
 };
 
-const getStyles = (options: FlowChartStyleOptions) =>
+const getStyles = (options: BlockChartStyleOptions) =>
   `.label {
     font-family: ${options.fontFamily};
     color: ${options.nodeTextColor || options.textColor};
diff --git a/packages/mermaid/src/diagrams/flowchart/swimlane/swimlaneRenderer.js b/packages/mermaid/src/diagrams/flowchart/swimlane/swimlaneRenderer.js
deleted file mode 100644
index a34ba02dd..000000000
--- a/packages/mermaid/src/diagrams/flowchart/swimlane/swimlaneRenderer.js
+++ /dev/null
@@ -1,396 +0,0 @@
-import * as graphlib from 'dagre-d3-es/src/graphlib/index.js';
-import { select, curveLinear, selectAll } from 'd3';
-import { swimlaneLayout } from './swimlane-layout.js';
-import { insertNode } from '../../../dagre-wrapper/nodes.js';
-import flowDb from '../flowDb.js';
-import { getConfig } from '../../../config.js';
-import { getStylesFromArray } from '../../../utils.js';
-import setupGraph, { addEdges, addVertices } from './setup-graph.js';
-import { render } from '../../../dagre-wrapper/index.js';
-import { log } from '../../../logger.js';
-import { setupGraphViewbox } from '../../../setupGraphViewbox.js';
-import common, { evaluate } from '../../common/common.js';
-import { addHtmlLabel } from 'dagre-d3-es/src/dagre-js/label/add-html-label.js';
-import { insertEdge, positionEdgeLabel } from '../../../dagre-wrapper/edges.js';
-import { clear as clearGraphlib, clusterDb } from '../../../dagre-wrapper/mermaid-graphlib.js';
-
-const conf = {};
-export const setConf = function (cnf) {
-  const keys = Object.keys(cnf);
-  for (const key of keys) {
-    conf[key] = cnf[key];
-  }
-};
-
-/**
- *
- * @param element
- * @param graph
- * @param layout
- * @param vert
- * @param elem
- * @param g
- * @param id
- * @param conf
- */
-async function swimlaneRender(layout, vert, elem, g, id, conf) {
-  let max;
-  // draw nodes from layout.graph to element
-  const nodes = layout.graph.nodes();
-
-  // lanes are the swimlanes
-  const lanes = layout.lanes;
-
-  const nodesElements = elem.insert('g').attr('class', 'nodes');
-  // for each node, draw a rect, with a child text inside as label
-  for (const node of nodes) {
-    const nodeFromLayout = layout.graph.node(node);
-    const vertex = vert[node];
-    //Initialize the node
-    /**
-     * Variable for storing the classes for the vertex
-     *
-     * @type {string}
-     */
-    let classStr = 'default';
-    if (vertex.classes.length > 0) {
-      classStr = vertex.classes.join(' ');
-    }
-    classStr = classStr + ' swimlane-label';
-    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;
-    log.info('vertex', vertex, vertex.labelType);
-    if (vertex.labelType === 'markdown') {
-      log.info('vertex', vertex, vertex.labelType);
-    } else {
-      if (evaluate(getConfig().flowchart.htmlLabels)) {
-        // TODO: addHtmlLabel accepts a labelStyle. Do we possibly have that?
-        const node = {
-          label: vertexText.replace(
-            /fa[blrs]?:fa-[\w-]+/g,
-            (s) => ``
-          ),
-        };
-        vertexNode = addHtmlLabel(elem, node).node();
-        vertexNode.parentNode.removeChild(vertexNode);
-      } else {
-        // doc is undefined ???
-        // 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 (const row of rows) {
-        //   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 = row;
-        //   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
-    let nodeObj = {
-      labelStyle: styles.labelStyle,
-      shape: _shape,
-      labelText: vertexText,
-      labelType: vertex.labelType,
-      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,
-      x: nodeFromLayout.x,
-      y: nodeFromLayout.y,
-    };
-
-    let boundingBox;
-    let nodeEl;
-
-    // Add the element to the DOM
-
-    nodeEl = await insertNode(nodesElements, nodeObj, vertex.dir);
-    boundingBox = nodeEl.node().getBBox();
-    nodeEl.attr('transform', `translate(${nodeObj.x}, ${nodeObj.y / 2})`);
-  }
-
-  return elem;
-}
-
-/**
- * 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 = async function (text, id, _version, diagObj) {
-  log.info('Drawing flowchart');
-  diagObj.db.clear();
-  flowDb.setGen('gen-2');
-  // Parse the graph definition
-  diagObj.parser.parse(text);
-
-  const { securityLevel, flowchart: conf } = getConfig();
-
-  // 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;
-
-  // create g as a graphlib graph using setupGraph from setup-graph.js
-  const g = setupGraph(diagObj, id, root, doc);
-
-  let subG;
-  const subGraphs = diagObj.db.getSubGraphs();
-  log.info('Subgraphs - ', subGraphs);
-  for (let i = subGraphs.length - 1; i >= 0; i--) {
-    subG = subGraphs[i];
-    log.info('Subgraph - ', subG);
-    diagObj.db.addVertex(
-      subG.id,
-      { text: subG.title, type: subG.labelType },
-      'group',
-      undefined,
-      subG.classes,
-      subG.dir
-    );
-  }
-
-  // Fetch the vertices/nodes and edges/links from the parsed graph definition
-  const vert = diagObj.db.getVertices();
-
-  const edges = diagObj.db.getEdges();
-
-  log.info('Edges', edges);
-
-  const svg = root.select('#' + id);
-
-  svg.append('g');
-
-  // Run the renderer. This is what draws the final graph.
-  // const element = root.select('#' + id + ' g');
-  // console.log('diagObj', diagObj);
-  // console.log('subGraphs', diagObj.db.getSubGraphs());
-  const layout = swimlaneLayout(g, diagObj);
-  // console.log('custom layout', layout);
-
-  // draw lanes as vertical lines
-  const lanesElements = svg.insert('g').attr('class', 'lanes');
-
-  let laneCount = 0;
-
-  for (const lane of layout.lanes) {
-    laneCount++;
-
-    //draw lane header as rectangle with lane title centered in it
-    const laneHeader = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
-
-    // Set attributes for the rectangle
-    laneHeader.setAttribute('x', lane.x); // x-coordinate of the top-left corner
-    laneHeader.setAttribute('y', -50); // y-coordinate of the top-left corner
-    laneHeader.setAttribute('width', lane.width); // width of the rectangle
-    laneHeader.setAttribute('height', '50'); // height of the rectangle
-    if (laneCount % 2 == 0) {
-      //set light blue color for even lanes
-      laneHeader.setAttribute('fill', 'blue'); // fill color of the rectangle
-    } else {
-      //set white color odd lanes
-      laneHeader.setAttribute('fill', 'grey'); // fill color of the rectangle
-    }
-
-    laneHeader.setAttribute('stroke', 'black'); // color of the stroke/border
-    laneHeader.setAttribute('stroke-width', '2'); // width of the stroke/border
-
-    // Append the rectangle to the SVG element
-    lanesElements.node().appendChild(laneHeader);
-
-    //draw lane title
-    const laneTitle = document.createElementNS('http://www.w3.org/2000/svg', 'text');
-
-    // Set attributes for the rectangle
-    laneTitle.setAttribute('x', lane.x + lane.width / 2); // x-coordinate of the top-left corner
-    laneTitle.setAttribute('y', -50 + 50 / 2); // y-coordinate of the top-left corner
-    laneTitle.setAttribute('width', lane.width); // width of the rectangle
-    laneTitle.setAttribute('height', '50'); // height of the rectangle
-    laneTitle.setAttribute('fill', 'white'); // fill color of the rectangle
-    laneTitle.setAttribute('stroke-width', '1'); // width of the stroke/border
-    laneTitle.setAttribute('text-anchor', 'middle'); // width of the stroke/border
-    laneTitle.setAttribute('alignment-baseline', 'middle'); // width of the stroke/border
-    laneTitle.setAttribute('font-size', '20'); // width of the stroke/border
-    laneTitle.textContent = lane.title;
-
-    // Append the rectangle to the SVG element
-    lanesElements.node().appendChild(laneTitle);
-
-    //draw lane
-
-    // Create a  element
-    const rectangle = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
-
-    // Set attributes for the rectangle
-    rectangle.setAttribute('x', lane.x); // x-coordinate of the top-left corner
-    rectangle.setAttribute('y', 0); // y-coordinate of the top-left corner
-    rectangle.setAttribute('width', lane.width); // width of the rectangle
-    rectangle.setAttribute('height', '500'); // height of the rectangle
-
-    if (laneCount % 2 == 0) {
-      //set light blue color for even lanes
-      rectangle.setAttribute('fill', 'lightblue'); // fill color of the rectangle
-    } else {
-      //set white color odd lanes
-      rectangle.setAttribute('fill', '#ffffff'); // fill color of the rectangle
-    }
-
-    rectangle.setAttribute('stroke', 'black'); // color of the stroke/border
-    rectangle.setAttribute('stroke-width', '2'); // width of the stroke/border
-
-    // Append the rectangle to the SVG element
-    lanesElements.node().appendChild(rectangle);
-  }
-
-  // append lanesElements to elem
-  svg.node().appendChild(lanesElements.node());
-
-  // add lane headers
-  const laneHeaders = svg.insert('g').attr('class', 'laneHeaders');
-
-  addEdges(edges, g, diagObj);
-
-  g.edges().forEach(function (e) {
-    const edge = g.edge(e);
-    log.info('Edge ' + e.v + ' -> ' + e.w + ': ' + JSON.stringify(edge), edge);
-    const edgePaths = svg.insert('g').attr('class', 'edgePaths');
-    //create edge points based on start and end node
-
-    //get start node x, y coordinates
-    const sourceNode = layout.graph.node(e.v);
-    //get end node x, y coordinates
-    // sourceNode.x = sourceNode.x;
-    // sourceNode.y = sourceNode.y;
-
-    const targetNode = layout.graph.node(e.w);
-    // targetNode.x = targetNode.x;
-    // targetNode.y = targetNode.y;
-
-    // edge.points = [];
-    // edge.points.push({ x: sourceNode.x, y: sourceNode.y / 2 });
-    // edge.points.push({ x: targetNode.x, y: targetNode.y / 2 });
-
-    const paths = insertEdge(edgePaths, e, edge, clusterDb, 'flowchart', g);
-    //positionEdgeLabel(edge, paths);
-  });
-  await swimlaneRender(layout, vert, svg, g, id, conf);
-
-  // utils.insertTitle(svg, 'flowchartTitleText', conf.titleTopMargin, diagObj.db.getDiagramTitle());
-
-  setupGraphViewbox(g, svg, conf.diagramPadding, conf.useMaxWidth);
-};
-
-export default {
-  setConf,
-  addVertices,
-  addEdges,
-  getClasses,
-  draw,
-};
diff --git a/packages/mermaid/src/docs/.vitepress/block.mmd b/packages/mermaid/src/docs/.vitepress/block.mmd
deleted file mode 100644
index 7ce628f44..000000000
--- a/packages/mermaid/src/docs/.vitepress/block.mmd
+++ /dev/null
@@ -1,33 +0,0 @@
-block
-  columns 3
-  Block1
-  Block2["Block 2"]
-  block
-    columns 2
-    Block2.1
-    Block2.2
-  end
-  Block3
-
-
-----
-
-block
-  columns 2
-  Block[Frontend]:vertical
-
-  block "Document management System"
-    columns 3
-    MO[Manager Operation]:vertical
-    block
-      columns 2
-        block "Security and User Manager"
-  end
-
-
-----
-block frontend:vertical
-move right
-block "Document Management System"
-move down
-
diff --git a/packages/mermaid/src/styles.spec.ts b/packages/mermaid/src/styles.spec.ts
index 420ee9757..7265c3b6c 100644
--- a/packages/mermaid/src/styles.spec.ts
+++ b/packages/mermaid/src/styles.spec.ts
@@ -28,6 +28,7 @@ import state from './diagrams/state/styles.js';
 import journey from './diagrams/user-journey/styles.js';
 import timeline from './diagrams/timeline/styles.js';
 import mindmap from './diagrams/mindmap/styles.js';
+import block from './diagrams/block/styles.js';
 import themes from './themes/index.js';
 
 async function checkValidStylisCSSStyleSheet(stylisString: string) {
@@ -95,6 +96,7 @@ describe('styles', () => {
         requirement,
         sequence,
         state,
+        block,
         timeline,
       })) {
         test(`should return a valid style for diagram ${diagramId} and theme ${themeId}`, async () => {
diff --git a/vite.config.ts.timestamp-1696335530501-05072b5e79635.mjs b/vite.config.ts.timestamp-1696335530501-05072b5e79635.mjs
deleted file mode 100644
index 7896fdd2c..000000000
--- a/vite.config.ts.timestamp-1696335530501-05072b5e79635.mjs
+++ /dev/null
@@ -1,201 +0,0 @@
-// .vite/jisonTransformer.ts
-import jison from 'file:///Users/knsv/source/git/mermaid/node_modules/.pnpm/jison@0.4.18/node_modules/jison/lib/jison.js';
-var transformJison = (src) => {
-  const parser = new jison.Generator(src, {
-    moduleType: 'js',
-    'token-stack': true,
-  });
-  const source = parser.generate({ moduleMain: '() => {}' });
-  const exporter = `
-	parser.parser = parser;
-	export { parser };
-	export default parser;
-	`;
-  return `${source} ${exporter}`;
-};
-
-// .vite/jisonPlugin.ts
-var fileRegex = /\.(jison)$/;
-/**
- *
- */
-function jison2() {
-  return {
-    name: 'jison',
-    transform(src, id) {
-      if (fileRegex.test(id)) {
-        return {
-          code: transformJison(src),
-          map: null,
-          // provide source map if available
-        };
-      }
-    },
-  };
-}
-
-// .vite/jsonSchemaPlugin.ts
-import {
-  load,
-  JSON_SCHEMA,
-} from 'file:///Users/knsv/source/git/mermaid/node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/dist/js-yaml.mjs';
-import assert from 'node:assert';
-import Ajv2019 from 'file:///Users/knsv/source/git/mermaid/node_modules/.pnpm/ajv@8.12.0/node_modules/ajv/dist/2019.js';
-var MERMAID_CONFIG_DIAGRAM_KEYS = [
-  'flowchart',
-  'sequence',
-  'gantt',
-  'journey',
-  'class',
-  'state',
-  'er',
-  'pie',
-  'quadrantChart',
-  'requirement',
-  'mindmap',
-  'timeline',
-  'gitGraph',
-  'c4',
-  'sankey',
-];
-/**
- *
- * @param mermaidConfigSchema
- */
-function generateDefaults(mermaidConfigSchema) {
-  const ajv = new Ajv2019({
-    useDefaults: true,
-    allowUnionTypes: true,
-    strict: true,
-  });
-  ajv.addKeyword({
-    keyword: 'meta:enum',
-    // used by jsonschema2md
-    errors: false,
-  });
-  ajv.addKeyword({
-    keyword: 'tsType',
-    // used by json-schema-to-typescript
-    errors: false,
-  });
-  const mermaidDefaultConfig = {};
-  assert.ok(mermaidConfigSchema.$defs);
-  const baseDiagramConfig = mermaidConfigSchema.$defs.BaseDiagramConfig;
-  for (const key of MERMAID_CONFIG_DIAGRAM_KEYS) {
-    const subSchemaRef = mermaidConfigSchema.properties[key].$ref;
-    const [root, defs, defName] = subSchemaRef.split('/');
-    assert.strictEqual(root, '#');
-    assert.strictEqual(defs, '$defs');
-    const subSchema = {
-      $schema: mermaidConfigSchema.$schema,
-      $defs: mermaidConfigSchema.$defs,
-      ...mermaidConfigSchema.$defs[defName],
-    };
-    const validate2 = ajv.compile(subSchema);
-    mermaidDefaultConfig[key] = {};
-    for (const required of subSchema.required ?? []) {
-      if (subSchema.properties[required] === void 0 && baseDiagramConfig.properties[required]) {
-        mermaidDefaultConfig[key][required] = baseDiagramConfig.properties[required].default;
-      }
-    }
-    if (!validate2(mermaidDefaultConfig[key])) {
-      throw new Error(
-        `schema for subconfig ${key} does not have valid defaults! Errors were ${JSON.stringify(
-          validate2.errors,
-          void 0,
-          2
-        )}`
-      );
-    }
-  }
-  const validate = ajv.compile(mermaidConfigSchema);
-  if (!validate(mermaidDefaultConfig)) {
-    throw new Error(
-      `Mermaid config JSON Schema does not have valid defaults! Errors were ${JSON.stringify(
-        validate.errors,
-        void 0,
-        2
-      )}`
-    );
-  }
-  return mermaidDefaultConfig;
-}
-/**
- *
- */
-function jsonSchemaPlugin() {
-  return {
-    name: 'json-schema-plugin',
-    transform(src, id) {
-      const idAsUrl = new URL(id, 'file:///');
-      if (!idAsUrl.pathname.endsWith('schema.yaml')) {
-        return;
-      }
-      if (idAsUrl.searchParams.get('only-defaults')) {
-        const jsonSchema = load(src, {
-          filename: idAsUrl.pathname,
-          // only allow JSON types in our YAML doc (will probably be default in YAML 1.3)
-          // e.g. `true` will be parsed a boolean `true`, `True` will be parsed as string `"True"`.
-          schema: JSON_SCHEMA,
-        });
-        return {
-          code: `export default ${JSON.stringify(generateDefaults(jsonSchema), void 0, 2)};`,
-          map: null,
-          // no source map
-        };
-      } else {
-        return {
-          code: `export default ${JSON.stringify(
-            load(src, {
-              filename: idAsUrl.pathname,
-              // only allow JSON types in our YAML doc (will probably be default in YAML 1.3)
-              // e.g. `true` will be parsed a boolean `true`, `True` will be parsed as string `"True"`.
-              schema: JSON_SCHEMA,
-            }),
-            void 0,
-            2
-          )};`,
-          map: null,
-          // provide source map if available
-        };
-      }
-    },
-  };
-}
-
-// vite.config.ts
-import typescript from 'file:///Users/knsv/source/git/mermaid/node_modules/.pnpm/@rollup+plugin-typescript@11.1.1_typescript@5.1.3/node_modules/@rollup/plugin-typescript/dist/es/index.js';
-import { defineConfig } from 'file:///Users/knsv/source/git/mermaid/node_modules/.pnpm/vitest@0.33.0_@vitest+ui@0.33.0_jsdom@22.0.0/node_modules/vitest/dist/config.js';
-var vite_config_default = defineConfig({
-  resolve: {
-    extensions: ['.js'],
-  },
-  plugins: [
-    jison2(),
-    jsonSchemaPlugin(),
-    // handles .schema.yaml JSON Schema files
-    // @ts-expect-error According to the type definitions, rollup plugins are incompatible with vite
-    typescript({ compilerOptions: { declaration: false } }),
-  ],
-  test: {
-    environment: 'jsdom',
-    globals: true,
-    // TODO: should we move this to a mermaid-core package?
-    setupFiles: ['packages/mermaid/src/tests/setup.ts'],
-    coverage: {
-      provider: 'v8',
-      reporter: ['text', 'json', 'html', 'lcov'],
-      reportsDirectory: './coverage/vitest',
-      exclude: ['**/node_modules/**', '**/tests/**', '**/__mocks__/**'],
-    },
-  },
-  build: {
-    /** If you set esmExternals to true, this plugins assumes that
-     all external dependencies are ES modules */
-    commonjsOptions: {
-      esmExternals: true,
-    },
-  },
-});
-export { vite_config_default as default };
-//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": [".vite/jisonTransformer.ts", ".vite/jisonPlugin.ts", ".vite/jsonSchemaPlugin.ts", "vite.config.ts"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"/Users/knsv/source/git/mermaid/.vite\";const __vite_injected_original_filename = \"/Users/knsv/source/git/mermaid/.vite/jisonTransformer.ts\";const __vite_injected_original_import_meta_url = \"file:///Users/knsv/source/git/mermaid/.vite/jisonTransformer.ts\";import jison from 'jison';\n\nexport const transformJison = (src: string): string => {\n  const parser = new jison.Generator(src, {\n    moduleType: 'js',\n    'token-stack': true,\n  });\n  const source = parser.generate({ moduleMain: '() => {}' });\n  const exporter = `\n\tparser.parser = parser;\n\texport { parser };\n\texport default parser;\n\t`;\n  return `${source} ${exporter}`;\n};\n", "const __vite_injected_original_dirname = \"/Users/knsv/source/git/mermaid/.vite\";const __vite_injected_original_filename = \"/Users/knsv/source/git/mermaid/.vite/jisonPlugin.ts\";const __vite_injected_original_import_meta_url = \"file:///Users/knsv/source/git/mermaid/.vite/jisonPlugin.ts\";import { transformJison } from './jisonTransformer.js';\nconst fileRegex = /\\.(jison)$/;\n\nexport default function jison() {\n  return {\n    name: 'jison',\n\n    transform(src: string, id: string) {\n      if (fileRegex.test(id)) {\n        return {\n          code: transformJison(src),\n          map: null, // provide source map if available\n        };\n      }\n    },\n  };\n}\n", "const __vite_injected_original_dirname = \"/Users/knsv/source/git/mermaid/.vite\";const __vite_injected_original_filename = \"/Users/knsv/source/git/mermaid/.vite/jsonSchemaPlugin.ts\";const __vite_injected_original_import_meta_url = \"file:///Users/knsv/source/git/mermaid/.vite/jsonSchemaPlugin.ts\";import { load, JSON_SCHEMA } from 'js-yaml';\nimport assert from 'node:assert';\nimport Ajv2019, { type JSONSchemaType } from 'ajv/dist/2019.js';\nimport { PluginOption } from 'vite';\n\nimport type { MermaidConfig, BaseDiagramConfig } from '../packages/mermaid/src/config.type.js';\n\n/**\n * All of the keys in the mermaid config that have a mermaid diagram config.\n */\nconst MERMAID_CONFIG_DIAGRAM_KEYS = [\n  'flowchart',\n  'sequence',\n  'gantt',\n  'journey',\n  'class',\n  'state',\n  'er',\n  'pie',\n  'quadrantChart',\n  'requirement',\n  'mindmap',\n  'timeline',\n  'gitGraph',\n  'c4',\n  'sankey',\n] as const;\n\n/**\n * Generate default values from the JSON Schema.\n *\n * AJV does not support nested default values yet (or default values with $ref),\n * so we need to manually find them (this may be fixed in ajv v9).\n *\n * @param mermaidConfigSchema - The Mermaid JSON Schema to use.\n * @returns The default mermaid config object.\n */\nfunction generateDefaults(mermaidConfigSchema: JSONSchemaType<MermaidConfig>) {\n  const ajv = new Ajv2019({\n    useDefaults: true,\n    allowUnionTypes: true,\n    strict: true,\n  });\n\n  ajv.addKeyword({\n    keyword: 'meta:enum', // used by jsonschema2md\n    errors: false,\n  });\n  ajv.addKeyword({\n    keyword: 'tsType', // used by json-schema-to-typescript\n    errors: false,\n  });\n\n  // ajv currently doesn't support nested default values, see https://github.com/ajv-validator/ajv/issues/1718\n  // (may be fixed in v9) so we need to manually use sub-schemas\n  const mermaidDefaultConfig = {};\n\n  assert.ok(mermaidConfigSchema.$defs);\n  const baseDiagramConfig = mermaidConfigSchema.$defs.BaseDiagramConfig;\n\n  for (const key of MERMAID_CONFIG_DIAGRAM_KEYS) {\n    const subSchemaRef = mermaidConfigSchema.properties[key].$ref;\n    const [root, defs, defName] = subSchemaRef.split('/');\n    assert.strictEqual(root, '#');\n    assert.strictEqual(defs, '$defs');\n    const subSchema = {\n      $schema: mermaidConfigSchema.$schema,\n      $defs: mermaidConfigSchema.$defs,\n      ...mermaidConfigSchema.$defs[defName],\n    } as JSONSchemaType<BaseDiagramConfig>;\n\n    const validate = ajv.compile(subSchema);\n\n    mermaidDefaultConfig[key] = {};\n\n    for (const required of subSchema.required ?? []) {\n      if (subSchema.properties[required] === undefined && baseDiagramConfig.properties[required]) {\n        mermaidDefaultConfig[key][required] = baseDiagramConfig.properties[required].default;\n      }\n    }\n    if (!validate(mermaidDefaultConfig[key])) {\n      throw new Error(\n        `schema for subconfig ${key} does not have valid defaults! Errors were ${JSON.stringify(\n          validate.errors,\n          undefined,\n          2\n        )}`\n      );\n    }\n  }\n\n  const validate = ajv.compile(mermaidConfigSchema);\n\n  if (!validate(mermaidDefaultConfig)) {\n    throw new Error(\n      `Mermaid config JSON Schema does not have valid defaults! Errors were ${JSON.stringify(\n        validate.errors,\n        undefined,\n        2\n      )}`\n    );\n  }\n\n  return mermaidDefaultConfig;\n}\n\n/**\n * Vite plugin that handles JSON Schemas saved as a `.schema.yaml` file.\n *\n * Use `my-example.schema.yaml?only-defaults=true` to only load the default values.\n */\nexport default function jsonSchemaPlugin(): PluginOption {\n  return {\n    name: 'json-schema-plugin',\n    transform(src: string, id: string) {\n      const idAsUrl = new URL(id, 'file:///');\n\n      if (!idAsUrl.pathname.endsWith('schema.yaml')) {\n        return;\n      }\n\n      if (idAsUrl.searchParams.get('only-defaults')) {\n        const jsonSchema = load(src, {\n          filename: idAsUrl.pathname,\n          // only allow JSON types in our YAML doc (will probably be default in YAML 1.3)\n          // e.g. `true` will be parsed a boolean `true`, `True` will be parsed as string `\"True\"`.\n          schema: JSON_SCHEMA,\n        }) as JSONSchemaType<MermaidConfig>;\n        return {\n          code: `export default ${JSON.stringify(generateDefaults(jsonSchema), undefined, 2)};`,\n          map: null, // no source map\n        };\n      } else {\n        return {\n          code: `export default ${JSON.stringify(\n            load(src, {\n              filename: idAsUrl.pathname,\n              // only allow JSON types in our YAML doc (will probably be default in YAML 1.3)\n              // e.g. `true` will be parsed a boolean `true`, `True` will be parsed as string `\"True\"`.\n              schema: JSON_SCHEMA,\n            }),\n            undefined,\n            2\n          )};`,\n          map: null, // provide source map if available\n        };\n      }\n    },\n  };\n}\n", "const __vite_injected_original_dirname = \"/Users/knsv/source/git/mermaid\";const __vite_injected_original_filename = \"/Users/knsv/source/git/mermaid/vite.config.ts\";const __vite_injected_original_import_meta_url = \"file:///Users/knsv/source/git/mermaid/vite.config.ts\";import jison from './.vite/jisonPlugin.js';\nimport jsonSchemaPlugin from './.vite/jsonSchemaPlugin.js';\nimport typescript from '@rollup/plugin-typescript';\nimport { defineConfig } from 'vitest/config';\n\nexport default defineConfig({\n  resolve: {\n    extensions: ['.js'],\n  },\n  plugins: [\n    jison(),\n    jsonSchemaPlugin(), // handles .schema.yaml JSON Schema files\n    // @ts-expect-error According to the type definitions, rollup plugins are incompatible with vite\n    typescript({ compilerOptions: { declaration: false } }),\n  ],\n  test: {\n    environment: 'jsdom',\n    globals: true,\n    // TODO: should we move this to a mermaid-core package?\n    setupFiles: ['packages/mermaid/src/tests/setup.ts'],\n    coverage: {\n      provider: 'v8',\n      reporter: ['text', 'json', 'html', 'lcov'],\n      reportsDirectory: './coverage/vitest',\n      exclude: ['**/node_modules/**', '**/tests/**', '**/__mocks__/**'],\n    },\n  },\n  build: {\n    /** If you set esmExternals to true, this plugins assumes that\n     all external dependencies are ES modules */\n\n    commonjsOptions: {\n      esmExternals: true,\n    },\n  },\n});\n"],
  "mappings": "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",
  "names": ["jison", "validate", "jison"]
}
