Skip to content

feat: enhance schema generation to support value types for additional… #19

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
IvanMurzak merged 2 commits into from
Oct 23, 2025
Merged

feat: enhance schema generation to support value types for additional… #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9b2792
feat: enhance schema generation to support value types for additional…
IvanMurzak Oct 23, 2025
e2a79fa
fix: add placeholder to defines to prevent infinite recursion during …
IvanMurzak Oct 23, 2025
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
1 change: 1 addition & 0 deletions ReflectorNet/src/Utils/Json/JsonSchema.Internal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ JsonNode GenerateSchemaFromType(Reflector reflector, Type type, JsonObject defin
if (defines.ContainsKey(typeId) == false)
{
// Add placeholder first to prevent infinite recursion
defines[typeId] = new JsonObject { [Type] = Array };
Comment thread
IvanMurzak marked this conversation as resolved.
defines[typeId] = new JsonObject
{
[Type] = Array,
Expand Down
33 changes: 25 additions & 8 deletions ReflectorNet/src/Utils/Json/JsonSchema.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,6 @@ public JsonNode GetSchema(Reflector reflector, Type type, JsonObject? defines =

schema = schemeConvertor.GetSchema();

if (definesNeeded && !defineContainsType)
defines[typeId] = schema;

foreach (var defType in schemeConvertor.GetDefinedTypes())
{
var defTypeId = defType.GetSchemaTypeId();
Expand Down Expand Up @@ -182,23 +179,43 @@ public JsonNode GetSchema(Reflector reflector, Type type, JsonObject? defines =
defines[defTypeId] = defSchema;
}

// Add placeholder to prevent infinite recursion
if (definesNeeded && !defineContainsType)
defines[typeId] = schema;
defines[typeId] = new JsonObject { [Type] = Object };

schema = new JsonObject { [Type] = Object, [AdditionalProperties] = true };
if (genericArgs.Length >= 2)
{
// Use the value type's schema for additionalProperties
var valueTypeSchema = GetSchema(reflector, genericArgs[1], defines);
schema = new JsonObject { [Type] = Object, [AdditionalProperties] = valueTypeSchema };
}
else
{
schema = new JsonObject { [Type] = Object, [AdditionalProperties] = true };
}
Comment thread
IvanMurzak marked this conversation as resolved.
}
else
{
schema = GenerateSchemaFromType(reflector, type, defines);
// Add placeholder to prevent infinite recursion
if (definesNeeded && !defineContainsType)
defines[typeId] = new JsonObject { [Type] = Object };

if (definesNeeded && defines.Count > 0)
schema[Defs] = defines;
schema = GenerateSchemaFromType(reflector, type, defines);
}

// Get description from the type if available
var description = TypeUtils.GetDescription(type);
if (!string.IsNullOrEmpty(description))
schema[Description] = JsonValue.Create(description);

if (definesNeeded)
{
if (!defineContainsType)
defines[typeId] = schema.DeepClone();

if (defines.Count > 0)
schema[Defs] = defines;
}
}
catch (Exception ex)
{
Expand Down