4616560...master · schematic

git.iko.soy/schematic

on master help sign in

ChangeLog.md+2−1

since splitsnapshots

unifiedsplit

@@ -2,7 +2,8 @@

3## 0.5.0.0 -- 2019-02-20

5−GHC 8.6, json generation by schema definition

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

6+parsing error messages.

7## 0.4.3.0 -- 2018-07-12

8## 0.4.3.0 -- 2018-07-12

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+3−2

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

1name: schematic

2version: 0.5.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

@@ -64,7 +65,7 @@ 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 && <4.13

68 , bytestring

69 , bytestring

69 , aeson >= 1

70 , aeson >= 1

70 , containers

71 , containers

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

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/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/Schema.hs+69−3

@@ -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,8 +13,8 @@ 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

15−import Data.Schematic.Instances ()

16import Data.Schematic.Generator

17+import Data.Schematic.Instances ()

17import Data.Scientific

18import Data.Scientific

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

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

19import Data.Singletons.TH

20import Data.Singletons.TH

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

179

180

180data ArrayConstraint

181data ArrayConstraint

181 = AEq Nat

182 = AEq Nat

183+ | AGt Nat

184+ | AGe Nat

185+ | ALt Nat

186+ | ALe Nat

182 deriving (Generic)

187 deriving (Generic)

183

188

184data DemotedArrayConstraint

189data DemotedArrayConstraint

185 = DAEq Integer

190 = DAEq Integer

191+ | DAGt Integer

192+ | DAGe Integer

193+ | DALt Integer

194+ | DALe Integer

186 deriving (Generic, Eq, Show)

195 deriving (Generic, Eq, Show)

187

196

188data instance Sing (ac :: ArrayConstraint) where

197data instance Sing (ac :: ArrayConstraint) where

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

190

203

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

192

209

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

194

215

195instance SingKind ArrayConstraint where

216instance SingKind ArrayConstraint where

196 type Demote ArrayConstraint = DemotedArrayConstraint

217 type Demote ArrayConstraint = DemotedArrayConstraint

197 fromSing = \case

218 fromSing = \case

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

199 toSing = \case

224 toSing = \case

200 DAEq n -> case someNatVal n of

225 DAEq n -> case someNatVal n of

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

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

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

203

240

204data Schema

241data Schema

205 = SchemaText [TextConstraint]

242 = SchemaText [TextConstraint]

