Honor text-color, background-color, border-color; fixes StoneCypher/f…

…sl#350, fixes StoneCypher/fsl#351, fixes Stonecyher/fsl#352
StoneCypher · Jan 26, 2020 · 527d01c · 527d01c
1 parent 81b755b
commit 527d01c
Show file tree

Hide file tree

Showing 15 changed files with 2,487 additions and 174 deletions.
diff --git a/dist/jssm-viz.cjs.js b/dist/jssm-viz.cjs.js
diff --git a/dist/jssm-viz.cjs.js.map b/dist/jssm-viz.cjs.js.map
diff --git a/dist/jssm-viz.es6.js b/dist/jssm-viz.es6.js
diff --git a/dist/jssm-viz.es6.js.map b/dist/jssm-viz.es6.js.map
diff --git a/dist/jssm-viz.iife.js b/dist/jssm-viz.iife.js
diff --git a/dist/jssm-viz.iife.js.map b/dist/jssm-viz.iife.js.map
diff --git a/docs/jssm-viz.cjs.js b/docs/jssm-viz.cjs.js
diff --git a/docs/jssm-viz.cjs.js.map b/docs/jssm-viz.cjs.js.map
diff --git a/docs/jssm-viz.es6.js b/docs/jssm-viz.es6.js
diff --git a/docs/jssm-viz.es6.js.map b/docs/jssm-viz.es6.js.map
diff --git a/docs/jssm-viz.iife.js b/docs/jssm-viz.iife.js
diff --git a/docs/jssm-viz.iife.js.map b/docs/jssm-viz.iife.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
     "del-cli": "^1.1.0",
     "documentation": "^12.1.2",
     "eslint": "^4.19.1",
-    "jssm": "^5.23.0",
+    "jssm": "^5.24.0",
     "nyc": "^14.1.1",
     "pegjs": "^0.10.0",
     "rimraf": "^2.7.1",

diff --git a/src/ts/jssm-viz.ts b/src/ts/jssm-viz.ts
@@ -18,7 +18,7 @@ var viz = new Viz({ Module, render });
 
 
 function dot_to_svg(dot: string, config? : Object): Promise<string> {  // whargarbl jssm isn't an any
-  return viz.renderString(dot).catch(e => console.log(e));
+  return viz.renderString(dot).catch(e => console.log(e));  // TODO FIXME better way to export errors
 }
 
 
@@ -92,15 +92,70 @@ function color8to6(color8: string): string {
 
 
 
+function border_color_for_state(u_jssm, state): string | undefined {
+
+  const d_color = u_jssm._state_declarations;
+  if (!d_color) { return undefined; }
+
+  const decls = u_jssm._state_declarations;
+  if (!decls) { return undefined; }
+
+  const state_decl = decls.get(state);
+  if (!state_decl) { return undefined; }
+
+  return state_decl.borderColor;
+
+}
+
+
+
+
+
+function text_color_for_state(u_jssm, state): string | undefined {
+
+  const d_color = u_jssm._state_declarations;
+  if (!d_color) { return undefined; }
+
+  const decls = u_jssm._state_declarations;
+  if (!decls) { return undefined; }
+
+  const state_decl = decls.get(state);
+  if (!state_decl) { return undefined; }
+
+  return state_decl.textColor;
+
+}
+
+
+
+
+
+function background_color_for_state(u_jssm, state): string | undefined {
+
+  const d_color = u_jssm._state_declarations;
+  if (!d_color) { return undefined; }
+
+  const decls = u_jssm._state_declarations;
+  if (!decls) { return undefined; }
+
+  const state_decl = decls.get(state);
+  if (!state_decl) { return undefined; }
+
+  return state_decl.backgroundColor;
+
+}
+
+
+
+
+
 function states_to_nodes_string(u_jssm, l_states): string {
 
   return l_states.map( (s) => {
 
-    const d_color = u_jssm._state_declarations
-                      ? (u_jssm._state_declarations.get(s)
-                          ? color8to6(u_jssm._state_declarations.get(s).color)
-                          : undefined)
-                      : undefined;
+    const bordercolor = border_color_for_state(u_jssm, s),
+          bgcolor     = background_color_for_state(u_jssm, s),
+          fgcolor     = text_color_for_state(u_jssm, s);
 
     const this_state = u_jssm.state_for(s),
 //        opening    = u_jssm.state_is_start_state(s),   TODO COMEBACK FIXME
@@ -110,7 +165,9 @@ function states_to_nodes_string(u_jssm, l_states): string {
           features   = [
                         ['label',       s],
                         ['peripheries', complete? 2 : 1  ],  // TODO COMEBACK use peripheries for current state instead
-                        ['color',       d_color || 'black' ],
+                        ['color',       bordercolor || 'black' ],
+                        ['fillcolor',   bgcolor     || 'white' ],
+                        ['fontcolor',   fgcolor     || 'black' ],
                         ['fillcolor',   final   ? vc('fill_final')    :
                                        (complete? vc('fill_complete') :
                                        (terminal? vc('fill_terminal') :