Nodes - Support dynamic children in data model node

src/Artemis.Core/Models/Profile/DataBindings/DataBinding.cs

@@ -60,7 +60,7 @@ namespace Artemis.Core
             if (!IsEnabled)
                 return;
 
-            // TODO: Update the base node
+            // TODO: Update the 'base value' node
 
             Script.Run();
         }
@@ -77,7 +77,7 @@ namespace Artemis.Core
             if (_disposed)
                 throw new ObjectDisposedException("DataBinding");
             if (Properties.Any(d => d.DisplayName == displayName))
-                throw new ArtemisCoreException($"A databinding property named '{displayName}' is already registered.");
+                throw new ArtemisCoreException($"A data binding property named '{displayName}' is already registered.");
 
             DataBindingProperty<TProperty> property = new(getter, setter, displayName);
             _properties.Add(property);
@@ -110,6 +110,8 @@ namespace Artemis.Core
             if (disposing)
             {
                 _disposed = true;
+                _isEnabled = false;
+
                 Script.Dispose();
             }
         }

src/Artemis.Core/Models/Profile/DataModel/DataModelPath.cs

@@ -365,6 +365,31 @@ namespace Artemis.Core
             Entity.DataModelId = DataModelId;
         }
 
+        #region Equality members
+
+        /// <inheritdoc cref="Equals(object)"/>>
+        protected bool Equals(DataModelPath other)
+        {
+            return ReferenceEquals(Target, other.Target) && Path == other.Path;
+        }
+
+        /// <inheritdoc />
+        public override bool Equals(object? obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != this.GetType()) return false;
+            return Equals((DataModelPath) obj);
+        }
+
+        /// <inheritdoc />
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(Target, Path);
+        }
+
+        #endregion
+
         #endregion
     }
 }

src/Artemis.Core/Models/Profile/DataModel/DataModelPathSegment.cs

@@ -295,7 +295,10 @@ namespace Artemis.Core
         private void DynamicChildOnDynamicChildAdded(object? sender, DynamicDataModelChildEventArgs e)
         {
             if (e.Key == Identifier)
+            {
+                DataModelPath.Invalidate();
                 DataModelPath.Initialize();
+            }
         }
 
         private void DynamicChildOnDynamicChildRemoved(object? sender, DynamicDataModelChildEventArgs e)

src/Artemis.Core/Services/NodeService.cs

@@ -83,7 +83,7 @@ namespace Artemis.Core.Services
                     // ignored
                 }
             }
-            
+
             node.Initialize(script);
             return node;
         }

