Merge pull request #17 from ronnygunawan/limi-to-classes-and-structs

Limit to Classes and Structs
ronnygunawan · Nov 15, 2023 · 02bc1ad · 02bc1ad
2 parents 718e649 + 874d98a
commit 02bc1ad
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/CsvSerializer/CsvSerializer.csproj b/CsvSerializer/CsvSerializer.csproj
@@ -15,7 +15,7 @@
     <RepositoryUrl>https://github.com/ronnygunawan/csv-serializer</RepositoryUrl>
     <PackageTags>csv serializer deserializer parser core</PackageTags>
     <Description>Fast CSV to object serializer and deserializer.</Description>
-    <Version>2.0.2</Version>
+    <Version>2.0.3</Version>
     <PackageReleaseNotes></PackageReleaseNotes>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
     <IsRoslynComponent>true</IsRoslynComponent>

diff --git a/CsvSerializer/Internals/SerializeOrDeserializeSyntaxReceiver.cs b/CsvSerializer/Internals/SerializeOrDeserializeSyntaxReceiver.cs
@@ -43,7 +43,8 @@ public void OnVisitSyntaxNode(GeneratorSyntaxContext context) {
 				} typeArguments
 				|| typeArguments[0] is not {
 					Name.Length: > 0,
-					DeclaringSyntaxReferences.Length: > 0
+					DeclaringSyntaxReferences.Length: > 0,
+					TypeKind: TypeKind.Class or TypeKind.Struct
 				}) {
 					return;
 				}
@@ -87,7 +88,8 @@ public void OnVisitSyntaxNode(GeneratorSyntaxContext context) {
 				} typeArguments
 				|| typeArguments[0] is not {
 					Name.Length: > 0,
-					DeclaringSyntaxReferences.Length: > 0
+					DeclaringSyntaxReferences.Length: > 0,
+					TypeKind: TypeKind.Class or TypeKind.Struct
 				}) {
 					return;
 				}

diff --git a/Tests/SerializerTests.cs b/Tests/SerializerTests.cs
@@ -1,6 +1,7 @@
 using Csv;
 using FluentAssertions;
 using System;
+using System.Configuration;
 using System.Globalization;
 using System.Linq;
 using System.Net;
@@ -202,6 +203,36 @@ public void CanDeserializeCsvFromExcel() {
 			ExcelModel[] models = CsvSerializer.Deserialize<ExcelModel>(csv, hasHeaders: true, delimiter: ';', provider: CultureInfo.GetCultureInfo("id-ID"));
 			models.Count().Should().Be(2);
 		}
+
+		[Fact]
+		public void TypeArgumentsAreSerializedUsingNaiveSerializer() {
+			string Serialize<T>(T item) {
+				return CsvSerializer.Serialize(new[] { item }, withHeaders: true, provider: CultureInfo.GetCultureInfo("en-US"));
+			}
+			Model item = new() {
+				Bool = true,
+				Byte = 0x66,
+				SByte = -100,
+				Short = -200,
+				UShort = 200,
+				Int = -3000,
+				UInt = 3000,
+				Long = -40000L,
+				ULong = 40000UL,
+				Float = 100000000000000.0f,
+				Double = 17837193718273812973.0,
+				Decimal = 989898989898m,
+				String = "CSV Serializer",
+				DateTime = new DateTime(2019, 8, 23),
+				Uri = new Uri("http://localhost:5000/"),
+				StatusCode = HttpStatusCode.OK
+			};
+			string csv = Serialize(item);
+			csv.Should().BeSimilarTo("""
+				"Bool","Byte","SByte","Short","UShort","Int","UInt","Long","ULong","Float","Double","Decimal","String","DateTime","Uri","StatusCode"
+				True,102,-100,-200,200,-3000,3000,-40000,40000,1E+14,1.7837193718273812E+19,989898989898,"CSV Serializer","8/23/2019 12:00:00 AM","http://localhost:5000/",OK
+				""");
+		}
 	}
 
 	public class ExcelModel {