Merge branch 'development' into feature/cpm

src/Artemis.Core/DryIoc/ContainerExtensions.cs

@@ -5,7 +5,7 @@ using Artemis.Core.DryIoc.Factories;
 using Artemis.Core.Providers;
 using Artemis.Core.Services;
 using Artemis.Storage;
-using Artemis.Storage.Migrations.Interfaces;
+using Artemis.Storage.Migrations;
 using Artemis.Storage.Repositories.Interfaces;
 using DryIoc;
 
@@ -36,6 +36,7 @@ public static class ContainerExtensions
 
         // Bind migrations
         container.RegisterMany(storageAssembly, type => type.IsAssignableTo<IStorageMigration>(), Reuse.Singleton, nonPublicServiceTypes: true);
+        container.RegisterMany(storageAssembly, type => type.IsAssignableTo<IProfileMigration>(), Reuse.Singleton, nonPublicServiceTypes: true);
         
         container.RegisterMany(coreAssembly, type => type.IsAssignableTo<ILayoutProvider>(), Reuse.Singleton);
         container.Register<IPluginSettingsFactory, PluginSettingsFactory>(Reuse.Singleton);

src/Artemis.Core/Models/Profile/Layer.cs

@@ -248,8 +248,8 @@ public sealed class Layer : RenderProfileElement
             typeof(PropertyGroupDescriptionAttribute)
         )!;
 
-        LayerEntity.GeneralPropertyGroup ??= new PropertyGroupEntity {Identifier = generalAttribute.Identifier};
-        LayerEntity.TransformPropertyGroup ??= new PropertyGroupEntity {Identifier = transformAttribute.Identifier};
+        LayerEntity.GeneralPropertyGroup ??= new PropertyGroupEntity {Identifier = generalAttribute.Identifier!};
+        LayerEntity.TransformPropertyGroup ??= new PropertyGroupEntity {Identifier = transformAttribute.Identifier!};
 
         General.Initialize(this, null, generalAttribute, LayerEntity.GeneralPropertyGroup);
         Transform.Initialize(this, null, transformAttribute, LayerEntity.TransformPropertyGroup);

src/Artemis.Core/Models/Profile/LayerPropertyGroup.cs

@@ -240,7 +240,8 @@ public abstract class LayerPropertyGroup : IDisposable
         foreach (LayerPropertyGroup layerPropertyGroup in LayerPropertyGroups)
         {
             layerPropertyGroup.ApplyToEntity();
-            PropertyGroupEntity.PropertyGroups.Add(layerPropertyGroup.PropertyGroupEntity);
+            if (layerPropertyGroup.PropertyGroupEntity != null)
+                PropertyGroupEntity.PropertyGroups.Add(layerPropertyGroup.PropertyGroupEntity);
         }
     }
 

src/Artemis.Core/Models/Surface/ArtemisDevice.cs

@@ -46,7 +46,7 @@ public class ArtemisDevice : CorePropertyChanged
         InputIdentifiers = new List<ArtemisDeviceInputIdentifier>();
         InputMappings = new Dictionary<ArtemisLed, ArtemisLed>();
         Categories = new HashSet<DeviceCategory>();
-        LayoutSelection = new LayoutSelection {Type = DefaultLayoutProvider.LayoutType};
+        LayoutSelection = new LayoutSelection {Type = DefaultLayoutProvider.LAYOUT_TYPE};
 
         RgbDevice.ColorCorrections.Clear();
         RgbDevice.ColorCorrections.Add(new ScaleColorCorrection(this));
@@ -75,7 +75,7 @@ public class ArtemisDevice : CorePropertyChanged
         InputIdentifiers = new List<ArtemisDeviceInputIdentifier>();
         InputMappings = new Dictionary<ArtemisLed, ArtemisLed>();
         Categories = new HashSet<DeviceCategory>();
-        LayoutSelection = new LayoutSelection {Type = DefaultLayoutProvider.LayoutType};
+        LayoutSelection = new LayoutSelection {Type = DefaultLayoutProvider.LAYOUT_TYPE};
 
         foreach (DeviceInputIdentifierEntity identifierEntity in DeviceEntity.InputIdentifiers)
             InputIdentifiers.Add(new ArtemisDeviceInputIdentifier(identifierEntity.InputProvider, identifierEntity.Identifier));
@@ -155,6 +155,9 @@ public class ArtemisDevice : CorePropertyChanged
     /// </summary>
     public HashSet<DeviceCategory> Categories { get; }
 
+    /// <summary>
+    ///     Gets the layout selection applied to this device
+    /// </summary>
     public LayoutSelection LayoutSelection { get; }
 
     /// <summary>

src/Artemis.Core/Models/Surface/Layout/ArtemisLayout.cs

@@ -57,6 +57,9 @@ public class ArtemisLayout
     /// </summary>
     public LayoutCustomDeviceData LayoutCustomDeviceData { get; private set; } = null!;
 
+    /// <summary>
+    ///     Gets a boolean indicating whether this layout is a default layout or not
+    /// </summary>
     public bool IsDefaultLayout { get; private set; }
 
     /// <summary>

src/Artemis.Core/Plugins/LayerBrushes/LayerBrushDescriptor.cs

@@ -65,7 +65,7 @@ public class LayerBrushDescriptor
         BaseLayerBrush brush = (BaseLayerBrush) Provider.Plugin.Resolve(LayerBrushType);
         brush.Layer = layer;
         brush.Descriptor = this;
-        brush.LayerBrushEntity = entity ?? new LayerBrushEntity {ProviderId = Provider.Id, BrushType = LayerBrushType.FullName};
+        brush.LayerBrushEntity = entity ?? new LayerBrushEntity {ProviderId = Provider.Id, BrushType = LayerBrushType.FullName ?? throw new InvalidOperationException()};
 
         brush.Initialize();
         return brush;

src/Artemis.Core/Plugins/LayerEffects/Internal/BaseLayerEffect.cs

@@ -231,7 +231,7 @@ public abstract class BaseLayerEffect : BreakableModel, IDisposable, IStorageMod
             return;
 
         LayerEffectEntity.ProviderId = Descriptor.Provider.Id;
-        LayerEffectEntity.EffectType = GetType().FullName;
+        LayerEffectEntity.EffectType = GetType().FullName ?? throw new InvalidOperationException();
         BaseProperties?.ApplyToEntity();
         LayerEffectEntity.PropertyGroup = BaseProperties?.PropertyGroupEntity;
     }

src/Artemis.Core/Plugins/Nodes/NodeProvider.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Reflection;
+using SkiaSharp;
+
+namespace Artemis.Core.Nodes;
+
+/// <summary>
+///     Allows you to register one or more <see cref="INode" />s usable by node scripts.
+/// </summary>
+public abstract class NodeProvider : PluginFeature
+{
+    private readonly List<NodeData> _nodeDescriptors;
+
+    /// <summary>
+    /// Creates a new instance of the <see cref="NodeProvider"/> class.
+    /// </summary>
+    public NodeProvider()
+    {
+        _nodeDescriptors = new List<NodeData>();
+        NodeDescriptors = new ReadOnlyCollection<NodeData>(_nodeDescriptors);
+        Disabled += OnDisabled;
+    }
+
+    /// <summary>
+    ///     A read-only collection of all nodes added with <see cref="RegisterNodeType{T}" />
+    /// </summary>
+    public ReadOnlyCollection<NodeData> NodeDescriptors { get; set; }
+
+    /// <summary>
+    ///     Adds a node descriptor for a given node, so that it appears in the UI.
+    ///     <para>Note: You do not need to manually remove these on disable</para>
+    /// </summary>
+    /// <typeparam name="T">The type of the node you wish to register</typeparam>
+    protected void RegisterNodeType<T>() where T : INode
+    {
+        RegisterNodeType(typeof(T));
+    }
+    
+    /// <summary>
+    ///     Adds a node descriptor for a given node, so that it appears in the UI.
+    ///     <para>Note: You do not need to manually remove these on disable</para>
+    /// </summary>
+    /// <param name="nodeType">The type of the node you wish to register</param>
+    protected void RegisterNodeType(Type nodeType)
+    {
+        if (!IsEnabled)
+            throw new ArtemisPluginFeatureException(this, "Can only add a node descriptor when the plugin is enabled");
+        if (nodeType == null)
+            throw new ArgumentNullException(nameof(nodeType));
+        if (!nodeType.IsAssignableTo(typeof(INode))) 
+            throw new ArgumentException("Node has to be a base type of the Node-Type.", nameof(nodeType));
+
+        NodeAttribute? nodeAttribute = nodeType.GetCustomAttribute<NodeAttribute>();
+        string name = nodeAttribute?.Name ?? nodeType.Name;
+        string description = nodeAttribute?.Description ?? string.Empty;
+        string category = nodeAttribute?.Category ?? string.Empty;
+        string helpUrl = nodeAttribute?.HelpUrl ?? string.Empty;
+        
+        NodeData nodeData = new(this, nodeType, name, description, category, helpUrl, nodeAttribute?.InputType, nodeAttribute?.OutputType);
+        _nodeDescriptors.Add(nodeData);
+        NodeTypeStore.Add(nodeData);
+    }
+    
+    /// <summary>
+    /// Adds a color for lines of the provided type.
+    /// </summary>
+    /// <param name="color">The color to add.</param>
+    /// <typeparam name="T">The type to use the color for.</typeparam>
+    protected TypeColorRegistration RegisterTypeColor<T>(SKColor color)
+    {
+        return NodeTypeStore.AddColor(typeof(T), color, this);
+    }
+    
+    private void OnDisabled(object? sender, EventArgs e)
+    {
+        // The store will clean up the registrations by itself, the plugin feature just needs to clear its own list
+        _nodeDescriptors.Clear();
+    }
+}

src/Artemis.Core/Plugins/Settings/PluginSettings.cs

@@ -41,7 +41,7 @@ public class PluginSettings
             if (_settingEntities.ContainsKey(name))
                 return (PluginSetting<T>) _settingEntities[name];
             // Try to find in database
-            PluginSettingEntity settingEntity = _pluginRepository.GetSettingByNameAndGuid(name, Plugin.Guid);
+            PluginSettingEntity? settingEntity = _pluginRepository.GetSettingByNameAndGuid(name, Plugin.Guid);
             // If not found, create a new one
             if (settingEntity == null)
             {

src/Artemis.Core/Providers/CustomPathLayoutProvider.cs

@@ -1,8 +1,14 @@
 namespace Artemis.Core.Providers;
 
+/// <summary>
+/// Represents a layout provider that loads a layout from a custom path.
+/// </summary>
 public class CustomPathLayoutProvider : ILayoutProvider
 {
-    public static string LayoutType = "CustomPath";
+    /// <summary>
+    /// The layout type of this layout provider.
+    /// </summary>
+    public const string LAYOUT_TYPE = "CustomPath";
 
     /// <inheritdoc />
     public ArtemisLayout? GetDeviceLayout(ArtemisDevice device)
@@ -21,7 +27,7 @@ public class CustomPathLayoutProvider : ILayoutProvider
     /// <inheritdoc />
     public bool IsMatch(ArtemisDevice device)
     {
-        return device.LayoutSelection.Type == LayoutType;
+        return device.LayoutSelection.Type == LAYOUT_TYPE;
     }
 
     /// <summary>
@@ -31,7 +37,7 @@ public class CustomPathLayoutProvider : ILayoutProvider
     /// <param name="path">The path to the custom layout.</param>
     public void ConfigureDevice(ArtemisDevice device, string? path)
     {
-        device.LayoutSelection.Type = LayoutType;
+        device.LayoutSelection.Type = LAYOUT_TYPE;
         device.LayoutSelection.Parameter = path;
     }
 }

src/Artemis.Core/Providers/DefaultLayoutProvider.cs

@@ -1,8 +1,14 @@
 namespace Artemis.Core.Providers;
 
+/// <summary>
+/// Represents a layout provider that loads a layout from the plugin and falls back to a default layout.
+/// </summary>
 public class DefaultLayoutProvider : ILayoutProvider
 {
-    public static string LayoutType = "Default";
+    /// <summary>
+    /// The layout type of this layout provider.
+    /// </summary>
+    public const string LAYOUT_TYPE = "Default";
 
     /// <inheritdoc />
     public ArtemisLayout? GetDeviceLayout(ArtemisDevice device)
@@ -26,7 +32,7 @@ public class DefaultLayoutProvider : ILayoutProvider
     /// <inheritdoc />
     public bool IsMatch(ArtemisDevice device)
     {
-        return device.LayoutSelection.Type == LayoutType;
+        return device.LayoutSelection.Type == LAYOUT_TYPE;
     }
 
     /// <summary>
@@ -35,7 +41,7 @@ public class DefaultLayoutProvider : ILayoutProvider
     /// <param name="device">The device to apply the provider to.</param>
     public void ConfigureDevice(ArtemisDevice device)
     {
-        device.LayoutSelection.Type = LayoutType;
+        device.LayoutSelection.Type = LAYOUT_TYPE;
         device.LayoutSelection.Parameter = null;
     }
 }

src/Artemis.Core/Providers/Interfaces/ILayoutProvider.cs

@@ -12,6 +12,17 @@ public interface ILayoutProvider
     /// <returns>The resulting layout if one was available; otherwise <see langword="null" />.</returns>
     ArtemisLayout? GetDeviceLayout(ArtemisDevice device);
 
+    /// <summary>
+    /// Applies the layout to the provided device.
+    /// </summary>
+    /// <param name="device">The device to apply to.</param>
+    /// <param name="layout">The layout to apply.</param>
     void ApplyLayout(ArtemisDevice device, ArtemisLayout layout);
+
+    /// <summary>
+    /// Determines whether the provided device is configured to use this layout provider.
+    /// </summary>
+    /// <param name="device">The device to check.</param>
+    /// <returns>A value indicating whether the provided device is configured to use this layout provider.</returns>
     bool IsMatch(ArtemisDevice device);
 }

src/Artemis.Core/Providers/NoneLayoutProvider.cs

@@ -1,8 +1,14 @@
 namespace Artemis.Core.Providers;
 
+/// <summary>
+/// Represents a layout provider that does not load a layout.
+/// </summary>
 public class NoneLayoutProvider : ILayoutProvider
 {
-    public static string LayoutType = "None";
+    /// <summary>
+    /// The layout type of this layout provider.
+    /// </summary>
+    public const string LAYOUT_TYPE = "None";
 
     /// <inheritdoc />
     public ArtemisLayout? GetDeviceLayout(ArtemisDevice device)
@@ -19,7 +25,7 @@ public class NoneLayoutProvider : ILayoutProvider
     /// <inheritdoc />
     public bool IsMatch(ArtemisDevice device)
     {
-        return device.LayoutSelection.Type == LayoutType;
+        return device.LayoutSelection.Type == LAYOUT_TYPE;
     }
 
     /// <summary>
@@ -28,7 +34,7 @@ public class NoneLayoutProvider : ILayoutProvider
     /// <param name="device">The device to apply the provider to.</param>
     public void ConfigureDevice(ArtemisDevice device)
     {
-        device.LayoutSelection.Type = LayoutType;
+        device.LayoutSelection.Type = LAYOUT_TYPE;
         device.LayoutSelection.Parameter = null;
     }
 }

