Move MethodBuilder and RecordingGeneratorsFactory to Generators (#45)

* Initial plan

* Move MethodBuilder and RecordingGeneratorsFactory from Abstractions to Generators

Co-authored-by: dex3r <3155725+dex3r@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: dex3r <3155725+dex3r@users.noreply.github.com>
Co-authored-by: Mateusz Krzaczek <dex3r@users.noreply.github.com>

Author: Copilot

MattSourceGenHelpers.Generators/Consts.cs

@@ -9,12 +9,14 @@ public static class Consts
     public const string SolutionNamespace = $"{nameof(MattSourceGenHelpers)}";
     public const string AbstractionsNamespace = $"{nameof(MattSourceGenHelpers)}.{nameof(Abstractions)}";
     public const string AbstractionsAssemblyName = AbstractionsNamespace;
+    public const string GeneratorsNamespace = "MattSourceGenHelpers.Generators";
+    public const string GeneratorsAssemblyName = GeneratorsNamespace;
     public const string SwitchCaseAttributeFullName = $"{AbstractionsNamespace}.{nameof(SwitchCase)}";
     public const string SwitchDefaultAttributeFullName = $"{AbstractionsNamespace}.{nameof(SwitchDefault)}";
     public const string GeneratesMethodAttributeFullName = $"{AbstractionsNamespace}.{nameof(GeneratesMethod)}";
     public const string IMethodImplementationGeneratorFullName = $"{AbstractionsNamespace}.{nameof(IMethodImplementationGenerator)}";
     public const string GenerateTypeFullName = $"{AbstractionsNamespace}.{nameof(Generate)}";
-    public const string RecordingGeneratorsFactoryTypeFullName = $"{AbstractionsNamespace}.{nameof(RecordingGeneratorsFactory)}";
+    public const string RecordingGeneratorsFactoryTypeFullName = $"{GeneratorsNamespace}.{nameof(RecordingGeneratorsFactory)}";
     public const string CurrentGeneratorPropertyName = nameof(Generate.CurrentGenerator);
     public const string LastRecordPropertyName = nameof(RecordingGeneratorsFactory.LastRecord);
 }

MattSourceGenHelpers.Generators/GeneratesMethodExecutionRuntime.cs

@@ -135,10 +135,10 @@ reference.Display is not null
             }
 
             Type? generatorStaticType = abstractionsAssembly.GetType(Consts.GenerateTypeFullName);
-            Type? recordingFactoryType = abstractionsAssembly.GetType(Consts.RecordingGeneratorsFactoryTypeFullName);
+            Type? recordingFactoryType = assembly.GetType(Consts.RecordingGeneratorsFactoryTypeFullName);
             if (generatorStaticType == null || recordingFactoryType == null)
             {
-                return (null, $"Could not find {Consts.GenerateTypeFullName} or {Consts.RecordingGeneratorsFactoryTypeFullName} types in Abstractions assembly");
+                return (null, $"Could not find {Consts.GenerateTypeFullName} or {Consts.RecordingGeneratorsFactoryTypeFullName} types in compiled assembly");
             }
 
             object? recordingFactory = Activator.CreateInstance(recordingFactoryType);
@@ -339,12 +339,26 @@ private static CSharpCompilation BuildExecutionCompilation(
         Compilation compilation)
     {
         string dummySource = BuildDummyImplementation(allPartialMethods);
+        string methodBuilderSource = ReadEmbeddedResource($"{Consts.GeneratorsAssemblyName}.MethodBuilder.cs");
+        string recordingFactorySource = ReadEmbeddedResource($"{Consts.GeneratorsAssemblyName}.RecordingGeneratorsFactory.cs");
         CSharpParseOptions parseOptions = compilation.SyntaxTrees.FirstOrDefault()?.Options as CSharpParseOptions
                                          ?? CSharpParseOptions.Default;
 
         return (CSharpCompilation)compilation
             .WithOptions(new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary))
