typescript: allow mixed types for anyOf

Author: danaelhe

src/Kiota.Builder/KiotaBuilder.cs

@@ -1107,7 +1107,7 @@ private CodeParameter GetIndexerParameter(OpenApiUrlTreeNode currentNode)
         var type = parameter switch
         {
             null => DefaultIndexerParameterType,
-            _ => GetPrimitiveType(parameter.Schema),
+            _ => GetPathParameterType(parameter.Schema),
         } ?? DefaultIndexerParameterType;
         type.IsNullable = false;
         var segment = currentNode.DeduplicatedSegment();
@@ -1253,6 +1253,55 @@ openApiExtension is OpenApiPrimaryErrorMessageExtension primaryErrorMessageExten
             (_, _) => null,
         };
     }
+    
+    private CodeTypeBase? GetPathParameterType(IOpenApiSchema? typeSchema)
+    {
+        // Check if it's a union type with mixed primitives (anyOf or oneOf) first
+        if (typeSchema != null && (typeSchema.AnyOf?.Count > 0 || typeSchema.OneOf?.Count > 0))
+        {
+            var schemas = typeSchema.AnyOf ?? typeSchema.OneOf;
+            if (schemas != null)
+            {
+                var primitiveTypes = new List<CodeType>();
+                
+                foreach (var schema in schemas)
+                {
+                    if (GetPrimitiveType(schema) is CodeType schemaType)
+                    {
+                        primitiveTypes.Add(schemaType);
+                    }
+                }
+                
+                // If we found multiple primitive types, create a union type
+                if (primitiveTypes.Count > 1)
+                {
+                    var unionType = new CodeUnionType
+                    {
+                        Name = "PathParameterUnion"
+                    };
+                    
+                    foreach (var primitiveType in primitiveTypes)
+                    {
+                        if (!unionType.ContainsType(primitiveType))
+                        {
+                            unionType.AddType(primitiveType);
+                        }
+                    }
+                    
+                    return unionType;
+                }
+                // If we only found one primitive type, return it
+                else if (primitiveTypes.Count == 1)
+                {
+                    return primitiveTypes[0];
+                }
+            }
+        }
+        
+        // Fall back to regular primitive type handling
+        return GetPrimitiveType(typeSchema);
+    }
+    
     private const string RequestBodyPlainTextContentType = "text/plain";
     private const string RequestBodyOctetStreamContentType = "application/octet-stream";
     private const string DefaultResponseIndicator = "default";

tests/Kiota.Builder.Tests/KiotaBuilderTests.cs

@@ -6687,6 +6687,145 @@ public async Task IndexerTypeIsAccurateAndBackwardCompatibleIndexersAreAddedAsyn
         var actorsItemRequestBuilder = actorsItemRequestBuilderNamespace.FindChildByName<CodeClass>("actorItemRequestBuilder");
         Assert.Equal(actorsCollectionIndexer.ReturnType.Name, actorsItemRequestBuilder.Name);
     }
