Skip to content

add anyOf case to validateSchemaType #87

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

Open
paolino wants to merge 8 commits into
base: master
Choose a base branch
from
Open

add anyOf case to validateSchemaType #87

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f22c316
add anyOf case to validateSchemaType
paolino Nov 10, 2023
666f766
Give title to sub-schemas of oneOf for sum types
maksbotan Nov 18, 2023
84ccfaa
version 3.2.4
maksbotan Nov 20, 2023
0965a7a
Bump versions for GHC 9.8
maksbotan Nov 27, 2023
f002189
Allow `lens ^>=5.3`
JackKelly-Bellroy May 14, 2024
bdc21a3
Allow `QuickCheck ^>=2.15`
JackKelly-Bellroy May 14, 2024
fab96d6
Allow cookie-0.5
spencerjanssen Apr 29, 2024
a31eb40
Merge upstream/master into develop
paolino Feb 4, 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
20 changes: 16 additions & 4 deletions src/Data/OpenApi/Internal/Schema/Validation.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import Prelude ()
import Prelude.Compat

import Control.Applicative
import Control.Lens hiding (allOf)
import Control.Lens hiding (allOf, anyOf)
import Control.Monad (forM, forM_, when)

import Data.Aeson hiding (Result)
Expand Down Expand Up @@ -480,13 +480,20 @@ inferParamSchemaTypes sch = concat
, has (pattern._Just) ] ]
]

-- compute number of passing variants and variants
countPassingVariants :: Value -> [Referenced Schema] -> Validation s Int
countPassingVariants val variants = do
res <- forM variants $ \var ->
True <$ validateWithSchemaRef var val <|> return False
pure $ length $ filter id res


validateSchemaType :: Value -> Validation Schema ()
validateSchemaType val = withSchema $ \sch ->
case sch of
(view oneOf -> Just variants) -> do
res <- forM variants $ \var ->
(True <$ validateWithSchemaRef var val) <|> (return False)
case length $ filter id res of
npassing <- countPassingVariants val variants
case npassing of
0 -> invalid $ "Value not valid under any of 'oneOf' schemas: " ++ show val
1 -> valid
_ -> invalid $ "Value matches more than one of 'oneOf' schemas: " ++ show val
Expand All @@ -495,6 +502,11 @@ validateSchemaType val = withSchema $ \sch ->
-- variant does not match.
forM_ variants $ \var ->
validateWithSchemaRef var val
(view anyOf -> Just variants) -> do
npassing <- countPassingVariants val variants
case npassing of
0 -> invalid $ "Value not valid under any of 'anyOf' schemas: " ++ show val
_ -> valid

_ ->
case (sch ^. type_, val) of
Expand Down