Merge branch 'hotfix/v1.4.1'

Author: CodeCasterNL

JsonTestClasses.cs

@@ -209,7 +209,6 @@ public class FooAttributes
         [DataMember(Name = "YesNo")]
         public bool BoolProperty { get; set; }
     }
-
 }
 
 // These are here so the attribute test works. This is a standalone file without references, so Roslyn won't know the attributes otherwise.

src/CodeCaster.SerializeThis.Serialization.Json/AttributeExtensions.cs

@@ -0,0 +1,30 @@
+using System.Linq;
+
+namespace CodeCaster.SerializeThis.Serialization.Json
+{
+    public static class AttributeExtensions
+    {
+        /// <summary>
+        /// Returns the Nth constructor argument (if passed non-null argument), or the given property name's value, or null if not found.
+        ///
+        /// For example `[Foo("Bar")]` will return "Bar" for GetArgOrNamedProperty(0, null), `[Foo(Baz = "Bar"]` will return "Bar" for GetArgOrNamedProperty(null, "Baz").
+        /// </summary>
+        public static string GetArgOrNamedProperty(this AttributeInfo attribute, int? constructorArgumentIndex, string propertyName)
+        {
+
+            if (constructorArgumentIndex.HasValue && attribute.ConstructorArguments.Length == constructorArgumentIndex + 1)
+            {
+                return attribute.ConstructorArguments[0]?.ToString();
+            }
+
+            if (string.IsNullOrWhiteSpace(propertyName))
+            {
+                return null;
+            }
+
+            return attribute.Properties.Where(namedArg => namedArg.Key == propertyName)
+                .Select(namedArg => namedArg.Value?.ToString())
+                .FirstOrDefault();
+        }
+    }
+}

src/CodeCaster.SerializeThis.Serialization.Json/ClassInfoExtensions.cs

@@ -0,0 +1,47 @@
+using System.Linq;
+
+namespace CodeCaster.SerializeThis.Serialization.Json
+{
+    public static class ClassInfoExtensions
+    {
+        /// <summary>
+        /// Returns the declared property name, or its name if overridden through any known attributes such as [JsonProperty], [DataMember].
+        /// </summary>
+        public static string GetPropertyName(this ClassInfo typeInfo, ClassInfo containingTypeInfo)
+        {
+            return typeInfo.GetPropertyNameFromAttributes(containingTypeInfo)
+                   ?? typeInfo.Name;
+        }
+
+        private static string GetPropertyNameFromAttributes(this ClassInfo typeInfo, ClassInfo containingTypeInfo)
+        {
+            if (!typeInfo.Attributes.Any())
+            {
+                return null;
+            }
+
+            foreach (var attribute in typeInfo.Attributes)
+            {
+                switch (attribute.Name)
+                {
+                    case TypeNameConstants.NewtonsoftJsonPropertyAttribute:
+                        return attribute.GetArgOrNamedProperty(0, TypeNameConstants.PropertyName);
+
+                    case TypeNameConstants.SystemTextJsonPropertyAttribute:
+                        return attribute.GetArgOrNamedProperty(0, TypeNameConstants.Name);
+
+                    // [DataMember] only applies inside a class marked with [DataContract].
+                    case TypeNameConstants.DataMemberAttribute:
+                        return containingTypeInfo?.Class.Attributes.Any(a => a.Name == TypeNameConstants.DataContractAttribute) == true
+                            ? attribute.GetArgOrNamedProperty(null, TypeNameConstants.Name)
+                            : null;
+
+                    default:
+                        continue;
+                }
+            }
+
+            return null;
+        }
+    }
+}

src/CodeCaster.SerializeThis.Serialization.Json/CodeCaster.SerializeThis.Serialization.Json.csproj

@@ -44,8 +44,11 @@
     <Compile Include="..\SolutionInfo.cs">
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
+    <Compile Include="ClassInfoExtensions.cs" />
     <Compile Include="JsonSerializer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="AttributeExtensions.cs" />
+    <Compile Include="TypeNameConstants.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CodeCaster.SerializeThis.Serialization\CodeCaster.SerializeThis.Serialization.csproj">

src/CodeCaster.SerializeThis.Serialization.Json/JsonSerializer.cs

@@ -46,13 +46,14 @@ private JObject GetComplexType(ClassInfo toSerialize)
 
             foreach (var child in toSerialize.Class.Children)
             {
+                var propertyName = child.GetPropertyName(toSerialize);
                 var childProperty = SerializeChild(child);
-                existing[child.Name] = childProperty;
+                existing[propertyName] = childProperty;
             }
 
             return existing;
         }
