Treat TimeSpan as a simple type

VyacheslavPritykin · Oct 22, 2020 · 70f4967 · 70f4967
1 parent ce67ae4
commit 70f4967
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 45 deletions.
diff --git a/NFormlySchema.UnitTests/UtilsTests.cs b/NFormlySchema.UnitTests/UtilsTests.cs
@@ -10,41 +10,40 @@ namespace NFormlySchema.UnitTests
     public class UtilsTests
     {
         [Theory]
-        [InlineData(typeof(int), false)]
-        [InlineData(typeof(DateTime), false)]
-        [InlineData(typeof(DateTimeOffset), false)]
-        [InlineData(typeof(TestEnum), false)]
-        [InlineData(typeof(string), false)]
-        [InlineData(typeof(Guid), false)]
-        [InlineData(typeof(TestClass), true)]
-        [InlineData(typeof(TestStruct), true)]
-        [InlineData(typeof(object), true)]
-        [InlineData(typeof(Collection<string>), false)]
-        [InlineData(typeof(List<string>), false)]
-        [InlineData(typeof(string[]), false)]
-        public void IsFormGroup(Type type, bool expectedResult)
+        [InlineData(typeof(int), true)]
+        [InlineData(typeof(DateTime), true)]
+        [InlineData(typeof(DateTimeOffset), true)]
+        [InlineData(typeof(TestEnum), true)]
+        [InlineData(typeof(string), true)]
+        [InlineData(typeof(Guid), true)]
+        [InlineData(typeof(TimeSpan), true)]
+        [InlineData(typeof(TestClass), false)]
+        [InlineData(typeof(TestStruct), false)]
+        [InlineData(typeof(object), false)]
+        public void IsSimple(Type type, bool expectedResult)
         {
             // act
-            var isFormGroup = TypeUtils.IsFormGroup(type);
+            var isSimple = type.IsSimple();
 
             // assert
-            isFormGroup.Should().Be(expectedResult);
+            isSimple.Should().Be(expectedResult);
         }
 
         [Theory]
-        [InlineData(typeof(int?), false)]
-        [InlineData(typeof(DateTime?), false)]
-        [InlineData(typeof(DateTimeOffset?), false)]
-        [InlineData(typeof(TestEnum?), false)]
-        [InlineData(typeof(Guid?), false)]
-        [InlineData(typeof(TestStruct?), true)]
-        public void IsFormGroupWithNullableTypes(Type type, bool expectedResult)
+        [InlineData(typeof(int?), true)]
+        [InlineData(typeof(DateTime?), true)]
+        [InlineData(typeof(DateTimeOffset?), true)]
+        [InlineData(typeof(TimeSpan?), true)]
+        [InlineData(typeof(TestEnum?), true)]
+        [InlineData(typeof(Guid?), true)]
+        [InlineData(typeof(TestStruct?), false)]
+        public void IsSimpleWithNullableTypes(Type type, bool expectedResult)
         {
             // act
-            var isFormGroup = TypeUtils.IsFormGroup(type);
+            var isSimple = type.IsSimple();
 
             // assert
-            isFormGroup.Should().Be(expectedResult);
+            isSimple.Should().Be(expectedResult);
         }
     }
 

diff --git a/NFormlySchema/Extensions/TypeExtensions.cs b/NFormlySchema/Extensions/TypeExtensions.cs
@@ -7,5 +7,18 @@ internal static class TypeExtensions
     {
         public static bool IsCollection(this Type type) =>
             type.GetInterface(nameof(ICollection)) != null;
+
+        public static bool IsSimple(this Type type)
+        {
+            type = Nullable.GetUnderlyingType(type) ?? type;
+            return type.IsPrimitive
+                   || type.IsEnum
+                   || type == typeof(string)
+                   || type == typeof(decimal)
+                   || type == typeof(DateTime)
+                   || type == typeof(DateTimeOffset)
+                   || type == typeof(TimeSpan)
+                   || type == typeof(Guid);
+        }
     }
 }
diff --git a/NFormlySchema/FormlySchema.cs b/NFormlySchema/FormlySchema.cs
@@ -130,7 +130,7 @@ private static FormlyFieldConfig BuildFormlyFieldConfigForSimpleArrayElement(Typ
                 return null;
 
             var elementType = propertyInfo.PropertyType.GetElementType()!;
-            if (!TypeUtils.IsFormGroup(elementType))
+            if (elementType.IsSimple())
                 return BuildFormlyFieldConfigForSimpleArrayElement(elementType);
 
             return null; // TODO
@@ -140,15 +140,15 @@ private static FormlyFieldConfig BuildFormlyFieldConfigForSimpleArrayElement(Typ
             Attribute[] attributes,
             FormlyGenerationSettings setting)
         {
-            return TypeUtils.IsFormGroup(propertyInfo.PropertyType)
+            return !propertyInfo.PropertyType.IsSimple()
                    && !propertyInfo.PropertyType.IsCollection()
                    && attributes.OfType<FieldGroupAttribute>().Any()
                 ? FromType(propertyInfo.PropertyType, setting)
                 : null;
         }
 
         private static bool IsInlineNestedFieldGroup(PropertyInfo propertyInfo, Attribute[] attributes) =>
-            TypeUtils.IsFormGroup(propertyInfo.PropertyType)
+            !propertyInfo.PropertyType.IsSimple()
             && !propertyInfo.PropertyType.IsCollection()
             && !attributes.OfType<FieldGroupAttribute>().Any();
 
@@ -427,7 +427,7 @@ private static bool IsInlineNestedFieldGroup(PropertyInfo propertyInfo, Attribut
 
         private static string? ResolveFieldType(Type propertyType, Attribute[] attributes)
         {
-            if (TypeUtils.IsFormGroup(propertyType))
+            if (!propertyType.IsSimple() && !propertyType.IsCollection())
                 return null;
 
             var fieldType = attributes.OfType<FieldTypeAttribute>().FirstOrDefault()?.Type;

diff --git a/NFormlySchema/Internal/TypeUtils.cs b/NFormlySchema/Internal/TypeUtils.cs