src/Artemis.Core/Services/NodeService.cs

@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using System.Security.Cryptography;
 using System.Text;
 using Artemis.Storage.Entities.Profile.Nodes;
-using DryIoc;
 using Newtonsoft.Json;
 using SkiaSharp;
 
@@ -13,31 +11,8 @@ namespace Artemis.Core.Services;
 
 internal class NodeService : INodeService
 {
-    #region Constants
-
-    private static readonly Type TypeNode = typeof(INode);
-
-    #endregion
-
-    private readonly IContainer _container;
-
-    #region Constructors
-
-    public NodeService(IContainer container)
-    {
-        _container = container;
-    }
-
-    #endregion
-
-    #region Properties & Fields
-
     public IEnumerable<NodeData> AvailableNodes => NodeTypeStore.GetAll();
 
-    #endregion
-
-    #region Methods
-
     /// <inheritdoc />
     public List<Type> GetRegisteredTypes()
     {
@@ -53,7 +28,7 @@ internal class NodeService : INodeService
 
         // Objects represent an input that can take any type, these are hardcoded white
         if (type == typeof(object))
-            return new TypeColorRegistration(type, new SKColor(255, 255, 255, 255), Constants.CorePlugin);
+            return new TypeColorRegistration(type, new SKColor(255, 255, 255, 255), Constants.CorePluginFeature);
 
         // Come up with a random color based on the type name that should be the same each time
         MD5 md5Hasher = MD5.Create();
@@ -61,32 +36,7 @@ internal class NodeService : INodeService
         int hash = BitConverter.ToInt32(hashed, 0);
 
         SKColor baseColor = SKColor.FromHsl(hash % 255, 50 + hash % 50, 50);
-        return new TypeColorRegistration(type, baseColor, Constants.CorePlugin);
-    }
-
-    public NodeTypeRegistration RegisterNodeType(Plugin plugin, Type nodeType)
-    {
-        if (plugin == null) throw new ArgumentNullException(nameof(plugin));
-        if (nodeType == null) throw new ArgumentNullException(nameof(nodeType));
-
-        if (!TypeNode.IsAssignableFrom(nodeType)) throw new ArgumentException("Node has to be a base type of the Node-Type.", nameof(nodeType));
-
-        NodeAttribute? nodeAttribute = nodeType.GetCustomAttribute<NodeAttribute>();
-        string name = nodeAttribute?.Name ?? nodeType.Name;
-        string description = nodeAttribute?.Description ?? string.Empty;
-        string category = nodeAttribute?.Category ?? string.Empty;
-        string helpUrl = nodeAttribute?.HelpUrl ?? string.Empty;
-        
-        NodeData nodeData = new(plugin, nodeType, name, description, category, helpUrl, nodeAttribute?.InputType, nodeAttribute?.OutputType, (s, e) => CreateNode(s, e, nodeType));
-        return NodeTypeStore.Add(nodeData);
-    }
-
-    public TypeColorRegistration RegisterTypeColor(Plugin plugin, Type type, SKColor color)
-    {
-        if (plugin == null) throw new ArgumentNullException(nameof(plugin));
-        if (type == null) throw new ArgumentNullException(nameof(type));
-
-        return NodeTypeStore.AddColor(type, color, plugin);
+        return new TypeColorRegistration(type, baseColor, Constants.CorePluginFeature);
     }
 
     public string ExportScript(NodeScript nodeScript)
@@ -103,33 +53,6 @@ internal class NodeService : INodeService
 
         target.LoadFromEntity(entity);
     }
-
-    private INode CreateNode(INodeScript script, NodeEntity? entity, Type nodeType)
-    {
-        INode node = _container.Resolve(nodeType) as INode ?? throw new InvalidOperationException($"Node {nodeType} is not an INode");
-        if (node is Node concreteNode)
-            concreteNode.Container = _container;
-        
-        if (entity != null)
-        {
-            node.X = entity.X;
-            node.Y = entity.Y;
-            try
-            {
-                if (node is Node nodeImplementation)
-                    nodeImplementation.DeserializeStorage(entity.Storage);
-            }
-            catch
-            {
-                // ignored
-            }
-        }
-
-        node.TryInitialize(script);
-        return node;
-    }
-
-    #endregion
 }
 
 /// <summary>
@@ -153,21 +76,6 @@ public interface INodeService : IArtemisService
     /// </summary>
     TypeColorRegistration GetTypeColorRegistration(Type type);
 
-    /// <summary>
-    ///     Registers a node of the provided <paramref name="nodeType" />
-    /// </summary>
-    /// <param name="plugin">The plugin the node belongs to</param>
-    /// <param name="nodeType">The type of node to initialize</param>
-    NodeTypeRegistration RegisterNodeType(Plugin plugin, Type nodeType);
-
-    /// <summary>
-    ///     Registers a type with a provided color for use in the node editor
-    /// </summary>
-    /// <param name="plugin">The plugin making the registration</param>
-    /// <param name="type">The type to associate the color with</param>
-    /// <param name="color">The color to display</param>
-    TypeColorRegistration RegisterTypeColor(Plugin plugin, Type type, SKColor color);
-
     /// <summary>
     ///     Exports the provided node script to JSON.
     /// </summary>

src/Artemis.Core/Services/ProcessMonitoring/ProcessMonitor.cs

@@ -7,6 +7,9 @@ using System.Threading;
 
 namespace Artemis.Core.Services;
 
+/// <summary>
+/// Represents a monitor that efficiently keeps track of running processes.
+/// </summary>
 public static partial class ProcessMonitor
 {
     #region Properties & Fields
@@ -15,8 +18,11 @@ public static partial class ProcessMonitor
 
     private static Timer? _timer;
 
-    private static Dictionary<int, ProcessInfo> _processes = new();
+    private static readonly Dictionary<int, ProcessInfo> _processes = new();
 
+    /// <summary>
+    /// Gets an immutable array of the current processes.
+    /// </summary>
     public static ImmutableArray<ProcessInfo> Processes
     {
         get
@@ -25,9 +31,17 @@ public static partial class ProcessMonitor
                 return _processes.Values.ToImmutableArray();
         }
     }
+
+    /// <summary>
+    /// Gets the date time at which the last update took place.
+    /// </summary>
     public static DateTime LastUpdate { get; private set; }
 
     private static TimeSpan _updateInterval = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// Gets or sets the interval at which to update the list of processes.
+    /// </summary>
     public static TimeSpan UpdateInterval
     {
         get => _updateInterval;
@@ -40,6 +54,9 @@ public static partial class ProcessMonitor
         }
     }
 
+    /// <summary>
+    /// Gets a value indicating whether the monitoring has started.
+    /// </summary>
     public static bool IsStarted
     {
         get
@@ -53,7 +70,14 @@ public static partial class ProcessMonitor
 
     #region Events
 
+    /// <summary>
+    /// Occurs when a new process is started.
+    /// </summary>
     public static event EventHandler<ProcessEventArgs>? ProcessStarted;
+
+    /// <summary>
+    /// Occurs when a process is stopped.
+    /// </summary>
     public static event EventHandler<ProcessEventArgs>? ProcessStopped;
 
     #endregion
@@ -69,6 +93,9 @@ public static partial class ProcessMonitor
 
     #region Methods
 
+    /// <summary>
+    /// Starts monitoring processes.
+    /// </summary>
     public static void Start()
     {
         lock (LOCK)
@@ -87,6 +114,9 @@ public static partial class ProcessMonitor
         }
     }
 
+    /// <summary>
+    /// Stops monitoring processes.
+    /// </summary>
     public static void Stop()
     {
         lock (LOCK)
@@ -100,7 +130,7 @@ public static partial class ProcessMonitor
                 FreeBuffer();
         }
     }
-    
+
     /// <summary>
     ///     Returns whether the specified process is running
     /// </summary>
@@ -111,7 +141,7 @@ public static partial class ProcessMonitor
     {
         if (!IsStarted || (processName == null && processLocation == null))
             return false;
-        
+
         lock (LOCK)
         {
             return _processes.Values.Any(x => IsProcessRunning(x, processName, processLocation));
@@ -130,19 +160,19 @@ public static partial class ProcessMonitor
                 OnProcessStopped(info);
             }
     }
-        
+
     private static bool IsProcessRunning(ProcessInfo info, string? processName, string? processLocation)
     {
         if (processName != null && processLocation != null)
             return string.Equals(info.ProcessName, processName, StringComparison.InvariantCultureIgnoreCase) &&
                    string.Equals(Path.GetDirectoryName(info.Executable), processLocation, StringComparison.InvariantCultureIgnoreCase);
-        
+
         if (processName != null)
             return string.Equals(info.ProcessName, processName, StringComparison.InvariantCultureIgnoreCase);
-        
+
         if (processLocation != null)
             return string.Equals(Path.GetDirectoryName(info.Executable), processLocation, StringComparison.InvariantCultureIgnoreCase);
-        
+
         return false;
     }
 
@@ -152,7 +182,10 @@ public static partial class ProcessMonitor
         {
             ProcessStarted?.Invoke(null, new ProcessEventArgs(processInfo));
         }
-        catch { /* Subscribers are idiots! */ }
+        catch
+        {
+            /* Subscribers are idiots! */
+        }
     }
 
     private static void OnProcessStopped(ProcessInfo processInfo)
@@ -161,7 +194,10 @@ public static partial class ProcessMonitor
         {
             ProcessStopped?.Invoke(null, new ProcessEventArgs(processInfo));
         }
-        catch { /* Subscribers are idiots! */ }
+        catch
+        {
+            /* Subscribers are idiots! */
+        }
     }
 
     #endregion

src/Artemis.Core/Services/Registration/LayerBrushService.cs

@@ -42,6 +42,7 @@ internal class LayerBrushService : ILayerBrushService
             BrushType = "SolidBrush"
         });
 
+        defaultReference.Value ??= new LayerBrushReference();
         defaultReference.Value.LayerBrushProviderId ??= "Artemis.Plugins.LayerBrushes.Color.ColorBrushProvider-92a9d6ba";
         defaultReference.Value.BrushType ??= "SolidBrush";
         return LayerBrushStore.Get(defaultReference.Value.LayerBrushProviderId, defaultReference.Value.BrushType)?.LayerBrushDescriptor;

src/Artemis.Core/Services/Storage/ProfileService.cs

@@ -8,8 +8,10 @@ using System.Text;
 using System.Threading.Tasks;
 using Artemis.Core.Modules;
 using Artemis.Storage.Entities.Profile;
+using Artemis.Storage.Migrations;
 using Artemis.Storage.Repositories.Interfaces;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Serilog;
 using SkiaSharp;
 
@@ -24,9 +26,10 @@ internal class ProfileService : IProfileService
     private readonly List<ArtemisKeyboardKeyEventArgs> _pendingKeyboardEvents = new();
     private readonly List<ProfileCategory> _profileCategories;
     private readonly IProfileRepository _profileRepository;
+    private readonly List<IProfileMigration> _profileMigrators;
     private readonly List<Exception> _renderExceptions = new();
     private readonly List<Exception> _updateExceptions = new();
-    
+
     private DateTime _lastRenderExceptionLog;
     private DateTime _lastUpdateExceptionLog;
 
@@ -35,13 +38,15 @@ internal class ProfileService : IProfileService
         IPluginManagementService pluginManagementService,
         IInputService inputService,
         IDeviceService deviceService,
-        IProfileRepository profileRepository)
+        IProfileRepository profileRepository,
+        List<IProfileMigration> profileMigrators)
     {
         _logger = logger;
         _profileCategoryRepository = profileCategoryRepository;
         _pluginManagementService = pluginManagementService;
         _deviceService = deviceService;
         _profileRepository = profileRepository;
+        _profileMigrators = profileMigrators;
         _profileCategories = new List<ProfileCategory>(_profileCategoryRepository.GetAll().Select(c => new ProfileCategory(c)).OrderBy(c => c.Order));
 
         _deviceService.LedsChanged += DeviceServiceOnLedsChanged;
@@ -58,7 +63,7 @@ internal class ProfileService : IProfileService
     public ProfileConfiguration? FocusProfile { get; set; }
     public ProfileElement? FocusProfileElement { get; set; }
     public bool UpdateFocusProfile { get; set; }
-    
+
     public bool ProfileRenderingDisabled { get; set; }
 
     /// <inheritdoc />
@@ -221,7 +226,7 @@ internal class ProfileService : IProfileService
             return profileConfiguration.Profile;
         }
 
-        ProfileEntity profileEntity;
+        ProfileEntity? profileEntity;
         try
         {
             profileEntity = _profileRepository.Get(profileConfiguration.Entity.ProfileId);
@@ -280,7 +285,7 @@ internal class ProfileService : IProfileService
     {
         DeactivateProfile(profileConfiguration);
 
-        ProfileEntity profileEntity = _profileRepository.Get(profileConfiguration.Entity.ProfileId);
+        ProfileEntity? profileEntity = _profileRepository.Get(profileConfiguration.Entity.ProfileId);
         if (profileEntity == null)
             return;
 
@@ -353,7 +358,7 @@ internal class ProfileService : IProfileService
 
         DeactivateProfile(profileConfiguration);
         SaveProfileCategory(profileConfiguration.Category);
-        ProfileEntity profileEntity = _profileRepository.Get(profileConfiguration.Entity.ProfileId);
+        ProfileEntity? profileEntity = _profileRepository.Get(profileConfiguration.Entity.ProfileId);
         if (profileEntity != null)
             _profileRepository.Remove(profileEntity);
 
@@ -461,7 +466,12 @@ internal class ProfileService : IProfileService
 
         await using Stream profileStream = profileEntry.Open();
         using StreamReader profileReader = new(profileStream);
-        ProfileEntity? profileEntity = JsonConvert.DeserializeObject<ProfileEntity>(await profileReader.ReadToEndAsync(), IProfileService.ExportSettings);
+        JObject? profileJson = JsonConvert.DeserializeObject<JObject>(await profileReader.ReadToEndAsync(), IProfileService.ExportSettings);
+
+        // Before deserializing, apply any pending migrations
+        MigrateProfile(configurationEntity, profileJson);
+
+        ProfileEntity? profileEntity = profileJson?.ToObject<ProfileEntity>(JsonSerializer.Create(IProfileService.ExportSettings));
         if (profileEntity == null)
             throw new ArtemisCoreException("Could not import profile, failed to deserialize profile.json");
 
@@ -514,10 +524,10 @@ internal class ProfileService : IProfileService
     public async Task<ProfileConfiguration> OverwriteProfile(MemoryStream archiveStream, ProfileConfiguration profileConfiguration)
     {
         ProfileConfiguration imported = await ImportProfile(archiveStream, profileConfiguration.Category, true, true, null, profileConfiguration.Order + 1);
-        
+
         DeleteProfile(profileConfiguration);
         SaveProfileCategory(imported.Category);
-        
+
         return imported;
     }
 
@@ -545,6 +555,21 @@ internal class ProfileService : IProfileService
         }
     }
 
