Remove dependencies between UI and core

Author: snakex64

docs/blazor-maintainability-audit.md

@@ -20,7 +20,7 @@
 
 namespace NodeDev.Blazor.Components;
 
-public partial class GraphCanvas : ComponentBase, IDisposable, IGraphCanvas
+public partial class GraphCanvas : ComponentBase, IDisposable
 {
 	[Parameter, EditorRequired]
 	public Graph Graph { get; set; } = null!;
@@ -46,8 +46,6 @@ protected override void OnInitialized()
 		base.OnInitialized();
 		_ = NodeProvider.WarmExtensionMethodCatalogAsync();
 
-		Graph.GraphCanvas = this;
-
 		var options = new BlazorDiagramOptions
 		{
 			GridSize = 30,
@@ -79,6 +77,7 @@ protected override void OnInitialized()
 		DiagramSynchronizer = new GraphDiagramSynchronizer(Graph, action => InvokeAsync(action));
 		DiagramProjection = new GraphDiagramProjection(Graph, Diagram, DiagramSynchronizer, OnConnectionAdded);
 		DebugVisualizer = new GraphDebugVisualizer(Graph, Diagram, action => InvokeAsync(action));
+		IndexPage.RegisterGraphCanvas(this);
 	}
 
 	#endregion
@@ -93,30 +92,13 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
 		{
 			await Task.Delay(100);
 			Diagram.Batch(DiagramProjection.Initialize);
-			DiagramSynchronizer.Start(DiagramProjection.Rebuild, StateHasChanged);
+			DiagramSynchronizer.Start(DiagramProjection, StateHasChanged);
 			DebugVisualizer.Start();
 		}
 	}
 
 	#endregion
 
-	#region UpdateConnectionType
-
-	public void UpdatePortColor(Connection connection)
-	{
-		var port = FindPort(connection);
-		if (port == null)
-			return;
-
-		var color = GetTypeShapeColor(connection.Type, connection.Parent.TypeFactory);
-		foreach (var link in port.Links.Cast<LinkModel>())
-			link.Color = color;
-
-		Diagram.Refresh();
-	}
-
-	#endregion
-
 	#region UpdateNodes
 
 	private NodeModel? FindNodeModel(Node node)
@@ -426,10 +408,6 @@ private void OnNewOverloadSelected(Node.AlternateOverload overload)
 
 		GraphManagerService.SelectNodeOverload(PopupState.Node, overload);
 
-		// Refresh the node visually after overload selection
-		// The node's ports have changed, so we need to update the UI
-		Refresh(PopupState.Node);
-
 		CancelPopup();
 	}
 
@@ -639,92 +617,6 @@ public void ToggleBreakpointOnSelectedNode()
 
 	#endregion
 
-	#region RemoveNode
-
-	public void RemoveNode(Node node)
-	{
-		if (node is LambdaReturnNode { IsImplicit: true } boundaryReturn)
-		{
-			var group = FindLambdaGroup(boundaryReturn.CallableScopeId);
-			if (group != null)
-			{
-				foreach (var port in group.Ports
-					.OfType<GraphPortModel>()
-					.Where(x => x.Connection.Parent == boundaryReturn)
-					.ToList())
-				{
-					group.RemovePort(port);
-				}
-				group.Refresh();
-			}
-			return;
-		}
-
-		var nodeModel = FindNodeModel(node);
-		if (nodeModel == null)
-			return;
-
-		using var suppression = DiagramSynchronizer.SuppressCanvasMutations();
-		if (nodeModel is LambdaGroupModel modelGroup)
-			Diagram.Groups.Remove(modelGroup);
-		else
-			Diagram.Nodes.Remove(nodeModel);
-	}
-
-	#endregion
-
-	#region AddLink / RemoveLink
-
-	public void RemoveLinkFromGraphCanvas(Connection source, Connection destination)
-	{
-		using (DiagramSynchronizer.SuppressConnectionUpdates())
-		{
-			var link = Diagram.Links.FirstOrDefault(x => (x.Source.Model as GraphPortModel)?.Connection == source && (x.Target.Model as GraphPortModel)?.Connection == destination);
-			if (link != null)
-				Diagram.Links.Remove(link);
-		}
-	}
-
-	public void AddLinkToGraphCanvas(Connection source, Connection destination)
-	{
-		using (DiagramSynchronizer.SuppressConnectionUpdates())
-		{
-			if (source.IsInput)
-				(destination, source) = (source, destination);
-
-			var sourcePort = FindPort(source) ?? throw new InvalidOperationException($"No canvas port exists for {source.Parent.Name}.{source.Name}.");
-			var destinationPort = FindPort(destination) ?? throw new InvalidOperationException($"No canvas port exists for {destination.Parent.Name}.{destination.Name}.");
-
-			// Make sure there isn't already an existing identical link
-			if (Diagram.Links.OfType<LinkModel>().Any(x => (x.Source as SinglePortAnchor)?.Port == sourcePort && (x.Target as SinglePortAnchor)?.Port == destinationPort))
-				return;
-
-			var link = Diagram.Links.Add(new LinkModel(sourcePort, destinationPort));
-
-			OnConnectionAdded(link, true);
-		}
-	}
-
-	#endregion
-
-	#region AddNode
-
-	public void AddNode(Node node)
-	{
-		DiagramProjection.AddNode(node);
-	}
-
-	#endregion
-
-	#region Refresh
-
-	public void Refresh(Node node)
-	{
-		DiagramProjection.Refresh(node);
-	}
-
-	#endregion
-
 	#region Initialize
 
 	public static string GetTypeShapeColor(TypeBase type, TypeFactory typeFactory)
