Skip to content

add support for collections #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mvdgun merged 1 commit into from
Feb 4, 2026
+90 −0
Merged

add support for collections #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions FluentValidation.AutoValidation.Shared/src/Extensions/TypeExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;

Expand Down Expand Up @@ -32,6 +33,13 @@ public static bool IsCustomType(this Type? type)
return false;
}

if (typeof(IEnumerable).IsAssignableFrom(type))
{
var underlyingType = type.IsArray ? type.GetElementType() : type.GetGenericArguments().LastOrDefault();

return underlyingType != null && underlyingType.IsCustomType();
}

return type.IsClass || type.IsValueType;
}

Expand Down
82 changes: 82 additions & 0 deletions Tests/src/FluentValidation.AutoValidation.Shared/Extensions/TypeExtensionsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// ReSharper disable InconsistentNaming

using System;
using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
using SharpGrip.FluentValidation.AutoValidation.Mvc.Attributes;
using SharpGrip.FluentValidation.AutoValidation.Shared.Extensions;
Expand Down Expand Up @@ -42,6 +43,87 @@ public void Test_IsCustomType()
Assert.False(typeof(Uri).IsCustomType());
}

[Fact]
public void Test_IsCustomType_Collections()
{
Assert.True(typeof(ICollection<TestModelClass>).IsCustomType());
Assert.True(typeof(ICollection<TestModelRecord>).IsCustomType());
Assert.True(typeof(ICollection<TestModelStruct>).IsCustomType());
Assert.False(typeof(ICollection<TestModelEnum>).IsCustomType());
Assert.False(typeof(ICollection<Enum>).IsCustomType());
Assert.False(typeof(ICollection<string>).IsCustomType());

Assert.True(typeof(IList<TestModelClass>).IsCustomType());
Assert.True(typeof(IList<TestModelRecord>).IsCustomType());
Assert.True(typeof(IList<TestModelStruct>).IsCustomType());
Assert.False(typeof(IList<TestModelEnum>).IsCustomType());
Assert.False(typeof(IList<Enum>).IsCustomType());
Assert.False(typeof(IList<string>).IsCustomType());

Assert.True(typeof(List<TestModelClass>).IsCustomType());
Assert.True(typeof(List<TestModelRecord>).IsCustomType());
Assert.True(typeof(List<TestModelStruct>).IsCustomType());
Assert.False(typeof(List<TestModelEnum>).IsCustomType());
Assert.False(typeof(List<Enum>).IsCustomType());
Assert.False(typeof(List<string>).IsCustomType());

Assert.True(typeof(TestModelClass[]).IsCustomType());
Assert.True(typeof(TestModelRecord[]).IsCustomType());
Assert.True(typeof(TestModelStruct[]).IsCustomType());
Assert.False(typeof(TestModelEnum[]).IsCustomType());
Assert.False(typeof(Enum[]).IsCustomType());
Assert.False(typeof(string[]).IsCustomType());

Assert.True(typeof(Dictionary<string, TestModelClass>).IsCustomType());
Assert.True(typeof(Dictionary<string, TestModelRecord>).IsCustomType());
Assert.True(typeof(Dictionary<string, TestModelStruct>).IsCustomType());
Assert.False(typeof(Dictionary<string, TestModelEnum>).IsCustomType());
Assert.False(typeof(Dictionary<string, Enum>).IsCustomType());
Assert.False(typeof(Dictionary<string, string>).IsCustomType());

Assert.True(typeof(HashSet<TestModelClass>).IsCustomType());
Assert.True(typeof(HashSet<TestModelRecord>).IsCustomType());
Assert.True(typeof(HashSet<TestModelStruct>).IsCustomType());
Assert.False(typeof(HashSet<TestModelEnum>).IsCustomType());
Assert.False(typeof(HashSet<Enum>).IsCustomType());
Assert.False(typeof(HashSet<string>).IsCustomType());

Assert.True(typeof(IEnumerable<TestModelClass>).IsCustomType());
Assert.True(typeof(IEnumerable<TestModelRecord>).IsCustomType());
Assert.True(typeof(IEnumerable<TestModelStruct>).IsCustomType());
Assert.False(typeof(IEnumerable<TestModelEnum>).IsCustomType());
Assert.False(typeof(IEnumerable<Enum>).IsCustomType());
Assert.False(typeof(IEnumerable<string>).IsCustomType());

Assert.True(typeof(IReadOnlyList<TestModelClass>).IsCustomType());
Assert.True(typeof(IReadOnlyList<TestModelRecord>).IsCustomType());
Assert.True(typeof(IReadOnlyList<TestModelStruct>).IsCustomType());
Assert.False(typeof(IReadOnlyList<TestModelEnum>).IsCustomType());
Assert.False(typeof(IReadOnlyList<Enum>).IsCustomType());
Assert.False(typeof(IReadOnlyList<string>).IsCustomType());

Assert.True(typeof(IReadOnlyCollection<TestModelClass>).IsCustomType());
Assert.True(typeof(IReadOnlyCollection<TestModelRecord>).IsCustomType());
Assert.True(typeof(IReadOnlyCollection<TestModelStruct>).IsCustomType());
Assert.False(typeof(IReadOnlyCollection<TestModelEnum>).IsCustomType());
Assert.False(typeof(IReadOnlyCollection<Enum>).IsCustomType());
Assert.False(typeof(IReadOnlyCollection<string>).IsCustomType());

Assert.True(typeof(ISet<TestModelClass>).IsCustomType());
Assert.True(typeof(ISet<TestModelRecord>).IsCustomType());
Assert.True(typeof(ISet<TestModelStruct>).IsCustomType());
Assert.False(typeof(ISet<TestModelEnum>).IsCustomType());
Assert.False(typeof(ISet<Enum>).IsCustomType());
Assert.False(typeof(ISet<string>).IsCustomType());

Assert.False(typeof(IAsyncEnumerable<TestModelClass>).IsCustomType());
Assert.False(typeof(IAsyncEnumerable<TestModelRecord>).IsCustomType());
Assert.False(typeof(IAsyncEnumerable<TestModelStruct>).IsCustomType());
Assert.False(typeof(IAsyncEnumerable<TestModelEnum>).IsCustomType());
Assert.False(typeof(IAsyncEnumerable<Enum>).IsCustomType());
Assert.False(typeof(IAsyncEnumerable<string>).IsCustomType());
}

[Fact]
public void Test_HasCustomAttribute()
{
Expand Down
Loading