Support for BCL value types in object flattening

Author: SteveWilkes

AgileMapper.UnitTests/WhenFlatteningToDictionaries.cs

@@ -1,5 +1,6 @@
 namespace AgileObjects.AgileMapper.UnitTests
 {
+    using System;
     using System.Collections.Generic;
     using TestClasses;
     using Xunit;
@@ -46,6 +47,15 @@ public void ShouldFlattenAComplexTypeMember()
             ((int)result["Value.Value"]).ShouldBe(1234);
         }
 
+        [Fact]
+        public void ShouldFlattenANullableComplexTypeMember()
+        {
+            var source = new PublicProperty<DateTimeOffset?> { Value = null };
+            var result = Mapper.Flatten(source).ToDictionary<string>();
+
+            result.ShouldNotContainKey("Value");
+        }
+
         [Fact]
         public void ShouldHandleANullComplexTypeMember()
         {

AgileMapper/Extensions/Internal/TypeExtensions.cs

@@ -129,15 +129,9 @@ public static bool IsEnumerable(this Type type)
                    type.IsAssignableTo(typeof(IEnumerable)));
         }
 
-        public static bool IsQueryable(this Type type)
-        {
-            return type.IsGenericType() && type.GetGenericTypeDefinition() == typeof(IQueryable<>);
-        }
+        public static bool IsQueryable(this Type type) => type.IsClosedTypeOf(typeof(IQueryable<>));
 
-        public static bool IsComplex(this Type type)
-        {
-            return !type.IsSimple() && !type.IsEnumerable();
-        }
+        public static bool IsComplex(this Type type) => !type.IsSimple() && !type.IsEnumerable();
 
         public static bool IsSimple(this Type type)
         {
@@ -153,15 +147,18 @@ public static bool IsSimple(this Type type)
                 return true;
             }
 
-            return type == typeof(Guid);
-        }
+            if ((type == typeof(Guid)) ||
+                (type == typeof(TimeSpan)) ||
+                (type == typeof(DateTimeOffset)))
+            {
+                return true;
+            }
 
-        public static bool IsDictionary(this Type type)
-        {
-            // ReSharper disable once UnusedVariable
-            return IsDictionary(type, out var keyAndValueTypes);
+            return type.IsValueType() && type.IsFromBcl();
         }
 
+        public static bool IsDictionary(this Type type) => IsDictionary(type, out var _);
+
         public static bool IsDictionary(this Type type, out KeyValuePair<Type, Type> keyAndValueTypes)
         {
             keyAndValueTypes = GetDictionaryTypes(type);

AgileMapper/Validation/EnumMappingMismatchFinder.cs

@@ -150,11 +150,7 @@ protected override Expression VisitBinary(BinaryExpression binary)
             return base.VisitBinary(binary);
         }
 
-        private static bool IsEnum(Type type)
-        {
-            // ReSharper disable once UnusedVariable
-            return IsEnum(type, out var enumType);
-        }
+        private static bool IsEnum(Type type) => IsEnum(type, out var _);
 
         private bool TryGetMatch(Expression targetMemberAccess, out TargetMemberData targetMemberData)
         {