#748: class diagram: allow linebreak after last statement; rerender c…

…orrectly; allow unassociated classes
mermaid-js · Oct 25, 2018 · 15404d4 · 15404d4
1 parent a499296
commit 15404d4
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 38 deletions.
diff --git a/src/diagrams/class/classDb.js b/src/diagrams/class/classDb.js
@@ -44,17 +44,24 @@ export const addRelation = function (relation) {
   relations.push(relation)
 }
 
-export const addMembers = function (className, MembersArr) {
+export const addMember = function (className, member) {
   const theClass = classes[className]
-  if (typeof MembersArr === 'string') {
-    if (MembersArr.substr(-1) === ')') {
-      theClass.methods.push(MembersArr)
+  if (typeof member === 'string') {
+    if (member.substr(-1) === ')') {
+      theClass.methods.push(member)
     } else {
-      theClass.members.push(MembersArr)
+      theClass.members.push(member)
     }
   }
 }
 
+export const addMembers = function (className, MembersArr) {
+  console.log(className, MembersArr)
+  if (Array.isArray(MembersArr)) {
+    MembersArr.forEach(member => addMember(className, member))
+  }
+}
+
 export const cleanupLabel = function (label) {
   if (label.substring(0, 1) === ':') {
     return label.substr(2).trim()
@@ -82,6 +89,7 @@ export default {
   getClasses,
   getRelations,
   addRelation,
+  addMember,
   addMembers,
   cleanupLabel,
   lineType,

diff --git a/src/diagrams/class/classRenderer.js b/src/diagrams/class/classRenderer.js
@@ -10,7 +10,6 @@ parser.yy = classDb
 
 const idCache = {}
 
-let classCnt = 0
 const conf = {
   dividerMargin: 10,
   padding: 5,
@@ -215,7 +214,7 @@ const drawClass = function (elem, classDef) {
     }
   }
 
-  const id = 'classId' + classCnt
+  const id = 'classId' + classDef.id
   const classInfo = {
     id: id,
     label: classDef.id,
@@ -284,7 +283,6 @@ const drawClass = function (elem, classDef) {
   classInfo.height = classBox.height + conf.padding + 0.5 * conf.dividerMargin
 
   idCache[id] = classInfo
-  classCnt++
   return classInfo
 }
 

diff --git a/src/diagrams/class/parser/classDiagram.jison b/src/diagrams/class/parser/classDiagram.jison
@@ -127,6 +127,7 @@ graphConfig
 
 statements
     : statement
+    | statement NEWLINE
     | statement NEWLINE statements
     ;
 
@@ -144,8 +145,8 @@ statement
     ;
 
 classStatement
-    : CLASS className
-    | CLASS className STRUCT_START members STRUCT_STOP {/*console.log($2,JSON.stringify($4));*/yy.addMembers($2,$4);}
+    : CLASS className         {yy.addClass($2);}
+    | CLASS className STRUCT_START members STRUCT_STOP {/*console.log($2,JSON.stringify($4));*/yy.addClass($2);yy.addMembers($2,$4);}
     ;
 
 members
@@ -155,7 +156,7 @@ members
 
 methodStatement
     : className {/*console.log('Rel found',$1);*/}
-    | className LABEL {yy.addMembers($1,yy.cleanupLabel($2));}
+    | className LABEL {yy.addMember($1,yy.cleanupLabel($2));}
     | MEMBER {console.warn('Member',$1);}
     | SEPARATOR {/*console.log('sep found',$1);*/}
     ;

diff --git a/src/diagrams/class/parser/classDiagram.js b/src/diagrams/class/parser/classDiagram.js