Merge c275c54 into c1f19d6

Author: Mike-E-angelo

src/ExtendedXmlSerializer/ContentModel/Collections/CollectionSpecification.cs

@@ -6,7 +6,7 @@ namespace ExtendedXmlSerializer.ContentModel.Collections
 {
 	class CollectionSpecification : DecoratedSpecification<TypeInfo>
 	{
-		public CollectionSpecification(ISpecification<TypeInfo> specification)
+		protected CollectionSpecification(ISpecification<TypeInfo> specification)
 			: base(IsCollectionTypeSpecification.Default.And(specification)) {}
 	}
 }

src/ExtendedXmlSerializer/ContentModel/Identification/Identities.cs

@@ -7,16 +7,14 @@ namespace ExtendedXmlSerializer.ContentModel.Identification
 {
 	sealed class Identities : CacheBase<TypeInfo, IIdentity>, IIdentities
 	{
-		readonly static TypeNameFormatter TypeNameFormatter = TypeNameFormatter.Default;
-
 		readonly IIdentityStore _source;
 		readonly INames         _alias;
 		readonly ITypeFormatter _formatter;
 		readonly IIdentifiers   _identifiers;
 
 		[UsedImplicitly]
 		public Identities(IIdentifiers identifiers, IIdentityStore source, INames names)
-			: this(source, names, TypeNameFormatter, identifiers) {}
+			: this(source, names, TypeNameFormatter.Default, identifiers) {}
 
 		// ReSharper disable once TooManyDependencies
 		public Identities(IIdentityStore source, INames alias, ITypeFormatter formatter, IIdentifiers identifiers)

src/ExtendedXmlSerializer/ContentModel/Reflection/GenericNameParser.cs

@@ -10,13 +10,7 @@ sealed class GenericNameParser : Parsing<string>
 
 		GenericNameParser() : this(CodeIdentifier.Default, Parse.Char(DefaultClrDelimiters.Default.Generic)) {}
 
-		public GenericNameParser(Parser<string> identifier, Parser<char> delimiter) : base(
-		                                                                                   identifier
-			                                                                                   .SelectMany(delimiter
-			                                                                                               .Optional()
-			                                                                                               .Accept,
-			                                                                                               (name, _)
-				                                                                                               => name)
-		                                                                                  ) {}
+		public GenericNameParser(Parser<string> identifier, Parser<char> delimiter)
+			: base(identifier.SelectMany(delimiter.Optional().Accept, (name, _) => name)) {}
 	}
 }

src/ExtendedXmlSerializer/ExtensionModel/DefaultExtensions.cs

@@ -58,6 +58,7 @@ public override IEnumerator<ISerializerExtension> GetEnumerator()
 			yield return new AllowedMembersExtension(_metadata);
 			yield return new AllowedMemberValuesExtension();
 			yield return new MemberFormatExtension();
+			yield return GeneratedListAwareExtension.Default;
 			yield return ImmutableArrayExtension.Default;
 			yield return SerializationExtension.Default;
 			yield return RecursionAwareExtension.Default;

src/ExtendedXmlSerializer/ExtensionModel/GeneratedListAwareExtension.cs

@@ -0,0 +1,45 @@
+using ExtendedXmlSerializer.ContentModel.Conversion;
+using ExtendedXmlSerializer.ContentModel.Reflection;
+using ExtendedXmlSerializer.Core.Sources;
+using ExtendedXmlSerializer.Core.Specifications;
+using System;
+using System.Reflection;
+
+namespace ExtendedXmlSerializer.ExtensionModel;
+
+sealed class GeneratedListAwareExtension : ISerializerExtension
+{
+	public static GeneratedListAwareExtension Default { get; } = new();
+
+	GeneratedListAwareExtension() {}
+
+	public IServiceRepository Get(IServiceRepository parameter)
+		=> parameter.Decorate<ITypePartResolver, TypePartResolver>();
+
+	public void Execute(IServices parameter) {}
+
+	sealed class TypePartResolver : ITypePartResolver
+	{
+		readonly ITypePartResolver        _previous;
+		readonly ISpecification<TypeInfo> _specification;
+		readonly IAlteration<Type>        _alter;
+
+		public TypePartResolver(ITypePartResolver previous)
+			: this(previous, IsGeneratedList.Default, GeneratedSubstitute.Default) {}
+
+		public TypePartResolver(ITypePartResolver previous, ISpecification<TypeInfo> specification,
+		                        IAlteration<Type> alter)
+		{
+			_previous      = previous;
+			_specification = specification;
+			_alter         = alter;
+		}
+
+		public TypeParts Get(TypeInfo parameter)
+		{
+			var type   = _specification.IsSatisfiedBy(parameter) ? _alter.Get(parameter) : parameter;
+			var result = _previous.Get(type);
+			return result;
+		}
+	}
+}

