git.iko.soy/typeable/schematic
on master help sign in
swap
7db0b4627 ahead, 0 behind
20 files changed+557−238
since splitsnapshots
unifiedsplit
ChangeLog.md+16 release+16−8 schematic.cabal+10−5 src/Data/Schematic/DSL.hs+11−2 src/Data/Schematic/Generator.hs+34−43 src/Data/Schematic/Generator/Regex.hs+10−10 src/Data/Schematic/JsonSchema.hs+21−9 src/Data/Schematic/Migration.hs+10−2 src/Data/Schematic/Path.hs+17−20 src/Data/Schematic/Schema.hs+108−38 src/Data/Schematic/Schema.hs-boot+95 src/Data/Schematic/Validation.hs+56−27 src/Data/Schematic/Verifier/Array.hs+1−1 src/Data/Schematic/Verifier/Common.hs+2−2 src/Data/Schematic/Verifier/Number.hs+9−9 src/Data/Schematic/Verifier/Text.hs+58−55 stack-13.21.yaml+7 stack.yaml+5−4 test/JsonSchemaSpec.hs+58 test/SchemaSpec.hs+13−3
ChangeLog.md+16
@@ -1,5 +1,21 @@
11# Revision history for schematic
22
3+## 0.6.0.0 -- 2021-01-15
4+
5+Added compatability with aeson-1.4.3.0. Since version 1.4.3 the module `Data.Aeson` started exporting `JSONPath`, which was conflicting with our own `JSONPath`. Furthermore, started using `JSONPathElement` from `aeson` instead of `DemotedPathSegment`.
6+
7+## 0.5.1.0 -- 2021-01-15
8+
9+Fix the generation of json schema for numbers.
10+Add array constraints.
11+Fix the generation of text and number constraints.
12+Remove jsonpath from the error message.
13+
14+## 0.5.0.0 -- 2019-02-20
15+
16+GHC 8.6, json generation by schema definition, validation bug fixes, better
17+parsing error messages.
18+
319## 0.4.3.0 -- 2018-07-12
420
521GHC 8.4 support, dropping support for older GHC versions
release+16−8
@@ -4,6 +4,12 @@ set -o xtrace
44
55dist=`stack path --dist-dir --stack-yaml ./stack.yaml 2> /dev/null`
66
7+rootdir=`pwd`
8+
9+cabalfile=`ls *.cabal`
10+packagename="${cabalfile%%.*}"
11+version=`grep '^version:' schematic.cabal | rev | cut -d" " -f1 | rev`
12+
713echo -e "\033[1;36mTesting library...\033[0m"
814stack test 2> /dev/null
915
@@ -18,17 +24,19 @@ if [ "$?" -eq "0" ]; then
1824 read -p "Hackage username: " username
1925 read -p "Hackage password: " -s password
2026 echo ""
21− cabal upload -u $username -p $password dist/$1-$2.tar.gz
27+ cabal upload -u $username -p $password dist/$packagename-$version.tar.gz
2228
23− docdir=$dist/doc/html
24− cd $docdir
25− doc=$1-$2-docs
29+ docdir=`find .stack-work -name "$packagename-$version-docs"`
2630
27− echo -e "Compressing documentation from \033[1;34m$docdir\033[0m for \033[1;35m$1\033[0m-\033[1;33m$2\033[1;30m"
28− cp -r $1 $doc
29− tar -c -v -z --format=ustar -f $doc.tar.gz $doc
31+ echo -e "Compressing documentation from \033[1;34m$docdir\033[0m for \033[1;35m$packagename\033[0m-\033[1;33m$version\033[1;30m"
32+ tar -c -v -z --format=ustar -f $docdir.tar.gz $docdir
3033 echo -e "\033[1;32mUploading documentation to Hackage...\033[0m"
31− curl -X PUT -H 'Content-Type: application/x-tar' -H 'Content-Encoding: gzip' --data-binary "@$doc.tar.gz" "https://$username:$password@hackage.haskell.org/package/$1-$2/docs"
34+ cd $docdir
35+ cd ..
36+ curl -X PUT -H 'Content-Type: application/x-tar' -H 'Content-Encoding: gzip' --data-binary "$packagename-$version-docs.tar.gz" "https://$username:$password@hackage.haskell.org/package/$packagename-$version/candidate/docs"
37+ open "https://hackage.haskell.org/package/$packagename-$version/candidate/"
38+ cd $rootdir
39+ echo "To publish the candidate, use 'cabal upload --publish'."
3240 exit $?
3341else
3442 echo -e "\033[1;31mNot in a stack-powered project\033[0m"
schematic.cabal+10−5
@@ -1,6 +1,7 @@
11name: schematic
2−version: 0.4.3.0
2+version: 0.6.0.0
33synopsis: JSON-biased spec and validation tool
4+description: JSON-biased spec and validation tool. Makes possible to have a schema as a haskell type and derive json instances, validation actions, JSON generation for property-test generically. Built-in lens support.
45license: BSD3
56license-file: LICENSE
67author: Denis Redozubov
@@ -9,7 +10,7 @@ homepage: http://github.com/typeable/schematic
910Bug-reports: http://github.com/typeable/schematic/issues/
1011category: Data
1112build-type: Simple
12−extra-source-files: ChangeLog.md
13+extra-source-files: ChangeLog.md, README.md
1314cabal-version: >=1.10
1415
1516library
@@ -64,9 +65,9 @@ library
6465 , TypeOperators
6566 , TypeSynonymInstances
6667 , UndecidableInstances
67− build-depends: base >=4.11 && <4.12
68+ build-depends: base >=4.11 && <5
6869 , bytestring
69− , aeson >= 1
70+ , aeson >= 1.4.3.0 && < 1.6
7071 , containers
7172 , hjsonschema
7273 , mtl
@@ -94,7 +95,7 @@ test-suite spec
9495 default-language: Haskell2010
9596 build-depends: HUnit
9697 , aeson >= 1
97− , base >=4.11 && <4.12
98+ , base >=4.11 && <4.13
9899 , bytestring
99100 , containers
100101 , hjsonschema
@@ -117,3 +118,7 @@ test-suite spec
117118 , HelpersSpec
118119 , LensSpec
119120 , JsonSchemaSpec
121+
122+source-repository head
123+ type: git
124+ location: https://github.com/typeable/schematic
src/Data/Schematic/DSL.hs+11−2
@@ -1,4 +1,5 @@
11{-# LANGUAGE AllowAmbiguousTypes #-}
2+{-# LANGUAGE CPP #-}
23
34module Data.Schematic.DSL where
45
@@ -17,11 +18,19 @@ import Data.Vinyl
1718import Data.Vinyl.Functor
1819
1920
21+#if MIN_VERSION_base(4,12,0)
2022type Constructor a
21− = forall fields b. (fields ~ FieldsOf a, FSubset fields b (FImage fields b))
23+ = forall fields b
24+ . (fields ~ FieldsOf a, FSubset fields b (FImage fields b), RMap fields)
2225 => Rec (Tagged fields :. FieldRepr) b
2326 -> JsonRepr ('SchemaObject fields)
24−
27+#else
28+type Constructor a
29+ = forall fields b
30+ . (fields ~ FieldsOf a, FSubset fields b (FImage fields b))
31+ => Rec (Tagged fields :. FieldRepr) b
32+ -> JsonRepr ('SchemaObject fields)
33+#endif
2534withRepr :: Constructor a
2635withRepr = ReprObject . rmap (unTagged . getCompose) . fcast
2736
src/Data/Schematic/Generator.hs+34−43
@@ -1,14 +1,13 @@
11module Data.Schematic.Generator where
22
3−import Data.Aeson (Value(..))
4−import qualified Data.HashMap.Lazy as H
5−import Data.Maybe
6−import Data.Schematic.Schema
7−import Data.Text (Text, pack)
3+import Data.Maybe
4+import Data.Schematic.Generator.Regex
5+import {-# SOURCE #-} Data.Schematic.Schema
6+import Data.Schematic.Verifier
7+import Data.Scientific
8+import Data.Text (Text, pack)
89import qualified Data.Vector as V
9−import Data.Schematic.Generator.Regex
10−import Data.Schematic.Verifier
11−import Test.SmallCheck.Series
10+import Test.SmallCheck.Series
1211
1312maxHigh :: Int
1413maxHigh = 30
@@ -19,25 +18,26 @@ minLow = 2
1918textLengthSeries :: Monad m => [VerifiedTextConstraint] -> Series m Text
2019textLengthSeries =
2120 \case
22− [VTEq eq] -> pure $ pack $ take (fromIntegral eq) $ cycle "sample"
21+ [VTEq eq] -> pure $ pack $ take (fromIntegral eq) $ cycle "sample"
2322 [VTBounds ml mh] -> do
24− let l = fromMaybe minLow (fromIntegral <$> ml) + 1
25− h = fromMaybe maxHigh (fromIntegral <$> mh) - 1
23+ let
24+ l = fromMaybe minLow (fromIntegral <$> ml) + 1
25+ h = fromMaybe maxHigh (fromIntegral <$> mh) - 1
2626 n <- generate $ \depth -> take depth [l .. h]
2727 pure $ pack $ take (fromIntegral n) $ cycle "sample"
28− _ -> pure "error"
28+ _ -> pure "error"
2929
3030textEnumSeries :: Monad m => [Text] -> Series m Text
3131textEnumSeries enum = generate $ \depth -> take depth enum
3232
33−textSeries :: Monad m => [DemotedTextConstraint] -> Series m Value
33+textSeries :: Monad m => [DemotedTextConstraint] -> Series m Text
3434textSeries cs = do
3535 let mvcs = verifyTextConstraints cs
3636 case mvcs of
3737 Just vcs -> do
3838 n <- textSeries' vcs
39− pure $ String n
40− Nothing -> pure Null
39+ pure n
40+ Nothing -> pure "error"
4141
4242textSeries' :: Monad m => [VerifiedTextConstraint] -> Series m Text
4343textSeries' [] = pure "sample"
@@ -48,19 +48,19 @@ textSeries' vcs = do
4848 Nothing -> do
4949 let regexps = listToMaybe [x | VTRegex x _ _ <- vcs]
5050 case regexps of
51− Just e -> regexSeries e
51+ Just e -> regexSeries e
5252 Nothing -> textLengthSeries vcs
5353
54−numberSeries :: Monad m => [DemotedNumberConstraint] -> Series m Value
54+numberSeries :: Monad m => [DemotedNumberConstraint] -> Series m Scientific
5555numberSeries cs = do
5656 let mvcs = verifyNumberConstraints cs
5757 case mvcs of
5858 Just vcs -> do
5959 n <- numberSeries' vcs
60− pure $ Number $ fromIntegral n
61− Nothing -> pure Null
60+ pure $ n
61+ Nothing -> pure 0
6262
63−numberSeries' :: Monad m => VerifiedNumberConstraint -> Series m Integer
63+numberSeries' :: Monad m => VerifiedNumberConstraint -> Series m Scientific
6464numberSeries' =
6565 \case
6666 VNEq eq -> pure $ fromIntegral eq
@@ -70,31 +70,22 @@ numberSeries' =
7070 n <- generate $ \depth -> take depth [l .. h]
7171 pure $ fromIntegral n
7272
73−arraySeries ::
74− Monad m => [DemotedArrayConstraint] -> DemotedSchema -> Series m Value
75−arraySeries cs sch = do
73+arraySeries
74+ :: (Monad m, Serial m (JsonRepr s))
75+ => [DemotedArrayConstraint]
76+ -> Series m (V.Vector (JsonRepr s))
77+arraySeries cs = do
7678 let mvcs = verifyArrayConstraint cs
7779 case mvcs of
78− Just vcs -> arraySeries' vcs sch
79− Nothing -> pure Null
80+ Just vcs -> arraySeries' vcs
81+ Nothing -> pure V.empty
8082
81−arraySeries' ::
82− Monad m => Maybe VerifiedArrayConstraint -> DemotedSchema -> Series m Value
83−arraySeries' ml sch = do
84− objs <- V.replicateM (maybe minRepeat f ml) (valueSeries sch)
85− pure $ Array objs
83+arraySeries'
84+ :: forall m s. (Monad m, Serial m (JsonRepr s))
85+ => Maybe VerifiedArrayConstraint
86+ -> Series m (V.Vector (JsonRepr s))
87+arraySeries' ml = do
88+ objs <- V.replicateM (maybe minRepeat f ml) (series :: Series m (JsonRepr s))
89+ pure $ objs
8690 where
8791 f (VAEq l) = fromIntegral l
88−
89−valueSeries :: Monad m => DemotedSchema -> Series m Value
90−valueSeries (DSchemaText cs) = textSeries cs
91−valueSeries (DSchemaNumber cs) = numberSeries cs
92−valueSeries DSchemaBoolean = Bool <$> pure True \/ pure False
93−valueSeries (DSchemaObject pairs') =
94− Object <$> (decDepth $ mapM valueSeries $ H.fromList pairs')
95−valueSeries (DSchemaArray cs sch) = arraySeries cs sch
96−valueSeries DSchemaNull = pure Null
97−valueSeries (DSchemaOptional sch) = pure Null \/ valueSeries sch
98−valueSeries (DSchemaUnion schs) = do
99− objs <- mapM valueSeries schs
100− pure $ Array $ V.fromList objs
src/Data/Schematic/Generator/Regex.hs+10−10
@@ -1,15 +1,15 @@
11module Data.Schematic.Generator.Regex where
22
3−import Control.Monad
4−import Data.List
5−import Data.Maybe
3+import Control.Monad
4+import Data.List
5+import Data.Maybe
66import qualified Data.Set as S
7−import Data.Text (Text, unpack)
8−import Data.Text.Lazy (toStrict)
9−import Data.Text.Lazy.Builder (Builder, singleton, toLazyText)
10−import Test.SmallCheck.Series
11−import Text.Regex.TDFA.Pattern
12−import Text.Regex.TDFA.ReadRegex (parseRegex)
7+import Data.Text (Text, unpack)
8+import Data.Text.Lazy (toStrict)
9+import Data.Text.Lazy.Builder (Builder, singleton, toLazyText)
10+import Test.SmallCheck.Series
11+import Text.Regex.TDFA.Pattern
12+import Text.Regex.TDFA.ReadRegex (parseRegex)
1313
1414
1515minRepeat :: Int
@@ -22,7 +22,7 @@ regexSeries :: (Monad m) => Text -> Series m Text
2222regexSeries regexp =
2323 case parseRegex . unpack $ regexp of
2424 Right (p, _) -> toStrict . toLazyText <$> regexSeries' p
25− Left _ -> pure ""
25+ Left _ -> pure ""
2626
2727regexSeries' :: (Monad m) => Pattern -> Series m Builder
2828regexSeries' pt =
src/Data/Schematic/JsonSchema.hs+21−9
@@ -30,13 +30,13 @@ textConstraint :: DemotedTextConstraint -> State D4.Schema ()
3030textConstraint (DTEq n) = modify $ \s -> s
3131 { _schemaMinLength = pure $ fromIntegral n
3232 , _schemaMaxLength = pure $ fromIntegral n }
33−textConstraint (DTLt n) = modify $ \s -> s
34− { _schemaMaxLength = pure . fromIntegral $ n + 1 }
3533textConstraint (DTLe n) = modify $ \s -> s
3634 { _schemaMaxLength = pure . fromIntegral $ n }
37−textConstraint (DTGt n) =
35+textConstraint (DTLt n) =
3836 let n' = if n == 0 then 0 else n - 1
39− in modify $ \s -> s { _schemaMinLength = pure . fromIntegral $ n' }
37+ in modify $ \s -> s { _schemaMaxLength = pure . fromIntegral $ n' }
38+textConstraint (DTGt n) = modify $ \s -> s
39+ { _schemaMinLength = pure . fromIntegral $ n + 1 }
4040textConstraint (DTGe n) = modify $ \s -> s
4141 { _schemaMinLength = pure . fromIntegral $ n }
4242textConstraint (DTRegex r) = modify $ \s -> s { _schemaPattern = pure r }
@@ -48,18 +48,30 @@ numberConstraint :: DemotedNumberConstraint -> State D4.Schema ()
4848numberConstraint (DNLe n) = modify $ \s -> s
4949 { _schemaMaximum = pure . fromIntegral $ n }
5050numberConstraint (DNLt n) = modify $ \s -> s
51− { _schemaMaximum = pure . fromIntegral $ n + 1 }
51+ { _schemaMaximum = pure . fromIntegral $ n
52+ , _schemaExclusiveMaximum = pure True }
5253numberConstraint (DNGt n) = modify $ \s -> s
54+ { _schemaMinimum = pure . fromIntegral $ n
55+ , _schemaExclusiveMinimum = pure True }
56+numberConstraint (DNGe n) = modify $ \s -> s
5357 { _schemaMinimum = pure . fromIntegral $ n }
54−numberConstraint (DNGe n) =
55− let n' = if n == 0 then 0 else n - 1
56− in modify $ \s -> s { _schemaMinimum = pure . fromIntegral $ n' }
5758numberConstraint (DNEq n) = modify $ \s -> s
5859 { _schemaMinimum = pure $ fromIntegral n
5960 , _schemaMaximum = pure $ fromIntegral n }
6061
6162arrayConstraint :: DemotedArrayConstraint -> State D4.Schema ()
62−arrayConstraint (DAEq _) = pure ()
63+arrayConstraint (DALe n) = modify $ \s -> s
64+ { _schemaMaxItems = pure . fromIntegral $ n }
65+arrayConstraint (DALt n) =
66+ let n' = if n == 0 then 0 else n - 1
67+ in modify $ \s -> s { _schemaMaxItems = pure . fromIntegral $ n' }
68+arrayConstraint (DAGt n) = modify $ \s -> s
69+ { _schemaMinItems = pure . fromIntegral $ n + 1 }
70+arrayConstraint (DAGe n) = modify $ \s -> s
71+ { _schemaMinItems = pure . fromIntegral $ n }
72+arrayConstraint (DAEq n) = modify $ \s -> s
73+ { _schemaMinItems = pure $ fromIntegral n
74+ , _schemaMaxItems = pure $ fromIntegral n }
6375
6476toJsonSchema
6577 :: forall proxy schema
src/Data/Schematic/Migration.hs+10−2
@@ -1,5 +1,6 @@
11{-# LANGUAGE AllowAmbiguousTypes #-}
2−{-# LANGUAGE TemplateHaskell #-}
2+{-# LANGUAGE CPP #-}
3+{-# LANGUAGE TemplateHaskell #-}
34
45module Data.Schematic.Migration where
56
@@ -8,7 +9,7 @@ import Data.Schematic.DSL
89import Data.Schematic.Lens
910import Data.Schematic.Path
1011import Data.Schematic.Schema
11−import Data.Singletons.Prelude hiding (All, (:.))
12+import Data.Singletons.Prelude hiding ((:.), All)
1213import Data.Singletons.TypeLits
1314import Data.Tagged
1415import Data.Vinyl
@@ -156,10 +157,17 @@ data MList :: (Type -> Type) -> [Schema] -> Type where
156157
157158infixr 7 :&&
158159
160+#if MIN_VERSION_base(4,12,0)
161+migrateObject
162+ :: forall m fs fh. (FSubset fs fs (FImage fs fs), Monad m, RMap fh, RMap fs)
163+ => (Rec (Tagged fs :. FieldRepr) fh -> m (Rec (Tagged fs :. FieldRepr) fs))
164+ -> Tagged ('SchemaObject fs) (JsonRepr ('SchemaObject fh) -> m (JsonRepr ('SchemaObject fs)))
165+#else
159166migrateObject
160167 :: forall m fs fh. (FSubset fs fs (FImage fs fs), Monad m)
161168 => (Rec (Tagged fs :. FieldRepr) fh -> m (Rec (Tagged fs :. FieldRepr) fs))
162169 -> Tagged ('SchemaObject fs) (JsonRepr ('SchemaObject fh) -> m (JsonRepr ('SchemaObject fs)))
170+#endif
163171migrateObject f = Tagged $ \(ReprObject r) -> do
164172 res <- f $ rmap (Compose . Tagged) r
165173 pure $ withRepr @('SchemaObject fs) res
src/Data/Schematic/Path.hs+17−20
@@ -4,36 +4,33 @@ import Data.Foldable as F
44import Data.Singletons.Prelude
55import Data.Singletons.TypeLits
66import Data.Text as T
7+import Data.Aeson.Internal
78
89
9−data PathSegment = Key Symbol | Ix Nat
10−
11−data instance Sing (jp :: PathSegment) where
12− SKey :: (SingI k) => Sing (k :: Symbol) -> Sing ('Key k)
13− SIx :: (SingI n) => Sing (n :: Nat) -> Sing ('Ix n)
14−
15−data DemotedPathSegment = DKey Text | DIx Integer
10+newtype JSONPathText = JSONPathText Text
1611 deriving (Show)
1712
18−-- | Textual representation of json path.
19−newtype JSONPath = JSONPath Text
20− deriving (Show)
13+data PathSegment = PathKey Symbol | PathIx Nat
14+
15+data instance Sing (jp :: PathSegment) where
16+ SKey :: (SingI k) => Sing (k :: Symbol) -> Sing ('PathKey k)
17+ SIx :: (SingI n) => Sing (n :: Nat) -> Sing ('PathIx n)
2118
22−demotePath :: Sing (ps :: [PathSegment]) -> [DemotedPathSegment]
19+demotePath :: Sing (ps :: [PathSegment]) -> JSONPath
2320demotePath = go []
2421 where
25− go :: [DemotedPathSegment] -> Sing (ps :: [PathSegment]) -> [DemotedPathSegment]
22+ go :: JSONPath -> Sing (ps :: [PathSegment]) -> JSONPath
2623 go acc SNil = acc
2724 go acc (SCons p ps) = go (acc ++ [demotePathSeg p]) ps
28− demotePathSeg :: Sing (ps :: PathSegment) -> DemotedPathSegment
29− demotePathSeg (SKey s) = DKey $ T.pack $ withKnownSymbol s $ symbolVal s
30− demotePathSeg (SIx n) = DIx $ withKnownNat n $ fromIntegral $ natVal n
25+ demotePathSeg :: Sing (ps :: PathSegment) -> JSONPathElement
26+ demotePathSeg (SKey s) = Key $ T.pack $ withKnownSymbol s $ symbolVal s
27+ demotePathSeg (SIx n) = Index $ withKnownNat n $ fromIntegral $ natVal n
3128
32−demotedPathToText :: [DemotedPathSegment] -> JSONPath
33−demotedPathToText = JSONPath . F.foldl' renderPathSegment ""
29+demotedPathToText :: JSONPath -> JSONPathText
30+demotedPathToText = JSONPathText . F.foldl' renderPathSegment ""
3431 where
35− renderPathSegment acc (DKey t) = acc <> "." <> t
36− renderPathSegment acc (DIx n) = acc <> "[" <> T.pack (show n) <> "]"
32+ renderPathSegment acc (Key t) = acc <> "." <> t
33+ renderPathSegment acc (Index n) = acc <> "[" <> T.pack (show n) <> "]"
3734
38−pathToText :: Sing (ps :: [PathSegment]) -> JSONPath
35+pathToText :: Sing (ps :: [PathSegment]) -> JSONPathText
3936pathToText = demotedPathToText . demotePath
src/Data/Schematic/Schema.hs+108−38
@@ -1,6 +1,7 @@
11{-# LANGUAGE AllowAmbiguousTypes #-}
2−{-# LANGUAGE OverloadedLists #-}
3−{-# LANGUAGE OverloadedStrings #-}
2+{-# LANGUAGE CPP #-}
3+{-# LANGUAGE OverloadedLists #-}
4+{-# LANGUAGE OverloadedStrings #-}
45{-# OPTIONS_GHC -fprint-explicit-kinds #-}
56
67module Data.Schematic.Schema where
@@ -12,6 +13,7 @@ import Data.Aeson.Types as J
1213import Data.HashMap.Strict as H
1314import Data.Kind
1415import Data.Maybe
16+import Data.Schematic.Generator
1517import Data.Schematic.Instances ()
1618import Data.Scientific
1719import Data.Singletons.Prelude.List hiding (All, Union)
@@ -24,7 +26,8 @@ import Data.Vinyl hiding (Dict)
2426import qualified Data.Vinyl.TypeLevel as V
2527import GHC.Exts
2628import GHC.Generics (Generic)
27−import GHC.TypeLits (SomeNat(..), SomeSymbol(..), someSymbolVal, someNatVal)
29+import GHC.TypeLits
30+ (SomeNat(..), SomeSymbol(..), someNatVal, someSymbolVal)
2831import Prelude as P
2932import Test.SmallCheck.Series
3033
@@ -56,25 +59,25 @@ instance SingKind TextConstraint where
5659 STRegex s -> withKnownSymbol s (DTRegex $ T.pack $ symbolVal s)
5760 STEnum s -> let
5861 d :: Sing (s :: [Symbol]) -> [Text]
59− d SNil = []
62+ d SNil = []
6063 d (SCons ss@SSym fs) = T.pack (symbolVal ss) : d fs
6164 in DTEnum $ d s
6265 toSing = \case
6366 DTEq n -> case someNatVal n of
6467 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STEq (SNat :: Sing n))
65− Nothing -> error "Negative singleton nat"
68+ Nothing -> error "Negative singleton nat"
6669 DTLt n -> case someNatVal n of
6770 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STLt (SNat :: Sing n))
68− Nothing -> error "Negative singleton nat"
71+ Nothing -> error "Negative singleton nat"
6972 DTLe n -> case someNatVal n of
7073 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STLe (SNat :: Sing n))
71− Nothing -> error "Negative singleton nat"
74+ Nothing -> error "Negative singleton nat"
7275 DTGt n -> case someNatVal n of
7376 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STGt (SNat :: Sing n))
74− Nothing -> error "Negative singleton nat"
77+ Nothing -> error "Negative singleton nat"
7578 DTGe n -> case someNatVal n of
7679 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STGe (SNat :: Sing n))
77− Nothing -> error "Negative singleton nat"
80+ Nothing -> error "Negative singleton nat"
7881 DTRegex s -> case someSymbolVal (T.unpack s) of
7982 SomeSymbol (_ :: Proxy n) -> SomeSing (STRegex (SSym :: Sing n))
8083 DTEnum ss -> case toSing ss of
@@ -161,43 +164,79 @@ instance SingKind NumberConstraint where
161164 toSing = \case
162165 DNEq n -> case someNatVal n of
163166 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNEq (SNat :: Sing n))
164− Nothing -> error "Negative singleton nat"
167+ Nothing -> error "Negative singleton nat"
165168 DNGt n -> case someNatVal n of
166169 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNGt (SNat :: Sing n))
167− Nothing -> error "Negative singleton nat"
170+ Nothing -> error "Negative singleton nat"
168171 DNGe n -> case someNatVal n of
169172 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNGe (SNat :: Sing n))
170− Nothing -> error "Negative singleton nat"
173+ Nothing -> error "Negative singleton nat"
171174 DNLt n -> case someNatVal n of
172175 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNLt (SNat :: Sing n))
173− Nothing -> error "Negative singleton nat"
176+ Nothing -> error "Negative singleton nat"
174177 DNLe n -> case someNatVal n of
175178 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNLe (SNat :: Sing n))
176− Nothing -> error "Negative singleton nat"
179+ Nothing -> error "Negative singleton nat"
177180
178181data ArrayConstraint
179182 = AEq Nat
183+ | AGt Nat
184+ | AGe Nat
185+ | ALt Nat
186+ | ALe Nat
180187 deriving (Generic)
181188
182189data DemotedArrayConstraint
183190 = DAEq Integer
191+ | DAGt Integer
192+ | DAGe Integer
193+ | DALt Integer
194+ | DALe Integer
184195 deriving (Generic, Eq, Show)
185196
186197data instance Sing (ac :: ArrayConstraint) where
187198 SAEq :: Sing n -> Sing ('AEq n)
199+ SAGt :: Sing n -> Sing ('AGt n)
200+ SAGe :: Sing n -> Sing ('AGe n)
201+ SALt :: Sing n -> Sing ('ALt n)
202+ SALe :: Sing n -> Sing ('ALe n)
188203
189204instance KnownNat n => SingI ('AEq n) where sing = SAEq sing
205+instance KnownNat n => SingI ('AGt n) where sing = SAGt sing
206+instance KnownNat n => SingI ('AGe n) where sing = SAGe sing
207+instance KnownNat n => SingI ('ALt n) where sing = SALt sing
208+instance KnownNat n => SingI ('ALe n) where sing = SALe sing
190209
191210instance Eq (Sing ('AEq n)) where _ == _ = True
211+instance Eq (Sing ('AGt n)) where _ == _ = True
212+instance Eq (Sing ('AGe n)) where _ == _ = True
213+instance Eq (Sing ('ALt n)) where _ == _ = True
214+instance Eq (Sing ('ALe n)) where _ == _ = True
192215
193216instance SingKind ArrayConstraint where
194217 type Demote ArrayConstraint = DemotedArrayConstraint
195218 fromSing = \case
196219 SAEq n -> withKnownNat n (DAEq . fromIntegral $ natVal n)
220+ SAGt n -> withKnownNat n (DAGt . fromIntegral $ natVal n)
221+ SAGe n -> withKnownNat n (DAGe . fromIntegral $ natVal n)
222+ SALt n -> withKnownNat n (DALt . fromIntegral $ natVal n)
223+ SALe n -> withKnownNat n (DALe . fromIntegral $ natVal n)
197224 toSing = \case
198225 DAEq n -> case someNatVal n of
199226 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SAEq (SNat :: Sing n))
200− Nothing -> error "Negative singleton nat"
227+ Nothing -> error "Negative singleton nat"
228+ DAGt n -> case someNatVal n of
229+ Just (SomeNat (_ :: Proxy n)) -> SomeSing (SAGt (SNat :: Sing n))
230+ Nothing -> error "Negative singleton nat"
231+ DAGe n -> case someNatVal n of
232+ Just (SomeNat (_ :: Proxy n)) -> SomeSing (SAGe (SNat :: Sing n))
233+ Nothing -> error "Negative singleton nat"
234+ DALt n -> case someNatVal n of
235+ Just (SomeNat (_ :: Proxy n)) -> SomeSing (SALt (SNat :: Sing n))
236+ Nothing -> error "Negative singleton nat"
237+ DALe n -> case someNatVal n of
238+ Just (SomeNat (_ :: Proxy n)) -> SomeSing (SALe (SNat :: Sing n))
239+ Nothing -> error "Negative singleton nat"
201240
202241data Schema
203242 = SchemaText [TextConstraint]
@@ -334,6 +373,31 @@ data JsonRepr :: Schema -> Type where
334373 ReprOptional :: Maybe (JsonRepr s) -> JsonRepr ('SchemaOptional s)
335374 ReprUnion :: Union JsonRepr (h ': tl) -> JsonRepr ('SchemaUnion (h ': tl))
336375
376+instance (Monad m, Serial m Text, SingI cs)
377+ => Serial m (JsonRepr ('SchemaText cs)) where
378+ series = decDepth $ fmap ReprText $ textSeries $ fromSing (sing :: Sing cs)
379+
380+instance (Monad m, Serial m Scientific, SingI cs)
381+ => Serial m (JsonRepr ('SchemaNumber cs)) where
382+ series = decDepth $ fmap ReprNumber
383+ $ numberSeries $ fromSing (sing :: Sing cs)
384+
385+instance Monad m => Serial m (JsonRepr 'SchemaNull) where
386+ series = cons0 ReprNull
387+
388+instance (Serial m (JsonRepr s), Serial m (V.Vector (JsonRepr s)), SingI cs)
389+ => Serial m (JsonRepr ('SchemaArray cs s)) where
390+ series = decDepth $ fmap ReprArray
391+ $ arraySeries $ fromSing (sing :: Sing cs)
392+
393+instance (Serial m (JsonRepr s))
394+ => Serial m (JsonRepr ('SchemaOptional s)) where
395+ series = cons1 ReprOptional
396+
397+instance (Monad m, Serial m (Rec FieldRepr fs))
398+ => Serial m (JsonRepr ('SchemaObject fs)) where
399+ series = cons1 ReprObject
400+
337401-- | Move to the union package
338402instance Show (JsonRepr ('SchemaText cs)) where
339403 show (ReprText t) = "ReprText " P.++ show t
@@ -341,39 +405,31 @@ instance Show (JsonRepr ('SchemaText cs)) where
341405instance Show (JsonRepr ('SchemaNumber cs)) where
342406 show (ReprNumber n) = "ReprNumber " P.++ show n
343407
408+instance Show (JsonRepr 'SchemaBoolean) where
409+ show (ReprBoolean n) = "ReprBoolean " P.++ show n
410+
344411instance Show (JsonRepr 'SchemaNull) where show _ = "ReprNull"
345412
346413instance Show (JsonRepr s) => Show (JsonRepr ('SchemaArray acs s)) where
347414 show (ReprArray v) = "ReprArray " P.++ show v
348415
416+#if MIN_VERSION_base(4,12,0)
417+instance
418+ ( V.RecAll FieldRepr fs Show, RMap fs, ReifyConstraint Show FieldRepr fs
419+ , RecordToList fs )
420+ => Show (JsonRepr ('SchemaObject fs)) where
421+ show (ReprObject fs) = "ReprObject " P.++ show fs
422+#else
349423instance V.RecAll FieldRepr fs Show => Show (JsonRepr ('SchemaObject fs)) where
350424 show (ReprObject fs) = "ReprObject " P.++ show fs
425+#endif
351426
352427instance Show (JsonRepr s) => Show (JsonRepr ('SchemaOptional s)) where
353428 show (ReprOptional s) = "ReprOptional " P.++ show s
354429
355−instance (Monad m, Serial m Text)
356− => Serial m (JsonRepr ('SchemaText cs)) where
357− series = cons1 ReprText
358−
359−instance (Monad m, Serial m Scientific)
360− => Serial m (JsonRepr ('SchemaNumber cs)) where
361− series = cons1 ReprNumber
362−
363−instance Monad m => Serial m (JsonRepr 'SchemaNull) where
364− series = cons0 ReprNull
365−
366−instance (Serial m (V.Vector (JsonRepr s)))
367− => Serial m (JsonRepr ('SchemaArray cs s)) where
368− series = cons1 ReprArray
369−
370−instance (Serial m (JsonRepr s))
371− => Serial m (JsonRepr ('SchemaOptional s)) where
372− series = cons1 ReprOptional
373−
374−instance (Monad m, Serial m (Rec FieldRepr fs))
375− => Serial m (JsonRepr ('SchemaObject fs)) where
376− series = cons1 ReprObject
430+instance Show (Union JsonRepr (h ': tl))
431+ => Show (JsonRepr ('SchemaUnion (h ': tl))) where
432+ show (ReprUnion s) = "ReprUnion " P.++ show s
377433
378434instance Eq (Rec FieldRepr fs) => Eq (JsonRepr ('SchemaObject fs)) where
379435 ReprObject a == ReprObject b = a == b
@@ -384,6 +440,9 @@ instance Eq (JsonRepr ('SchemaText cs)) where
384440instance Eq (JsonRepr ('SchemaNumber cs)) where
385441 ReprNumber a == ReprNumber b = a == b
386442
443+instance Eq (JsonRepr 'SchemaBoolean) where
444+ ReprBoolean a == ReprBoolean b = a == b
445+
387446instance Eq (JsonRepr 'SchemaNull) where
388447 ReprNull == ReprNull = True
389448
@@ -393,6 +452,10 @@ instance Eq (JsonRepr s) => Eq (JsonRepr ('SchemaArray as s)) where
393452instance Eq (JsonRepr s) => Eq (JsonRepr ('SchemaOptional s)) where
394453 ReprOptional a == ReprOptional b = a == b
395454
455+instance Eq (Union JsonRepr (h ': tl))
456+ => Eq (JsonRepr ('SchemaUnion (h ': tl))) where
457+ ReprUnion a == ReprUnion b = a == b
458+
396459instance Ord (Rec FieldRepr fs) => Ord (JsonRepr ('SchemaObject fs)) where
397460 ReprObject a `compare` ReprObject b = a `compare` b
398461
@@ -402,6 +465,9 @@ instance Ord (JsonRepr ('SchemaText cs)) where
402465instance Ord (JsonRepr ('SchemaNumber cs)) where
403466 ReprNumber a `compare` ReprNumber b = a `compare` b
404467
468+instance Ord (JsonRepr 'SchemaBoolean) where
469+ ReprBoolean a `compare` ReprBoolean b = a `compare` b
470+
405471instance Ord (JsonRepr 'SchemaNull) where
406472 compare _ _ = EQ
407473
@@ -411,6 +477,10 @@ instance Ord (JsonRepr s) => Ord (JsonRepr ('SchemaArray as s)) where
411477instance Ord (JsonRepr s) => Ord (JsonRepr ('SchemaOptional s)) where
412478 ReprOptional a `compare` ReprOptional b = a `compare` b
413479
480+instance Ord (Union JsonRepr (h ': tl))
481+ => Ord (JsonRepr ('SchemaUnion (h ': tl))) where
482+ ReprUnion a `compare` ReprUnion b = a `compare` b
483+
414484instance IsList (JsonRepr ('SchemaArray cs s)) where
415485 type Item (JsonRepr ('SchemaArray cs s)) = JsonRepr s
416486 fromList = ReprArray . GHC.Exts.fromList
@@ -502,7 +572,7 @@ instance J.ToJSON (JsonRepr a) where
502572 toJSON (ReprText t) = J.String t
503573 toJSON (ReprNumber n) = J.Number n
504574 toJSON (ReprOptional s) = case s of
505− Just v -> toJSON v
575+ Just v -> toJSON v
506576 Nothing -> J.Null
507577 toJSON (ReprArray v) = J.Array $ toJSON <$> v
508578 toJSON (ReprObject r) = J.Object . H.fromList . fold $ r
src/Data/Schematic/Schema.hs-bootnew file+95
@@ -0,0 +1,95 @@
1+module Data.Schematic.Schema where
2+
3+import Data.Kind
4+import Data.Maybe
5+import Data.Schematic.Instances ()
6+import Data.Scientific
7+import Data.Singletons.TH
8+import Data.Singletons.TypeLits
9+import Data.Text as T
10+import Data.Union
11+import Data.Vector as V
12+import Data.Vinyl hiding (Dict)
13+import Prelude as P
14+
15+data TextConstraint
16+ = TEq Nat
17+ | TLt Nat
18+ | TLe Nat
19+ | TGt Nat
20+ | TGe Nat
21+ | TRegex Symbol
22+ | TEnum [Symbol]
23+
24+data DemotedTextConstraint
25+ = DTEq Integer
26+ | DTLt Integer
27+ | DTLe Integer
28+ | DTGt Integer
29+ | DTGe Integer
30+ | DTRegex Text
31+ | DTEnum [Text]
32+
33+data NumberConstraint
34+ = NLe Nat
35+ | NLt Nat
36+ | NGt Nat
37+ | NGe Nat
38+ | NEq Nat
39+
40+data DemotedNumberConstraint
41+ = DNLe Integer
42+ | DNLt Integer
43+ | DNGt Integer
44+ | DNGe Integer
45+ | DNEq Integer
46+
47+data ArrayConstraint
48+ = AEq Nat
49+ | AGt Nat
50+ | AGe Nat
51+ | ALt Nat
52+ | ALe Nat
53+
54+data DemotedArrayConstraint
55+ = DAEq Integer
56+ | DAGt Integer
57+ | DAGe Integer
58+ | DALt Integer
59+ | DALe Integer
60+
61+data Schema
62+ = SchemaText [TextConstraint]
63+ | SchemaBoolean
64+ | SchemaNumber [NumberConstraint]
65+ | SchemaObject [(Symbol, Schema)]
66+ | SchemaArray [ArrayConstraint] Schema
67+ | SchemaNull
68+ | SchemaOptional Schema
69+ | SchemaUnion [Schema]
70+
71+data DemotedSchema
72+ = DSchemaText [DemotedTextConstraint]
73+ | DSchemaNumber [DemotedNumberConstraint]
74+ | DSchemaBoolean
75+ | DSchemaObject [(Text, DemotedSchema)]
76+ | DSchemaArray [DemotedArrayConstraint] DemotedSchema
77+ | DSchemaNull
78+ | DSchemaOptional DemotedSchema
79+ | DSchemaUnion [DemotedSchema]
80+
81+data FieldRepr :: (Symbol, Schema) -> Type where
82+ FieldRepr
83+ :: (SingI schema, KnownSymbol name)
84+ => JsonRepr schema
85+ -> FieldRepr '(name, schema)
86+
87+data JsonRepr :: Schema -> Type where
88+ ReprText :: Text -> JsonRepr ('SchemaText cs)
89+ ReprNumber :: Scientific -> JsonRepr ('SchemaNumber cs)
90+ ReprBoolean :: Bool -> JsonRepr 'SchemaBoolean
91+ ReprNull :: JsonRepr 'SchemaNull
92+ ReprArray :: V.Vector (JsonRepr s) -> JsonRepr ('SchemaArray cs s)
93+ ReprObject :: Rec FieldRepr fs -> JsonRepr ('SchemaObject fs)
94+ ReprOptional :: Maybe (JsonRepr s) -> JsonRepr ('SchemaOptional s)
95+ ReprUnion :: Union JsonRepr (h ': tl) -> JsonRepr ('SchemaUnion (h ': tl))
src/Data/Schematic/Validation.hs+56−27
@@ -3,6 +3,7 @@ module Data.Schematic.Validation where
33import Control.Monad
44import Control.Monad.Validation
55import Data.Aeson
6+import Data.Aeson.Internal
67import Data.Aeson.Types
78import Data.Foldable
89import Data.Functor.Identity
@@ -49,51 +50,51 @@ isValidationError (ValidationError _) = True
4950isValidationError _ = False
5051
5152validateTextConstraint
52− :: JSONPath
53+ :: JSONPathText
5354 -> Text
5455 -> Sing (tcs :: TextConstraint)
5556 -> Validation ()
56−validateTextConstraint (JSONPath path) t = \case
57+validateTextConstraint (JSONPathText path) t = \case
5758 STEq n -> do
5859 let
5960 nlen = withKnownNat n $ natVal n
6061 predicate = nlen == (fromIntegral $ T.length t)
61− errMsg = "length of " <> path <> " should be == " <> T.pack (show nlen)
62+ errMsg = "length should be == " <> T.pack (show nlen)
6263 warn = vWarning $ mmSingleton path (pure errMsg)
6364 unless predicate warn
6465 STLt n -> do
6566 let
6667 nlen = withKnownNat n $ natVal n
67− predicate = nlen < (fromIntegral $ T.length t)
68− errMsg = "length of " <> path <> " should be < " <> T.pack (show nlen)
68+ predicate = nlen > (fromIntegral $ T.length t)
69+ errMsg = "length should be < " <> T.pack (show nlen)
6970 warn = vWarning $ mmSingleton path (pure errMsg)
7071 unless predicate warn
7172 STLe n -> do
7273 let
7374 nlen = withKnownNat n $ natVal n
74− predicate = nlen <= (fromIntegral $ T.length t)
75− errMsg = "length of " <> path <> " should be <= " <> T.pack (show nlen)
75+ predicate = nlen >= (fromIntegral $ T.length t)
76+ errMsg = "length should be <= " <> T.pack (show nlen)
7677 warn = vWarning $ mmSingleton path (pure errMsg)
7778 unless predicate warn
7879 STGt n -> do
7980 let
8081 nlen = withKnownNat n $ natVal n
81− predicate = nlen > (fromIntegral $ T.length t)
82− errMsg = "length of " <> path <> " should be > " <> T.pack (show nlen)
82+ predicate = nlen < (fromIntegral $ T.length t)
83+ errMsg = "length should be > " <> T.pack (show nlen)
8384 warn = vWarning $ mmSingleton path (pure errMsg)
8485 unless predicate warn
8586 STGe n -> do
8687 let
8788 nlen = withKnownNat n $ natVal n
88− predicate = nlen >= (fromIntegral $ T.length t)
89− errMsg = "length of " <> path <> " should be >= " <> T.pack (show nlen)
89+ predicate = nlen <= (fromIntegral $ T.length t)
90+ errMsg = "length should be >= " <> T.pack (show nlen)
9091 warn = vWarning $ mmSingleton path (pure errMsg)
9192 unless predicate warn
9293 STRegex r -> do
9394 let
9495 regex = withKnownSymbol r $ fromSing r
9596 predicate = matchTest (makeRegex (T.unpack regex) :: Regex) (T.unpack t)
96− errMsg = path <> " must match " <> regex
97+ errMsg = "must match " <> regex
9798 warn = vWarning $ mmSingleton path (pure errMsg)
9899 unless predicate warn
99100 STEnum ss -> do
@@ -101,69 +102,97 @@ validateTextConstraint (JSONPath path) t = \case
101102 matching :: Sing (s :: [Symbol]) -> Bool
102103 matching SNil = False
103104 matching (SCons s@SSym fs) = T.pack (symbolVal s) == t || matching fs
104− errMsg = path <> " must be one of " <> T.pack (show (fromSing ss))
105+ errMsg = "must be one of " <> T.pack (show (fromSing ss))
105106 warn = vWarning $ mmSingleton path (pure errMsg)
106107 unless (matching ss) warn
107108
108109validateNumberConstraint
109− :: JSONPath
110+ :: JSONPathText
110111 -> Scientific
111112 -> Sing (tcs :: NumberConstraint)
112113 -> Validation ()
113−validateNumberConstraint (JSONPath path) num = \case
114+validateNumberConstraint (JSONPathText path) num = \case
114115 SNEq n -> do
115116 let
116117 nlen = withKnownNat n $ natVal n
117118 predicate = fromIntegral nlen == num
118− errMsg = path <> " should be == " <> T.pack (show nlen)
119+ errMsg = "should be == " <> T.pack (show nlen)
119120 warn = vWarning $ mmSingleton path (pure errMsg)
120121 unless predicate warn
121122 SNGt n -> do
122123 let
123124 nlen = withKnownNat n $ natVal n
124125 predicate = num > fromIntegral nlen
125− errMsg = path <> " should be > " <> T.pack (show nlen)
126+ errMsg = "should be > " <> T.pack (show nlen)
126127 warn = vWarning $ mmSingleton path (pure errMsg)
127128 unless predicate warn
128129 SNGe n -> do
129130 let
130131 nlen = withKnownNat n $ natVal n
131132 predicate = num >= fromIntegral nlen
132− errMsg = path <> " should be >= " <> T.pack (show nlen)
133+ errMsg = "should be >= " <> T.pack (show nlen)
133134 warn = vWarning $ mmSingleton path (pure errMsg)
134135 unless predicate warn
135136 SNLt n -> do
136137 let
137138 nlen = withKnownNat n $ natVal n
138139 predicate = num < fromIntegral nlen
139− errMsg = path <> " should be < " <> T.pack (show nlen)
140+ errMsg = "should be < " <> T.pack (show nlen)
140141 warn = vWarning $ mmSingleton path (pure errMsg)
141142 unless predicate warn
142143 SNLe n -> do
143144 let
144145 nlen = withKnownNat n $ natVal n
145146 predicate = num <= fromIntegral nlen
146− errMsg = path <> " should be <= " <> T.pack (show nlen)
147+ errMsg = "should be <= " <> T.pack (show nlen)
147148 warn = vWarning $ mmSingleton path (pure errMsg)
148149 unless predicate warn
149150
150151validateArrayConstraint
151− :: JSONPath
152+ :: JSONPathText
152153 -> V.Vector a
153154 -> Sing (tcs :: ArrayConstraint)
154155 -> Validation ()
155−validateArrayConstraint (JSONPath path) v = \case
156+validateArrayConstraint (JSONPathText path) v = \case
156157 SAEq n -> do
157158 let
158159 nlen = withKnownNat n $ natVal n
159160 predicate = nlen == fromIntegral (V.length v)
160− errMsg = "length of " <> path <> " should be == " <> T.pack (show nlen)
161+ errMsg = "length should be == " <> T.pack (show nlen)
162+ warn = vWarning $ mmSingleton path (pure errMsg)
163+ unless predicate warn
164+ SAGt n -> do
165+ let
166+ nlen = withKnownNat n $ natVal n
167+ predicate = fromIntegral (V.length v) > nlen
168+ errMsg = "length should be > " <> T.pack (show nlen)
169+ warn = vWarning $ mmSingleton path (pure errMsg)
170+ unless predicate warn
171+ SAGe n -> do
172+ let
173+ nlen = withKnownNat n $ natVal n
174+ predicate = fromIntegral (V.length v) >= nlen
175+ errMsg = "length should be >= " <> T.pack (show nlen)
176+ warn = vWarning $ mmSingleton path (pure errMsg)
177+ unless predicate warn
178+ SALt n -> do
179+ let
180+ nlen = withKnownNat n $ natVal n
181+ predicate = fromIntegral (V.length v) < nlen
182+ errMsg = "length should be < " <> T.pack (show nlen)
183+ warn = vWarning $ mmSingleton path (pure errMsg)
184+ unless predicate warn
185+ SALe n -> do
186+ let
187+ nlen = withKnownNat n $ natVal n
188+ predicate = fromIntegral (V.length v) <= nlen
189+ errMsg = "length should be <= " <> T.pack (show nlen)
161190 warn = vWarning $ mmSingleton path (pure errMsg)
162191 unless predicate warn
163192
164193validateJsonRepr
165194 :: Sing schema
166− -> [DemotedPathSegment]
195+ -> JSONPath
167196 -> JsonRepr schema
168197 -> Validation ()
169198validateJsonRepr sschema dpath jr = case jr of
@@ -197,7 +226,7 @@ validateJsonRepr sschema dpath jr = case jr of
197226 process cs
198227 process acs
199228 for_ (V.indexed v) $ \(ix, jr') -> do
200− let newPath = dpath <> pure (DIx $ fromIntegral ix)
229+ let newPath = dpath <> pure (Index $ fromIntegral ix)
201230 validateJsonRepr s newPath jr'
202231 ReprOptional d -> case sschema of
203232 SSchemaOptional ss -> case d of
@@ -209,7 +238,7 @@ validateJsonRepr sschema dpath jr = case jr of
209238 go :: Rec FieldRepr (ts :: [(Symbol, Schema)] ) -> Validation ()
210239 go RNil = pure ()
211240 go (f@(FieldRepr d) :& ftl) = do
212− let newPath = dpath <> [DKey (knownFieldName f)]
241+ let newPath = dpath <> [Key (knownFieldName f)]
213242 validateJsonRepr (knownFieldSchema f) newPath d
214243 go ftl
215244 ReprUnion _ -> pure () -- FIXME
@@ -221,7 +250,7 @@ validateJsonRepr sschema dpath jr = case jr of
221250 -- fail "impossible to produce subUnion, please report this as a bug"
222251 -- Just x -> do
223252 -- let
224− -- JSONPath path = demotedPathToText dpath
253+ -- JSONPathText path = demotedPathToText dpath
225254 -- case stl of
226255 -- SNil -> void $ vWarning $ mmSingleton path
227256 -- $ pure "union handling error, please report this as bug"
src/Data/Schematic/Verifier/Array.hs+1−1
@@ -1,6 +1,6 @@
11module Data.Schematic.Verifier.Array where
22
3−import Data.Schematic
3+import {-# SOURCE #-} Data.Schematic.Schema
44import Data.Schematic.Verifier.Common
55
66data VerifiedArrayConstraint =
src/Data/Schematic/Verifier/Common.hs+2−2
@@ -17,8 +17,8 @@ simplifyDNGs = simplifyNumberConstraint maximum
1717verifyDNEq :: [Integer] -> Maybe (Maybe Integer)
1818verifyDNEq x =
1919 case nub x of
20− [] -> Just Nothing
21− [y] -> Just $ Just y
20+ [] -> Just Nothing
21+ [y] -> Just $ Just y
2222 (_:_:_) -> Nothing
2323
2424verify3 :: Maybe Integer -> Maybe Integer -> Maybe Integer -> Maybe ()
src/Data/Schematic/Verifier/Number.hs+9−9
@@ -1,6 +1,6 @@
11module Data.Schematic.Verifier.Number where
22
3−import Data.Schematic
3+import {-# SOURCE #-} Data.Schematic.Schema
44import Data.Schematic.Verifier.Common
55
66toStrictNumber :: [DemotedNumberConstraint] -> [DemotedNumberConstraint]
@@ -8,21 +8,21 @@ toStrictNumber = map f
88 where
99 f (DNLe x) = DNLt (x + 1)
1010 f (DNGe x) = DNGt (x - 1)
11− f x = x
11+ f x = x
1212
1313data VerifiedNumberConstraint
1414 = VNEq Integer
15− | VNBounds (Maybe Integer)
16− (Maybe Integer)
15+ | VNBounds (Maybe Integer) (Maybe Integer)
1716 deriving (Show)
1817
19−verifyNumberConstraints ::
20− [DemotedNumberConstraint]
18+verifyNumberConstraints
19+ :: [DemotedNumberConstraint]
2120 -> Maybe VerifiedNumberConstraint
2221verifyNumberConstraints cs' = do
23− let cs = toStrictNumber cs'
24− mlt = simplifyDNLs [x | DNLt x <- cs]
25− mgt = simplifyDNGs [x | DNGt x <- cs]
22+ let
23+ cs = toStrictNumber cs'
24+ mlt = simplifyDNLs [x | DNLt x <- cs]
25+ mgt = simplifyDNGs [x | DNGt x <- cs]
2626 meq <- verifyDNEq [x | DNEq x <- cs]
2727 verifyEquations mgt meq mlt
2828 Just $
src/Data/Schematic/Verifier/Text.hs+58−55
@@ -2,7 +2,7 @@ module Data.Schematic.Verifier.Text where
22
33import Control.Monad
44import Data.Maybe
5−import Data.Schematic
5+import {-# SOURCE #-} Data.Schematic.Schema
66import Data.Schematic.Verifier.Common
77import Data.Text (Text, unpack)
88import Text.Regex.TDFA.Pattern
@@ -13,29 +13,28 @@ toStrictTextLength = map f
1313 where
1414 f (DTLe x) = DTLt (x + 1)
1515 f (DTGe x) = DTGt (x - 1)
16− f x = x
16+ f x = x
1717
1818data VerifiedTextConstraint
1919 = VTEq Integer
20− | VTBounds (Maybe Integer)
21− (Maybe Integer)
22− | VTRegex Text
23− Integer
24− (Maybe Integer)
20+ | VTBounds (Maybe Integer) (Maybe Integer)
21+ | VTRegex Text Integer (Maybe Integer)
2522 | VTEnum [Text]
2623 deriving (Show)
2724
28−verifyTextLengthConstraints ::
29− [DemotedTextConstraint] -> Maybe (Maybe VerifiedTextConstraint)
25+verifyTextLengthConstraints
26+ :: [DemotedTextConstraint]
27+ -> Maybe (Maybe VerifiedTextConstraint)
3028verifyTextLengthConstraints cs' = do
31− let cs = toStrictTextLength cs'
32− mlt = simplifyDNLs [x | DTLt x <- cs]
33− mgt = simplifyDNGs [x | DTGt x <- cs]
29+ let
30+ cs = toStrictTextLength cs'
31+ mlt = simplifyDNLs [x | DTLt x <- cs]
32+ mgt = simplifyDNGs [x | DTGt x <- cs]
3433 meq <- verifyDNEq [x | DTEq x <- cs]
3534 verifyEquations mgt meq mlt
3635 case all isNothing ([mgt, meq, mlt] :: [Maybe Integer]) of
3736 True -> Just Nothing
38− _ ->
37+ _ ->
3938 Just $
4039 Just $
4140 case meq of
@@ -46,73 +45,77 @@ regexLength :: Text -> Maybe (Int, Maybe Int)
4645regexLength regexp =
4746 case parseRegex . unpack $ regexp of
4847 Right (p, _) -> Just (minRegexLength p, maxRegexLength p)
49− Left _ -> Nothing
48+ Left _ -> Nothing
5049
5150minRegexLength :: Pattern -> Int
5251minRegexLength p =
5352 case p of
54− PEmpty -> 0
55− PChar {..} -> 1
56− PAny {..} -> 1
57− PAnyNot {..} -> 1
58− PQuest _ -> 0
59− PPlus sch -> minRegexLength $ PBound 1 Nothing sch
60− PStar _ sch -> minRegexLength $ PBound 0 Nothing sch
53+ PEmpty -> 0
54+ PChar {..} -> 1
55+ PAny {..} -> 1
56+ PAnyNot {..} -> 1
57+ PQuest _ -> 0
58+ PPlus sch -> minRegexLength $ PBound 1 Nothing sch
59+ PStar _ sch -> minRegexLength $ PBound 0 Nothing sch
6160 PBound low _ sch -> low * minRegexLength sch
62− PConcat ps -> sum $ fmap minRegexLength ps
63− POr xs -> minimum $ fmap minRegexLength xs
64− PDot _ -> 1
65− PEscape {..} -> 1
66− PCarat _ -> 0
67− PDollar _ -> 0
68− _ -> 0
61+ PConcat ps -> sum $ fmap minRegexLength ps
62+ POr xs -> minimum $ fmap minRegexLength xs
63+ PDot _ -> 1
64+ PEscape {..} -> 1
65+ PCarat _ -> 0
66+ PDollar _ -> 0
67+ _ -> 0
6968
7069maxRegexLength :: Pattern -> Maybe Int
7170maxRegexLength p =
7271 case p of
73− PEmpty -> Just 0
74− PChar _ _ -> Just 1
75− PAny _ _ -> Just 1
76− PAnyNot _ _ -> Just 1
77− PQuest _ -> Just 0
78− PPlus _ -> Nothing
79− PStar _ _ -> Nothing
72+ PEmpty -> Just 0
73+ PChar _ _ -> Just 1
74+ PAny _ _ -> Just 1
75+ PAnyNot _ _ -> Just 1
76+ PQuest _ -> Just 0
77+ PPlus _ -> Nothing
78+ PStar _ _ -> Nothing
8079 PBound _ mhigh sch -> (*) <$> mhigh <*> maxRegexLength sch
81− PConcat ps -> sum <$> mapM maxRegexLength ps
82− POr xs -> maximum <$> mapM maxRegexLength xs
83− PDot _ -> Just 1
84− PEscape _ _ -> Just 1
85− PCarat _ -> Just 0
86− PDollar _ -> Just 0
87− _ -> Just 0
80+ PConcat ps -> sum <$> mapM maxRegexLength ps
81+ POr xs -> maximum <$> mapM maxRegexLength xs
82+ PDot _ -> Just 1
83+ PEscape _ _ -> Just 1
84+ PCarat _ -> Just 0
85+ PDollar _ -> Just 0
86+ _ -> Just 0
8887
89−verifyTextRegexConstraint ::
90− [DemotedTextConstraint] -> Maybe (Maybe VerifiedTextConstraint)
88+verifyTextRegexConstraint
89+ :: [DemotedTextConstraint]
90+ -> Maybe (Maybe VerifiedTextConstraint)
9191verifyTextRegexConstraint cs = do
9292 let regexps = [x | DTRegex x <- cs]
9393 case regexps of
94− [] -> Just Nothing
94+ [] -> Just Nothing
9595 [x] -> do
9696 (l, mh) <- regexLength x
9797 Just $ Just $ VTRegex x (fromIntegral l) (fromIntegral <$> mh)
98− _ -> Nothing
98+ _ -> Nothing
9999
100−verifyTextEnumConstraint ::
101− [DemotedTextConstraint] -> Maybe (Maybe VerifiedTextConstraint)
100+verifyTextEnumConstraint
101+ :: [DemotedTextConstraint]
102+ -> Maybe (Maybe VerifiedTextConstraint)
102103verifyTextEnumConstraint cs = do
103104 let enums = concat [x | DTEnum x <- cs]
104105 case enums of
105106 [] -> Just Nothing
106− x -> Just $ Just $ VTEnum x
107+ x -> Just $ Just $ VTEnum x
107108
108−verifyTextConstraints ::
109− [DemotedTextConstraint] -> Maybe [VerifiedTextConstraint]
109+verifyTextConstraints
110+ :: [DemotedTextConstraint]
111+ -> Maybe [VerifiedTextConstraint]
110112verifyTextConstraints cs = do
111113 regexp <- verifyTextRegexConstraint cs
112− void $ case regexp of
113− Just (VTRegex _ l mh) ->
114− verifyTextLengthConstraints (DTGe l : cs ++ maybeToList (DTLe <$> mh))
115− _ -> pure Nothing
114+ void $
115+ case regexp of
116+ Just (VTRegex _ l mh) ->
117+ verifyTextLengthConstraints (DTGe l : cs ++ maybeToList (DTLe <$> mh))
118+ _ -> pure Nothing
116119 lengths <- verifyTextLengthConstraints cs
117120 enums <- verifyTextEnumConstraint cs
118121 return $ catMaybes [lengths, enums, regexp]
stack-13.21.yamlnew file+7
@@ -0,0 +1,7 @@
1+resolver: lts-13.21
2+extra-deps:
3+ - hjsonpointer-1.4.0@rev:0
4+ - hjsonschema-1.9.0@rev:0
5+ - validationt-0.3.0
6+nix:
7+ packages: [pcre, pkg-config, zlib]
stack.yaml+5−4
@@ -1,5 +1,6 @@
1−resolver: lts-12.0
1+resolver: lts-14.22
22extra-deps:
3− - hjsonpointer-1.4.0@rev:0
4− - hjsonschema-1.9.0@rev:0
5− - validationt-0.2.1.0
3+- hjsonpointer-1.4.0@rev:0
4+- hjsonschema-1.9.0@rev:0
5+- git: https://github.com/typeable/validationt.git
6+ commit: 97fea97c4015ab5e99f3efb2c73e1fef4b8857d8
test/JsonSchemaSpec.hs+58
@@ -10,6 +10,7 @@ module JsonSchemaSpec (spec, main) where
1010import Data.Aeson as J
1111import Data.Maybe
1212import Data.Proxy
13+import Data.ByteString.Lazy as B
1314import Data.Schematic
1415import Data.Vinyl
1516import JSONSchema.Draft4 as D4
@@ -31,6 +32,27 @@ exampleData = withRepr @SchemaExample $
3132 :& field @"bar" (pure (ReprText "foo"))
3233 :& RNil
3334
35+type SchemaArrayExample = 'SchemaObject
36+ '[ '("a1", 'SchemaArray '[ 'AGt 1 ] ('SchemaNumber '[]))
37+ , '("a2", 'SchemaArray '[ 'AGe 1 ] ('SchemaNumber '[]))
38+ , '("a3", 'SchemaArray '[ 'ALt 1 ] ('SchemaNumber '[]))
39+ , '("a4", 'SchemaArray '[ 'ALe 1 ] ('SchemaNumber '[]))
40+ ]
41+
42+type SchemaNumberExample = 'SchemaObject
43+ '[ '("n1", 'SchemaNumber '[ 'NGt 1 ])
44+ , '("n2", 'SchemaNumber '[ 'NGe 1 ])
45+ , '("n3", 'SchemaNumber '[ 'NLt 1 ])
46+ , '("n4", 'SchemaNumber '[ 'NLe 1 ])
47+ ]
48+
49+type SchemaTextExample = 'SchemaObject
50+ '[ '("t1", 'SchemaText '[ 'TGt 1 ])
51+ , '("t2", 'SchemaText '[ 'TGe 1 ])
52+ , '("t3", 'SchemaText '[ 'TLt 1 ])
53+ , '("t4", 'SchemaText '[ 'TLe 1 ])
54+ ]
55+
3456spec :: Spec
3557spec = do
3658 it "validates simple schema" $ do
@@ -38,6 +60,42 @@ spec = do
3860 fetchHTTPAndValidate schema (toJSON exampleData) >>= \case
3961 Left _ -> fail "failed to validate test example"
4062 Right _ -> pure ()
63+ it "validates schema with arrays" $ do
64+ let
65+ schema = D4.SchemaWithURI (fromJust $ toJsonSchema (Proxy @SchemaArrayExample)) Nothing
66+ obj = withRepr @SchemaArrayExample $
67+ field @"a1" [ReprNumber 13, ReprNumber 13]
68+ :& field @"a2" [ReprNumber 13]
69+ :& field @"a3" []
70+ :& field @"a4" [ReprNumber 13]
71+ :& RNil
72+ fetchHTTPAndValidate schema (toJSON obj) >>= \case
73+ Left e -> fail "failed to validate test example"
74+ Right _ -> pure ()
75+ it "validates schema with numbers" $ do
76+ let
77+ schema = D4.SchemaWithURI (fromJust $ toJsonSchema (Proxy @SchemaNumberExample)) Nothing
78+ obj = withRepr @SchemaNumberExample $
79+ field @"n1" 1.1
80+ :& field @"n2" 1
81+ :& field @"n3" 0.9
82+ :& field @"n4" 1.0
83+ :& RNil
84+ fetchHTTPAndValidate schema (toJSON obj) >>= \case
85+ Left e -> fail "failed to validate test example"
86+ Right _ -> pure ()
87+ it "validates schema with strings" $ do
88+ let
89+ schema = D4.SchemaWithURI (fromJust $ toJsonSchema (Proxy @SchemaTextExample)) Nothing
90+ obj = withRepr @SchemaTextExample $
91+ field @"t1" "11"
92+ :& field @"t2" "1"
93+ :& field @"t3" ""
94+ :& field @"t4" "1"
95+ :& RNil
96+ fetchHTTPAndValidate schema (toJSON obj) >>= \case
97+ Left e -> fail "failed to validate test example"
98+ Right _ -> pure ()
4199
42100main :: IO ()
43101main = hspec spec
test/SchemaSpec.hs+13−3
@@ -33,6 +33,10 @@ type SchemaExample = 'SchemaObject
3333 '[ '("foo", 'SchemaArray '[ 'AEq 1] ('SchemaNumber '[ 'NGt 10]))
3434 , '("bar", 'SchemaOptional ('SchemaText '[ 'TEnum '["foo", "bar"]]))]
3535
36+type SchemaExample2 = 'SchemaObject
37+ '[ '("foo", 'SchemaArray '[ 'AEq 2] ('SchemaText '[ 'TGt 10]))
38+ , '("bar", 'SchemaOptional ('SchemaText '[ 'TRegex "[0-9]+"]))]
39+
3640jsonExample :: JsonRepr SchemaExample
3741jsonExample = withRepr @SchemaExample
3842 $ field @"bar" (Just "bar")
@@ -76,8 +80,11 @@ schemaJson = "{\"foo\": [13], \"bar\": null}"
7680schemaJson2 :: ByteString
7781schemaJson2 = "{\"foo\": [3], \"bar\": null}"
7882
79−schemaJsonSeries :: Monad m => SC.Series m Value
80−schemaJsonSeries = valueSeries $ fromSing (sing :: Sing SchemaExample)
83+schemaJsonSeries :: Monad m => SC.Series m (JsonRepr SchemaExample)
84+schemaJsonSeries = series
85+
86+schemaJsonSeries2 :: Monad m => SC.Series m (JsonRepr SchemaExample2)
87+schemaJsonSeries2 = series
8188
8289spec :: Spec
8390spec = do
@@ -105,7 +112,10 @@ spec = do
105112 `shouldSatisfy` isValid
106113 it "validates json series" $ property $
107114 SC.over schemaJsonSeries $ \x ->
108− isValid (parseAndValidateJson @SchemaExample x)
115+ isValid (parseAndValidateJson @SchemaExample (toJSON x))
116+ it "validates json series 2" $ property $
117+ SC.over schemaJsonSeries2 $ \x ->
118+ isValid (parseAndValidateJson @SchemaExample2 (toJSON x))
109119
110120
111121main :: IO ()