Merge 226d766 into d39f78b

src/ExtendedXmlSerializer/ExtensionModel/DefaultExtensions.cs

@@ -59,6 +59,7 @@ public override IEnumerator<ISerializerExtension> GetEnumerator()
 			yield return new AllowedMemberValuesExtension();
 			yield return new MemberFormatExtension();
 			yield return ImmutableArrayExtension.Default;
+			yield return ImmutableListExtension.Default;
 			yield return SerializationExtension.Default;
 			yield return NullableStructureAwareExtension.Default;
 			yield return new CustomSerializationExtension();

src/ExtendedXmlSerializer/ExtensionModel/Types/ImmutableListExtension.cs

@@ -0,0 +1,94 @@
+using ExtendedXmlSerializer.ContentModel;
+using ExtendedXmlSerializer.ContentModel.Collections;
+using ExtendedXmlSerializer.ContentModel.Content;
+using ExtendedXmlSerializer.ContentModel.Format;
+using ExtendedXmlSerializer.ContentModel.Identification;
+using ExtendedXmlSerializer.ContentModel.Reflection;
+using ExtendedXmlSerializer.Core;
+using ExtendedXmlSerializer.Core.Specifications;
+using ExtendedXmlSerializer.ReflectionModel;
+using JetBrains.Annotations;
+using System.Collections.Immutable;
+using System.Collections.ObjectModel;
+using System.Reflection;
+
+namespace ExtendedXmlSerializer.ExtensionModel.Types
+{
+	sealed class ImmutableListExtension : ISerializerExtension
+	{
+		public static ImmutableListExtension Default { get; } = new ImmutableListExtension();
+
+		ImmutableListExtension() : this(new IsAssignableGenericSpecification(typeof(ImmutableList<>))) {}
+
+		readonly ISpecification<TypeInfo> _specification;
+
+		public ImmutableListExtension(ISpecification<TypeInfo> specification) => _specification = specification;
+
+		public IServiceRepository Get(IServiceRepository parameter)
+			=> parameter.DecorateContentsWith<ImmutableLists>()
+			            .When(_specification)
+			            .Decorate<IGenericTypes, GenericTypes>();
+
+		void ICommand<IServices>.Execute(IServices parameter) {}
+
+		sealed class GenericTypes : IGenericTypes
+		{
+			readonly static TypeInfo Check = typeof(ImmutableList).GetTypeInfo();
+			readonly static ImmutableArray<TypeInfo> Type = typeof(ImmutableList<>).GetTypeInfo()
+			                                                                       .Yield()
+			                                                                       .ToImmutableArray();
+
+			readonly IGenericTypes _types;
+
+			public GenericTypes(IGenericTypes types) => _types = types;
+
+			public ImmutableArray<TypeInfo> Get(IIdentity parameter)
+			{
+				var type   = _types.Get(parameter);
+				var result = Equals(type.Only(), Check) ? Type : type;
+				return result;
+			}
+		}
+
+		sealed class ImmutableLists : Collections
+		{
+			public ImmutableLists(RuntimeSerializers serializers, Contents contents) : base(serializers, contents) {}
+		}
+
+		sealed class Contents : ICollectionContents
+		{
+			readonly IInnerContentServices _contents;
+			readonly IEnumerators          _enumerators;
+
+			public Contents(IInnerContentServices contents, IEnumerators enumerators)
+			{
+				_contents    = contents;
+				_enumerators = enumerators;
+			}
+
+			public ISerializer Get(CollectionContentInput parameter)
+				=> new Serializer(Readers.Instance.Get(parameter.ItemType)(_contents, parameter.Item),
+				                  new EnumerableWriter(_enumerators, parameter.Item).Adapt());
+
+			sealed class Readers : Generic<IInnerContentServices, IReader, IReader>
+			{
+				public static Readers Instance { get; } = new Readers();
+
+				Readers() : base(typeof(Reader<>)) {}
+			}
+
+			sealed class Reader<T> : IReader
+			{
+				readonly IReader<Collection<T>> _reader;
+
+				[UsedImplicitly]
+				public Reader(IInnerContentServices services, IReader item)
+					: this(services.CreateContents<Collection<T>>(new CollectionInnerContentHandler(item, services))) {}
+
+				Reader(IReader<Collection<T>> reader) => _reader = reader;
+
+				public object Get(IFormatReader parameter) => _reader.Get(parameter).ToImmutableList();
+			}
+		}
+	}
+}

