NorfairKing/autodocodec
1
1
Fork 0
mirror of https://github.com/NorfairKing/autodocodec.git synced 2024-11-29 18:22:58 +03:00
Code Issues Projects Releases Wiki Activity

got ci to pass

Browse Source
This commit is contained in:
Tom Sydney Kerckhove 2021-10-27 12:32:29 +02:00
parent 24c2f3ca00
commit e64d072d84
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
autodocodec-aeson/src/Autodocodec/Aeson/Document.hs
View File

@ -67,11 +67,10 @@ instance ToJSON JSONSchema where
ObjectSchema os ->
let combine (ps, rps) k (r, s) =
( (k, s) : ps,
( case r of
case r of
Required -> k : rps
Optional -> rps
)
)
in case M.foldlWithKey combine ([], []) os of
([], _) -> ["type" JSON..= ("object" :: Text)]
(ps, []) ->
@ -110,10 +109,9 @@ instance FromJSON JSONSchema where
let keySchemaFor k s =
M.singleton
k
( ( if k `elem` requiredProps
( if k `elem` requiredProps
then Required
else Optional
),
else Optional,
s
)
pure $ ObjectSchema $ M.unions $ map (uncurry keySchemaFor) $ M.toList props
@ -158,8 +156,8 @@ jsonSchemaVia = go
goObject :: ObjectCodec input output -> Map Text (KeyRequirement, JSONSchema)
goObject = \case
RequiredKeyCodec k c -> M.singleton k (Required, (go c))
OptionalKeyCodec k c -> M.singleton k (Optional, (go c))
RequiredKeyCodec k c -> M.singleton k (Required, go c)
OptionalKeyCodec k c -> M.singleton k (Optional, go c)
BimapObjectCodec _ _ oc -> goObject oc
PureObjectCodec _ -> M.empty
ApObjectCodec oc1 oc2 -> M.union (goObject oc1) (goObject oc2)