+    private void MigrateProfile(ProfileConfigurationEntity configurationEntity, JObject? profileJson)
+    {
+        if (profileJson == null)
+            return;
+
+        foreach (IProfileMigration profileMigrator in _profileMigrators.OrderBy(m => m.Version))
+        {
+            if (profileMigrator.Version <= configurationEntity.Version)
+                continue;
+
+            profileMigrator.Migrate(profileJson);
+            configurationEntity.Version = profileMigrator.Version;
+        }
+    }
+
     /// <summary>
     ///     Populates all missing LEDs on all currently active profiles
     /// </summary>

src/Artemis.Core/Services/WebServer/Interfaces/IWebServerService.cs

@@ -100,7 +100,7 @@ public interface IWebServerService : IArtemisService
     /// <summary>
     ///     Removes an existing Web API controller and restarts the web server
     /// </summary>
-    /// <typeparam name="T">The type of Web API controller to remove</typeparam>
+    /// <param name="registration">The registration of the controller to remove.</param>
     void RemoveController(WebApiControllerRegistration registration);
 
     /// <summary>

src/Artemis.Core/Stores/NodeTypeStore.cs

@@ -13,16 +13,13 @@ internal class NodeTypeStore
 
     public static NodeTypeRegistration Add(NodeData nodeData)
     {
-        if (nodeData.Plugin == null)
-            throw new ArtemisCoreException("Cannot add a data binding modifier type that is not associated with a plugin");
-
         NodeTypeRegistration typeRegistration;
         lock (Registrations)
         {
             if (Registrations.Any(r => r.NodeData == nodeData))
                 throw new ArtemisCoreException($"Data binding modifier type store already contains modifier '{nodeData.Name}'");
 
-            typeRegistration = new NodeTypeRegistration(nodeData, nodeData.Plugin) {IsInStore = true};
+            typeRegistration = new NodeTypeRegistration(nodeData, nodeData.Provider) {IsInStore = true};
             Registrations.Add(typeRegistration);
         }
 
@@ -60,24 +57,12 @@ internal class NodeTypeStore
         }
     }
 
-    public static Plugin? GetPlugin(INode node)
-    {
-        Type nodeType = node.GetType();
-        lock (Registrations)
-        {
-            return Registrations.FirstOrDefault(r => r.NodeData.Type == nodeType)?.Plugin;
-        }
-    }
-
-    public static TypeColorRegistration AddColor(Type type, SKColor color, Plugin plugin)
+    public static TypeColorRegistration AddColor(Type type, SKColor color, PluginFeature pluginFeature)
     {
         TypeColorRegistration typeColorRegistration;
         lock (ColorRegistrations)
         {
-            if (ColorRegistrations.Any(r => r.Type == type))
-                throw new ArtemisCoreException($"Node color store already contains a color for '{type.Name}'");
-
-            typeColorRegistration = new TypeColorRegistration(type, color, plugin) {IsInStore = true};
+            typeColorRegistration = new TypeColorRegistration(type, color, pluginFeature) {IsInStore = true};
             ColorRegistrations.Add(typeColorRegistration);
         }
 

src/Artemis.Core/Stores/Registrations/NodeTypeRegistration.cs

@@ -9,12 +9,12 @@ namespace Artemis.Core;
 /// </summary>
 public class NodeTypeRegistration
 {
-    internal NodeTypeRegistration(NodeData nodeData, Plugin plugin)
+    internal NodeTypeRegistration(NodeData nodeData, PluginFeature pluginFeature)
     {
         NodeData = nodeData;
-        Plugin = plugin;
+        PluginFeature = pluginFeature;
 
-        Plugin.Disabled += OnDisabled;
+        PluginFeature.Disabled += OnDisabled;
     }
 
     /// <summary>
@@ -23,9 +23,9 @@ public class NodeTypeRegistration
     public NodeData NodeData { get; }
 
     /// <summary>
-    ///     Gets the plugin the node is associated with
+    ///     Gets the plugin feature the node is associated with
     /// </summary>
-    public Plugin Plugin { get; }
+    public PluginFeature PluginFeature { get; }
 
     /// <summary>
     ///     Gets a boolean indicating whether the registration is in the internal Core store
@@ -39,12 +39,12 @@ public class NodeTypeRegistration
     /// <returns><see langword="true" /> if the entity matches this registration; otherwise <see langword="false" />.</returns>
     public bool MatchesEntity(NodeEntity entity)
     {
-        return Plugin.Guid == entity.PluginId && NodeData.Type.Name == entity.Type;
+        return PluginFeature.Id == entity.ProviderId && NodeData.Type.Name == entity.Type;
     }
 
     private void OnDisabled(object? sender, EventArgs e)
     {
-        Plugin.Disabled -= OnDisabled;
+        PluginFeature.Disabled -= OnDisabled;
         if (IsInStore)
             NodeTypeStore.Remove(this);
     }
@@ -55,13 +55,13 @@ public class NodeTypeRegistration
 /// </summary>
 public class TypeColorRegistration
 {
-    internal TypeColorRegistration(Type type, SKColor color, Plugin plugin)
+    internal TypeColorRegistration(Type type, SKColor color, PluginFeature pluginFeature)
     {
         Type = type;
         Color = color;
-        Plugin = plugin;
+        PluginFeature = pluginFeature;
 
-        Plugin.Disabled += OnDisabled;
+        PluginFeature.Disabled += OnDisabled;
     }
 
     /// <summary>
@@ -80,9 +80,9 @@ public class TypeColorRegistration
     public SKColor DarkenedColor => Color.Darken(0.35f);
 
     /// <summary>
-    ///     Gets the plugin type color is associated with
+    ///     Gets the plugin feature this type color is associated with
     /// </summary>
-    public Plugin Plugin { get; }
+    public PluginFeature PluginFeature { get; }
 
     /// <summary>
     ///     Gets a boolean indicating whether the registration is in the internal Core store
@@ -91,7 +91,7 @@ public class TypeColorRegistration
 
     private void OnDisabled(object? sender, EventArgs e)
     {
-        Plugin.Disabled -= OnDisabled;
+        PluginFeature.Disabled -= OnDisabled;
         if (IsInStore)
             NodeTypeStore.RemoveColor(this);
     }

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

@@ -14,6 +14,11 @@ public interface INode : INotifyPropertyChanged, IBreakableModel
     ///     Gets or sets the ID of the node.
     /// </summary>
     Guid Id { get; set; }
+    
+    /// <summary>
+    ///     Gets or sets the node data with information about this node
+    /// </summary>
+    NodeData? NodeData { get; set; }
 
     /// <summary>
     ///     Gets the name of the node

src/Artemis.Core/VisualScripting/NodeData.cs

@@ -1,4 +1,5 @@
 using System;
+using Artemis.Core.Nodes;
 using Artemis.Storage.Entities.Profile.Nodes;
 
 namespace Artemis.Core;
@@ -10,9 +11,9 @@ public class NodeData
 {
     #region Constructors
 
-    internal NodeData(Plugin plugin, Type type, string name, string description, string category, string helpUrl, Type? inputType, Type? outputType, Func<INodeScript, NodeEntity?, INode> create)
+    internal NodeData(NodeProvider provider, Type type, string name, string description, string category, string helpUrl, Type? inputType, Type? outputType)
     {
-        Plugin = plugin;
+        Provider = provider;
         Type = type;
         Name = name;
         Description = description;
@@ -20,7 +21,6 @@ public class NodeData
         HelpUrl = helpUrl;
         InputType = inputType;
         OutputType = outputType;
-        _create = create;
     }
 
     #endregion
@@ -35,14 +35,31 @@ public class NodeData
     /// <returns>The returning node of type <see cref="Type" /></returns>
     public INode CreateNode(INodeScript script, NodeEntity? entity)
     {
-        INode node = _create(script, entity);
+        INode node = (INode) Provider.Plugin.Resolve(Type);
+        node.NodeData = this;
         if (string.IsNullOrWhiteSpace(node.Name))
             node.Name = Name;
         if (string.IsNullOrWhiteSpace(node.Description))
             node.Description = Description;
         if (string.IsNullOrWhiteSpace(node.HelpUrl))
             node.HelpUrl = HelpUrl;
+        
+        if (entity != null)
+        {
+            node.X = entity.X;
+            node.Y = entity.Y;
+            try
+            {
+                if (node is Node nodeImplementation)
+                    nodeImplementation.DeserializeStorage(entity.Storage);
+            }
+            catch
+            {
+                // ignored
+            }
+        }
 
+        node.TryInitialize(script);
         return node;
     }
 
@@ -91,11 +108,11 @@ public class NodeData
     }
 
     #region Properties & Fields
-
+    
     /// <summary>
-    ///     Gets the plugin that provided this node data
+    ///     Gets the node provider that provided this node data
     /// </summary>
-    public Plugin Plugin { get; }
+    public NodeProvider Provider { get; }
 
     /// <summary>
     ///     Gets the type of <see cref="INode" /> this data represents
@@ -132,7 +149,5 @@ public class NodeData
     /// </summary>
     public Type? OutputType { get; }
 
-    private readonly Func<INodeScript, NodeEntity?, INode> _create;
-
     #endregion
 }

src/Artemis.Core/VisualScripting/NodeScript.cs

@@ -161,6 +161,7 @@ public abstract class NodeScript : CorePropertyChanged, INodeScript
         {
             foreach (INode node in _nodes)
             {
+                // ReSharper disable once SuspiciousTypeConversion.Global - Provided by plugins
                 if (node is IDisposable disposable)
                     disposable.Dispose();
             }
@@ -181,6 +182,7 @@ public abstract class NodeScript : CorePropertyChanged, INodeScript
             foreach (INode removeNode in removeNodes)
             {
                 RemoveNode(removeNode);
+                // ReSharper disable once SuspiciousTypeConversion.Global - Provided by plugins
                 if (removeNode is IDisposable disposable)
                     disposable.Dispose();
             }
@@ -312,7 +314,7 @@ public abstract class NodeScript : CorePropertyChanged, INodeScript
             NodeEntity nodeEntity = new()
             {
                 Id = node.Id,
-                PluginId = NodeTypeStore.GetPlugin(node)?.Guid ?? Constants.CorePlugin.Guid,
+                ProviderId = node.NodeData?.Provider.Id ?? Constants.CorePluginFeature.Id,
                 Type = node.GetType().Name,
                 X = node.X,
                 Y = node.Y,

src/Artemis.Core/VisualScripting/Nodes/Node.cs

@@ -41,6 +41,9 @@ public abstract class Node : BreakableModel, INode
         set => SetAndNotify(ref _id, value);
     }
 
+    /// <inheritdoc />
+    public NodeData? NodeData { get; set; }
+
     private string _name;
 
     /// <inheritdoc />
@@ -104,8 +107,6 @@ public abstract class Node : BreakableModel, INode
     /// <inheritdoc />
     public override string BrokenDisplayName => Name;
 
-    internal IContainer Container { get; set; } = null!;
-
     #endregion
 
     #region Construtors

src/Artemis.Core/VisualScripting/Nodes/NodeTStorageTViewModel.cs

@@ -25,7 +25,9 @@ public abstract class Node<TStorage, TViewModel> : Node<TStorage>, ICustomViewMo
     /// <param name="nodeScript"></param>
     public virtual TViewModel GetViewModel(NodeScript nodeScript)
     {
-        return Container.Resolve<TViewModel>(args: new object[] {this, nodeScript});
+        if (NodeData == null)
+            throw new ArtemisCoreException("Nodes without node data (default nodes or exit nodes) cannot have custom view models");
+        return NodeData.Provider.Plugin.Container.Resolve<TViewModel>(args: new object[] {this, nodeScript});
     }
 
     /// <summary>

src/Artemis.Storage/Artemis.Storage.csproj

@@ -3,10 +3,12 @@
         <TargetFramework>net8.0</TargetFramework>
         <PreserveCompilationContext>false</PreserveCompilationContext>
         <Platforms>x64</Platforms>
+        <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="LiteDB" />
         <PackageReference Include="Serilog" />
+        <PackageReference Include="Newtonsoft.Json" />
     </ItemGroup>
 </Project>

src/Artemis.Storage/Entities/General/QueuedActionEntity.cs

@@ -11,7 +11,7 @@ public class QueuedActionEntity
     }
 
     public Guid Id { get; set; }
-    public string Type { get; set; }
+    public string Type { get; set; } = string.Empty;
     public DateTimeOffset CreatedAt { get; set; }
 
     public Dictionary<string, object> Parameters { get; set; }

src/Artemis.Storage/Entities/General/ReleaseEntity.cs

@@ -6,6 +6,6 @@ public class ReleaseEntity
 {
     public Guid Id { get; set; }
 
-    public string Version { get; set; }
+    public string Version { get; set; } = string.Empty;
     public DateTimeOffset? InstalledAt { get; set; }
 }

src/Artemis.Storage/Entities/General/ScriptConfigurationEntity.cs

@@ -6,7 +6,7 @@ public class ScriptConfigurationEntity
 {
     public Guid Id { get; set; }
 
-    public string Name { get; set; }
-    public string ScriptingProviderId { get; set; }
-    public string ScriptContent { get; set; }
+    public string Name { get; set; } = string.Empty;
+    public string ScriptingProviderId { get; set; } = string.Empty;
+    public string? ScriptContent { get; set; }
 }

src/Artemis.Storage/Entities/Plugins/PluginEntity.cs

@@ -24,6 +24,6 @@ public class PluginEntity
 /// </summary>
 public class PluginFeatureEntity
 {
-    public string Type { get; set; }
+    public string Type { get; set; } = string.Empty;
     public bool IsEnabled { get; set; }
 }

src/Artemis.Storage/Entities/Plugins/PluginSettingEntity.cs

@@ -10,6 +10,6 @@ public class PluginSettingEntity
     public Guid Id { get; set; }
     public Guid PluginGuid { get; set; }
 
-    public string Name { get; set; }
-    public string Value { get; set; }
+    public string Name { get; set; } = string.Empty;
+    public string Value { get; set; } = string.Empty;
 }

src/Artemis.Storage/Entities/Profile/Abstract/DisplayConditionPartEntity.cs

@@ -1,8 +0,0 @@
-using System.Collections.Generic;
-
-namespace Artemis.Storage.Entities.Profile.Abstract;
-
-public abstract class DataModelConditionPartEntity
-{
-    public List<DataModelConditionPartEntity> Children { get; set; }
-}

src/Artemis.Storage/Entities/Profile/Abstract/RenderElementEntity.cs

@@ -8,8 +8,8 @@ public abstract class RenderElementEntity
     public Guid Id { get; set; }
     public Guid ParentId { get; set; }
 
-    public List<LayerEffectEntity> LayerEffects { get; set; }
+    public List<LayerEffectEntity> LayerEffects { get; set; } = new();
 
-    public IConditionEntity DisplayCondition { get; set; }
-    public TimelineEntity Timeline { get; set; }
+    public IConditionEntity? DisplayCondition { get; set; }
+    public TimelineEntity? Timeline { get; set; }
 }

