fix: score nested anyof envelope properties

Author: HavenDV

src/libs/AutoSDK.CSharp/Enrichment/CSharpSchemaDataFactory.cs

@@ -238,18 +238,7 @@ public static AnyOfData CreateAnyOfData(SchemaContext context)
                 name = CSharpPropertyNameGenerator.AvoidObjectMemberNameCollision(name);
                 name = AvoidNamedAnyOfMemberNameCollision(name);
 
-                var resolvedSchema = child.Schema.ResolveIfRequired();
-                var jsonPropertyNames = ImmutableArray<string>.Empty;
-                if (resolvedSchema.Properties is { Count: > 0 } props)
-                {
-                    var jpnBuilder = ImmutableArray.CreateBuilder<string>(props.Count);
-                    foreach (var key in props.Keys.OrderBy(x => x, StringComparer.Ordinal))
-                    {
-                        jpnBuilder.Add(key);
-                    }
-
-                    jsonPropertyNames = jpnBuilder.MoveToImmutable();
-                }
+                var jsonPropertyNames = CollectJsonPropertyNames(child.Schema);
 
                 builder.Add((PropertyData.Default with
                 {
@@ -360,6 +349,34 @@ private static string ComputeDiscriminatorValue(
         return string.Empty;
     }
 
+    private static ImmutableArray<string> CollectJsonPropertyNames(IOpenApiSchema schema)
+    {
+        var resolvedSchema = schema.ResolveIfRequired();
+        if (resolvedSchema.Properties is not { Count: > 0 } properties)
+        {
+            return ImmutableArray<string>.Empty;
+        }
+
+        var builder = ImmutableArray.CreateBuilder<string>();
+        foreach (var property in properties.OrderBy(x => x.Key, StringComparer.Ordinal))
+        {
+            builder.Add(property.Key);
+
+            var nestedSchema = property.Value.ResolveIfRequired();
+            if (nestedSchema.Properties is not { Count: > 0 } nestedProperties)
+            {
+                continue;
+            }
+
+            foreach (var nestedProperty in nestedProperties.Keys.OrderBy(x => x, StringComparer.Ordinal))
+            {
+                builder.Add($"{property.Key}.{nestedProperty}");
+            }
+        }
+
+        return builder.ToImmutable();
+    }
+
     private static EquatableArray<PropertyData> DeduplicatePropertyNames(
         EquatableArray<PropertyData> properties)
     {

src/libs/AutoSDK.CSharp/Sources/Sources.JsonConverters.AnyOf.cs

@@ -25,6 +25,7 @@ public static string GenerateAnyOfJsonConverter(
             : $"global::{anyOfData.Namespace}.{anyOfData.Name}";
         var hasDiscriminator = anyOfData.DiscriminatorType != null && anyOfData.Properties.All(x => !string.IsNullOrWhiteSpace(x.DiscriminatorValue));
         var hasPropertyInfo = anyOfData.Properties.Any(x => !x.JsonPropertyNames.IsEmpty);
+        var hasNestedPropertyInfo = anyOfData.Properties.Any(x => x.JsonPropertyNames.Any(propName => propName.Contains('.')));
 
         string read;
         if (hasDiscriminator)
@@ -77,6 +78,14 @@ public static string GenerateAnyOfJsonConverter(
                 foreach (var __jsonProp in __jsonDocument.RootElement.EnumerateObject())
                 {{
                     __jsonProps.Add(__jsonProp.Name);
+{(hasNestedPropertyInfo ? @"                    if (__jsonProp.Value.ValueKind == global::System.Text.Json.JsonValueKind.Object)
+                    {
+                        foreach (var __nestedJsonProp in __jsonProp.Value.EnumerateObject())
+                        {
+                            __jsonProps.Add(__jsonProp.Name + ""."" + __nestedJsonProp.Name);
+                        }
+                    }
+" : string.Empty)}
                 }}
             }}
 

src/tests/AutoSDK.UnitTests/Tests.WebSocketClient.cs

@@ -165,6 +165,92 @@ public void AsyncApiServerVariables_GenerateTypedConnectAsync_UsesTemplateAndCon
         source.Should().Contain("global::System.Threading.CancellationTokenSource.CreateLinkedTokenSource(cancellationToken)");
     }
 
+    [TestMethod]
+    public void AsyncApiNestedEnvelopeServerEvents_GenerateNestedPropertyScoring()
+    {
+        const string yaml = """
+asyncapi: 3.0.0
+info:
+  title: Realtime API
+  version: 1.0.0
+channels:
+  realtime:
+    address: /realtime
+    messages:
+      Transcript:
+        payload:
+          $ref: '#/components/schemas/TranscriptEvent'
+      Usage:
+        payload:
+          $ref: '#/components/schemas/UsageEvent'
+      SpeechStarted:
+        payload:
+          $ref: '#/components/schemas/SpeechStartedEvent'
+operations:
+  receiveUpdates:
+    action: receive
+    channel:
+      $ref: '#/channels/realtime'
+    messages:
+      - $ref: '#/channels/realtime/messages/Transcript'
+      - $ref: '#/channels/realtime/messages/Usage'
+      - $ref: '#/channels/realtime/messages/SpeechStarted'
+components:
+  schemas:
+    TranscriptEvent:
+      type: object
+      properties:
+        result:
+          type: object
+          properties:
+            transcription:
+              type: object
+              properties:
+                text:
+                  type: string
+    UsageEvent:
+      type: object
+      properties:
+        result:
+          type: object
+          properties:
+            usage:
+              type: object
+              properties:
+                input_tokens:
+                  type: integer
+    SpeechStartedEvent:
+      type: object
+      properties:
+        result:
+          type: object
+          properties:
+            speechStarted:
+              type: object
+              properties:
+                offset_ms:
+                  type: integer
+""";
+
+        var settings = Settings.Default with
+        {
+            Namespace = "G",
+            JsonSerializerContext = "G.SourceGenerationContext",
+        };
+
+        var data = AsyncApiData.Prepare(((yaml, settings), GlobalSettings: settings));
+        var anyOf = data.AnyOfs.Should().ContainSingle(x => x.Name == "ServerEvent").Subject;
+        var source = Sources.GenerateAnyOfJsonConverter(anyOf);
+
+        anyOf.Properties.SelectMany(x => x.JsonPropertyNames).Should().Contain("result.transcription");
+        anyOf.Properties.SelectMany(x => x.JsonPropertyNames).Should().Contain("result.usage");
+        anyOf.Properties.SelectMany(x => x.JsonPropertyNames).Should().Contain("result.speechStarted");
+        source.Should().Contain("__jsonProps.Add(__jsonProp.Name + \".\" + __nestedJsonProp.Name);");
+        source.Should().Contain("if (__jsonProps.Contains(\"result.transcription\")) __score0++;");
+        source.Should().Contain("if (__jsonProps.Contains(\"result.usage\")) __score1++;");
+        source.Should().Contain("if (__jsonProps.Contains(\"result.speechStarted\")) __score2++;");
+    }
+
     [TestMethod]
     public void WebSocketBinaryPayloadHelpers_GenerateDecodedBytesProperty_AndConvenienceSendOverload()
     {