0a19087..master · typeable/schematic

ChangeLog.md+11

since splitsnapshots

unifiedsplit

@@ -1,5 +1,16 @@

1# Revision history for schematic

2

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+

3## 0.5.0.0 -- 2019-02-20

14## 0.5.0.0 -- 2019-02-20

4

15

5GHC 8.6, json generation by schema definition, validation bug fixes, better

16GHC 8.6, json generation by schema definition, validation bug fixes, better

schematic.cabal+8−4

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

1name: schematic

2−version: 0.5.0.0

2+version: 0.6.0.0

3synopsis: JSON-biased spec and validation tool

4description: 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.

5license: BSD3

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

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

11category: Data

12build-type: Simple

13−extra-source-files: ChangeLog.md

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

14cabal-version: >=1.10

15

16library

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

65 , TypeOperators

66 , TypeSynonymInstances

67 , UndecidableInstances

68− build-depends: base >=4.11 && <4.13

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

69 , bytestring

70− , aeson >= 1

70+ , aeson >= 1.4.3.0 && < 1.6

71 , containers

72 , hjsonschema

73 , mtl

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

118 , HelpersSpec

119 , LensSpec

120 , JsonSchemaSpec

121+

122+source-repository head

123+ type: git

124+ location: https://github.com/typeable/schematic

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 }

60

61

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 }

63

75

64toJsonSchema

76toJsonSchema

65 :: forall proxy schema

77 :: forall proxy schema

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

7

8

9

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)

17

12

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)

21

18

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

31

28

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

37

34

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

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

39pathToText = demotedPathToText . demotePath

36pathToText = demotedPathToText . demotePath

src/Data/Schematic/Schema.hs+36

@@ -180,27 +180,63 @@ instance SingKind NumberConstraint where

180

181data ArrayConstraint

182 = AEq Nat

183+ | AGt Nat

184+ | AGe Nat

185+ | ALt Nat

186+ | ALe Nat

183 deriving (Generic)

187 deriving (Generic)

184

188

185data DemotedArrayConstraint

189data DemotedArrayConstraint

186 = DAEq Integer

190 = DAEq Integer

191+ | DAGt Integer

192+ | DAGe Integer

193+ | DALt Integer

194+ | DALe Integer

187 deriving (Generic, Eq, Show)

195 deriving (Generic, Eq, Show)

188

196

189data instance Sing (ac :: ArrayConstraint) where

197data instance Sing (ac :: ArrayConstraint) where

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

191

203

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

193

209

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

195

215

196instance SingKind ArrayConstraint where

216instance SingKind ArrayConstraint where

197 type Demote ArrayConstraint = DemotedArrayConstraint

217 type Demote ArrayConstraint = DemotedArrayConstraint

198 fromSing = \case

218 fromSing = \case

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

200 toSing = \case

224 toSing = \case

201 DAEq n -> case someNatVal n of

225 DAEq n -> case someNatVal n of

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

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

203 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"

204

240

205data Schema

241data Schema

206 = SchemaText [TextConstraint]

242 = SchemaText [TextConstraint]

src/Data/Schematic/Schema.hs-boot+8

@@ -46,9 +46,17 @@ data DemotedNumberConstraint

46

47data ArrayConstraint

48 = AEq Nat

49+ | AGt Nat

50+ | AGe Nat

51+ | ALt Nat

52+ | ALe Nat

49

53

50data DemotedArrayConstraint

54data DemotedArrayConstraint

51 = DAEq Integer

55 = DAEq Integer

56+ | DAGt Integer

57+ | DAGe Integer

58+ | DALt Integer

59+ | DALe Integer

52

60

53data Schema

61data Schema

54 = SchemaText [TextConstraint]

62 = SchemaText [TextConstraint]

src/Data/Schematic/Validation.hs+80−18

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

@@ -17,6 +18,7 @@ import Data.Traversable

17import Data.Union

18import Data.Union

18import Data.Vector as V

19import Data.Vector as V

19import Data.Vinyl

20import Data.Vinyl

21+import Data.Vinyl.TypeLevel

20import Prelude as P

22import Prelude as P

21import Text.Regex.TDFA

23import Text.Regex.TDFA

22

24

@@ -37,7 +39,7 @@ instance (TopLevel a, SingI a, FromJSON (JsonRepr a))

37

39

38isValid :: ParseResult a -> Bool

40isValid :: ParseResult a -> Bool

39isValid (Valid _) = True

41isValid (Valid _) = True

40−isValid _ = False

42+isValid _ = False

41

43

42isDecodingError :: ParseResult a -> Bool