src/Artemis.Storage/Entities/Profile/AdaptionHints/IAdaptionHintEntity.cs

@@ -1,5 +1,3 @@
 namespace Artemis.Storage.Entities.Profile.AdaptionHints;
 
-public interface IAdaptionHintEntity
-{
-}
+public interface IAdaptionHintEntity;

src/Artemis.Storage/Entities/Profile/Conditions/AlwaysOnConditionEntity.cs

@@ -2,6 +2,4 @@
 
 namespace Artemis.Storage.Entities.Profile.Conditions;
 
-public class AlwaysOnConditionEntity : IConditionEntity
-{
-}
+public class AlwaysOnConditionEntity : IConditionEntity;

src/Artemis.Storage/Entities/Profile/Conditions/EventConditionEntity.cs

@@ -8,6 +8,6 @@ public class EventConditionEntity : IConditionEntity
     public int TriggerMode { get; set; }
     public int OverlapMode { get; set; }
     public int ToggleOffMode { get; set; }
-    public DataModelPathEntity EventPath { get; set; }
-    public NodeScriptEntity Script { get; set; }
+    public DataModelPathEntity? EventPath { get; set; }
+    public NodeScriptEntity? Script { get; set; }
 }

src/Artemis.Storage/Entities/Profile/Conditions/IConditionEntity.cs

@@ -1,5 +1,3 @@
 namespace Artemis.Storage.Entities.Profile.Abstract;
 
-public interface IConditionEntity
-{
-}
+public interface IConditionEntity;

src/Artemis.Storage/Entities/Profile/Conditions/PlayOnceConditionEntity.cs

@@ -2,6 +2,4 @@
 
 namespace Artemis.Storage.Entities.Profile.Conditions;
 
-public class PlayOnceConditionEntity : IConditionEntity
-{
-}
+public class PlayOnceConditionEntity : IConditionEntity;

src/Artemis.Storage/Entities/Profile/Conditions/StaticConditionEntity.cs

@@ -7,5 +7,5 @@ public class StaticConditionEntity : IConditionEntity
 {
     public int PlayMode { get; set; }
     public int StopMode { get; set; }
-    public NodeScriptEntity Script { get; set; }
+    public NodeScriptEntity? Script { get; set; }
 }

src/Artemis.Storage/Entities/Profile/DataBindings/DataBindingEntity.cs

@@ -4,7 +4,6 @@ namespace Artemis.Storage.Entities.Profile.DataBindings;
 
 public class DataBindingEntity
 {
-    public string Identifier { get; set; }
     public bool IsEnabled { get; set; }
-    public NodeScriptEntity NodeScript { get; set; }
+    public NodeScriptEntity? NodeScript { get; set; }
 }

src/Artemis.Storage/Entities/Profile/DataModelPathEntity.cs

@@ -2,7 +2,7 @@
 
 public class DataModelPathEntity
 {
-    public string Path { get; set; }
-    public string DataModelId { get; set; }
-    public string Type { get; set; }
+    public string Path { get; set; } = string.Empty;
+    public string? DataModelId { get; set; }
+    public string? Type { get; set; }
 }

src/Artemis.Storage/Entities/Profile/FolderEntity.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Artemis.Storage.Entities.Profile.Abstract;
 using LiteDB;
 
@@ -7,18 +6,13 @@ namespace Artemis.Storage.Entities.Profile;
 
 public class FolderEntity : RenderElementEntity
 {
-    public FolderEntity()
-    {
-        LayerEffects = new List<LayerEffectEntity>();
-    }
-
     public int Order { get; set; }
-    public string Name { get; set; }
+    public string? Name { get; set; }
     public bool IsExpanded { get; set; }
     public bool Suspended { get; set; }
 
     [BsonRef("ProfileEntity")]
-    public ProfileEntity Profile { get; set; }
+    public ProfileEntity Profile { get; set; } = null!;
 
     public Guid ProfileId { get; set; }
 }

src/Artemis.Storage/Entities/Profile/KeyframeEntity.cs

@@ -6,6 +6,6 @@ public class KeyframeEntity
 {
     public TimeSpan Position { get; set; }
     public int Timeline { get; set; }
-    public string Value { get; set; }
+    public string Value { get; set; } = string.Empty;
     public int EasingFunction { get; set; }
 }

src/Artemis.Storage/Entities/Profile/LayerBrushEntity.cs

@@ -2,8 +2,8 @@
 
 public class LayerBrushEntity
 {
-    public string ProviderId { get; set; }
-    public string BrushType { get; set; }
+    public string ProviderId { get; set; } = string.Empty;
+    public string BrushType { get; set; } = string.Empty;
 
-    public PropertyGroupEntity PropertyGroup { get; set; }
+    public PropertyGroupEntity? PropertyGroup { get; set; }
 }

src/Artemis.Storage/Entities/Profile/LayerEffectEntity.cs

@@ -2,11 +2,11 @@
 
 public class LayerEffectEntity
 {
-    public string ProviderId { get; set; }
-    public string EffectType { get; set; }
-    public string Name { get; set; }
+    public string ProviderId { get; set; } = string.Empty;
+    public string EffectType { get; set; } = string.Empty;
+    public string Name { get; set; } = string.Empty;
     public bool HasBeenRenamed { get; set; }
     public int Order { get; set; }
 
-    public PropertyGroupEntity PropertyGroup { get; set; }
+    public PropertyGroupEntity? PropertyGroup { get; set; }
 }

src/Artemis.Storage/Entities/Profile/LayerEntity.cs

@@ -12,22 +12,21 @@ public class LayerEntity : RenderElementEntity
     {
         Leds = new List<LedEntity>();
         AdaptionHints = new List<IAdaptionHintEntity>();
-        LayerEffects = new List<LayerEffectEntity>();
     }
 
     public int Order { get; set; }
-    public string Name { get; set; }
+    public string? Name { get; set; }
     public bool Suspended { get; set; }
 
     public List<LedEntity> Leds { get; set; }
     public List<IAdaptionHintEntity> AdaptionHints { get; set; }
 
-    public PropertyGroupEntity GeneralPropertyGroup { get; set; }
-    public PropertyGroupEntity TransformPropertyGroup { get; set; }
-    public LayerBrushEntity LayerBrush { get; set; }
+    public PropertyGroupEntity? GeneralPropertyGroup { get; set; }
+    public PropertyGroupEntity? TransformPropertyGroup { get; set; }
+    public LayerBrushEntity? LayerBrush { get; set; }
 
     [BsonRef("ProfileEntity")]
-    public ProfileEntity Profile { get; set; }
+    public ProfileEntity Profile { get; set; } = null!;
 
     public Guid ProfileId { get; set; }
 }

src/Artemis.Storage/Entities/Profile/LedEntity.cs

@@ -5,8 +5,8 @@ namespace Artemis.Storage.Entities.Profile;
 
 public class LedEntity
 {
-    public string LedName { get; set; }
-    public string DeviceIdentifier { get; set; }
+    public string LedName { get; set; } = string.Empty;
+    public string DeviceIdentifier { get; set; } = string.Empty;
 
     public int? PhysicalLayout { get; set; }
 
@@ -14,7 +14,7 @@ public class LedEntity
 
     private sealed class LedEntityEqualityComparer : IEqualityComparer<LedEntity>
     {
-        public bool Equals(LedEntity x, LedEntity y)
+        public bool Equals(LedEntity? x, LedEntity? y)
         {
             if (ReferenceEquals(x, y))
                 return true;

src/Artemis.Storage/Entities/Profile/Nodes/NodeConnectionEntity.cs

@@ -20,12 +20,12 @@ public class NodeConnectionEntity
         TargetPinId = nodeConnectionEntity.TargetPinId;
     }
 
-    public string SourceType { get; set; }
+    public string SourceType { get; set; } = string.Empty;
     public Guid SourceNode { get; set; }
     public Guid TargetNode { get; set; }
     public int SourcePinCollectionId { get; set; }
     public int SourcePinId { get; set; }
-    public string TargetType { get; set; }
+    public string TargetType { get; set; } = string.Empty;
     public int TargetPinCollectionId { get; set; }
     public int TargetPinId { get; set; }
 }

src/Artemis.Storage/Entities/Profile/Nodes/NodeEntity.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -15,7 +15,7 @@ public class NodeEntity
     {
         Id = nodeEntity.Id;
         Type = nodeEntity.Type;
-        PluginId = nodeEntity.PluginId;
+        ProviderId = nodeEntity.ProviderId;
 
         Name = nodeEntity.Name;
         Description = nodeEntity.Description;
@@ -28,15 +28,15 @@ public class NodeEntity
     }
 
     public Guid Id { get; set; }
-    public string Type { get; set; }
-    public Guid PluginId { get; set; }
+    public string Type { get; set; } = string.Empty;
+    public string ProviderId { get; set; } = string.Empty;
 
-    public string Name { get; set; }
-    public string Description { get; set; }
+    public string Name { get; set; } = string.Empty;
+    public string Description { get; set; } = string.Empty;
     public bool IsExitNode { get; set; }
     public double X { get; set; }
     public double Y { get; set; }
-    public string Storage { get; set; }
+    public string Storage { get; set; } = string.Empty;
 
     public List<NodePinCollectionEntity> PinCollections { get; set; }
 }

src/Artemis.Storage/Entities/Profile/Nodes/NodeScriptEntity.cs

@@ -10,8 +10,8 @@ public class NodeScriptEntity
         Connections = new List<NodeConnectionEntity>();
     }
 
-    public string Name { get; set; }
-    public string Description { get; set; }
+    public string Name { get; set; } = string.Empty;
+    public string Description { get; set; } = string.Empty;
 
     public List<NodeEntity> Nodes { get; set; }
     public List<NodeConnectionEntity> Connections { get; set; }

src/Artemis.Storage/Entities/Profile/ProfileCategoryEntity.cs

@@ -7,7 +7,7 @@ public class ProfileCategoryEntity
 {
     public Guid Id { get; set; }
 
-    public string Name { get; set; }
+    public string Name { get; set; } = string.Empty;
     public bool IsCollapsed { get; set; }
     public bool IsSuspended { get; set; }
     public int Order { get; set; }

src/Artemis.Storage/Entities/Profile/ProfileConfigurationEntity.cs

@@ -5,8 +5,8 @@ namespace Artemis.Storage.Entities.Profile;
 
 public class ProfileConfigurationEntity
 {
-    public string Name { get; set; }
-    public string MaterialIcon { get; set; }
+    public string Name { get; set; } = string.Empty;
+    public string? MaterialIcon { get; set; }
     public Guid FileIconId { get; set; }
     public int IconType { get; set; }
     public bool IconFill { get; set; }
@@ -14,16 +14,17 @@ public class ProfileConfigurationEntity
 
     public bool IsSuspended { get; set; }
     public int ActivationBehaviour { get; set; }
-    public NodeScriptEntity ActivationCondition { get; set; }
+    public NodeScriptEntity? ActivationCondition { get; set; }
 
     public int HotkeyMode { get; set; }
-    public ProfileConfigurationHotkeyEntity EnableHotkey { get; set; }
-    public ProfileConfigurationHotkeyEntity DisableHotkey { get; set; }
+    public ProfileConfigurationHotkeyEntity? EnableHotkey { get; set; }
+    public ProfileConfigurationHotkeyEntity? DisableHotkey { get; set; }
 
-    public string ModuleId { get; set; }
+    public string? ModuleId { get; set; }
 
     public Guid ProfileCategoryId { get; set; }
     public Guid ProfileId { get; set; }
 
     public bool FadeInAndOut { get; set; }
+    public int Version { get; set; }
 }

src/Artemis.Storage/Entities/Profile/ProfileEntity.cs

@@ -16,7 +16,7 @@ public class ProfileEntity
 
     public Guid Id { get; set; }
 
-    public string Name { get; set; }
+    public string Name { get; set; } = string.Empty;
     public bool IsFreshImport { get; set; }
 
     public List<FolderEntity> Folders { get; set; }
@@ -28,7 +28,7 @@ public class ProfileEntity
         Guid oldGuid = Id;
         Id = guid;
 
-        FolderEntity rootFolder = Folders.FirstOrDefault(f => f.ParentId == oldGuid);
+        FolderEntity? rootFolder = Folders.FirstOrDefault(f => f.ParentId == oldGuid);
         if (rootFolder != null)
             rootFolder.ParentId = Id;
     }

src/Artemis.Storage/Entities/Profile/PropertyEntity.cs

@@ -5,10 +5,10 @@ namespace Artemis.Storage.Entities.Profile;
 
 public class PropertyEntity
 {
-    public string Identifier { get; set; }
-    public string Value { get; set; }
+    public string Identifier { get; set; } = string.Empty;
+    public string Value { get; set; } = string.Empty;
     public bool KeyframesEnabled { get; set; }
 
-    public DataBindingEntity DataBinding { get; set; }
+    public DataBindingEntity? DataBinding { get; set; }
     public List<KeyframeEntity> KeyframeEntities { get; set; } = new();
 }

src/Artemis.Storage/Entities/Profile/PropertyGroupEntity.cs

@@ -4,7 +4,7 @@ namespace Artemis.Storage.Entities.Profile;
 
 public class PropertyGroupEntity
 {
-    public string Identifier { get; set; }
+    public string Identifier { get; set; } = string.Empty;
     public List<PropertyEntity> Properties { get; set; } = new();
     public List<PropertyGroupEntity> PropertyGroups { get; set; } = new();
 }

src/Artemis.Storage/Entities/Surface/DeviceEntity.cs

@@ -11,8 +11,8 @@ public class DeviceEntity
         Categories = new List<int>();
     }
 
-    public string Id { get; set; }
-    public string DeviceProvider { get; set; }
+    public string Id { get; set; } = string.Empty;
+    public string DeviceProvider { get; set; } = string.Empty;
     public float X { get; set; }
     public float Y { get; set; }
     public float Rotation { get; set; }
@@ -24,9 +24,9 @@ public class DeviceEntity
     public bool IsEnabled { get; set; }
     
     public int PhysicalLayout { get; set; }