-
+        
         private JToken SerializeChild(ClassInfo child)
         {
             if (child.Class.CollectionType == CollectionType.Dictionary)

src/CodeCaster.SerializeThis.Serialization.Json/TypeNameConstants.cs

@@ -0,0 +1,18 @@
+namespace CodeCaster.SerializeThis.Serialization.Json
+{
+    public static class TypeNameConstants
+    {
+        public const string NewtonsoftJsonPropertyAttribute = "Newtonsoft.Json.JsonPropertyAttribute";
+
+        public const string SystemTextJsonPropertyAttribute = "System.Text.Json.JsonPropertyNameAttribute";
+
+        public const string DataMemberAttribute = "System.Runtime.Serialization.DataMemberAttribute";
+
+        public const string DataContractAttribute = "System.Runtime.Serialization.DataContractAttribute";
+
+
+        public const string Name = "Name";
+
+        public const string PropertyName = "PropertyName";
+    }
+}

src/CodeCaster.SerializeThis.Serialization.Roslyn/AttributeDataExtensions.cs

@@ -1,30 +1,23 @@
-using Microsoft.CodeAnalysis;
+using System;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
 using System.Linq;
 
 namespace CodeCaster.SerializeThis.Serialization.Roslyn
 {
     public static class AttributeDataExtensions
     {
-        /// <summary>
-        /// Returns the Nth constructor argument (if passed non-null argument), or the given property name's value.
-        ///
-        /// For example `[Foo("Bar")]` will return "Bar" for GetArgOrNamedProperty(0, null), `[Foo(Baz = "Bar"]` will return "Bar" for GetArgOrNamedProperty(null, "Baz").
-        /// </summary>
-        public static string GetArgOrNamedProperty(this AttributeData attribute, int? constructorArgumentIndex, string propertyName)
+        public static AttributeInfo[] Map(this ImmutableArray<AttributeData> attributes)
         {
-            if (constructorArgumentIndex.HasValue && attribute.ConstructorArguments.Length == constructorArgumentIndex + 1)
-            {
-                return attribute.ConstructorArguments[0].Value?.ToString();
-            }
-
-            if (string.IsNullOrWhiteSpace(propertyName))
-            {
-                return null;
-            }
-
-            return attribute.NamedArguments.Where(namedArg => namedArg.Key == propertyName)
-                                           .Select(namedArg => namedArg.Value.Value?.ToString())
-                                           .FirstOrDefault();
+            return attributes == null
+                ? Array.Empty<AttributeInfo>()
+                : attributes.Select(a => new AttributeInfo
+                {
+                    Name = a.AttributeClass.GetTypeName(withGenericParameterNames: true),
+                    ConstructorArguments = a.ConstructorArguments.Select(ca => ca.Value).ToArray(),
+                    Properties = a.NamedArguments.ToDictionary(na => na.Key, na => na.Value.Value),
+                })
+                .ToArray();
         }
     }
 }

src/CodeCaster.SerializeThis.Serialization.Roslyn/CodeCaster.SerializeThis.Serialization.Roslyn.csproj

@@ -50,7 +50,6 @@
     </Compile>
     <Compile Include="AttributeDataExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PropertySymbolExtensions.cs" />
     <Compile Include="TypeNameConstants.cs" />
     <Compile Include="TypeSymbolExtensions.cs" />
     <Compile Include="TypeSymbolParser.cs" />

src/CodeCaster.SerializeThis.Serialization.Roslyn/PropertySymbolExtensions.cs

@@ -7,19 +7,5 @@ public static class TypeNameConstants
         public const string GenericCollectionInterface = "System.Collections.Generic.ICollection";
 
         public const string GenericDictionaryInterface = "System.Collections.Generic.IDictionary";
-
-        public const string NewtonsoftJsonPropertyAttribute = "Newtonsoft.Json.JsonPropertyAttribute";
-
-        public const string SystemTextJsonPropertyAttribute = "System.Text.Json.JsonPropertyNameAttribute";
-
-        public const string DataMemberAttribute = "System.Runtime.Serialization.DataMemberAttribute";
-
-        public const string DataContractAttribute = "System.Runtime.Serialization.DataContractAttribute";
-
-        
-        public const string Name = "Name";
-        
-        public const string PropertyName = "PropertyName";
-
     }
 }