diff --git a/.github/workflows/link-checker.yml b/.github/workflows/link-checker.yml
index 566548ecf..15259b518 100644
--- a/.github/workflows/link-checker.yml
+++ b/.github/workflows/link-checker.yml
@@ -35,7 +35,7 @@ jobs:
restore-keys: cache-lychee-
- name: Link Checker
- uses: lycheeverse/lychee-action@v1.5.4
+ uses: lycheeverse/lychee-action@v1.6.1
with:
args: --verbose --no-progress --cache --max-cache-age 1d packages/mermaid/src/docs/**/*.md README.md README.zh-CN.md
fail: true
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b0320b36e..150a22341 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -55,6 +55,8 @@ The documentation is written in **Markdown**. For more information about Markdow
The source files for the project documentation are located in the [`/packages/mermaid/src/docs`](packages/mermaid/src/docs) directory. This is where you should make changes.
The files under `/packages/mermaid/src/docs` are processed to generate the published documentation, and the resulting files are put into the `/docs` directory.
+After editing files in the [`/packages/mermaid/src/docs`](packages/mermaid/src/docs) directory, be sure to run `pnpm install` and `pnpm run --filter mermaid docs:build` locally to build the `/docs` directory.
+
```mermaid
flowchart LR
classDef default fill:#fff,color:black,stroke:black
diff --git a/cypress/integration/rendering/pie.spec.js b/cypress/integration/rendering/pie.spec.js
index 019fa41af..8a89a0cde 100644
--- a/cypress/integration/rendering/pie.spec.js
+++ b/cypress/integration/rendering/pie.spec.js
@@ -75,4 +75,15 @@ describe('Pie Chart', () => {
expect(svg).to.not.have.attr('style');
});
});
+ it('should render a pie diagram when textPosition is set', () => {
+ imgSnapshotTest(
+ `
+ pie
+ "Dogs": 50
+ "Cats": 25
+ `,
+ { logLevel: 1, pie: { textPosition: 0.9 } }
+ );
+ cy.get('svg');
+ });
});
diff --git a/demos/pie.html b/demos/pie.html
index 51c5fe7b5..3d832d83c 100644
--- a/demos/pie.html
+++ b/demos/pie.html
@@ -26,6 +26,7 @@
+ %%{init: {"pie": {"textPosition": 0.9}, "themeVariables": {"pieOuterStrokeWidth": "5px"}} }%%
pie
title Key elements in Product X
accTitle: Key elements in Product X
diff --git a/docs/config/setup/modules/defaultConfig.md b/docs/config/setup/modules/defaultConfig.md
index 302bd51e1..3b2e33842 100644
--- a/docs/config/setup/modules/defaultConfig.md
+++ b/docs/config/setup/modules/defaultConfig.md
@@ -14,7 +14,7 @@
#### Defined in
-[defaultConfig.ts:2084](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/defaultConfig.ts#L2084)
+[defaultConfig.ts:2093](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/defaultConfig.ts#L2093)
---
diff --git a/docs/config/setup/modules/mermaidAPI.md b/docs/config/setup/modules/mermaidAPI.md
index 4802ec808..4b8f57bd7 100644
--- a/docs/config/setup/modules/mermaidAPI.md
+++ b/docs/config/setup/modules/mermaidAPI.md
@@ -31,7 +31,7 @@ Renames and re-exports [mermaidAPI](mermaidAPI.md#mermaidapi)
### mermaidAPI
-• `Const` **mermaidAPI**: `Readonly`<{ `defaultConfig`: `MermaidConfig` = configApi.defaultConfig; `getConfig`: () => `MermaidConfig` = configApi.getConfig; `getSiteConfig`: () => `MermaidConfig` = configApi.getSiteConfig; `globalReset`: () => `void` ; `initialize`: (`options`: `MermaidConfig`) => `void` ; `parse`: (`text`: `string`, `parseOptions?`: [`ParseOptions`](../interfaces/mermaidAPI.ParseOptions.md)) => `Promise`<`boolean`> ; `parseDirective`: (`p`: `any`, `statement`: `string`, `context`: `string`, `type`: `string`) => `void` ; `render`: (`id`: `string`, `text`: `string`, `svgContainingElement?`: `Element`) => `Promise`<[`RenderResult`](../interfaces/mermaidAPI.RenderResult.md)> ; `reset`: () => `void` ; `setConfig`: (`conf`: `MermaidConfig`) => `MermaidConfig` = configApi.setConfig; `updateSiteConfig`: (`conf`: `MermaidConfig`) => `MermaidConfig` = configApi.updateSiteConfig }>
+• `Const` **mermaidAPI**: `Readonly`<{ `defaultConfig`: `MermaidConfig` = configApi.defaultConfig; `getConfig`: () => `MermaidConfig` = configApi.getConfig; `getDiagramFromText`: (`text`: `string`) => `Promise`<`Diagram`> ; `getSiteConfig`: () => `MermaidConfig` = configApi.getSiteConfig; `globalReset`: () => `void` ; `initialize`: (`options`: `MermaidConfig`) => `void` ; `parse`: (`text`: `string`, `parseOptions?`: [`ParseOptions`](../interfaces/mermaidAPI.ParseOptions.md)) => `Promise`<`boolean`> ; `parseDirective`: (`p`: `any`, `statement`: `string`, `context`: `string`, `type`: `string`) => `void` ; `render`: (`id`: `string`, `text`: `string`, `svgContainingElement?`: `Element`) => `Promise`<[`RenderResult`](../interfaces/mermaidAPI.RenderResult.md)> ; `reset`: () => `void` ; `setConfig`: (`conf`: `MermaidConfig`) => `MermaidConfig` = configApi.setConfig; `updateSiteConfig`: (`conf`: `MermaidConfig`) => `MermaidConfig` = configApi.updateSiteConfig }>
## mermaidAPI configuration defaults
diff --git a/docs/config/theming.md b/docs/config/theming.md
index 014ac1374..580afb488 100644
--- a/docs/config/theming.md
+++ b/docs/config/theming.md
@@ -261,6 +261,34 @@ The theming engine will only recognize hex colors and not color names. So, the v
| activationBkgColor | secondaryColor | Activation Background Color |
| sequenceNumberColor | calculated from lineColor | Sequence Number Color |
+## Pie Diagram Variables
+
+| Variable | Default value | Description |
+| ------------------- | ------------------------------ | ------------------------------------------ |
+| pie1 | primaryColor | Fill for 1st section in pie diagram |
+| pie2 | secondaryColor | Fill for 2nd section in pie diagram |
+| pie3 | calculated from tertiary | Fill for 3rd section in pie diagram |
+| pie4 | calculated from primaryColor | Fill for 4th section in pie diagram |
+| pie5 | calculated from secondaryColor | Fill for 5th section in pie diagram |
+| pie6 | calculated from tertiaryColor | Fill for 6th section in pie diagram |
+| pie7 | calculated from primaryColor | Fill for 7th section in pie diagram |
+| pie8 | calculated from primaryColor | Fill for 8th section in pie diagram |
+| pie9 | calculated from primaryColor | Fill for 9th section in pie diagram |
+| pie10 | calculated from primaryColor | Fill for 10th section in pie diagram |
+| pie11 | calculated from primaryColor | Fill for 11th section in pie diagram |
+| pie12 | calculated from primaryColor | Fill for 12th section in pie diagram |
+| pieTitleTextSize | 25px | Title text size |
+| pieTitleTextColor | taskTextDarkColor | Title text color |
+| pieSectionTextSize | 17px | Text size of individual section labels |
+| pieSectionTextColor | textColor | Text color of individual section labels |
+| pieLegendTextSize | 17px | Text size of labels in diagram legend |
+| pieLegendTextColor | taskTextDarkColor | Text color of labels in diagram legend |
+| pieStrokeColor | black | Border color of individual pie sections |
+| pieStrokeWidth | 2px | Border width of individual pie sections |
+| pieOuterStrokeWidth | 2px | Border width of pie diagram's outer circle |
+| pieOuterStrokeColor | black | Border color of pie diagram's outer circle |
+| pieOpacity | 0.7 | Opacity of individual pie sections |
+
## State Colors
| Variable | Default value | Description |
diff --git a/docs/ecosystem/integrations.md b/docs/ecosystem/integrations.md
index 3db4a17bc..a9b7b974d 100644
--- a/docs/ecosystem/integrations.md
+++ b/docs/ecosystem/integrations.md
@@ -20,6 +20,7 @@ They also serve as proof of concept, for the variety of things that can be built
- [Gitea](https://gitea.io) (**Native support**)
- [Azure Devops](https://docs.microsoft.com/en-us/azure/devops/project/wiki/wiki-markdown-guidance?view=azure-devops#add-mermaid-diagrams-to-a-wiki-page) (**Native support**)
- [Tuleap](https://docs.tuleap.org/user-guide/writing-in-tuleap.html#graphs) (**Native support**)
+- [Mermaid Flow Visual Editor](https://www.mermaidflow.app) (**Native support**)
- [Deepdwn](https://billiam.itch.io/deepdwn) (**Native support**)
- [Joplin](https://joplinapp.org) (**Native support**)
- [Swimm](https://swimm.io) (**Native support**)
diff --git a/docs/syntax/pie.md b/docs/syntax/pie.md
index 63f371e87..8b1de3856 100644
--- a/docs/syntax/pie.md
+++ b/docs/syntax/pie.md
@@ -48,6 +48,7 @@ Drawing a pie chart is really simple in mermaid.
## Example
```mermaid-example
+%%{init: {"pie": {"textPosition": 0.5}, "themeVariables": {"pieOuterStrokeWidth": "5px"}} }%%
pie showData
title Key elements in Product X
"Calcium" : 42.96
@@ -57,6 +58,7 @@ pie showData
```
```mermaid
+%%{init: {"pie": {"textPosition": 0.5}, "themeVariables": {"pieOuterStrokeWidth": "5px"}} }%%
pie showData
title Key elements in Product X
"Calcium" : 42.96
@@ -64,3 +66,11 @@ pie showData
"Magnesium" : 10.01
"Iron" : 5
```
+
+## Configuration
+
+Possible pie diagram configuration parameters:
+
+| Parameter | Description | Default value |
+| -------------- | ------------------------------------------------------------------------------------------------------------ | ------------- |
+| `textPosition` | The axial position of the pie slice labels, from 0.0 at the center to 1.0 at the outside edge of the circle. | `0.75` |
diff --git a/package.json b/package.json
index 7b2114746..89de95949 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"version": "10.0.2",
"description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
"type": "module",
- "packageManager": "pnpm@7.27.0",
+ "packageManager": "pnpm@7.29.0",
"keywords": [
"diagram",
"markdown",
@@ -70,9 +70,9 @@
"@types/rollup-plugin-visualizer": "^4.2.1",
"@typescript-eslint/eslint-plugin": "^5.48.2",
"@typescript-eslint/parser": "^5.48.2",
- "@vitest/coverage-c8": "^0.28.4",
- "@vitest/spy": "^0.28.4",
- "@vitest/ui": "^0.28.4",
+ "@vitest/coverage-c8": "^0.29.0",
+ "@vitest/spy": "^0.29.0",
+ "@vitest/ui": "^0.29.0",
"concurrently": "^7.5.0",
"cors": "^2.8.5",
"coveralls": "^3.1.1",
@@ -109,9 +109,9 @@
"ts-node": "^10.9.1",
"typescript": "^4.8.4",
"vite": "^4.1.1",
- "vitest": "^0.28.5"
+ "vitest": "^0.29.0"
},
"volta": {
- "node": "18.14.0"
+ "node": "18.14.2"
}
}
diff --git a/packages/mermaid/package.json b/packages/mermaid/package.json
index fbf8c0d2d..10081e7f3 100644
--- a/packages/mermaid/package.json
+++ b/packages/mermaid/package.json
@@ -58,7 +58,7 @@
"d3": "^7.4.0",
"dagre-d3-es": "7.0.9",
"dayjs": "^1.11.7",
- "dompurify": "2.4.3",
+ "dompurify": "2.4.5",
"elkjs": "^0.8.2",
"khroma": "^2.0.0",
"lodash-es": "^4.17.21",
diff --git a/packages/mermaid/src/Diagram.ts b/packages/mermaid/src/Diagram.ts
index 1e7539aeb..3010ce130 100644
--- a/packages/mermaid/src/Diagram.ts
+++ b/packages/mermaid/src/Diagram.ts
@@ -7,6 +7,11 @@ import { UnknownDiagramError } from './errors';
import { DetailedError } from './utils';
export type ParseErrorFunction = (err: string | DetailedError | unknown, hash?: any) => void;
+
+/**
+ * An object representing a parsed mermaid diagram definition.
+ * @privateRemarks This is exported as part of the public mermaidAPI.
+ */
export class Diagram {
type = 'graph';
parser;
@@ -68,6 +73,15 @@ export class Diagram {
}
}
+/**
+ * Parse the text asynchronously and generate a Diagram object asynchronously.
+ * **Warning:** This function may be changed in the future.
+ * @alpha
+ * @param text - The mermaid diagram definition.
+ * @returns A the Promise of a Diagram object.
+ * @throws {@link UnknownDiagramError} if the diagram type can not be found.
+ * @privateRemarks This is exported as part of the public mermaidAPI.
+ */
export const getDiagramFromText = async (text: string): Promise => {
const type = detectType(text, configApi.getConfig());
try {
diff --git a/packages/mermaid/src/config.type.ts b/packages/mermaid/src/config.type.ts
index 39ab3f4d9..157304149 100644
--- a/packages/mermaid/src/config.type.ts
+++ b/packages/mermaid/src/config.type.ts
@@ -222,7 +222,9 @@ export interface MindmapDiagramConfig extends BaseDiagramConfig {
maxNodeWidth: number;
}
-export type PieDiagramConfig = BaseDiagramConfig;
+export interface PieDiagramConfig extends BaseDiagramConfig {
+ textPosition?: number;
+}
export interface ErDiagramConfig extends BaseDiagramConfig {
titleTopMargin?: number;
diff --git a/packages/mermaid/src/defaultConfig.ts b/packages/mermaid/src/defaultConfig.ts
index ec741e908..666efc364 100644
--- a/packages/mermaid/src/defaultConfig.ts
+++ b/packages/mermaid/src/defaultConfig.ts
@@ -1247,6 +1247,15 @@ const config: Partial = {
* Default value: true
*/
useMaxWidth: true,
+
+ /**
+ * | Parameter | Description | Type | Required | Values |
+ * | ------------ | -------------------------------------------------------------------------------- | ------- | -------- | ------------------- |
+ * | textPosition | Axial position of slice's label from zero at the center to 1 at the outside edge | Number | Optional | Decimal from 0 to 1 |
+ *
+ * **Notes:** Default value: 0.75
+ */
+ textPosition: 0.75,
},
/** The object containing configurations specific for req diagrams */
diff --git a/packages/mermaid/src/diagrams/pie/pieRenderer.js b/packages/mermaid/src/diagrams/pie/pieRenderer.js
index 83f301207..9b25f5f43 100644
--- a/packages/mermaid/src/diagrams/pie/pieRenderer.js
+++ b/packages/mermaid/src/diagrams/pie/pieRenderer.js
@@ -3,6 +3,7 @@ import { select, scaleOrdinal, pie as d3pie, arc } from 'd3';
import { log } from '../../logger';
import { configureSvgSize } from '../../setupGraphViewbox';
import * as configApi from '../../config';
+import { parseFontSize } from '../../utils';
let conf = configApi.getConfig();
@@ -88,6 +89,10 @@ export const draw = (txt, id, _version, diagObj) => {
themeVariables.pie12,
];
+ const textPosition = conf.pie?.textPosition ?? 0.75;
+ let [outerStrokeWidth] = parseFontSize(themeVariables.pieOuterStrokeWidth);
+ outerStrokeWidth ??= 2;
+
// Set the color scale
var color = scaleOrdinal().range(myGeneratedColors);
@@ -111,6 +116,16 @@ export const draw = (txt, id, _version, diagObj) => {
// Shape helper to build arcs:
var arcGenerator = arc().innerRadius(0).outerRadius(radius);
+ var labelArcGenerator = arc()
+ .innerRadius(radius * textPosition)
+ .outerRadius(radius * textPosition);
+
+ svg
+ .append('circle')
+ .attr('cx', 0)
+ .attr('cy', 0)
+ .attr('r', radius + outerStrokeWidth / 2)
+ .attr('class', 'pieOuterCircle');
// Build the pie chart: each part of the pie is a path that we build using the arc function.
svg
@@ -135,7 +150,7 @@ export const draw = (txt, id, _version, diagObj) => {
return ((d.data.value / sum) * 100).toFixed(0) + '%';
})
.attr('transform', function (d) {
- return 'translate(' + arcGenerator.centroid(d) + ')';
+ return 'translate(' + labelArcGenerator.centroid(d) + ')';
})
.style('text-anchor', 'middle')
.attr('class', 'slice');
diff --git a/packages/mermaid/src/diagrams/pie/styles.js b/packages/mermaid/src/diagrams/pie/styles.js
index 8544501a3..6f0f60006 100644
--- a/packages/mermaid/src/diagrams/pie/styles.js
+++ b/packages/mermaid/src/diagrams/pie/styles.js
@@ -5,6 +5,11 @@ const getStyles = (options) =>
stroke-width : ${options.pieStrokeWidth};
opacity : ${options.pieOpacity};
}
+ .pieOuterCircle{
+ stroke: ${options.pieOuterStrokeColor};
+ stroke-width: ${options.pieOuterStrokeWidth};
+ fill: none;
+ }
.pieTitleText {
text-anchor: middle;
font-size: ${options.pieTitleTextSize};
diff --git a/packages/mermaid/src/docs/config/theming.md b/packages/mermaid/src/docs/config/theming.md
index da021f7f8..0e4571d15 100644
--- a/packages/mermaid/src/docs/config/theming.md
+++ b/packages/mermaid/src/docs/config/theming.md
@@ -183,6 +183,34 @@ The theming engine will only recognize hex colors and not color names. So, the v
| activationBkgColor | secondaryColor | Activation Background Color |
| sequenceNumberColor | calculated from lineColor | Sequence Number Color |
+## Pie Diagram Variables
+
+| Variable | Default value | Description |
+| ------------------- | ------------------------------ | ------------------------------------------ |
+| pie1 | primaryColor | Fill for 1st section in pie diagram |
+| pie2 | secondaryColor | Fill for 2nd section in pie diagram |
+| pie3 | calculated from tertiary | Fill for 3rd section in pie diagram |
+| pie4 | calculated from primaryColor | Fill for 4th section in pie diagram |
+| pie5 | calculated from secondaryColor | Fill for 5th section in pie diagram |
+| pie6 | calculated from tertiaryColor | Fill for 6th section in pie diagram |
+| pie7 | calculated from primaryColor | Fill for 7th section in pie diagram |
+| pie8 | calculated from primaryColor | Fill for 8th section in pie diagram |
+| pie9 | calculated from primaryColor | Fill for 9th section in pie diagram |
+| pie10 | calculated from primaryColor | Fill for 10th section in pie diagram |
+| pie11 | calculated from primaryColor | Fill for 11th section in pie diagram |
+| pie12 | calculated from primaryColor | Fill for 12th section in pie diagram |
+| pieTitleTextSize | 25px | Title text size |
+| pieTitleTextColor | taskTextDarkColor | Title text color |
+| pieSectionTextSize | 17px | Text size of individual section labels |
+| pieSectionTextColor | textColor | Text color of individual section labels |
+| pieLegendTextSize | 17px | Text size of labels in diagram legend |
+| pieLegendTextColor | taskTextDarkColor | Text color of labels in diagram legend |
+| pieStrokeColor | black | Border color of individual pie sections |
+| pieStrokeWidth | 2px | Border width of individual pie sections |
+| pieOuterStrokeWidth | 2px | Border width of pie diagram's outer circle |
+| pieOuterStrokeColor | black | Border color of pie diagram's outer circle |
+| pieOpacity | 0.7 | Opacity of individual pie sections |
+
## State Colors
| Variable | Default value | Description |
diff --git a/packages/mermaid/src/docs/ecosystem/integrations.md b/packages/mermaid/src/docs/ecosystem/integrations.md
index 727580664..6550d5ef7 100644
--- a/packages/mermaid/src/docs/ecosystem/integrations.md
+++ b/packages/mermaid/src/docs/ecosystem/integrations.md
@@ -14,6 +14,7 @@ They also serve as proof of concept, for the variety of things that can be built
- [Gitea](https://gitea.io) (**Native support**)
- [Azure Devops](https://docs.microsoft.com/en-us/azure/devops/project/wiki/wiki-markdown-guidance?view=azure-devops#add-mermaid-diagrams-to-a-wiki-page) (**Native support**)
- [Tuleap](https://docs.tuleap.org/user-guide/writing-in-tuleap.html#graphs) (**Native support**)
+- [Mermaid Flow Visual Editor](https://www.mermaidflow.app) (**Native support**)
- [Deepdwn](https://billiam.itch.io/deepdwn) (**Native support**)
- [Joplin](https://joplinapp.org) (**Native support**)
- [Swimm](https://swimm.io) (**Native support**)
diff --git a/packages/mermaid/src/docs/syntax/pie.md b/packages/mermaid/src/docs/syntax/pie.md
index 2fe8c3e54..81ec720c4 100644
--- a/packages/mermaid/src/docs/syntax/pie.md
+++ b/packages/mermaid/src/docs/syntax/pie.md
@@ -35,6 +35,7 @@ Drawing a pie chart is really simple in mermaid.
## Example
```mermaid-example
+%%{init: {"pie": {"textPosition": 0.5}, "themeVariables": {"pieOuterStrokeWidth": "5px"}} }%%
pie showData
title Key elements in Product X
"Calcium" : 42.96
@@ -42,3 +43,11 @@ pie showData
"Magnesium" : 10.01
"Iron" : 5
```
+
+## Configuration
+
+Possible pie diagram configuration parameters:
+
+| Parameter | Description | Default value |
+| -------------- | ------------------------------------------------------------------------------------------------------------ | ------------- |
+| `textPosition` | The axial position of the pie slice labels, from 0.0 at the center to 1.0 at the outside edge of the circle. | `0.75` |
diff --git a/packages/mermaid/src/mermaidAPI.ts b/packages/mermaid/src/mermaidAPI.ts
index 18488ed99..1b440672a 100644
--- a/packages/mermaid/src/mermaidAPI.ts
+++ b/packages/mermaid/src/mermaidAPI.ts
@@ -660,6 +660,7 @@ export const mermaidAPI = Object.freeze({
render,
parse,
parseDirective,
+ getDiagramFromText,
initialize,
getConfig: configApi.getConfig,
setConfig: configApi.setConfig,
diff --git a/packages/mermaid/src/themes/theme-base.js b/packages/mermaid/src/themes/theme-base.js
index 8ff544feb..01f8a9c0b 100644
--- a/packages/mermaid/src/themes/theme-base.js
+++ b/packages/mermaid/src/themes/theme-base.js
@@ -212,6 +212,8 @@ class Theme {
this.pieLegendTextColor = this.pieLegendTextColor || this.taskTextDarkColor;
this.pieStrokeColor = this.pieStrokeColor || 'black';
this.pieStrokeWidth = this.pieStrokeWidth || '2px';
+ this.pieOuterStrokeWidth = this.pieOuterStrokeWidth || '2px';
+ this.pieOuterStrokeColor = this.pieOuterStrokeColor || 'black';
this.pieOpacity = this.pieOpacity || '0.7';
/* requirement-diagram */
diff --git a/packages/mermaid/src/themes/theme-dark.js b/packages/mermaid/src/themes/theme-dark.js
index af21b4f13..9585a2e27 100644
--- a/packages/mermaid/src/themes/theme-dark.js
+++ b/packages/mermaid/src/themes/theme-dark.js
@@ -222,6 +222,8 @@ class Theme {
this.pieLegendTextColor = this.pieLegendTextColor || this.taskTextDarkColor;
this.pieStrokeColor = this.pieStrokeColor || 'black';
this.pieStrokeWidth = this.pieStrokeWidth || '2px';
+ this.pieOuterStrokeWidth = this.pieOuterStrokeWidth || '2px';
+ this.pieOuterStrokeColor = this.pieOuterStrokeColor || 'black';
this.pieOpacity = this.pieOpacity || '0.7';
/* class */
diff --git a/packages/mermaid/src/themes/theme-default.js b/packages/mermaid/src/themes/theme-default.js
index 391c0298f..c91029de3 100644
--- a/packages/mermaid/src/themes/theme-default.js
+++ b/packages/mermaid/src/themes/theme-default.js
@@ -244,6 +244,8 @@ class Theme {
this.pieLegendTextColor = this.pieLegendTextColor || this.taskTextDarkColor;
this.pieStrokeColor = this.pieStrokeColor || 'black';
this.pieStrokeWidth = this.pieStrokeWidth || '2px';
+ this.pieOuterStrokeWidth = this.pieOuterStrokeWidth || '2px';
+ this.pieOuterStrokeColor = this.pieOuterStrokeColor || 'black';
this.pieOpacity = this.pieOpacity || '0.7';
/* requirement-diagram */
diff --git a/packages/mermaid/src/themes/theme-forest.js b/packages/mermaid/src/themes/theme-forest.js
index 59adc9139..96d6c35c1 100644
--- a/packages/mermaid/src/themes/theme-forest.js
+++ b/packages/mermaid/src/themes/theme-forest.js
@@ -213,6 +213,8 @@ class Theme {
this.pieLegendTextColor = this.pieLegendTextColor || this.taskTextDarkColor;
this.pieStrokeColor = this.pieStrokeColor || 'black';
this.pieStrokeWidth = this.pieStrokeWidth || '2px';
+ this.pieOuterStrokeWidth = this.pieOuterStrokeWidth || '2px';
+ this.pieOuterStrokeColor = this.pieOuterStrokeColor || 'black';
this.pieOpacity = this.pieOpacity || '0.7';
/* requirement-diagram */
diff --git a/packages/mermaid/src/themes/theme-neutral.js b/packages/mermaid/src/themes/theme-neutral.js
index e7a136c6b..8bb5ff693 100644
--- a/packages/mermaid/src/themes/theme-neutral.js
+++ b/packages/mermaid/src/themes/theme-neutral.js
@@ -243,6 +243,8 @@ class Theme {
this.pieLegendTextColor = this.pieLegendTextColor || this.taskTextDarkColor;
this.pieStrokeColor = this.pieStrokeColor || 'black';
this.pieStrokeWidth = this.pieStrokeWidth || '2px';
+ this.pieOuterStrokeWidth = this.pieOuterStrokeWidth || '2px';
+ this.pieOuterStrokeColor = this.pieOuterStrokeColor || 'black';
this.pieOpacity = this.pieOpacity || '0.7';
/* requirement-diagram */
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2c16c1965..56a053396 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -53,14 +53,14 @@ importers:
specifier: ^5.48.2
version: 5.48.2_yygwinqv3a2io74xmwofqb7uka
'@vitest/coverage-c8':
- specifier: ^0.28.4
- version: 0.28.4_vun5xzxu3tkrssf3erdbijyyki
+ specifier: ^0.29.0
+ version: 0.29.2_vitest@0.29.2
'@vitest/spy':
- specifier: ^0.28.4
- version: 0.28.4
+ specifier: ^0.29.0
+ version: 0.29.2
'@vitest/ui':
- specifier: ^0.28.4
- version: 0.28.4
+ specifier: ^0.29.0
+ version: 0.29.2
concurrently:
specifier: ^7.5.0
version: 7.5.0
@@ -170,8 +170,8 @@ importers:
specifier: ^4.1.1
version: 4.1.1_@types+node@18.11.9
vitest:
- specifier: ^0.28.5
- version: 0.28.5_vun5xzxu3tkrssf3erdbijyyki
+ specifier: ^0.29.0
+ version: 0.29.2_hjnfa4mohew6fc4mnpzgbfyvpa
packages/mermaid:
dependencies:
@@ -197,8 +197,8 @@ importers:
specifier: ^1.11.7
version: 1.11.7
dompurify:
- specifier: 2.4.3
- version: 2.4.3
+ specifier: 2.4.5
+ version: 2.4.5
elkjs:
specifier: ^0.8.2
version: 0.8.2
@@ -3432,73 +3432,41 @@ packages:
vue: 3.2.45
dev: true
- /@vitest/coverage-c8/0.28.4_vun5xzxu3tkrssf3erdbijyyki:
- resolution: {integrity: sha512-btelLBxaWhHnywXRQxDlrvPhGdnuIaD3XulsxcZRIcnpLPbFu39dNTT0IYu2QWP2ZZrV0AmNtdLIfD4c77zMAg==}
+ /@vitest/coverage-c8/0.29.2_vitest@0.29.2:
+ resolution: {integrity: sha512-NmD3WirQCeQjjKfHu4iEq18DVOBFbLn9TKVdMpyi5YW2EtnS+K22/WE+9/wRrepOhyeTxuEFgxUVkCAE1GhbnQ==}
+ peerDependencies:
+ vitest: '>=0.29.0 <1'
dependencies:
- c8: 7.12.0
+ c8: 7.13.0
picocolors: 1.0.0
std-env: 3.3.2
- vitest: 0.28.4_vun5xzxu3tkrssf3erdbijyyki
- transitivePeerDependencies:
- - '@edge-runtime/vm'
- - '@vitest/browser'
- - '@vitest/ui'
- - happy-dom
- - jsdom
- - less
- - sass
- - stylus
- - sugarss
- - supports-color
- - terser
+ vitest: 0.29.2_hjnfa4mohew6fc4mnpzgbfyvpa
dev: true
- /@vitest/expect/0.28.4:
- resolution: {integrity: sha512-JqK0NZ4brjvOSL8hXAnIsfi+jxDF7rH/ZWCGCt0FAqRnVFc1hXsfwXksQvEnKqD84avRt3gmeXoK4tNbmkoVsQ==}
+ /@vitest/expect/0.29.2:
+ resolution: {integrity: sha512-wjrdHB2ANTch3XKRhjWZN0UueFocH0cQbi2tR5Jtq60Nb3YOSmakjdAvUa2JFBu/o8Vjhj5cYbcMXkZxn1NzmA==}
dependencies:
- '@vitest/spy': 0.28.4
- '@vitest/utils': 0.28.4
+ '@vitest/spy': 0.29.2
+ '@vitest/utils': 0.29.2
chai: 4.3.7
dev: true
- /@vitest/expect/0.28.5:
- resolution: {integrity: sha512-gqTZwoUTwepwGIatnw4UKpQfnoyV0Z9Czn9+Lo2/jLIt4/AXLTn+oVZxlQ7Ng8bzcNkR+3DqLJ08kNr8jRmdNQ==}
+ /@vitest/runner/0.29.2:
+ resolution: {integrity: sha512-A1P65f5+6ru36AyHWORhuQBJrOOcmDuhzl5RsaMNFe2jEkoj0faEszQS4CtPU/LxUYVIazlUtZTY0OEZmyZBnA==}
dependencies:
- '@vitest/spy': 0.28.5
- '@vitest/utils': 0.28.5
- chai: 4.3.7
- dev: true
-
- /@vitest/runner/0.28.4:
- resolution: {integrity: sha512-Q8UV6GjDvBSTfUoq0QXVCNpNOUrWu4P2qvRq7ssJWzn0+S0ojbVOxEjMt+8a32X6SdkhF8ak+2nkppsqV0JyNQ==}
- dependencies:
- '@vitest/utils': 0.28.4
+ '@vitest/utils': 0.29.2
p-limit: 4.0.0
pathe: 1.1.0
dev: true
- /@vitest/runner/0.28.5:
- resolution: {integrity: sha512-NKkHtLB+FGjpp5KmneQjTcPLWPTDfB7ie+MmF1PnUBf/tGe2OjGxWyB62ySYZ25EYp9krR5Bw0YPLS/VWh1QiA==}
- dependencies:
- '@vitest/utils': 0.28.5
- p-limit: 4.0.0
- pathe: 1.1.0
- dev: true
-
- /@vitest/spy/0.28.4:
- resolution: {integrity: sha512-8WuhfXLlvCXpNXEGJW6Gc+IKWI32435fQJLh43u70HnZ1otJOa2Cmg2Wy2Aym47ZnNCP4NolF+8cUPwd0MigKQ==}
+ /@vitest/spy/0.29.2:
+ resolution: {integrity: sha512-Hc44ft5kaAytlGL2PyFwdAsufjbdOvHklwjNy/gy/saRbg9Kfkxfh+PklLm1H2Ib/p586RkQeNFKYuJInUssyw==}
dependencies:
tinyspy: 1.0.2
dev: true
- /@vitest/spy/0.28.5:
- resolution: {integrity: sha512-7if6rsHQr9zbmvxN7h+gGh2L9eIIErgf8nSKYDlg07HHimCxp4H6I/X/DPXktVPPLQfiZ1Cw2cbDIx9fSqDjGw==}
- dependencies:
- tinyspy: 1.0.2
- dev: true
-
- /@vitest/ui/0.28.4:
- resolution: {integrity: sha512-LQfCCFc17n49mwtraV9/NAWl2DUqJS/9ZEa3fqJjoYO+HowdseQ5jvWflpzliCyfrIAh6cXVo1bNzHnDXe0cbw==}
+ /@vitest/ui/0.29.2:
+ resolution: {integrity: sha512-GpCExCMptrS1z3Xf6kz35Xdvjc2eTBy9OIIwW3HjePVxw9Q++ZoEaIBVimRTTGzSe40XiAI/ZyR0H0Ya9brqLA==}
dependencies:
fast-glob: 3.2.12
flatted: 3.2.7
@@ -3507,18 +3475,8 @@ packages:
sirv: 2.0.2
dev: true
- /@vitest/utils/0.28.4:
- resolution: {integrity: sha512-l2QztOLdc2LkR+w/lP52RGh8hW+Ul4KESmCAgVE8q737I7e7bQoAfkARKpkPJ4JQtGpwW4deqlj1732VZD7TFw==}
- dependencies:
- cli-truncate: 3.1.0
- diff: 5.1.0
- loupe: 2.3.6
- picocolors: 1.0.0
- pretty-format: 27.5.1
- dev: true
-
- /@vitest/utils/0.28.5:
- resolution: {integrity: sha512-UyZdYwdULlOa4LTUSwZ+Paz7nBHGTT72jKwdFSV4IjHF1xsokp+CabMdhjvVhYwkLfO88ylJT46YMilnkSARZA==}
+ /@vitest/utils/0.29.2:
+ resolution: {integrity: sha512-F14/Uc+vCdclStS2KEoXJlOLAEyqRhnw0gM27iXw9bMTcyKRPJrQ+rlC6XZ125GIPvvKYMPpVxNhiou6PsEeYQ==}
dependencies:
cli-truncate: 3.1.0
diff: 5.1.0
@@ -4202,7 +4160,7 @@ packages:
/axios/0.21.4_debug@4.3.2:
resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==}
dependencies:
- follow-redirects: 1.15.2_debug@4.3.4
+ follow-redirects: 1.15.2_debug@4.3.2
transitivePeerDependencies:
- debug
dev: true
@@ -4431,8 +4389,8 @@ packages:
engines: {node: '>= 0.8'}
dev: true
- /c8/7.12.0:
- resolution: {integrity: sha512-CtgQrHOkyxr5koX1wEUmN/5cfDa2ckbHRA4Gy5LAL0zaCFtVWJS5++n+w4/sr2GWGerBxgTjpKeDclk/Qk6W/A==}
+ /c8/7.13.0:
+ resolution: {integrity: sha512-/NL4hQTv1gBL6J6ei80zu3IiTrmePDKXKXOTLpHvcIWZTVYQlDhVWjjWvkhICylE8EwwnMVzDZugCvdx0/DIIA==}
engines: {node: '>=10.12.0'}
hasBin: true
dependencies:
@@ -5932,8 +5890,8 @@ packages:
domelementtype: 2.3.0
dev: true
- /dompurify/2.4.3:
- resolution: {integrity: sha512-q6QaLcakcRjebxjg8/+NP+h0rPfatOgOzc46Fst9VAA3jF2ApfKBNKMzdP4DYTqtUMXSCd5pRS/8Po/OmoCHZQ==}
+ /dompurify/2.4.5:
+ resolution: {integrity: sha512-jggCCd+8Iqp4Tsz0nIvpcb22InKEBrGz5dw3EQJMs8HPJDsKbFIO3STYtAvCfDx26Muevn1MHVI0XxjgFfmiSA==}
dev: false
/domutils/3.0.1:
@@ -6774,6 +6732,28 @@ packages:
resolution: {integrity: sha512-XGozTsMPYkm+6b5QL3Z9wQcJjNYxp0CYn3U1gO7dwD6PAqU1SVWZxI9CCg3z+ml3YfqdPnrBehaBrnH2AGKbNA==}
dev: true
+ /follow-redirects/1.15.2:
+ resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
+ engines: {node: '>=4.0'}
+ peerDependencies:
+ debug: '*'
+ peerDependenciesMeta:
+ debug:
+ optional: true
+ dev: true
+
+ /follow-redirects/1.15.2_debug@4.3.2:
+ resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
+ engines: {node: '>=4.0'}
+ peerDependencies:
+ debug: '*'
+ peerDependenciesMeta:
+ debug:
+ optional: true
+ dependencies:
+ debug: 4.3.2
+ dev: true
+
/follow-redirects/1.15.2_debug@4.3.4:
resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
engines: {node: '>=4.0'}
@@ -7323,7 +7303,7 @@ packages:
engines: {node: '>=8.0.0'}
dependencies:
eventemitter3: 4.0.7
- follow-redirects: 1.15.2_debug@4.3.4
+ follow-redirects: 1.15.2
requires-port: 1.0.0
transitivePeerDependencies:
- debug
@@ -11697,8 +11677,8 @@ packages:
vfile-message: 3.1.2
dev: true
- /vite-node/0.28.4_@types+node@18.11.9:
- resolution: {integrity: sha512-KM0Q0uSG/xHHKOJvVHc5xDBabgt0l70y7/lWTR7Q0pR5/MrYxadT+y32cJOE65FfjGmJgxpVEEY+69btJgcXOQ==}
+ /vite-node/0.29.2_@types+node@18.11.9:
+ resolution: {integrity: sha512-5oe1z6wzI3gkvc4yOBbDBbgpiWiApvuN4P55E8OI131JGrSuo4X3SOZrNmZYo4R8Zkze/dhi572blX0zc+6SdA==}
engines: {node: '>=v14.16.0'}
hasBin: true
dependencies:
@@ -11707,31 +11687,6 @@ packages:
mlly: 1.1.0
pathe: 1.1.0
picocolors: 1.0.0
- source-map: 0.6.1
- source-map-support: 0.5.21
- vite: 4.1.1_@types+node@18.11.9
- transitivePeerDependencies:
- - '@types/node'
- - less
- - sass
- - stylus
- - sugarss
- - supports-color
- - terser
- dev: true
-
- /vite-node/0.28.5_@types+node@18.11.9:
- resolution: {integrity: sha512-LmXb9saMGlrMZbXTvOveJKwMTBTNUH66c8rJnQ0ZPNX+myPEol64+szRzXtV5ORb0Hb/91yq+/D3oERoyAt6LA==}
- engines: {node: '>=v14.16.0'}
- hasBin: true
- dependencies:
- cac: 6.7.14
- debug: 4.3.4
- mlly: 1.1.0
- pathe: 1.1.0
- picocolors: 1.0.0
- source-map: 0.6.1
- source-map-support: 0.5.21
vite: 4.1.1_@types+node@18.11.9
transitivePeerDependencies:
- '@types/node'
@@ -11853,8 +11808,8 @@ packages:
- terser
dev: true
- /vitest/0.28.4_vun5xzxu3tkrssf3erdbijyyki:
- resolution: {integrity: sha512-sfWIy0AdlbyGRhunm+TLQEJrFH9XuRPdApfubsyLcDbCRrUX717BRQKInTgzEfyl2Ipi1HWoHB84Nqtcwxogcg==}
+ /vitest/0.29.2_hjnfa4mohew6fc4mnpzgbfyvpa:
+ resolution: {integrity: sha512-ydK9IGbAvoY8wkg29DQ4ivcVviCaUi3ivuPKfZEVddMTenFHUfB8EEDXQV8+RasEk1ACFLgMUqAaDuQ/Nk+mQA==}
engines: {node: '>=v14.16.0'}
hasBin: true
peerDependencies:
@@ -11878,11 +11833,11 @@ packages:
'@types/chai': 4.3.4
'@types/chai-subset': 1.3.3
'@types/node': 18.11.9
- '@vitest/expect': 0.28.4
- '@vitest/runner': 0.28.4
- '@vitest/spy': 0.28.4
- '@vitest/ui': 0.28.4
- '@vitest/utils': 0.28.4
+ '@vitest/expect': 0.29.2
+ '@vitest/runner': 0.29.2
+ '@vitest/spy': 0.29.2
+ '@vitest/ui': 0.29.2
+ '@vitest/utils': 0.29.2
acorn: 8.8.1
acorn-walk: 8.2.0
cac: 6.7.14
@@ -11899,64 +11854,7 @@ packages:
tinypool: 0.3.1
tinyspy: 1.0.2
vite: 4.1.1_@types+node@18.11.9
- vite-node: 0.28.4_@types+node@18.11.9
- why-is-node-running: 2.2.2
- transitivePeerDependencies:
- - less
- - sass
- - stylus
- - sugarss
- - supports-color
- - terser
- dev: true
-
- /vitest/0.28.5_vun5xzxu3tkrssf3erdbijyyki:
- resolution: {integrity: sha512-pyCQ+wcAOX7mKMcBNkzDwEHRGqQvHUl0XnoHR+3Pb1hytAHISgSxv9h0gUiSiYtISXUU3rMrKiKzFYDrI6ZIHA==}
- engines: {node: '>=v14.16.0'}
- hasBin: true
- peerDependencies:
- '@edge-runtime/vm': '*'
- '@vitest/browser': '*'
- '@vitest/ui': '*'
- happy-dom: '*'
- jsdom: '*'
- peerDependenciesMeta:
- '@edge-runtime/vm':
- optional: true
- '@vitest/browser':
- optional: true
- '@vitest/ui':
- optional: true
- happy-dom:
- optional: true
- jsdom:
- optional: true
- dependencies:
- '@types/chai': 4.3.4
- '@types/chai-subset': 1.3.3
- '@types/node': 18.11.9
- '@vitest/expect': 0.28.5
- '@vitest/runner': 0.28.5
- '@vitest/spy': 0.28.5
- '@vitest/ui': 0.28.4
- '@vitest/utils': 0.28.5
- acorn: 8.8.1
- acorn-walk: 8.2.0
- cac: 6.7.14
- chai: 4.3.7
- debug: 4.3.4
- jsdom: 21.1.0
- local-pkg: 0.4.2
- pathe: 1.1.0
- picocolors: 1.0.0
- source-map: 0.6.1
- std-env: 3.3.2
- strip-literal: 1.0.0
- tinybench: 2.3.1
- tinypool: 0.3.1
- tinyspy: 1.0.2
- vite: 4.1.1_@types+node@18.11.9
- vite-node: 0.28.5_@types+node@18.11.9
+ vite-node: 0.29.2_@types+node@18.11.9
why-is-node-running: 2.2.2
transitivePeerDependencies:
- less