Refactor folder stucture

Needlework.Net.Core.Tests/LcuSchemaHandlerTest.cs

@@ -1,27 +0,0 @@
-using Xunit.Abstractions;
-
-namespace Needlework.Net.Core.Tests;
-
-public class LcuSchemaHandlerTest
-{
-    private readonly ITestOutputHelper _output;
-
-    internal HttpClient HttpClient { get; } = new();
-
-    public LcuSchemaHandlerTest(ITestOutputHelper output)
-    {
-        _output = output;
-    }
-
-    [Fact]
-    public async Task PluginsTestAsync()
-    {
-        var reader = new LcuSchemaHandler(await Resources.GetOpenApiDocumentAsync(HttpClient));
-
-        var plugins = reader.Plugins.Keys.ToList();
-        foreach (var plugin in plugins)
-            _output.WriteLine($"Plugin: {plugin}");
-
-        Assert.True(plugins.Count > 0);
-    }
-}

Needlework.Net.Core.Tests/Needlework.Net.Core.Tests.csproj

@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.5.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Using Include="Xunit" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Needlework.Net.Core\Needlework.Net.Core.csproj" />
-  </ItemGroup>
-
-</Project>

Needlework.Net.Core.Tests/ResourcesTest.cs

@@ -1,23 +0,0 @@
-using Xunit.Abstractions;
-
-namespace Needlework.Net.Core.Tests;
-
-public class ResourcesTest
-{
-    private readonly ITestOutputHelper _output;
-
-    internal HttpClient HttpClient { get; } = new();
-
-    public ResourcesTest(ITestOutputHelper output)
-    {
-        _output = output;
-    }
-
-    [Fact]
-    public async Task DocumentTestAsync()
-    {
-        var document = await Resources.GetOpenApiDocumentAsync(HttpClient);
-
-        Assert.True(document.Info.Title == "LCU SCHEMA");
-    }
-}

Needlework.Net.Core/Needlework.Net.Core.csproj

@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.OpenApi" Version="1.6.16" />
-    <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.16" />
-  </ItemGroup>
-
-</Project>

Needlework.Net.sln

