Skip to content

[repo-assist] refactor: extract tryResolveSingle helper in DefinitionCompiler #441

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

Merged
sergey-tihon merged 2 commits into from
May 17, 2026
Merged

[repo-assist] refactor: extract tryResolveSingle helper in DefinitionCompiler #441

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1090d9
refactor: extract tryResolveSingle helper in DefinitionCompiler
github-actions[bot] May 17, 2026
c3528e5
ci: trigger checks
github-actions[bot] May 17, 2026
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
42 changes: 11 additions & 31 deletions src/SwaggerProvider.DesignTime/DefinitionCompiler.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,43 +411,23 @@ type DefinitionCompiler(schema: OpenApiDocument, provideNullable, useDateOnly: b

let resolvedType =
// If schemaObj.Type is missing, but allOf/oneOf/anyOf is present with one subschema, use that
if
not schemaObj.Type.HasValue
&& not(isNull schemaObj.AllOf)
&& schemaObj.AllOf.Count = 1
then
let firstAllOf = schemaObj.AllOf.[0]

if not(isNull firstAllOf) && firstAllOf.Type.HasValue then
Some firstAllOf.Type.Value
else
None
else if
not schemaObj.Type.HasValue
&& not(isNull schemaObj.OneOf)
&& schemaObj.OneOf.Count = 1
then
let firstOneOf = schemaObj.OneOf.[0]
let tryResolveSingle(schemas: System.Collections.Generic.IList<IOpenApiSchema>) =
if not(isNull schemas) && schemas.Count = 1 then
let first = schemas.[0]

if not(isNull firstOneOf) && firstOneOf.Type.HasValue then
Some firstOneOf.Type.Value
if not(isNull first) && first.Type.HasValue then
Some first.Type.Value
else
None
else
None
else if
not schemaObj.Type.HasValue
&& not(isNull schemaObj.AnyOf)
&& schemaObj.AnyOf.Count = 1
then
let firstAnyOf = schemaObj.AnyOf.[0]

if not(isNull firstAnyOf) && firstAnyOf.Type.HasValue then
Some firstAnyOf.Type.Value
else
None
else if schemaObj.Type.HasValue then
if schemaObj.Type.HasValue then
Some schemaObj.Type.Value
else
None
tryResolveSingle schemaObj.AllOf
|> Option.orElseWith(fun () -> tryResolveSingle schemaObj.OneOf)
|> Option.orElseWith(fun () -> tryResolveSingle schemaObj.AnyOf)

// Helper to get full definition path from reference ID
let getFullPath(refId: string) =
Expand Down
Loading