@@ -368,17 +405,32 @@ instance Show (JsonRepr ('SchemaText cs)) where

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

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

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

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

370

407

408+instance Show (JsonRepr 'SchemaBoolean) where

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

410+

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

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

372

412

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

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

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

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

375

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

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

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

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

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

425+#endif

378

426

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

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

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

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

381

429

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

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

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

433+

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

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

383 ReprObject a == ReprObject b = a == b

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

384

436

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

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

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

389 ReprNumber a == ReprNumber b = a == b

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

390

442

443+instance Eq (JsonRepr 'SchemaBoolean) where

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

445+

391instance Eq (JsonRepr 'SchemaNull) where

446instance Eq (JsonRepr 'SchemaNull) where

392 ReprNull == ReprNull = True

447 ReprNull == ReprNull = True

393

448

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

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

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

398 ReprOptional a == ReprOptional b = a == b

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

399

454

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

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

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

458+

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

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

401 ReprObject a `compare` ReprObject b = a `compare` b

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

402

461

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

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

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

407 ReprNumber a `compare` ReprNumber b = a `compare` b

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

408

467

468+instance Ord (JsonRepr 'SchemaBoolean) where

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

470+

409instance Ord (JsonRepr 'SchemaNull) where

471instance Ord (JsonRepr 'SchemaNull) where

410 compare _ _ = EQ

472 compare _ _ = EQ

411

473

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

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

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

416 ReprOptional a `compare` ReprOptional b = a `compare` b

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

417

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+

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

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

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

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

420 fromList = ReprArray . GHC.Exts.fromList

486 fromList = ReprArray . GHC.Exts.fromList

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

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

47data ArrayConstraint

48 = AEq Nat

49+ | AGt Nat

50+ | AGe Nat

51+ | ALt Nat

52+ | ALe Nat

50data DemotedArrayConstraint

54data DemotedArrayConstraint

51 = DAEq Integer

55 = DAEq Integer

56+ | DAGt Integer

57+ | DAGe Integer

58+ | DALt Integer

59+ | DALe Integer

53data Schema

61data Schema

54 = SchemaText [TextConstraint]

62 = SchemaText [TextConstraint]

src/Data/Schematic/Validation.hs+41−13

@@ -58,42 +58,42 @@ validateTextConstraint (JSONPath path) t = \case

58 let

59 nlen = withKnownNat n $ natVal n

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

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

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

62 warn = vWarning $ mmSingleton path (pure errMsg)

63 unless predicate warn

64 STLt n -> do

65 let

66 nlen = withKnownNat n $ natVal n

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

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

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

69 warn = vWarning $ mmSingleton path (pure errMsg)

70 unless predicate warn

71 STLe n -> do

72 let

73 nlen = withKnownNat n $ natVal n

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

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

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

76 warn = vWarning $ mmSingleton path (pure errMsg)

77 unless predicate warn

78 STGt n -> do

79 let

80 nlen = withKnownNat n $ natVal n

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

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

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

83 warn = vWarning $ mmSingleton path (pure errMsg)

84 unless predicate warn

85 STGe n -> do

86 let

87 nlen = withKnownNat n $ natVal n

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

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

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

90 warn = vWarning $ mmSingleton path (pure errMsg)

91 unless predicate warn

92 STRegex r -> do

93 let

94 regex = withKnownSymbol r $ fromSing r

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

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

96+ errMsg = "must match " <> regex

97 warn = vWarning $ mmSingleton path (pure errMsg)

98 unless predicate warn

99 STEnum ss -> do

@@ -101,7 +101,7 @@ validateTextConstraint (JSONPath path) t = \case

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

102 matching SNil = False

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

104− errMsg = path <> " must be one of " <> T.pack (show (fromSing ss))

104+ errMsg = "must be one of " <> T.pack (show (fromSing ss))

105 warn = vWarning $ mmSingleton path (pure errMsg)

106 unless (matching ss) warn

107

@@ -115,35 +115,35 @@ validateNumberConstraint (JSONPath path) num = \case

115 let

116 nlen = withKnownNat n $ natVal n

117 predicate = fromIntegral nlen == num

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

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

119 warn = vWarning $ mmSingleton path (pure errMsg)

120 unless predicate warn

121 SNGt n -> do

122 let

123 nlen = withKnownNat n $ natVal n

124 predicate = num > fromIntegral nlen

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

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

126 warn = vWarning $ mmSingleton path (pure errMsg)

127 unless predicate warn

128 SNGe n -> do

129 let

130 nlen = withKnownNat n $ natVal n

131 predicate = num >= fromIntegral nlen

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

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

133 warn = vWarning $ mmSingleton path (pure errMsg)

134 unless predicate warn

135 SNLt n -> do

136 let

137 nlen = withKnownNat n $ natVal n

138 predicate = num < fromIntegral nlen

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

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

140 warn = vWarning $ mmSingleton path (pure errMsg)

141 unless predicate warn

142 SNLe n -> do

143 let

144 nlen = withKnownNat n $ natVal n

145 predicate = num <= fromIntegral nlen

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

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

147 warn = vWarning $ mmSingleton path (pure errMsg)

148 unless predicate warn

149

@@ -157,7 +157,35 @@ validateArrayConstraint (JSONPath path) v = \case

157 let

158 nlen = withKnownNat n $ natVal n

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

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

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

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

162+ unless predicate warn

163+ SAGt n -> do

164+ let

165+ nlen = withKnownNat n $ natVal n

166+ predicate = fromIntegral (V.length v) > nlen

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

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

169+ unless predicate warn

170+ SAGe n -> do

171+ let

172+ nlen = withKnownNat n $ natVal n

173+ predicate = fromIntegral (V.length v) >= nlen

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

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

176+ unless predicate warn

177+ SALt n -> do

178+ let

179+ nlen = withKnownNat n $ natVal n

180+ predicate = fromIntegral (V.length v) < nlen

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

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

183+ unless predicate warn

184+ SALe n -> do

185+ let

186+ nlen = withKnownNat n $ natVal n

187+ predicate = fromIntegral (V.length v) <= nlen

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

161 warn = vWarning $ mmSingleton path (pure errMsg)

189 warn = vWarning $ mmSingleton path (pure errMsg)

162 unless predicate warn

190 unless predicate warn

163

191

stack-13.7.yamlnew file+5

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

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

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