Merge pull request #191 from github/fix-graph-vertex-ids

Include vertex IDs in JSON graph output and fix their format.

Author: robrix

src/Data/Graph.hs

@@ -111,5 +111,5 @@ instance (Ord vertex, ToJSON vertex, VertexTag vertex) => ToJSON (Graph vertex)
 newtype Edge vertex = Edge (vertex, vertex)
 
 instance (ToJSON vertex, VertexTag vertex) => ToJSON (Edge vertex) where
-  toJSON     (Edge (a, b)) = object ["source" .= uniqueTag a,   "target" .= uniqueTag b]
-  toEncoding (Edge (a, b)) = pairs  ("source" .= uniqueTag a <> "target" .= uniqueTag b)
+  toJSON     (Edge (a, b)) = object ["source" .= show (uniqueTag a),   "target" .= show (uniqueTag b)]
+  toEncoding (Edge (a, b)) = pairs  ("source" .= show (uniqueTag a) <>  "target" .= show (uniqueTag b))

src/Data/Graph/ControlFlowVertex.hs

@@ -86,7 +86,14 @@ instance Lower ControlFlowVertex where lowerBound = Package ""
 instance VertexTag ControlFlowVertex where uniqueTag = hash . vertexIdentifier
 
 instance ToJSON ControlFlowVertex where
-  toJSON v = object [ "name" .= vertexIdentifier v, "type" .= vertexToType v ]
+  toJSON v = object [ "name" .= vertexIdentifier v
+                    , "type" .= vertexToType v
+                    , "id"   .= show (uniqueTag v)
+                    ]
+  toEncoding v = pairs $ mconcat [ "name" .= vertexIdentifier v
+                                 , "type" .= vertexToType v
+                                 , "id"   .= show (uniqueTag v)
+                                 ]
 
 -- TODO: This is potentially valuable just to get name's out of declarable things.
 -- Typeclasses to create 'ControlFlowVertex's from 'Term's. Also extracts