-            .AddSyntaxTrees(CSharpSyntaxTree.ParseText(dummySource, parseOptions));
+            .AddSyntaxTrees(
+                CSharpSyntaxTree.ParseText(dummySource, parseOptions),
+                CSharpSyntaxTree.ParseText(methodBuilderSource, parseOptions),
+                CSharpSyntaxTree.ParseText(recordingFactorySource, parseOptions));
+    }
+
+    private static string ReadEmbeddedResource(string resourceName)
+    {
+        using Stream? stream = typeof(GeneratesMethodExecutionRuntime).Assembly.GetManifestResourceStream(resourceName);
+        if (stream == null)
+            throw new InvalidOperationException($"Embedded resource '{resourceName}' not found in {Consts.GeneratorsAssemblyName} assembly");
+        using StreamReader reader = new StreamReader(stream);
+        return reader.ReadToEnd();
     }
 
     private static string BuildDummyImplementation(IEnumerable<IMethodSymbol> partialMethods)

MattSourceGenHelpers.Generators/MattSourceGenHelpers.Generators.csproj

@@ -16,6 +16,10 @@
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
+   
+    <ItemGroup>
+         <None Include="..\README.md" Pack="true" PackagePath="\" />
+    </ItemGroup>
 
     <ItemGroup>
       <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
@@ -26,6 +30,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <None Include="..\README.md" Pack="true" PackagePath="\" />
+      <EmbeddedResource Include="MethodBuilder.cs" LogicalName="$(RootNamespace).MethodBuilder.cs" />
+      <EmbeddedResource Include="RecordingGeneratorsFactory.cs" LogicalName="$(RootNamespace).RecordingGeneratorsFactory.cs" />
     </ItemGroup>
 </Project>

…GenHelpers.Abstractions/MethodBuilder.cs …ceGenHelpers.Generators/MethodBuilder.csMattSourceGenHelpers.Abstractions/MethodBuilder.cs renamed to MattSourceGenHelpers.Generators/MethodBuilder.cs MattSourceGenHelpers.Abstractions/MethodBuilder.cs renamed to MattSourceGenHelpers.Generators/MethodBuilder.cs

@@ -1,4 +1,6 @@
-namespace MattSourceGenHelpers.Abstractions;
+using MattSourceGenHelpers.Abstractions;
+
+namespace MattSourceGenHelpers.Generators;
 
 public class MethodBuilder(IGeneratorsFactory generatorsFactory) : IMethodBuilder
 {
@@ -10,4 +12,4 @@ public class MethodBuilder(IGeneratorsFactory generatorsFactory) : IMethodBuilde
 public class MethodBuilder<TArg1>(IGeneratorsFactory generatorsFactory) : IMethodBuilder<TArg1>
 {
     public IMethodImplementationGenerator<TArg1, TReturnType> WithReturnType<TReturnType>() => generatorsFactory.CreateImplementation<TArg1, TReturnType>();
-}
+}

…stractions/RecordingGeneratorsFactory.cs …Generators/RecordingGeneratorsFactory.csMattSourceGenHelpers.Abstractions/RecordingGeneratorsFactory.cs renamed to MattSourceGenHelpers.Generators/RecordingGeneratorsFactory.cs MattSourceGenHelpers.Abstractions/RecordingGeneratorsFactory.cs renamed to MattSourceGenHelpers.Generators/RecordingGeneratorsFactory.cs

@@ -1,12 +1,13 @@
-using JetBrains.Annotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MattSourceGenHelpers.Abstractions;
 
-namespace MattSourceGenHelpers.Abstractions;
+namespace MattSourceGenHelpers.Generators;
 
 public class SwitchBodyRecord
 {
-    [UsedImplicitly]
     public List<object> CaseKeys { get; } = new();
-    [UsedImplicitly]
     public List<object?> CaseValues { get; } = new();
     public bool HasDefaultCase { get; set; }
 }