/gi);
for (let i = 0; i < lines.length; i++) {
- const dy = (i * actorFontSize) - (actorFontSize * (lines.length - 1) / 2)
- const text = g.append('text')
- .attr('x', x + width / 2).attr('y', y)
+ const dy = i * actorFontSize - (actorFontSize * (lines.length - 1)) / 2;
+ const text = g
+ .append('text')
+ .attr('x', x + width / 2)
+ .attr('y', y)
.style('text-anchor', 'middle')
.style('font-size', actorFontSize)
- .style('font-family', actorFontFamily)
- text.append('tspan')
- .attr('x', x + width / 2).attr('dy', dy)
- .text(lines[i])
+ .style('font-family', actorFontFamily);
+ text
+ .append('tspan')
+ .attr('x', x + width / 2)
+ .attr('dy', dy)
+ .text(lines[i]);
- text.attr('y', y + height / 2.0)
+ text
+ .attr('y', y + height / 2.0)
.attr('dominant-baseline', 'central')
- .attr('alignment-baseline', 'central')
+ .attr('alignment-baseline', 'central');
- _setTextAttrs(text, textAttrs)
+ _setTextAttrs(text, textAttrs);
}
}
- function byFo (content, g, x, y, width, height, textAttrs, conf) {
- const s = g.append('switch')
- const f = s.append('foreignObject')
- .attr('x', x).attr('y', y)
- .attr('width', width).attr('height', height)
+ function byFo(content, g, x, y, width, height, textAttrs, conf) {
+ const s = g.append('switch');
+ const f = s
+ .append('foreignObject')
+ .attr('x', x)
+ .attr('y', y)
+ .attr('width', width)
+ .attr('height', height);
- const text = f.append('div').style('display', 'table')
- .style('height', '100%').style('width', '100%')
+ const text = f
+ .append('div')
+ .style('display', 'table')
+ .style('height', '100%')
+ .style('width', '100%');
- text.append('div').style('display', 'table-cell')
- .style('text-align', 'center').style('vertical-align', 'middle')
- .text(content)
+ text
+ .append('div')
+ .style('display', 'table-cell')
+ .style('text-align', 'center')
+ .style('vertical-align', 'middle')
+ .text(content);
- byTspan(content, s, x, y, width, height, textAttrs, conf)
- _setTextAttrs(text, textAttrs)
+ byTspan(content, s, x, y, width, height, textAttrs, conf);
+ _setTextAttrs(text, textAttrs);
}
- function _setTextAttrs (toText, fromTextAttrsDict) {
+ function _setTextAttrs(toText, fromTextAttrsDict) {
for (const key in fromTextAttrsDict) {
if (fromTextAttrsDict.hasOwnProperty(key)) {
- toText.attr(key, fromTextAttrsDict[key])
+ toText.attr(key, fromTextAttrsDict[key]);
}
}
}
- return function (conf) {
- return conf.textPlacement === 'fo' ? byFo : (
- conf.textPlacement === 'old' ? byText : byTspan)
- }
-})()
+ return function(conf) {
+ return conf.textPlacement === 'fo' ? byFo : conf.textPlacement === 'old' ? byText : byTspan;
+ };
+})();
export default {
drawRect,
@@ -352,4 +399,4 @@ export default {
insertArrowCrossHead,
getTextObj,
getNoteRect
-}
+};
diff --git a/src/diagrams/sequence/svgDraw.spec.js b/src/diagrams/sequence/svgDraw.spec.js
index efb541e78..c99b9b95b 100644
--- a/src/diagrams/sequence/svgDraw.spec.js
+++ b/src/diagrams/sequence/svgDraw.spec.js
@@ -1,11 +1,11 @@
/* eslint-env jasmine */
-const svgDraw = require('./svgDraw')
-const { MockD3 } = require('d3')
+const svgDraw = require('./svgDraw');
+const { MockD3 } = require('d3');
-describe('svgDraw', function () {
- describe('drawRect', function () {
- it('it should append a rectangle', function () {
- const svg = MockD3('svg')
+describe('svgDraw', function() {
+ describe('drawRect', function() {
+ it('it should append a rectangle', function() {
+ const svg = MockD3('svg');
svgDraw.drawRect(svg, {
x: 10,
y: 10,
@@ -16,22 +16,22 @@ describe('svgDraw', function () {
rx: '10',
ry: '10',
class: 'unitTestRectangleClass'
- })
- expect(svg.__children.length).toBe(1)
- const rect = svg.__children[0]
- expect(rect.__name).toBe('rect')
- expect(rect.attr).toHaveBeenCalledWith('x', 10)
- expect(rect.attr).toHaveBeenCalledWith('y', 10)
- expect(rect.attr).toHaveBeenCalledWith('fill', '#ccc')
- expect(rect.attr).toHaveBeenCalledWith('stroke', 'red')
- expect(rect.attr).toHaveBeenCalledWith('width', '20')
- expect(rect.attr).toHaveBeenCalledWith('height', '20')
- expect(rect.attr).toHaveBeenCalledWith('rx', '10')
- expect(rect.attr).toHaveBeenCalledWith('ry', '10')
- expect(rect.attr).toHaveBeenCalledWith('class', 'unitTestRectangleClass')
- })
+ });
+ expect(svg.__children.length).toBe(1);
+ const rect = svg.__children[0];
+ expect(rect.__name).toBe('rect');
+ expect(rect.attr).toHaveBeenCalledWith('x', 10);
+ expect(rect.attr).toHaveBeenCalledWith('y', 10);
+ expect(rect.attr).toHaveBeenCalledWith('fill', '#ccc');
+ expect(rect.attr).toHaveBeenCalledWith('stroke', 'red');
+ expect(rect.attr).toHaveBeenCalledWith('width', '20');
+ expect(rect.attr).toHaveBeenCalledWith('height', '20');
+ expect(rect.attr).toHaveBeenCalledWith('rx', '10');
+ expect(rect.attr).toHaveBeenCalledWith('ry', '10');
+ expect(rect.attr).toHaveBeenCalledWith('class', 'unitTestRectangleClass');
+ });
it('it should not add the class attribute if a class isn`t provided', () => {
- const svg = MockD3('svg')
+ const svg = MockD3('svg');
svgDraw.drawRect(svg, {
x: 10,
y: 10,
@@ -41,17 +41,17 @@ describe('svgDraw', function () {
height: '20',
rx: '10',
ry: '10'
- })
- expect(svg.__children.length).toBe(1)
- const rect = svg.__children[0]
- expect(rect.__name).toBe('rect')
- expect(rect.attr).toHaveBeenCalledWith('fill', '#ccc')
- expect(rect.attr).not.toHaveBeenCalledWith('class', expect.anything())
- })
- })
- describe('drawBackgroundRect', function () {
- it('it should append a rect before the previous element within a given bound', function () {
- const svg = MockD3('svg')
+ });
+ expect(svg.__children.length).toBe(1);
+ const rect = svg.__children[0];
+ expect(rect.__name).toBe('rect');
+ expect(rect.attr).toHaveBeenCalledWith('fill', '#ccc');
+ expect(rect.attr).not.toHaveBeenCalledWith('class', expect.anything());
+ });
+ });
+ describe('drawBackgroundRect', function() {
+ it('it should append a rect before the previous element within a given bound', function() {
+ const svg = MockD3('svg');
const boundingRect = {
startx: 50,
starty: 200,
@@ -59,18 +59,18 @@ describe('svgDraw', function () {
stopy: 260,
title: undefined,
fill: '#ccc'
- }
- svgDraw.drawBackgroundRect(svg, boundingRect)
- expect(svg.__children.length).toBe(1)
- const rect = svg.__children[0]
- expect(rect.__name).toBe('rect')
- expect(rect.attr).toHaveBeenCalledWith('x', 50)
- expect(rect.attr).toHaveBeenCalledWith('y', 200)
- expect(rect.attr).toHaveBeenCalledWith('width', 100)
- expect(rect.attr).toHaveBeenCalledWith('height', 60)
- expect(rect.attr).toHaveBeenCalledWith('fill', '#ccc')
- expect(rect.attr).toHaveBeenCalledWith('class', 'rect')
- expect(rect.lower).toHaveBeenCalled()
- })
- })
-})
+ };
+ svgDraw.drawBackgroundRect(svg, boundingRect);
+ expect(svg.__children.length).toBe(1);
+ const rect = svg.__children[0];
+ expect(rect.__name).toBe('rect');
+ expect(rect.attr).toHaveBeenCalledWith('x', 50);
+ expect(rect.attr).toHaveBeenCalledWith('y', 200);
+ expect(rect.attr).toHaveBeenCalledWith('width', 100);
+ expect(rect.attr).toHaveBeenCalledWith('height', 60);
+ expect(rect.attr).toHaveBeenCalledWith('fill', '#ccc');
+ expect(rect.attr).toHaveBeenCalledWith('class', 'rect');
+ expect(rect.lower).toHaveBeenCalled();
+ });
+ });
+});
diff --git a/src/logger.js b/src/logger.js
index eefaccf34..5de9e320a 100644
--- a/src/logger.js
+++ b/src/logger.js
@@ -1,4 +1,4 @@
-import moment from 'moment-mini'
+import moment from 'moment-mini';
export const LEVELS = {
debug: 1,
@@ -6,7 +6,7 @@ export const LEVELS = {
warn: 3,
error: 4,
fatal: 5
-}
+};
export const logger = {
debug: () => {},
@@ -14,32 +14,32 @@ export const logger = {
warn: () => {},
error: () => {},
fatal: () => {}
-}
+};
-export const setLogLevel = function (level) {
- logger.debug = () => {}
- logger.info = () => {}
- logger.warn = () => {}
- logger.error = () => {}
- logger.fatal = () => {}
+export const setLogLevel = function(level) {
+ logger.debug = () => {};
+ logger.info = () => {};
+ logger.warn = () => {};
+ logger.error = () => {};
+ logger.fatal = () => {};
if (level <= LEVELS.fatal) {
- logger.fatal = console.log.bind(console, '\x1b[35m', format('FATAL'))
+ logger.fatal = console.log.bind(console, '\x1b[35m', format('FATAL'));
}
if (level <= LEVELS.error) {
- logger.error = console.log.bind(console, '\x1b[31m', format('ERROR'))
+ logger.error = console.log.bind(console, '\x1b[31m', format('ERROR'));
}
if (level <= LEVELS.warn) {
- logger.warn = console.log.bind(console, `\x1b[33m`, format('WARN'))
+ logger.warn = console.log.bind(console, `\x1b[33m`, format('WARN'));
}
if (level <= LEVELS.info) {
- logger.info = console.log.bind(console, '\x1b[34m', format('INFO'))
+ logger.info = console.log.bind(console, '\x1b[34m', format('INFO'));
}
if (level <= LEVELS.debug) {
- logger.debug = console.log.bind(console, '\x1b[32m', format('DEBUG'))
+ logger.debug = console.log.bind(console, '\x1b[32m', format('DEBUG'));
}
-}
+};
-const format = (level) => {
- const time = moment().format('HH:mm:ss.SSS')
- return `${time} : ${level} : `
-}
+const format = level => {
+ const time = moment().format('HH:mm:ss.SSS');
+ return `${time} : ${level} : `;
+};
diff --git a/src/mermaid.js b/src/mermaid.js
index ebfc87532..76b644ef2 100644
--- a/src/mermaid.js
+++ b/src/mermaid.js
@@ -2,10 +2,10 @@
* Web page integration module for the mermaid framework. It uses the mermaidAPI for mermaid functionality and to render
* the diagrams to svg code.
*/
-import he from 'he'
+import he from 'he';
-import mermaidAPI from './mermaidAPI'
-import { logger } from './logger'
+import mermaidAPI from './mermaidAPI';
+import { logger } from './logger';
/**
* ## init
@@ -28,126 +28,142 @@ import { logger } from './logger'
* Renders the mermaid diagrams
* @param nodes a css selector or an array of nodes
*/
-const init = function () {
- const conf = mermaidAPI.getConfig()
- logger.debug('Starting rendering diagrams')
- let nodes
+const init = function() {
+ const conf = mermaidAPI.getConfig();
+ logger.debug('Starting rendering diagrams');
+ let nodes;
if (arguments.length >= 2) {
/*! sequence config was passed as #1 */
if (typeof arguments[0] !== 'undefined') {
- mermaid.sequenceConfig = arguments[0]
+ mermaid.sequenceConfig = arguments[0];
}
- nodes = arguments[1]
+ nodes = arguments[1];
} else {
- nodes = arguments[0]
+ nodes = arguments[0];
}
// if last argument is a function this is the callback function
- let callback
+ let callback;
if (typeof arguments[arguments.length - 1] === 'function') {
- callback = arguments[arguments.length - 1]
- logger.debug('Callback function found')
+ callback = arguments[arguments.length - 1];
+ logger.debug('Callback function found');
} else {
if (typeof conf.mermaid !== 'undefined') {
if (typeof conf.mermaid.callback === 'function') {
- callback = conf.mermaid.callback
- logger.debug('Callback function found')
+ callback = conf.mermaid.callback;
+ logger.debug('Callback function found');
} else {
- logger.debug('No Callback function found')
+ logger.debug('No Callback function found');
}
}
}
- nodes = nodes === undefined ? document.querySelectorAll('.mermaid')
- : typeof nodes === 'string' ? document.querySelectorAll(nodes)
- : nodes instanceof window.Node ? [nodes]
- : nodes // Last case - sequence config was passed pick next
+ nodes =
+ nodes === undefined
+ ? document.querySelectorAll('.mermaid')
+ : typeof nodes === 'string'
+ ? document.querySelectorAll(nodes)
+ : nodes instanceof window.Node
+ ? [nodes]
+ : nodes; // Last case - sequence config was passed pick next
- logger.debug('Start On Load before: ' + mermaid.startOnLoad)
+ logger.debug('Start On Load before: ' + mermaid.startOnLoad);
if (typeof mermaid.startOnLoad !== 'undefined') {
- logger.debug('Start On Load inner: ' + mermaid.startOnLoad)
- mermaidAPI.initialize({ startOnLoad: mermaid.startOnLoad })
+ logger.debug('Start On Load inner: ' + mermaid.startOnLoad);
+ mermaidAPI.initialize({ startOnLoad: mermaid.startOnLoad });
}
if (typeof mermaid.ganttConfig !== 'undefined') {
- mermaidAPI.initialize({ gantt: mermaid.ganttConfig })
+ mermaidAPI.initialize({ gantt: mermaid.ganttConfig });
}
- let txt
+ let txt;
for (let i = 0; i < nodes.length; i++) {
- const element = nodes[i]
+ const element = nodes[i];
/*! Check if previously processed */
if (!element.getAttribute('data-processed')) {
- element.setAttribute('data-processed', true)
+ element.setAttribute('data-processed', true);
} else {
- continue
+ continue;
}
- const id = `mermaid-${Date.now()}`
+ const id = `mermaid-${Date.now()}`;
// Fetch the graph definition including tags
- txt = element.innerHTML
+ txt = element.innerHTML;
// transforms the html to pure text
- txt = he.decode(txt).trim().replace(/
/ig, '
')
+ txt = he
+ .decode(txt)
+ .trim()
+ .replace(/
/gi, '
');
- mermaidAPI.render(id, txt, (svgCode, bindFunctions) => {
- element.innerHTML = svgCode
- if (typeof callback !== 'undefined') {
- callback(id)
- }
- if (bindFunctions) bindFunctions(element)
- }, element)
+ mermaidAPI.render(
+ id,
+ txt,
+ (svgCode, bindFunctions) => {
+ element.innerHTML = svgCode;
+ if (typeof callback !== 'undefined') {
+ callback(id);
+ }
+ if (bindFunctions) bindFunctions(element);
+ },
+ element
+ );
}
-}
+};
-const initialize = function (config) {
- logger.debug('Initializing mermaid ')
+const initialize = function(config) {
+ logger.debug('Initializing mermaid ');
if (typeof config.mermaid !== 'undefined') {
if (typeof config.mermaid.startOnLoad !== 'undefined') {
- mermaid.startOnLoad = config.mermaid.startOnLoad
+ mermaid.startOnLoad = config.mermaid.startOnLoad;
}
if (typeof config.mermaid.htmlLabels !== 'undefined') {
- mermaid.htmlLabels = config.mermaid.htmlLabels
+ mermaid.htmlLabels = config.mermaid.htmlLabels;
}
}
- mermaidAPI.initialize(config)
-}
+ mermaidAPI.initialize(config);
+};
/**
* ##contentLoaded
* Callback function that is called when page is loaded. This functions fetches configuration for mermaid rendering and
* calls init for rendering the mermaid diagrams on the page.
*/
-const contentLoaded = function () {
- let config
+const contentLoaded = function() {
+ let config;
if (mermaid.startOnLoad) {
// No config found, do check API config
- config = mermaidAPI.getConfig()
+ config = mermaidAPI.getConfig();
if (config.startOnLoad) {
- mermaid.init()
+ mermaid.init();
}
} else {
if (typeof mermaid.startOnLoad === 'undefined') {
- logger.debug('In start, no config')
- config = mermaidAPI.getConfig()
+ logger.debug('In start, no config');
+ config = mermaidAPI.getConfig();
if (config.startOnLoad) {
- mermaid.init()
+ mermaid.init();
}
}
}
-}
+};
if (typeof document !== 'undefined') {
/*!
* Wait for document loaded before starting the execution
*/
- window.addEventListener('load', function () {
- contentLoaded()
- }, false)
+ window.addEventListener(
+ 'load',
+ function() {
+ contentLoaded();
+ },
+ false
+ );
}
const mermaid = {
@@ -162,6 +178,6 @@ const mermaid = {
initialize,
contentLoaded
-}
+};
-export default mermaid
+export default mermaid;
diff --git a/src/mermaid.spec.js b/src/mermaid.spec.js
index 996ad21f5..8bfbc1995 100644
--- a/src/mermaid.spec.js
+++ b/src/mermaid.spec.js
@@ -1,195 +1,200 @@
/* eslint-env jasmine */
-import mermaid from './mermaid'
-import flowDb from './diagrams/flowchart/flowDb'
-import flowParser from './diagrams/flowchart/parser/flow'
-import flowRenderer from './diagrams/flowchart/flowRenderer'
+import mermaid from './mermaid';
+import flowDb from './diagrams/flowchart/flowDb';
+import flowParser from './diagrams/flowchart/parser/flow';
+import flowRenderer from './diagrams/flowchart/flowRenderer';
-describe('when using mermaid and ', function () {
- describe('when detecting chart type ', function () {
- it('should not start rendering with mermaid.startOnLoad set to false', function () {
- mermaid.startOnLoad = false
- document.body.innerHTML = 'graph TD;\na;
'
- spyOn(mermaid, 'init')
- mermaid.contentLoaded()
- expect(mermaid.init).not.toHaveBeenCalled()
- })
+describe('when using mermaid and ', function() {
+ describe('when detecting chart type ', function() {
+ it('should not start rendering with mermaid.startOnLoad set to false', function() {
+ mermaid.startOnLoad = false;
+ document.body.innerHTML = 'graph TD;\na;
';
+ spyOn(mermaid, 'init');
+ mermaid.contentLoaded();
+ expect(mermaid.init).not.toHaveBeenCalled();
+ });
- it('should start rendering with both startOnLoad set', function () {
- mermaid.startOnLoad = true
- document.body.innerHTML = 'graph TD;\na;
'
- spyOn(mermaid, 'init')
- mermaid.contentLoaded()
- expect(mermaid.init).toHaveBeenCalled()
- })
+ it('should start rendering with both startOnLoad set', function() {
+ mermaid.startOnLoad = true;
+ document.body.innerHTML = 'graph TD;\na;
';
+ spyOn(mermaid, 'init');
+ mermaid.contentLoaded();
+ expect(mermaid.init).toHaveBeenCalled();
+ });
- it('should start rendering with mermaid.startOnLoad', function () {
- mermaid.startOnLoad = true
- document.body.innerHTML = 'graph TD;\na;
'
- spyOn(mermaid, 'init')
- mermaid.contentLoaded()
- expect(mermaid.init).toHaveBeenCalled()
- })
+ it('should start rendering with mermaid.startOnLoad', function() {
+ mermaid.startOnLoad = true;
+ document.body.innerHTML = 'graph TD;\na;
';
+ spyOn(mermaid, 'init');
+ mermaid.contentLoaded();
+ expect(mermaid.init).toHaveBeenCalled();
+ });
- it('should start rendering as a default with no changes performed', function () {
- document.body.innerHTML = 'graph TD;\na;
'
- spyOn(mermaid, 'init')
- mermaid.contentLoaded()
- expect(mermaid.init).toHaveBeenCalled()
- })
- })
+ it('should start rendering as a default with no changes performed', function() {
+ document.body.innerHTML = 'graph TD;\na;
';
+ spyOn(mermaid, 'init');
+ mermaid.contentLoaded();
+ expect(mermaid.init).toHaveBeenCalled();
+ });
+ });
- describe('when calling addEdges ', function () {
- beforeEach(function () {
- flowParser.parser.yy = flowDb
- flowDb.clear()
- })
- it('it should handle edges with text', function () {
- flowParser.parser.parse('graph TD;A-->|text ex|B;')
- flowParser.parser.yy.getVertices()
- const edges = flowParser.parser.yy.getEdges()
+ describe('when calling addEdges ', function() {
+ beforeEach(function() {
+ flowParser.parser.yy = flowDb;
+ flowDb.clear();
+ });
+ it('it should handle edges with text', function() {
+ flowParser.parser.parse('graph TD;A-->|text ex|B;');
+ flowParser.parser.yy.getVertices();
+ const edges = flowParser.parser.yy.getEdges();
const mockG = {
- setEdge: function (start, end, options) {
- expect(start).toBe('A')
- expect(end).toBe('B')
- expect(options.arrowhead).toBe('normal')
- expect(options.label.match('text ex')).toBeTruthy()
+ setEdge: function(start, end, options) {
+ expect(start).toBe('A');
+ expect(end).toBe('B');
+ expect(options.arrowhead).toBe('normal');
+ expect(options.label.match('text ex')).toBeTruthy();
}
- }
+ };
- flowRenderer.addEdges(edges, mockG)
- })
+ flowRenderer.addEdges(edges, mockG);
+ });
- it('should handle edges without text', function () {
- flowParser.parser.parse('graph TD;A-->B;')
- flowParser.parser.yy.getVertices()
- const edges = flowParser.parser.yy.getEdges()
+ it('should handle edges without text', function() {
+ flowParser.parser.parse('graph TD;A-->B;');
+ flowParser.parser.yy.getVertices();
+ const edges = flowParser.parser.yy.getEdges();
const mockG = {
- setEdge: function (start, end, options) {
- expect(start).toBe('A')
- expect(end).toBe('B')
- expect(options.arrowhead).toBe('normal')
+ setEdge: function(start, end, options) {
+ expect(start).toBe('A');
+ expect(end).toBe('B');
+ expect(options.arrowhead).toBe('normal');
}
- }
+ };
- flowRenderer.addEdges(edges, mockG)
- })
+ flowRenderer.addEdges(edges, mockG);
+ });
- it('should handle open-ended edges', function () {
- flowParser.parser.parse('graph TD;A---B;')
- flowParser.parser.yy.getVertices()
- const edges = flowParser.parser.yy.getEdges()
+ it('should handle open-ended edges', function() {
+ flowParser.parser.parse('graph TD;A---B;');
+ flowParser.parser.yy.getVertices();
+ const edges = flowParser.parser.yy.getEdges();
const mockG = {
- setEdge: function (start, end, options) {
- expect(start).toBe('A')
- expect(end).toBe('B')
- expect(options.arrowhead).toBe('none')
+ setEdge: function(start, end, options) {
+ expect(start).toBe('A');
+ expect(end).toBe('B');
+ expect(options.arrowhead).toBe('none');
}
- }
+ };
- flowRenderer.addEdges(edges, mockG)
- })
+ flowRenderer.addEdges(edges, mockG);
+ });
- it('should handle edges with styles defined', function () {
- flowParser.parser.parse('graph TD;A---B; linkStyle 0 stroke:val1,stroke-width:val2;')
- flowParser.parser.yy.getVertices()
- const edges = flowParser.parser.yy.getEdges()
+ it('should handle edges with styles defined', function() {
+ flowParser.parser.parse('graph TD;A---B; linkStyle 0 stroke:val1,stroke-width:val2;');
+ flowParser.parser.yy.getVertices();
+ const edges = flowParser.parser.yy.getEdges();
const mockG = {
- setEdge: function (start, end, options) {
- expect(start).toBe('A')
- expect(end).toBe('B')
- expect(options.arrowhead).toBe('none')
- expect(options.style).toBe('stroke:val1;stroke-width:val2;fill:none;')
+ setEdge: function(start, end, options) {
+ expect(start).toBe('A');
+ expect(end).toBe('B');
+ expect(options.arrowhead).toBe('none');
+ expect(options.style).toBe('stroke:val1;stroke-width:val2;fill:none;');
}
- }
+ };
- flowRenderer.addEdges(edges, mockG)
- })
- it('should handle edges with interpolation defined', function () {
- flowParser.parser.parse('graph TD;A---B; linkStyle 0 interpolate basis')
- flowParser.parser.yy.getVertices()
- const edges = flowParser.parser.yy.getEdges()
+ flowRenderer.addEdges(edges, mockG);
+ });
+ it('should handle edges with interpolation defined', function() {
+ flowParser.parser.parse('graph TD;A---B; linkStyle 0 interpolate basis');
+ flowParser.parser.yy.getVertices();
+ const edges = flowParser.parser.yy.getEdges();
const mockG = {
- setEdge: function (start, end, options) {
- expect(start).toBe('A')
- expect(end).toBe('B')
- expect(options.arrowhead).toBe('none')
- expect(options.curve).toBe('basis') // mocked as string
+ setEdge: function(start, end, options) {
+ expect(start).toBe('A');
+ expect(end).toBe('B');
+ expect(options.arrowhead).toBe('none');
+ expect(options.curve).toBe('basis'); // mocked as string
}
- }
+ };
- flowRenderer.addEdges(edges, mockG)
- })
- it('should handle edges with text and styles defined', function () {
- flowParser.parser.parse('graph TD;A---|the text|B; linkStyle 0 stroke:val1,stroke-width:val2;')
- flowParser.parser.yy.getVertices()
- const edges = flowParser.parser.yy.getEdges()
+ flowRenderer.addEdges(edges, mockG);
+ });
+ it('should handle edges with text and styles defined', function() {
+ flowParser.parser.parse(
+ 'graph TD;A---|the text|B; linkStyle 0 stroke:val1,stroke-width:val2;'
+ );
+ flowParser.parser.yy.getVertices();
+ const edges = flowParser.parser.yy.getEdges();
const mockG = {
- setEdge: function (start, end, options) {
- expect(start).toBe('A')
- expect(end).toBe('B')
- expect(options.arrowhead).toBe('none')
- expect(options.label.match('the text')).toBeTruthy()
- expect(options.style).toBe('stroke:val1;stroke-width:val2;fill:none;')
+ setEdge: function(start, end, options) {
+ expect(start).toBe('A');
+ expect(end).toBe('B');
+ expect(options.arrowhead).toBe('none');
+ expect(options.label.match('the text')).toBeTruthy();
+ expect(options.style).toBe('stroke:val1;stroke-width:val2;fill:none;');
}
- }
+ };
- flowRenderer.addEdges(edges, mockG)
- })
+ flowRenderer.addEdges(edges, mockG);
+ });
- it('should set fill to "none" by default when handling edges', function () {
- flowParser.parser.parse('graph TD;A---B; linkStyle 0 stroke:val1,stroke-width:val2;')
- flowParser.parser.yy.getVertices()
- const edges = flowParser.parser.yy.getEdges()
+ it('should set fill to "none" by default when handling edges', function() {
+ flowParser.parser.parse('graph TD;A---B; linkStyle 0 stroke:val1,stroke-width:val2;');
+ flowParser.parser.yy.getVertices();
+ const edges = flowParser.parser.yy.getEdges();
const mockG = {
- setEdge: function (start, end, options) {
- expect(start).toBe('A')
- expect(end).toBe('B')
- expect(options.arrowhead).toBe('none')
- expect(options.style).toBe('stroke:val1;stroke-width:val2;fill:none;')
+ setEdge: function(start, end, options) {
+ expect(start).toBe('A');
+ expect(end).toBe('B');
+ expect(options.arrowhead).toBe('none');
+ expect(options.style).toBe('stroke:val1;stroke-width:val2;fill:none;');
}
- }
+ };
- flowRenderer.addEdges(edges, mockG)
- })
+ flowRenderer.addEdges(edges, mockG);
+ });
- it('should not set fill to none if fill is set in linkStyle', function () {
- flowParser.parser.parse('graph TD;A---B; linkStyle 0 stroke:val1,stroke-width:val2,fill:blue;')
- flowParser.parser.yy.getVertices()
- const edges = flowParser.parser.yy.getEdges()
+ it('should not set fill to none if fill is set in linkStyle', function() {
+ flowParser.parser.parse(
+ 'graph TD;A---B; linkStyle 0 stroke:val1,stroke-width:val2,fill:blue;'
+ );
+ flowParser.parser.yy.getVertices();
+ const edges = flowParser.parser.yy.getEdges();
const mockG = {
- setEdge: function (start, end, options) {
- expect(start).toBe('A')
- expect(end).toBe('B')
- expect(options.arrowhead).toBe('none')
- expect(options.style).toBe('stroke:val1;stroke-width:val2;fill:blue;')
+ setEdge: function(start, end, options) {
+ expect(start).toBe('A');
+ expect(end).toBe('B');
+ expect(options.arrowhead).toBe('none');
+ expect(options.style).toBe('stroke:val1;stroke-width:val2;fill:blue;');
}
- }
+ };
- flowRenderer.addEdges(edges, mockG)
- })
- })
+ flowRenderer.addEdges(edges, mockG);
+ });
+ });
- describe('checking validity of input ', function () {
- it('it should throw for an invalid definiton', function () {
- expect(() => mermaid.parse('this is not a mermaid diagram definition')).toThrow()
- })
+ describe('checking validity of input ', function() {
+ it('it should throw for an invalid definiton', function() {
+ expect(() => mermaid.parse('this is not a mermaid diagram definition')).toThrow();
+ });
- it('it should not throw for a valid flow definition', function () {
- expect(() => mermaid.parse('graph TD;A--x|text including URL space|B;')).not.toThrow()
- })
- it('it should throw for an invalid flow definition', function () {
- expect(() => mermaid.parse('graph TQ;A--x|text including URL space|B;')).toThrow()
- })
+ it('it should not throw for a valid flow definition', function() {
+ expect(() => mermaid.parse('graph TD;A--x|text including URL space|B;')).not.toThrow();
+ });
+ it('it should throw for an invalid flow definition', function() {
+ expect(() => mermaid.parse('graph TQ;A--x|text including URL space|B;')).toThrow();
+ });
- it('it should not throw for a valid sequenceDiagram definition', function () {
- const text = 'sequenceDiagram\n' +
+ it('it should not throw for a valid sequenceDiagram definition', function() {
+ const text =
+ 'sequenceDiagram\n' +
'Alice->Bob: Hello Bob, how are you?\n\n' +
'%% Comment\n' +
'Note right of Bob: Bob thinks\n' +
@@ -197,12 +202,13 @@ describe('when using mermaid and ', function () {
'Bob-->Alice: I am good thanks!\n' +
'else isSick\n' +
'Bob-->Alice: Feel sick...\n' +
- 'end'
- expect(() => mermaid.parse(text)).not.toThrow()
- })
+ 'end';
+ expect(() => mermaid.parse(text)).not.toThrow();
+ });
- it('it should throw for an invalid sequenceDiagram definition', function () {
- const text = 'sequenceDiagram\n' +
+ it('it should throw for an invalid sequenceDiagram definition', function() {
+ const text =
+ 'sequenceDiagram\n' +
'Alice:->Bob: Hello Bob, how are you?\n\n' +
'%% Comment\n' +
'Note right of Bob: Bob thinks\n' +
@@ -210,8 +216,8 @@ describe('when using mermaid and ', function () {
'Bob-->Alice: I am good thanks!\n' +
'else isSick\n' +
'Bob-->Alice: Feel sick...\n' +
- 'end'
- expect(() => mermaid.parse(text)).toThrow()
- })
- })
-})
+ 'end';
+ expect(() => mermaid.parse(text)).toThrow();
+ });
+ });
+});
diff --git a/src/mermaidAPI.js b/src/mermaidAPI.js
index 522bdafbd..855d16b7f 100644
--- a/src/mermaidAPI.js
+++ b/src/mermaidAPI.js
@@ -9,38 +9,38 @@
* In addition to the render function, a number of behavioral configuration options are available.
*
* @name mermaidAPI
-*/
-import * as d3 from 'd3'
-import scope from 'scope-css'
-import pkg from '../package.json'
-import { setConfig, getConfig } from './config'
-import { logger, setLogLevel } from './logger'
-import utils from './utils'
-import flowRenderer from './diagrams/flowchart/flowRenderer'
-import flowParser from './diagrams/flowchart/parser/flow'
-import flowDb from './diagrams/flowchart/flowDb'
-import sequenceRenderer from './diagrams/sequence/sequenceRenderer'
-import sequenceParser from './diagrams/sequence/parser/sequenceDiagram'
-import sequenceDb from './diagrams/sequence/sequenceDb'
-import ganttRenderer from './diagrams/gantt/ganttRenderer'
-import ganttParser from './diagrams/gantt/parser/gantt'
-import ganttDb from './diagrams/gantt/ganttDb'
-import classRenderer from './diagrams/class/classRenderer'
-import classParser from './diagrams/class/parser/classDiagram'
-import classDb from './diagrams/class/classDb'
-import gitGraphRenderer from './diagrams/git/gitGraphRenderer'
-import gitGraphParser from './diagrams/git/parser/gitGraph'
-import gitGraphAst from './diagrams/git/gitGraphAst'
-import infoRenderer from './diagrams/info/infoRenderer'
-import infoParser from './diagrams/info/parser/info'
-import infoDb from './diagrams/info/infoDb'
-import pieRenderer from './diagrams/pie/pieRenderer'
-import pieParser from './diagrams/pie/parser/pie'
-import pieDb from './diagrams/pie/pieDb'
+ */
+import * as d3 from 'd3';
+import scope from 'scope-css';
+import pkg from '../package.json';
+import { setConfig, getConfig } from './config';
+import { logger, setLogLevel } from './logger';
+import utils from './utils';
+import flowRenderer from './diagrams/flowchart/flowRenderer';
+import flowParser from './diagrams/flowchart/parser/flow';
+import flowDb from './diagrams/flowchart/flowDb';
+import sequenceRenderer from './diagrams/sequence/sequenceRenderer';
+import sequenceParser from './diagrams/sequence/parser/sequenceDiagram';
+import sequenceDb from './diagrams/sequence/sequenceDb';
+import ganttRenderer from './diagrams/gantt/ganttRenderer';
+import ganttParser from './diagrams/gantt/parser/gantt';
+import ganttDb from './diagrams/gantt/ganttDb';
+import classRenderer from './diagrams/class/classRenderer';
+import classParser from './diagrams/class/parser/classDiagram';
+import classDb from './diagrams/class/classDb';
+import gitGraphRenderer from './diagrams/git/gitGraphRenderer';
+import gitGraphParser from './diagrams/git/parser/gitGraph';
+import gitGraphAst from './diagrams/git/gitGraphAst';
+import infoRenderer from './diagrams/info/infoRenderer';
+import infoParser from './diagrams/info/parser/info';
+import infoDb from './diagrams/info/infoDb';
+import pieRenderer from './diagrams/pie/pieRenderer';
+import pieParser from './diagrams/pie/parser/pie';
+import pieDb from './diagrams/pie/pieDb';
-const themes = {}
+const themes = {};
for (const themeName of ['default', 'forest', 'dark', 'neutral']) {
- themes[themeName] = require(`./themes/${themeName}/index.scss`)
+ themes[themeName] = require(`./themes/${themeName}/index.scss`);
}
/**
@@ -75,22 +75,21 @@ for (const themeName of ['default', 'forest', 'dark', 'neutral']) {
* @name Configuration
*/
const config = {
-
/** theme , the CSS style sheet
- *
- * **theme** - Choose one of the built-in themes:
- * * default
- * * forest
- * * dark
- * * neutral.
- * To disable any pre-defined mermaid theme, use "null".
- *
- * **themeCSS** - Use your own CSS. This overrides **theme**.
- *
- * "theme": "forest",
- * "themeCSS": ".node rect { fill: red; }"
- *
- */
+ *
+ * **theme** - Choose one of the built-in themes:
+ * * default
+ * * forest
+ * * dark
+ * * neutral.
+ * To disable any pre-defined mermaid theme, use "null".
+ *
+ * **themeCSS** - Use your own CSS. This overrides **theme**.
+ *
+ * "theme": "forest",
+ * "themeCSS": ".node rect { fill: red; }"
+ *
+ */
theme: 'default',
themeCSS: undefined,
@@ -149,7 +148,6 @@ const config = {
* The object containing configurations specific for sequence diagrams
*/
sequence: {
-
/**
* margin to the right and left of the sequence diagram.
* **Default value 50**.
@@ -234,7 +232,6 @@ const config = {
* **Default value false**.
*/
showSequenceNumbers: false
-
},
/**
@@ -303,100 +300,100 @@ const config = {
},
class: {},
git: {}
-}
+};
-setLogLevel(config.logLevel)
-setConfig(config)
+setLogLevel(config.logLevel);
+setConfig(config);
-function parse (text) {
- const graphType = utils.detectType(text)
- let parser
+function parse(text) {
+ const graphType = utils.detectType(text);
+ let parser;
- logger.debug('Type ' + graphType)
+ logger.debug('Type ' + graphType);
switch (graphType) {
case 'git':
- parser = gitGraphParser
- parser.parser.yy = gitGraphAst
- break
+ parser = gitGraphParser;
+ parser.parser.yy = gitGraphAst;
+ break;
case 'flowchart':
- parser = flowParser
- parser.parser.yy = flowDb
- break
+ parser = flowParser;
+ parser.parser.yy = flowDb;
+ break;
case 'sequence':
- parser = sequenceParser
- parser.parser.yy = sequenceDb
- break
+ parser = sequenceParser;
+ parser.parser.yy = sequenceDb;
+ break;
case 'gantt':
- parser = ganttParser
- parser.parser.yy = ganttDb
- break
+ parser = ganttParser;
+ parser.parser.yy = ganttDb;
+ break;
case 'class':
- parser = classParser
- parser.parser.yy = classDb
- break
+ parser = classParser;
+ parser.parser.yy = classDb;
+ break;
case 'info':
- logger.debug('info info info')
- console.warn('In API', pkg.version)
+ logger.debug('info info info');
+ console.warn('In API', pkg.version);
- parser = infoParser
- parser.parser.yy = infoDb
- break
+ parser = infoParser;
+ parser.parser.yy = infoDb;
+ break;
case 'pie':
- logger.debug('pie')
- parser = pieParser
- parser.parser.yy = pieDb
- break
+ logger.debug('pie');
+ parser = pieParser;
+ parser.parser.yy = pieDb;
+ break;
}
parser.parser.yy.parseError = (str, hash) => {
- const error = { str, hash }
- throw error
- }
+ const error = { str, hash };
+ throw error;
+ };
- parser.parse(text)
+ parser.parse(text);
}
-export const encodeEntities = function (text) {
- let txt = text
+export const encodeEntities = function(text) {
+ let txt = text;
- txt = txt.replace(/style.*:\S*#.*;/g, function (s) {
- const innerTxt = s.substring(0, s.length - 1)
- return innerTxt
- })
- txt = txt.replace(/classDef.*:\S*#.*;/g, function (s) {
- const innerTxt = s.substring(0, s.length - 1)
- return innerTxt
- })
+ txt = txt.replace(/style.*:\S*#.*;/g, function(s) {
+ const innerTxt = s.substring(0, s.length - 1);
+ return innerTxt;
+ });
+ txt = txt.replace(/classDef.*:\S*#.*;/g, function(s) {
+ const innerTxt = s.substring(0, s.length - 1);
+ return innerTxt;
+ });
- txt = txt.replace(/#\w+;/g, function (s) {
- const innerTxt = s.substring(1, s.length - 1)
+ txt = txt.replace(/#\w+;/g, function(s) {
+ const innerTxt = s.substring(1, s.length - 1);
- const isInt = /^\+?\d+$/.test(innerTxt)
+ const isInt = /^\+?\d+$/.test(innerTxt);
if (isInt) {
- return 'fl°°' + innerTxt + '¶ß'
+ return 'fl°°' + innerTxt + '¶ß';
} else {
- return 'fl°' + innerTxt + '¶ß'
+ return 'fl°' + innerTxt + '¶ß';
}
- })
+ });
- return txt
-}
+ return txt;
+};
-export const decodeEntities = function (text) {
- let txt = text
+export const decodeEntities = function(text) {
+ let txt = text;
- txt = txt.replace(/fl°°/g, function () {
- return '&#'
- })
- txt = txt.replace(/fl°/g, function () {
- return '&'
- })
- txt = txt.replace(/¶ß/g, function () {
- return ';'
- })
+ txt = txt.replace(/fl°°/g, function() {
+ return '&#';
+ });
+ txt = txt.replace(/fl°/g, function() {
+ return '&';
+ });
+ txt = txt.replace(/¶ß/g, function() {
+ return ';';
+ });
- return txt
-}
+ return txt;
+};
/**
* Function that renders an svg with a graph from a chart definition. Usage example below.
*
@@ -419,183 +416,209 @@ export const decodeEntities = function (text) {
* provided a hidden div will be inserted in the body of the page instead. The element will be removed when rendering is
* completed.
*/
-const render = function (id, txt, cb, container) {
+const render = function(id, txt, cb, container) {
if (typeof container !== 'undefined') {
- container.innerHTML = ''
+ container.innerHTML = '';
- d3.select(container).append('div')
+ d3.select(container)
+ .append('div')
.attr('id', 'd' + id)
.append('svg')
.attr('id', id)
.attr('width', '100%')
.attr('xmlns', 'http://www.w3.org/2000/svg')
- .append('g')
+ .append('g');
} else {
- const element = document.querySelector('#' + 'd' + id)
+ const element = document.querySelector('#' + 'd' + id);
if (element) {
- element.innerHTML = ''
+ element.innerHTML = '';
}
- d3.select('body').append('div')
+ d3.select('body')
+ .append('div')
.attr('id', 'd' + id)
.append('svg')
.attr('id', id)
.attr('width', '100%')
.attr('xmlns', 'http://www.w3.org/2000/svg')
- .append('g')
+ .append('g');
}
- window.txt = txt
- txt = encodeEntities(txt)
+ window.txt = txt;
+ txt = encodeEntities(txt);
- const element = d3.select('#d' + id).node()
- const graphType = utils.detectType(txt)
+ const element = d3.select('#d' + id).node();
+ const graphType = utils.detectType(txt);
// insert inline style into svg
- const svg = element.firstChild
- const firstChild = svg.firstChild
+ const svg = element.firstChild;
+ const firstChild = svg.firstChild;
// pre-defined theme
- let style = themes[config.theme]
+ let style = themes[config.theme];
if (style === undefined) {
- style = ''
+ style = '';
}
// user provided theme CSS
if (config.themeCSS !== undefined) {
- style += `\n${config.themeCSS}`
+ style += `\n${config.themeCSS}`;
}
// classDef
if (graphType === 'flowchart') {
- const classes = flowRenderer.getClasses(txt)
+ const classes = flowRenderer.getClasses(txt);
for (const className in classes) {
- style += `\n.${className} > * { ${classes[className].styles.join(' !important; ')} !important; }`
+ style += `\n.${className} > * { ${classes[className].styles.join(
+ ' !important; '
+ )} !important; }`;
}
}
- const style1 = document.createElement('style')
- style1.innerHTML = scope(style, `#${id}`)
- svg.insertBefore(style1, firstChild)
+ const style1 = document.createElement('style');
+ style1.innerHTML = scope(style, `#${id}`);
+ svg.insertBefore(style1, firstChild);
- const style2 = document.createElement('style')
- const cs = window.getComputedStyle(svg)
+ const style2 = document.createElement('style');
+ const cs = window.getComputedStyle(svg);
style2.innerHTML = `#${id} {
color: ${cs.color};
font: ${cs.font};
- }`
- svg.insertBefore(style2, firstChild)
+ }`;
+ svg.insertBefore(style2, firstChild);
switch (graphType) {
case 'git':
- config.flowchart.arrowMarkerAbsolute = config.arrowMarkerAbsolute
- gitGraphRenderer.setConf(config.git)
- gitGraphRenderer.draw(txt, id, false)
- break
+ config.flowchart.arrowMarkerAbsolute = config.arrowMarkerAbsolute;
+ gitGraphRenderer.setConf(config.git);
+ gitGraphRenderer.draw(txt, id, false);
+ break;
case 'flowchart':
- config.flowchart.arrowMarkerAbsolute = config.arrowMarkerAbsolute
- flowRenderer.setConf(config.flowchart)
- flowRenderer.draw(txt, id, false)
- break
+ config.flowchart.arrowMarkerAbsolute = config.arrowMarkerAbsolute;
+ flowRenderer.setConf(config.flowchart);
+ flowRenderer.draw(txt, id, false);
+ break;
case 'sequence':
- config.sequence.arrowMarkerAbsolute = config.arrowMarkerAbsolute
- if (config.sequenceDiagram) { // backwards compatibility
- sequenceRenderer.setConf(Object.assign(config.sequence, config.sequenceDiagram))
- console.error('`mermaid config.sequenceDiagram` has been renamed to `config.sequence`. Please update your mermaid config.')
+ config.sequence.arrowMarkerAbsolute = config.arrowMarkerAbsolute;
+ if (config.sequenceDiagram) {
+ // backwards compatibility
+ sequenceRenderer.setConf(Object.assign(config.sequence, config.sequenceDiagram));
+ console.error(
+ '`mermaid config.sequenceDiagram` has been renamed to `config.sequence`. Please update your mermaid config.'
+ );
} else {
- sequenceRenderer.setConf(config.sequence)
+ sequenceRenderer.setConf(config.sequence);
}
- sequenceRenderer.draw(txt, id)
- break
+ sequenceRenderer.draw(txt, id);
+ break;
case 'gantt':
- config.gantt.arrowMarkerAbsolute = config.arrowMarkerAbsolute
- ganttRenderer.setConf(config.gantt)
- ganttRenderer.draw(txt, id)
- break
+ config.gantt.arrowMarkerAbsolute = config.arrowMarkerAbsolute;
+ ganttRenderer.setConf(config.gantt);
+ ganttRenderer.draw(txt, id);
+ break;
case 'class':
- config.class.arrowMarkerAbsolute = config.arrowMarkerAbsolute
- classRenderer.setConf(config.class)
- classRenderer.draw(txt, id)
- break
+ config.class.arrowMarkerAbsolute = config.arrowMarkerAbsolute;
+ classRenderer.setConf(config.class);
+ classRenderer.draw(txt, id);
+ break;
case 'info':
- config.class.arrowMarkerAbsolute = config.arrowMarkerAbsolute
- infoRenderer.setConf(config.class)
- infoRenderer.draw(txt, id, pkg.version)
- break
+ config.class.arrowMarkerAbsolute = config.arrowMarkerAbsolute;
+ infoRenderer.setConf(config.class);
+ infoRenderer.draw(txt, id, pkg.version);
+ break;
case 'pie':
- config.class.arrowMarkerAbsolute = config.arrowMarkerAbsolute
- pieRenderer.setConf(config.class)
- pieRenderer.draw(txt, id, pkg.version)
- break
+ config.class.arrowMarkerAbsolute = config.arrowMarkerAbsolute;
+ pieRenderer.setConf(config.class);
+ pieRenderer.draw(txt, id, pkg.version);
+ break;
}
- d3.select(`[id="${id}"]`).selectAll('foreignobject > *').attr('xmlns', 'http://www.w3.org/1999/xhtml')
+ d3.select(`[id="${id}"]`)
+ .selectAll('foreignobject > *')
+ .attr('xmlns', 'http://www.w3.org/1999/xhtml');
- let url = ''
+ let url = '';
if (config.arrowMarkerAbsolute) {
- url = window.location.protocol + '//' + window.location.host + window.location.pathname + window.location.search
- url = url.replace(/\(/g, '\\(')
- url = url.replace(/\)/g, '\\)')
+ url =
+ window.location.protocol +
+ '//' +
+ window.location.host +
+ window.location.pathname +
+ window.location.search;
+ url = url.replace(/\(/g, '\\(');
+ url = url.replace(/\)/g, '\\)');
}
// Fix for when the base tag is used
- let svgCode = d3.select('#d' + id).node().innerHTML.replace(/url\(#arrowhead/g, 'url(' + url + '#arrowhead', 'g')
+ let svgCode = d3
+ .select('#d' + id)
+ .node()
+ .innerHTML.replace(/url\(#arrowhead/g, 'url(' + url + '#arrowhead', 'g');
- svgCode = decodeEntities(svgCode)
+ svgCode = decodeEntities(svgCode);
if (typeof cb !== 'undefined') {
switch (graphType) {
case 'flowchart':
- cb(svgCode, flowDb.bindFunctions)
- break
+ cb(svgCode, flowDb.bindFunctions);
+ break;
case 'gantt':
- cb(svgCode, ganttDb.bindFunctions)
- break
+ cb(svgCode, ganttDb.bindFunctions);
+ break;
default:
- cb(svgCode)
+ cb(svgCode);
}
} else {
- logger.debug('CB = undefined!')
+ logger.debug('CB = undefined!');
}
- const node = d3.select('#d' + id).node()
+ const node = d3.select('#d' + id).node();
if (node !== null && typeof node.remove === 'function') {
- d3.select('#d' + id).node().remove()
+ d3.select('#d' + id)
+ .node()
+ .remove();
}
- return svgCode
-}
+ return svgCode;
+};
-const setConf = function (cnf) {
+const setConf = function(cnf) {
// Top level initially mermaid, gflow, sequenceDiagram and gantt
- const lvl1Keys = Object.keys(cnf)
+ const lvl1Keys = Object.keys(cnf);
for (let i = 0; i < lvl1Keys.length; i++) {
if (typeof cnf[lvl1Keys[i]] === 'object' && cnf[lvl1Keys[i]] != null) {
- const lvl2Keys = Object.keys(cnf[lvl1Keys[i]])
+ const lvl2Keys = Object.keys(cnf[lvl1Keys[i]]);
for (let j = 0; j < lvl2Keys.length; j++) {
- logger.debug('Setting conf ', lvl1Keys[i], '-', lvl2Keys[j])
+ logger.debug('Setting conf ', lvl1Keys[i], '-', lvl2Keys[j]);
if (typeof config[lvl1Keys[i]] === 'undefined') {
- config[lvl1Keys[i]] = {}
+ config[lvl1Keys[i]] = {};
}
- logger.debug('Setting config: ' + lvl1Keys[i] + ' ' + lvl2Keys[j] + ' to ' + cnf[lvl1Keys[i]][lvl2Keys[j]])
- config[lvl1Keys[i]][lvl2Keys[j]] = cnf[lvl1Keys[i]][lvl2Keys[j]]
+ logger.debug(
+ 'Setting config: ' +
+ lvl1Keys[i] +
+ ' ' +
+ lvl2Keys[j] +
+ ' to ' +
+ cnf[lvl1Keys[i]][lvl2Keys[j]]
+ );
+ config[lvl1Keys[i]][lvl2Keys[j]] = cnf[lvl1Keys[i]][lvl2Keys[j]];
}
} else {
- config[lvl1Keys[i]] = cnf[lvl1Keys[i]]
+ config[lvl1Keys[i]] = cnf[lvl1Keys[i]];
}
}
-}
+};
-function initialize (options) {
- logger.debug('Initializing mermaidAPI ', pkg.version)
+function initialize(options) {
+ logger.debug('Initializing mermaidAPI ', pkg.version);
// Update default config with options supplied at initialization
if (typeof options === 'object') {
- setConf(options)
+ setConf(options);
}
- setConfig(config)
- setLogLevel(config.logLevel)
+ setConfig(config);
+ setLogLevel(config.logLevel);
}
// function getConfig () {
@@ -608,9 +631,9 @@ const mermaidAPI = {
parse,
initialize,
getConfig
-}
+};
-export default mermaidAPI
+export default mermaidAPI;
/**
* ## mermaidAPI configuration defaults
*
diff --git a/src/mermaidAPI.spec.js b/src/mermaidAPI.spec.js
index 51749677c..a5114356f 100644
--- a/src/mermaidAPI.spec.js
+++ b/src/mermaidAPI.spec.js
@@ -1,45 +1,45 @@
/* eslint-env jasmine */
-import mermaidAPI from './mermaidAPI'
+import mermaidAPI from './mermaidAPI';
-describe('when using mermaidAPI and ', function () {
- describe('doing initialize ', function () {
- beforeEach(function () {
- document.body.innerHTML = ''
- })
+describe('when using mermaidAPI and ', function() {
+ describe('doing initialize ', function() {
+ beforeEach(function() {
+ document.body.innerHTML = '';
+ });
- it('should copy a literal into the configuration', function () {
- const orgConfig = mermaidAPI.getConfig()
- expect(orgConfig.testLiteral).toBe(undefined)
+ it('should copy a literal into the configuration', function() {
+ const orgConfig = mermaidAPI.getConfig();
+ expect(orgConfig.testLiteral).toBe(undefined);
- mermaidAPI.initialize({ 'testLiteral': true })
- const config = mermaidAPI.getConfig()
+ mermaidAPI.initialize({ testLiteral: true });
+ const config = mermaidAPI.getConfig();
- expect(config.testLiteral).toBe(true)
- })
- it('should copy a an object into the configuration', function () {
- const orgConfig = mermaidAPI.getConfig()
- expect(orgConfig.testObject).toBe(undefined)
+ expect(config.testLiteral).toBe(true);
+ });
+ it('should copy a an object into the configuration', function() {
+ const orgConfig = mermaidAPI.getConfig();
+ expect(orgConfig.testObject).toBe(undefined);
const object = {
test1: 1,
test2: false
- }
+ };
- mermaidAPI.initialize({ 'testObject': object })
- mermaidAPI.initialize({ 'testObject': { 'test3': true } })
- const config = mermaidAPI.getConfig()
+ mermaidAPI.initialize({ testObject: object });
+ mermaidAPI.initialize({ testObject: { test3: true } });
+ const config = mermaidAPI.getConfig();
- expect(config.testObject.test1).toBe(1)
- expect(config.testObject.test2).toBe(false)
- expect(config.testObject.test3).toBe(true)
- })
- })
- describe('checking validity of input ', function () {
- it('it should throw for an invalid definiton', function () {
- expect(() => mermaidAPI.parse('this is not a mermaid diagram definition')).toThrow()
- })
- it('it should not throw for a valid definiton', function () {
- expect(() => mermaidAPI.parse('graph TD;A--x|text including URL space|B;')).not.toThrow()
- })
- })
-})
+ expect(config.testObject.test1).toBe(1);
+ expect(config.testObject.test2).toBe(false);
+ expect(config.testObject.test3).toBe(true);
+ });
+ });
+ describe('checking validity of input ', function() {
+ it('it should throw for an invalid definiton', function() {
+ expect(() => mermaidAPI.parse('this is not a mermaid diagram definition')).toThrow();
+ });
+ it('it should not throw for a valid definiton', function() {
+ expect(() => mermaidAPI.parse('graph TD;A--x|text including URL space|B;')).not.toThrow();
+ });
+ });
+});
diff --git a/src/utils.js b/src/utils.js
index 462e7040c..357865fbf 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -1,5 +1,5 @@
-import * as d3 from 'd3'
-import { logger } from './logger'
+import * as d3 from 'd3';
+import { logger } from './logger';
/**
* @function detectType
@@ -18,34 +18,34 @@ import { logger } from './logger'
* @param {string} text The text defining the graph
* @returns {string} A graph definition key
*/
-export const detectType = function (text) {
- text = text.replace(/^\s*%%.*\n/g, '\n')
- logger.debug('Detecting diagram type based on the text ' + text)
+export const detectType = function(text) {
+ text = text.replace(/^\s*%%.*\n/g, '\n');
+ logger.debug('Detecting diagram type based on the text ' + text);
if (text.match(/^\s*sequenceDiagram/)) {
- return 'sequence'
+ return 'sequence';
}
if (text.match(/^\s*gantt/)) {
- return 'gantt'
+ return 'gantt';
}
if (text.match(/^\s*classDiagram/)) {
- return 'class'
+ return 'class';
}
if (text.match(/^\s*gitGraph/)) {
- return 'git'
+ return 'git';
}
if (text.match(/^\s*info/)) {
- return 'info'
+ return 'info';
}
if (text.match(/^\s*pie/)) {
- return 'pie'
+ return 'pie';
}
- return 'flowchart'
-}
+ return 'flowchart';
+};
/**
* @function isSubstringInArray
@@ -54,23 +54,23 @@ export const detectType = function (text) {
* @param {array} arr The array to search
* @returns {number} the array index containing the substring or -1 if not present
**/
-export const isSubstringInArray = function (str, arr) {
+export const isSubstringInArray = function(str, arr) {
for (let i = 0; i < arr.length; i++) {
- if (arr[i].match(str)) return i
+ if (arr[i].match(str)) return i;
}
- return -1
-}
+ return -1;
+};
export const interpolateToCurve = (interpolate, defaultCurve) => {
if (!interpolate) {
- return defaultCurve
+ return defaultCurve;
}
- const curveName = `curve${interpolate.charAt(0).toUpperCase() + interpolate.slice(1)}`
- return d3[curveName] || defaultCurve
-}
+ const curveName = `curve${interpolate.charAt(0).toUpperCase() + interpolate.slice(1)}`;
+ return d3[curveName] || defaultCurve;
+};
export default {
detectType,
isSubstringInArray,
interpolateToCurve
-}
+};
diff --git a/src/utils.spec.js b/src/utils.spec.js
index 43341fb6d..86de39513 100644
--- a/src/utils.spec.js
+++ b/src/utils.spec.js
@@ -1,39 +1,39 @@
/* eslint-env jasmine */
-import utils from './utils'
+import utils from './utils';
-describe('when detecting chart type ', function () {
- it('should handle a graph defintion', function () {
- const str = 'graph TB\nbfs1:queue'
- const type = utils.detectType(str)
- expect(type).toBe('flowchart')
- })
- it('should handle a graph defintion with leading spaces', function () {
- const str = ' graph TB\nbfs1:queue'
- const type = utils.detectType(str)
- expect(type).toBe('flowchart')
- })
+describe('when detecting chart type ', function() {
+ it('should handle a graph defintion', function() {
+ const str = 'graph TB\nbfs1:queue';
+ const type = utils.detectType(str);
+ expect(type).toBe('flowchart');
+ });
+ it('should handle a graph defintion with leading spaces', function() {
+ const str = ' graph TB\nbfs1:queue';
+ const type = utils.detectType(str);
+ expect(type).toBe('flowchart');
+ });
- it('should handle a graph defintion with leading spaces and newline', function () {
- const str = ' \n graph TB\nbfs1:queue'
- const type = utils.detectType(str)
- expect(type).toBe('flowchart')
- })
- it('should handle a graph defintion for gitGraph', function () {
- const str = ' \n gitGraph TB:\nbfs1:queue'
- const type = utils.detectType(str)
- expect(type).toBe('git')
- })
-})
+ it('should handle a graph defintion with leading spaces and newline', function() {
+ const str = ' \n graph TB\nbfs1:queue';
+ const type = utils.detectType(str);
+ expect(type).toBe('flowchart');
+ });
+ it('should handle a graph defintion for gitGraph', function() {
+ const str = ' \n gitGraph TB:\nbfs1:queue';
+ const type = utils.detectType(str);
+ expect(type).toBe('git');
+ });
+});
-describe('when finding substring in array ', function () {
- it('should return the array index that contains the substring', function () {
- const arr = ['stroke:val1', 'fill:val2']
- const result = utils.isSubstringInArray('fill', arr)
- expect(result).toEqual(1)
- })
- it('should return -1 if the substring is not found in the array', function () {
- const arr = ['stroke:val1', 'stroke-width:val2']
- const result = utils.isSubstringInArray('fill', arr)
- expect(result).toEqual(-1)
- })
-})
+describe('when finding substring in array ', function() {
+ it('should return the array index that contains the substring', function() {
+ const arr = ['stroke:val1', 'fill:val2'];
+ const result = utils.isSubstringInArray('fill', arr);
+ expect(result).toEqual(1);
+ });
+ it('should return -1 if the substring is not found in the array', function() {
+ const arr = ['stroke:val1', 'stroke-width:val2'];
+ const result = utils.isSubstringInArray('fill', arr);
+ expect(result).toEqual(-1);
+ });
+});
diff --git a/yarn.lock b/yarn.lock
index c2e24ae0b..8f64c4adb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1528,6 +1528,11 @@ acorn-jsx@^5.0.0:
version "5.0.1"
resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e"
+acorn-jsx@^5.0.2:
+ version "5.0.2"
+ resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.2.tgz#84b68ea44b373c4f8686023a551f61a21b7c4a4f"
+ integrity sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw==
+
acorn-walk@^6.0.1:
version "6.1.1"
resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
@@ -1540,6 +1545,11 @@ acorn@^6.0.1, acorn@^6.0.2:
version "6.0.4"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.4.tgz#77377e7353b72ec5104550aa2d2097a2fd40b754"
+acorn@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.0.0.tgz#26b8d1cd9a9b700350b71c0905546f64d1284e7a"
+ integrity sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ==
+
agent-base@^4.1.0:
version "4.2.1"
resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
@@ -1575,6 +1585,16 @@ ajv@^6.1.0:
fast-json-stable-stringify "^2.0.0"
json-schema-traverse "^0.3.0"
+ajv@^6.10.0, ajv@^6.10.2:
+ version "6.10.2"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
+ integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
+ dependencies:
+ fast-deep-equal "^2.0.1"
+ fast-json-stable-stringify "^2.0.0"
+ json-schema-traverse "^0.4.1"
+ uri-js "^4.2.2"
+
amdefine@>=0.0.4:
version "1.0.1"
resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
@@ -1591,9 +1611,10 @@ ansi-escapes@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92"
-ansi-escapes@^3.1.0:
+ansi-escapes@^3.1.0, ansi-escapes@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+ integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
ansi-html@0.0.7, ansi-html@^0.0.7:
version "0.0.7"
@@ -2383,6 +2404,11 @@ callsites@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+callsites@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+ integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
camel-case@3.0.x:
version "3.0.0"
resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
@@ -2504,6 +2530,11 @@ chardet@^0.4.0:
version "0.4.2"
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
+chardet@^0.7.0:
+ version "0.7.0"
+ resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+ integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+
check-more-types@2.24.0:
version "2.24.0"
resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
@@ -3394,9 +3425,10 @@ debug@3.2.6, debug@^3.2.5, debug@^3.2.6:
dependencies:
ms "^2.1.1"
-debug@4.1.1, debug@^4.1.1:
+debug@4.1.1, debug@^4.0.1, debug@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+ integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
dependencies:
ms "^2.1.1"
@@ -3627,6 +3659,13 @@ doctrine@^2.1.0:
dependencies:
esutils "^2.0.2"
+doctrine@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+ integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+ dependencies:
+ esutils "^2.0.2"
+
documentation@^12.0.1:
version "12.0.1"
resolved "https://registry.yarnpkg.com/documentation/-/documentation-12.0.1.tgz#4abe263d5415f3ed7ee737829921ef6159e6a335"
@@ -3899,6 +3938,13 @@ escodegen@^1.9.1:
optionalDependencies:
source-map "~0.6.1"
+eslint-config-prettier@^6.3.0:
+ version "6.3.0"
+ resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.3.0.tgz#e73b48e59dc49d950843f3eb96d519e2248286a3"
+ integrity sha512-EWaGjlDAZRzVFveh2Jsglcere2KK5CJBhkNSa1xs3KfMUGdRiT7lG089eqPdvlzWHpAqaekubOsOMu8W8Yk71A==
+ dependencies:
+ get-stdin "^6.0.0"
+
eslint-config-standard-jsx@6.0.2:
version "6.0.2"
resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-6.0.2.tgz#90c9aa16ac2c4f8970c13fc7efc608bacd02da70"
@@ -3954,6 +4000,13 @@ eslint-plugin-node@~7.0.1:
resolve "^1.8.1"
semver "^5.5.0"
+eslint-plugin-prettier@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.0.tgz#8695188f95daa93b0dc54b249347ca3b79c4686d"
+ integrity sha512-XWX2yVuwVNLOUhQijAkXz+rMPPoCr7WFiAl8ig6I7Xn+pPVhDhzg4DxHpmbeb0iqjO9UronEA3Tb09ChnFVHHA==
+ dependencies:
+ prettier-linter-helpers "^1.0.0"
+
eslint-plugin-promise@~4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.0.1.tgz#2d074b653f35a23d1ba89d8e976a985117d1c6a2"
@@ -3979,14 +4032,77 @@ eslint-scope@^4.0.0:
esrecurse "^4.1.0"
estraverse "^4.1.1"
+eslint-scope@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"
+ integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==
+ dependencies:
+ esrecurse "^4.1.0"
+ estraverse "^4.1.1"
+
eslint-utils@^1.3.0, eslint-utils@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
+eslint-utils@^1.4.2:
+ version "1.4.2"
+ resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab"
+ integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==
+ dependencies:
+ eslint-visitor-keys "^1.0.0"
+
eslint-visitor-keys@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
+eslint-visitor-keys@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
+ integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
+
+eslint@^6.3.0:
+ version "6.3.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.3.0.tgz#1f1a902f67bfd4c354e7288b81e40654d927eb6a"
+ integrity sha512-ZvZTKaqDue+N8Y9g0kp6UPZtS4FSY3qARxBs7p4f0H0iof381XHduqVerFWtK8DPtKmemqbqCFENWSQgPR/Gow==
+ dependencies:
+ "@babel/code-frame" "^7.0.0"
+ ajv "^6.10.0"
+ chalk "^2.1.0"
+ cross-spawn "^6.0.5"
+ debug "^4.0.1"
+ doctrine "^3.0.0"
+ eslint-scope "^5.0.0"
+ eslint-utils "^1.4.2"
+ eslint-visitor-keys "^1.1.0"
+ espree "^6.1.1"
+ esquery "^1.0.1"
+ esutils "^2.0.2"
+ file-entry-cache "^5.0.1"
+ functional-red-black-tree "^1.0.1"
+ glob-parent "^5.0.0"
+ globals "^11.7.0"
+ ignore "^4.0.6"
+ import-fresh "^3.0.0"
+ imurmurhash "^0.1.4"
+ inquirer "^6.4.1"
+ is-glob "^4.0.0"
+ js-yaml "^3.13.1"
+ json-stable-stringify-without-jsonify "^1.0.1"
+ levn "^0.3.0"
+ lodash "^4.17.14"
+ minimatch "^3.0.4"
+ mkdirp "^0.5.1"
+ natural-compare "^1.4.0"
+ optionator "^0.8.2"
+ progress "^2.0.0"
+ regexpp "^2.0.1"
+ semver "^6.1.2"
+ strip-ansi "^5.2.0"
+ strip-json-comments "^3.0.1"
+ table "^5.2.3"
+ text-table "^0.2.0"
+ v8-compile-cache "^2.0.3"
+
eslint@~5.4.0:
version "5.4.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.4.0.tgz#d068ec03006bb9e06b429dc85f7e46c1b69fac62"
@@ -4038,6 +4154,15 @@ espree@^4.0.0:
acorn-jsx "^5.0.0"
eslint-visitor-keys "^1.0.0"
+espree@^6.1.1:
+ version "6.1.1"
+ resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.1.tgz#7f80e5f7257fc47db450022d723e356daeb1e5de"
+ integrity sha512-EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ==
+ dependencies:
+ acorn "^7.0.0"
+ acorn-jsx "^5.0.2"
+ eslint-visitor-keys "^1.1.0"
+
esprima@1.1.x, esprima@~1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.1.1.tgz#5b6f1547f4d102e670e140c509be6771d6aeb549"
@@ -4289,6 +4414,15 @@ external-editor@^2.1.0:
iconv-lite "^0.4.17"
tmp "^0.0.33"
+external-editor@^3.0.3:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+ integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
+ dependencies:
+ chardet "^0.7.0"
+ iconv-lite "^0.4.24"
+ tmp "^0.0.33"
+
extglob@^0.3.1:
version "0.3.2"
resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
@@ -4337,6 +4471,11 @@ fast-deep-equal@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+fast-diff@^1.1.2:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
+ integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
+
fast-glob@^3.0.3:
version "3.0.4"
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.0.4.tgz#d484a41005cb6faeb399b951fd1bd70ddaebb602"
@@ -4420,6 +4559,13 @@ file-entry-cache@^2.0.0:
flat-cache "^1.2.1"
object-assign "^4.0.1"
+file-entry-cache@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
+ integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
+ dependencies:
+ flat-cache "^2.0.1"
+
filename-regex@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
@@ -4537,6 +4683,20 @@ flat-cache@^1.2.1:
rimraf "~2.6.2"
write "^0.2.1"
+flat-cache@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
+ integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
+ dependencies:
+ flatted "^2.0.0"
+ rimraf "2.6.3"
+ write "1.0.3"
+
+flatted@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
+ integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
+
flush-write-stream@^1.0.0, flush-write-stream@^1.0.2:
version "1.0.3"
resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
@@ -5260,7 +5420,7 @@ hyperlinker@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/hyperlinker/-/hyperlinker-1.0.0.tgz#23dc9e38a206b208ee49bc2d6c8ef47027df0c0e"
-iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.4:
+iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
version "0.4.24"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
dependencies:
@@ -5300,9 +5460,10 @@ ignore@^3.0.9:
version "3.3.10"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
-ignore@^4.0.2:
+ignore@^4.0.2, ignore@^4.0.6:
version "4.0.6"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+ integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
ignore@^5.1.1:
version "5.1.4"
@@ -5315,6 +5476,14 @@ import-fresh@^2.0.0:
caller-path "^2.0.0"
resolve-from "^3.0.0"
+import-fresh@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.1.0.tgz#6d33fa1dcef6df930fae003446f33415af905118"
+ integrity sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==
+ dependencies:
+ parent-module "^1.0.0"
+ resolve-from "^4.0.0"
+
import-local@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
@@ -5396,6 +5565,25 @@ inquirer@^5.2.0:
strip-ansi "^4.0.0"
through "^2.3.6"
+inquirer@^6.4.1:
+ version "6.5.2"
+ resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
+ integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
+ dependencies:
+ ansi-escapes "^3.2.0"
+ chalk "^2.4.2"
+ cli-cursor "^2.1.0"
+ cli-width "^2.0.0"
+ external-editor "^3.0.3"
+ figures "^2.0.0"
+ lodash "^4.17.12"
+ mute-stream "0.0.7"
+ run-async "^2.2.0"
+ rxjs "^6.4.0"
+ string-width "^2.1.0"
+ strip-ansi "^5.1.0"
+ through "^2.3.6"
+
internal-ip@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
@@ -6661,9 +6849,10 @@ lodash@^4.0.0, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4,
version "4.17.13"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.13.tgz#0bdc3a6adc873d2f4e0c4bac285df91b64fc7b93"
-lodash@^4.17.13:
+lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14:
version "4.17.15"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+ integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
log-driver@^1.2.7:
version "1.2.7"
@@ -7699,6 +7888,13 @@ param-case@2.1.x:
dependencies:
no-case "^2.2.0"
+parent-module@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+ integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+ dependencies:
+ callsites "^3.0.0"
+
parse-asn1@^5.0.0:
version "5.1.1"
resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
@@ -8062,6 +8258,18 @@ preserve@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+prettier-linter-helpers@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
+ integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
+ dependencies:
+ fast-diff "^1.1.2"
+
+prettier@^1.18.2:
+ version "1.18.2"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
+ integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
+
pretty-format@^23.6.0:
version "23.6.0"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760"
@@ -8804,6 +9012,11 @@ resolve-from@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+resolve-from@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+ integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
resolve-options@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131"
@@ -8856,7 +9069,7 @@ reusify@^1.0.0:
version "1.0.4"
resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
-rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@~2.6.2:
+rimraf@2, rimraf@2.6.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@~2.6.2:
version "2.6.3"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
dependencies:
@@ -8907,6 +9120,13 @@ rxjs@^5.0.0-beta.11, rxjs@^5.5.2:
dependencies:
symbol-observable "1.0.1"
+rxjs@^6.4.0:
+ version "6.5.3"
+ resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"
+ integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==
+ dependencies:
+ tslib "^1.9.0"
+
safe-buffer@5.1.2, safe-buffer@^5.1.1, safe-buffer@^5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -9036,6 +9256,11 @@ semver@^6.1.1:
version "6.2.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db"
+semver@^6.1.2:
+ version "6.3.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+ integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
semver@~5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -9199,6 +9424,15 @@ slice-ansi@1.0.0:
dependencies:
is-fullwidth-code-point "^2.0.0"
+slice-ansi@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
+ integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
+ dependencies:
+ ansi-styles "^3.2.0"
+ astral-regex "^1.0.0"
+ is-fullwidth-code-point "^2.0.0"
+
slugify@^1.3.1:
version "1.3.4"
resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.3.4.tgz#78d2792d7222b55cd9fc81fa018df99af779efeb"
@@ -9648,6 +9882,11 @@ strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+strip-json-comments@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
+ integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
+
subarg@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
@@ -9708,6 +9947,16 @@ table@^4.0.3:
slice-ansi "1.0.0"
string-width "^2.1.1"
+table@^5.2.3:
+ version "5.4.6"
+ resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
+ integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
+ dependencies:
+ ajv "^6.10.2"
+ lodash "^4.17.14"
+ slice-ansi "^2.1.0"
+ string-width "^3.0.0"
+
tapable@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
@@ -10253,6 +10502,11 @@ v8-compile-cache@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
+v8-compile-cache@^2.0.3:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
+ integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==
+
validate-npm-package-license@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
@@ -10687,6 +10941,13 @@ write-file-atomic@^2.1.0:
imurmurhash "^0.1.4"
signal-exit "^3.0.2"
+write@1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
+ integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
+ dependencies:
+ mkdirp "^0.5.1"
+
write@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"