Use the new dot writer

* removes the "preparedGraph" middle man between the parser and the dot writer * delete the old code refs #10
ryepup · Jan 16, 2017 · ed2b9ae · ed2b9ae
1 parent 35c6670
commit ed2b9ae
Show file tree

Hide file tree

Showing 15 changed files with 5 additions and 346 deletions.
diff --git a/src/core/codegen.js b/src/core/codegen.js
@@ -1,51 +1,5 @@
 import Viz from 'viz.js'
 import lz from 'lz-string';
-import dotExporter from './dot/dot'
-
-/**
- * resolve any links into a exporter-friendly format
- */
-export const prepareForRendering = (graph, zoomNodeId) => {
-
-    const visibleIds = zoomNodeId
-        ? graph.idMap[zoomNodeId]
-            .children
-            .map(x => x.id)
-            .concat(graph.roots)
-        : graph.roots
-
-    const isIdVisible = x => visibleIds.includes(x)
-    const toGraphableEdge = edge => {
-        const srcOk = isIdVisible(edge.sourceId)
-        const dstOk = isIdVisible(edge.destinationId)
-
-        const {type, id, description} = edge;
-
-        return {
-            type, id, description,
-            sourceId: srcOk
-                ? edge.sourceId
-                : edge.sourceParentIds.find(isIdVisible),
-            destinationId: dstOk
-                ? edge.destinationId
-                : edge.destinationParentIds.find(isIdVisible),
-            implicit: !(srcOk && dstOk)
-        }
-    }
-    const visibleEdges = graph.edges
-        .filter(x => isIdVisible(x.sourceId) || isIdVisible(x.destinationId))
-        .map(toGraphableEdge)
-
-    const toGraphableItem = id => {
-        const {type, name, description, tech, parentId} = graph.idMap[id]
-        return { type, id, name, description, tech, parentId }
-    }
-
-    return {
-        items: visibleIds.map(toGraphableItem),
-        edges: visibleEdges
-    };
-}
 
 /**
  * convert a graph from DOT text to SVG
@@ -81,8 +35,3 @@ export const toPngDataUri = (dot, createElement) => {
         img.setAttribute("src", "data:image/svg+xml," + encodeURIComponent(svg))
     })
 }
-
-/**
- * convert a graph to DOT
- */
-export const toDot = dotExporter
diff --git a/src/core/codegen.spec.js b/src/core/codegen.spec.js
diff --git a/src/core/dot/container.template.dot b/src/core/dot/container.template.dot
diff --git a/src/core/dot/dot.js b/src/core/dot/dot.js
diff --git a/src/core/dot/dot.spec.js b/src/core/dot/dot.spec.js
diff --git a/src/core/dot/edge.template.dot b/src/core/dot/edge.template.dot
diff --git a/src/core/dot/empty.dot b/src/core/dot/empty.dot
diff --git a/src/core/dot/graph.js b/src/core/dot/graph.js
diff --git a/src/core/dot/item.template.dot b/src/core/dot/item.template.dot
diff --git a/src/core/dot/simple.dot b/src/core/dot/simple.dot
diff --git a/src/core/dot/two-actors.dot b/src/core/dot/two-actors.dot
diff --git a/src/core/dot/zoomed.template.dot b/src/core/dot/zoomed.template.dot
diff --git a/src/core/index.js b/src/core/index.js
@@ -1,4 +1,5 @@
 export { parse, SyntaxError } from './parse'
-export { uriEncode, uriDecode, prepareForRendering, toSvg, toDot } from './codegen'
+export { uriEncode, uriDecode, toSvg } from './codegen'
 export { Storage } from './storage'
-export { Exporter, formats } from './exporter'
+export { Exporter, formats } from './exporter'
+export { toDot } from './dot-writer'
diff --git a/src/shell/app.component.js b/src/shell/app.component.js
@@ -1,7 +1,7 @@
 import template from './app.html'
 import sample from './c4lab.sexp'
 
-import { Storage, prepareForRendering, toSvg, Exporter, formats, toDot } from '../core'
+import { Storage, toSvg, Exporter, formats, toDot } from '../core'
 
 export class AppController {
 
@@ -37,11 +37,7 @@ export class AppController {
 
     recalculate() {
         this.log.debug('recalculate', this.graph)
-        this.preparedGraph = prepareForRendering(this.graph, this.selectedRoot)
-        this.dot = toDot(
-            () => null,
-            this.preparedGraph,
-            this.graph.idMap[this.selectedRoot])
+        this.dot = toDot(this.graph, this.selectedRoot)
         this.svg = this.toSvg(this.dot)
     }
 

diff --git a/src/shell/app.html b/src/shell/app.html
@@ -24,11 +24,6 @@
                     <!-- TODO: a disabled text area -->
                     <pre>{{$ctrl.dot}}</pre>
                 </uib-tab>
-                <uib-tab heading="json">
-                    <p>This is for debugging purposes</p>
-                    <!-- TODO: a disabled text area -->
-                    <pre>{{$ctrl.preparedGraph | json}}</pre>
-                </uib-tab>
             </uib-tabset>
         </div>
     </div>