diff --git a/cypress/platform/knsv2.html b/cypress/platform/knsv2.html index 786ee2692..6e69533eb 100644 --- a/cypress/platform/knsv2.html +++ b/cypress/platform/knsv2.html @@ -69,12 +69,15 @@ block-beta id2("2") block id3["I am a wide one"] - id4 + block + id44("A final one") + id45("B final one") + end end - %% id4("A final one") + id4("Another final one") -
+block-beta id3["I am a wide one"] @@ -84,7 +87,9 @@ block-betaflowchart RL + subgraph "`one`" id + endflowchart RL diff --git a/packages/mermaid/src/dagre-wrapper/nodes.js b/packages/mermaid/src/dagre-wrapper/nodes.js index 9e57fb2b0..b95265f31 100644 --- a/packages/mermaid/src/dagre-wrapper/nodes.js +++ b/packages/mermaid/src/dagre-wrapper/nodes.js @@ -27,7 +27,7 @@ const question = async (parent, node) => { questionElem.attr('style', node.style); updateNodeBounds(node, questionElem); - node.intersect = function(point) { + node.intersect = function (point) { log.warn('Intersect called'); return intersect.polygon(node, points, point); }; @@ -52,7 +52,7 @@ const choice = (parent, node) => { const choice = shapeSvg.insert('polygon', ':first-child').attr( 'points', points - .map(function(d) { + .map(function (d) { return d.x + ',' + d.y; }) .join(' ') @@ -62,7 +62,7 @@ const choice = (parent, node) => { node.width = 28; node.height = 28; - node.intersect = function(point) { + node.intersect = function (point) { return intersect.circle(node, 14, point); }; @@ -89,7 +89,7 @@ const hexagon = async (parent, node) => { hex.attr('style', node.style); updateNodeBounds(node, hex); - node.intersect = function(point) { + node.intersect = function (point) { return intersect.polygon(node, points, point); }; @@ -115,7 +115,7 @@ const rect_left_inv_arrow = async (parent, node) => { node.width = w + h; node.height = h; - node.intersect = function(point) { + node.intersect = function (point) { return intersect.polygon(node, points, point); }; @@ -138,7 +138,7 @@ const lean_right = async (parent, node) => { el.attr('style', node.style); updateNodeBounds(node, el); - node.intersect = function(point) { + node.intersect = function (point) { return intersect.polygon(node, points, point); }; @@ -161,7 +161,7 @@ const lean_left = async (parent, node) => { el.attr('style', node.style); updateNodeBounds(node, el); - node.intersect = function(point) { + node.intersect = function (point) { return intersect.polygon(node, points, point); }; @@ -184,7 +184,7 @@ const trapezoid = async (parent, node) => { el.attr('style', node.style); updateNodeBounds(node, el); - node.intersect = function(point) { + node.intersect = function (point) { return intersect.polygon(node, points, point); }; @@ -207,7 +207,7 @@ const inv_trapezoid = async (parent, node) => { el.attr('style', node.style); updateNodeBounds(node, el); - node.intersect = function(point) { + node.intersect = function (point) { return intersect.polygon(node, points, point); }; @@ -231,7 +231,7 @@ const rect_right_inv_arrow = async (parent, node) => { el.attr('style', node.style); updateNodeBounds(node, el); - node.intersect = function(point) { + node.intersect = function (point) { return intersect.polygon(node, points, point); }; @@ -281,7 +281,7 @@ const cylinder = async (parent, node) => { updateNodeBounds(node, el); - node.intersect = function(point) { + node.intersect = function (point) { const pos = intersect.rect(node, point); const x = pos.x - node.x; @@ -350,7 +350,55 @@ const rect = async (parent, node) => { updateNodeBounds(node, rect); - node.intersect = function(point) { + node.intersect = function (point) { + return intersect.rect(node, point); + }; + + return shapeSvg; +}; + +const composite = async (parent, node) => { + console.log('This got called'); + const { shapeSvg, bbox, halfPadding } = await labelHelper( + parent, + node, + 'node ' + node.classes, + true + ); + + // add the rect + const rect = shapeSvg.insert('rect', ':first-child'); + + // const totalWidth = bbox.width + node.padding * 2; + // const totalHeight = bbox.height + node.padding * 2; + const totalWidth = node.positioned ? node.width : bbox.width + node.padding; + const totalHeight = node.positioned ? node.height : bbox.height + node.padding; + const x = node.positioned ? -totalWidth / 2 : -bbox.width / 2 - halfPadding; + const y = node.positioned ? -totalHeight / 2 : -bbox.height / 2 - halfPadding; + rect + .attr('class', 'basic cluster composite label-container') + .attr('style', node.style) + .attr('rx', node.rx) + .attr('ry', node.ry) + .attr('x', x) + .attr('y', y) + .attr('width', totalWidth) + .attr('height', totalHeight); + + if (node.props) { + const propKeys = new Set(Object.keys(node.props)); + if (node.props.borders) { + applyNodePropertyBorders(rect, node.props.borders, totalWidth, totalHeight); + propKeys.delete('borders'); + } + propKeys.forEach((propKey) => { + log.warn(`Unknown node property ${propKey}`); + }); + } + + updateNodeBounds(node, rect); + + node.intersect = function (point) { return intersect.rect(node, point); }; @@ -383,7 +431,7 @@ const labelRect = async (parent, node) => { updateNodeBounds(node, rect); - node.intersect = function(point) { + node.intersect = function (point) { return intersect.rect(node, point); }; @@ -495,20 +543,20 @@ const rectWithTitle = (parent, node) => { select(descr).attr( 'transform', 'translate( ' + - // (titleBox.width - bbox.width) / 2 + - (bbox.width > titleBox.width ? 0 : (titleBox.width - bbox.width) / 2) + - ', ' + - (titleBox.height + halfPadding + 5) + - ')' + // (titleBox.width - bbox.width) / 2 + + (bbox.width > titleBox.width ? 0 : (titleBox.width - bbox.width) / 2) + + ', ' + + (titleBox.height + halfPadding + 5) + + ')' ); select(text).attr( 'transform', 'translate( ' + - // (titleBox.width - bbox.width) / 2 + - (bbox.width < titleBox.width ? 0 : -(titleBox.width - bbox.width) / 2) + - ', ' + - 0 + - ')' + // (titleBox.width - bbox.width) / 2 + + (bbox.width < titleBox.width ? 0 : -(titleBox.width - bbox.width) / 2) + + ', ' + + 0 + + ')' ); // Get the size of the label @@ -537,7 +585,7 @@ const rectWithTitle = (parent, node) => { updateNodeBounds(node, rect); - node.intersect = function(point) { + node.intersect = function (point) { return intersect.rect(node, point); }; @@ -563,7 +611,7 @@ const stadium = async (parent, node) => { updateNodeBounds(node, rect); - node.intersect = function(point) { + node.intersect = function (point) { return intersect.rect(node, point); }; @@ -587,7 +635,7 @@ const circle = async (parent, node) => { updateNodeBounds(node, circle); - node.intersect = function(point) { + node.intersect = function (point) { log.info('Circle intersect', node, bbox.width / 2 + halfPadding, point); return intersect.circle(node, bbox.width / 2 + halfPadding, point); }; @@ -625,7 +673,7 @@ const doublecircle = async (parent, node) => { updateNodeBounds(node, outerCircle); - node.intersect = function(point) { + node.intersect = function (point) { log.info('DoubleCircle intersect', node, bbox.width / 2 + halfPadding + gap, point); return intersect.circle(node, bbox.width / 2 + halfPadding + gap, point); }; @@ -655,7 +703,7 @@ const subroutine = async (parent, node) => { el.attr('style', node.style); updateNodeBounds(node, el); - node.intersect = function(point) { + node.intersect = function (point) { return intersect.polygon(node, points, point); }; @@ -674,7 +722,7 @@ const start = (parent, node) => { updateNodeBounds(node, circle); - node.intersect = function(point) { + node.intersect = function (point) { return intersect.circle(node, 7, point); }; @@ -706,7 +754,7 @@ const forkJoin = (parent, node, dir) => { updateNodeBounds(node, shape); node.height = node.height + node.padding / 2; node.width = node.width + node.padding / 2; - node.intersect = function(point) { + node.intersect = function (point) { return intersect.rect(node, point); }; @@ -727,7 +775,7 @@ const end = (parent, node) => { updateNodeBounds(node, circle); - node.intersect = function(point) { + node.intersect = function (point) { return intersect.circle(node, 7, point); }; @@ -892,10 +940,10 @@ const class_box = (parent, node) => { select(classTitleLabel).attr( 'transform', 'translate( ' + - ((-1 * maxWidth) / 2 + diffX) + - ', ' + - ((-1 * maxHeight) / 2 + verticalPos) + - ')' + ((-1 * maxWidth) / 2 + diffX) + + ', ' + + ((-1 * maxHeight) / 2 + verticalPos) + + ')' ); verticalPos += classTitleBBox.height + rowPadding; @@ -912,10 +960,10 @@ const class_box = (parent, node) => { select(lbl).attr( 'transform', 'translate( ' + - -maxWidth / 2 + - ', ' + - ((-1 * maxHeight) / 2 + verticalPos + lineHeight / 2) + - ')' + -maxWidth / 2 + + ', ' + + ((-1 * maxHeight) / 2 + verticalPos + lineHeight / 2) + + ')' ); //get the height of the bounding box of each member if exists const memberBBox = lbl?.getBBox(); @@ -950,7 +998,7 @@ const class_box = (parent, node) => { updateNodeBounds(node, rect); - node.intersect = function(point) { + node.intersect = function (point) { return intersect.rect(node, point); }; @@ -959,6 +1007,7 @@ const class_box = (parent, node) => { const shapes = { rhombus: question, + composite, question, rect, labelRect, @@ -1040,10 +1089,10 @@ export const positionNode = (node) => { el.attr( 'transform', 'translate(' + - (node.x + diff - node.width / 2) + - ', ' + - (node.y - node.height / 2 - padding) + - ')' + (node.x + diff - node.width / 2) + + ', ' + + (node.y - node.height / 2 - padding) + + ')' ); } else { el.attr('transform', 'translate(' + node.x + ', ' + node.y + ')'); diff --git a/packages/mermaid/src/diagrams/block/blockDB.ts b/packages/mermaid/src/diagrams/block/blockDB.ts index 50af7965f..2dce9e323 100644 --- a/packages/mermaid/src/diagrams/block/blockDB.ts +++ b/packages/mermaid/src/diagrams/block/blockDB.ts @@ -27,7 +27,7 @@ const populateBlockDatabase = (blockList: Block[], parent: Block): void => { } else { if (!block.label) { if (block.type === 'composite') { - block.label = 'x'; + block.label = ''; } else { block.label = block.id; } diff --git a/packages/mermaid/src/diagrams/block/layout.ts b/packages/mermaid/src/diagrams/block/layout.ts index e008d7882..8756646ef 100644 --- a/packages/mermaid/src/diagrams/block/layout.ts +++ b/packages/mermaid/src/diagrams/block/layout.ts @@ -2,15 +2,17 @@ import { BlockDB } from './blockDB.js'; import type { Block } from './blockTypes.js'; function calcBlockSizes(block: Block, db: BlockDB) { - let totalWidth = 0; - let totalHeight = 0; + const totalWidth = 0; + const totalHeight = 0; + let maxWidth = 0; + let maxHeight = 0; + const padding = 20; + if (block.children) { for (const child of block.children) { calcBlockSizes(child, db); } // find max width of children - let maxWidth = 0; - let maxHeight = 0; for (const child of block.children) { const { width, height, x, y } = child.size || { width: 0, height: 0, x: 0, y: 0 }; if (width > maxWidth) { @@ -30,39 +32,41 @@ function calcBlockSizes(block: Block, db: BlockDB) { } // Position items relative to self - let x = 0; + let x = -padding / 2; const y = 0; - const padding = 10; + + let accumulatedPaddingX = 0; for (const child of block.children) { if (child.size) { child.size.x = x; child.size.y = y; x += maxWidth + padding; } - if (x > totalWidth) { - totalWidth = x; - } - if (y > totalHeight) { - totalHeight = y; - } + accumulatedPaddingX += padding; } } if (block.children?.length > 0) { - block.size = { width: totalWidth, height: totalHeight, x: 0, y: 0 }; + const numChildren = block.children.length; + block.size = { + width: numChildren * (maxWidth + padding) + padding, + height: totalHeight + 4 * padding, + x: 0, + y: 0, + }; } console.log('layoutBlock (done)', block); } function positionBlock(parent: Block, block: Block, db: BlockDB) { console.log('layout position block', parent.id, parent?.size?.x, block.id, block?.size?.x); - let x = 0; + let parentX = 0; let y = 0; if (parent) { - x = parent?.size?.x || 0; + parentX = parent?.size?.x || 0; y = parent?.size?.y || 0; } - if (block.size) { - block.size.x = block.size.x + x - block.size.width / 2; + if (block.size && block.id !== 'root') { + block.size.x = parentX + block.size.x + -block.size.width / 2; block.size.y = block.size.y + y; } if (block.children) { @@ -104,9 +108,9 @@ export function layout(db: BlockDB) { const blocks = db.getBlocks(); const root = { id: 'root', type: 'composite', children: blocks } as Block; calcBlockSizes(root, db); - console.log('layout getBlocks', db.getBlocks()); // Position blocks relative to parents positionBlock(root, root, db); + console.log('getBlocks', JSON.stringify(db.getBlocks(), null, 2)); minX = 0; minY = 0; diff --git a/packages/mermaid/src/diagrams/block/renderHelpers.ts b/packages/mermaid/src/diagrams/block/renderHelpers.ts index a17cda607..5bbe279e7 100644 --- a/packages/mermaid/src/diagrams/block/renderHelpers.ts +++ b/packages/mermaid/src/diagrams/block/renderHelpers.ts @@ -26,12 +26,17 @@ function getNodeFromBlock(block: Block, db: BlockDB, positioned = false) { let radious = 0; let _shape = ''; let layoutOptions = {}; + console.log('This is the type:', vertex.type); // Set the shape based parameters switch (vertex.type) { case 'round': radious = 5; _shape = 'rect'; break; + case 'composite': + radious = 4; + _shape = 'composite'; + break; case 'square': _shape = 'rect'; break; diff --git a/packages/mermaid/src/diagrams/block/styles.ts b/packages/mermaid/src/diagrams/block/styles.ts index a4af4f128..e1194f0d1 100644 --- a/packages/mermaid/src/diagrams/block/styles.ts +++ b/packages/mermaid/src/diagrams/block/styles.ts @@ -42,6 +42,8 @@ const getStyles = (options: FlowChartStyleOptions) => color: ${options.titleColor}; } + + .label text,span,p { fill: ${options.nodeTextColor || options.textColor}; color: ${options.nodeTextColor || options.textColor}; @@ -103,9 +105,11 @@ const getStyles = (options: FlowChartStyleOptions) => // background-color: } - .cluster rect { - fill: ${options.clusterBkg}; - stroke: ${options.clusterBorder}; + .node .cluster { + // fill: ${fade(options.mainBkg, 0.5)}; + fill: ${fade(options.clusterBkg, 0.5)}; + stroke: ${fade(options.clusterBorder, 0.2)}; + box-shadow: rgba(50, 50, 93, 0.25) 0px 13px 27px -5px, rgba(0, 0, 0, 0.3) 0px 8px 16px -8px; stroke-width: 1px; } diff --git a/vite.config.ts.timestamp-1696335530501-05072b5e79635.mjs b/vite.config.ts.timestamp-1696335530501-05072b5e79635.mjs new file mode 100644 index 000000000..e020937df --- /dev/null +++ b/vite.config.ts.timestamp-1696335530501-05072b5e79635.mjs @@ -0,0 +1,190 @@ +// .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" +]; +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"]
}