44isDecodingError :: ParseResult a -> Bool

43isDecodingError (DecodingError _) = True

45isDecodingError (DecodingError _) = True

@@ -48,11 +50,11 @@ isValidationError (ValidationError _) = True

48isValidationError _ = False

50isValidationError _ = False

49

51

50validateTextConstraint

52validateTextConstraint

51− :: JSONPath

53+ :: JSONPathText

52 -> Text

54 -> Text

53 -> Sing (tcs :: TextConstraint)

55 -> Sing (tcs :: TextConstraint)

54 -> Validation ()

56 -> Validation ()

55−validateTextConstraint (JSONPath path) t = \case

57+validateTextConstraint (JSONPathText path) t = \case

56 STEq n -> do

58 STEq n -> do

57 let

59 let

58 nlen = withKnownNat n $ natVal n

60 nlen = withKnownNat n $ natVal n

@@ -105,11 +107,11 @@ validateTextConstraint (JSONPath path) t = \case

105 unless (matching ss) warn

107 unless (matching ss) warn

106

108

107validateNumberConstraint

109validateNumberConstraint

108− :: JSONPath

110+ :: JSONPathText

109 -> Scientific

111 -> Scientific

110 -> Sing (tcs :: NumberConstraint)

112 -> Sing (tcs :: NumberConstraint)

111 -> Validation ()

113 -> Validation ()

112−validateNumberConstraint (JSONPath path) num = \case

114+validateNumberConstraint (JSONPathText path) num = \case

113 SNEq n -> do

115 SNEq n -> do

114 let

116 let

115 nlen = withKnownNat n $ natVal n

117 nlen = withKnownNat n $ natVal n

@@ -147,11 +149,11 @@ validateNumberConstraint (JSONPath path) num = \case

147 unless predicate warn

149 unless predicate warn

148

150

149validateArrayConstraint

151validateArrayConstraint

150− :: JSONPath

152+ :: JSONPathText

151 -> V.Vector a

153 -> V.Vector a

152 -> Sing (tcs :: ArrayConstraint)

154 -> Sing (tcs :: ArrayConstraint)

153 -> Validation ()

155 -> Validation ()

154−validateArrayConstraint (JSONPath path) v = \case

156+validateArrayConstraint (JSONPathText path) v = \case

155 SAEq n -> do

157 SAEq n -> do

156 let

158 let

157 nlen = withKnownNat n $ natVal n

159 nlen = withKnownNat n $ natVal n

@@ -159,10 +161,38 @@ validateArrayConstraint (JSONPath path) v = \case

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

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

160 warn = vWarning $ mmSingleton path (pure errMsg)

162 warn = vWarning $ mmSingleton path (pure errMsg)

161 unless predicate warn

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)

190+ warn = vWarning $ mmSingleton path (pure errMsg)

191+ unless predicate warn

162

192

163validateJsonRepr

193validateJsonRepr

164 :: Sing schema

194 :: Sing schema

165− -> [DemotedPathSegment]

195+ -> JSONPath

166 -> JsonRepr schema

196 -> JsonRepr schema

167 -> Validation ()

197 -> Validation ()

168validateJsonRepr sschema dpath jr = case jr of

198validateJsonRepr sschema dpath jr = case jr of

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

196 process cs

226 process cs

197 process acs

227 process acs

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

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

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

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

200 validateJsonRepr s newPath jr'

230 validateJsonRepr s newPath jr'

201 ReprOptional d -> case sschema of

231 ReprOptional d -> case sschema of

202 SSchemaOptional ss -> case d of

232 SSchemaOptional ss -> case d of

@@ -208,17 +238,49 @@ validateJsonRepr sschema dpath jr = case jr of

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

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

209 go RNil = pure ()

239 go RNil = pure ()

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

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

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

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

212 validateJsonRepr (knownFieldSchema f) newPath d

242 validateJsonRepr (knownFieldSchema f) newPath d

213 go ftl

243 go ftl

244+ ReprUnion _ -> pure () -- FIXME

214− ReprUnion ru -> case sschema of

245+ -- case sschema of

215− SSchemaUnion su -> validateUnion su ru

246+ -- SSchemaUnion ss -> case ss of

216− where

247+ -- SCons s stl -> case umatch' s u of

217− validateUnion :: Sing us -> Union JsonRepr us -> Validation ()

248+ -- Nothing -> case urestrict u of

218− validateUnion ss r = case (ss,r) of

249+ -- Nothing ->

219− (SCons s _, This v) -> validateJsonRepr s dpath v

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

