Refactor by renaming

This commit is contained in:
Tyler Long 2018-03-12 21:06:49 +08:00
parent 6f43082e38
commit d222196fd1
3 changed files with 14 additions and 15 deletions

View File

@ -18,15 +18,15 @@ import { logger, setLogLevel } from './logger'
import flowDb from './diagrams/flowchart/flowDb'
import utils from './utils'
import flowRenderer from './diagrams/flowchart/flowRenderer'
import seq from './diagrams/sequenceDiagram/sequenceRenderer'
import example from './diagrams/example/exampleRenderer'
import sequenceRenderer from './diagrams/sequenceDiagram/sequenceRenderer'
import exampleRenderer from './diagrams/example/exampleRenderer'
import exampleParser from './diagrams/example/parser/example'
import flowParser from './diagrams/flowchart/parser/flow'
import dotParser from './diagrams/flowchart/parser/dot'
import sequenceParser from './diagrams/sequenceDiagram/parser/sequenceDiagram'
import sequenceDb from './diagrams/sequenceDiagram/sequenceDb'
import exampleDb from './diagrams/example/exampleDb'
import gantt from './diagrams/gantt/ganttRenderer'
import ganttRenderer from './diagrams/gantt/ganttRenderer'
import ganttParser from './diagrams/gantt/parser/gantt'
import ganttDb from './diagrams/gantt/ganttDb'
import classParser from './diagrams/classDiagram/parser/classDiagram'
@ -260,7 +260,7 @@ function parse (text) {
parser = gitGraphParser
parser.parser.yy = gitGraphAst
break
case 'graph':
case 'flowchart':
parser = flowParser
parser.parser.yy = flowDb
break
@ -395,7 +395,7 @@ const render = function (id, txt, cb, container) {
gitGraphRenderer.setConf(config.gitGraph)
gitGraphRenderer.draw(txt, id, false)
break
case 'graph':
case 'flowchart':
config.flowchart.arrowMarkerAbsolute = config.arrowMarkerAbsolute
flowRenderer.setConf(config.flowchart)
flowRenderer.draw(txt, id, false)
@ -407,13 +407,13 @@ const render = function (id, txt, cb, container) {
break
case 'sequenceDiagram':
config.sequenceDiagram.arrowMarkerAbsolute = config.arrowMarkerAbsolute
seq.setConf(config.sequenceDiagram)
seq.draw(txt, id)
sequenceRenderer.setConf(config.sequenceDiagram)
sequenceRenderer.draw(txt, id)
break
case 'gantt':
config.gantt.arrowMarkerAbsolute = config.arrowMarkerAbsolute
gantt.setConf(config.gantt)
gantt.draw(txt, id)
ganttRenderer.setConf(config.gantt)
ganttRenderer.draw(txt, id)
break
case 'classDiagram':
config.classDiagram.arrowMarkerAbsolute = config.arrowMarkerAbsolute
@ -422,7 +422,7 @@ const render = function (id, txt, cb, container) {
break
case 'example':
config.example.arrowMarkerAbsolute = config.arrowMarkerAbsolute
example.draw(txt, id)
exampleRenderer.draw(txt, id)
break
}
@ -508,7 +508,6 @@ const mermaidAPI = {
render,
parse,
initialize,
detectType: utils.detectType,
getConfig
}

View File

@ -42,7 +42,7 @@ export const detectType = function (text) {
if (text.match(/^\s*gitGraph/)) {
return 'gitGraph'
}
return 'graph'
return 'flowchart'
}
/**

View File

@ -5,18 +5,18 @@ 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('graph')
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('graph')
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('graph')
expect(type).toBe('flowchart')
})
it('should handle a graph defintion for gitGraph', function () {
const str = ' \n gitGraph TB:\nbfs1:queue'