Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Product>Simpra</Product>
<Company>ALTA Software llc.</Company>
<Copyright>Copyright © 2024 ALTA Software llc.</Copyright>
<Version>2.1.4</Version>
<Version>2.1.5</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
</PropertyGroup>
<ItemGroup>
<!-- Core Dependencies -->
<PackageVersion Include="AltaSoft.DomainPrimitives" Version="8.0.3" />
<PackageVersion Include="AltaSoft.DomainPrimitives.Generator" Version="8.0.3" />
<PackageVersion Include="AltaSoft.DomainPrimitives" Version="8.1.2" />
<PackageVersion Include="AltaSoft.DomainPrimitives.Generator" Version="8.1.2" />
<PackageVersion Include="Antlr4.Runtime.Standard" Version="4.13.1" />
<!-- Testing Dependencies -->
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
<PackageVersion Include="xunit.runner.visualstudio" Version="4.0.0" />
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
</ItemGroup>
Expand Down
206 changes: 133 additions & 73 deletions src/AltaSoft.Simpra.Metadata/TypeExt.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,108 +55,168 @@ internal static List<PropertyModel> ProcessProperties(this Type type)
return cachedProperties;
}

var visited = new HashSet<Type>();
var properties = ProcessPropertiesInternal(type, visited);
s_propertyCache[type] = properties;
return properties;
}

private static List<PropertyModel> ProcessPropertiesInternal(Type type, HashSet<Type> visited)
{
var properties = type.GetProperties(BindingFlags.Instance | BindingFlags.Public);
var processedProperties = properties
.Where(x => x.GetCustomAttribute<JsonIgnoreAttribute>() is null)
.Where(x => x.GetMethod is not null && x.CanRead)
.SelectMany(prop => Process(prop.Name, Nullable.GetUnderlyingType(prop.PropertyType) is null, prop.PropertyType)).Distinct().ToList();
.SelectMany(prop => Process(prop.Name, Nullable.GetUnderlyingType(prop.PropertyType) is null, prop.PropertyType, visited)).Distinct().ToList();

Comment on lines 66 to 71
s_propertyCache[type] = processedProperties;
return processedProperties;
}

