Skip to content

Add null to Maybe a schemas #1

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

Closed
wants to merge 3 commits into from
Closed

Add null to Maybe a schemas #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
837a7b6
Add null to `Maybe a` schemas
rasheedja Jul 29, 2024
269877c
Use `anyOf` instead of `oneOf` to fix nested `Maybe`s
rasheedja Jul 29, 2024
5ac3f33
return -> pure
rasheedja Jul 29, 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
9 changes: 8 additions & 1 deletion src/Data/OpenApi/Internal/Schema.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,14 @@ instance ToSchema Float where declareNamedSchema = plain . paramSchemaToSc
instance (Typeable (Fixed a), HasResolution a) => ToSchema (Fixed a) where declareNamedSchema = plain . paramSchemaToSchema

instance ToSchema a => ToSchema (Maybe a) where
declareNamedSchema _ = declareNamedSchema (Proxy :: Proxy a)
declareNamedSchema _ = do
NamedSchema mName aSchema <- declareNamedSchema (Proxy :: Proxy a)

let aSchemaWithNull = mempty
{ _schemaAnyOf = Just [Inline aSchema, Inline mempty { _schemaType = Just OpenApiNull }]
}

pure $ NamedSchema mName aSchemaWithNull

instance (ToSchema a, ToSchema b) => ToSchema (Either a b) where
-- To match Aeson instance
Expand Down