Add template working

src/BlueWest.MapTo/EfAddGeneratorContext.cs

@@ -12,16 +12,21 @@ using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace MapTo
 {
-    internal class EfGeneratorContext
+    internal class EfAddGeneratorContext
     {
         private readonly List<SymbolDisplayPart> _ignoredNamespaces;
 
-        public EfGeneratorContext(Compilation compilation, SourceGenerationOptions sourceGenerationOptions, MemberDeclarationSyntax memberSyntax)
+        protected EfAddGeneratorContext(
+            Compilation compilation, 
+            SourceGenerationOptions sourceGenerationOptions, 
+            MemberDeclarationSyntax memberSyntax,
+            string addSourceTemplate)
         {
             Compilation = compilation;
             _ignoredNamespaces = new();
             Diagnostics = ImmutableArray<Diagnostic>.Empty;
             Usings = ImmutableArray.Create("System", Constants.RootNamespace);
+            SourceTemplate = addSourceTemplate;
             SourceGenerationOptions = sourceGenerationOptions;
             MemberSyntax = memberSyntax;
             
@@ -30,6 +35,8 @@ namespace MapTo
             AddUsingIfRequired(sourceGenerationOptions.SupportNullableStaticAnalysis, "System.Diagnostics.CodeAnalysis");
         }
 
+        public string SourceTemplate { get; }
+
         public ImmutableArray<Diagnostic> Diagnostics { get; private set; }
 
         public EfMethodsModel? Model { get; private set; }
@@ -38,19 +45,21 @@ namespace MapTo
         
         protected INamedTypeSymbol MappingContextTypeSymbol { get; }
         
-        protected INamedTypeSymbol EfAddMethodsAttributeTypeSymbol { get; }
-
         protected SourceGenerationOptions SourceGenerationOptions { get; }
         
         protected MemberDeclarationSyntax MemberSyntax { get; }
 
         protected ImmutableArray<string> Usings { get; private set; }
 
-        public static EfGeneratorContext Create(Compilation compilation, SourceGenerationOptions sourceGenerationOptions, MemberDeclarationSyntax typeSyntax)
+        public static EfAddGeneratorContext Create(
+            Compilation compilation, 
+            SourceGenerationOptions sourceGenerationOptions, 
+            MemberDeclarationSyntax typeSyntax,
+            string addSourceTemplate)
         {
-            EfGeneratorContext context = typeSyntax switch
+            EfAddGeneratorContext context = typeSyntax switch
             {
-                PropertyDeclarationSyntax => new EfGeneratorContext(compilation, sourceGenerationOptions, typeSyntax),
+                PropertyDeclarationSyntax => new EfAddGeneratorContext(compilation, sourceGenerationOptions, typeSyntax, addSourceTemplate),
                 _ => throw new ArgumentOutOfRangeException()
             };
 
@@ -178,9 +187,9 @@ namespace MapTo
             // context name
             var dbContextName = classDeclarationSyntax.Identifier.ValueText;
             var namespaceDeclaration = classDeclarationSyntax.Parent as NamespaceDeclarationSyntax;
-            var namespaceFullName = namespaceDeclaration.Name.ToString();
+            var contextNamespace = namespaceDeclaration.Name.ToString();
             
-            var contextTypeFullName = $"{namespaceFullName}.{dbContextName}";
+            var contextTypeFullName = $"{contextNamespace}.{dbContextName}";
 
             var propertyName = entityTypeName;
             
@@ -208,7 +217,7 @@ namespace MapTo
 
             return new EfMethodsModel(
                 SourceGenerationOptions,
-                namespaceFullName,
+                contextNamespace,
                 propertyName,
                 dbContextName, 
                 contextTypeFullName, 

src/BlueWest.MapTo/EfAddMethodsGenerator.cs

@@ -10,20 +10,11 @@ using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace MapTo
 {
-    /*/// <summary>
-    /// Base source code generator typed class.
-    /// </summary>
-    public class SourceCodeGenerator : ISourceGenerator
-    {
-        public virtual void Initialize(GeneratorInitializationContext context) {}
-        public virtual void Execute(GeneratorExecutionContext context) {}
-    }*/
-    
     /// <summary>
     /// Ef methods source generator
     /// </summary>
     [Generator]
-    public class EfMethodsGenerator: ISourceGenerator
+    public class EfAddMethodsGenerator: ISourceGenerator
     {
          /// <inheritdoc />
         public void Initialize(GeneratorInitializationContext context)
@@ -59,7 +50,18 @@ namespace MapTo
             
             foreach (var memberDeclarationSyntax in candidateTypes)
             {
-                var mappingContext = EfGeneratorContext.Create(compilation, options, memberDeclarationSyntax);
+                string addSourceTemplate = string.Empty;
+
+                if (context.AdditionalFiles.Length > 0)
+                {
+                    addSourceTemplate = context.AdditionalFiles
+                        .FirstOrDefault()?
+                        .GetText()?
+                        .ToString() ?? string.Empty;
+                }
+                
+                var mappingContext = EfAddGeneratorContext.Create(compilation, options, memberDeclarationSyntax, addSourceTemplate);
+                
                 mappingContext.Diagnostics.ForEach(context.ReportDiagnostic);
                 
                 if (mappingContext.Model is null)
@@ -67,10 +69,9 @@ namespace MapTo
                     continue;
                 }
                 
-
                 var (source, hintName) = memberDeclarationSyntax switch
                 {
-                    PropertyDeclarationSyntax => EfMethodsSource.Generate(mappingContext.Model),
+                    PropertyDeclarationSyntax => EfMethodsSource.Generate(mappingContext.Model, addSourceTemplate),
                     _ => throw new ArgumentOutOfRangeException()
                 };
 

src/BlueWest.MapTo/Models.cs

@@ -74,7 +74,7 @@ namespace MapTo
         string Namespace,
         string PropertyName,
         string ContextTypeName,
-        string ContestFullType,
+        string ContextFullType,
         
         string EntityTypeFullName,
         string EntityTypeIdentifierName,

src/BlueWest.MapTo/Sources/EfMethodsSource.cs

@@ -1,4 +1,7 @@
 using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
 using MapTo.Extensions;
 using static MapTo.Sources.Constants;
 
@@ -6,13 +9,51 @@ namespace MapTo.Sources
 {
     internal static class EfMethodsSource
     {
-        internal static SourceCode Generate(EfMethodsModel model)
+    
+        static IEnumerable<string> GetFilesFromDir(string dir) =>
+            Directory.EnumerateFiles(dir);
+        internal static SourceCode Generate(EfMethodsModel model, string addSourceTemplate)
         {
-            const bool writeDebugInfo = false;
+            using var builder = new SourceBuilder();
             
-            List<string> constructorHeaders = new List<string>();
+            var entityTypeName = model.EntityTypeIdentifierName;
+            var entityTypeFullName = model.EntityTypeFullName;
+            var readTypeName = model.ReadTypeIdentifierName;
+            var readTypeFullName = model.ReadTypeFullName;
+            var createTypeName = model.CreateTypeIdentifierName;
+            var createTypeFullName = model.CreateTypeFullName;
+            var contextFullName = model.ContextFullType;
+            var propertyName = model.PropertyName;
+            var newEntityVarName = $"new{model.EntityTypeIdentifierName}";
+            var toCreateVarName = $"{model.EntityTypeIdentifierName.ToCamelCase()}ToCreate";
 
-            using var builder = new SourceBuilder()
+            if (!addSourceTemplate.IsEmpty())
+            {
+                builder
+                    .WriteLine(GeneratedFilesHeader)
+                    .WriteUsings(model.Usings);
+                
+                var templateToSourceBuilder = new StringBuilder(addSourceTemplate);
+                templateToSourceBuilder
+                        
+                    .Replace("{Namespace} ", model.Namespace)
+                    .Replace("{entityTypeName}", entityTypeName)
+                    .Replace("{readTypeFullName}", readTypeFullName)
+                    .Replace("{createTypeFullName}", createTypeFullName)
+                    .Replace("{contextFullName}", contextFullName)
+                    .Replace("{toCreateVarName}", toCreateVarName)
+                    .Replace("{newEntityVarName}", newEntityVarName)
+                    .Replace("{entityTypeFullName}", entityTypeFullName)
+                    .Replace("{propertyName}", propertyName);
+
+                builder
+                    .Write(templateToSourceBuilder.ToString());
+
+            }
+            
+            if (addSourceTemplate.IsEmpty())
+            {
+                builder
                 .WriteLine(GeneratedFilesHeader)
                     .WriteUsings(model.Usings)
                     .WriteLine("using Microsoft.EntityFrameworkCore;")
@@ -24,14 +65,14 @@ namespace MapTo.Sources
                     .WriteLine($"public static partial class {model.EntityTypeIdentifierName}Extensions")
                     .WriteOpeningBracket()
                     .WriteLine()
-                .WriteLine($"public static (bool, {model.ReadTypeFullName}) Add{model.EntityTypeIdentifierName}(")
+                    .WriteLine($"public static (bool, {model.ReadTypeFullName}) Add{entityTypeName}(")
-                .WriteLine($"this {model.ContestFullType} dbContext,")
+                    .WriteLine($"this {contextFullName} dbContext,")
-                .WriteLine($"{model.CreateTypeFullName} {model.EntityTypeIdentifierName.ToLower()}toCreate)")
+                    .WriteLine($"{createTypeFullName} {toCreateVarName})")
                     .WriteOpeningBracket()
-                .WriteLine($"var new{model.EntityTypeIdentifierName} = new {model.EntityTypeFullName}({model.EntityTypeIdentifierName.ToLower()}toCreate);")
+                    .WriteLine($"var {newEntityVarName} = new {model.EntityTypeFullName}({toCreateVarName});")
-                .WriteLine($"dbContext.{model.PropertyName}.Add(new{model.EntityTypeIdentifierName});")
+                    .WriteLine($"dbContext.{propertyName}.Add({newEntityVarName});")
                     .WriteLine($"var success = dbContext.SaveChanges() >= 0;")
-                .WriteLine($"return (success, new {model.ReadTypeFullName}(new{model.EntityTypeIdentifierName}));")
+                    .WriteLine($"return (success, new {readTypeFullName}({newEntityVarName}));")
                     .WriteClosingBracket();
                 builder
                     .WriteLine()
@@ -41,7 +82,11 @@ namespace MapTo.Sources
                     // End namespace declaration
                     .WriteClosingBracket();
 
-            return new(builder.ToString(), $"{model.Namespace}.{model.EntityTypeIdentifierName}Extensions.g.cs");
+            }
+
+            var generatedCode = builder.ToString();
+            var hintName = $"{model.EntityTypeIdentifierName}Extensions.g.cs";
+            return new(generatedCode, hintName);
         }
     }
 }

test/BlueWest.MapTo.Tests/Infrastructure/CSharpGenerator.cs

@@ -50,7 +50,7 @@ namespace MapTo.Tests.Infrastructure
             }
 
             var driver = CSharpGeneratorDriver.Create(
-                new List<ISourceGenerator>() { new MapToGenerator(), new EfMethodsGenerator() },
+                new List<ISourceGenerator>() { new MapToGenerator(), new EfAddMethodsGenerator() },
                 optionsProvider: new TestAnalyzerConfigOptionsProvider(analyzerConfigOptions),
                 parseOptions: new CSharpParseOptions(languageVersion)
             );