Refactored rendering sequence diagrams

src/diagrams/sequence/sequenceDb.js

@@ -1,6 +1,4 @@
 import { logger } from '../../logger';
-import { getConfig, setConfig } from '../../config';
-import mermaidAPI from '../../mermaidAPI';
 
 let prevActor = undefined;
 let actors = {};
@@ -10,7 +8,6 @@ let title = '';
 let titleWrapped = false;
 let sequenceNumbersEnabled = false;
 let wrapEnabled = false;
-let configUpdated = false;
 let currentDirective = {};
 
 export const parseDirective = function(statement, context) {
@@ -46,10 +43,7 @@ const handleDirective = function(directive) {
   switch (directive.type) {
     case 'init':
     case 'initialize':
-      mermaidAPI.initialize(directive.args);
-      break;
-    case 'config':
-      updateConfig(directive.args);
+      logger.debug('init/initialize is handled in mermaid/mermaidAPI');
       break;
     case 'wrap':
     case 'nowrap':
@@ -57,7 +51,9 @@ const handleDirective = function(directive) {
       break;
     default:
       logger.warn(
-        `Unrecognized directive: source: '%%{${directive.type}: ${directive.args}}%%`,
+        `Unhandled directive: source: '%%{${directive.type}: ${JSON.stringify(
+          directive.args ? directive.args : {}
+        )}}%%`,
         directive
       );
       break;
@@ -77,7 +73,7 @@ export const addActor = function(id, name, description) {
   actors[id] = {
     name: name,
     description: description.text,
-    wrap: (description.wrap === null && autoWrap()) || !!description.wrap,
+    wrap: (description.wrap === undefined && autoWrap()) || !!description.wrap,
     prevActor: prevActor
   };
   if (prevActor && actors[prevActor]) {
@@ -111,12 +107,17 @@ export const addMessage = function(idFrom, idTo, message, answer) {
     from: idFrom,
     to: idTo,
     message: message.text,
-    wrap: (message.wrap === null && autoWrap()) || !!message.wrap,
+    wrap: (message.wrap === undefined && autoWrap()) || !!message.wrap,
     answer: answer
   });
 };
 
-export const addSignal = function(idFrom, idTo, message = { text: null, wrap: null }, messageType) {
+export const addSignal = function(
+  idFrom,
+  idTo,
+  message = { text: undefined, wrap: undefined },
+  messageType
+) {
   logger.debug(
     'Adding message from=' +
       idFrom +
@@ -150,7 +151,7 @@ export const addSignal = function(idFrom, idTo, message = { text: null, wrap: nu
     from: idFrom,
     to: idTo,
     message: message.text,
-    wrap: (message.wrap === null && autoWrap()) || !!message.wrap,
+    wrap: (message.wrap === undefined && autoWrap()) || !!message.wrap,
     type: messageType
   });
   return true;
@@ -180,12 +181,8 @@ export const enableSequenceNumbers = function() {
 };
 export const showSequenceNumbers = () => sequenceNumbersEnabled;
 
-export const enableWrap = function() {
-  wrapEnabled = true;
-};
-
-export const disableWrap = function() {
-  wrapEnabled = false;
+export const setWrap = function(wrapSetting) {
+  wrapEnabled = wrapSetting;
 };
 
 export const autoWrap = () => wrapEnabled;
@@ -193,7 +190,6 @@ export const autoWrap = () => wrapEnabled;
 export const clear = function() {
   actors = {};
   messages = [];
-  configUpdated = false;
 };
 
 export const parseMessage = function(str) {
@@ -251,7 +247,7 @@ export const addNote = function(actor, placement, message) {
     actor: actor,
     placement: placement,
     message: message.text,
-    wrap: (message.wrap === null && autoWrap()) || !!message.wrap
+    wrap: (message.wrap === undefined && autoWrap()) || !!message.wrap
   };
 
   // Coerce actor into a [to, from, ...] array
@@ -262,7 +258,7 @@ export const addNote = function(actor, placement, message) {
     from: actors[0],
     to: actors[1],
     message: message.text,
-    wrap: (message.wrap === null && autoWrap()) || !!message.wrap,
+    wrap: (message.wrap === undefined && autoWrap()) || !!message.wrap,
     type: LINETYPE.NOTE,
     placement: placement
   });
@@ -270,20 +266,7 @@ export const addNote = function(actor, placement, message) {
 
 export const setTitle = function(titleWrap) {
   title = titleWrap.text;
-  titleWrapped = (titleWrap.wrap === null && autoWrap()) || !!titleWrap.wrap;
-};
-
-export const updateConfig = function(config = getConfig()) {
-  try {
-    setConfig(config);
-    configUpdated = true;
-  } catch (error) {
-    logger.error('Error: unable to parse config');
-  }
-};
-
-export const hasConfigChange = function() {
-  return configUpdated;
+  titleWrapped = (titleWrap.wrap === undefined && autoWrap()) || !!titleWrap.wrap;
 };
 
 export const apply = function(param) {
@@ -355,20 +338,16 @@ export default {
   addActor,
   addMessage,
   addSignal,
-  enableWrap,
-  disableWrap,
+  autoWrap,
+  setWrap,
   enableSequenceNumbers,
   showSequenceNumbers,
-  autoWrap,
   getMessages,
   getActors,
   getActor,
   getActorKeys,
   getTitle,
   parseDirective,
-  hasConfigChange,
-  getConfig,
-  updateConfig,
   getTitleWrapped,
   clear,
   parseMessage,