Skip to content

AnyOf with array schema #309

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

Draft
nsmnds wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

AnyOf with array schema #309

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfe013e
Parse anyOf
Dec 16, 2024
b2f3378
Handle arrays
Dec 16, 2024
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
61 changes: 39 additions & 22 deletions ...rter/openapi/src/commonMain/kotlin/community/flock/wirespec/openapi/v3/OpenApiV3Parser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,20 +361,19 @@ object OpenApiV3Parser {
Union(
comment = null,
identifier = DefinitionIdentifier(name),
entries = schemaObject.oneOf
.orEmpty()
entries = (schemaObject.oneOf.orEmpty() + schemaObject.anyOf.orEmpty())
.mapIndexed { index, it ->
when (it) {
is ReferenceObject -> toReference(it)
is SchemaObject -> toReference(it, className(name, index.toString()))
}

.let { ref -> if (schemaObject.type == OpenapiType.ARRAY) ref.toIterable() else ref }
}
.toSet()

)
)
.plus(schemaObject.oneOf.orEmpty().flatMapIndexed { index, it ->
.plus((schemaObject.oneOf.orEmpty() + schemaObject.anyOf.orEmpty()).flatMapIndexed { index, it ->
when (it) {
is ReferenceObject -> emptyList()
is SchemaObject -> flatten(it, className(name, index.toString()))
Expand Down Expand Up @@ -561,28 +560,46 @@ object OpenApiV3Parser {
private fun OpenAPIObject.toField(schema: SchemaObject, name: String) =
schema.properties.orEmpty().map { (key, value) ->
when (value) {
is SchemaObject -> {
Field(
identifier = FieldIdentifier(key),
reference = when {
value.enum != null -> toReference(value, className(name, key))
value.type == OpenapiType.ARRAY -> toReference(value, className(name, key, "Array"))
else -> toReference(value, className(name, key))
},
isNullable = !(schema.required?.contains(key) ?: false)
)
}
is SchemaObject -> createField(schema, key, value, name)
is ReferenceObject -> createField(schema, key, value)
}
}

is ReferenceObject -> {
Field(
FieldIdentifier(key),
toReference(value),
!(schema.required?.contains(key) ?: false)
)
}
private fun OpenAPIObject.createField(schema: SchemaObject, key: String, value: SchemaObject, name: String): Field {
val reference = when {
value.enum != null -> toReference(value, className(name, key))
value.type == OpenapiType.ARRAY -> toReference(value, className(name, key, "Array"))
value.anyOf != null || value.oneOf != null -> createUnionReference(value, name, key)
else -> toReference(value, className(name, key))
}
return Field(
identifier = FieldIdentifier(key),
reference = reference,
isNullable = !(schema.required?.contains(key) ?: false)
)
}

private fun OpenAPIObject.createField(schema: SchemaObject, key: String, value: ReferenceObject): Field =
Field(
identifier = FieldIdentifier(key),
reference = toReference(value),
isNullable = !(schema.required?.contains(key) ?: false)
)

private fun OpenAPIObject.createUnionReference(schema: SchemaObject, name: String, key: String): Reference {
val unionRefs = schema.anyOf.orEmpty() + schema.oneOf.orEmpty()
val allAreArrays = unionRefs.all { ref ->
when (ref) {
is ReferenceObject -> resolveSchemaObject(ref).second.type == OpenapiType.ARRAY
is SchemaObject -> ref.type == OpenapiType.ARRAY
}
}

return toReference(schema, className(name, key)).let { ref ->
if (allAreArrays) ref.toIterable() else ref
}
}

private fun OpenAPIObject.toField(parameter: ParameterObject, name: String) =
when (val s = parameter.schema) {
is ReferenceObject -> toReference(s)
Expand Down