-    public string LogicalLayout { get; set; }
-    public string LayoutType { get; set; }
-    public string LayoutParameter { get; set; }
+    public string? LogicalLayout { get; set; }
+    public string? LayoutType { get; set; }
+    public string? LayoutParameter { get; set; }
 
     public List<DeviceInputIdentifierEntity> InputIdentifiers { get; set; }
     public List<InputMappingEntity> InputMappings { get; set; }
@@ -41,6 +41,6 @@ public class InputMappingEntity
 
 public class DeviceInputIdentifierEntity
 {
-    public string InputProvider { get; set; }
-    public object Identifier { get; set; }
+    public string InputProvider { get; set; } = string.Empty;
+    public object Identifier { get; set; } = string.Empty;
 }

src/Artemis.Storage/Entities/Workshop/EntryEntity.cs

@@ -10,13 +10,12 @@ public class EntryEntity
     public long EntryId { get; set; }
     public int EntryType { get; set; }
     
-    public string Author { get; set; } 
+    public string Author { get; set; }  = string.Empty;
     public string Name { get; set; } = string.Empty;
-    public string Summary { get; set; } = string.Empty;
 
     public long ReleaseId { get; set; }
-    public string ReleaseVersion { get; set; }
+    public string ReleaseVersion { get; set; } = string.Empty;
     public DateTimeOffset InstalledAt { get; set; }
 
-    public Dictionary<string,object> Metadata { get; set; }
+    public Dictionary<string,object>? Metadata { get; set; }
 }

src/Artemis.Storage/Migrations/IProfileMigration.cs

@@ -0,0 +1,9 @@
+using Newtonsoft.Json.Linq;
+
+namespace Artemis.Storage.Migrations;
+
+public interface IProfileMigration
+{
+    int Version { get; }
+    void Migrate(JObject profileJson);
+}

src/Artemis.Storage/Migrations/IStorageMigration.cs

@@ -1,6 +1,6 @@
 using LiteDB;
 
