Add subschemas

pkg/converter/converter.go

@@ -422,10 +422,20 @@ func (c *Converter) convertRequestBody(requestBodyRef *openapi3.RequestBodyRef)
 							arg.Properties = nestedProps["properties"].(map[string]any)
 						}
 					}
-					// Handle allOf
-					if propRef.Value.Type == "" && len(propRef.Value.AllOf) == 1 {
-						arg.Type = "object"
-						arg.Properties = c.allOfHandle(propRef.Value.AllOf[0])
+					if propRef.Value.Type == "" {
+						// Handle allOf, anyOf, oneOf
+						if len(propRef.Value.AllOf) == 1 {
+							arg.Type = "object"
+							arg.Properties = c.allOfHandle(propRef.Value.AllOf[0])
+						} else if c.hasCommonType(propRef.Value.AllOf) {
+							arg.Type = propRef.Value.AllOf[0].Value.Type
+						}
+						if c.hasCommonType(propRef.Value.AnyOf) {
+							arg.Type = propRef.Value.AnyOf[0].Value.Type
+						}
+						if c.hasCommonType(propRef.Value.OneOf) {
+							arg.Type = propRef.Value.OneOf[0].Value.Type
+						}
 					}
 
 					args = append(args, arg)
@@ -459,6 +469,19 @@ func (c *Converter) allOfHandle(schemaRef *openapi3.SchemaRef) map[string]interf
 	return properties
 }
 
+func (c *Converter) hasCommonType(schemaRefs []*openapi3.SchemaRef) bool {
+	if len(schemaRefs) == 0 {
+		return false
+	}
+	first := schemaRefs[0].Value.Type
+	for _, schemaRef := range schemaRefs {
+		if first != schemaRef.Value.Type {
+			return false
+		}
+	}
+	return true
+}
+
 // createRequestTemplate creates an MCP request template from an OpenAPI operation
 func (c *Converter) createRequestTemplate(path, method string, operation *openapi3.Operation) (*models.RequestTemplate, error) {
 	// Get the server URL from the OpenAPI specification

pkg/converter/converter_test.go

@@ -96,6 +96,12 @@ func TestEndToEndConversion(t *testing.T) {
 			expectedOutput: "../../test/expected-output-schema-test-mcp.yaml",
 			serverName:     "output-schema-api",
 		},
+		{
+			name:           "Handle Subschemas",
+			inputFile:      "../../test/subschemas.json",
+			expectedOutput: "../../test/expected-subschemas-mcp.yaml",
+			serverName:     "openapi-server",
+		},
 	}
 
 	for _, tc := range testCases {

test/expected-subschemas-mcp.yaml

@@ -0,0 +1,25 @@
+server:
+  name: openapi-server
+tools:
+  - name: post_user
+    description: Test allOf, anyOf, and oneOf in request body
+    args:
+      - name: allOfUser
+        description: Combines both BaseUser and ExtraInfo via allOf
+        type: object
+        position: body
+      - name: anyOfUser
+        description: Valid if matches any of BaseUser or ExtraInfo
+        type: object
+        position: body
+      - name: oneOfUser
+        description: Valid if matches exactly one of BaseUser or ExtraInfo
+        type: object
+        position: body
+    requestTemplate:
+      url: /user
+      method: POST
+      headers:
+        - key: Content-Type
+          value: application/json
+    responseTemplate: {}

test/subschemas.json

@@ -0,0 +1,99 @@
+{
+  "openapi": "3.0.3",
+  "info": {
+    "title": "Composition Test API",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/user": {
+      "post": {
+        "summary": "Test allOf, anyOf, and oneOf in request body",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CompositionTest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "CompositionTest": {
+        "type": "object",
+        "properties": {
+          "allOfUser": {
+            "description": "Combines both BaseUser and ExtraInfo via allOf",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BaseUser"
+              },
+              {
+                "$ref": "#/components/schemas/ExtraInfo"
+              }
+            ]
+          },
+          "anyOfUser": {
+            "description": "Valid if matches any of BaseUser or ExtraInfo",
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BaseUser"
+              },
+              {
+                "$ref": "#/components/schemas/ExtraInfo"
+              }
+            ]
+          },
+          "oneOfUser": {
+            "description": "Valid if matches exactly one of BaseUser or ExtraInfo",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/BaseUser"
+              },
+              {
+                "$ref": "#/components/schemas/ExtraInfo"
+              }
+            ]
+          }
+        }
+      },
+      "BaseUser": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer"
+          },
+          "name": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "name"
+        ]
+      },
+      "ExtraInfo": {
+        "type": "object",
+        "properties": {
+          "email": {
+            "type": "string",
+            "format": "email"
+          },
+          "age": {
+            "type": "integer",
+            "minimum": 0
+          }
+        }
+      }
+    }
+  }
+}