src/ExtendedXmlSerializer/ExtensionModel/GeneratedSubstitute.cs

@@ -0,0 +1,29 @@
+using ExtendedXmlSerializer.Core.Sources;
+using ExtendedXmlSerializer.ReflectionModel;
+using System;
+using System.Collections.Generic;
+
+namespace ExtendedXmlSerializer.ExtensionModel;
+
+sealed class GeneratedSubstitute : IAlteration<Type>
+{
+	public static GeneratedSubstitute Default { get; } = new();
+
+	GeneratedSubstitute() : this(typeof(List<>), CollectionItemTypeLocator.Default) {}
+
+	readonly Type                       _definition;
+	readonly ICollectionItemTypeLocator _locator;
+
+	public GeneratedSubstitute(Type definition, ICollectionItemTypeLocator locator)
+	{
+		_definition = definition;
+		_locator    = locator;
+	}
+
+	public Type Get(Type parameter)
+	{
+		var arguments = _locator.Get(parameter);
+		var result    = _definition.MakeGenericType(arguments);
+		return result;
+	}
+}

src/ExtendedXmlSerializer/ExtensionModel/IsGeneratedList.cs

@@ -0,0 +1,14 @@
+using ExtendedXmlSerializer.Core.Specifications;
+using System.Reflection;
+
+namespace ExtendedXmlSerializer.ExtensionModel;
+
+sealed class IsGeneratedList : DelegatedSpecification<TypeInfo>
+{
+	public static IsGeneratedList Default { get; } = new();
+
+	IsGeneratedList()
+		: base(x => x.FullName != null &&
+		            (x.FullName.StartsWith("<>z__ReadOnlySingleElementList") ||
+		             x.FullName.StartsWith("<>z__ReadOnlyArray"))) {}
+}

src/ExtendedXmlSerializer/ReflectionModel/CollectionAwareConstructorLocator.cs

@@ -1,21 +1,14 @@
 using ExtendedXmlSerializer.Core.Specifications;
-using System.Collections.Generic;
+using ExtendedXmlSerializer.ExtensionModel;
 using System.Reflection;
 
 namespace ExtendedXmlSerializer.ReflectionModel
 {
 	sealed class CollectionAwareConstructorLocator : ListConstructorLocator, IConstructorLocator
 	{
-		readonly static ISpecification<TypeInfo> Specification = IsInterface.Default.And(IsCollectionType.Instance);
+		readonly static ISpecification<TypeInfo> Specification
+			= IsInterface.Default.Or(IsGeneratedList.Default).And(IsCollectionTypeExpandedSpecification.Default);
 
 		public CollectionAwareConstructorLocator(IConstructorLocator previous) : base(Specification, previous) {}
-
-		sealed class IsCollectionType : AnySpecification<TypeInfo>
-		{
-			public static IsCollectionType Instance { get; } = new IsCollectionType();
-
-			IsCollectionType() : base(IsCollectionTypeSpecification.Default,
-			                          new IsAssignableGenericSpecification(typeof(IReadOnlyCollection<>))) {}
-		}
 	}
 }

src/ExtendedXmlSerializer/ReflectionModel/IsCollectionTypeExpandedSpecification.cs

@@ -0,0 +1,15 @@
+using ExtendedXmlSerializer.Core.Specifications;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace ExtendedXmlSerializer.ReflectionModel;
+
+sealed class IsCollectionTypeExpandedSpecification : AnySpecification<TypeInfo>
+{
+	public static IsCollectionTypeExpandedSpecification Default { get; } = new();
+
+	IsCollectionTypeExpandedSpecification()
+		: base(IsCollectionTypeSpecification.Default,
+		       new IsAssignableGenericSpecification(typeof(IReadOnlyList<>)),
+		       new IsAssignableGenericSpecification(typeof(IReadOnlyCollection<>))) {}
+}

src/ExtendedXmlSerializer/ReflectionModel/IsUnspeakable.cs

@@ -10,6 +10,6 @@ sealed class IsUnspeakable : DelegatedSpecification<TypeInfo>
 	{
 		public static IsUnspeakable Default { get; } = new IsUnspeakable();
 
-		IsUnspeakable() : base(x => x.Name.StartsWith("<")) {}
+		IsUnspeakable() : base(x => x.Name.StartsWith("<") || (x.FullName is not null && x.FullName.StartsWith("<"))) {}
 	}
 }