-namespace Artemis.Storage.Migrations.Interfaces;
+namespace Artemis.Storage.Migrations;
 
 public interface IStorageMigration
 {

src/Artemis.Storage/Migrations/Profile/M0001NodeProviders.cs

@@ -0,0 +1,88 @@
+using Newtonsoft.Json.Linq;
+
+namespace Artemis.Storage.Migrations.Profile;
+
+/// <summary>
+/// Migrates nodes to be provider-based.
+/// This requires giving them a ProviderId and updating the their namespaces to match the namespace of the new plugin. 
+/// </summary>
+internal class M0001NodeProviders : IProfileMigration
+{
+    /// <inheritdoc />
+    public int Version => 1;
+
+    /// <inheritdoc />
+    public void Migrate(JObject profileJson)
+    {
+        JArray? folders = (JArray?) profileJson["Folders"]?["$values"];
+        JArray? layers = (JArray?) profileJson["Layers"]?["$values"];
+
+        if (folders != null)
+        {
+            foreach (JToken folder in folders)
+                MigrateProfileElement(folder);
+        }
+
+        if (layers != null)
+        {
+            foreach (JToken layer in layers)
+            {
+                MigrateProfileElement(layer);
+                MigratePropertyGroup(layer["GeneralPropertyGroup"]);
+                MigratePropertyGroup(layer["TransformPropertyGroup"]);
+                MigratePropertyGroup(layer["LayerBrush"]?["PropertyGroup"]);
+            }
+        }
+    }
+
+    private void MigrateProfileElement(JToken profileElement)
+    {
+        JArray? layerEffects = (JArray?) profileElement["LayerEffects"]?["$values"];
+        if (layerEffects != null)
+        {
+            foreach (JToken layerEffect in layerEffects)
+                MigratePropertyGroup(layerEffect["PropertyGroup"]);
+        }
+
+        JToken? displayCondition = profileElement["DisplayCondition"];
+        if (displayCondition != null)
+            MigrateNodeScript(displayCondition["Script"]);
+    }
+
+    private void MigratePropertyGroup(JToken? propertyGroup)
+    {
+        if (propertyGroup == null || !propertyGroup.HasValues)
+            return;
+
+        JArray? properties = (JArray?) propertyGroup["Properties"]?["$values"];
+        JArray? propertyGroups = (JArray?) propertyGroup["PropertyGroups"]?["$values"];
+
+        if (properties != null)
+        {
+            foreach (JToken property in properties)
+                MigrateNodeScript(property["DataBinding"]?["NodeScript"]);
+        }
+
+        if (propertyGroups != null)
+        {
+            foreach (JToken childPropertyGroup in propertyGroups)
+                MigratePropertyGroup(childPropertyGroup);
+        }
+    }
+
+    private void MigrateNodeScript(JToken? nodeScript)
+    {
+        if (nodeScript == null || !nodeScript.HasValues)
+            return;
+
+        JArray? nodes = (JArray?) nodeScript["Nodes"]?["$values"];
+        if (nodes == null)
+            return;
+
+        foreach (JToken node in nodes)
+        {
+            node["Type"] = node["Type"]?.Value<string>()?.Replace("Artemis.VisualScripting.Nodes", "Artemis.Plugins.Nodes.General.Nodes");
+            node["ProviderId"] = "Artemis.Plugins.Nodes.General.GeneralNodesProvider-d9e1ee78";
+        }
+    }
+}

src/Artemis.Storage/Migrations/Storage/M0020AvaloniaReset.cs

@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using Artemis.Storage.Migrations.Interfaces;
 using LiteDB;
 
-namespace Artemis.Storage.Migrations;
+namespace Artemis.Storage.Migrations.Storage;
 
 public class M0020AvaloniaReset : IStorageMigration
 {

src/Artemis.Storage/Migrations/Storage/M0021GradientNodes.cs

@@ -3,18 +3,17 @@ using System.Collections.Generic;
 using System.Linq;
 using Artemis.Storage.Entities.Profile;
 using Artemis.Storage.Entities.Profile.Nodes;
-using Artemis.Storage.Migrations.Interfaces;
 using LiteDB;
 
-namespace Artemis.Storage.Migrations;
+namespace Artemis.Storage.Migrations.Storage;
 
 public class M0021GradientNodes : IStorageMigration
 {
     private void MigrateDataBinding(PropertyEntity property)
     {
-        NodeScriptEntity script = property.DataBinding.NodeScript;
-        NodeEntity exitNode = script.Nodes.FirstOrDefault(s => s.IsExitNode);
-        if (exitNode == null)
+        NodeScriptEntity? script = property.DataBinding?.NodeScript;
+        NodeEntity? exitNode = script?.Nodes.FirstOrDefault(s => s.IsExitNode);
+        if (script == null || exitNode == null)
             return;
 
         // Create a new node at the same position of the exit node
@@ -22,7 +21,7 @@ public class M0021GradientNodes : IStorageMigration
         {
             Id = Guid.NewGuid(),
             Type = "ColorGradientNode",
-            PluginId = Guid.Parse("ffffffff-ffff-ffff-ffff-ffffffffffff"),
+            ProviderId = "Artemis.Plugins.Nodes.General.GeneralNodesProvider-d9e1ee78",
             Name = "Color Gradient",
             Description = "Outputs a color gradient with the given colors",
             X = exitNode.X,
@@ -59,8 +58,11 @@ public class M0021GradientNodes : IStorageMigration
         exitNode.Y += 30;
     }
 
-    private void MigrateDataBinding(PropertyGroupEntity propertyGroup)
+    private void MigrateDataBinding(PropertyGroupEntity? propertyGroup)
     {
+        if (propertyGroup == null)
+            return;
+        
         foreach (PropertyGroupEntity propertyGroupPropertyGroup in propertyGroup.PropertyGroups)
             MigrateDataBinding(propertyGroupPropertyGroup);
 
@@ -80,7 +82,7 @@ public class M0021GradientNodes : IStorageMigration
         foreach (ProfileEntity profileEntity in profiles)
         {
             foreach (LayerEntity layer in profileEntity.Layers.Where(le => le.LayerBrush != null))
-                MigrateDataBinding(layer.LayerBrush.PropertyGroup);
+                MigrateDataBinding(layer.LayerBrush?.PropertyGroup);
 
             repository.Update(profileEntity);
         }

src/Artemis.Storage/Migrations/Storage/M0022TransitionNodes.cs

@@ -3,14 +3,13 @@ using Artemis.Storage.Entities.Profile;
 using Artemis.Storage.Entities.Profile.Abstract;
 using Artemis.Storage.Entities.Profile.Conditions;
 using Artemis.Storage.Entities.Profile.Nodes;
-using Artemis.Storage.Migrations.Interfaces;
 using LiteDB;
 
-namespace Artemis.Storage.Migrations;
+namespace Artemis.Storage.Migrations.Storage;
 
 public class M0022TransitionNodes : IStorageMigration
 {
-    private void MigrateNodeScript(NodeScriptEntity nodeScript)
+    private void MigrateNodeScript(NodeScriptEntity? nodeScript)
     {
         if (nodeScript == null)
             return;
@@ -28,7 +27,7 @@ public class M0022TransitionNodes : IStorageMigration
         }
     }
 
-    private void MigratePropertyGroup(PropertyGroupEntity propertyGroup)
+    private void MigratePropertyGroup(PropertyGroupEntity? propertyGroup)
     {
         if (propertyGroup == null)
             return;
@@ -39,7 +38,7 @@ public class M0022TransitionNodes : IStorageMigration
             MigrateNodeScript(property.DataBinding?.NodeScript);
     }
 
-    private void MigrateDisplayCondition(IConditionEntity conditionEntity)
+    private void MigrateDisplayCondition(IConditionEntity? conditionEntity)
     {
         if (conditionEntity is EventConditionEntity eventConditionEntity)
             MigrateNodeScript(eventConditionEntity.Script);
@@ -70,14 +69,14 @@ public class M0022TransitionNodes : IStorageMigration
                 MigratePropertyGroup(layer.GeneralPropertyGroup);
                 MigratePropertyGroup(layer.TransformPropertyGroup);
                 foreach (LayerEffectEntity layerEffectEntity in layer.LayerEffects)
-                    MigratePropertyGroup(layerEffectEntity?.PropertyGroup);
+                    MigratePropertyGroup(layerEffectEntity.PropertyGroup);
                 MigrateDisplayCondition(layer.DisplayCondition);
             }
 
             foreach (FolderEntity folder in profileEntity.Folders)
             {
                 foreach (LayerEffectEntity folderLayerEffect in folder.LayerEffects)
-                    MigratePropertyGroup(folderLayerEffect?.PropertyGroup);
+                    MigratePropertyGroup(folderLayerEffect.PropertyGroup);
                 MigrateDisplayCondition(folder.DisplayCondition);
             }
 

src/Artemis.Storage/Migrations/Storage/M0023LayoutProviders.cs

@@ -1,8 +1,7 @@
 using System.Collections.Generic;
-using Artemis.Storage.Migrations.Interfaces;
 using LiteDB;
 
-namespace Artemis.Storage.Migrations;
+namespace Artemis.Storage.Migrations.Storage;
 
 public class M0023LayoutProviders : IStorageMigration
 {

src/Artemis.Storage/Migrations/Storage/M0024NodeProviders.cs

@@ -0,0 +1,100 @@
+using System.Collections.Generic;
+using Artemis.Storage.Entities.Profile;
+using LiteDB;
+
+namespace Artemis.Storage.Migrations.Storage;
+
+public class M0024NodeProviders : IStorageMigration
+{
+    public int UserVersion => 24;
+
+    public void Apply(LiteRepository repository)
+    {
+        List<ProfileCategoryEntity> profileCategories = repository.Query<ProfileCategoryEntity>().ToList();
+        foreach (ProfileCategoryEntity profileCategory in profileCategories)
+        {
+            foreach (ProfileConfigurationEntity profileConfigurationEntity in profileCategory.ProfileConfigurations)
+            {
+                profileConfigurationEntity.Version = 1;
+            }
+            repository.Update(profileCategory);
+        }
+
+        ILiteCollection<BsonDocument> collection = repository.Database.GetCollection("ProfileEntity");
+        foreach (BsonDocument profileBson in collection.FindAll())
+        {
+            BsonArray? folders = profileBson["Folders"]?.AsArray;
+            BsonArray? layers = profileBson["Layers"]?.AsArray;
+
+            if (folders != null)
+            {
+                foreach (BsonValue folder in folders)
+                    MigrateProfileElement(folder.AsDocument);
+            }
+
+            if (layers != null)
+            {
+                foreach (BsonValue layer in layers)
+                {
+                    MigrateProfileElement(layer.AsDocument);
+                    MigratePropertyGroup(layer.AsDocument["GeneralPropertyGroup"].AsDocument);
+                    MigratePropertyGroup(layer.AsDocument["TransformPropertyGroup"].AsDocument);
+                    MigratePropertyGroup(layer.AsDocument["LayerBrush"]?["PropertyGroup"].AsDocument);
+                }
+            }
+
+            collection.Update(profileBson);
+        }
+    }
+
+    private void MigrateProfileElement(BsonDocument profileElement)
+    {
+        BsonArray? layerEffects = profileElement["LayerEffects"]?.AsArray;
+        if (layerEffects != null)
+        {
+            foreach (BsonValue layerEffect in layerEffects)
+                MigratePropertyGroup(layerEffect.AsDocument["PropertyGroup"].AsDocument);
+        }
+
+        BsonValue? displayCondition = profileElement["DisplayCondition"];
+        if (displayCondition != null)
+            MigrateNodeScript(displayCondition.AsDocument["Script"].AsDocument);
+    }
+
+    private void MigratePropertyGroup(BsonDocument? propertyGroup)
+    {
+        if (propertyGroup == null || propertyGroup.Keys.Count == 0)
+            return;
+
+        BsonArray? properties = propertyGroup["Properties"]?.AsArray;
+        BsonArray? propertyGroups = propertyGroup["PropertyGroups"]?.AsArray;
+
+        if (properties != null)
+        {
+            foreach (BsonValue property in properties)
+                MigrateNodeScript(property.AsDocument["DataBinding"]?["NodeScript"]?.AsDocument);
+        }
+
+        if (propertyGroups != null)
+        {
+            foreach (BsonValue childPropertyGroup in propertyGroups)
+                MigratePropertyGroup(childPropertyGroup.AsDocument);
+        }
+    }
+
+    private void MigrateNodeScript(BsonDocument? nodeScript)
+    {
+        if (nodeScript == null || nodeScript.Keys.Count == 0)
+            return;
+
+        BsonArray? nodes = nodeScript["Nodes"]?.AsArray;
+        if (nodes == null)
+            return;
+
+        foreach (BsonValue node in nodes)
+        {
+            node.AsDocument["Type"] = node.AsDocument["Type"]?.AsString?.Replace("Artemis.VisualScripting.Nodes", "Artemis.Plugins.Nodes.General.Nodes");
+            node.AsDocument["ProviderId"] = "Artemis.Plugins.Nodes.General.GeneralNodesProvider-d9e1ee78";
+        }
+    }
+}

src/Artemis.Storage/Repositories/DeviceRepository.cs

@@ -25,7 +25,7 @@ internal class DeviceRepository : IDeviceRepository
         _repository.Delete<DeviceEntity>(deviceEntity.Id);
     }
 
-    public DeviceEntity Get(string id)
+    public DeviceEntity? Get(string id)
     {
         return _repository.FirstOrDefault<DeviceEntity>(s => s.Id == id);
     }

src/Artemis.Storage/Repositories/EntryRepository.cs

@@ -27,12 +27,12 @@ internal class EntryRepository : IEntryRepository
         _repository.Delete<EntryEntity>(entryEntity.Id);
     }
 
-    public EntryEntity Get(Guid id)
+    public EntryEntity? Get(Guid id)
     {
         return _repository.FirstOrDefault<EntryEntity>(s => s.Id == id);
     }
 
-    public EntryEntity GetByEntryId(long entryId)
+    public EntryEntity? GetByEntryId(long entryId)
     {
         return _repository.FirstOrDefault<EntryEntity>(s => s.EntryId == entryId);
     }

src/Artemis.Storage/Repositories/Interfaces/IDeviceRepository.cs

@@ -7,7 +7,7 @@ public interface IDeviceRepository : IRepository
 {
     void Add(DeviceEntity deviceEntity);
     void Remove(DeviceEntity deviceEntity);
-    DeviceEntity Get(string id);
+    DeviceEntity? Get(string id);
     List<DeviceEntity> GetAll();
     void Save(DeviceEntity deviceEntity);
     void Save(IEnumerable<DeviceEntity> deviceEntities);

src/Artemis.Storage/Repositories/Interfaces/IEntryRepository.cs

@@ -8,8 +8,8 @@ public interface IEntryRepository : IRepository
 {
     void Add(EntryEntity entryEntity);
     void Remove(EntryEntity entryEntity);
-    EntryEntity Get(Guid id);
-    EntryEntity GetByEntryId(long entryId);
+    EntryEntity? Get(Guid id);
+    EntryEntity? GetByEntryId(long entryId);
     List<EntryEntity> GetAll();
     void Save(EntryEntity entryEntity);
     void Save(IEnumerable<EntryEntity> entryEntities);

src/Artemis.Storage/Repositories/Interfaces/IPluginRepository.cs

@@ -6,12 +6,12 @@ namespace Artemis.Storage.Repositories.Interfaces;
 public interface IPluginRepository : IRepository
 {
     void AddPlugin(PluginEntity pluginEntity);
-    PluginEntity GetPluginByGuid(Guid pluginGuid);
+    PluginEntity? GetPluginByGuid(Guid pluginGuid);
     void SavePlugin(PluginEntity pluginEntity);
 
     void AddSetting(PluginSettingEntity pluginSettingEntity);
-    PluginSettingEntity GetSettingByGuid(Guid pluginGuid);
-    PluginSettingEntity GetSettingByNameAndGuid(string name, Guid pluginGuid);
+    PluginSettingEntity? GetSettingByGuid(Guid pluginGuid);
+    PluginSettingEntity? GetSettingByNameAndGuid(string name, Guid pluginGuid);
     void SaveSetting(PluginSettingEntity pluginSettingEntity);
     void RemoveSettings(Guid pluginGuid);
 }

src/Artemis.Storage/Repositories/Interfaces/IProfileCategoryRepository.cs

@@ -10,8 +10,8 @@ public interface IProfileCategoryRepository : IRepository
     void Add(ProfileCategoryEntity profileCategoryEntity);
     void Remove(ProfileCategoryEntity profileCategoryEntity);
     List<ProfileCategoryEntity> GetAll();
-    ProfileCategoryEntity Get(Guid id);
-    Stream GetProfileIconStream(Guid id);
+    ProfileCategoryEntity? Get(Guid id);
+    Stream? GetProfileIconStream(Guid id);
     void SaveProfileIconStream(ProfileConfigurationEntity profileConfigurationEntity, Stream stream);
     ProfileCategoryEntity IsUnique(string name, Guid? id);
     void Save(ProfileCategoryEntity profileCategoryEntity);

src/Artemis.Storage/Repositories/Interfaces/IProfileRepository.cs

@@ -9,6 +9,6 @@ public interface IProfileRepository : IRepository
     void Add(ProfileEntity profileEntity);
     void Remove(ProfileEntity profileEntity);
     List<ProfileEntity> GetAll();
-    ProfileEntity Get(Guid id);
+    ProfileEntity? Get(Guid id);
     void Save(ProfileEntity profileEntity);
 }

src/Artemis.Storage/Repositories/Interfaces/IRepository.cs

@@ -1,5 +1,3 @@
 namespace Artemis.Storage.Repositories.Interfaces;
 
-public interface IRepository
-{
-}
+public interface IRepository;

src/Artemis.Storage/Repositories/PluginRepository.cs

@@ -21,7 +21,7 @@ internal class PluginRepository : IPluginRepository
         _repository.Insert(pluginEntity);
     }
 
-    public PluginEntity GetPluginByGuid(Guid pluginGuid)
+    public PluginEntity? GetPluginByGuid(Guid pluginGuid)
     {
         return _repository.FirstOrDefault<PluginEntity>(p => p.Id == pluginGuid);
     }
@@ -29,7 +29,6 @@ internal class PluginRepository : IPluginRepository
     public void SavePlugin(PluginEntity pluginEntity)
     {
         _repository.Upsert(pluginEntity);
-        _repository.Database.Checkpoint();
     }
 
     public void AddSetting(PluginSettingEntity pluginSettingEntity)
@@ -37,12 +36,12 @@ internal class PluginRepository : IPluginRepository
         _repository.Insert(pluginSettingEntity);
     }
 
-    public PluginSettingEntity GetSettingByGuid(Guid pluginGuid)
+    public PluginSettingEntity? GetSettingByGuid(Guid pluginGuid)
     {
         return _repository.FirstOrDefault<PluginSettingEntity>(p => p.PluginGuid == pluginGuid);
     }
 
-    public PluginSettingEntity GetSettingByNameAndGuid(string name, Guid pluginGuid)
+    public PluginSettingEntity? GetSettingByNameAndGuid(string name, Guid pluginGuid)
     {
         return _repository.FirstOrDefault<PluginSettingEntity>(p => p.Name == name && p.PluginGuid == pluginGuid);
     }

src/Artemis.Storage/Repositories/ProfileCategoryRepository.cs

@@ -34,7 +34,7 @@ internal class ProfileCategoryRepository : IProfileCategoryRepository
         return _repository.Query<ProfileCategoryEntity>().ToList();
     }
 
-    public ProfileCategoryEntity Get(Guid id)
+    public ProfileCategoryEntity? Get(Guid id)
     {
         return _repository.FirstOrDefault<ProfileCategoryEntity>(p => p.Id == id);
     }
@@ -52,7 +52,7 @@ internal class ProfileCategoryRepository : IProfileCategoryRepository
         _repository.Upsert(profileCategoryEntity);
     }
 
-    public Stream GetProfileIconStream(Guid id)
+    public Stream? GetProfileIconStream(Guid id)
     {
         if (!_profileIcons.Exists(id))
             return null;

src/Artemis.Storage/Repositories/ProfileRepository.cs

@@ -31,7 +31,7 @@ internal class ProfileRepository : IProfileRepository
         return _repository.Query<ProfileEntity>().ToList();
     }
 
-    public ProfileEntity Get(Guid id)
+    public ProfileEntity? Get(Guid id)
     {
         return _repository.FirstOrDefault<ProfileEntity>(p => p.Id == id);
     }

src/Artemis.Storage/StorageMigrationService.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Artemis.Storage.Migrations.Interfaces;
+using Artemis.Storage.Migrations;
 using LiteDB;
 using Serilog;
 

src/Artemis.UI.Shared/Services/DataModelUIService.cs

@@ -18,16 +18,20 @@ internal class DataModelUIService : IDataModelUIService
     private readonly IContainer _container;
     private readonly List<DataModelVisualizationRegistration> _registeredDataModelDisplays;
     private readonly List<DataModelVisualizationRegistration> _registeredDataModelEditors;
+    private readonly PluginSetting<bool> _showFullPaths;
+    private readonly PluginSetting<bool> _showDataModelValues;
 
-    public DataModelUIService(IDataModelService dataModelService, IContainer container)
+    public DataModelUIService(IDataModelService dataModelService, IContainer container, ISettingsService settingsService)
     {
         _dataModelService = dataModelService;
         _container = container;
         _registeredDataModelEditors = new List<DataModelVisualizationRegistration>();
         _registeredDataModelDisplays = new List<DataModelVisualizationRegistration>();
-
+        
         RegisteredDataModelEditors = new ReadOnlyCollection<DataModelVisualizationRegistration>(_registeredDataModelEditors);
         RegisteredDataModelDisplays = new ReadOnlyCollection<DataModelVisualizationRegistration>(_registeredDataModelDisplays);
+        ShowFullPaths = settingsService.GetSetting("ProfileEditor.ShowFullPaths", true);
+        ShowDataModelValues = settingsService.GetSetting("ProfileEditor.ShowDataModelValues", false);
     }
 
     private DataModelInputViewModel InstantiateDataModelInputViewModel(DataModelVisualizationRegistration registration, DataModelPropertyAttribute? description, object? initialValue)
@@ -43,7 +47,9 @@ internal class DataModelUIService : IDataModelUIService
 
     public IReadOnlyCollection<DataModelVisualizationRegistration> RegisteredDataModelEditors { get; }
     public IReadOnlyCollection<DataModelVisualizationRegistration> RegisteredDataModelDisplays { get; }
-
+    public PluginSetting<bool> ShowFullPaths { get; }
+    public PluginSetting<bool> ShowDataModelValues { get; }
+    
     public DataModelPropertiesViewModel GetMainDataModelVisualization()
     {
         DataModelPropertiesViewModel viewModel = new(null, null, null);

src/Artemis.UI.Shared/Services/Interfaces/IDataModelUIService.cs

@@ -104,4 +104,14 @@ public interface IDataModelUIService : IArtemisSharedUIService
     /// <param name="updateCallback">A function to call whenever the input was updated (submitted or not)</param>
     /// <returns>The most appropriate input view model for the provided <paramref name="propertyType" /></returns>
     DataModelInputViewModel? GetDataModelInputViewModel(Type propertyType, DataModelPropertyAttribute? description, object? initialValue, Action<object?, bool> updateCallback);
+
+    /// <summary>
+    ///     Gets a boolean indicating whether or not to show full paths when displaying data model paths.
+    /// </summary>
+    PluginSetting<bool> ShowFullPaths { get; }
+
+    /// <summary>
+    ///     Gets a boolean indicating whether or not to show values when displaying data model paths.
+    /// </summary>
+    PluginSetting<bool> ShowDataModelValues { get; }
 }

src/Artemis.UI.Shared/Services/NodeEditor/Commands/AddNode.cs

@@ -27,6 +27,7 @@ public class AddNode : INodeEditorCommand, IDisposable
     /// <inheritdoc />
     public void Dispose()
     {
+        // ReSharper disable once SuspiciousTypeConversion.Global - Provided by plugins
         if (_isRemoved && _node is IDisposable disposableNode)
             disposableNode.Dispose();
     }

src/Artemis.UI.Shared/Services/NodeEditor/Commands/DeleteNode.cs

@@ -29,6 +29,7 @@ public class DeleteNode : INodeEditorCommand, IDisposable
     /// <inheritdoc />
     public void Dispose()
     {
+        // ReSharper disable once SuspiciousTypeConversion.Global - Provided by plugins
         if (_isRemoved && _node is IDisposable disposableNode)
             disposableNode.Dispose();
     }

src/Artemis.UI.Shared/Services/NodeEditor/Commands/DuplicateNode.cs

@@ -87,6 +87,7 @@ public class DuplicateNode : INodeEditorCommand, IDisposable
     /// <inheritdoc />
     public void Dispose()
     {
+        // ReSharper disable once SuspiciousTypeConversion.Global - Provided by plugins
         if (!_executed && _copy is IDisposable disposableNode)
             disposableNode.Dispose();
     }

src/Artemis.UI/Artemis.UI.csproj

@@ -10,7 +10,6 @@
     <ItemGroup>
         <ProjectReference Include="..\Artemis.Core\Artemis.Core.csproj" />
         <ProjectReference Include="..\Artemis.UI.Shared\Artemis.UI.Shared.csproj" />
-        <ProjectReference Include="..\Artemis.VisualScripting\Artemis.VisualScripting.csproj" />
         <ProjectReference Include="..\Artemis.WebClient.Updating\Artemis.WebClient.Updating.csproj" />
         <ProjectReference Include="..\Artemis.WebClient.Workshop\Artemis.WebClient.Workshop.csproj" />
     </ItemGroup>

src/Artemis.UI/ArtemisBootstrapper.cs

@@ -10,10 +10,8 @@ using Artemis.UI.Screens.Root;
 using Artemis.UI.Shared.DataModelPicker;
 using Artemis.UI.Shared.DryIoc;
 using Artemis.UI.Shared.Services;
-using Artemis.VisualScripting.DryIoc;
 using Artemis.WebClient.Updating.DryIoc;
 using Artemis.WebClient.Workshop.DryIoc;
-using Artemis.WebClient.Workshop.Services;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
@@ -49,7 +47,6 @@ public static class ArtemisBootstrapper
         _container.RegisterSharedUI();
         _container.RegisterUpdatingClient();
         _container.RegisterWorkshopClient();
-        _container.RegisterNoStringEvaluating();
         configureServices?.Invoke(_container);
 
         _container.UseDryIocDependencyResolver();

src/Artemis.UI/Screens/VisualScripting/NodeViewModel.cs

@@ -18,11 +18,13 @@ using DynamicData;
 using DynamicData.Binding;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
+using Serilog;
 
 namespace Artemis.UI.Screens.VisualScripting;
 
 public partial class NodeViewModel : ActivatableViewModelBase
 {
+    private readonly ILogger _logger;
     private readonly INodeEditorService _nodeEditorService;
     private readonly IWindowService _windowService;
     private ObservableAsPropertyHelper<bool>? _hasInputPins;
@@ -39,8 +41,9 @@ public partial class NodeViewModel : ActivatableViewModelBase
     [Notify] private bool _displayCustomViewModelBelow;
     [Notify] private VerticalAlignment _customViewModelVerticalAlignment;
 
-    public NodeViewModel(NodeScriptViewModel nodeScriptViewModel, INode node, INodeVmFactory nodeVmFactory, INodeEditorService nodeEditorService, IWindowService windowService)
+    public NodeViewModel(NodeScriptViewModel nodeScriptViewModel, INode node, ILogger logger, INodeVmFactory nodeVmFactory, INodeEditorService nodeEditorService, IWindowService windowService)
     {
+        _logger = logger;
         _nodeEditorService = nodeEditorService;
         _windowService = windowService;
         NodeScriptViewModel = nodeScriptViewModel;
@@ -137,25 +140,7 @@ public partial class NodeViewModel : ActivatableViewModelBase
             });
 
             // Set up the custom node VM if needed
-            if (Node is ICustomViewModelNode customViewModelNode)
-            {
-                CustomNodeViewModel = customViewModelNode.GetCustomViewModel(nodeScriptViewModel.NodeScript);
-                if (customViewModelNode.ViewModelPosition == CustomNodeViewModelPosition.AbovePins)
-                    DisplayCustomViewModelAbove = true;
-                else if (customViewModelNode.ViewModelPosition == CustomNodeViewModelPosition.BelowPins)
-                    DisplayCustomViewModelBelow = true;
-                else
-                {
-                    DisplayCustomViewModelBetween = true;
-                    
-                    if (customViewModelNode.ViewModelPosition == CustomNodeViewModelPosition.BetweenPinsTop)
-                        CustomViewModelVerticalAlignment = VerticalAlignment.Top;
-                    else if (customViewModelNode.ViewModelPosition == CustomNodeViewModelPosition.BetweenPinsTop)
-                        CustomViewModelVerticalAlignment = VerticalAlignment.Center;
-                    else
-                        CustomViewModelVerticalAlignment = VerticalAlignment.Bottom;
-                }
-            }
+            SetupCustomNodeViewModel();
         });
     }
 