220− (SCons _ stl, That r') -> validateUnion stl r'

251+ -- Just x -> do

221− (SNil,_) -> fail "Invalid union. Please report this as a bug"

252+ -- let

253+ -- JSONPathText path = demotedPathToText dpath

254+ -- case stl of

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

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

257+ -- SCons s' stl' ->

258+ -- validateJsonRepr (SSchemaUnion (SCons s' stl')) dpath

259+ -- $ toUnion (SCons s' stl') x

260+ -- Just x -> validateJsonRepr s dpath x

261+

262+-- subUnion

263+-- :: Sing (s ': stl)

264+-- -> ( USubset stl (s ': stl) (RImage stl (s ': stl))

265+-- => Union f (s ': stl)

266+-- -> Maybe (Union f stl) )

267+-- subUnion (SCons s stl) = urestrict

268+

269+-- withUSubset

270+-- :: Sing (s ': stl)

271+-- -> (USubset stl (s ': stl) (RImage stl (s ': stl)) => Maybe (Union f stl))

272+-- -> Maybe (Union f stl)

273+-- withUSubset (SCons s stl) r = r

274+

275+toUnion

276+ :: USubset s' (s ': ss) (RImage s' (s ': ss))

277+ => Sing (s ': ss)

278+ -> Union JsonRepr s'

279+ -> JsonRepr ('SchemaUnion (s ': ss))

280+toUnion _ = ReprUnion . urelax

281+

282+umatch' :: UElem a as i => Sing a -> Union f as -> Maybe (f a)

283+umatch' _ u = umatch u

222

284

223parseAndValidateJson

285parseAndValidateJson

224 :: forall schema

286 :: forall schema

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-13.7.yamldeleted−5

@@ -1,5 +0,0 @@

1−resolver: lts-13.7

2−extra-deps:

3− - hjsonpointer-1.4.0@rev:0

4− - hjsonschema-1.9.0@rev:0

5− - validationt-0.2.1.0

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/HelpersSpec.hs+4−4

@@ -1,17 +1,17 @@

