Add colored combinator nodes to Mermaid diagram

- join nodes: light blue (#e6f3ff)
- union nodes: light orange (#fff0e6)
- fixpoint nodes: light green (#e6ffe6)
- Remove level annotations from node labels

Author: cristianoc

analysis/reactive/src/Reactive.ml

@@ -97,6 +97,7 @@ module Registry = struct
 
   let nodes : (string, node_info) Hashtbl.t = Hashtbl.create 64
   let edges : (string * string, string) Hashtbl.t = Hashtbl.create 128
+
   (* Combinator nodes: (combinator_id, (shape, inputs, output)) *)
   let combinators : (string, string * string list * string) Hashtbl.t =
     Hashtbl.create 32
@@ -152,19 +153,27 @@ module Registry = struct
     Hashtbl.iter
       (fun comb_name (_, inputs, output) ->
         List.iter
-          (fun input -> Hashtbl.replace combinator_edges (input, output) comb_name)
+          (fun input ->
+            Hashtbl.replace combinator_edges (input, output) comb_name)
           inputs)
       combinators;
     (* Output regular nodes *)
     Hashtbl.iter
-      (fun name info ->
-        Buffer.add_string buf
-          (Printf.sprintf "    %s[%s L%d]\n" name name info.level))
+      (fun name _info ->
+        Buffer.add_string buf (Printf.sprintf "    %s[%s]\n" name name))
       nodes;
-    (* Output combinator nodes (diamond shape) *)
+    (* Output combinator nodes (diamond shape) with classes *)
+    let join_nodes = ref [] in
+    let union_nodes = ref [] in
+    let fixpoint_nodes = ref [] in
     Hashtbl.iter
       (fun comb_name (shape, _inputs, _output) ->
-        Buffer.add_string buf (Printf.sprintf "    %s{%s}\n" comb_name shape))
+        Buffer.add_string buf (Printf.sprintf "    %s{%s}\n" comb_name shape);
+        match shape with
+        | "join" -> join_nodes := comb_name :: !join_nodes
+        | "union" -> union_nodes := comb_name :: !union_nodes
+        | "fixpoint" -> fixpoint_nodes := comb_name :: !fixpoint_nodes
+        | _ -> ())
       combinators;
     (* Output edges *)
     Hashtbl.iter
@@ -194,8 +203,29 @@ module Registry = struct
     (* Output edges from combinators to their outputs *)
     Hashtbl.iter
       (fun comb_name (_shape, _inputs, output) ->
-        Buffer.add_string buf (Printf.sprintf "    %s --> %s\n" comb_name output))
+        Buffer.add_string buf
+          (Printf.sprintf "    %s --> %s\n" comb_name output))
       combinators;
+    (* Style definitions for combinator types *)
+    Buffer.add_string buf
+      "\n    classDef joinClass fill:#e6f3ff,stroke:#0066cc\n";
+    Buffer.add_string buf
+      "    classDef unionClass fill:#fff0e6,stroke:#cc6600\n";
+    Buffer.add_string buf
+      "    classDef fixpointClass fill:#e6ffe6,stroke:#006600\n";
+    (* Assign classes to combinator nodes *)
+    if !join_nodes <> [] then
+      Buffer.add_string buf
+        (Printf.sprintf "    class %s joinClass\n"
+           (String.concat "," !join_nodes));
+    if !union_nodes <> [] then
+      Buffer.add_string buf
+        (Printf.sprintf "    class %s unionClass\n"
+           (String.concat "," !union_nodes));
+    if !fixpoint_nodes <> [] then
+      Buffer.add_string buf
+        (Printf.sprintf "    class %s fixpointClass\n"
+           (String.concat "," !fixpoint_nodes));
     Buffer.contents buf
 
   (** Print timing stats for all nodes *)

analysis/reanalyze/diagrams/reactive-pipeline-full.mmd

@@ -1,54 +1,54 @@
 graph TD
-    annotations[annotations L2]
-    exc_refs.exception_decls[exc_refs.exception_decls L3]
-    type_deps.same_path_refs[type_deps.same_path_refs L4]
-    file_collection[file_collection L0]
-    decl_refs.value_decl_refs[decl_refs.value_decl_refs L7]
-    type_deps.combined_refs_to[type_deps.combined_refs_to L7]
-    type_deps.all_type_refs_from[type_deps.all_type_refs_from L8]
-    type_deps.impl_needing_path2[type_deps.impl_needing_path2 L4]
-    exc_refs.resolved_refs_from[exc_refs.resolved_refs_from L5]
-    exc_refs.resolved_refs[exc_refs.resolved_refs L4]
-    type_deps.impl_to_intf_refs_path2[type_deps.impl_to_intf_refs_path2 L5]
-    file_deps_map[file_deps_map L2]
-    decl_refs.with_value_refs[decl_refs.with_value_refs L8]
-    type_deps.u1[type_deps.u1 L5]
-    cross_file_items[cross_file_items L2]
-    decl_refs.decls_by_file[decl_refs.decls_by_file L3]
-    type_deps.impl_to_intf_refs[type_deps.impl_to_intf_refs L4]
-    solver.issues_by_file[solver.issues_by_file L17]
-    liveness.annotated_roots[liveness.annotated_roots L3]
-    solver.incorrect_dead_decls[solver.incorrect_dead_decls L16]
-    type_deps.intf_to_impl_refs[type_deps.intf_to_impl_refs L4]
-    type_deps.decl_by_path[type_deps.decl_by_path L3]
-    type_deps.u2[type_deps.u2 L6]
-    solver.live_decls[solver.live_decls L15]
-    type_deps.impl_decls[type_deps.impl_decls L3]
-    liveness.all_roots[liveness.all_roots L12]
-    solver.dead_modules[solver.dead_modules L17]
-    liveness.external_type_refs[liveness.external_type_refs L10]
-    decl_refs.combined[decl_refs.combined L12]
-    type_refs_from[type_refs_from L2]
-    liveness.type_refs_from[liveness.type_refs_from L9]
-    solver.dead_decls_by_file[solver.dead_decls_by_file L16]
-    liveness.external_value_refs[liveness.external_value_refs L7]
-    liveness.value_refs_from[liveness.value_refs_from L6]
-    value_refs_from[value_refs_from L2]
-    solver.modules_with_dead[solver.modules_with_dead L16]
-    solver.dead_decls[solver.dead_decls L15]
-    exception_refs_collection[exception_refs_collection L3]
-    type_deps.intf_decls[type_deps.intf_decls L3]
-    file_data_collection[file_data_collection L1]
-    solver.dead_module_issues[solver.dead_module_issues L19]
-    decl_refs.with_type_refs[decl_refs.with_type_refs L11]
-    solver.modules_with_live[solver.modules_with_live L16]
-    decl_refs.type_decl_refs[decl_refs.type_decl_refs L10]
-    files[files L2]
-    solver.modules_with_reported[solver.modules_with_reported L18]
-    liveness.externally_referenced[liveness.externally_referenced L11]
-    liveness.edges[liveness.edges L13]
-    liveness.live[liveness.live L14]
-    decls[decls L2]
+    annotations[annotations]
+    exc_refs.exception_decls[exc_refs.exception_decls]
+    type_deps.same_path_refs[type_deps.same_path_refs]
+    file_collection[file_collection]
+    decl_refs.value_decl_refs[decl_refs.value_decl_refs]
+    type_deps.combined_refs_to[type_deps.combined_refs_to]
+    type_deps.all_type_refs_from[type_deps.all_type_refs_from]
+    type_deps.impl_needing_path2[type_deps.impl_needing_path2]
+    exc_refs.resolved_refs_from[exc_refs.resolved_refs_from]
+    exc_refs.resolved_refs[exc_refs.resolved_refs]
+    type_deps.impl_to_intf_refs_path2[type_deps.impl_to_intf_refs_path2]
+    file_deps_map[file_deps_map]
+    decl_refs.with_value_refs[decl_refs.with_value_refs]
+    type_deps.u1[type_deps.u1]
+    cross_file_items[cross_file_items]
+    decl_refs.decls_by_file[decl_refs.decls_by_file]
+    type_deps.impl_to_intf_refs[type_deps.impl_to_intf_refs]
+    solver.issues_by_file[solver.issues_by_file]
+    liveness.annotated_roots[liveness.annotated_roots]
+    solver.incorrect_dead_decls[solver.incorrect_dead_decls]
+    type_deps.intf_to_impl_refs[type_deps.intf_to_impl_refs]
+    type_deps.decl_by_path[type_deps.decl_by_path]
+    type_deps.u2[type_deps.u2]
+    solver.live_decls[solver.live_decls]
+    type_deps.impl_decls[type_deps.impl_decls]
+    liveness.all_roots[liveness.all_roots]
+    solver.dead_modules[solver.dead_modules]
+    liveness.external_type_refs[liveness.external_type_refs]
+    decl_refs.combined[decl_refs.combined]
+    type_refs_from[type_refs_from]
+    liveness.type_refs_from[liveness.type_refs_from]
+    solver.dead_decls_by_file[solver.dead_decls_by_file]
+    liveness.external_value_refs[liveness.external_value_refs]
+    liveness.value_refs_from[liveness.value_refs_from]
+    value_refs_from[value_refs_from]
+    solver.modules_with_dead[solver.modules_with_dead]
+    solver.dead_decls[solver.dead_decls]
+    exception_refs_collection[exception_refs_collection]
+    type_deps.intf_decls[type_deps.intf_decls]
+    file_data_collection[file_data_collection]
+    solver.dead_module_issues[solver.dead_module_issues]
+    decl_refs.with_type_refs[decl_refs.with_type_refs]
+    solver.modules_with_live[solver.modules_with_live]
+    decl_refs.type_decl_refs[decl_refs.type_decl_refs]
+    files[files]
+    solver.modules_with_reported[solver.modules_with_reported]
+    liveness.externally_referenced[liveness.externally_referenced]
+    liveness.edges[liveness.edges]
+    liveness.live[liveness.live]
+    decls[decls]
     type_deps.intf_to_impl_refs_join{join}
     liveness.external_value_refs_join{join}
     type_deps.impl_to_intf_refs_path2_join{join}
@@ -177,3 +177,10 @@ graph TD
     type_deps.u1_union --> type_deps.u1
     decl_refs.with_type_refs_join --> decl_refs.with_type_refs
 
+    classDef joinClass fill:#e6f3ff,stroke:#0066cc
+    classDef unionClass fill:#fff0e6,stroke:#cc6600
+    classDef fixpointClass fill:#e6ffe6,stroke:#006600
+    class decl_refs.with_type_refs_join,decl_refs.combined_join,decl_refs.type_decl_refs_join,liveness.external_type_refs_join,type_deps.impl_needing_path2_join,decl_refs.with_value_refs_join,solver.live_decls_join,type_deps.impl_to_intf_refs_join,decl_refs.value_decl_refs_join,liveness.annotated_roots_join,solver.dead_decls_join,solver.dead_module_issues_join,solver.dead_modules_join,exc_refs.resolved_refs_join,solver.incorrect_dead_decls_join,type_deps.impl_to_intf_refs_path2_join,liveness.external_value_refs_join,type_deps.intf_to_impl_refs_join joinClass
+    class type_deps.u1_union,type_deps.u2_union,liveness.type_refs_from_union,liveness.all_roots_union,liveness.externally_referenced_union,type_deps.combined_refs_to_union,liveness.value_refs_from_union unionClass
+    class liveness.live_fp fixpointClass
+