@@ -750,9 +642,7 @@ public static string GetTypeShapeColor(TypeBase type, TypeFactory typeFactory)
 	public void Dispose()
 	{
 		GC.SuppressFinalize(this);
-
-		if (Graph.GraphCanvas == this)
-			Graph.GraphCanvas = null;
+		IndexPage.UnregisterGraphCanvas(this);
 
 		DebugVisualizer.Dispose();
 		DiagramSynchronizer.Dispose();

src/NodeDev.Blazor/Components/GraphCanvas.razor.cs

@@ -1,4 +1,5 @@
 using Blazor.Diagrams;
+using Blazor.Diagrams.Core.Anchors;
 using Blazor.Diagrams.Core.Models;
 using Blazor.Diagrams.Core.Models.Base;
 using NodeDev.Blazor.DiagramsModels;
@@ -95,6 +96,9 @@ public void Rebuild()
 	/// </summary>
 	public void AddNode(Node node)
 	{
+		if (FindNodeModel(node) != null)
+			return;
+
 		if (node is CreateDelegateNode delegateNode)
 			AddLambdaGroupModel(delegateNode);
 		else if (node is LambdaReturnNode { IsImplicit: true } boundaryReturn)
@@ -105,6 +109,96 @@ public void AddNode(Node node)
 		ReparentScopedModels();
 	}
 
+	/// <summary>
+	/// Removes the model representing a domain node without allowing diagram callbacks to repeat the domain mutation.
+	/// </summary>
+	public void RemoveNode(Node node)
+	{
+		if (node is LambdaReturnNode { IsImplicit: true } boundaryReturn)
+		{
+			var group = FindLambdaGroup(boundaryReturn.CallableScopeId);
+			if (group == null)
+				return;
+
+			foreach (var port in group.Ports
+				.OfType<GraphPortModel>()
+				.Where(port => port.Connection.Parent == boundaryReturn)
+				.ToList())
+			{
+				group.RemovePort(port);
+			}
+			group.Refresh();
+			return;
+		}
+
+		var nodeModel = FindNodeModel(node);
+		if (nodeModel == null)
+			return;
+
+		using var suppression = Synchronizer.SuppressCanvasMutations();
+		if (nodeModel is LambdaGroupModel groupModel)
+			Diagram.Groups.Remove(groupModel);
+		else
+			Diagram.Nodes.Remove(nodeModel);
+	}
+
+	/// <summary>
+	/// Adds a projected link if the diagram does not already contain it.
+	/// </summary>
+	public void AddLink(Connection source, Connection destination)
+	{
+		if (source.IsInput)
+			(destination, source) = (source, destination);
+
+		var sourcePort = FindPort(source) ?? throw new InvalidOperationException($"No canvas port exists for {source.Parent.Name}.{source.Name}.");
+		var destinationPort = FindPort(destination) ?? throw new InvalidOperationException($"No canvas port exists for {destination.Parent.Name}.{destination.Name}.");
+		if (Diagram.Links.Any(link =>
+			(link.Source.Model as GraphPortModel)?.Connection == source &&
+			(link.Target.Model as GraphPortModel)?.Connection == destination))
+		{
+			return;
+		}
+
+		LinkModel link;
+		using (Synchronizer.SuppressConnectionUpdates())
+			link = Diagram.Links.Add(new LinkModel(new SinglePortAnchor(sourcePort), new SinglePortAnchor(destinationPort)));
+
+		ConfigureConnection(link, true);
+	}
+
+	/// <summary>
+	/// Removes a projected link if it still exists.
+	/// </summary>
+	public void RemoveLink(Connection source, Connection destination)
+	{
+		if (source.IsInput)
+			(destination, source) = (source, destination);
+
+		using var suppression = Synchronizer.SuppressConnectionUpdates();
+		var link = Diagram.Links.FirstOrDefault(candidate =>
+			(candidate.Source.Model as GraphPortModel)?.Connection == source &&
+			(candidate.Target.Model as GraphPortModel)?.Connection == destination);
+		if (link != null)
+			Diagram.Links.Remove(link);
+	}
+
+	/// <summary>
+	/// Recomputes the visual state of a changed domain connection and its links.
+	/// </summary>
+	public void RefreshConnection(Connection connection)
+	{
+		var port = FindPort(connection);
+		if (port == null)
+			return;
+
+		var color = GraphCanvas.GetTypeShapeColor(connection.Type, connection.Parent.TypeFactory);
+		foreach (var link in port.Links.Cast<LinkModel>())
+			link.Color = color;
+
+		port.Parent.Refresh();
+		Diagram.Refresh();
+	}
+
 	/// <summary>
 	/// Refreshes an existing projected node. Port topology is rebuilt only when the domain node's
 	/// inputs or outputs changed; otherwise the cheaper model refresh path is used.