1{-# OPTIONS_GHC -Wno-unticked-promoted-constructors #-}

2

3−{-# LANGUAGE LambdaCase #-}

3+{-# LANGUAGE LambdaCase #-}

4

5−{-# LANGUAGE DataKinds #-}

5+{-# LANGUAGE DataKinds #-}

6+{-# LANGUAGE TypeApplications #-}

6{-# LANGUAGE OverloadedStrings #-}

7{-# LANGUAGE OverloadedStrings #-}

7−{-# LANGUAGE TypeApplications #-}

8

9module HelpersSpec (spec, main) where

10

11import Control.Lens

12import Data.ByteString.Lazy.Lens

13import Data.Foldable

14−import Data.Monoid ((<>))

14+import Data.Monoid

15import Data.Schematic

16import Data.Text as T

17import Data.Text.Lens

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

33

34

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

41

99

42main :: IO ()

100main :: IO ()

43main = hspec spec

101main = hspec spec

test/LensSpec.hs+5−3

@@ -1,11 +1,12 @@

1−{-# LANGUAGE DataKinds #-}

1+{-# LANGUAGE DataKinds #-}

2+{-# LANGUAGE TypeApplications #-}

2−{-# LANGUAGE OverloadedLists #-}

3+{-# LANGUAGE OverloadedLists #-}

3{-# LANGUAGE OverloadedStrings #-}

4{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TypeApplications #-}

5

6module LensSpec (spec, main) where

7

8import Control.Lens

9+import Data.Proxy

9import Data.Schematic

10import Data.Schematic

10import Data.Vinyl

11import Data.Vinyl

11import Test.Hspec

12import Test.Hspec

@@ -300,6 +301,7 @@ spec :: Spec

300spec = do

301spec = do

301 let

302 let

302 newFooVal = FieldRepr $ ReprArray [ReprNumber 15]

303 newFooVal = FieldRepr $ ReprArray [ReprNumber 15]

304+ fooProxy = Proxy @"foo"

303 it "gets the field from an object" $ do

305 it "gets the field from an object" $ do

304 fget @"foo" objectData `shouldBe` arrayField

306 fget @"foo" objectData `shouldBe` arrayField

305 it "sets the object field" $ do

307 it "sets the object field" $ do

test/SchemaSpec.hs+15−23

@@ -1,28 +1,33 @@

1−{-# OPTIONS_GHC -fno-warn-unused-top-binds #-}

2{-# OPTIONS_GHC -fprint-potential-instances #-}

1{-# OPTIONS_GHC -fprint-potential-instances #-}

3

2

4−{-# LANGUAGE DataKinds #-}

3+{-# LANGUAGE DataKinds #-}

5−{-# LANGUAGE FlexibleContexts #-}

4+{-# LANGUAGE FlexibleContexts #-}

6−{-# LANGUAGE GADTs #-}

5+{-# LANGUAGE GADTs #-}

7−{-# LANGUAGE OverloadedLists #-}

6+{-# LANGUAGE OverloadedLists #-}

8−{-# LANGUAGE OverloadedStrings #-}

7+{-# LANGUAGE OverloadedStrings #-}

9−{-# LANGUAGE RankNTypes #-}

8+{-# LANGUAGE RankNTypes #-}

10{-# LANGUAGE ScopedTypeVariables #-}

9{-# LANGUAGE ScopedTypeVariables #-}

11−{-# LANGUAGE TypeApplications #-}

10+{-# LANGUAGE TypeApplications #-}

12

11

13module SchemaSpec (spec, main) where

12module SchemaSpec (spec, main) where

14

13

15import Control.Lens

14import Control.Lens

16import Data.Aeson

15import Data.Aeson

17import Data.ByteString.Lazy

16import Data.ByteString.Lazy

17+import Data.Functor.Identity

18import Data.Proxy

19import Data.Schematic

20+import Data.Schematic.Generator

21+import Data.Singletons

22+import Data.Tagged

20import Data.Vinyl

23import Data.Vinyl

21import Test.Hspec

24import Test.Hspec

22import Test.Hspec.SmallCheck

25import Test.Hspec.SmallCheck

23import Test.SmallCheck as SC

26import Test.SmallCheck as SC

27+import Test.SmallCheck.Drivers as SC

24import Test.SmallCheck.Series as SC

28import Test.SmallCheck.Series as SC

25

29

30+import Debug.Trace

26

31

27type SchemaExample = 'SchemaObject

32type SchemaExample = 'SchemaObject

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

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

@@ -32,13 +37,6 @@ type SchemaExample2 = 'SchemaObject

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

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

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

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

34

39

35−type SchemaExample3 = 'SchemaUnion '[SchemaExample]

36−

37−type SchemaExample4 = 'SchemaObject

38− '[ '("baz3", SchemaExample3)

39− , '("baz1", SchemaExample)]

40−

41−

42jsonExample :: JsonRepr SchemaExample

40jsonExample :: JsonRepr SchemaExample

43jsonExample = withRepr @SchemaExample

41jsonExample = withRepr @SchemaExample

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

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

@@ -47,7 +45,7 @@ jsonExample = withRepr @SchemaExample

47

45

48type AddQuuz =

46type AddQuuz =

49 'Migration "add_field_quuz"

47 'Migration "add_field_quuz"

50− '[ 'Diff '[] ('AddKey "quuz" ('SchemaNumber '[])) ]

48+ '[ 'Diff '[] ('AddKey "quuz" (SchemaNumber '[])) ]

51

49

52type DeleteQuuz =

50type DeleteQuuz =

53 'Migration "remove_field_quuz"

51 'Migration "remove_field_quuz"

@@ -82,12 +80,6 @@ schemaJson = "{\"foo\": [13], \"bar\": null}"

82schemaJson2 :: ByteString

80schemaJson2 :: ByteString

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

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

84

82

85−schemaJson3 :: ByteString

86−schemaJson3 = schemaJson

87−

88−schemaJson4 :: ByteString

89−schemaJson4 = "{\"baz1\": "<>schemaJson<>", \"baz3\": "<>schemaJson3<>"}"

90−

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

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

92schemaJsonSeries = series

84schemaJsonSeries = series

93

85

@@ -101,7 +93,7 @@ spec = do

101 it "decode/encode JsonRepr properly" $

93 it "decode/encode JsonRepr properly" $

102 decode (encode jsonExample) == Just jsonExample

94 decode (encode jsonExample) == Just jsonExample

103 it "validates correct representation" $

95 it "validates correct representation" $

104− ((decodeAndValidateJson schemaJson4) :: ParseResult (JsonRepr SchemaExample4))

96+ ((decodeAndValidateJson schemaJson) :: ParseResult (JsonRepr SchemaExample))

105 `shouldSatisfy` isValid

97 `shouldSatisfy` isValid

106 it "returns decoding error on structurally incorrect input" $

98 it "returns decoding error on structurally incorrect input" $

107 ((decodeAndValidateJson "{}") :: ParseResult (JsonRepr SchemaExample))

99 ((decodeAndValidateJson "{}") :: ParseResult (JsonRepr SchemaExample))