@@ -3,12 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Needlework.Net.Core", "Needlework.Net.Core\Needlework.Net.Core.csproj", "{B14E1B39-3C5A-400F-8148-CC3A4833CBC4}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Needlework.Net", "Needlework.Net\Needlework.Net.csproj", "{7388B579-2DC0-46D6-957A-6683D0FCF5D3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Needlework.Net.Core.Tests", "Needlework.Net.Core.Tests\Needlework.Net.Core.Tests.csproj", "{0E08542E-6E3F-4825-9F9C-7D6275D6AEC5}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -18,17 +14,9 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B14E1B39-3C5A-400F-8148-CC3A4833CBC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B14E1B39-3C5A-400F-8148-CC3A4833CBC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B14E1B39-3C5A-400F-8148-CC3A4833CBC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B14E1B39-3C5A-400F-8148-CC3A4833CBC4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7388B579-2DC0-46D6-957A-6683D0FCF5D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7388B579-2DC0-46D6-957A-6683D0FCF5D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7388B579-2DC0-46D6-957A-6683D0FCF5D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7388B579-2DC0-46D6-957A-6683D0FCF5D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0E08542E-6E3F-4825-9F9C-7D6275D6AEC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0E08542E-6E3F-4825-9F9C-7D6275D6AEC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0E08542E-6E3F-4825-9F9C-7D6275D6AEC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0E08542E-6E3F-4825-9F9C-7D6275D6AEC5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

Needlework.Net/Extensions/ServiceCollectionExtensions.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Needlework.Net.Extensions
+{
+    public static class ServiceCollectionExtensions
+    {
+        public static IServiceCollection AddSingletonsFromAssemblies<T>(this ServiceCollection services)
+        {
+            var types = AppDomain.CurrentDomain.GetAssemblies()
+                .SelectMany(s => s.GetTypes())
+                .Where(p => !p.IsAbstract && typeof(T).IsAssignableFrom(p));
+
+            foreach (var type in types) services.AddSingleton(typeof(T), type);
+
+            return services;
+        }
+    }
+}

Needlework.Net/Messages/DataReadyMessage.cs

@@ -1,9 +1,9 @@
 using CommunityToolkit.Mvvm.Messaging.Messages;
-using Needlework.Net.Core;
+using Needlework.Net.Models;
 
 namespace Needlework.Net.Messages
 {
-    public class DataReadyMessage(LcuSchemaHandler handler) : ValueChangedMessage<LcuSchemaHandler>(handler)
+    public class DataReadyMessage(OpenApiDocumentWrapper wrapper) : ValueChangedMessage<OpenApiDocumentWrapper>(wrapper)
     {
     }
 }

Needlework.Net/Messages/DataRequestMessage.cs

@@ -1,9 +1,9 @@
 using CommunityToolkit.Mvvm.Messaging.Messages;
-using Needlework.Net.Core;
+using Needlework.Net.Models;
 
 namespace Needlework.Net.Messages
 {
-    public class DataRequestMessage : RequestMessage<LcuSchemaHandler>
+    public class DataRequestMessage : RequestMessage<OpenApiDocumentWrapper>
     {
     }
 }

Needlework.Net/Models/GithubRelease.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Needlework.Net
+namespace Needlework.Net.Models
 {
     public class GithubRelease
     {

Needlework.Net/Models/OpenApiDocumentWrapper.cs

@@ -1,8 +1,9 @@
+using System.Collections.Generic;
 using Microsoft.OpenApi.Models;
 
-namespace Needlework.Net.Core;
+namespace Needlework.Net.Models;
 
-public class LcuSchemaHandler
+public class OpenApiDocumentWrapper
 {
     internal OpenApiDocument OpenApiDocument { get; }
 
@@ -12,7 +13,7 @@ public class LcuSchemaHandler
 
     public List<string> Paths => [.. OpenApiDocument.Paths.Keys];
 
-    public LcuSchemaHandler(OpenApiDocument openApiDocument)
+    public OpenApiDocumentWrapper(OpenApiDocument openApiDocument)
     {
         OpenApiDocument = openApiDocument;
         var plugins = new SortedDictionary<string, List<PathOperation>>();
@@ -68,5 +69,3 @@ public class LcuSchemaHandler
         Plugins = plugins;
     }
 }
-
-public record PathOperation(string Method, string Path, OpenApiOperation Operation);

Needlework.Net/Models/PathOperation.cs

@@ -0,0 +1,5 @@
+using Microsoft.OpenApi.Models;
+
+namespace Needlework.Net.Models;
+
+public record PathOperation(string Method, string Path, OpenApiOperation Operation);

Needlework.Net/Models/Resources.cs

@@ -1,7 +1,9 @@
-using Microsoft.OpenApi.Models;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers;
 
-namespace Needlework.Net.Core;
+namespace Needlework.Net.Models;
 
 public static class Resources
 {

Needlework.Net/Needlework.Net.csproj

@@ -33,6 +33,8 @@
     <PackageReference Include="Material.Icons.Avalonia" Version="2.1.10" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Microsoft.OpenApi" Version="1.6.17" />
+    <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.17" />
     <PackageReference Include="Projektanker.Icons.Avalonia" Version="9.4.0" />
     <PackageReference Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.4.0" />
     <PackageReference Include="TextMateSharp.Grammars" Version="1.0.62" />
@@ -42,10 +44,6 @@
     <AvaloniaResource Include="Assets\**" />	
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Needlework.Net.Core\Needlework.Net.Core.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <UpToDateCheckInput Remove="Views\AboutView.axaml" />
   </ItemGroup>

Needlework.Net/Program.cs

@@ -1,5 +1,6 @@
 using Avalonia;
 using Microsoft.Extensions.DependencyInjection;
+using Needlework.Net.Extensions;
 using Needlework.Net.Services;
 using Needlework.Net.ViewModels;
 using Projektanker.Icons.Avalonia;
@@ -36,12 +37,7 @@ class Program
 
         builder.AddSingleton<MainWindowViewModel>();
         builder.AddSingleton<WindowService>();
-        // Dynamically add ViewModels
+        builder.AddSingletonsFromAssemblies<PageBase>();
-        var types = AppDomain.CurrentDomain.GetAssemblies()
-          .SelectMany(s => s.GetTypes())
-          .Where(p => !p.IsAbstract && typeof(PageBase).IsAssignableFrom(p));
-        foreach (var type in types)
-            builder.AddSingleton(typeof(PageBase), type);
        
         builder.AddHttpClient();
 

Needlework.Net/ViewModels/EndpointViewModel.cs

@@ -3,7 +3,6 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
 using Needlework.Net.Messages;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 
 namespace Needlework.Net.ViewModels

Needlework.Net/ViewModels/MainWindowViewModel.cs

@@ -4,8 +4,8 @@ using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using FluentAvalonia.UI.Controls;
 using Microsoft.OpenApi.Models;
-using Needlework.Net.Core;
 using Needlework.Net.Messages;
+using Needlework.Net.Models;
 using Needlework.Net.Services;
 using System;
 using System.Collections.Generic;
@@ -32,7 +32,7 @@ namespace Needlework.Net.ViewModels
 
         public HttpClient HttpClient { get; }
         public WindowService WindowService { get; }
-        public LcuSchemaHandler? LcuSchemaHandler { get; set; }
+        public OpenApiDocumentWrapper? OpenApiDocumentWrapper { get; set; }
         public OpenApiDocument? HostDocument { get; set; }
 
         [ObservableProperty] private bool _isBusy = true;
@@ -105,8 +105,8 @@ namespace Needlework.Net.ViewModels
         {
             var document = await Resources.GetOpenApiDocumentAsync(HttpClient);
             HostDocument = document;
-            var handler = new LcuSchemaHandler(document);
+            var handler = new OpenApiDocumentWrapper(document);
-            LcuSchemaHandler = handler;
+            OpenApiDocumentWrapper = handler;
 
             WeakReferenceMessenger.Default.Send(new DataReadyMessage(handler));
             IsBusy = false;
@@ -114,7 +114,7 @@ namespace Needlework.Net.ViewModels
 
         public void Receive(DataRequestMessage message)
         {
-            message.Reply(LcuSchemaHandler!);
+            message.Reply(OpenApiDocumentWrapper!);
         }
 
         public void Receive(HostDocumentRequestMessage message)

Needlework.Net/ViewModels/PathOperationViewModel.cs

@@ -3,8 +3,8 @@ using BlossomiShymae.GrrrLCU;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
-using Needlework.Net.Core;
 using Needlework.Net.Messages;
+using Needlework.Net.Models;
 using System;
 using System.Net.Http;
 using System.Text;