Skip to content
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.

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

Values of additionalProperties not transformed #59616

Open
1 task done
JTeeuwissen opened this issue Dec 23, 2024 · 2 comments
Open
1 task done

Values of additionalProperties not transformed #59616

JTeeuwissen opened this issue Dec 23, 2024 · 2 comments
Labels
area-minimal Includes minimal APIs, endpoint filters, parameter binding, request delegate generator etc feature-openapi help wanted Up for grabs. We would accept a PR to help resolve this issue

Comments

@JTeeuwissen
Copy link

JTeeuwissen commented Dec 23, 2024

Is there an existing issue for this?

  • I have searched the existing issues

Describe the bug

When an endpoint returns a type containing a Dictionary containing another type, the schema of this last type is not processed by schema transformers (see the missing "a": "b" in Bar2 below, causing a new schema to be created).

{
  "schemas": {
    "Bar": {
      "type": "object",
      "properties": {
        "value": {
          "type": "integer",
          "format": "int32",
          "a": "b"
        }
      },
      "a": "b"
    },
    "Bar2": {
      "type": "object",
      "properties": {
        "value": {
          "type": "integer",
          "format": "int32"
        }
      }
    },
    "Foo": {
      "type": "object",
      "properties": {
        "bar": {
          "$ref": "#/components/schemas/Bar"
        },
        "bars": {
          "type": "object",
          "additionalProperties": {
            "$ref": "#/components/schemas/Bar2"
          },
          "a": "b"
        }
      },
      "a": "b"
    }
  }
}

My guess is that additionalProperties should be processed somewhere here:

private async Task InnerApplySchemaTransformersAsync(OpenApiSchema schema,
JsonTypeInfo jsonTypeInfo,
JsonPropertyInfo? jsonPropertyInfo,
OpenApiSchemaTransformerContext context,
IOpenApiSchemaTransformer transformer,
CancellationToken cancellationToken = default)
{
context.UpdateJsonTypeInfo(jsonTypeInfo, jsonPropertyInfo);
await transformer.TransformAsync(schema, context, cancellationToken);
// Only apply transformers on polymorphic schemas where we can resolve the derived
// types associated with the base type.
if (schema.AnyOf is { Count: > 0 } && jsonTypeInfo.PolymorphismOptions is not null)
{
var anyOfIndex = 0;
foreach (var derivedType in jsonTypeInfo.PolymorphismOptions.DerivedTypes)
{
var derivedJsonTypeInfo = _jsonSerializerOptions.GetTypeInfo(derivedType.DerivedType);
if (schema.AnyOf.Count <= anyOfIndex)
{
break;
}
await InnerApplySchemaTransformersAsync(schema.AnyOf[anyOfIndex], derivedJsonTypeInfo, null, context, transformer, cancellationToken);
anyOfIndex++;
}
}
if (schema.Items is not null)
{
var elementTypeInfo = _jsonSerializerOptions.GetTypeInfo(jsonTypeInfo.ElementType!);
await InnerApplySchemaTransformersAsync(schema.Items, elementTypeInfo, null, context, transformer, cancellationToken);
}
if (schema.Properties is { Count: > 0 })
{
foreach (var propertyInfo in jsonTypeInfo.Properties)
{
if (schema.Properties.TryGetValue(propertyInfo.Name, out var propertySchema))
{
await InnerApplySchemaTransformersAsync(propertySchema, _jsonSerializerOptions.GetTypeInfo(propertyInfo.PropertyType), propertyInfo, context, transformer, cancellationToken);
}
}
}
}

Expected Behavior

I expected to see

{
  "schemas": {
    "Bar": {
      "type": "object",
      "properties": {
        "value": {
          "type": "integer",
          "format": "int32",
          "a": "b"
        }
      },
      "a": "b"
    },
    "Foo": {
      "type": "object",
      "properties": {
        "bar": {
          "$ref": "#/components/schemas/Bar"
        },
        "bars": {
          "type": "object",
          "additionalProperties": {
            "$ref": "#/components/schemas/Bar"
          },
          "a": "b"
        }
      },
      "a": "b"
    }
  }
}

Steps To Reproduce

Add a schema transformer like so:

options.AddSchemaTransformer((schema, _, _)
	=>
{
	schema.Extensions.Add("a", new OpenApiString("b"));
	return Task.CompletedTask;
});

And add an endpoint that returns a type (Foo) which contains a dictionary with another type (Bar).

app.MapGet("/", () => new Foo());

class Foo
{
	public Bar Bar { get; set; }
	public Dictionary<string, Bar> Bars { get; set; }
}

class Bar
{
	public int Value { get; set; }
}

Exceptions (if any)

No response

.NET Version

9.0.200-preview.0.24575.35

Anything else?

No response

@dotnet-issue-labeler dotnet-issue-labeler bot added the needs-area-label Used by the dotnet-issue-labeler to label those issues which couldn't be triaged automatically label Dec 23, 2024
@martincostello martincostello added feature-openapi area-minimal Includes minimal APIs, endpoint filters, parameter binding, request delegate generator etc and removed needs-area-label Used by the dotnet-issue-labeler to label those issues which couldn't be triaged automatically labels Dec 23, 2024
@mikekistler mikekistler added the help wanted Up for grabs. We would accept a PR to help resolve this issue label Dec 30, 2024
@mikekistler
Copy link
Contributor

@JTeeuwissen Thanks for filing this issue!

I followed your instructions for recreate and have reproduced the problem on my side.

I have flagged this as a bug and added it to our backlog.

Also, I think you have identified the right area of the code that needs to be fixed. Would you be interested in submitting a PR with a proposed fix? We welcome community contributions and there are detailed instructions for submitting PRs in the CONTRIBUTING.md file.

Copy link
Contributor

Looks like this issue has been identified as a candidate for community contribution. If you're considering sending a PR for this issue, look for the Summary Comment link in the issue description. That comment has been left by an engineer on our team to help you get started with handling this issue. You can learn more about our Help Wanted process here

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-minimal Includes minimal APIs, endpoint filters, parameter binding, request delegate generator etc feature-openapi help wanted Up for grabs. We would accept a PR to help resolve this issue
Projects
None yet
Development

No branches or pull requests

3 participants