f4e8e6d..master · typeable/schematic

git.iko.soy/typeable/schematic

ChangeLog.md+16

@@ -1,5 +1,21 @@

1# Revision history for schematic

3+## 0.6.0.0 -- 2021-01-15

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`.

7+## 0.5.1.0 -- 2021-01-15

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+

3## 0.4.3.0 -- 2018-07-12

19## 0.4.3.0 -- 2018-07-12

5GHC 8.4 support, dropping support for older GHC versions

21GHC 8.4 support, dropping support for older GHC versions

release+16−8

@@ -4,6 +4,12 @@ set -o xtrace

5dist=`stack path --dist-dir --stack-yaml ./stack.yaml 2> /dev/null`

7+rootdir=`pwd`

9+cabalfile=`ls *.cabal`

10+packagename="${cabalfile%%.*}"

11+version=`grep '^version:' schematic.cabal | rev | cut -d" " -f1 | rev`

12+

7echo -e "\033[1;36mTesting library...\033[0m"

13echo -e "\033[1;36mTesting library...\033[0m"

8stack test 2> /dev/null

14stack test 2> /dev/null

@@ -18,17 +24,19 @@ if [ "$?" -eq "0" ]; then

18 read -p "Hackage username: " username

24 read -p "Hackage username: " username

19 read -p "Hackage password: " -s password

25 read -p "Hackage password: " -s password

20 echo ""

26 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

23− docdir=$dist/doc/html

29+ docdir=`find .stack-work -name "$packagename-$version-docs"`

24− cd $docdir

25− doc=$1-$2-docs

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"

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"

28− cp -r $1 $doc

29− tar -c -v -z --format=ustar -f $doc.tar.gz $doc

32+ tar -c -v -z --format=ustar -f $docdir.tar.gz $docdir

30 echo -e "\033[1;32mUploading documentation to Hackage...\033[0m"

33 echo -e "\033[1;32mUploading documentation to Hackage...\033[0m"

34+ cd $docdir

35+ cd ..

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"

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'."

32 exit $?

40 exit $?

33else

41else

34 echo -e "\033[1;31mNot in a stack-powered project\033[0m"

42 echo -e "\033[1;31mNot in a stack-powered project\033[0m"

schematic.cabal+10−5

@@ -1,6 +1,7 @@

1name: schematic

2−version: 0.4.3.0

2+version: 0.6.0.0

3synopsis: 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.

4license: BSD3

5license: BSD3

5license-file: LICENSE

6license-file: LICENSE

6author: Denis Redozubov

7author: Denis Redozubov

@@ -9,7 +10,7 @@ homepage: http://github.com/typeable/schematic

9Bug-reports: http://github.com/typeable/schematic/issues/

10Bug-reports: http://github.com/typeable/schematic/issues/

10category: Data

11category: Data

11build-type: Simple

12build-type: Simple

12−extra-source-files: ChangeLog.md

13+extra-source-files: ChangeLog.md, README.md

13cabal-version: >=1.10

14cabal-version: >=1.10

15library

16library

@@ -64,9 +65,9 @@ library

64 , TypeOperators

65 , TypeOperators

65 , TypeSynonymInstances

66 , TypeSynonymInstances

66 , UndecidableInstances

67 , UndecidableInstances

67− build-depends: base >=4.11 && <4.12

68+ build-depends: base >=4.11 && <5

68 , bytestring

69 , bytestring

69− , aeson >= 1

70+ , aeson >= 1.4.3.0 && < 1.6

70 , containers

71 , containers

71 , hjsonschema

72 , hjsonschema

72 , mtl

73 , mtl

@@ -94,7 +95,7 @@ test-suite spec

94 default-language: Haskell2010

95 default-language: Haskell2010

95 build-depends: HUnit

96 build-depends: HUnit

96 , aeson >= 1

97 , aeson >= 1

97− , base >=4.11 && <4.12

98+ , base >=4.11 && <4.13

98 , bytestring

99 , bytestring

99 , containers

100 , containers

100 , hjsonschema

101 , hjsonschema

@@ -117,3 +118,7 @@ test-suite spec

117 , HelpersSpec

118 , HelpersSpec

118 , LensSpec

119 , LensSpec

119 , JsonSchemaSpec

120 , 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 @@

1{-# LANGUAGE AllowAmbiguousTypes #-}

2+{-# LANGUAGE CPP #-}

3module Data.Schematic.DSL where

4module Data.Schematic.DSL where

@@ -17,11 +18,19 @@ import Data.Vinyl

17import Data.Vinyl.Functor

18import Data.Vinyl.Functor

21+#if MIN_VERSION_base(4,12,0)

20type Constructor a

22type Constructor a

23+ = forall fields b

21− = forall fields b. (fields ~ FieldsOf a, FSubset fields b (FImage fields b))

24+ . (fields ~ FieldsOf a, FSubset fields b (FImage fields b), RMap fields)

22 => Rec (Tagged fields :. FieldRepr) b

25 => Rec (Tagged fields :. FieldRepr) b

23 -> JsonRepr ('SchemaObject fields)

26 -> 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

25withRepr :: Constructor a

34withRepr :: Constructor a

26withRepr = ReprObject . rmap (unTagged . getCompose) . fcast

35withRepr = ReprObject . rmap (unTagged . getCompose) . fcast

src/Data/Schematic/Generator.hs+34−43

@@ -1,14 +1,13 @@

1module Data.Schematic.Generator where

3−import Data.Aeson (Value(..))

4−import qualified Data.HashMap.Lazy as H

5−import Data.Maybe

3+import Data.Maybe

4+import Data.Schematic.Generator.Regex

6−import Data.Schematic.Schema

5+import {-# SOURCE #-} Data.Schematic.Schema

6+import Data.Schematic.Verifier

7+import Data.Scientific

7−import Data.Text (Text, pack)

8+import Data.Text (Text, pack)

8import qualified Data.Vector as V

9import 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

13maxHigh :: Int

12maxHigh :: Int

14maxHigh = 30

13maxHigh = 30

@@ -19,25 +18,26 @@ minLow = 2

19textLengthSeries :: Monad m => [VerifiedTextConstraint] -> Series m Text

18textLengthSeries :: Monad m => [VerifiedTextConstraint] -> Series m Text

20textLengthSeries =

19textLengthSeries =

21 \case

20 \case

22− [VTEq eq] -> pure $ pack $ take (fromIntegral eq) $ cycle "sample"

21+ [VTEq eq] -> pure $ pack $ take (fromIntegral eq) $ cycle "sample"

23 [VTBounds ml mh] -> do

22 [VTBounds ml mh] -> do

23+ let

24− let l = fromMaybe minLow (fromIntegral <$> ml) + 1

24+ l = fromMaybe minLow (fromIntegral <$> ml) + 1

25− h = fromMaybe maxHigh (fromIntegral <$> mh) - 1

25+ h = fromMaybe maxHigh (fromIntegral <$> mh) - 1

26 n <- generate $ \depth -> take depth [l .. h]

27 pure $ pack $ take (fromIntegral n) $ cycle "sample"

28− _ -> pure "error"

28+ _ -> pure "error"

30textEnumSeries :: Monad m => [Text] -> Series m Text

31textEnumSeries enum = generate $ \depth -> take depth enum

33−textSeries :: Monad m => [DemotedTextConstraint] -> Series m Value

33+textSeries :: Monad m => [DemotedTextConstraint] -> Series m Text

34textSeries cs = do

35 let mvcs = verifyTextConstraints cs

36 case mvcs of

37 Just vcs -> do

38 n <- textSeries' vcs

39− pure $ String n

39+ pure n

40− Nothing -> pure Null

40+ Nothing -> pure "error"

42textSeries' :: Monad m => [VerifiedTextConstraint] -> Series m Text

43textSeries' [] = pure "sample"

@@ -48,19 +48,19 @@ textSeries' vcs = do

48 Nothing -> do

49 let regexps = listToMaybe [x | VTRegex x _ _ <- vcs]

50 case regexps of

51− Just e -> regexSeries e

51+ Just e -> regexSeries e

52 Nothing -> textLengthSeries vcs

54−numberSeries :: Monad m => [DemotedNumberConstraint] -> Series m Value

54+numberSeries :: Monad m => [DemotedNumberConstraint] -> Series m Scientific

55numberSeries cs = do

56 let mvcs = verifyNumberConstraints cs

57 case mvcs of

58 Just vcs -> do

59 n <- numberSeries' vcs

60− pure $ Number $ fromIntegral n

60+ pure $ n

61− Nothing -> pure Null

61+ Nothing -> pure 0

63−numberSeries' :: Monad m => VerifiedNumberConstraint -> Series m Integer

63+numberSeries' :: Monad m => VerifiedNumberConstraint -> Series m Scientific

64numberSeries' =

65 \case

66 VNEq eq -> pure $ fromIntegral eq

@@ -70,31 +70,22 @@ numberSeries' =

70 n <- generate $ \depth -> take depth [l .. h]

71 pure $ fromIntegral n

73−arraySeries ::

73+arraySeries

74+ :: (Monad m, Serial m (JsonRepr s))

74− Monad m => [DemotedArrayConstraint] -> DemotedSchema -> Series m Value

75+ => [DemotedArrayConstraint]

76+ -> Series m (V.Vector (JsonRepr s))

75−arraySeries cs sch = do

77+arraySeries cs = do

76 let mvcs = verifyArrayConstraint cs

78 let mvcs = verifyArrayConstraint cs

77 case mvcs of

79 case mvcs of

78− Just vcs -> arraySeries' vcs sch

80+ Just vcs -> arraySeries' vcs

79− Nothing -> pure Null

81+ Nothing -> pure V.empty

81−arraySeries' ::

83+arraySeries'

84+ :: forall m s. (Monad m, Serial m (JsonRepr s))

82− Monad m => Maybe VerifiedArrayConstraint -> DemotedSchema -> Series m Value

85+ => Maybe VerifiedArrayConstraint

86+ -> Series m (V.Vector (JsonRepr s))

83−arraySeries' ml sch = do

87+arraySeries' ml = do

84− objs <- V.replicateM (maybe minRepeat f ml) (valueSeries sch)

88+ objs <- V.replicateM (maybe minRepeat f ml) (series :: Series m (JsonRepr s))

85− pure $ Array objs

89+ pure $ objs

86 where

90 where

87 f (VAEq l) = fromIntegral l

91 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 @@

1module Data.Schematic.Generator.Regex where

3−import Control.Monad

3+import Control.Monad

4−import Data.List

4+import Data.List

5−import Data.Maybe

5+import Data.Maybe

6import qualified Data.Set as S

7−import Data.Text (Text, unpack)

7+import Data.Text (Text, unpack)

8−import Data.Text.Lazy (toStrict)

8+import Data.Text.Lazy (toStrict)

9−import Data.Text.Lazy.Builder (Builder, singleton, toLazyText)

9+import Data.Text.Lazy.Builder (Builder, singleton, toLazyText)

10−import Test.SmallCheck.Series

10+import Test.SmallCheck.Series

11−import Text.Regex.TDFA.Pattern

11+import Text.Regex.TDFA.Pattern

12−import Text.Regex.TDFA.ReadRegex (parseRegex)

12+import Text.Regex.TDFA.ReadRegex (parseRegex)

15minRepeat :: Int

@@ -22,7 +22,7 @@ regexSeries :: (Monad m) => Text -> Series m Text

22regexSeries regexp =

23 case parseRegex . unpack $ regexp of

24 Right (p, _) -> toStrict . toLazyText <$> regexSeries' p

25− Left _ -> pure ""

25+ Left _ -> pure ""

27regexSeries' :: (Monad m) => Pattern -> Series m Builder

28regexSeries' pt =

src/Data/Schematic/JsonSchema.hs+21−9

@@ -30,13 +30,13 @@ textConstraint :: DemotedTextConstraint -> State D4.Schema ()

30textConstraint (DTEq n) = modify $ \s -> s

31 { _schemaMinLength = pure $ fromIntegral n

32 , _schemaMaxLength = pure $ fromIntegral n }

33−textConstraint (DTLt n) = modify $ \s -> s

34− { _schemaMaxLength = pure . fromIntegral $ n + 1 }

35textConstraint (DTLe n) = modify $ \s -> s

33textConstraint (DTLe n) = modify $ \s -> s

36 { _schemaMaxLength = pure . fromIntegral $ n }

34 { _schemaMaxLength = pure . fromIntegral $ n }

37−textConstraint (DTGt n) =

35+textConstraint (DTLt n) =

38 let n' = if n == 0 then 0 else n - 1

36 let n' = if n == 0 then 0 else n - 1

37+ in modify $ \s -> s { _schemaMaxLength = pure . fromIntegral $ n' }

38+textConstraint (DTGt n) = modify $ \s -> s

39− in modify $ \s -> s { _schemaMinLength = pure . fromIntegral $ n' }

39+ { _schemaMinLength = pure . fromIntegral $ n + 1 }

40textConstraint (DTGe n) = modify $ \s -> s

41 { _schemaMinLength = pure . fromIntegral $ n }

42textConstraint (DTRegex r) = modify $ \s -> s { _schemaPattern = pure r }

@@ -48,18 +48,30 @@ numberConstraint :: DemotedNumberConstraint -> State D4.Schema ()

48numberConstraint (DNLe n) = modify $ \s -> s

49 { _schemaMaximum = pure . fromIntegral $ n }

50numberConstraint (DNLt n) = modify $ \s -> s

51− { _schemaMaximum = pure . fromIntegral $ n + 1 }

51+ { _schemaMaximum = pure . fromIntegral $ n

52+ , _schemaExclusiveMaximum = pure True }

52numberConstraint (DNGt n) = modify $ \s -> s

53numberConstraint (DNGt n) = modify $ \s -> s

54+ { _schemaMinimum = pure . fromIntegral $ n

55+ , _schemaExclusiveMinimum = pure True }

56+numberConstraint (DNGe n) = modify $ \s -> s

53 { _schemaMinimum = pure . fromIntegral $ n }

57 { _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' }

57numberConstraint (DNEq n) = modify $ \s -> s

58numberConstraint (DNEq n) = modify $ \s -> s

58 { _schemaMinimum = pure $ fromIntegral n

59 { _schemaMinimum = pure $ fromIntegral n

59 , _schemaMaximum = pure $ fromIntegral n }

60 , _schemaMaximum = pure $ fromIntegral n }

61arrayConstraint :: DemotedArrayConstraint -> State D4.Schema ()

62arrayConstraint :: 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 }

64toJsonSchema

76toJsonSchema

65 :: forall proxy schema

77 :: forall proxy schema

src/Data/Schematic/Migration.hs+10−2

@@ -1,5 +1,6 @@

1{-# LANGUAGE AllowAmbiguousTypes #-}

2+{-# LANGUAGE CPP #-}

2−{-# LANGUAGE TemplateHaskell #-}

3+{-# LANGUAGE TemplateHaskell #-}

4module Data.Schematic.Migration where

5module Data.Schematic.Migration where

@@ -8,7 +9,7 @@ import Data.Schematic.DSL

8import Data.Schematic.Lens

9import Data.Schematic.Lens

9import Data.Schematic.Path

10import Data.Schematic.Path

10import Data.Schematic.Schema

11import Data.Schematic.Schema

11−import Data.Singletons.Prelude hiding (All, (:.))

12+import Data.Singletons.Prelude hiding ((:.), All)

12import Data.Singletons.TypeLits

13import Data.Singletons.TypeLits

13import Data.Tagged

14import Data.Tagged

14import Data.Vinyl

15import Data.Vinyl

@@ -156,10 +157,17 @@ data MList :: (Type -> Type) -> [Schema] -> Type where

156

157

157infixr 7 :&&

158infixr 7 :&&

158

159

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

159migrateObject

166migrateObject

160 :: forall m fs fh. (FSubset fs fs (FImage fs fs), Monad m)

167 :: forall m fs fh. (FSubset fs fs (FImage fs fs), Monad m)

161 => (Rec (Tagged fs :. FieldRepr) fh -> m (Rec (Tagged fs :. FieldRepr) fs))

168 => (Rec (Tagged fs :. FieldRepr) fh -> m (Rec (Tagged fs :. FieldRepr) fs))

162 -> Tagged ('SchemaObject fs) (JsonRepr ('SchemaObject fh) -> m (JsonRepr ('SchemaObject fs)))

169 -> Tagged ('SchemaObject fs) (JsonRepr ('SchemaObject fh) -> m (JsonRepr ('SchemaObject fs)))

170+#endif

163migrateObject f = Tagged $ \(ReprObject r) -> do

171migrateObject f = Tagged $ \(ReprObject r) -> do

164 res <- f $ rmap (Compose . Tagged) r

172 res <- f $ rmap (Compose . Tagged) r

165 pure $ withRepr @('SchemaObject fs) res

173 pure $ withRepr @('SchemaObject fs) res

src/Data/Schematic/Path.hs+17−20

@@ -4,36 +4,33 @@ import Data.Foldable as F

4import Data.Singletons.Prelude

5import Data.Singletons.TypeLits

6import Data.Text as T

7+import Data.Aeson.Internal

9−data PathSegment = Key Symbol | Ix Nat

10+newtype JSONPathText = JSONPathText Text

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

16 deriving (Show)

11 deriving (Show)

18−-- | Textual representation of json path.

13+data PathSegment = PathKey Symbol | PathIx Nat

19−newtype JSONPath = JSONPath Text

14+

20− deriving (Show)

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)

22−demotePath :: Sing (ps :: [PathSegment]) -> [DemotedPathSegment]

19+demotePath :: Sing (ps :: [PathSegment]) -> JSONPath

23demotePath = go []

20demotePath = go []

24 where

21 where

25− go :: [DemotedPathSegment] -> Sing (ps :: [PathSegment]) -> [DemotedPathSegment]

22+ go :: JSONPath -> Sing (ps :: [PathSegment]) -> JSONPath

26 go acc SNil = acc

23 go acc SNil = acc

27 go acc (SCons p ps) = go (acc ++ [demotePathSeg p]) ps

24 go acc (SCons p ps) = go (acc ++ [demotePathSeg p]) ps

28− demotePathSeg :: Sing (ps :: PathSegment) -> DemotedPathSegment

25+ demotePathSeg :: Sing (ps :: PathSegment) -> JSONPathElement

29− demotePathSeg (SKey s) = DKey $ T.pack $ withKnownSymbol s $ symbolVal s

26+ demotePathSeg (SKey s) = Key $ T.pack $ withKnownSymbol s $ symbolVal s

30− demotePathSeg (SIx n) = DIx $ withKnownNat n $ fromIntegral $ natVal n

27+ demotePathSeg (SIx n) = Index $ withKnownNat n $ fromIntegral $ natVal n

32−demotedPathToText :: [DemotedPathSegment] -> JSONPath

29+demotedPathToText :: JSONPath -> JSONPathText

33−demotedPathToText = JSONPath . F.foldl' renderPathSegment ""

30+demotedPathToText = JSONPathText . F.foldl' renderPathSegment ""

34 where

31 where

35− renderPathSegment acc (DKey t) = acc <> "." <> t

32+ renderPathSegment acc (Key t) = acc <> "." <> t

36− renderPathSegment acc (DIx n) = acc <> "[" <> T.pack (show n) <> "]"

33+ renderPathSegment acc (Index n) = acc <> "[" <> T.pack (show n) <> "]"

38−pathToText :: Sing (ps :: [PathSegment]) -> JSONPath

35+pathToText :: Sing (ps :: [PathSegment]) -> JSONPathText

39pathToText = demotedPathToText . demotePath

36pathToText = demotedPathToText . demotePath

src/Data/Schematic/Schema.hs+108−38

@@ -1,6 +1,7 @@

1{-# LANGUAGE AllowAmbiguousTypes #-}

2+{-# LANGUAGE CPP #-}

2−{-# LANGUAGE OverloadedLists #-}

3+{-# LANGUAGE OverloadedLists #-}

3−{-# LANGUAGE OverloadedStrings #-}

4+{-# LANGUAGE OverloadedStrings #-}

4{-# OPTIONS_GHC -fprint-explicit-kinds #-}

5{-# OPTIONS_GHC -fprint-explicit-kinds #-}

6module Data.Schematic.Schema where

7module Data.Schematic.Schema where

@@ -12,6 +13,7 @@ import Data.Aeson.Types as J

12import Data.HashMap.Strict as H

13import Data.HashMap.Strict as H

13import Data.Kind

14import Data.Kind

14import Data.Maybe

15import Data.Maybe

16+import Data.Schematic.Generator

15import Data.Schematic.Instances ()

17import Data.Schematic.Instances ()

16import Data.Scientific

18import Data.Scientific

17import Data.Singletons.Prelude.List hiding (All, Union)

19import Data.Singletons.Prelude.List hiding (All, Union)

@@ -24,7 +26,8 @@ import Data.Vinyl hiding (Dict)

24import qualified Data.Vinyl.TypeLevel as V

26import qualified Data.Vinyl.TypeLevel as V

25import GHC.Exts

27import GHC.Exts

26import GHC.Generics (Generic)

28import GHC.Generics (Generic)

29+import GHC.TypeLits

27−import GHC.TypeLits (SomeNat(..), SomeSymbol(..), someSymbolVal, someNatVal)

30+ (SomeNat(..), SomeSymbol(..), someNatVal, someSymbolVal)

28import Prelude as P

31import Prelude as P

29import Test.SmallCheck.Series

32import Test.SmallCheck.Series

@@ -56,25 +59,25 @@ instance SingKind TextConstraint where

56 STRegex s -> withKnownSymbol s (DTRegex $ T.pack $ symbolVal s)

59 STRegex s -> withKnownSymbol s (DTRegex $ T.pack $ symbolVal s)

57 STEnum s -> let

60 STEnum s -> let

58 d :: Sing (s :: [Symbol]) -> [Text]

61 d :: Sing (s :: [Symbol]) -> [Text]

59− d SNil = []

62+ d SNil = []

60 d (SCons ss@SSym fs) = T.pack (symbolVal ss) : d fs

63 d (SCons ss@SSym fs) = T.pack (symbolVal ss) : d fs

61 in DTEnum $ d s

64 in DTEnum $ d s

62 toSing = \case

65 toSing = \case

63 DTEq n -> case someNatVal n of

66 DTEq n -> case someNatVal n of

64 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STEq (SNat :: Sing n))

67 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STEq (SNat :: Sing n))

65− Nothing -> error "Negative singleton nat"

68+ Nothing -> error "Negative singleton nat"

66 DTLt n -> case someNatVal n of

69 DTLt n -> case someNatVal n of

67 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STLt (SNat :: Sing n))

70 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STLt (SNat :: Sing n))

68− Nothing -> error "Negative singleton nat"

71+ Nothing -> error "Negative singleton nat"

69 DTLe n -> case someNatVal n of

72 DTLe n -> case someNatVal n of

70 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STLe (SNat :: Sing n))

73 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STLe (SNat :: Sing n))

71− Nothing -> error "Negative singleton nat"

74+ Nothing -> error "Negative singleton nat"

72 DTGt n -> case someNatVal n of

75 DTGt n -> case someNatVal n of

73 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STGt (SNat :: Sing n))

76 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STGt (SNat :: Sing n))

74− Nothing -> error "Negative singleton nat"

77+ Nothing -> error "Negative singleton nat"

75 DTGe n -> case someNatVal n of

78 DTGe n -> case someNatVal n of

76 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STGe (SNat :: Sing n))

79 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STGe (SNat :: Sing n))

77− Nothing -> error "Negative singleton nat"

80+ Nothing -> error "Negative singleton nat"

78 DTRegex s -> case someSymbolVal (T.unpack s) of

81 DTRegex s -> case someSymbolVal (T.unpack s) of

79 SomeSymbol (_ :: Proxy n) -> SomeSing (STRegex (SSym :: Sing n))

82 SomeSymbol (_ :: Proxy n) -> SomeSing (STRegex (SSym :: Sing n))

80 DTEnum ss -> case toSing ss of

83 DTEnum ss -> case toSing ss of

@@ -161,43 +164,79 @@ instance SingKind NumberConstraint where

161 toSing = \case

164 toSing = \case

162 DNEq n -> case someNatVal n of

165 DNEq n -> case someNatVal n of

163 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNEq (SNat :: Sing n))

166 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNEq (SNat :: Sing n))

164− Nothing -> error "Negative singleton nat"

167+ Nothing -> error "Negative singleton nat"

165 DNGt n -> case someNatVal n of

168 DNGt n -> case someNatVal n of

166 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNGt (SNat :: Sing n))

169 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNGt (SNat :: Sing n))

167− Nothing -> error "Negative singleton nat"

170+ Nothing -> error "Negative singleton nat"

168 DNGe n -> case someNatVal n of

171 DNGe n -> case someNatVal n of

169 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNGe (SNat :: Sing n))

172 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNGe (SNat :: Sing n))

170− Nothing -> error "Negative singleton nat"

173+ Nothing -> error "Negative singleton nat"

171 DNLt n -> case someNatVal n of

174 DNLt n -> case someNatVal n of

172 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNLt (SNat :: Sing n))

175 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNLt (SNat :: Sing n))

173− Nothing -> error "Negative singleton nat"

176+ Nothing -> error "Negative singleton nat"

174 DNLe n -> case someNatVal n of

177 DNLe n -> case someNatVal n of

175 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNLe (SNat :: Sing n))

178 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNLe (SNat :: Sing n))

176− Nothing -> error "Negative singleton nat"

179+ Nothing -> error "Negative singleton nat"

177

180

178data ArrayConstraint

181data ArrayConstraint

179 = AEq Nat

182 = AEq Nat

183+ | AGt Nat

184+ | AGe Nat

185+ | ALt Nat

186+ | ALe Nat

180 deriving (Generic)

187 deriving (Generic)

181

188

182data DemotedArrayConstraint

189data DemotedArrayConstraint

183 = DAEq Integer

190 = DAEq Integer

191+ | DAGt Integer

192+ | DAGe Integer

193+ | DALt Integer

194+ | DALe Integer

184 deriving (Generic, Eq, Show)

195 deriving (Generic, Eq, Show)

185

196

186data instance Sing (ac :: ArrayConstraint) where

197data instance Sing (ac :: ArrayConstraint) where

187 SAEq :: Sing n -> Sing ('AEq n)

198 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)

188

203

189instance KnownNat n => SingI ('AEq n) where sing = SAEq sing

204instance 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

190

209

191instance Eq (Sing ('AEq n)) where _ == _ = True

210instance 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

192

215

193instance SingKind ArrayConstraint where

216instance SingKind ArrayConstraint where

194 type Demote ArrayConstraint = DemotedArrayConstraint

217 type Demote ArrayConstraint = DemotedArrayConstraint

195 fromSing = \case

218 fromSing = \case

196 SAEq n -> withKnownNat n (DAEq . fromIntegral $ natVal n)

219 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)

197 toSing = \case

224 toSing = \case

198 DAEq n -> case someNatVal n of

225 DAEq n -> case someNatVal n of

199 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SAEq (SNat :: Sing n))

226 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SAEq (SNat :: Sing n))

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))

200− Nothing -> error "Negative singleton nat"

239+ Nothing -> error "Negative singleton nat"

201

240

202data Schema

241data Schema

203 = SchemaText [TextConstraint]

242 = SchemaText [TextConstraint]

@@ -334,6 +373,31 @@ data JsonRepr :: Schema -> Type where

334 ReprOptional :: Maybe (JsonRepr s) -> JsonRepr ('SchemaOptional s)

373 ReprOptional :: Maybe (JsonRepr s) -> JsonRepr ('SchemaOptional s)

335 ReprUnion :: Union JsonRepr (h ': tl) -> JsonRepr ('SchemaUnion (h ': tl))

374 ReprUnion :: Union JsonRepr (h ': tl) -> JsonRepr ('SchemaUnion (h ': tl))

336

375

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+

337-- | Move to the union package

401-- | Move to the union package

338instance Show (JsonRepr ('SchemaText cs)) where

402instance Show (JsonRepr ('SchemaText cs)) where

339 show (ReprText t) = "ReprText " P.++ show t

403 show (ReprText t) = "ReprText " P.++ show t

@@ -341,39 +405,31 @@ instance Show (JsonRepr ('SchemaText cs)) where

341instance Show (JsonRepr ('SchemaNumber cs)) where

405instance Show (JsonRepr ('SchemaNumber cs)) where

342 show (ReprNumber n) = "ReprNumber " P.++ show n

406 show (ReprNumber n) = "ReprNumber " P.++ show n

343

407

408+instance Show (JsonRepr 'SchemaBoolean) where

409+ show (ReprBoolean n) = "ReprBoolean " P.++ show n

410+

344instance Show (JsonRepr 'SchemaNull) where show _ = "ReprNull"

411instance Show (JsonRepr 'SchemaNull) where show _ = "ReprNull"

345

412

346instance Show (JsonRepr s) => Show (JsonRepr ('SchemaArray acs s)) where

413instance Show (JsonRepr s) => Show (JsonRepr ('SchemaArray acs s)) where

347 show (ReprArray v) = "ReprArray " P.++ show v

414 show (ReprArray v) = "ReprArray " P.++ show v

348

415

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

349instance V.RecAll FieldRepr fs Show => Show (JsonRepr ('SchemaObject fs)) where

423instance V.RecAll FieldRepr fs Show => Show (JsonRepr ('SchemaObject fs)) where

350 show (ReprObject fs) = "ReprObject " P.++ show fs

424 show (ReprObject fs) = "ReprObject " P.++ show fs

425+#endif

351

426

352instance Show (JsonRepr s) => Show (JsonRepr ('SchemaOptional s)) where

427instance Show (JsonRepr s) => Show (JsonRepr ('SchemaOptional s)) where

353 show (ReprOptional s) = "ReprOptional " P.++ show s

428 show (ReprOptional s) = "ReprOptional " P.++ show s

354

429

355−instance (Monad m, Serial m Text)

430+instance Show (Union JsonRepr (h ': tl))

356− => Serial m (JsonRepr ('SchemaText cs)) where

431+ => Show (JsonRepr ('SchemaUnion (h ': tl))) where

357− series = cons1 ReprText

432+ show (ReprUnion s) = "ReprUnion " P.++ show s

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

377

433

378instance Eq (Rec FieldRepr fs) => Eq (JsonRepr ('SchemaObject fs)) where

434instance Eq (Rec FieldRepr fs) => Eq (JsonRepr ('SchemaObject fs)) where

379 ReprObject a == ReprObject b = a == b

435 ReprObject a == ReprObject b = a == b

@@ -384,6 +440,9 @@ instance Eq (JsonRepr ('SchemaText cs)) where

384instance Eq (JsonRepr ('SchemaNumber cs)) where

440instance Eq (JsonRepr ('SchemaNumber cs)) where

385 ReprNumber a == ReprNumber b = a == b

441 ReprNumber a == ReprNumber b = a == b

386

442

443+instance Eq (JsonRepr 'SchemaBoolean) where

444+ ReprBoolean a == ReprBoolean b = a == b

445+

387instance Eq (JsonRepr 'SchemaNull) where

446instance Eq (JsonRepr 'SchemaNull) where

388 ReprNull == ReprNull = True

447 ReprNull == ReprNull = True

389

448

@@ -393,6 +452,10 @@ instance Eq (JsonRepr s) => Eq (JsonRepr ('SchemaArray as s)) where

393instance Eq (JsonRepr s) => Eq (JsonRepr ('SchemaOptional s)) where

452instance Eq (JsonRepr s) => Eq (JsonRepr ('SchemaOptional s)) where

394 ReprOptional a == ReprOptional b = a == b

453 ReprOptional a == ReprOptional b = a == b

395

454

455+instance Eq (Union JsonRepr (h ': tl))

456+ => Eq (JsonRepr ('SchemaUnion (h ': tl))) where

457+ ReprUnion a == ReprUnion b = a == b

458+

396instance Ord (Rec FieldRepr fs) => Ord (JsonRepr ('SchemaObject fs)) where

459instance Ord (Rec FieldRepr fs) => Ord (JsonRepr ('SchemaObject fs)) where

397 ReprObject a `compare` ReprObject b = a `compare` b

460 ReprObject a `compare` ReprObject b = a `compare` b

398

461

@@ -402,6 +465,9 @@ instance Ord (JsonRepr ('SchemaText cs)) where

402instance Ord (JsonRepr ('SchemaNumber cs)) where

465instance Ord (JsonRepr ('SchemaNumber cs)) where

403 ReprNumber a `compare` ReprNumber b = a `compare` b

466 ReprNumber a `compare` ReprNumber b = a `compare` b

404

467

468+instance Ord (JsonRepr 'SchemaBoolean) where

469+ ReprBoolean a `compare` ReprBoolean b = a `compare` b

470+

405instance Ord (JsonRepr 'SchemaNull) where

471instance Ord (JsonRepr 'SchemaNull) where

406 compare _ _ = EQ

472 compare _ _ = EQ

407

473

@@ -411,6 +477,10 @@ instance Ord (JsonRepr s) => Ord (JsonRepr ('SchemaArray as s)) where

411instance Ord (JsonRepr s) => Ord (JsonRepr ('SchemaOptional s)) where

477instance Ord (JsonRepr s) => Ord (JsonRepr ('SchemaOptional s)) where

412 ReprOptional a `compare` ReprOptional b = a `compare` b

478 ReprOptional a `compare` ReprOptional b = a `compare` b

413

479

480+instance Ord (Union JsonRepr (h ': tl))

481+ => Ord (JsonRepr ('SchemaUnion (h ': tl))) where

482+ ReprUnion a `compare` ReprUnion b = a `compare` b

483+

414instance IsList (JsonRepr ('SchemaArray cs s)) where

484instance IsList (JsonRepr ('SchemaArray cs s)) where

415 type Item (JsonRepr ('SchemaArray cs s)) = JsonRepr s

485 type Item (JsonRepr ('SchemaArray cs s)) = JsonRepr s

416 fromList = ReprArray . GHC.Exts.fromList

486 fromList = ReprArray . GHC.Exts.fromList

@@ -502,7 +572,7 @@ instance J.ToJSON (JsonRepr a) where

502 toJSON (ReprText t) = J.String t

572 toJSON (ReprText t) = J.String t

503 toJSON (ReprNumber n) = J.Number n

573 toJSON (ReprNumber n) = J.Number n

504 toJSON (ReprOptional s) = case s of

574 toJSON (ReprOptional s) = case s of

505− Just v -> toJSON v

575+ Just v -> toJSON v

506 Nothing -> J.Null

576 Nothing -> J.Null

507 toJSON (ReprArray v) = J.Array $ toJSON <$> v

577 toJSON (ReprArray v) = J.Array $ toJSON <$> v

508 toJSON (ReprObject r) = J.Object . H.fromList . fold $ r

578 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

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

3import Control.Monad

4import Control.Monad.Validation

5import Data.Aeson

6+import Data.Aeson.Internal

6import Data.Aeson.Types

7import Data.Aeson.Types

7import Data.Foldable

8import Data.Foldable

8import Data.Functor.Identity

9import Data.Functor.Identity

@@ -49,51 +50,51 @@ isValidationError (ValidationError _) = True

49isValidationError _ = False

50isValidationError _ = False

51validateTextConstraint

52validateTextConstraint

52− :: JSONPath

53+ :: JSONPathText

53 -> Text

54 -> Text

54 -> Sing (tcs :: TextConstraint)

55 -> Sing (tcs :: TextConstraint)

55 -> Validation ()

56 -> Validation ()

56−validateTextConstraint (JSONPath path) t = \case

57+validateTextConstraint (JSONPathText path) t = \case

57 STEq n -> do

58 STEq n -> do

58 let

59 let

59 nlen = withKnownNat n $ natVal n

60 nlen = withKnownNat n $ natVal n

60 predicate = nlen == (fromIntegral $ T.length t)

61 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)

62 warn = vWarning $ mmSingleton path (pure errMsg)

63 warn = vWarning $ mmSingleton path (pure errMsg)

63 unless predicate warn

64 unless predicate warn

64 STLt n -> do

65 STLt n -> do

65 let

66 let

66 nlen = withKnownNat n $ natVal n

67 nlen = withKnownNat n $ natVal n

67− predicate = nlen < (fromIntegral $ T.length t)

68+ predicate = nlen > (fromIntegral $ T.length t)

68− errMsg = "length of " <> path <> " should be < " <> T.pack (show nlen)

69+ errMsg = "length should be < " <> T.pack (show nlen)

69 warn = vWarning $ mmSingleton path (pure errMsg)

70 warn = vWarning $ mmSingleton path (pure errMsg)

70 unless predicate warn

71 unless predicate warn

71 STLe n -> do

72 STLe n -> do

72 let

73 let

73 nlen = withKnownNat n $ natVal n

74 nlen = withKnownNat n $ natVal n

74− predicate = nlen <= (fromIntegral $ T.length t)

75+ predicate = nlen >= (fromIntegral $ T.length t)

75− errMsg = "length of " <> path <> " should be <= " <> T.pack (show nlen)

76+ errMsg = "length should be <= " <> T.pack (show nlen)

76 warn = vWarning $ mmSingleton path (pure errMsg)

77 warn = vWarning $ mmSingleton path (pure errMsg)

77 unless predicate warn

78 unless predicate warn

78 STGt n -> do

79 STGt n -> do

79 let

80 let

80 nlen = withKnownNat n $ natVal n

81 nlen = withKnownNat n $ natVal n

81− predicate = nlen > (fromIntegral $ T.length t)

82+ predicate = nlen < (fromIntegral $ T.length t)

82− errMsg = "length of " <> path <> " should be > " <> T.pack (show nlen)

83+ errMsg = "length should be > " <> T.pack (show nlen)

83 warn = vWarning $ mmSingleton path (pure errMsg)

84 warn = vWarning $ mmSingleton path (pure errMsg)

84 unless predicate warn

85 unless predicate warn

85 STGe n -> do

86 STGe n -> do

86 let

87 let

87 nlen = withKnownNat n $ natVal n

88 nlen = withKnownNat n $ natVal n

88− predicate = nlen >= (fromIntegral $ T.length t)

89+ predicate = nlen <= (fromIntegral $ T.length t)

89− errMsg = "length of " <> path <> " should be >= " <> T.pack (show nlen)

90+ errMsg = "length should be >= " <> T.pack (show nlen)

90 warn = vWarning $ mmSingleton path (pure errMsg)

91 warn = vWarning $ mmSingleton path (pure errMsg)

91 unless predicate warn

92 unless predicate warn

92 STRegex r -> do

93 STRegex r -> do

93 let

94 let

94 regex = withKnownSymbol r $ fromSing r

95 regex = withKnownSymbol r $ fromSing r

95 predicate = matchTest (makeRegex (T.unpack regex) :: Regex) (T.unpack t)

96 predicate = matchTest (makeRegex (T.unpack regex) :: Regex) (T.unpack t)

96− errMsg = path <> " must match " <> regex

97+ errMsg = "must match " <> regex

97 warn = vWarning $ mmSingleton path (pure errMsg)

98 warn = vWarning $ mmSingleton path (pure errMsg)

98 unless predicate warn

99 unless predicate warn

99 STEnum ss -> do

100 STEnum ss -> do

@@ -101,69 +102,97 @@ validateTextConstraint (JSONPath path) t = \case

101 matching :: Sing (s :: [Symbol]) -> Bool

102 matching :: Sing (s :: [Symbol]) -> Bool

102 matching SNil = False

103 matching SNil = False

103 matching (SCons s@SSym fs) = T.pack (symbolVal s) == t || matching fs

104 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))

105 warn = vWarning $ mmSingleton path (pure errMsg)

106 warn = vWarning $ mmSingleton path (pure errMsg)

106 unless (matching ss) warn

107 unless (matching ss) warn

107

108

108validateNumberConstraint

109validateNumberConstraint

109− :: JSONPath

110+ :: JSONPathText

110 -> Scientific

111 -> Scientific

111 -> Sing (tcs :: NumberConstraint)

112 -> Sing (tcs :: NumberConstraint)

112 -> Validation ()

113 -> Validation ()

113−validateNumberConstraint (JSONPath path) num = \case

114+validateNumberConstraint (JSONPathText path) num = \case

114 SNEq n -> do

115 SNEq n -> do

115 let

116 let

116 nlen = withKnownNat n $ natVal n

117 nlen = withKnownNat n $ natVal n

117 predicate = fromIntegral nlen == num

118 predicate = fromIntegral nlen == num

118− errMsg = path <> " should be == " <> T.pack (show nlen)

119+ errMsg = "should be == " <> T.pack (show nlen)

119 warn = vWarning $ mmSingleton path (pure errMsg)

120 warn = vWarning $ mmSingleton path (pure errMsg)

120 unless predicate warn

121 unless predicate warn

121 SNGt n -> do

122 SNGt n -> do

122 let

123 let

123 nlen = withKnownNat n $ natVal n

124 nlen = withKnownNat n $ natVal n

124 predicate = num > fromIntegral nlen

125 predicate = num > fromIntegral nlen

125− errMsg = path <> " should be > " <> T.pack (show nlen)

126+ errMsg = "should be > " <> T.pack (show nlen)

126 warn = vWarning $ mmSingleton path (pure errMsg)

127 warn = vWarning $ mmSingleton path (pure errMsg)

127 unless predicate warn

128 unless predicate warn

128 SNGe n -> do

129 SNGe n -> do

129 let

130 let

130 nlen = withKnownNat n $ natVal n

131 nlen = withKnownNat n $ natVal n

131 predicate = num >= fromIntegral nlen

132 predicate = num >= fromIntegral nlen

132− errMsg = path <> " should be >= " <> T.pack (show nlen)

133+ errMsg = "should be >= " <> T.pack (show nlen)

133 warn = vWarning $ mmSingleton path (pure errMsg)

134 warn = vWarning $ mmSingleton path (pure errMsg)

134 unless predicate warn

135 unless predicate warn

135 SNLt n -> do

136 SNLt n -> do

136 let

137 let

137 nlen = withKnownNat n $ natVal n

138 nlen = withKnownNat n $ natVal n

138 predicate = num < fromIntegral nlen

139 predicate = num < fromIntegral nlen

139− errMsg = path <> " should be < " <> T.pack (show nlen)

140+ errMsg = "should be < " <> T.pack (show nlen)

140 warn = vWarning $ mmSingleton path (pure errMsg)

141 warn = vWarning $ mmSingleton path (pure errMsg)

141 unless predicate warn

142 unless predicate warn

142 SNLe n -> do

143 SNLe n -> do

143 let

144 let

144 nlen = withKnownNat n $ natVal n

145 nlen = withKnownNat n $ natVal n

145 predicate = num <= fromIntegral nlen

146 predicate = num <= fromIntegral nlen

146− errMsg = path <> " should be <= " <> T.pack (show nlen)

147+ errMsg = "should be <= " <> T.pack (show nlen)

147 warn = vWarning $ mmSingleton path (pure errMsg)

148 warn = vWarning $ mmSingleton path (pure errMsg)

148 unless predicate warn

149 unless predicate warn

149

150

150validateArrayConstraint

151validateArrayConstraint

151− :: JSONPath

152+ :: JSONPathText

152 -> V.Vector a

153 -> V.Vector a

153 -> Sing (tcs :: ArrayConstraint)

154 -> Sing (tcs :: ArrayConstraint)

154 -> Validation ()

155 -> Validation ()

155−validateArrayConstraint (JSONPath path) v = \case

156+validateArrayConstraint (JSONPathText path) v = \case

156 SAEq n -> do

157 SAEq n -> do

157 let

158 let

158 nlen = withKnownNat n $ natVal n

159 nlen = withKnownNat n $ natVal n

159 predicate = nlen == fromIntegral (V.length v)

160 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)

161 warn = vWarning $ mmSingleton path (pure errMsg)

190 warn = vWarning $ mmSingleton path (pure errMsg)

162 unless predicate warn

191 unless predicate warn

163

192

164validateJsonRepr

193validateJsonRepr

165 :: Sing schema

194 :: Sing schema

166− -> [DemotedPathSegment]

195+ -> JSONPath

167 -> JsonRepr schema

196 -> JsonRepr schema

168 -> Validation ()

197 -> Validation ()

169validateJsonRepr sschema dpath jr = case jr of

198validateJsonRepr sschema dpath jr = case jr of

@@ -197,7 +226,7 @@ validateJsonRepr sschema dpath jr = case jr of

197 process cs

226 process cs

198 process acs

227 process acs

199 for_ (V.indexed v) $ \(ix, jr') -> do

228 for_ (V.indexed v) $ \(ix, jr') -> do

200− let newPath = dpath <> pure (DIx $ fromIntegral ix)

229+ let newPath = dpath <> pure (Index $ fromIntegral ix)

201 validateJsonRepr s newPath jr'

230 validateJsonRepr s newPath jr'

202 ReprOptional d -> case sschema of

231 ReprOptional d -> case sschema of

203 SSchemaOptional ss -> case d of

232 SSchemaOptional ss -> case d of

@@ -209,7 +238,7 @@ validateJsonRepr sschema dpath jr = case jr of

209 go :: Rec FieldRepr (ts :: [(Symbol, Schema)] ) -> Validation ()

238 go :: Rec FieldRepr (ts :: [(Symbol, Schema)] ) -> Validation ()

210 go RNil = pure ()

239 go RNil = pure ()

211 go (f@(FieldRepr d) :& ftl) = do

240 go (f@(FieldRepr d) :& ftl) = do

212− let newPath = dpath <> [DKey (knownFieldName f)]

241+ let newPath = dpath <> [Key (knownFieldName f)]

213 validateJsonRepr (knownFieldSchema f) newPath d

242 validateJsonRepr (knownFieldSchema f) newPath d

214 go ftl

243 go ftl

215 ReprUnion _ -> pure () -- FIXME

244 ReprUnion _ -> pure () -- FIXME

@@ -221,7 +250,7 @@ validateJsonRepr sschema dpath jr = case jr of

221 -- fail "impossible to produce subUnion, please report this as a bug"

250 -- fail "impossible to produce subUnion, please report this as a bug"

222 -- Just x -> do

251 -- Just x -> do

223 -- let

252 -- let

224− -- JSONPath path = demotedPathToText dpath

253+ -- JSONPathText path = demotedPathToText dpath

225 -- case stl of

254 -- case stl of

226 -- SNil -> void $ vWarning $ mmSingleton path

255 -- SNil -> void $ vWarning $ mmSingleton path

227 -- $ pure "union handling error, please report this as bug"

256 -- $ pure "union handling error, please report this as bug"

src/Data/Schematic/Verifier/Array.hs+1−1

@@ -1,6 +1,6 @@

1module Data.Schematic.Verifier.Array where

3−import Data.Schematic

3+import {-# SOURCE #-} Data.Schematic.Schema

4import Data.Schematic.Verifier.Common

6data VerifiedArrayConstraint =

src/Data/Schematic/Verifier/Common.hs+2−2

@@ -17,8 +17,8 @@ simplifyDNGs = simplifyNumberConstraint maximum

17verifyDNEq :: [Integer] -> Maybe (Maybe Integer)

18verifyDNEq x =

19 case nub x of

20− [] -> Just Nothing

20+ [] -> Just Nothing

21− [y] -> Just $ Just y

21+ [y] -> Just $ Just y

22 (_:_:_) -> Nothing

24verify3 :: Maybe Integer -> Maybe Integer -> Maybe Integer -> Maybe ()

src/Data/Schematic/Verifier/Number.hs+9−9

@@ -1,6 +1,6 @@

1module Data.Schematic.Verifier.Number where

3−import Data.Schematic

3+import {-# SOURCE #-} Data.Schematic.Schema

4import Data.Schematic.Verifier.Common

6toStrictNumber :: [DemotedNumberConstraint] -> [DemotedNumberConstraint]

@@ -8,21 +8,21 @@ toStrictNumber = map f

8 where

9 f (DNLe x) = DNLt (x + 1)

10 f (DNGe x) = DNGt (x - 1)

11− f x = x

11+ f x = x

13data VerifiedNumberConstraint

14 = VNEq Integer

15− | VNBounds (Maybe Integer)

15+ | VNBounds (Maybe Integer) (Maybe Integer)

16− (Maybe Integer)

17 deriving (Show)

16 deriving (Show)

19−verifyNumberConstraints ::

18+verifyNumberConstraints

20− [DemotedNumberConstraint]

19+ :: [DemotedNumberConstraint]

21 -> Maybe VerifiedNumberConstraint

20 -> Maybe VerifiedNumberConstraint

22verifyNumberConstraints cs' = do

21verifyNumberConstraints cs' = do

22+ let

23− let cs = toStrictNumber cs'

23+ cs = toStrictNumber cs'

24− mlt = simplifyDNLs [x | DNLt x <- cs]

24+ mlt = simplifyDNLs [x | DNLt x <- cs]

25− mgt = simplifyDNGs [x | DNGt x <- cs]

25+ mgt = simplifyDNGs [x | DNGt x <- cs]

26 meq <- verifyDNEq [x | DNEq x <- cs]

27 verifyEquations mgt meq mlt

28 Just $

src/Data/Schematic/Verifier/Text.hs+58−55

@@ -2,7 +2,7 @@ module Data.Schematic.Verifier.Text where

3import Control.Monad

4import Data.Maybe

5−import Data.Schematic

5+import {-# SOURCE #-} Data.Schematic.Schema

6import Data.Schematic.Verifier.Common

7import Data.Text (Text, unpack)

8import Text.Regex.TDFA.Pattern

@@ -13,29 +13,28 @@ toStrictTextLength = map f

13 where

14 f (DTLe x) = DTLt (x + 1)

15 f (DTGe x) = DTGt (x - 1)

16− f x = x

16+ f x = x

18data VerifiedTextConstraint

19 = VTEq Integer

20− | VTBounds (Maybe Integer)

20+ | VTBounds (Maybe Integer) (Maybe Integer)

21− (Maybe Integer)

22− | VTRegex Text

23− Integer

24− (Maybe Integer)

21+ | VTRegex Text Integer (Maybe Integer)

25 | VTEnum [Text]

22 | VTEnum [Text]

26 deriving (Show)

23 deriving (Show)

28−verifyTextLengthConstraints ::

25+verifyTextLengthConstraints

26+ :: [DemotedTextConstraint]

29− [DemotedTextConstraint] -> Maybe (Maybe VerifiedTextConstraint)

27+ -> Maybe (Maybe VerifiedTextConstraint)

30verifyTextLengthConstraints cs' = do

28verifyTextLengthConstraints cs' = do

29+ let

31− let cs = toStrictTextLength cs'

30+ cs = toStrictTextLength cs'

32− mlt = simplifyDNLs [x | DTLt x <- cs]

31+ mlt = simplifyDNLs [x | DTLt x <- cs]

33− mgt = simplifyDNGs [x | DTGt x <- cs]

32+ mgt = simplifyDNGs [x | DTGt x <- cs]

34 meq <- verifyDNEq [x | DTEq x <- cs]

33 meq <- verifyDNEq [x | DTEq x <- cs]

35 verifyEquations mgt meq mlt

34 verifyEquations mgt meq mlt

36 case all isNothing ([mgt, meq, mlt] :: [Maybe Integer]) of

35 case all isNothing ([mgt, meq, mlt] :: [Maybe Integer]) of

37 True -> Just Nothing

36 True -> Just Nothing

38− _ ->

37+ _ ->

39 Just $

38 Just $

40 Just $

39 Just $

41 case meq of

40 case meq of

@@ -46,73 +45,77 @@ regexLength :: Text -> Maybe (Int, Maybe Int)

46regexLength regexp =

45regexLength regexp =

47 case parseRegex . unpack $ regexp of

46 case parseRegex . unpack $ regexp of

48 Right (p, _) -> Just (minRegexLength p, maxRegexLength p)

47 Right (p, _) -> Just (minRegexLength p, maxRegexLength p)

49− Left _ -> Nothing

48+ Left _ -> Nothing

51minRegexLength :: Pattern -> Int

50minRegexLength :: Pattern -> Int

52minRegexLength p =

51minRegexLength p =

53 case p of

52 case p of

54− PEmpty -> 0

53+ PEmpty -> 0

55− PChar {..} -> 1

54+ PChar {..} -> 1

56− PAny {..} -> 1

55+ PAny {..} -> 1

57− PAnyNot {..} -> 1

56+ PAnyNot {..} -> 1

58− PQuest _ -> 0

57+ PQuest _ -> 0

59− PPlus sch -> minRegexLength $ PBound 1 Nothing sch

58+ PPlus sch -> minRegexLength $ PBound 1 Nothing sch

60− PStar _ sch -> minRegexLength $ PBound 0 Nothing sch

59+ PStar _ sch -> minRegexLength $ PBound 0 Nothing sch

61 PBound low _ sch -> low * minRegexLength sch

60 PBound low _ sch -> low * minRegexLength sch

62− PConcat ps -> sum $ fmap minRegexLength ps

61+ PConcat ps -> sum $ fmap minRegexLength ps

63− POr xs -> minimum $ fmap minRegexLength xs

62+ POr xs -> minimum $ fmap minRegexLength xs

64− PDot _ -> 1

63+ PDot _ -> 1

65− PEscape {..} -> 1

64+ PEscape {..} -> 1

66− PCarat _ -> 0

65+ PCarat _ -> 0

67− PDollar _ -> 0

66+ PDollar _ -> 0

68− _ -> 0

67+ _ -> 0

70maxRegexLength :: Pattern -> Maybe Int

69maxRegexLength :: Pattern -> Maybe Int

71maxRegexLength p =

70maxRegexLength p =

72 case p of

71 case p of

73− PEmpty -> Just 0

72+ PEmpty -> Just 0

74− PChar _ _ -> Just 1

73+ PChar _ _ -> Just 1

75− PAny _ _ -> Just 1

74+ PAny _ _ -> Just 1

76− PAnyNot _ _ -> Just 1

75+ PAnyNot _ _ -> Just 1

77− PQuest _ -> Just 0

76+ PQuest _ -> Just 0

78− PPlus _ -> Nothing

77+ PPlus _ -> Nothing

79− PStar _ _ -> Nothing

78+ PStar _ _ -> Nothing

80 PBound _ mhigh sch -> (*) <$> mhigh <*> maxRegexLength sch

79 PBound _ mhigh sch -> (*) <$> mhigh <*> maxRegexLength sch

81− PConcat ps -> sum <$> mapM maxRegexLength ps

80+ PConcat ps -> sum <$> mapM maxRegexLength ps

82− POr xs -> maximum <$> mapM maxRegexLength xs

81+ POr xs -> maximum <$> mapM maxRegexLength xs

83− PDot _ -> Just 1

82+ PDot _ -> Just 1

84− PEscape _ _ -> Just 1

83+ PEscape _ _ -> Just 1

85− PCarat _ -> Just 0

84+ PCarat _ -> Just 0

86− PDollar _ -> Just 0

85+ PDollar _ -> Just 0

87− _ -> Just 0

86+ _ -> Just 0

89−verifyTextRegexConstraint ::

88+verifyTextRegexConstraint

89+ :: [DemotedTextConstraint]

90− [DemotedTextConstraint] -> Maybe (Maybe VerifiedTextConstraint)

90+ -> Maybe (Maybe VerifiedTextConstraint)

91verifyTextRegexConstraint cs = do

92 let regexps = [x | DTRegex x <- cs]

93 case regexps of

94− [] -> Just Nothing

94+ [] -> Just Nothing

95 [x] -> do

96 (l, mh) <- regexLength x

97 Just $ Just $ VTRegex x (fromIntegral l) (fromIntegral <$> mh)

98− _ -> Nothing

98+ _ -> Nothing

100−verifyTextEnumConstraint ::

100+verifyTextEnumConstraint

101+ :: [DemotedTextConstraint]

101− [DemotedTextConstraint] -> Maybe (Maybe VerifiedTextConstraint)

102+ -> Maybe (Maybe VerifiedTextConstraint)

102verifyTextEnumConstraint cs = do

103verifyTextEnumConstraint cs = do

103 let enums = concat [x | DTEnum x <- cs]

104 let enums = concat [x | DTEnum x <- cs]

104 case enums of

105 case enums of

105 [] -> Just Nothing

106 [] -> Just Nothing

106− x -> Just $ Just $ VTEnum x

107+ x -> Just $ Just $ VTEnum x

107

108

108−verifyTextConstraints ::

109+verifyTextConstraints

110+ :: [DemotedTextConstraint]

109− [DemotedTextConstraint] -> Maybe [VerifiedTextConstraint]

111+ -> Maybe [VerifiedTextConstraint]

110verifyTextConstraints cs = do

112verifyTextConstraints cs = do

111 regexp <- verifyTextRegexConstraint cs

113 regexp <- verifyTextRegexConstraint cs

114+ void $

112− void $ case regexp of

115+ case regexp of

113− Just (VTRegex _ l mh) ->

116+ Just (VTRegex _ l mh) ->

114− verifyTextLengthConstraints (DTGe l : cs ++ maybeToList (DTLe <$> mh))

117+ verifyTextLengthConstraints (DTGe l : cs ++ maybeToList (DTLe <$> mh))

115− _ -> pure Nothing

118+ _ -> pure Nothing

116 lengths <- verifyTextLengthConstraints cs

119 lengths <- verifyTextLengthConstraints cs

117 enums <- verifyTextEnumConstraint cs

120 enums <- verifyTextEnumConstraint cs

118 return $ catMaybes [lengths, enums, regexp]

121 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

2extra-deps:

3− - hjsonpointer-1.4.0@rev:0

3+- hjsonpointer-1.4.0@rev:0

4− - hjsonschema-1.9.0@rev:0

4+- hjsonschema-1.9.0@rev:0

5− - validationt-0.2.1.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

10import Data.Aeson as J

11import Data.Maybe

12import Data.Proxy

13+import Data.ByteString.Lazy as B

13import Data.Schematic

14import Data.Schematic

14import Data.Vinyl

15import Data.Vinyl

15import JSONSchema.Draft4 as D4

16import JSONSchema.Draft4 as D4

@@ -31,6 +32,27 @@ exampleData = withRepr @SchemaExample $

31 :& field @"bar" (pure (ReprText "foo"))

32 :& field @"bar" (pure (ReprText "foo"))

32 :& RNil

33 :& RNil

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+

34spec :: Spec

56spec :: Spec

35spec = do

57spec = do

36 it "validates simple schema" $ do

58 it "validates simple schema" $ do

@@ -38,6 +60,42 @@ spec = do

38 fetchHTTPAndValidate schema (toJSON exampleData) >>= \case

60 fetchHTTPAndValidate schema (toJSON exampleData) >>= \case

39 Left _ -> fail "failed to validate test example"

61 Left _ -> fail "failed to validate test example"

40 Right _ -> pure ()

62 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 ()

42main :: IO ()

100main :: IO ()

43main = hspec spec

101main = hspec spec

test/SchemaSpec.hs+13−3

@@ -33,6 +33,10 @@ type SchemaExample = 'SchemaObject

33 '[ '("foo", 'SchemaArray '[ 'AEq 1] ('SchemaNumber '[ 'NGt 10]))

34 , '("bar", 'SchemaOptional ('SchemaText '[ 'TEnum '["foo", "bar"]]))]

36+type SchemaExample2 = 'SchemaObject

37+ '[ '("foo", 'SchemaArray '[ 'AEq 2] ('SchemaText '[ 'TGt 10]))

38+ , '("bar", 'SchemaOptional ('SchemaText '[ 'TRegex "[0-9]+"]))]

39+

36jsonExample :: JsonRepr SchemaExample

40jsonExample :: JsonRepr SchemaExample

37jsonExample = withRepr @SchemaExample

41jsonExample = withRepr @SchemaExample

38 $ field @"bar" (Just "bar")

42 $ field @"bar" (Just "bar")

@@ -76,8 +80,11 @@ schemaJson = "{\"foo\": [13], \"bar\": null}"

76schemaJson2 :: ByteString

80schemaJson2 :: ByteString

77schemaJson2 = "{\"foo\": [3], \"bar\": null}"

81schemaJson2 = "{\"foo\": [3], \"bar\": null}"

79−schemaJsonSeries :: Monad m => SC.Series m Value

83+schemaJsonSeries :: Monad m => SC.Series m (JsonRepr SchemaExample)

80−schemaJsonSeries = valueSeries $ fromSing (sing :: Sing SchemaExample)

84+schemaJsonSeries = series

85+

86+schemaJsonSeries2 :: Monad m => SC.Series m (JsonRepr SchemaExample2)

87+schemaJsonSeries2 = series

82spec :: Spec

89spec :: Spec

83spec = do

90spec = do

@@ -105,7 +112,10 @@ spec = do

105 `shouldSatisfy` isValid

112 `shouldSatisfy` isValid

106 it "validates json series" $ property $

113 it "validates json series" $ property $

107 SC.over schemaJsonSeries $ \x ->

114 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))

109

119

110

120

111main :: IO ()

121main :: IO ()