private static List<PropertyModel> Process(string name, bool isRequired, Type type)
private static List<PropertyModel> Process(string name, bool isRequired, Type type, HashSet<Type> visited)
{
if (type.TryGetUnderlyingDomainPrimitiveType(out var primitive))
{
return
[
new PropertyModel
{
Name = name,
Description = type.GetSummaryWithoutException(),
Type = primitive.AliasOrName(),
Required = isRequired
}
];
}
if (s_primitiveTypes.Contains(type))
var actualType = Nullable.GetUnderlyingType(type) ?? type;

// Check for cycle: if type is already in visited path, skip expansion
// but still return the property with its actual type name
if (visited.Contains(actualType))
{
return
[
new PropertyModel
{
Name = name,
Description = type.GetSummaryWithoutException(),
Type = (Nullable.GetUnderlyingType(type) ?? type).AliasOrName(),
Required = isRequired
}
];
return [new PropertyModel
{
Name = name,
Description = type.GetSummaryWithoutException(),
Type = actualType.AliasOrName(), // Return actual type, not generic "object"
Required = isRequired
}];
}
Comment on lines +77 to 90
if (type.IsEnum || Nullable.GetUnderlyingType(type)?.IsEnum == true)

// Skip XML types (System.Xml namespace) - treat as leaf nodes
if (IsXmlType(actualType))
{
var enumType = Nullable.GetUnderlyingType(type) ?? type;
return
[
new PropertyModel
{
Name = name,
Description = string.Join(" ", enumType.GetEnumNames()),
Type = "enum",
Required = isRequired
}
];
return [new PropertyModel
{
Name = name,
Description = type.GetSummaryWithoutException(),
Type = "object", // XML types are opaque - safe to use generic object
Required = isRequired
}];
Comment on lines +92 to +101
}
if (type.IsArray)
{
var elementType = type.GetElementType() ?? throw new InvalidOperationException("Should not be null");

if (elementType.Namespace == "System")
// Add current type to visited set to track the recursion path
visited.Add(actualType);

try
{
if (type.TryGetUnderlyingDomainPrimitiveType(out var primitive))
{
var aliasOrName = (Nullable.GetUnderlyingType(type) ?? type).AliasOrName();
return [new PropertyModel { Name = $"{name}[]", Description = type.GetSummaryWithoutException(), Type = aliasOrName, Required = isRequired }];
return
[
new PropertyModel
{
Name = name,
Description = type.GetSummaryWithoutException(),
Type = primitive.AliasOrName(),
Required = isRequired
}
];
}

if (elementType.TryGetUnderlyingDomainPrimitiveType(out var primitiveType))
if (s_primitiveTypes.Contains(type))
{
var aliasOrName = primitiveType.AliasOrName();
return [new PropertyModel { Name = $"{name}[]", Description = type.GetSummaryWithoutException(), Type = aliasOrName, Required = isRequired }];
return
[
new PropertyModel
{
Name = name,
Description = type.GetSummaryWithoutException(),
Type = actualType.AliasOrName(),
Required = isRequired
}
];
}
if (type.IsEnum || Nullable.GetUnderlyingType(type)?.IsEnum == true)
{
var enumType = actualType;
return
[
new PropertyModel
{
Name = name,
Description = string.Join(" ", enumType.GetEnumNames()),
Type = "enum",
Required = isRequired
}
];
}
if (type.IsArray)
{
var elementType = type.GetElementType() ?? throw new InvalidOperationException("Should not be null");

var collectionProp = ProcessProperties(elementType);
if (elementType.Namespace == "System")
{
var aliasOrName = actualType.AliasOrName();
return [new PropertyModel { Name = $"{name}[]", Description = type.GetSummaryWithoutException(), Type = aliasOrName, Required = isRequired }];
}

return MapToPrefixedPropertyModels(collectionProp, name);
}
if (elementType.TryGetUnderlyingDomainPrimitiveType(out var primitiveType))
{
var aliasOrName = primitiveType.AliasOrName();
return [new PropertyModel { Name = $"{name}[]", Description = type.GetSummaryWithoutException(), Type = aliasOrName, Required = isRequired }];
}

if (type is { IsGenericType: true, GenericTypeArguments.Length: >= 1 } && typeof(IEnumerable).IsAssignableFrom(type))
{
var elementType = type.GetGenericArguments()[0];
if (IsXmlType(elementType))
{
return [new PropertyModel { Name = $"{name}[]", Description = type.GetSummaryWithoutException(), Type = "object", Required = isRequired }];
}

if (elementType.Namespace == "System")
{
var aliasOrName = (Nullable.GetUnderlyingType(type) ?? type).AliasOrName();
return [new PropertyModel { Name = $"{name}[]", Description = type.GetSummaryWithoutException(), Type = aliasOrName, Required = isRequired }];
var collectionProp = ProcessPropertiesInternal(elementType, visited);

return MapToPrefixedPropertyModels(collectionProp, name);
}

if (elementType.TryGetUnderlyingDomainPrimitiveType(out var primitiveType))
if (type is { IsGenericType: true, GenericTypeArguments.Length: >= 1 } && typeof(IEnumerable).IsAssignableFrom(type))
{
var aliasOrName = primitiveType.AliasOrName();
return [new PropertyModel { Name = $"{name}[]", Description = type.GetSummaryWithoutException(), Type = aliasOrName, Required = isRequired }];
}
var elementType = type.GetGenericArguments()[0];

var collectionProp = ProcessProperties(elementType);
if (elementType.Namespace == "System")
{
var aliasOrName = actualType.AliasOrName();
return [new PropertyModel { Name = $"{name}[]", Description = type.GetSummaryWithoutException(), Type = aliasOrName, Required = isRequired }];
}

return MapToPrefixedPropertyModels(collectionProp, name);
}
if (elementType.TryGetUnderlyingDomainPrimitiveType(out var primitiveType))
{
var aliasOrName = primitiveType.AliasOrName();
return [new PropertyModel { Name = $"{name}[]", Description = type.GetSummaryWithoutException(), Type = aliasOrName, Required = isRequired }];
}

if (IsXmlType(elementType))
{
return [new PropertyModel { Name = $"{name}[]", Description = type.GetSummaryWithoutException(), Type = "object", Required = isRequired }];
}

var collectionProp = ProcessPropertiesInternal(elementType, visited);

return MapToPrefixedPropertyModels(collectionProp, name);
}

var obj = ProcessProperties(Nullable.GetUnderlyingType(type) ?? type);
return obj.Select(x => new PropertyModel
var obj = ProcessPropertiesInternal(Nullable.GetUnderlyingType(type) ?? type, visited);
return obj.Select(x => new PropertyModel
{
Name = $"{name}.{x.Name}",
Description = x.Description,
Type = x.Type,
Required = x.Required
}).ToList();
}
finally
{
Name = $"{name}.{x.Name}",
Description = x.Description,
Type = x.Type,
Required = x.Required
}).ToList();
// Remove from visited set when backtracking - allows same type in different branches
visited.Remove(actualType);
}
}

private static bool IsXmlType(Type type)
{
return typeof(System.Xml.XmlNode).IsAssignableFrom(type);
}
Comment thread
Copilot marked this conversation as resolved.

private static List<PropertyModel> MapToPrefixedPropertyModels(List<PropertyModel> collection, string name)
Expand Down
Loading
Loading