mirrors
/
mermaid
mirror of https://github.com/mermaid-js/mermaid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace 'var ' with 'const '

This commit is contained in:
Tyler Long 2017-09-14 20:12:54 +08:00
parent d6e22d5f5e
commit 8da5f26452
3 changed files with 68 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/diagrams/classDiagram/classDb.js
View File

@ -1,11 +1,8 @@
import { logger } from '../../logger' import { logger } from '../../logger'
var relations = [] let relations = []
let classes = {}
var classes
classes = {
}
/** /**
* Function called by parser when a node definition has been found. * Function called by parser when a node definition has been found.
@ -48,7 +45,7 @@ export const addRelation = function (relation) {
} }
export const addMembers = function (className, MembersArr) { export const addMembers = function (className, MembersArr) {
var theClass = classes[className] const theClass = classes[className]
if (typeof MembersArr === 'string') { if (typeof MembersArr === 'string') {
if (MembersArr.substr(-1) === ')') { if (MembersArr.substr(-1) === ')') {
theClass.methods.push(MembersArr) theClass.methods.push(MembersArr)

38
src/diagrams/classDiagram/classDiagram.spec.js
View File

@ -9,7 +9,7 @@ describe('class diagram, ', function () {
}) })
it('should handle relation definitions', function () { it('should handle relation definitions', function () {
var str = 'classDiagram\n' + const str = 'classDiagram\n' +
'Class01 <|-- Class02\n' + 'Class01 <|-- Class02\n' +
'Class03 *-- Class04\n' + 'Class03 *-- Class04\n' +
'Class05 o-- Class06\n' + 'Class05 o-- Class06\n' +
@ -19,7 +19,7 @@ describe('class diagram, ', function () {
parser.parse(str) parser.parse(str)
}) })
it('should handle relation definition of different types and directions', function () { it('should handle relation definition of different types and directions', function () {
var str = 'classDiagram\n' + const str = 'classDiagram\n' +
'Class11 <|.. Class12\n' + 'Class11 <|.. Class12\n' +
'Class13 --> Class14\n' + 'Class13 --> Class14\n' +
'Class15 ..> Class16\n' + 'Class15 ..> Class16\n' +
@ -30,7 +30,7 @@ describe('class diagram, ', function () {
}) })
it('should handle cardinality and labels', function () { it('should handle cardinality and labels', function () {
var str = 'classDiagram\n' + const str = 'classDiagram\n' +
'Class01 "1" *-- "many" Class02 : contains\n' + 'Class01 "1" *-- "many" Class02 : contains\n' +
'Class03 o-- Class04 : aggregation\n' + 'Class03 o-- Class04 : aggregation\n' +
'Class05 --> "1" Class06' 'Class05 --> "1" Class06'
@ -38,7 +38,7 @@ describe('class diagram, ', function () {
parser.parse(str) parser.parse(str)
}) })
it('should handle class definitions', function () { it('should handle class definitions', function () {
var str = 'classDiagram\n' + const str = 'classDiagram\n' +
'class Car\n' + 'class Car\n' +
'Driver -- Car : drives >\n' + 'Driver -- Car : drives >\n' +
'Car *-- Wheel : have 4 >\n' + 'Car *-- Wheel : have 4 >\n' +
@ -48,7 +48,7 @@ describe('class diagram, ', function () {
}) })
it('should handle method statements', function () { it('should handle method statements', function () {
var str = 'classDiagram\n' + const str = 'classDiagram\n' +
'Object <|-- ArrayList\n' + 'Object <|-- ArrayList\n' +
'Object : equals()\n' + 'Object : equals()\n' +
'ArrayList : Object[] elementData\n' + 'ArrayList : Object[] elementData\n' +
@ -57,7 +57,7 @@ describe('class diagram, ', function () {
parser.parse(str) parser.parse(str)
}) })
it('should handle parsing of method statements grouped by brackets', function () { it('should handle parsing of method statements grouped by brackets', function () {
var str = 'classDiagram\n' + const str = 'classDiagram\n' +
'class Dummy {\n' + 'class Dummy {\n' +
'String data\n' + 'String data\n' +
' void methods()\n' + ' void methods()\n' +
@ -72,7 +72,7 @@ describe('class diagram, ', function () {
}) })
it('should handle parsing of separators', function () { it('should handle parsing of separators', function () {
var str = 'classDiagram\n' + const str = 'classDiagram\n' +
'class Foo1 {\n' + 'class Foo1 {\n' +
' You can use\n' + ' You can use\n' +
' several lines\n' + ' several lines\n' +
@ -110,12 +110,12 @@ describe('class diagram, ', function () {
parser.yy.clear() parser.yy.clear()
}) })
it('should handle relation definitions EXTENSION', function () { it('should handle relation definitions EXTENSION', function () {
var str = 'classDiagram\n' + const str = 'classDiagram\n' +
'Class01 <|-- Class02' 'Class01 <|-- Class02'
parser.parse(str) parser.parse(str)
var relations = parser.yy.getRelations() const relations = parser.yy.getRelations()
expect(parser.yy.getClass('Class01').id).toBe('Class01') expect(parser.yy.getClass('Class01').id).toBe('Class01')
expect(parser.yy.getClass('Class02').id).toBe('Class02') expect(parser.yy.getClass('Class02').id).toBe('Class02')
@ -124,12 +124,12 @@ describe('class diagram, ', function () {
expect(relations[0].relation.lineType).toBe(classDb.lineType.LINE) expect(relations[0].relation.lineType).toBe(classDb.lineType.LINE)
}) })
it('should handle relation definitions AGGREGATION and dotted line', function () { it('should handle relation definitions AGGREGATION and dotted line', function () {
var str = 'classDiagram\n' + const str = 'classDiagram\n' +
'Class01 o.. Class02' 'Class01 o.. Class02'
parser.parse(str) parser.parse(str)
var relations = parser.yy.getRelations() const relations = parser.yy.getRelations()
expect(parser.yy.getClass('Class01').id).toBe('Class01') expect(parser.yy.getClass('Class01').id).toBe('Class01')
expect(parser.yy.getClass('Class02').id).toBe('Class02') expect(parser.yy.getClass('Class02').id).toBe('Class02')
@ -138,12 +138,12 @@ describe('class diagram, ', function () {
expect(relations[0].relation.lineType).toBe(classDb.lineType.DOTTED_LINE) expect(relations[0].relation.lineType).toBe(classDb.lineType.DOTTED_LINE)
}) })
it('should handle relation definitions COMPOSITION on both sides', function () { it('should handle relation definitions COMPOSITION on both sides', function () {
var str = 'classDiagram\n' + const str = 'classDiagram\n' +
'Class01 *--* Class02' 'Class01 *--* Class02'
parser.parse(str) parser.parse(str)
var relations = parser.yy.getRelations() const relations = parser.yy.getRelations()
expect(parser.yy.getClass('Class01').id).toBe('Class01') expect(parser.yy.getClass('Class01').id).toBe('Class01')
expect(parser.yy.getClass('Class02').id).toBe('Class02') expect(parser.yy.getClass('Class02').id).toBe('Class02')
@ -152,12 +152,12 @@ describe('class diagram, ', function () {
expect(relations[0].relation.lineType).toBe(classDb.lineType.LINE) expect(relations[0].relation.lineType).toBe(classDb.lineType.LINE)
}) })
it('should handle relation definitions no types', function () { it('should handle relation definitions no types', function () {
var str = 'classDiagram\n' + const str = 'classDiagram\n' +
'Class01 -- Class02' 'Class01 -- Class02'
parser.parse(str) parser.parse(str)
var relations = parser.yy.getRelations() const relations = parser.yy.getRelations()
expect(parser.yy.getClass('Class01').id).toBe('Class01') expect(parser.yy.getClass('Class01').id).toBe('Class01')
expect(parser.yy.getClass('Class02').id).toBe('Class02') expect(parser.yy.getClass('Class02').id).toBe('Class02')
@ -166,12 +166,12 @@ describe('class diagram, ', function () {
expect(relations[0].relation.lineType).toBe(classDb.lineType.LINE) expect(relations[0].relation.lineType).toBe(classDb.lineType.LINE)
}) })
it('should handle relation definitions with type only on right side', function () { it('should handle relation definitions with type only on right side', function () {
var str = 'classDiagram\n' + const str = 'classDiagram\n' +
'Class01 --|> Class02' 'Class01 --|> Class02'
parser.parse(str) parser.parse(str)
var relations = parser.yy.getRelations() const relations = parser.yy.getRelations()
expect(parser.yy.getClass('Class01').id).toBe('Class01') expect(parser.yy.getClass('Class01').id).toBe('Class01')
expect(parser.yy.getClass('Class02').id).toBe('Class02') expect(parser.yy.getClass('Class02').id).toBe('Class02')
@ -181,7 +181,7 @@ describe('class diagram, ', function () {
}) })
it('should handle multiple classes and relation definitions', function () { it('should handle multiple classes and relation definitions', function () {
var str = 'classDiagram\n' + const str = 'classDiagram\n' +
'Class01 <|-- Class02\n' + 'Class01 <|-- Class02\n' +
'Class03 *-- Class04\n' + 'Class03 *-- Class04\n' +
'Class05 o-- Class06\n' + 'Class05 o-- Class06\n' +
@ -190,7 +190,7 @@ describe('class diagram, ', function () {
parser.parse(str) parser.parse(str)
var relations = parser.yy.getRelations() const relations = parser.yy.getRelations()
expect(parser.yy.getClass('Class01').id).toBe('Class01') expect(parser.yy.getClass('Class01').id).toBe('Class01')
expect(parser.yy.getClass('Class10').id).toBe('Class10') expect(parser.yy.getClass('Class10').id).toBe('Class10')

96
src/diagrams/classDiagram/classRenderer.js
View File

@ -8,22 +8,20 @@ import { parser } from './parser/classDiagram'
parser.yy = classDb parser.yy = classDb
var idCache const idCache = {}
idCache = {}
var classCnt = 0 let classCnt = 0
var conf = { const conf = {
dividerMargin: 10, dividerMargin: 10,
padding: 5, padding: 5,
textHeight: 10 textHeight: 10
} }
// Todo optimize // Todo optimize
var getGraphId = function (label) { const getGraphId = function (label) {
var keys = Object.keys(idCache) const keys = Object.keys(idCache)
var i for (let i = 0; i < keys.length; i++) {
for (i = 0; i < keys.length; i++) {
if (idCache[keys[i]].label === label) { if (idCache[keys[i]].label === label) {
return keys[i] return keys[i]
} }
@ -35,7 +33,7 @@ var getGraphId = function (label) {
/** /**
* Setup arrow head and define the marker. The result is appended to the svg. * Setup arrow head and define the marker. The result is appended to the svg.
*/ */
var insertMarkers = function (elem) { const insertMarkers = function (elem) {
elem.append('defs').append('marker') elem.append('defs').append('marker')
.attr('id', 'extensionStart') .attr('id', 'extensionStart')
.attr('class', 'extension') .attr('class', 'extension')
@ -121,9 +119,9 @@ var insertMarkers = function (elem) {
.attr('d', 'M 18,7 L9,13 L14,7 L9,1 Z') .attr('d', 'M 18,7 L9,13 L14,7 L9,1 Z')
} }
var edgeCount = 0 let edgeCount = 0
var drawEdge = function (elem, path, relation) { const drawEdge = function (elem, path, relation) {
var getRelationType = function (type) { const getRelationType = function (type) {
switch (type) { switch (type) {
case classDb.relationType.AGGREGATION: case classDb.relationType.AGGREGATION:
return 'aggregation' return 'aggregation'
@ -137,10 +135,10 @@ var drawEdge = function (elem, path, relation) {
} }
// The data for our line // The data for our line
var lineData = path.points const lineData = path.points
// This is the accessor function we talked about above // This is the accessor function we talked about above
var lineFunction = d3.svg.line() const lineFunction = d3.svg.line()
.x(function (d) { .x(function (d) {
return d.x return d.x
}) })
@ -149,11 +147,11 @@ var drawEdge = function (elem, path, relation) {
}) })
.interpolate('basis') .interpolate('basis')
var svgPath = elem.append('path') const svgPath = elem.append('path')
.attr('d', lineFunction(lineData)) .attr('d', lineFunction(lineData))
.attr('id', 'edge' + edgeCount) .attr('id', 'edge' + edgeCount)
.attr('class', 'relation') .attr('class', 'relation')
var url = '' let url = ''
if (conf.arrowMarkerAbsolute) { if (conf.arrowMarkerAbsolute) {
url = window.location.protocol + '//' + window.location.host + window.location.pathname + window.location.search url = window.location.protocol + '//' + window.location.host + window.location.pathname + window.location.search
url = url.replace(/\(/g, '\\(') url = url.replace(/\(/g, '\\(')
@ -167,23 +165,23 @@ var drawEdge = function (elem, path, relation) {
svgPath.attr('marker-end', 'url(' + url + '#' + getRelationType(relation.relation.type2) + 'End' + ')') svgPath.attr('marker-end', 'url(' + url + '#' + getRelationType(relation.relation.type2) + 'End' + ')')
} }
var x, y let x, y
var l = path.points.length const l = path.points.length
if ((l % 2) !== 0) { if ((l % 2) !== 0) {
var p1 = path.points[Math.floor(l / 2)] const p1 = path.points[Math.floor(l / 2)]
var p2 = path.points[Math.ceil(l / 2)] const p2 = path.points[Math.ceil(l / 2)]
x = (p1.x + p2.x) / 2 x = (p1.x + p2.x) / 2
y = (p1.y + p2.y) / 2 y = (p1.y + p2.y) / 2
} else { } else {
var p = path.points[Math.floor(l / 2)] const p = path.points[Math.floor(l / 2)]
x = p.x x = p.x
y = p.y y = p.y
} }
if (typeof relation.title !== 'undefined') { if (typeof relation.title !== 'undefined') {
var g = elem.append('g') const g = elem.append('g')
.attr('class', 'classLabel') .attr('class', 'classLabel')
var label = g.append('text') const label = g.append('text')
.attr('class', 'label') .attr('class', 'label')
.attr('x', x) .attr('x', x)
.attr('y', y) .attr('y', y)
@ -192,7 +190,7 @@ var drawEdge = function (elem, path, relation) {
.text(relation.title) .text(relation.title)
window.label = label window.label = label
var bounds = label.node().getBBox() const bounds = label.node().getBBox()
g.insert('rect', ':first-child') g.insert('rect', ':first-child')
.attr('class', 'box') .attr('class', 'box')
@ -205,11 +203,11 @@ var drawEdge = function (elem, path, relation) {
edgeCount++ edgeCount++
} }
var drawClass = function (elem, classDef) { const drawClass = function (elem, classDef) {
logger.info('Rendering class ' + classDef) logger.info('Rendering class ' + classDef)
var addTspan = function (textEl, txt, isFirst) { const addTspan = function (textEl, txt, isFirst) {
var tSpan = textEl.append('tspan') const tSpan = textEl.append('tspan')
.attr('x', conf.padding) .attr('x', conf.padding)
.text(txt) .text(txt)
if (!isFirst) { if (!isFirst) {
@ -217,50 +215,49 @@ var drawClass = function (elem, classDef) {
} }
} }
var id = 'classId' + classCnt const id = 'classId' + classCnt
var classInfo = { const classInfo = {
id: id, id: id,
label: classDef.id, label: classDef.id,
width: 0, width: 0,
height: 0 height: 0
} }
var g = elem.append('g') const g = elem.append('g')
.attr('id', id) .attr('id', id)
.attr('class', 'classGroup') .attr('class', 'classGroup')
var title = g.append('text') const title = g.append('text')
.attr('x', conf.padding) .attr('x', conf.padding)
.attr('y', conf.textHeight + conf.padding) .attr('y', conf.textHeight + conf.padding)
.text(classDef.id) .text(classDef.id)
var titleHeight = title.node().getBBox().height const titleHeight = title.node().getBBox().height
var membersLine = g.append('line') // text label for the x axis const membersLine = g.append('line') // text label for the x axis
.attr('x1', 0) .attr('x1', 0)
.attr('y1', conf.padding + titleHeight + conf.dividerMargin / 2) .attr('y1', conf.padding + titleHeight + conf.dividerMargin / 2)
.attr('y2', conf.padding + titleHeight + conf.dividerMargin / 2) .attr('y2', conf.padding + titleHeight + conf.dividerMargin / 2)
var members = g.append('text') // text label for the x axis const members = g.append('text') // text label for the x axis
.attr('x', conf.padding) .attr('x', conf.padding)
.attr('y', titleHeight + (conf.dividerMargin) + conf.textHeight) .attr('y', titleHeight + (conf.dividerMargin) + conf.textHeight)
.attr('fill', 'white') .attr('fill', 'white')
.attr('class', 'classText') .attr('class', 'classText')
var isFirst = true let isFirst = true
classDef.members.forEach(function (member) { classDef.members.forEach(function (member) {
addTspan(members, member, isFirst) addTspan(members, member, isFirst)
isFirst = false isFirst = false
}) })
var membersBox = members.node().getBBox() const membersBox = members.node().getBBox()
var methodsLine = g.append('line') // text label for the x axis const methodsLine = g.append('line') // text label for the x axis
.attr('x1', 0) .attr('x1', 0)
.attr('y1', conf.padding + titleHeight + conf.dividerMargin + membersBox.height) .attr('y1', conf.padding + titleHeight + conf.dividerMargin + membersBox.height)
.attr('y2', conf.padding + titleHeight + conf.dividerMargin + membersBox.height) .attr('y2', conf.padding + titleHeight + conf.dividerMargin + membersBox.height)
var methods = g.append('text') // text label for the x axis const methods = g.append('text') // text label for the x axis
.attr('x', conf.padding) .attr('x', conf.padding)
.attr('y', titleHeight + 2 * conf.dividerMargin + membersBox.height + conf.textHeight) .attr('y', titleHeight + 2 * conf.dividerMargin + membersBox.height + conf.textHeight)
.attr('fill', 'white') .attr('fill', 'white')
@ -273,7 +270,7 @@ var drawClass = function (elem, classDef) {
isFirst = false isFirst = false
}) })
var classBox = g.node().getBBox() const classBox = g.node().getBBox()
g.insert('rect', ':first-child') g.insert('rect', ':first-child')
.attr('x', 0) .attr('x', 0)
.attr('y', 0) .attr('y', 0)
@ -292,7 +289,7 @@ var drawClass = function (elem, classDef) {
} }
export const setConf = function (cnf) { export const setConf = function (cnf) {
var keys = Object.keys(cnf) const keys = Object.keys(cnf)
keys.forEach(function (key) { keys.forEach(function (key) {
conf[key] = cnf[key] conf[key] = cnf[key]
@ -310,11 +307,11 @@ export const draw = function (text, id) {
logger.info('Rendering diagram ' + text) logger.info('Rendering diagram ' + text)
/// / Fetch the default direction, use TD if none was found /// / Fetch the default direction, use TD if none was found
var diagram = d3.select('#' + id) const diagram = d3.select('#' + id)
insertMarkers(diagram) insertMarkers(diagram)
// Layout graph, Create a new directed graph // Layout graph, Create a new directed graph
var g = new dagre.graphlib.Graph({ const g = new dagre.graphlib.Graph({
multigraph: true multigraph: true
}) })
@ -328,12 +325,11 @@ export const draw = function (text, id) {
return {} return {}
}) })
var classes = classDb.getClasses() const classes = classDb.getClasses()
var keys = Object.keys(classes) const keys = Object.keys(classes)
var i for (let i = 0; i < keys.length; i++) {
for (i = 0; i < keys.length; i++) { const classDef = classes[keys[i]]
var classDef = classes[keys[i]] const node = drawClass(diagram, classDef)
var node = drawClass(diagram, classDef)
// Add nodes to the graph. The first argument is the node id. The second is // Add nodes to the graph. The first argument is the node id. The second is
// metadata about the node. In this case we're going to add labels to each of // metadata about the node. In this case we're going to add labels to each of
// our nodes. // our nodes.
@ -341,7 +337,7 @@ export const draw = function (text, id) {
logger.info('Org height: ' + node.height) logger.info('Org height: ' + node.height)
} }
var relations = classDb.getRelations() const relations = classDb.getRelations()
relations.forEach(function (relation) { relations.forEach(function (relation) {
logger.info('tjoho' + getGraphId(relation.id1) + getGraphId(relation.id2) + JSON.stringify(relation)) logger.info('tjoho' + getGraphId(relation.id1) + getGraphId(relation.id2) + JSON.stringify(relation))
g.setEdge(getGraphId(relation.id1), getGraphId(relation.id2), { relation: relation }) g.setEdge(getGraphId(relation.id1), getGraphId(relation.id2), { relation: relation })