diff --git a/crates/oxc_semantic/src/dot.rs b/crates/oxc_semantic/src/dot.rs
index df3354ef781fb..432c4dd82cd19 100644
--- a/crates/oxc_semantic/src/dot.rs
+++ b/crates/oxc_semantic/src/dot.rs
@@ -66,10 +66,18 @@ impl DebugDot for ControlFlowGraph {
                         label
                     }
                 },
-                &|_graph, node| format!(
-                    "label = {:?} ",
-                    self.basic_blocks[*node.1].debug_dot(ctx).trim()
-                ),
+                &|_graph, node| {
+                    let basic_block_index = *node.1;
+                    let basic_block_debug_str = self.basic_blocks[*node.1].debug_dot(ctx);
+                    let trimmed_debug_str = basic_block_debug_str.trim();
+                    if trimmed_debug_str.is_empty() {
+                        format!("label = \"bb{basic_block_index}\" shape = box",)
+                    } else {
+                        format!(
+                            "label = \"bb{basic_block_index}\n{trimmed_debug_str}\" shape = box",
+                        )
+                    }
+                },
             )
         )
     }
diff --git a/crates/oxc_semantic/tests/integration/snapshots/argument_map.snap b/crates/oxc_semantic/tests/integration/snapshots/argument_map.snap
index 8efbe03ef451a..8210b0493d9c5 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/argument_map.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/argument_map.snap
@@ -24,11 +24,12 @@ bb4: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "" ]
-    2 [ label = "" ]
-    3 [ label = "ExpressionStatement" ]
-    4 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+ExpressionStatement" shape = box]
+    4 [ label = "bb4" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/arrow_expressions.snap b/crates/oxc_semantic/tests/integration/snapshots/arrow_expressions.snap
index cb8781ba012b8..931b1a3b1991d 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/arrow_expressions.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/arrow_expressions.snap
@@ -29,12 +29,16 @@ bb5: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "ExpressionStatement\nVariableDeclaration" ]
-    2 [ label = "" ]
-    3 [ label = "ExpressionStatement" ]
-    4 [ label = "" ]
-    5 [ label = "ExpressionStatement" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+ExpressionStatement
+VariableDeclaration" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+ExpressionStatement" shape = box]
+    4 [ label = "bb4" shape = box]
+    5 [ label = "bb5
+ExpressionStatement" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/assignment_operators.snap b/crates/oxc_semantic/tests/integration/snapshots/assignment_operators.snap
index 4e45c2366fd83..8d8b8f10db2aa 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/assignment_operators.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/assignment_operators.snap
@@ -37,14 +37,19 @@ bb7: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "ExpressionStatement" ]
-    2 [ label = "" ]
-    3 [ label = "ExpressionStatement" ]
-    4 [ label = "" ]
-    5 [ label = "ExpressionStatement" ]
-    6 [ label = "" ]
-    7 [ label = "ExpressionStatement\nExpressionStatement" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+ExpressionStatement" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+ExpressionStatement" shape = box]
+    4 [ label = "bb4" shape = box]
+    5 [ label = "bb5
+ExpressionStatement" shape = box]
+    6 [ label = "bb6" shape = box]
+    7 [ label = "bb7
+ExpressionStatement
+ExpressionStatement" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     2 -> 0 [ label = "Error(Implicit)" ]
     3 -> 0 [ label = "Error(Implicit)" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/break_from_a_label_in_global_scope.snap b/crates/oxc_semantic/tests/integration/snapshots/break_from_a_label_in_global_scope.snap
index 91d109bad8692..a604a3391158a 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/break_from_a_label_in_global_scope.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/break_from_a_label_in_global_scope.snap
@@ -21,10 +21,13 @@ bb3: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "LabeledStatement(A)\nbreak <A>" ]
-    2 [ label = "unreachable" ]
-    3 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+LabeledStatement(A)
+break <A>" shape = box]
+    2 [ label = "bb2
+unreachable" shape = box]
+    3 [ label = "bb3" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     2 -> 0 [ label = "Error(Implicit)" , style = "dotted" ]
     1 -> 2 [ label = "Unreachable" , style = "dotted" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/class.snap b/crates/oxc_semantic/tests/integration/snapshots/class.snap
index a2e523c101260..aa661869b1d8f 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/class.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/class.snap
@@ -24,11 +24,12 @@ bb4: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "" ]
-    2 [ label = "" ]
-    3 [ label = "ExpressionStatement" ]
-    4 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+ExpressionStatement" shape = box]
+    4 [ label = "bb4" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/class_extend_super.snap b/crates/oxc_semantic/tests/integration/snapshots/class_extend_super.snap
index 23bdddb5f4187..7c13554c45daf 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/class_extend_super.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/class_extend_super.snap
@@ -28,12 +28,14 @@ bb5: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "" ]
-    2 [ label = "" ]
-    3 [ label = "return <value>" ]
-    4 [ label = "unreachable" ]
-    5 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+return <value>" shape = box]
+    4 [ label = "bb4
+unreachable" shape = box]
+    5 [ label = "bb5" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/cond_expr_in_arrow_fn.snap b/crates/oxc_semantic/tests/integration/snapshots/cond_expr_in_arrow_fn.snap
index 5e7a79e9d20f1..496b0a5f831d3 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/cond_expr_in_arrow_fn.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/cond_expr_in_arrow_fn.snap
@@ -36,14 +36,17 @@ bb7: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "VariableDeclaration" ]
-    2 [ label = "" ]
-    3 [ label = "ExpressionStatement" ]
-    4 [ label = "Condition(CallExpression(a))" ]
-    5 [ label = "" ]
-    6 [ label = "" ]
-    7 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+VariableDeclaration" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+ExpressionStatement" shape = box]
+    4 [ label = "bb4
+Condition(CallExpression(a))" shape = box]
+    5 [ label = "bb5" shape = box]
+    6 [ label = "bb6" shape = box]
+    7 [ label = "bb7" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/conditional_expression.snap b/crates/oxc_semantic/tests/integration/snapshots/conditional_expression.snap
index 444513aacfa91..3a66031d3eae6 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/conditional_expression.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/conditional_expression.snap
@@ -28,12 +28,15 @@ bb5: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "VariableDeclaration" ]
-    2 [ label = "Condition(CallExpression(a))" ]
-    3 [ label = "" ]
-    4 [ label = "" ]
-    5 [ label = "VariableDeclaration" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+VariableDeclaration" shape = box]
+    2 [ label = "bb2
+Condition(CallExpression(a))" shape = box]
+    3 [ label = "bb3" shape = box]
+    4 [ label = "bb4" shape = box]
+    5 [ label = "bb5
+VariableDeclaration" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     2 -> 0 [ label = "Error(Implicit)" ]
     3 -> 0 [ label = "Error(Implicit)" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/do_while_break.snap b/crates/oxc_semantic/tests/integration/snapshots/do_while_break.snap
index ae5a163fa42c7..1df3a3772f610 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/do_while_break.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/do_while_break.snap
@@ -57,19 +57,27 @@ bb12: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "VariableDeclaration" ]
-    2 [ label = "" ]
-    3 [ label = "TryStatement" ]
-    4 [ label = "" ]
-    5 [ label = "BlockStatement" ]
-    6 [ label = "DoWhileStatement" ]
-    7 [ label = "BlockStatement\nbreak" ]
-    8 [ label = "unreachable" ]
-    9 [ label = "Condition(true)" ]
-    10 [ label = "" ]
-    11 [ label = "" ]
-    12 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+VariableDeclaration" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+TryStatement" shape = box]
+    4 [ label = "bb4" shape = box]
+    5 [ label = "bb5
+BlockStatement" shape = box]
+    6 [ label = "bb6
+DoWhileStatement" shape = box]
+    7 [ label = "bb7
+BlockStatement
+break" shape = box]
+    8 [ label = "bb8
+unreachable" shape = box]
+    9 [ label = "bb9
+Condition(true)" shape = box]
+    10 [ label = "bb10" shape = box]
+    11 [ label = "bb11" shape = box]
+    12 [ label = "bb12" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/expression_spread.snap b/crates/oxc_semantic/tests/integration/snapshots/expression_spread.snap
index 742931734aa54..c0d0e9ba18110 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/expression_spread.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/expression_spread.snap
@@ -12,7 +12,8 @@ bb1: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "VariableDeclaration" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+VariableDeclaration" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
 }
diff --git a/crates/oxc_semantic/tests/integration/snapshots/fn_return_obj_expr_with_computed_key.snap b/crates/oxc_semantic/tests/integration/snapshots/fn_return_obj_expr_with_computed_key.snap
index 6bce4ae9b581e..84aed787a5b94 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/fn_return_obj_expr_with_computed_key.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/fn_return_obj_expr_with_computed_key.snap
@@ -28,12 +28,14 @@ bb5: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "" ]
-    2 [ label = "" ]
-    3 [ label = "return <value>" ]
-    4 [ label = "unreachable" ]
-    5 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+return <value>" shape = box]
+    4 [ label = "bb4
+unreachable" shape = box]
+    5 [ label = "bb5" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/for_in.snap b/crates/oxc_semantic/tests/integration/snapshots/for_in.snap
index 92f50f16ba64b..727e7cf993487 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/for_in.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/for_in.snap
@@ -41,15 +41,20 @@ bb8: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "" ]
-    2 [ label = "" ]
-    3 [ label = "ForStatement\nVariableDeclaration" ]
-    4 [ label = "Condition(test)" ]
-    5 [ label = "" ]
-    6 [ label = "ExpressionStatement" ]
-    7 [ label = "ExpressionStatement" ]
-    8 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+ForStatement
+VariableDeclaration" shape = box]
+    4 [ label = "bb4
+Condition(test)" shape = box]
+    5 [ label = "bb5" shape = box]
+    6 [ label = "bb6
+ExpressionStatement" shape = box]
+    7 [ label = "bb7
+ExpressionStatement" shape = box]
+    8 [ label = "bb8" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/function_as_expression.snap b/crates/oxc_semantic/tests/integration/snapshots/function_as_expression.snap
index e2c2872a6294c..d875f8a932243 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/function_as_expression.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/function_as_expression.snap
@@ -160,45 +160,55 @@ bb38: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "ExpressionStatement" ]
-    2 [ label = "" ]
-    3 [ label = "" ]
-    4 [ label = "ExpressionStatement" ]
-    5 [ label = "" ]
-    6 [ label = "" ]
-    7 [ label = "" ]
-    8 [ label = "" ]
-    9 [ label = "" ]
-    10 [ label = "ExpressionStatement" ]
-    11 [ label = "" ]
-    12 [ label = "" ]
-    13 [ label = "ExpressionStatement" ]
-    14 [ label = "" ]
-    15 [ label = "" ]
-    16 [ label = "ExpressionStatement" ]
-    17 [ label = "" ]
-    18 [ label = "" ]
-    19 [ label = "ExpressionStatement" ]
-    20 [ label = "" ]
-    21 [ label = "" ]
-    22 [ label = "ExpressionStatement" ]
-    23 [ label = "" ]
-    24 [ label = "" ]
-    25 [ label = "" ]
-    26 [ label = "" ]
-    27 [ label = "ExpressionStatement" ]
-    28 [ label = "" ]
-    29 [ label = "" ]
-    30 [ label = "" ]
-    31 [ label = "" ]
-    32 [ label = "ExpressionStatement" ]
-    33 [ label = "" ]
-    34 [ label = "" ]
-    35 [ label = "ExpressionStatement" ]
-    36 [ label = "" ]
-    37 [ label = "" ]
-    38 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+ExpressionStatement" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3" shape = box]
+    4 [ label = "bb4
+ExpressionStatement" shape = box]
+    5 [ label = "bb5" shape = box]
+    6 [ label = "bb6" shape = box]
+    7 [ label = "bb7" shape = box]
+    8 [ label = "bb8" shape = box]
+    9 [ label = "bb9" shape = box]
+    10 [ label = "bb10
+ExpressionStatement" shape = box]
+    11 [ label = "bb11" shape = box]
+    12 [ label = "bb12" shape = box]
+    13 [ label = "bb13
+ExpressionStatement" shape = box]
+    14 [ label = "bb14" shape = box]
+    15 [ label = "bb15" shape = box]
+    16 [ label = "bb16
+ExpressionStatement" shape = box]
+    17 [ label = "bb17" shape = box]
+    18 [ label = "bb18" shape = box]
+    19 [ label = "bb19
+ExpressionStatement" shape = box]
+    20 [ label = "bb20" shape = box]
+    21 [ label = "bb21" shape = box]
+    22 [ label = "bb22
+ExpressionStatement" shape = box]
+    23 [ label = "bb23" shape = box]
+    24 [ label = "bb24" shape = box]
+    25 [ label = "bb25" shape = box]
+    26 [ label = "bb26" shape = box]
+    27 [ label = "bb27
+ExpressionStatement" shape = box]
+    28 [ label = "bb28" shape = box]
+    29 [ label = "bb29" shape = box]
+    30 [ label = "bb30" shape = box]
+    31 [ label = "bb31" shape = box]
+    32 [ label = "bb32
+ExpressionStatement" shape = box]
+    33 [ label = "bb33" shape = box]
+    34 [ label = "bb34" shape = box]
+    35 [ label = "bb35
+ExpressionStatement" shape = box]
+    36 [ label = "bb36" shape = box]
+    37 [ label = "bb37" shape = box]
+    38 [ label = "bb38" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/function_in_finally.snap b/crates/oxc_semantic/tests/integration/snapshots/function_in_finally.snap
index 789ca61d83e4d..d0a61a8d42c09 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/function_in_finally.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/function_in_finally.snap
@@ -41,15 +41,19 @@ bb8: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "TryStatement" ]
-    2 [ label = "" ]
-    3 [ label = "BlockStatement\nExpressionStatement" ]
-    4 [ label = "" ]
-    5 [ label = "" ]
-    6 [ label = "" ]
-    7 [ label = "ExpressionStatement" ]
-    8 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+TryStatement" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+BlockStatement
+ExpressionStatement" shape = box]
+    4 [ label = "bb4" shape = box]
+    5 [ label = "bb5" shape = box]
+    6 [ label = "bb6" shape = box]
+    7 [ label = "bb7
+ExpressionStatement" shape = box]
+    8 [ label = "bb8" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Finalize" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/if_else.snap b/crates/oxc_semantic/tests/integration/snapshots/if_else.snap
index 1569002280bae..ebf78c52b3215 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/if_else.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/if_else.snap
@@ -62,20 +62,30 @@ bb13: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "" ]
-    2 [ label = "" ]
-    3 [ label = "IfStatement" ]
-    4 [ label = "Condition(LogicalExpression)" ]
-    5 [ label = "" ]
-    6 [ label = "" ]
-    7 [ label = "BlockStatement\nreturn <value>" ]
-    8 [ label = "unreachable" ]
-    9 [ label = "BlockStatement\nreturn <value>" ]
-    10 [ label = "unreachable" ]
-    11 [ label = "return <value>" ]
-    12 [ label = "unreachable" ]
-    13 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+IfStatement" shape = box]
+    4 [ label = "bb4
+Condition(LogicalExpression)" shape = box]
+    5 [ label = "bb5" shape = box]
+    6 [ label = "bb6" shape = box]
+    7 [ label = "bb7
+BlockStatement
+return <value>" shape = box]
+    8 [ label = "bb8
+unreachable" shape = box]
+    9 [ label = "bb9
+BlockStatement
+return <value>" shape = box]
+    10 [ label = "bb10
+unreachable" shape = box]
+    11 [ label = "bb11
+return <value>" shape = box]
+    12 [ label = "bb12
+unreachable" shape = box]
+    13 [ label = "bb13" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/if_stmt_in_for_in.snap b/crates/oxc_semantic/tests/integration/snapshots/if_stmt_in_for_in.snap
index dd6f6f7965b8f..f09d2e482c30d 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/if_stmt_in_for_in.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/if_stmt_in_for_in.snap
@@ -83,24 +83,43 @@ bb17: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "" ]
-    2 [ label = "" ]
-    3 [ label = "ForInStatement\nVariableDeclaration" ]
-    4 [ label = "" ]
-    5 [ label = "Iteration(IdentifierReference(array) in expr)" ]
-    6 [ label = "BlockStatement\nIfStatement" ]
-    7 [ label = "Condition(if cond)" ]
-    8 [ label = "BlockStatement\nExpressionStatement\nbreak" ]
-    9 [ label = "unreachable" ]
-    10 [ label = "IfStatement" ]
-    11 [ label = "Condition(else cond)" ]
-    12 [ label = "BlockStatement\nExpressionStatement\ncontinue" ]
-    13 [ label = "unreachable" ]
-    14 [ label = "" ]
-    15 [ label = "ExpressionStatement\nExpressionStatement" ]
-    16 [ label = "ExpressionStatement" ]
-    17 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+ForInStatement
+VariableDeclaration" shape = box]
+    4 [ label = "bb4" shape = box]
+    5 [ label = "bb5
+Iteration(IdentifierReference(array) in expr)" shape = box]
+    6 [ label = "bb6
+BlockStatement
+IfStatement" shape = box]
+    7 [ label = "bb7
+Condition(if cond)" shape = box]
+    8 [ label = "bb8
+BlockStatement
+ExpressionStatement
+break" shape = box]
+    9 [ label = "bb9
+unreachable" shape = box]
+    10 [ label = "bb10
+IfStatement" shape = box]
+    11 [ label = "bb11
+Condition(else cond)" shape = box]
+    12 [ label = "bb12
+BlockStatement
+ExpressionStatement
+continue" shape = box]
+    13 [ label = "bb13
+unreachable" shape = box]
+    14 [ label = "bb14" shape = box]
+    15 [ label = "bb15
+ExpressionStatement
+ExpressionStatement" shape = box]
+    16 [ label = "bb16
+ExpressionStatement" shape = box]
+    17 [ label = "bb17" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/import_as_function.snap b/crates/oxc_semantic/tests/integration/snapshots/import_as_function.snap
index fd80beaa47729..ba325c462ee26 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/import_as_function.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/import_as_function.snap
@@ -20,10 +20,12 @@ bb3: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "ExpressionStatement" ]
-    2 [ label = "" ]
-    3 [ label = "ExpressionStatement" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+ExpressionStatement" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+ExpressionStatement" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/index_into_object_with_symbol_as_arg.snap b/crates/oxc_semantic/tests/integration/snapshots/index_into_object_with_symbol_as_arg.snap
index 614ee7de21563..07b6dc5b88b5e 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/index_into_object_with_symbol_as_arg.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/index_into_object_with_symbol_as_arg.snap
@@ -12,7 +12,8 @@ bb1: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "ExpressionStatement" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+ExpressionStatement" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
 }
diff --git a/crates/oxc_semantic/tests/integration/snapshots/indexing_into_class_expression.snap b/crates/oxc_semantic/tests/integration/snapshots/indexing_into_class_expression.snap
index eec74b2eb76f6..72caaf33324a6 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/indexing_into_class_expression.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/indexing_into_class_expression.snap
@@ -13,7 +13,9 @@ bb1: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "ExpressionStatement\nExpressionStatement" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+ExpressionStatement
+ExpressionStatement" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
 }
diff --git a/crates/oxc_semantic/tests/integration/snapshots/infix_operators.snap b/crates/oxc_semantic/tests/integration/snapshots/infix_operators.snap
index aaf622a2c6357..9ac3f416171ba 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/infix_operators.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/infix_operators.snap
@@ -21,10 +21,12 @@ bb3: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "ExpressionStatement\nExpressionStatement" ]
-    2 [ label = "" ]
-    3 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+ExpressionStatement
+ExpressionStatement" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     2 -> 0 [ label = "Error(Implicit)" ]
     3 -> 0 [ label = "Error(Implicit)" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/labeled_block_break.snap b/crates/oxc_semantic/tests/integration/snapshots/labeled_block_break.snap
index 44e98e0d65b84..971843622431b 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/labeled_block_break.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/labeled_block_break.snap
@@ -52,17 +52,27 @@ bb10: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "TryStatement" ]
-    2 [ label = "" ]
-    3 [ label = "BlockStatement" ]
-    4 [ label = "BlockStatement\nLabeledStatement(LABEL)\nBlockStatement\nIfStatement" ]
-    5 [ label = "Condition(IdentifierReference(condition))" ]
-    6 [ label = "BlockStatement\nbreak <LABEL>" ]
-    7 [ label = "unreachable" ]
-    8 [ label = "" ]
-    9 [ label = "" ]
-    10 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+TryStatement" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+BlockStatement" shape = box]
+    4 [ label = "bb4
+BlockStatement
+LabeledStatement(LABEL)
+BlockStatement
+IfStatement" shape = box]
+    5 [ label = "bb5
+Condition(IdentifierReference(condition))" shape = box]
+    6 [ label = "bb6
+BlockStatement
+break <LABEL>" shape = box]
+    7 [ label = "bb7
+unreachable" shape = box]
+    8 [ label = "bb8" shape = box]
+    9 [ label = "bb9" shape = box]
+    10 [ label = "bb10" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Explicit)" ]
     4 -> 0 [ label = "Error(Implicit)" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/labelled_try_break.snap b/crates/oxc_semantic/tests/integration/snapshots/labelled_try_break.snap
index 21727677061b9..d0a50366b3f28 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/labelled_try_break.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/labelled_try_break.snap
@@ -58,19 +58,29 @@ bb12: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "VariableDeclaration" ]
-    2 [ label = "" ]
-    3 [ label = "LabeledStatement(label)\nTryStatement" ]
-    4 [ label = "" ]
-    5 [ label = "BlockStatement\nreturn <value>" ]
-    6 [ label = "unreachable" ]
-    7 [ label = "break <label>" ]
-    8 [ label = "unreachable" ]
-    9 [ label = "" ]
-    10 [ label = "return <value>" ]
-    11 [ label = "unreachable" ]
-    12 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+VariableDeclaration" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+LabeledStatement(label)
+TryStatement" shape = box]
+    4 [ label = "bb4" shape = box]
+    5 [ label = "bb5
+BlockStatement
+return <value>" shape = box]
+    6 [ label = "bb6
+unreachable" shape = box]
+    7 [ label = "bb7
+break <label>" shape = box]
+    8 [ label = "bb8
+unreachable" shape = box]
+    9 [ label = "bb9" shape = box]
+    10 [ label = "bb10
+return <value>" shape = box]
+    11 [ label = "bb11
+unreachable" shape = box]
+    12 [ label = "bb12" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/logical_expressions_short_circuit.snap b/crates/oxc_semantic/tests/integration/snapshots/logical_expressions_short_circuit.snap
index f46c08eaee8be..0790558a74543 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/logical_expressions_short_circuit.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/logical_expressions_short_circuit.snap
@@ -73,23 +73,33 @@ bb16: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "IfStatement" ]
-    2 [ label = "Condition(LogicalExpression)" ]
-    3 [ label = "" ]
-    4 [ label = "" ]
-    5 [ label = "BlockStatement\nExpressionStatement" ]
-    6 [ label = "IfStatement" ]
-    7 [ label = "Condition(LogicalExpression)" ]
-    8 [ label = "" ]
-    9 [ label = "" ]
-    10 [ label = "ExpressionStatement" ]
-    11 [ label = "IfStatement" ]
-    12 [ label = "Condition(LogicalExpression)" ]
-    13 [ label = "" ]
-    14 [ label = "" ]
-    15 [ label = "ExpressionStatement" ]
-    16 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+IfStatement" shape = box]
+    2 [ label = "bb2
+Condition(LogicalExpression)" shape = box]
+    3 [ label = "bb3" shape = box]
+    4 [ label = "bb4" shape = box]
+    5 [ label = "bb5
+BlockStatement
+ExpressionStatement" shape = box]
+    6 [ label = "bb6
+IfStatement" shape = box]
+    7 [ label = "bb7
+Condition(LogicalExpression)" shape = box]
+    8 [ label = "bb8" shape = box]
+    9 [ label = "bb9" shape = box]
+    10 [ label = "bb10
+ExpressionStatement" shape = box]
+    11 [ label = "bb11
+IfStatement" shape = box]
+    12 [ label = "bb12
+Condition(LogicalExpression)" shape = box]
+    13 [ label = "bb13" shape = box]
+    14 [ label = "bb14" shape = box]
+    15 [ label = "bb15
+ExpressionStatement" shape = box]
+    16 [ label = "bb16" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     2 -> 0 [ label = "Error(Implicit)" ]
     3 -> 0 [ label = "Error(Implicit)" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/member_access_with_numbered_index.snap b/crates/oxc_semantic/tests/integration/snapshots/member_access_with_numbered_index.snap
index 016cc4034b7cb..df2c294c9544b 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/member_access_with_numbered_index.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/member_access_with_numbered_index.snap
@@ -33,13 +33,17 @@ bb6: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "" ]
-    2 [ label = "" ]
-    3 [ label = "return <value>" ]
-    4 [ label = "unreachable\nreturn <value>" ]
-    5 [ label = "unreachable" ]
-    6 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+return <value>" shape = box]
+    4 [ label = "bb4
+unreachable
+return <value>" shape = box]
+    5 [ label = "bb5
+unreachable" shape = box]
+    6 [ label = "bb6" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/member_access_with_unreachable.snap b/crates/oxc_semantic/tests/integration/snapshots/member_access_with_unreachable.snap
index 8c86e6f39c0c4..acda97da388ee 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/member_access_with_unreachable.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/member_access_with_unreachable.snap
@@ -33,13 +33,17 @@ bb6: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "" ]
-    2 [ label = "" ]
-    3 [ label = "return <value>" ]
-    4 [ label = "unreachable\nreturn <value>" ]
-    5 [ label = "unreachable" ]
-    6 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+return <value>" shape = box]
+    4 [ label = "bb4
+unreachable
+return <value>" shape = box]
+    5 [ label = "bb5
+unreachable" shape = box]
+    6 [ label = "bb6" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/nested_computed_member_expression.snap b/crates/oxc_semantic/tests/integration/snapshots/nested_computed_member_expression.snap
index 8bf6adef8b01a..da1683745f962 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/nested_computed_member_expression.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/nested_computed_member_expression.snap
@@ -28,12 +28,14 @@ bb5: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "" ]
-    2 [ label = "" ]
-    3 [ label = "return <value>" ]
-    4 [ label = "unreachable" ]
-    5 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+return <value>" shape = box]
+    4 [ label = "bb4
+unreachable" shape = box]
+    5 [ label = "bb5" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/new_and_meta.snap b/crates/oxc_semantic/tests/integration/snapshots/new_and_meta.snap
index 88e5de78970e3..a5d708047c7b9 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/new_and_meta.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/new_and_meta.snap
@@ -12,7 +12,8 @@ bb1: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "ExpressionStatement" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+ExpressionStatement" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
 }
diff --git a/crates/oxc_semantic/tests/integration/snapshots/new_class_then_call_fn.snap b/crates/oxc_semantic/tests/integration/snapshots/new_class_then_call_fn.snap
index 4678721f95cc8..078342c2c30d8 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/new_class_then_call_fn.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/new_class_then_call_fn.snap
@@ -12,7 +12,8 @@ bb1: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "VariableDeclaration" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+VariableDeclaration" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
 }
diff --git a/crates/oxc_semantic/tests/integration/snapshots/object_in_computer_member_expression.snap b/crates/oxc_semantic/tests/integration/snapshots/object_in_computer_member_expression.snap
index 6f32a4dea6d04..892ee2a597908 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/object_in_computer_member_expression.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/object_in_computer_member_expression.snap
@@ -12,7 +12,8 @@ bb1: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "ExpressionStatement" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+ExpressionStatement" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
 }
diff --git a/crates/oxc_semantic/tests/integration/snapshots/parenthesized_and_sequence_expr.snap b/crates/oxc_semantic/tests/integration/snapshots/parenthesized_and_sequence_expr.snap
index a00ff8203e75a..ad7179a12ca06 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/parenthesized_and_sequence_expr.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/parenthesized_and_sequence_expr.snap
@@ -36,14 +36,16 @@ bb7: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "" ]
-    2 [ label = "" ]
-    3 [ label = "ExpressionStatement" ]
-    4 [ label = "" ]
-    5 [ label = "" ]
-    6 [ label = "ExpressionStatement" ]
-    7 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+ExpressionStatement" shape = box]
+    4 [ label = "bb4" shape = box]
+    5 [ label = "bb5" shape = box]
+    6 [ label = "bb6
+ExpressionStatement" shape = box]
+    7 [ label = "bb7" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/private_in.snap b/crates/oxc_semantic/tests/integration/snapshots/private_in.snap
index 09788356fa6b4..90a76315386b2 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/private_in.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/private_in.snap
@@ -28,12 +28,14 @@ bb5: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "" ]
-    2 [ label = "" ]
-    3 [ label = "return <value>" ]
-    4 [ label = "unreachable" ]
-    5 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+return <value>" shape = box]
+    4 [ label = "bb4
+unreachable" shape = box]
+    5 [ label = "bb5" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/simple_spread.snap b/crates/oxc_semantic/tests/integration/snapshots/simple_spread.snap
index 43b311d261095..2bb2be260dee0 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/simple_spread.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/simple_spread.snap
@@ -28,12 +28,14 @@ bb5: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "" ]
-    2 [ label = "" ]
-    3 [ label = "return <value>" ]
-    4 [ label = "unreachable" ]
-    5 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+return <value>" shape = box]
+    4 [ label = "bb4
+unreachable" shape = box]
+    5 [ label = "bb5" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/spread_in_a_spread.snap b/crates/oxc_semantic/tests/integration/snapshots/spread_in_a_spread.snap
index 56c32dcebc679..f83ee0f7b047e 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/spread_in_a_spread.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/spread_in_a_spread.snap
@@ -28,12 +28,14 @@ bb5: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "" ]
-    2 [ label = "" ]
-    3 [ label = "return <value>" ]
-    4 [ label = "unreachable" ]
-    5 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+return <value>" shape = box]
+    4 [ label = "bb4
+unreachable" shape = box]
+    5 [ label = "bb5" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/string.snap b/crates/oxc_semantic/tests/integration/snapshots/string.snap
index a8db944e45f78..edf5d92c82554 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/string.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/string.snap
@@ -12,7 +12,7 @@ bb1: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
 }
diff --git a/crates/oxc_semantic/tests/integration/snapshots/switch_in_while.snap b/crates/oxc_semantic/tests/integration/snapshots/switch_in_while.snap
index 64ebda541d809..6231ffb00116e 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/switch_in_while.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/switch_in_while.snap
@@ -50,17 +50,27 @@ bb10: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "WhileStatement" ]
-    2 [ label = "Condition(IdentifierReference(a))" ]
-    3 [ label = "BlockStatement\nSwitchStatement" ]
-    4 [ label = "Condition(0)" ]
-    5 [ label = "ExpressionStatement\ncontinue" ]
-    6 [ label = "unreachable" ]
-    7 [ label = "Condition(1)" ]
-    8 [ label = "ExpressionStatement" ]
-    9 [ label = "" ]
-    10 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+WhileStatement" shape = box]
+    2 [ label = "bb2
+Condition(IdentifierReference(a))" shape = box]
+    3 [ label = "bb3
+BlockStatement
+SwitchStatement" shape = box]
+    4 [ label = "bb4
+Condition(0)" shape = box]
+    5 [ label = "bb5
+ExpressionStatement
+continue" shape = box]
+    6 [ label = "bb6
+unreachable" shape = box]
+    7 [ label = "bb7
+Condition(1)" shape = box]
+    8 [ label = "bb8
+ExpressionStatement" shape = box]
+    9 [ label = "bb9" shape = box]
+    10 [ label = "bb10" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     2 -> 0 [ label = "Error(Implicit)" ]
     3 -> 0 [ label = "Error(Implicit)" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/switch_statement.snap b/crates/oxc_semantic/tests/integration/snapshots/switch_statement.snap
index 52e70f2b929c5..73408ed813947 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/switch_statement.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/switch_statement.snap
@@ -106,29 +106,57 @@ bb22: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "" ]
-    2 [ label = "" ]
-    3 [ label = "SwitchStatement" ]
-    4 [ label = "Condition(1)" ]
-    5 [ label = "ExpressionStatement\nbreak" ]
-    6 [ label = "unreachable" ]
-    7 [ label = "Condition(2)" ]
-    8 [ label = "ExpressionStatement" ]
-    9 [ label = "Condition(3)" ]
-    10 [ label = "ExpressionStatement\nbreak" ]
-    11 [ label = "unreachable" ]
-    12 [ label = "Condition(4)" ]
-    13 [ label = "BlockStatement\nExpressionStatement\nVariableDeclaration\nExpressionStatement\nreturn <value>" ]
-    14 [ label = "unreachable" ]
-    15 [ label = "Condition(5)" ]
-    16 [ label = "ExpressionStatement\nExpressionStatement\nExpressionStatement" ]
-    17 [ label = "" ]
-    18 [ label = "ExpressionStatement\nreturn <value>" ]
-    19 [ label = "unreachable" ]
-    20 [ label = "ExpressionStatement\nreturn <value>" ]
-    21 [ label = "unreachable" ]
-    22 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+SwitchStatement" shape = box]
+    4 [ label = "bb4
+Condition(1)" shape = box]
+    5 [ label = "bb5
+ExpressionStatement
+break" shape = box]
+    6 [ label = "bb6
+unreachable" shape = box]
+    7 [ label = "bb7
+Condition(2)" shape = box]
+    8 [ label = "bb8
+ExpressionStatement" shape = box]
+    9 [ label = "bb9
+Condition(3)" shape = box]
+    10 [ label = "bb10
+ExpressionStatement
+break" shape = box]
+    11 [ label = "bb11
+unreachable" shape = box]
+    12 [ label = "bb12
+Condition(4)" shape = box]
+    13 [ label = "bb13
+BlockStatement
+ExpressionStatement
+VariableDeclaration
+ExpressionStatement
+return <value>" shape = box]
+    14 [ label = "bb14
+unreachable" shape = box]
+    15 [ label = "bb15
+Condition(5)" shape = box]
+    16 [ label = "bb16
+ExpressionStatement
+ExpressionStatement
+ExpressionStatement" shape = box]
+    17 [ label = "bb17" shape = box]
+    18 [ label = "bb18
+ExpressionStatement
+return <value>" shape = box]
+    19 [ label = "bb19
+unreachable" shape = box]
+    20 [ label = "bb20
+ExpressionStatement
+return <value>" shape = box]
+    21 [ label = "bb21
+unreachable" shape = box]
+    22 [ label = "bb22" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/template_literal.snap b/crates/oxc_semantic/tests/integration/snapshots/template_literal.snap
index bc8f1b75747fc..141d8d8d0a20f 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/template_literal.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/template_literal.snap
@@ -12,7 +12,8 @@ bb1: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "ExpressionStatement" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+ExpressionStatement" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
 }
diff --git a/crates/oxc_semantic/tests/integration/snapshots/template_string.snap b/crates/oxc_semantic/tests/integration/snapshots/template_string.snap
index ec5f224556a47..1d7ec989b99c9 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/template_string.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/template_string.snap
@@ -12,7 +12,8 @@ bb1: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "ExpressionStatement" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+ExpressionStatement" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
 }
diff --git a/crates/oxc_semantic/tests/integration/snapshots/two_functions.snap b/crates/oxc_semantic/tests/integration/snapshots/two_functions.snap
index 5836e144d1486..e385e9b5be406 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/two_functions.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/two_functions.snap
@@ -44,16 +44,20 @@ bb9: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "" ]
-    2 [ label = "" ]
-    3 [ label = "return <value>" ]
-    4 [ label = "unreachable" ]
-    5 [ label = "" ]
-    6 [ label = "" ]
-    7 [ label = "return <value>" ]
-    8 [ label = "unreachable" ]
-    9 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+return <value>" shape = box]
+    4 [ label = "bb4
+unreachable" shape = box]
+    5 [ label = "bb5" shape = box]
+    6 [ label = "bb6" shape = box]
+    7 [ label = "bb7
+return <value>" shape = box]
+    8 [ label = "bb8
+unreachable" shape = box]
+    9 [ label = "bb9" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/unary_operator.snap b/crates/oxc_semantic/tests/integration/snapshots/unary_operator.snap
index 1c9540fa52fa0..eb06e72d388bf 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/unary_operator.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/unary_operator.snap
@@ -14,7 +14,10 @@ bb1: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "ExpressionStatement\nExpressionStatement\nExpressionStatement" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+ExpressionStatement
+ExpressionStatement
+ExpressionStatement" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
 }
diff --git a/crates/oxc_semantic/tests/integration/snapshots/while.snap b/crates/oxc_semantic/tests/integration/snapshots/while.snap
index 1ce7911bbbc54..099b9e799a690 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/while.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/while.snap
@@ -53,18 +53,25 @@ bb11: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "" ]
-    2 [ label = "" ]
-    3 [ label = "WhileStatement" ]
-    4 [ label = "Condition(LogicalExpression)" ]
-    5 [ label = "" ]
-    6 [ label = "" ]
-    7 [ label = "BlockStatement\nreturn <value>" ]
-    8 [ label = "unreachable" ]
-    9 [ label = "return <value>" ]
-    10 [ label = "unreachable" ]
-    11 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+WhileStatement" shape = box]
+    4 [ label = "bb4
+Condition(LogicalExpression)" shape = box]
+    5 [ label = "bb5" shape = box]
+    6 [ label = "bb6" shape = box]
+    7 [ label = "bb7
+BlockStatement
+return <value>" shape = box]
+    8 [ label = "bb8
+unreachable" shape = box]
+    9 [ label = "bb9
+return <value>" shape = box]
+    10 [ label = "bb10
+unreachable" shape = box]
+    11 [ label = "bb11" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]
diff --git a/crates/oxc_semantic/tests/integration/snapshots/yield_as_statement_and_expression.snap b/crates/oxc_semantic/tests/integration/snapshots/yield_as_statement_and_expression.snap
index 4b58d7c99b8e4..600520d6eb38d 100644
--- a/crates/oxc_semantic/tests/integration/snapshots/yield_as_statement_and_expression.snap
+++ b/crates/oxc_semantic/tests/integration/snapshots/yield_as_statement_and_expression.snap
@@ -25,11 +25,14 @@ bb4: {
 }
 
 digraph {
-    0 [ label = "" ]
-    1 [ label = "VariableDeclaration" ]
-    2 [ label = "" ]
-    3 [ label = "ExpressionStatement\nExpressionStatement" ]
-    4 [ label = "" ]
+    0 [ label = "bb0" shape = box]
+    1 [ label = "bb1
+VariableDeclaration" shape = box]
+    2 [ label = "bb2" shape = box]
+    3 [ label = "bb3
+ExpressionStatement
+ExpressionStatement" shape = box]
+    4 [ label = "bb4" shape = box]
     1 -> 0 [ label = "Error(Implicit)" ]
     3 -> 2 [ label = "Error(Implicit)" ]
     1 -> 3 [ label = "NewFunction" ]