@@ -209,4 +194,35 @@ public partial class NodeViewModel : ActivatableViewModelBase
         if (Node.BrokenState != null && Node.BrokenStateException != null)
             _windowService.ShowExceptionDialog(Node.BrokenState, Node.BrokenStateException);
     }
+
+    private void SetupCustomNodeViewModel()
+    {
+        if (Node is not ICustomViewModelNode customViewModelNode)
+            return;
+
+        try
+        {
+            CustomNodeViewModel = customViewModelNode.GetCustomViewModel(NodeScriptViewModel.NodeScript);
+        }
+        catch (Exception e)
+        {
+            _logger.Error(e, "Failed to instantiate custom node view model");
+        }
+
+        if (customViewModelNode.ViewModelPosition == CustomNodeViewModelPosition.AbovePins)
+            DisplayCustomViewModelAbove = true;
+        else if (customViewModelNode.ViewModelPosition == CustomNodeViewModelPosition.BelowPins)
+            DisplayCustomViewModelBelow = true;
+        else
+        {
+            DisplayCustomViewModelBetween = true;
+
+            if (customViewModelNode.ViewModelPosition == CustomNodeViewModelPosition.BetweenPinsTop)
+                CustomViewModelVerticalAlignment = VerticalAlignment.Top;
+            else if (customViewModelNode.ViewModelPosition == CustomNodeViewModelPosition.BetweenPinsTop)
+                CustomViewModelVerticalAlignment = VerticalAlignment.Center;
+            else
+                CustomViewModelVerticalAlignment = VerticalAlignment.Bottom;
+        }
+    }
 }

src/Artemis.UI/Services/Interfaces/IRegistrationService.cs

@@ -6,5 +6,4 @@ public interface IRegistrationService : IArtemisUIService
     void RegisterBuiltInDataModelInputs();
     void RegisterBuiltInPropertyEditors();
     void RegisterControllers();
-    void RegisterBuiltInNodeTypes();
 }

src/Artemis.UI/Services/RegistrationService.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections;
-using System.Linq;
-using System.Reflection;
+using System.Linq;
 using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.Controllers;
@@ -13,10 +10,8 @@ using Artemis.UI.Shared.Routing;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.ProfileEditor;
 using Artemis.UI.Shared.Services.PropertyInput;
-using Artemis.VisualScripting.Nodes.Mathematics;
 using Avalonia;
 using DryIoc;
-using SkiaSharp;
 
 namespace Artemis.UI.Services;
 
@@ -26,7 +21,6 @@ public class RegistrationService : IRegistrationService
     private readonly IInputService _inputService;
     private readonly IContainer _container;
     private readonly IRouter _router;
-    private readonly INodeService _nodeService;
     private readonly IPropertyInputService _propertyInputService;
     private readonly IWebServerService _webServerService;
     private bool _registeredBuiltInPropertyEditors;
@@ -36,7 +30,6 @@ public class RegistrationService : IRegistrationService
         IInputService inputService,
         IPropertyInputService propertyInputService,
         IProfileEditorService profileEditorService,
-        INodeService nodeService,
         IDataModelUIService dataModelUIService,
         IWebServerService webServerService,
         IDeviceLayoutService deviceLayoutService // here to make sure it is instantiated
@@ -46,13 +39,11 @@ public class RegistrationService : IRegistrationService
         _router = router;
         _inputService = inputService;
         _propertyInputService = propertyInputService;
-        _nodeService = nodeService;
         _dataModelUIService = dataModelUIService;
         _webServerService = webServerService;
 
         CreateCursorResources();
         RegisterRoutes();
-        RegisterBuiltInNodeTypes();
         RegisterControllers();
     }
 
@@ -105,22 +96,4 @@ public class RegistrationService : IRegistrationService
     {
         _webServerService.AddController<RemoteController>(Constants.CorePlugin.Features.First().Instance!);
     }
-
-    public void RegisterBuiltInNodeTypes()
-    {
-        _nodeService.RegisterTypeColor(Constants.CorePlugin, typeof(bool), new SKColor(0xFFCD3232));
-        _nodeService.RegisterTypeColor(Constants.CorePlugin, typeof(string), new SKColor(0xFFFFD700));
-        _nodeService.RegisterTypeColor(Constants.CorePlugin, typeof(Numeric), new SKColor(0xFF32CD32));
-        _nodeService.RegisterTypeColor(Constants.CorePlugin, typeof(float), new SKColor(0xFFFF7C00));
-        _nodeService.RegisterTypeColor(Constants.CorePlugin, typeof(SKColor), new SKColor(0xFFAD3EED));
-        _nodeService.RegisterTypeColor(Constants.CorePlugin, typeof(IList), new SKColor(0xFFED3E61));
-        _nodeService.RegisterTypeColor(Constants.CorePlugin, typeof(Enum), new SKColor(0xFF1E90FF));
-        _nodeService.RegisterTypeColor(Constants.CorePlugin, typeof(ColorGradient), new SKColor(0xFF00B2A9));
-
-        foreach (Type nodeType in typeof(SumNumericsNode).Assembly.GetTypes().Where(t => typeof(INode).IsAssignableFrom(t) && t.IsPublic && !t.IsAbstract && !t.IsInterface))
-        {
-            if (nodeType.GetCustomAttribute(typeof(NodeAttribute)) != null)
-                _nodeService.RegisterNodeType(Constants.CorePlugin, nodeType);
-        }
-    }
 }

src/Artemis.VisualScripting/Artemis.VisualScripting.csproj

@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <Platforms>x64</Platforms>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="NoStringEvaluating" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\Artemis.Core\Artemis.Core.csproj" />
-        <ProjectReference Include="..\Artemis.UI.Shared\Artemis.UI.Shared.csproj" />
-    </ItemGroup>
-</Project>

src/Artemis.VisualScripting/Converters/JsonConverter.cs

@@ -1,25 +0,0 @@
-using System.Globalization;
-using Artemis.Core;
-using Avalonia.Data.Converters;
-using Newtonsoft.Json;
-
-namespace Artemis.VisualScripting.Converters;
-
-/// <summary>
-///     Converts input into <see cref="Numeric" />.
-/// </summary>
-public class JsonConverter : IValueConverter
-{
-    /// <inheritdoc />
-    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        return JsonConvert.SerializeObject(value, Formatting.Indented);
-    }
-
-    /// <inheritdoc />
-    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        string? json = value?.ToString();
-        return json == null ? null : JsonConvert.DeserializeObject(json, targetType);
-    }
-}

src/Artemis.VisualScripting/Converters/NumericConverter.cs

@@ -1,27 +0,0 @@
-using System.Globalization;
-using Artemis.Core;
-using Avalonia.Data.Converters;
-
-namespace Artemis.VisualScripting.Converters;
-
-/// <summary>
-///     Converts input into <see cref="Numeric" />.
-/// </summary>
-public class NumericConverter : IValueConverter
-{
-    /// <inheritdoc />
-    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        if (value is not Numeric numeric)
-            return value;
-
-        object result = Numeric.IsTypeCompatible(targetType) ? numeric.ToType(targetType, NumberFormatInfo.InvariantInfo) : value;
-        return result;
-    }
-
-    /// <inheritdoc />
-    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        return new Numeric(value);
-    }
-}

src/Artemis.VisualScripting/DryIoc/ContainerExtensions.cs

@@ -1,41 +0,0 @@
-using DryIoc;
-using Microsoft.Extensions.ObjectPool;
-using NoStringEvaluating;
-using NoStringEvaluating.Contract;
-using NoStringEvaluating.Models.Values;
-using NoStringEvaluating.Services.Cache;
-using NoStringEvaluating.Services.Checking;
-using NoStringEvaluating.Services.Parsing;
-using NoStringEvaluating.Services.Parsing.NodeReaders;
-
-namespace Artemis.VisualScripting.DryIoc;
-
-/// <summary>
-/// Provides an extension method to register services onto a DryIoc <see cref="IContainer"/>.
-/// </summary>
-public static class ContainerExtensions
-{
-    /// <summary>
-    /// Registers NoStringEvaluating services into the container.
-    /// </summary>
-    /// <param name="container">The builder building the current container</param>
-    public static void RegisterNoStringEvaluating(this IContainer container)
-    {
-        // Pooling
-        container.RegisterInstance(ObjectPool.Create<Stack<InternalEvaluatorValue>>());
-        container.RegisterInstance(ObjectPool.Create<List<InternalEvaluatorValue>>());
-        container.RegisterInstance(ObjectPool.Create<ValueKeeperContainer>());
-        
-        // Parser
-        container.Register<IFormulaCache, FormulaCache>(Reuse.Singleton);
-        container.Register<IFunctionReader, FunctionReader>(Reuse.Singleton);
-        container.Register<IFormulaParser, FormulaParser>(Reuse.Singleton);
-        
-        // Checker
-        container.Register<IFormulaChecker, FormulaChecker>(Reuse.Singleton);
-        
-        // Evaluator
-        container.Register<INoStringEvaluator, NoStringEvaluator>(Reuse.Singleton);
-        container.Register<INoStringEvaluatorNullable, NoStringEvaluatorNullable>(Reuse.Singleton);
-    }
-}

src/Artemis.VisualScripting/Nodes/Branching/BooleanBranchNode.cs

@@ -1,59 +0,0 @@
-using Artemis.Core;
-using Artemis.Core.Events;
-
-namespace Artemis.VisualScripting.Nodes.Branching;
-
-[Node("Branch", "Forwards one of two values depending on an input boolean", "Branching", InputType = typeof(object), OutputType = typeof(object))]
-public class BooleanBranchNode : Node
-{
-    public BooleanBranchNode()
-    {
-        BooleanInput = CreateInputPin<bool>();
-        TrueInput = CreateInputPin(typeof(object), "True");
-        FalseInput = CreateInputPin(typeof(object), "False");
-
-        Output = CreateOutputPin(typeof(object));
-
-        TrueInput.PinConnected += InputPinConnected;
-        FalseInput.PinConnected += InputPinConnected;
-        TrueInput.PinDisconnected += InputPinDisconnected;
-        FalseInput.PinDisconnected += InputPinDisconnected;
-    }
-
-    public InputPin<bool> BooleanInput { get; set; }
-    public InputPin TrueInput { get; set; }
-    public InputPin FalseInput { get; set; }
-
-    public OutputPin Output { get; set; }
-
-    #region Overrides of Node
-
-    /// <inheritdoc />
-    public override void Evaluate()
-    {
-        Output.Value = BooleanInput.Value ? TrueInput.Value : FalseInput.Value;
-    }
-
-    #endregion
-
-    private void InputPinConnected(object? sender, SingleValueEventArgs<IPin> e)
-    {
-        if (TrueInput.ConnectedTo.Any())
-            ChangeType(TrueInput.ConnectedTo.First().Type);
-        else if (FalseInput.ConnectedTo.Any())
-            ChangeType(FalseInput.ConnectedTo.First().Type);
-    }
-
-    private void InputPinDisconnected(object? sender, SingleValueEventArgs<IPin> e)
-    {
-        if (!TrueInput.ConnectedTo.Any() && !FalseInput.ConnectedTo.Any())
-            ChangeType(typeof(object));
-    }
-
-    private void ChangeType(Type type)
-    {
-        TrueInput.ChangeType(type);
-        FalseInput.ChangeType(type);
-        Output.ChangeType(type);
-    }
-}

src/Artemis.VisualScripting/Nodes/Branching/EnumSwitchNode.cs

@@ -1,100 +0,0 @@
-using Artemis.Core;
-using Artemis.Core.Events;
-using Humanizer;
-
-namespace Artemis.VisualScripting.Nodes.Branching;
-
-[Node("Switch (Enum)", "Outputs the input that corresponds to the switch value", "Operators", InputType = typeof(Enum), OutputType = typeof(object))]
-public class EnumSwitchNode : Node
-{
-    private readonly Dictionary<Enum, InputPin> _inputPins;
-
-    public EnumSwitchNode()
-    {
-        _inputPins = new Dictionary<Enum, InputPin>();
-
-        Output = CreateOutputPin(typeof(object), "Result");
-        SwitchValue = CreateInputPin<Enum>("Switch");
-
-        SwitchValue.PinConnected += OnSwitchPinConnected;
-        SwitchValue.PinDisconnected += OnSwitchPinDisconnected;
-    }
-
-    public OutputPin Output { get; }
-    public InputPin<Enum> SwitchValue { get; }
-
-    public override void Evaluate()
-    {
-        if (SwitchValue.Value is null)
-        {
-            Output.Value = null;
-            return;
-        }
-
-        if (!_inputPins.TryGetValue(SwitchValue.Value, out InputPin? pin))
-        {
-            Output.Value = null;
-            return;
-        }
-
-        if (pin.ConnectedTo.Count == 0)
-        {
-            Output.Value = null;
-            return;
-        }
-
-        Output.Value = pin.Value;
-    }
-
-    private void OnInputPinDisconnected(object? sender, SingleValueEventArgs<IPin> e)
-    {
-        // if this is the last pin to disconnect, reset the type.
-        if (_inputPins.Values.All(i => i.ConnectedTo.Count == 0))
-            ChangeType(typeof(object));
-    }
-
-    private void OnInputPinConnected(object? sender, SingleValueEventArgs<IPin> e)
-    {
-        // change the type of our inputs and output
-        // depending on the first node the user connects to
-        ChangeType(e.Value.Type);
-    }
-
-    private void OnSwitchPinConnected(object? sender, SingleValueEventArgs<IPin> e)
-    {
-        if (SwitchValue.ConnectedTo.Count == 0)
-            return;
-
-        Type enumType = SwitchValue.ConnectedTo[0].Type;
-        if (!enumType.IsEnum)
-            return;
-
-        foreach (Enum enumValue in Enum.GetValues(enumType).Cast<Enum>())
-        {
-            InputPin pin = CreateOrAddInputPin(typeof(object), enumValue.Humanize(LetterCasing.Sentence));
-            pin.PinConnected += OnInputPinConnected;
-            pin.PinDisconnected += OnInputPinDisconnected;
-            _inputPins[enumValue] = pin;
-        }
-    }
-
-    private void OnSwitchPinDisconnected(object? sender, SingleValueEventArgs<IPin> e)
-    {
-        foreach (InputPin input in _inputPins.Values)
-        {
-            input.PinConnected -= OnInputPinConnected;
-            input.PinDisconnected -= OnInputPinDisconnected;
-            RemovePin(input);
-        }
-
-        _inputPins.Clear();
-        ChangeType(typeof(object));
-    }
-
-    private void ChangeType(Type type)
-    {
-        foreach (InputPin input in _inputPins.Values)
-            input.ChangeType(type);
-        Output.ChangeType(type);
-    }
-}