+    
+    [Fact]
+    public async Task IndexerSupportsUnionOfPrimitiveTypesForPathParametersAsync()
+    {
+        var tempFilePath = Path.GetTempFileName();
+        await using var fs = await GetDocumentStreamAsync(@"openapi: 3.0.0
+info:
+  title: Test API with Union Path Parameters
+  version: 1.0.0
+servers:
+  - url: https://api.example.com/v1
+paths:
+  /keys/{ssh_key_identifier}:
+    get:
+      parameters:
+        - name: ssh_key_identifier
+          in: path
+          required: true
+          description: Either the ID or the fingerprint of an existing SSH key.
+          schema:
+            anyOf:
+              - type: string
+              - type: integer
+          example: 512189
+      responses:
+        200:
+          description: Success!
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SSHKey'
+components:
+  schemas:
+    SSHKey:
+      type: object
+      properties:
+        id:
+          type: integer
+        fingerprint:
+          type: string
+        key:
+          type: string");
+        var mockLogger = new Mock<ILogger<KiotaBuilder>>();
+        var builder = new KiotaBuilder(mockLogger.Object, new GenerationConfiguration { ClientClassName = "TestClient", OpenAPIFilePath = tempFilePath }, _httpClient);
+        var document = await builder.CreateOpenApiDocumentAsync(fs);
+        var node = builder.CreateUriSpace(document!);
+        var codeModel = builder.CreateSourceModel(node);
+
+        var keysCollectionRequestBuilderNamespace = codeModel.FindNamespaceByName("ApiSdk.keys");
+        Assert.NotNull(keysCollectionRequestBuilderNamespace);
+        var keysCollectionRequestBuilder = keysCollectionRequestBuilderNamespace.FindChildByName<CodeClass>("keysRequestBuilder");
+        var keysCollectionIndexer = keysCollectionRequestBuilder.Indexer;
+        Assert.NotNull(keysCollectionIndexer);
+        
+        // Check that the indexer parameter type is a union type containing both string and integer
+        var parameterType = keysCollectionIndexer.IndexParameter.Type;
+        Assert.IsType<CodeUnionType>(parameterType);
+        var unionType = (CodeUnionType)keysCollectionIndexer.IndexParameter.Type;
+        Assert.Equal(2, unionType.Types.Count());
+        
+        // Verify both types are present in the union
+        Assert.Contains(unionType.Types, t => t.Name.Equals("string", StringComparison.OrdinalIgnoreCase));
+        Assert.Contains(unionType.Types, t => t.Name.Equals("integer", StringComparison.OrdinalIgnoreCase));
+        
+        // Verify description
+        Assert.Equal("Either the ID or the fingerprint of an existing SSH key.", keysCollectionIndexer.IndexParameter.Documentation.DescriptionTemplate);
+        Assert.False(keysCollectionIndexer.IndexParameter.Type.IsNullable);
+        Assert.False(keysCollectionIndexer.Deprecation.IsDeprecated);
+    }
+    
+    [Fact]
+    public async Task IndexerSupportsUnionOfPrimitiveTypesForPathParametersWithOneOfAsync()
+    {
+        var tempFilePath = Path.GetTempFileName();
+        await using var fs = await GetDocumentStreamAsync(@"openapi: 3.0.0
+info:
+  title: Test API with OneOf Path Parameters
+  version: 1.0.0
+servers:
+  - url: https://api.example.com/v1
+paths:
+  /keys/{ssh_key_identifier}:
+    get:
+      parameters:
+        - name: ssh_key_identifier
+          in: path
+          required: true
+          description: Either the ID or the fingerprint of an existing SSH key.
+          schema:
+            oneOf:
+              - type: string
+              - type: integer
+          example: 512189
+      responses:
+        200:
+          description: Success!
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SSHKey'
+components:
+  schemas:
+    SSHKey:
+      type: object
+      properties:
+        id:
+          type: integer
+        fingerprint:
+          type: string
+        key:
+          type: string");
+        var mockLogger = new Mock<ILogger<KiotaBuilder>>();
+        var builder = new KiotaBuilder(mockLogger.Object, new GenerationConfiguration { ClientClassName = "TestClient", OpenAPIFilePath = tempFilePath }, _httpClient);
+        var document = await builder.CreateOpenApiDocumentAsync(fs);
+        var node = builder.CreateUriSpace(document!);
+        var codeModel = builder.CreateSourceModel(node);
+
+        var keysCollectionRequestBuilderNamespace = codeModel.FindNamespaceByName("ApiSdk.keys");
+        Assert.NotNull(keysCollectionRequestBuilderNamespace);
+        var keysCollectionRequestBuilder = keysCollectionRequestBuilderNamespace.FindChildByName<CodeClass>("keysRequestBuilder");
+        var keysCollectionIndexer = keysCollectionRequestBuilder.Indexer;
+        Assert.NotNull(keysCollectionIndexer);
+        
+        // Check that the indexer parameter type is a union type containing both string and integer
+        var parameterType = keysCollectionIndexer.IndexParameter.Type;
+        Assert.IsType<CodeUnionType>(parameterType);
+        var unionType = (CodeUnionType)keysCollectionIndexer.IndexParameter.Type;
+        Assert.Equal(2, unionType.Types.Count());
+        
+        // Verify both types are present in the union
+        Assert.Contains(unionType.Types, t => t.Name.Equals("string", StringComparison.OrdinalIgnoreCase));
+        Assert.Contains(unionType.Types, t => t.Name.Equals("integer", StringComparison.OrdinalIgnoreCase));
+        
+        // Verify description
+        Assert.Equal("Either the ID or the fingerprint of an existing SSH key.", keysCollectionIndexer.IndexParameter.Documentation.DescriptionTemplate);
+        Assert.False(keysCollectionIndexer.IndexParameter.Type.IsNullable);
+        Assert.False(keysCollectionIndexer.Deprecation.IsDeprecated);
+    }
+    
     [Fact]
     public async Task MapsBooleanEnumToBooleanTypeAsync()
     {