CSV Metrics Logger Generator/CSVConverterGenerator.cs

@@ -29,6 +29,9 @@ public class CSVConverterGenerator : ISourceGenerator
 
     private void ProcessStructure(GeneratorExecutionContext context, TypeDeclarationSyntax dataStructure)
     {
+        var generatedFileName = $"{dataStructure.Identifier}.Generated.cs";
+        var namespaceName = this.GetNamespaceFrom(dataStructure);
+        
         var accessModifiers = string.Join(' ', dataStructure.Modifiers.Select(n => n.Text));
         var declarationType = dataStructure switch
         {
@@ -37,22 +40,27 @@ public class CSVConverterGenerator : ISourceGenerator
             
             _ => string.Empty
         };
-        var namespaceName = this.GetNamespaceFrom(dataStructure);
-        var parameterProperties = dataStructure.ParameterList?.Parameters.Select(n => n.Identifier.ValueText).ToList() ?? [];
-        var bodyProperties = dataStructure.Members.OfType<PropertyDeclarationSyntax>().Select(n => n.Identifier.ValueText).ToList();
-        var allProperties = new List<string>(parameterProperties);
-        allProperties.AddRange(bodyProperties);
+        
+        var typeParameters = dataStructure switch
+        {
+            { TypeParameterList: not null } => $"<{string.Join(", ", dataStructure.TypeParameterList.Parameters.Select(t => t.Identifier.Text))}>",
+            _ => string.Empty
+        };
+
+        var parameterProperties = dataStructure.ParameterList?.Parameters.Select(n => n.Identifier.ValueText) ?? [];
+        var bodyProperties = dataStructure.Members.OfType<PropertyDeclarationSyntax>().Select(n => n.Identifier.ValueText);
+        var allProperties = parameterProperties.Concat(bodyProperties).ToList();
         
         var numberProperties = allProperties.Count;
         var header = string.Join(ARRAY_DELIMITER, allProperties.Select(n => $"\"{n}\""));
-        var allFieldsString = string.Join(ARRAY_DELIMITER, allProperties.Select(n => $"this.{n}.ToString(CultureInfo.InvariantCulture)"));
+        var allFieldsString = string.Join(ARRAY_DELIMITER, allProperties.Select(n => $$"""string.Create(CultureInfo.InvariantCulture, $"{this.{{n}}}")"""));
         
         var sourceCode = SourceText.From(
             $$"""
               using System.Globalization;
               using CSV_Metrics_Logger;
               namespace {{namespaceName}};
-              {{accessModifiers}} {{declarationType}} {{dataStructure.Identifier}} : IConvertToCSV
+              {{accessModifiers}} {{declarationType}} {{dataStructure.Identifier}}{{typeParameters}} : IConvertToCSV
               {
                   public uint GetCSVColumnCount()
                   {
@@ -71,7 +79,7 @@ public class CSVConverterGenerator : ISourceGenerator
               }
               """, Encoding.UTF8);
         
-        context.AddSource($"{dataStructure.Identifier}.Generated.cs", sourceCode);
+        context.AddSource(generatedFileName, sourceCode);
     }
 
     private string GetNamespaceFrom(SyntaxNode? node) => node switch

CSV Metrics Logger/CSV Metrics Logger.csproj

@@ -25,10 +25,16 @@
     </PropertyGroup>
 
     <ItemGroup Condition="'$(UseLocalProjects)' == 'true'">
-      <ProjectReference Include="..\CSV Metrics Logger Generator\CSV Metrics Logger Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+      <ProjectReference Include="..\CSV Metrics Logger Generator\CSV Metrics Logger Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>build; analyzers; buildtransitive</IncludeAssets>
+      </ProjectReference>
     </ItemGroup>
     <ItemGroup Condition="'$(UseLocalProjects)' == 'false'">
-        <PackageReference Include="CSVMetricsLoggerGenerator" Version="1.0.0" />
+        <PackageReference Include="CSVMetricsLoggerGenerator" Version="1.0.0" OutputItemType="Analyzer" ReferenceOutputAssembly="false">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

Tests/TestGeneric.cs

@@ -0,0 +1,8 @@
+using System.Numerics;
+
+using CSV_Metrics_Logger;
+
+namespace Tests;
+
+[CSVRecord]
+public readonly partial record struct TestGeneric<TNum>(string Name, sbyte Age, TNum Value) where TNum : IFloatingPointIeee754<TNum>;

Tests/Tests.cs

@@ -60,6 +60,23 @@ public sealed class Tests
         });
     }
     
+    [Test]
+    public void TestGeneric()
+    {
+        var testData = new TestGeneric<float>("Bob", 120, 4.78f);
+        Assert.Multiple(() =>
+        {
+            var numberColumns = testData.GetCSVColumnCount();
+            Assert.That(numberColumns, Is.EqualTo(3));
+            
+            var header = testData.GetCSVHeaders();
+            Assert.That(header, Is.EquivalentTo(new[] { "Name", "Age", "Value" }));
+            
+            var dataLine = testData.ConvertToCSVDataLine();
+            Assert.That(dataLine, Is.EquivalentTo(new[] { "Bob", "120", "4.78" }));
+        });
+    }
+    
     [Test]
     public void TestRegularStruct()
     {

Tests/Tests.csproj

@@ -12,7 +12,7 @@
 
     <ItemGroup>
         <PackageReference Include="coverlet.collector" Version="6.0.0"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
         <PackageReference Include="NUnit" Version="3.14.0"/>
         <PackageReference Include="NUnit.Analyzers" Version="3.9.0"/>
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0"/>