src/Artemis.VisualScripting/Nodes/Color/BrightenSKColorNode.cs

@@ -1,26 +0,0 @@
-using Artemis.Core;
-using SkiaSharp;
-
-namespace Artemis.VisualScripting.Nodes.Color;
-
-[Node("Brighten Color", "Brightens a color by a specified amount in percent", "Color", InputType = typeof(SKColor), OutputType = typeof(SKColor))]
-public class BrightenSKColorNode : Node
-{
-    public BrightenSKColorNode()
-    {
-        Input = CreateInputPin<SKColor>("Color");
-        Percentage = CreateInputPin<Numeric>("%");
-        Output = CreateOutputPin<SKColor>();
-    }
-
-    public InputPin<SKColor> Input { get; }
-    public InputPin<Numeric> Percentage { get; }
-    public OutputPin<SKColor> Output { get; set; }
-
-    public override void Evaluate()
-    {
-        Input.Value.ToHsl(out float h, out float s, out float l);
-        l += l * (Percentage.Value / 100f);
-        Output.Value = SKColor.FromHsl(h, s, l);
-    }
-}

src/Artemis.VisualScripting/Nodes/Color/ColorGradientFromPinsNode.cs

@@ -1,102 +0,0 @@
-using Artemis.Core;
-using Artemis.Core.Events;
-using SkiaSharp;
-
-namespace Artemis.VisualScripting.Nodes.Color;
-
-[Node("Color Gradient (Advanced)", "Outputs a Color Gradient from colors and positions", "Color", OutputType = typeof(ColorGradient))]
-public class ColorGradientFromPinsNode : Node
-{
-    public OutputPin<ColorGradient> Gradient { get; set; }
-    public InputPinCollection<SKColor> Colors { get; set; }
-    public InputPinCollection<Numeric> Positions { get; set; }
-
-    public ColorGradientFromPinsNode()
-    {
-        Colors = CreateInputPinCollection<SKColor>("Colors", 0);
-        Positions = CreateInputPinCollection<Numeric>("Positions", 0);
-        Gradient = CreateOutputPin<ColorGradient>("Gradient");
-
-        Colors.PinAdded += OnPinAdded;
-        Colors.PinRemoved += OnPinRemoved;
-        Positions.PinAdded += OnPinAdded;
-        Positions.PinRemoved += OnPinRemoved;
-    }
-
-    private void OnPinRemoved(object? sender, SingleValueEventArgs<IPin> e)
-    {
-        int colorsCount = Colors.Count();
-        int positionsCount = Positions.Count();
-        if (colorsCount == positionsCount)
-            return;
-
-        while (colorsCount > positionsCount)
-        {
-            IPin pinToRemove = Colors.Last();
-            Colors.Remove(pinToRemove);
-
-            --colorsCount;
-        }
-
-        while (positionsCount > colorsCount)
-        {
-            IPin pinToRemove = Positions.Last();
-            Positions.Remove(pinToRemove);
-            --positionsCount;
-        }
-
-        RenamePins();
-    }
-
-    private void OnPinAdded(object? sender, SingleValueEventArgs<IPin> e)
-    {
-        int colorsCount = Colors.Count();
-        int positionsCount = Positions.Count();
-        if (colorsCount == positionsCount)
-            return;
-
-        while (colorsCount < positionsCount)
-        {
-            Colors.Add(Colors.CreatePin());
-
-            ++colorsCount;
-        }
-
-        while (positionsCount < colorsCount)
-        {
-            Positions.Add(Positions.CreatePin());
-
-            ++positionsCount;
-        }
-
-        RenamePins();
-    }
-
-    private void RenamePins()
-    {
-        int colors = 0;
-        foreach (IPin item in Colors)
-        {
-            item.Name = $"Color #{++colors}";
-        }
-
-        int positions = 0;
-        foreach (IPin item in Positions)
-        {
-            item.Name = $"Position #{++positions}";
-        }
-    }
-
-    public override void Evaluate()
-    {
-        List<ColorGradientStop> stops = new List<ColorGradientStop>();
-        InputPin<SKColor>[] colors = Colors.Pins.ToArray();
-        InputPin<Numeric>[] positions = Positions.Pins.ToArray();
-        for (int i = 0; i < colors.Length; i++)
-        {
-            stops.Add(new ColorGradientStop(colors[i].Value, positions[i].Value));
-        }
-
-        Gradient.Value = new ColorGradient(stops);
-    }
-}

src/Artemis.VisualScripting/Nodes/Color/ColorGradientNode.cs

@@ -1,108 +0,0 @@
-using System.Collections.Specialized;
-using Artemis.Core;
-using Artemis.VisualScripting.Nodes.Color.Screens;
-using SkiaSharp;
-
-namespace Artemis.VisualScripting.Nodes.Color;
-
-[Node("Color Gradient (Simple)", "Outputs a color gradient with the given colors", "Color", OutputType = typeof(ColorGradient))]
-public class ColorGradientNode : Node<ColorGradient, ColorGradientNodeCustomViewModel>
-{
-    private readonly List<InputPin> _inputPins;
-
-    public ColorGradientNode()
-    {
-        _inputPins = new List<InputPin>();
-
-        Gradient = ColorGradient.GetUnicornBarf();
-        Output = CreateOutputPin<ColorGradient>();
-        ViewModelPosition = CustomNodeViewModelPosition.AbovePins;
-    }
-
-    public ColorGradient Gradient { get; private set; }
-    public OutputPin<ColorGradient> Output { get; }
-
-    public override void Initialize(INodeScript script)
-    {
-        UpdateGradient();
-        ComputeInputPins();
-
-        // Not expecting storage to get modified, but lets just make sure
-        StorageModified += OnStorageModified;
-    }
-
-    public override void Evaluate()
-    {
-        ColorGradientStop[] stops = Gradient.ToArray();
-
-        if (_inputPins.Count != stops.Length)
-            return;
-
-        for (int i = 0; i < _inputPins.Count; i++)
-        {
-            // if nothing is connected, leave the stop alone.
-            if (_inputPins[i].ConnectedTo.Count == 0)
-                continue;
-
-            // if the pin has a connection, update the stop.
-            if (_inputPins[i].PinValue is SKColor color)
-                stops[i].Color = color;
-        }
-
-        Output.Value = Gradient;
-    }
-
-    private void DisconnectAllInputPins()
-    {
-        foreach (InputPin item in _inputPins)
-            item.DisconnectAll();
-    }
-
-    private void UpdateGradient()
-    {
-        Gradient.CollectionChanged -= OnGradientCollectionChanged;
-        if (Storage != null)
-            Gradient = Storage;
-        else
-            Storage = Gradient;
-        Gradient.CollectionChanged += OnGradientCollectionChanged;
-    }
-
-    private void ComputeInputPins()
-    {
-        int newAmount = Gradient.Count;
-        if (newAmount == _inputPins.Count)
-            return;
-
-        while (newAmount > _inputPins.Count)
-            _inputPins.Add(CreateOrAddInputPin(typeof(SKColor), string.Empty));
-
-        while (newAmount < _inputPins.Count)
-        {
-            InputPin pin = _inputPins.Last();
-            RemovePin(pin);
-            _inputPins.Remove(pin);
-        }
-
-        int index = 0;
-        foreach (InputPin item in _inputPins)
-            item.Name = $"Color #{++index}";
-    }
-    
-    private void OnStorageModified(object? sender, EventArgs e)
-    {
-        UpdateGradient();
-        ComputeInputPins();
-    }
-
-    private void OnGradientCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-    {
-        // if the user reorders the gradient, let it slide and do nothing.
-        // of course, the user might want to change the input pins since they will no longer line up.
-        if (e.Action == NotifyCollectionChangedAction.Move)
-            return;
-
-        // DisconnectAllInputPins();
-        ComputeInputPins();
-    }
-}

src/Artemis.VisualScripting/Nodes/Color/DarkenSKColorNode.cs

@@ -1,26 +0,0 @@
-using Artemis.Core;
-using SkiaSharp;
-
-namespace Artemis.VisualScripting.Nodes.Color;
-
-[Node("Darken Color", "Darkens a color by a specified amount in percent", "Color", InputType = typeof(SKColor), OutputType = typeof(SKColor))]
-public class DarkenSKColorNode : Node
-{
-    public DarkenSKColorNode()
-    {
-        Input = CreateInputPin<SKColor>("Color");
-        Percentage = CreateInputPin<Numeric>("%");
-        Output = CreateOutputPin<SKColor>();
-    }
-
-    public InputPin<SKColor> Input { get; }
-    public InputPin<Numeric> Percentage { get; }
-    public OutputPin<SKColor> Output { get; set; }
-
-    public override void Evaluate()
-    {
-        Input.Value.ToHsl(out float h, out float s, out float l);
-        l -= l * (Percentage.Value / 100f);
-        Output.Value = SKColor.FromHsl(h, s, l);
-    }
-}

src/Artemis.VisualScripting/Nodes/Color/DesaturateSKColorNode.cs

@@ -1,26 +0,0 @@
-using Artemis.Core;
-using SkiaSharp;
-
-namespace Artemis.VisualScripting.Nodes.Color;
-
-[Node("Desaturate Color", "Desaturates a color by a specified amount in percent", "Color", InputType = typeof(SKColor), OutputType = typeof(SKColor))]
-public class DesaturateSKColorNode : Node
-{
-    public DesaturateSKColorNode()
-    {
-        Input = CreateInputPin<SKColor>("Color");
-        Percentage = CreateInputPin<Numeric>("%");
-        Output = CreateOutputPin<SKColor>();
-    }
-
-    public InputPin<SKColor> Input { get; }
-    public InputPin<Numeric> Percentage { get; }
-    public OutputPin<SKColor> Output { get; set; }
-
-    public override void Evaluate()
-    {
-        Input.Value.ToHsl(out float h, out float s, out float l);
-        s -= s * (Percentage.Value / 100f);
-        Output.Value = SKColor.FromHsl(h, Math.Clamp(s, 0f, 100f), l);
-    }
-}

src/Artemis.VisualScripting/Nodes/Color/GradientBuilderNode.cs

@@ -1,50 +0,0 @@
-using Artemis.Core;
-using SkiaSharp;
-
-namespace Artemis.VisualScripting.Nodes.Color
-{
-    [Node("Gradient Builder", "Generates a gradient based on some values", "Color", OutputType = typeof(ColorGradient), HelpUrl = "https://krazydad.com/tutorials/makecolors.php")]
-    public class GradientBuilderNode : Node
-    {
-        public OutputPin<ColorGradient> Output { get; }
-
-        public InputPin<Numeric> Frequency1 { get; }
-        public InputPin<Numeric> Frequency2 { get; }
-        public InputPin<Numeric> Frequency3 { get; }
-        public InputPin<Numeric> Phase1 { get; }
-        public InputPin<Numeric> Phase2 { get; }
-        public InputPin<Numeric> Phase3 { get; }
-        public InputPin<Numeric> Center { get; }
-        public InputPin<Numeric> Width { get; }
-        public InputPin<Numeric> Length { get; }
-
-        public GradientBuilderNode()
-        {
-            Output = CreateOutputPin<ColorGradient>();
-            Frequency1 = CreateInputPin<Numeric>("Frequency 1");
-            Frequency2 = CreateInputPin<Numeric>("Frequency 2");
-            Frequency3 = CreateInputPin<Numeric>("Frequency 3");
-            Phase1 = CreateInputPin<Numeric>("Phase 1");
-            Phase2 = CreateInputPin<Numeric>("Phase 2");
-            Phase3 = CreateInputPin<Numeric>("Phase 3");
-            Center = CreateInputPin<Numeric>("Center");
-            Width = CreateInputPin<Numeric>("Width");
-            Length = CreateInputPin<Numeric>("Length");
-        }
-
-        public override void Evaluate()
-        {
-            ColorGradient gradient = new ColorGradient();
-
-            for (int i = 0; i < Length.Value; i++)
-            {
-                Numeric r = Math.Sin(Frequency1.Value * i + Phase1.Value) * Width.Value + Center.Value;
-                Numeric g = Math.Sin(Frequency2.Value * i + Phase2.Value) * Width.Value + Center.Value;
-                Numeric b = Math.Sin(Frequency3.Value * i + Phase3.Value) * Width.Value + Center.Value;
-                gradient.Add(new ColorGradientStop(new SKColor((byte)r, (byte)g, (byte)b), i / Length.Value));
-            }
-
-            Output.Value = gradient;
-        }
-    }
-}

src/Artemis.VisualScripting/Nodes/Color/HslSKColorNode.cs

@@ -1,31 +0,0 @@
-using Artemis.Core;
-using SkiaSharp;
-
-namespace Artemis.VisualScripting.Nodes.Color;
-
-[Node("HSL Color", "Creates a color from hue, saturation and lightness numbers", "Color", InputType = typeof(Numeric), OutputType = typeof(SKColor))]
-public class HslSKColorNode : Node
-{
-    public HslSKColorNode()
-    {
-        H = CreateInputPin<Numeric>("H");
-        S = CreateInputPin<Numeric>("S");
-        L = CreateInputPin<Numeric>("L");
-        Output = CreateOutputPin<SKColor>();
-    }
-
-    public InputPin<Numeric> H { get; set; }
-    public InputPin<Numeric> S { get; set; }
-    public InputPin<Numeric> L { get; set; }
-    public OutputPin<SKColor> Output { get; }
-
-    #region Overrides of Node
-
-    /// <inheritdoc />
-    public override void Evaluate()
-    {
-        Output.Value = SKColor.FromHsl(H.Value, S.Value, L.Value);
-    }
-
-    #endregion
-}