src/ExtendedXmlSerializer/ExtensionModel/Xml/MigrationsExtension.cs

@@ -19,13 +19,20 @@
 
 namespace ExtendedXmlSerializer.ExtensionModel.Xml
 {
-	sealed class MigrationsExtension : TypedTable<IEnumerable<Action<XElement>>>, ISerializerExtension
+	/// <summary>
+	/// This extension is meant for internal use, but has been exposed for extension authors who require access to it.
+	/// </summary>
+	/// <seealso href="https://github.com/ExtendedXmlSerializer/home/issues/483" />
+	public sealed class MigrationsExtension : TypedTable<IEnumerable<Action<XElement>>>, ISerializerExtension
 	{
+		/// <inheritdoc />
 		[UsedImplicitly]
 		public MigrationsExtension() : this(new Dictionary<TypeInfo, IEnumerable<Action<XElement>>>()) {}
 
+		/// <inheritdoc />
 		public MigrationsExtension(IDictionary<TypeInfo, IEnumerable<Action<XElement>>> store) : base(store) {}
 
+		/// <inheritdoc />
 		public IServiceRepository Get(IServiceRepository parameter) => parameter.Decorate<IContents>(Register);
 
 		IContents Register(IServiceProvider services, IContents contents)

test/ExtendedXmlSerializer.Tests.ReportedIssues/Issue477Tests_Extended.cs

@@ -3,6 +3,7 @@
 using FluentAssertions;
 using System;
 using Xunit;
+// ReSharper disable All
 
 namespace ExtendedXmlSerializer.Tests.ReportedIssues
 {
@@ -33,9 +34,11 @@ public void Verify()
 
 		class Test
 		{
-			public DateTime Date1 { get; set; } = DateTime.Now;  // Formatted OK
-			public DateTime? Date2 { get; set; } = null;         // Is not emitted = OK
-			public DateTime? Date3 { get; set; } = DateTime.Now; // Completety ignores configured formatting
+			readonly static DateTime Now = new DateTime(2020, 11, 23);
+
+			public DateTime Date1 { get; set; } = Now;   // Formatted OK
+			public DateTime? Date2 { get; set; } = null; // Is not emitted = OK
+			public DateTime? Date3 { get; set; } = Now;  // Completety ignores configured formatting
 		}
 	}
 }

test/ExtendedXmlSerializer.Tests.ReportedIssues/Issue483Tests.cs

@@ -0,0 +1,19 @@
+using ExtendedXmlSerializer.Configuration;
+using ExtendedXmlSerializer.ExtensionModel.Xml;
+using FluentAssertions;
+using Xunit;
+
+namespace ExtendedXmlSerializer.Tests.ReportedIssues
+{
+	public sealed class Issue483Tests
+	{
+		[Fact]
+		public void Verify()
+		{
+			new ConfigurationContainer().Type<Issue483Tests>().Root.With<MigrationsExtension>().Should().NotBeNull();
+
+		}
+
+
+	}
+}

test/ExtendedXmlSerializer.Tests.ReportedIssues/Issue485Tests.cs

@@ -0,0 +1,25 @@
+using ExtendedXmlSerializer.Configuration;
+using ExtendedXmlSerializer.Tests.ReportedIssues.Support;
+using FluentAssertions;
+using System.Collections.Immutable;
+using Xunit;
+
+namespace ExtendedXmlSerializer.Tests.ReportedIssues
+{
+	public sealed class Issue485Tests
+	{
+		[Fact]
+		public void Verify()
+		{
+			var instance = new[] { 1, 2, 3, 4 }.ToImmutableList();
+
+			var serializer = new ConfigurationContainer().UseAutoFormatting()
+			                                             .UseOptimizedNamespaces()
+			                                             .EnableParameterizedContentWithPropertyAssignments()
+			                                             .Create()
+			                                             .ForTesting();
+
+			serializer.Cycle(instance).Should().BeEquivalentTo(instance);
+		}
+	}
+}