src/Artemis.Core/VisualScripting/Interfaces/INode.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using Artemis.Storage.Entities.Profile.Nodes;
 
 namespace Artemis.Core
 {
@@ -16,6 +17,7 @@ namespace Artemis.Core
 
         public IReadOnlyCollection<IPin> Pins { get; }
         public IReadOnlyCollection<IPinCollection> PinCollections { get; }
+        
 
         event EventHandler Resetting;
 

src/Artemis.Core/VisualScripting/NodeScript.cs

@@ -10,6 +10,14 @@ namespace Artemis.Core
 {
     public abstract class NodeScript : CorePropertyChanged, INodeScript, IStorageModel
     {
+        private void NodeTypeStoreOnNodeTypeChanged(object? sender, NodeTypeStoreEvent e)
+        {
+            Load();
+        }
+
+        public event EventHandler<INode>? NodeAdded;
+        public event EventHandler<INode>? NodeRemoved;
+
         #region Properties & Fields
 
         internal NodeScriptEntity Entity { get; }
@@ -28,21 +36,14 @@ namespace Artemis.Core
 
         #endregion
 
-        #region Events
-
-        public event EventHandler<INode>? NodeAdded;
-        public event EventHandler<INode>? NodeRemoved;
-
-        #endregion
-
         #region Constructors
 
         public NodeScript(string name, string description, object? context = null)
         {
-            this.Name = name;
-            this.Description = description;
-            this.Context = context;
-            this.Entity = new NodeScriptEntity();
+            Name = name;
+            Description = description;
+            Context = context;
+            Entity = new NodeScriptEntity();
 
             NodeTypeStore.NodeTypeAdded += NodeTypeStoreOnNodeTypeChanged;
             NodeTypeStore.NodeTypeRemoved += NodeTypeStoreOnNodeTypeChanged;
@@ -50,10 +51,10 @@ namespace Artemis.Core
 
         internal NodeScript(string name, string description, NodeScriptEntity entity, object? context = null)
         {
-            this.Name = name;
-            this.Description = description;
-            this.Entity = entity;
-            this.Context = context;
+            Name = name;
+            Description = description;
+            Entity = entity;
+            Context = context;
 
             NodeTypeStore.NodeTypeAdded += NodeTypeStoreOnNodeTypeChanged;
             NodeTypeStore.NodeTypeRemoved += NodeTypeStoreOnNodeTypeChanged;
@@ -89,6 +90,12 @@ namespace Artemis.Core
         {
             NodeTypeStore.NodeTypeAdded -= NodeTypeStoreOnNodeTypeChanged;
             NodeTypeStore.NodeTypeRemoved -= NodeTypeStoreOnNodeTypeChanged;
+
+            foreach (INode node in _nodes)
+            {
+                if (node is IDisposable disposable)
+                    disposable.Dispose();
+            }
         }
 
         #endregion
@@ -98,20 +105,18 @@ namespace Artemis.Core
         /// <inheritdoc />
         public void Load()
         {
+            _nodes.Clear();
+
             // Create nodes
-            Dictionary<int, INode> nodes = new();
             foreach (NodeEntity entityNode in Entity.Nodes)
             {
                 INode? node = LoadNode(entityNode, entityNode.IsExitNode ? ExitNode : null);
                 if (node == null)
                     continue;
-                nodes.Add(entityNode.Id, node);
+                _nodes.Add(node);
             }
 
-            LoadConnections(nodes);
-
-            _nodes.Clear();
-            _nodes.AddRange(nodes.Values);
+            LoadConnections();
         }
 
         private INode? LoadNode(NodeEntity nodeEntity, INode? node)
@@ -147,12 +152,19 @@ namespace Artemis.Core
             return node;
         }
 
-        private void LoadConnections(Dictionary<int, INode> nodes)
+        /// <summary>
+        ///     Loads missing connections between the nodes of this node script from the <see cref="Entity"/>
+        /// </summary>
+        public void LoadConnections()
         {
+            List<INode> nodes = Nodes.ToList();
             foreach (NodeConnectionEntity nodeConnectionEntity in Entity.Connections)
             {
-                // Find the source and target node
-                if (!nodes.TryGetValue(nodeConnectionEntity.SourceNode, out INode? source) || !nodes.TryGetValue(nodeConnectionEntity.TargetNode, out INode? target))
+                INode? source = nodes.ElementAtOrDefault(nodeConnectionEntity.SourceNode);
+                if (source == null)
+                    continue;
+                INode? target = nodes.ElementAtOrDefault(nodeConnectionEntity.TargetNode);
+                if (target == null)
                     continue;
 
                 IPin? sourcePin = nodeConnectionEntity.SourcePinCollectionId == -1
@@ -165,9 +177,15 @@ namespace Artemis.Core
                 // Ensure both nodes have the required pins
                 if (sourcePin == null || targetPin == null)
                     continue;
+                // Ensure the connection is valid
+                if (sourcePin.Direction == targetPin.Direction)
+                    continue;
 
-                targetPin.ConnectTo(sourcePin);
-                sourcePin.ConnectTo(targetPin);
+                // Only connect the nodes if they aren't already connected (LoadConnections may be called twice or more)
+                if (!targetPin.ConnectedTo.Contains(sourcePin))
+                    targetPin.ConnectTo(sourcePin);
+                if (!sourcePin.ConnectedTo.Contains(targetPin))
+                    sourcePin.ConnectTo(targetPin);
             }
         }
 
@@ -178,13 +196,12 @@ namespace Artemis.Core
             Entity.Description = Description;
 
             Entity.Nodes.Clear();
-            
+
             // No need to save the exit node if that's all there is
             if (Nodes.Count() == 1)
                 return;
 
             int id = 0;
-            
             foreach (INode node in Nodes)
             {
                 NodeEntity nodeEntity = new()
@@ -248,9 +265,11 @@ namespace Artemis.Core
                         targetPinId = targetCollection.ToList().IndexOf(targetPin);
                     }
                     else
+                    {
                         targetPinId = targetPin.Node.Pins.IndexOf(targetPin);
+                    }
 
-                    Entity.Connections.Add(new NodeConnectionEntity()
+                    Entity.Connections.Add(new NodeConnectionEntity
                     {
                         SourceType = sourcePin.Type.Name,
                         SourceNode = nodes.IndexOf(node),
@@ -259,7 +278,7 @@ namespace Artemis.Core
                         TargetType = targetPin.Type.Name,
                         TargetNode = nodes.IndexOf(targetPin.Node),
                         TargetPinCollectionId = targetPinCollectionId,
-                        TargetPinId = targetPinId,
+                        TargetPinId = targetPinId
                     });
                 }
 
@@ -268,15 +287,6 @@ namespace Artemis.Core
         }
 
         #endregion
-
-        #region Event handlers
-
-        private void NodeTypeStoreOnNodeTypeChanged(object? sender, NodeTypeStoreEvent e)
-        {
-            Load();
-        }
-
-        #endregion
     }
 
     public class NodeScript<T> : NodeScript, INodeScript<T>