git.iko.soy/typeable/schematic
on master help sign in
swap
7db0b4674 ahead, 0 behind
30 files changed+1424−478
since splitsnapshots
unifiedsplit
.travis.yml+2−2 ChangeLog.md+36 README.md+145−26 release+43 release.nix+32 schematic.cabal+23−37 src/Data/Schematic.hs+18−115 src/Data/Schematic/DSL.hs+92 src/Data/Schematic/Generator.hs+91 src/Data/Schematic/Generator/Regex.hs+76 src/Data/Schematic/Instances.hs+4 src/Data/Schematic/JsonSchema.hs+29−10 src/Data/Schematic/Lens.hs+61−37 src/Data/Schematic/Migration.hs+45−8 src/Data/Schematic/Path.hs+18−32 src/Data/Schematic/Schema.hs+148−60 src/Data/Schematic/Schema.hs-boot+95 src/Data/Schematic/Utils.hs−42 src/Data/Schematic/Validation.hs+87−30 src/Data/Schematic/Verifier.hs+5 src/Data/Schematic/Verifier/Array.hs+14 src/Data/Schematic/Verifier/Common.hs+43 src/Data/Schematic/Verifier/Number.hs+31 src/Data/Schematic/Verifier/Text.hs+121 stack-13.21.yaml+7 stack.yaml+5−50 test/HelpersSpec.hs+6 test/JsonSchemaSpec.hs+68−3 test/LensSpec.hs+9−4 test/SchemaSpec.hs+70−22
.travis.yml+2−2
@@ -1,4 +1,4 @@
1−sudo: false
1+sudo: required
22
33language: c
44
@@ -22,4 +22,4 @@ script:
2222
2323cache:
2424 directories:
25− - $HOME/.stack
25+ - $HOME/.stack
ChangeLog.md+36
@@ -1,5 +1,41 @@
11# Revision history for schematic
22
3+## 0.6.0.0 -- 2021-01-15
4+
5+Added compatability with aeson-1.4.3.0. Since version 1.4.3 the module `Data.Aeson` started exporting `JSONPath`, which was conflicting with our own `JSONPath`. Furthermore, started using `JSONPathElement` from `aeson` instead of `DemotedPathSegment`.
6+
7+## 0.5.1.0 -- 2021-01-15
8+
9+Fix the generation of json schema for numbers.
10+Add array constraints.
11+Fix the generation of text and number constraints.
12+Remove jsonpath from the error message.
13+
14+## 0.5.0.0 -- 2019-02-20
15+
16+GHC 8.6, json generation by schema definition, validation bug fixes, better
17+parsing error messages.
18+
19+## 0.4.3.0 -- 2018-07-12
20+
21+GHC 8.4 support, dropping support for older GHC versions
22+
23+## 0.4.2.0
24+
25+Support ghc-8.4 and drop support for older versions
26+
27+## 0.4.1.0 -- 2017-11-05
28+
29+Convenience isomorphisms: txt, num, opt, bln etc
30+
31+## 0.4.1.0 -- 2017-11-01
32+
33+flens and fget now use type application syntax
34+
35+## 0.4.0.0 -- 2017-10-17
36+
37+Object building DSL, more convenience helpers, MCons simplified with Tagged
38+
339## 0.3.2.0 -- 2017-10-02
440
541Fixed FIndex bug, added bunch of convenience isomorphism, re-exports.
README.md+145−26
@@ -22,9 +22,35 @@ Be aware that library is experimental and subject to change a lot. The current s
2222$ stack install schematic
2323```
2424
25−## Basic Examples
25+## GHC Extensions
26+
27+To use this library without any hassle you should add a few GHC extension
28+either to a module or a cabal file:
2629
2730```
31+DataKinds
32+OverloadedLists
33+OverloadedStrings
34+TypeApplications
35+```
36+
37+`Overloaded`-extensions are being used only by `field` combinator,
38+so if you don't use it - feel free to disable it.
39+
40+## GHC Options
41+
42+I recommend using `{-# OPTIONS_GHC -fno-warn-unticked-promoted-constructors #-}`
43+pragma in modules which declare schemas and schema migrations, because `schematic`
44+heavily uses promoted types which should be prefixed with "`" signs and they can
45+be dropped with this option, making it less noisy visually.
46+It's entirely optional and totally opinionated, so feel free to ignore this.
47+Through the documentation, the code is written without any explicit ticks for
48+the same reason.
49+Notice that they're still needed for type-level lists and tuples in schematic code.
50+
51+## Basic Examples
52+
53+```haskell
2854type SchemaExample
2955 = SchemaObject
3056 '[ '("foo", SchemaArray '[AEq 1] (SchemaNumber '[NGt 10]))
@@ -42,21 +68,21 @@ type SchemaExample
4268
4369This one is valid for example
4470
45−```
71+```haskell
4672schemaJson :: ByteString
4773schemaJson = "{\"foo\": [13], \"bar\": null}"
4874```
4975
5076Also valid
5177
52−```
78+```haskell
5379schemaJson :: ByteString
5480schemaJson = "{\"foo\": [13], \"bar\": \"bar\"}"
5581```
5682
5783it can be parsed and validated like this:
5884
59−```
85+```haskell
6086decodeAndValidateJson schemaJson :: ParseResult (JsonRepr SchemaExample)
6187```
6288
@@ -66,24 +92,64 @@ decodeAndValidateJson schemaJson :: ParseResult (JsonRepr SchemaExample)
6692* some of the runtime validations have failed, but it's structurally correct
6793 overall
6894
69−It implies a transport layer representation of that data that can be traversed and transformed to whatever internal types user has. It's called `JsonRepr`. Type parameter is the schema itself.
95+It implies a transport layer representation of that data that can be traversed
96+and transformed to whatever internal types user has.
97+It's called `JsonRepr`. Type parameter is the schema itself.
98+
99+```haskell
100+jsonExample :: JsonRepr SchemaExample
101+jsonExample = withRepr @SchemaExample
102+ $ field @"foo" [12]
103+ :& field @"bar" (Just "bar")
104+ :& RNil
105+```
70106
107+The most basic and sugar-free way of constructing the same object will look like this:
71108
72109```
73−jsonExample :: JsonRepr SchemaExample
74−jsonExample = ReprObject $
110+jsonExample' :: JsonRepr SchemaExample
111+jsonExample' = ReprObject $
75112 FieldRepr (ReprArray [ReprNumber 12])
76113 :& FieldRepr (ReprOptional (Just (ReprText "bar")))
77114 :& RNil
78115```
79116
117+## Lens-compatibility
118+
119+It's possible to use `flens` to construct a field lens for a typed object in schematic. Let's suppose you have a schema like this:
120+
121+```haskell
122+type ArraySchema = SchemaArray '[AEq 1] (SchemaNumber '[NGt 10])
123+
124+type ArrayField = '("foo", ArraySchema)
125+
126+type FieldsSchema =
127+ '[ ArrayField, '("bar", SchemaOptional (SchemaText '[TEnum '["foo", "bar"]]))]
128+
129+type SchemaExample = 'SchemaObject FieldsSchema
130+
131+```
132+
133+There are two ways of working with named fields in the objects:
134+
135+* Using the `fget` and `fset` functions: `fget @"foo" (fput newFooVal objectData) == newFooVal`
136+* Using the lens library: `set (flens @"foo") newFooVal objectData ^. flens @"foo" == newFooVal`
137+
80138## Migrations
81139
82−It's possible to represent schema changes as a series of migrations, which describes a series of json-path/change pairs. Migrations can be applied in succession.
140+Usually migrations are implicit and hard to deal with, `schematic` deals with it
141+by giving tools to deal with it to a programmer, being as explicit as possible,
142+notifying the developer of a missing transition with a compile-time error.
143+It allows to build versioned HTTP APIs or migrate data from the older versions
144+when reading from the JSON storages.
145+
146+It's possible to represent schema changes as a series of migrations,
147+which describes a series of json-path/change pairs. Migrations can be applied in
148+succession.
83149
84150This piece of code will apply a migration to the schema, decode and validate the latest version.
85151
86−```
152+```haskell
87153type SchemaExample
88154 = SchemaObject
89155 '[ '("foo", SchemaArray '[AEq 1] (SchemaNumber '[NGt 10]))
@@ -91,8 +157,8 @@ type SchemaExample
91157
92158type TestMigration =
93159 'Migration "test_revision"
94− '[ 'Diff '[ 'PKey "bar" ] ('Update ('SchemaText '[]))
95− , 'Diff '[ 'PKey "foo" ] ('Update ('SchemaNumber '[])) ]
160+ '[ Diff '[ PKey "bar" ] (Update (SchemaText '[]))
161+ , Diff '[ PKey "foo" ] (Update (SchemaNumber '[])) ]
96162
97163type VS = 'Versioned SchemaExample '[ TestMigration ]
98164
@@ -106,31 +172,84 @@ It's possible to decode the latest version like this:
106172decodeAndValidateJson schemaJsonTopVersion :: ParseResult (JsonRepr (TopVersion (AllVersions VS)))
107173```
108174
109−## Lens-compatibility
175+It's important to differentiate between schema migrations and data migrations.
176+Schema migration is a change of a schema acceptable by a JSON consumer. It transforms one schema to another.
177+Data migrations on the other hand are functions on the data itself. They transform values
178+acceptable by one schema to values acceptable by another.
179+Let's look at the situation when we have to add a field to a JSON Object of a current schema:
110180
111−It's possible to use `flens` to construct a field lens for a typed object in schematic. Let's suppose you have a schema like this:
181+```haskell
182+type SchemaExample = 'SchemaObject
183+ '[ '("foo", 'SchemaArray '[ 'AEq 1] ('SchemaNumber '[ 'NGt 10]))
184+ , '("bar", 'SchemaOptional ('SchemaText '[ 'TEnum '["foo", "bar"]]))]
112185
113−```
114−type ArraySchema = 'SchemaArray '[AEq 1] ('SchemaNumber '[NGt 10])
186+jsonExample :: JsonRepr SchemaExample
187+jsonExample = withRepr @SchemaExample
188+ $ field @"bar" (Just "bar")
189+ :& field @"foo" [12]
190+ :& RNil
115191
116−type ArrayField = '("foo", ArraySchema)
192+type AddQuuz =
193+ 'Migration "add_field_quuz"
194+ '[ 'Diff '[] ('AddKey "quuz" (SchemaNumber '[])) ]
117195
118−type FieldsSchema =
119− '[ ArrayField, '("bar", 'SchemaOptional ('SchemaText '[TEnum '["foo", "bar"]]))]
196+type DeleteQuuz =
197+ 'Migration "remove_field_quuz"
198+ '[ 'Diff '[] ( 'DeleteKey "quuz") ]
120199
121−type SchemaExample = 'SchemaObject FieldsSchema
200+type Migrations = '[ AddQuuz
201+ , DeleteQuuz ]
202+
203+type VersionedJson = 'Versioned SchemaExample Migrations
204+
205+migrationList :: MigrationList Identity VersionedJson
206+migrationList
207+ = (migrateObject (\r -> Identity $ field @"quuz" 42 :& r))
208+ :&& shrinkObject
209+ :&& MNil
122210
123211```
124212
125−There are two ways of working with named fields in the objects:
213+In this instance `Migrations` is a list of schema migrations and
214+`MigrationList Identity VersionedJson` is a list of data migrations corresponding
215+to the list of schema migrations: `migrateObject (\r -> Identity $ field @"quuz" 42 :& r))`
216+will be used at runtime to transform `JsonRepr SchemaExample` to
217+`JsonRepr (SchemaByRevision "add_quuz" VersionedJson). `Identity` in the type of
218+`MigrationList` is a monad we choose to run our migrations in. If there's need to
219+do database queries or something like that, it can be changed to something more
220+appropriate by a user.
221+`migrateObject` takes a function transforming old fields into new ones, `shrinkObject`
222+allows to shrink the JSON object in case migration only removed fields.
126223
127−* Using the `fget` and `fset` functions: `fget fooProxy (fput newFooVal objectData) == newFooVal`
128−* Using the lens library: `set (flens (Proxy @"foo")) newFooVal objectData ^. flens (Proxy @"foo") == newFooVal`
224+## How do I construct a value of `JsonRepr schema`?
129225
130−## Export to json-schema (draft 4)
226+`JsonRepr schema` is a primary representation of a value serializable/deserializable
227+to JSON, but with a twist. It's guaranteed to correspond a type-level schema,
228+it's a type parameter of a same name.
229+It makes constructing it a little bit more involved, but luckily `schematic`
230+provides a DSL for doing so in a more straightforward fashion. An example would
231+look like this:
131232
233+```haskell
234+type SchemaExample = 'SchemaObject
235+ '[ '("foo", SchemaArray '[ AEq 1] (SchemaNumber '[NGt 10]))
236+ , '("bar", SchemaOptional (SchemaText '[TEnum '["foo", "bar"]]))]
132237
133−## TODO
238+jsonExample = withRepr @SchemaExample
239+ $ field @"bar" (Just "bar")
240+ :& field @"foo" [12]
241+ :& RNil
242+```
243+
244+`@foo` syntax is an explicit type application, which is a feature of GHC 8+, it
245+makes type inference possible without relying on a bunch of `Proxy`s, which
246+makes it syntactically more terse.
247+
248+[GHC Type Applications](https://ghc.haskell.org/trac/ghc/wiki/TypeApplication)
134249
135−* Overall user friendliness
136−* Versioned http endpoints
250+`schematic` provides instances for `OverloadedLists` and `OverloadedStrings`
251+GHC extensions to make use of string and list literals for values in a previous
252+example.
253+
254+
255+## Export to json-schema (draft 4)
releasenew file+43
@@ -0,0 +1,43 @@
1+#!/bin/bash
2+
3+set -o xtrace
4+
5+dist=`stack path --dist-dir --stack-yaml ./stack.yaml 2> /dev/null`
6+
7+rootdir=`pwd`
8+
9+cabalfile=`ls *.cabal`
10+packagename="${cabalfile%%.*}"
11+version=`grep '^version:' schematic.cabal | rev | cut -d" " -f1 | rev`
12+
13+echo -e "\033[1;36mTesting library...\033[0m"
14+stack test 2> /dev/null
15+
16+echo -e "\033[1;36mRunning sdist...\033[0m"
17+cabal sdist
18+
19+echo -e "\033[1;36mGenerating documentation...\033[0m"
20+stack haddock 2> /dev/null
21+
22+if [ "$?" -eq "0" ]; then
23+ echo -e "\033[1;32mUploading package to Hackage...\033[0m"
24+ read -p "Hackage username: " username
25+ read -p "Hackage password: " -s password
26+ echo ""
27+ cabal upload -u $username -p $password dist/$packagename-$version.tar.gz
28+
29+ docdir=`find .stack-work -name "$packagename-$version-docs"`
30+
31+ echo -e "Compressing documentation from \033[1;34m$docdir\033[0m for \033[1;35m$packagename\033[0m-\033[1;33m$version\033[1;30m"
32+ tar -c -v -z --format=ustar -f $docdir.tar.gz $docdir
33+ echo -e "\033[1;32mUploading documentation to Hackage...\033[0m"
34+ cd $docdir
35+ cd ..
36+ curl -X PUT -H 'Content-Type: application/x-tar' -H 'Content-Encoding: gzip' --data-binary "$packagename-$version-docs.tar.gz" "https://$username:$password@hackage.haskell.org/package/$packagename-$version/candidate/docs"
37+ open "https://hackage.haskell.org/package/$packagename-$version/candidate/"
38+ cd $rootdir
39+ echo "To publish the candidate, use 'cabal upload --publish'."
40+ exit $?
41+else
42+ echo -e "\033[1;31mNot in a stack-powered project\033[0m"
43+fi
release.nixnew file+32
@@ -0,0 +1,32 @@
1+{ schematicSrc ? { outPath = ./.; revCount = 0; gitTag = "dirty"; }
2+, supportedSystems ? [ "x86_64-linux" ]
3+}:
4+
5+let
6+ _nixpkgs = import <nixpkgs> {};
7+ inherit (_nixpkgs) pkgs lib;
8+
9+ stackageOverlayPath = pkgs.fetchFromGitHub {
10+ owner = "typeable";
11+ repo = "nixpkgs-stackage";
12+ rev = "abe0a03ba2bde609b0707ce45301ec836cb3ed29";
13+ sha256 = "0ksdk83zbsgvs30izwsfyjh4xxwz8dsn9a5igrs3pjap4whpzqfv";
14+ };
15+
16+ nixpkgsArgs = {
17+ overlays = [ (import stackageOverlayPath) ];
18+ };
19+
20+ release = import <nixpkgs/pkgs/top-level/release-lib.nix> { inherit nixpkgsArgs supportedSystems; };
21+
22+ mkStackage = system:
23+ let
24+ nixpkgs = release.pkgsFor system;
25+ stackage = nixpkgs.haskell.packages.stackage.lib.callStackage2nix "schematic" schematicSrc { inherit nixpkgs; };
26+ in
27+ stackage;
28+
29+in
30+ lib.genAttrs supportedSystems (system: {
31+ inherit (mkStackage system) schematic;
32+ })
schematic.cabal+23−37
@@ -1,6 +1,7 @@
11name: schematic
2−version: 0.3.2.0
2+version: 0.6.0.0
33synopsis: JSON-biased spec and validation tool
4+description: JSON-biased spec and validation tool. Makes possible to have a schema as a haskell type and derive json instances, validation actions, JSON generation for property-test generically. Built-in lens support.
45license: BSD3
56license-file: LICENSE
67author: Denis Redozubov
@@ -9,11 +10,14 @@ homepage: http://github.com/typeable/schematic
910Bug-reports: http://github.com/typeable/schematic/issues/
1011category: Data
1112build-type: Simple
12−extra-source-files: ChangeLog.md
13+extra-source-files: ChangeLog.md, README.md
1314cabal-version: >=1.10
1415
1516library
1617 exposed-modules: Data.Schematic
18+ , Data.Schematic.DSL
19+ , Data.Schematic.Generator
20+ , Data.Schematic.Generator.Regex
1721 , Data.Schematic.Instances
1822 , Data.Schematic.JsonSchema
1923 , Data.Schematic.Helpers
@@ -22,7 +26,11 @@ library
2226 , Data.Schematic.Path
2327 , Data.Schematic.Schema
2428 , Data.Schematic.Validation
25− , Data.Schematic.Utils
29+ , Data.Schematic.Verifier
30+ , Data.Schematic.Verifier.Array
31+ , Data.Schematic.Verifier.Common
32+ , Data.Schematic.Verifier.Number
33+ , Data.Schematic.Verifier.Text
2634 ghc-options: -Wall
2735 default-extensions: ConstraintKinds
2836 , DataKinds
@@ -57,9 +65,9 @@ library
5765 , TypeOperators
5866 , TypeSynonymInstances
5967 , UndecidableInstances
60− build-depends: base >=4.9 && <4.11
68+ build-depends: base >=4.11 && <5
6169 , bytestring
62− , aeson >= 1
70+ , aeson >= 1.4.3.0 && < 1.6
6371 , containers
6472 , hjsonschema
6573 , mtl
@@ -67,13 +75,14 @@ library
6775 , regex-tdfa
6876 , regex-tdfa-text
6977 , scientific
70− , singletons >= 2.2
78+ , singletons >= 2.4
7179 , smallcheck
7280 , tagged
81+ , template-haskell
7382 , text
7483 , union
7584 , unordered-containers
76− , validationt >= 0.1.0.1
85+ , validationt >= 0.2.1.0
7786 , vector
7887 , vinyl
7988 hs-source-dirs: src
@@ -84,36 +93,9 @@ test-suite spec
8493 hs-source-dirs: test
8594 main-is: Spec.hs
8695 default-language: Haskell2010
87− default-extensions: ConstraintKinds
88− , DataKinds
89− , DeriveFunctor
90− , DeriveFoldable
91− , DeriveGeneric
92− , DeriveDataTypeable
93− , FlexibleContexts
94− , FlexibleInstances
95− , FunctionalDependencies
96− , GADTs
97− , KindSignatures
98− , InstanceSigs
99− , LambdaCase
100− , MultiParamTypeClasses
101− , OverloadedLists
102− , OverloadedStrings
103− , PolyKinds
104− , QuasiQuotes
105− , PartialTypeSignatures
106− , RecordWildCards
107− , ScopedTypeVariables
108− , TemplateHaskell
109− , TypeApplications
110− , TypeFamilies
111− , TypeInType
112− , TypeOperators
113− , TypeSynonymInstances
11496 build-depends: HUnit
11597 , aeson >= 1
116− , base >=4.9 && <4.11
98+ , base >=4.11 && <4.13
11799 , bytestring
118100 , containers
119101 , hjsonschema
@@ -130,9 +112,13 @@ test-suite spec
130112 , tagged
131113 , text
132114 , unordered-containers
133− , validationt >= 0.1.0.1
115+ , validationt >= 0.2.1.0
134116 , vinyl
135117 other-modules: SchemaSpec
136118 , HelpersSpec
137119 , LensSpec
138− , JsonSchemaSpec
120+ , JsonSchemaSpec
121+
122+source-repository head
123+ type: git
124+ location: https://github.com/typeable/schematic
src/Data/Schematic.hs+18−115
@@ -7,7 +7,6 @@ module Data.Schematic
77 , module Data.Schematic.Lens
88 , module Data.Schematic.Migration
99 , module Data.Schematic.Schema
10− , module Data.Schematic.Utils
1110 , decodeAndValidateJson
1211 , parseAndValidateJson
1312 , parseAndValidateJsonBy
@@ -21,56 +20,25 @@ module Data.Schematic
2120 , ParseResult(..)
2221 , withRepr
2322 , field
24− , (<:&>)
2523 ) where
2624
27−import Control.Applicative
28−import Control.Monad.Validation
29−import Data.Aeson as J
30−import Data.Aeson.Types as J
31−import Data.ByteString.Lazy as BL
32−import Data.Functor.Identity
33−import Data.Kind
34−import Data.Schematic.Helpers
35−import Data.Schematic.JsonSchema
36−import Data.Schematic.Lens
37−import Data.Schematic.Migration
38−import Data.Schematic.Schema
39−import Data.Schematic.Utils
40−import Data.Schematic.Validation
41−import Data.Scientific
42−import Data.Singletons.Prelude
43−import Data.Singletons.TypeLits
44−import Data.Tagged
45−import Data.Text as T
46−import Data.Union
47−import qualified Data.Vector as V
48−import Data.Vinyl
25+import Control.Monad.Validation
26+import Data.Aeson as J
27+import Data.Aeson.Types as J
28+import Data.ByteString.Lazy as BL
29+import Data.Functor.Identity as F
30+import Data.Schematic.DSL
31+import Data.Schematic.Helpers
32+import Data.Schematic.JsonSchema
33+import Data.Schematic.Lens
34+import Data.Schematic.Migration
35+import Data.Schematic.Schema
36+import Data.Schematic.Validation
37+import Data.Singletons.Prelude hiding ((:.))
38+import Data.Tagged
39+import Data.Text as T
4940
5041
51−parseAndValidateJson
52− :: forall schema
53− . (J.FromJSON (JsonRepr schema), TopLevel schema, SingI schema)
54− => J.Value
55− -> ParseResult (JsonRepr schema)
56−parseAndValidateJson v =
57− case parseEither parseJSON v of
58− Left s -> DecodingError $ T.pack s
59− Right jsonRepr ->
60− let
61− validate = validateJsonRepr (sing :: Sing schema) [] jsonRepr
62− res = runIdentity . runValidationTEither $ validate
63− in case res of
64− Left em -> ValidationError em
65− Right () -> Valid jsonRepr
66−
67−parseAndValidateJsonBy
68− :: (J.FromJSON (JsonRepr schema), TopLevel schema, SingI schema)
69− => proxy schema
70− -> J.Value
71− -> ParseResult (JsonRepr schema)
72−parseAndValidateJsonBy _ = parseAndValidateJson
73−
7442parseAndValidateTopVersionJson
7543 :: forall proxy (v :: Versioned)
7644 . (SingI (TopVersion (AllVersions v)))
@@ -95,7 +63,8 @@ parseAndValidateWithMList
9563 -> J.Value
9664 -> m (ParseResult (JsonRepr (Head revisions)))
9765parseAndValidateWithMList MNil v = pure $ parseAndValidateJson v
98−parseAndValidateWithMList ((:&&) p f tl) v = case parseAndValidateJsonBy p v of
66+parseAndValidateWithMList (Tagged f :&& tl) v =
67+ case parseAndValidateJsonBy Proxy v of
9968 Valid a -> pure $ Valid a
10069 DecodingError _ -> do
10170 pr <- parseAndValidateWithMList tl v
@@ -115,10 +84,6 @@ decodeAndValidateJson bs = case decode bs of
11584 Nothing -> DecodingError "malformed json"
11685 Just x -> parseAndValidateJson x
11786
118−type family MapSnd (l :: [(a,k)]) = (r :: [k]) where
119− MapSnd '[] = '[]
120− MapSnd ( '(a, b) ': tl) = b ': MapSnd tl
121−
12287decodeAndValidateVersionedWithMList
12388 :: Monad m
12489 => proxy versioned
@@ -131,70 +96,8 @@ decodeAndValidateVersionedWithMList _ mlist bs = case decode bs of
13196
13297decodeAndValidateVersionedWithPureMList
13398 :: proxy versioned
134− -> MList Identity (MapSnd (AllVersions versioned))
99+ -> MList F.Identity (MapSnd (AllVersions versioned))
135100 -> BL.ByteString
136101 -> ParseResult (JsonRepr (Head (MapSnd (AllVersions versioned))))
137102decodeAndValidateVersionedWithPureMList a b c =
138103 runIdentity $ decodeAndValidateVersionedWithMList a b c
139−
140−-- convenience helpers
141−
142−type Constructor a
143− = forall b. FSubset (FieldsOf a) b (FImage (FieldsOf a) b)
144− => Tagged (FieldsOf a) (Rec FieldRepr b)
145− -> JsonRepr ('SchemaObject (FieldsOf a))
146−
147−withRepr :: Constructor a
148−withRepr = ReprObject . unTagged . fmap fcast
149−
150−(<:&>)
151− :: Applicative m
152− => m (FieldRepr fns)
153− -> m (Rec FieldRepr b)
154− -> m (Rec FieldRepr (fns ': b))
155−(<:&>) = liftA2 (:&)
156−
157−infixr 7 <:&>
158−
159−class Representable s where
160− type Repr s :: Type
161− construct :: Sing fn -> Proxy s -> Repr s -> FieldRepr '(fn, s)
162−
163−instance SingI so => Representable ('SchemaObject so) where
164− type Repr ('SchemaObject so) = Rec FieldRepr so
165− construct sfn _ o = withKnownSymbol sfn $ FieldRepr $ ReprObject o
166−
167−instance (SingI cs, SingI sa) => Representable ('SchemaArray cs sa) where
168− type Repr ('SchemaArray cs sa) = V.Vector (JsonRepr sa)
169− construct sfn _ a = withKnownSymbol sfn $ FieldRepr $ ReprArray a
170−
171−instance SingI cs => Representable ('SchemaText cs) where
172− type Repr ('SchemaText cs) = Text
173− construct sfn _ t = withKnownSymbol sfn $ FieldRepr $ ReprText t
174−
175−instance SingI cs => Representable ('SchemaNumber cs) where
176− type Repr ('SchemaNumber cs) = Scientific
177− construct sfn _ n = withKnownSymbol sfn $ FieldRepr $ ReprNumber n
178−
179−instance Representable 'SchemaBoolean where
180− type Repr 'SchemaBoolean = Bool
181− construct sfn _ b = withKnownSymbol sfn $ FieldRepr $ ReprBoolean b
182−
183−instance SingI so => Representable ('SchemaOptional so) where
184− type Repr ('SchemaOptional so) = Maybe (JsonRepr so)
185− construct sfn _ o = withKnownSymbol sfn $ FieldRepr $ ReprOptional o
186−
187−instance SingI (h ': tl) => Representable ('SchemaUnion (h ': tl)) where
188− type Repr ('SchemaUnion (h ': tl)) = Union JsonRepr (h ': tl)
189− construct sfn _ u = withKnownSymbol sfn $ FieldRepr $ ReprUnion u
190−
191−type family FieldsOf (s :: Schema) :: [(Symbol, Schema)] where
192− FieldsOf ('SchemaObject fs) = fs
193−
194−type FieldConstructor fn =
195− forall fs. (Representable (ByField fn fs (FIndex fn fs)))
196− => Repr (ByField fn fs (FIndex fn fs))
197− -> Tagged fs (FieldRepr '(fn, (ByField fn fs (FIndex fn fs))))
198−
199−field :: forall fn. KnownSymbol fn => FieldConstructor fn
200−field = Tagged . construct (sing :: Sing fn) Proxy
src/Data/Schematic/DSL.hsnew file+92
@@ -0,0 +1,92 @@
1+{-# LANGUAGE AllowAmbiguousTypes #-}
2+{-# LANGUAGE CPP #-}
3+
4+module Data.Schematic.DSL where
5+
6+import Data.Kind
7+import Data.Schematic.Lens
8+import Data.Schematic.Schema
9+import Data.Scientific
10+import Data.Singletons
11+import Data.Singletons.Prelude hiding ((:.))
12+import Data.Singletons.TypeLits
13+import Data.Tagged
14+import Data.Text as T
15+import Data.Union
16+import qualified Data.Vector as V
17+import Data.Vinyl
18+import Data.Vinyl.Functor
19+
20+
21+#if MIN_VERSION_base(4,12,0)
22+type Constructor a
23+ = forall fields b
24+ . (fields ~ FieldsOf a, FSubset fields b (FImage fields b), RMap fields)
25+ => Rec (Tagged fields :. FieldRepr) b
26+ -> JsonRepr ('SchemaObject fields)
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
34+withRepr :: Constructor a
35+withRepr = ReprObject . rmap (unTagged . getCompose) . fcast
36+
37+class Representable s where
38+ constructField :: Sing fn -> Proxy s -> Repr s -> FieldRepr '(fn, s)
39+
40+instance SingI so => Representable ('SchemaObject so) where
41+ constructField sfn _ o = withKnownSymbol sfn $ FieldRepr $ ReprObject o
42+
43+instance (SingI cs, SingI sa) => Representable ('SchemaArray cs sa) where
44+ constructField sfn _ a = withKnownSymbol sfn $ FieldRepr $ ReprArray a
45+
46+instance SingI cs => Representable ('SchemaText cs) where
47+ constructField sfn _ t = withKnownSymbol sfn $ FieldRepr $ ReprText t
48+
49+instance SingI cs => Representable ('SchemaNumber cs) where
50+ constructField sfn _ n = withKnownSymbol sfn $ FieldRepr $ ReprNumber n
51+
52+instance Representable 'SchemaBoolean where
53+ constructField sfn _ b = withKnownSymbol sfn $ FieldRepr $ ReprBoolean b
54+
55+instance SingI so => Representable ('SchemaOptional so) where
56+ constructField sfn _ o = withKnownSymbol sfn $ FieldRepr $ ReprOptional o
57+
58+instance SingI (h ': tl) => Representable ('SchemaUnion (h ': tl)) where
59+ constructField sfn _ u = withKnownSymbol sfn $ FieldRepr $ ReprUnion u
60+
61+construct :: Sing s -> Repr s -> JsonRepr s
62+construct s r = case s of
63+ SSchemaObject _ -> ReprObject r
64+ SSchemaArray _ _ -> ReprArray r
65+ SSchemaText _ -> ReprText r
66+ SSchemaNumber _ -> ReprNumber r
67+ SSchemaBoolean -> ReprBoolean r
68+ SSchemaOptional _ -> ReprOptional r
69+ SSchemaNull -> ReprNull
70+ SSchemaUnion ss -> case ss of
71+ SNil -> error "unconstructable union"
72+ SCons _ _ -> ReprUnion r
73+
74+type family FieldsOf (s :: Schema) :: [(Symbol, Schema)] where
75+ FieldsOf ('SchemaObject fs) = fs
76+
77+type FieldConstructor fn =
78+ forall byField fs. (byField ~ ByField fn fs (FIndex fn fs), Representable byField)
79+ => Repr byField
80+ -> (Tagged fs :. FieldRepr) '(fn, byField)
81+
82+field :: forall fn. KnownSymbol fn => FieldConstructor fn
83+field = Compose . Tagged . constructField (sing :: Sing fn) Proxy
84+
85+type family Repr (s :: Schema) = (ty :: Type) where
86+ Repr ('SchemaObject so) = Rec FieldRepr so
87+ Repr ('SchemaArray cs sa) = V.Vector (JsonRepr sa)
88+ Repr ('SchemaText cs) = Text
89+ Repr ('SchemaNumber cs) = Scientific
90+ Repr 'SchemaBoolean = Bool
91+ Repr ('SchemaOptional so) = Maybe (JsonRepr so)
92+ Repr ('SchemaUnion (h ': tl)) = Union JsonRepr (h ': tl)
src/Data/Schematic/Generator.hsnew file+91
@@ -0,0 +1,91 @@
1+module Data.Schematic.Generator where
2+
3+import Data.Maybe
4+import Data.Schematic.Generator.Regex
5+import {-# SOURCE #-} Data.Schematic.Schema
6+import Data.Schematic.Verifier
7+import Data.Scientific
8+import Data.Text (Text, pack)
9+import qualified Data.Vector as V
10+import Test.SmallCheck.Series
11+
12+maxHigh :: Int
13+maxHigh = 30
14+
15+minLow :: Int
16+minLow = 2
17+
18+textLengthSeries :: Monad m => [VerifiedTextConstraint] -> Series m Text
19+textLengthSeries =
20+ \case
21+ [VTEq eq] -> pure $ pack $ take (fromIntegral eq) $ cycle "sample"
22+ [VTBounds ml mh] -> do
23+ let
24+ l = fromMaybe minLow (fromIntegral <$> ml) + 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"
29+
30+textEnumSeries :: Monad m => [Text] -> Series m Text
31+textEnumSeries enum = generate $ \depth -> take depth enum
32+
33+textSeries :: Monad m => [DemotedTextConstraint] -> Series m Text
34+textSeries cs = do
35+ let mvcs = verifyTextConstraints cs
36+ case mvcs of
37+ Just vcs -> do
38+ n <- textSeries' vcs
39+ pure n
40+ Nothing -> pure "error"
41+
42+textSeries' :: Monad m => [VerifiedTextConstraint] -> Series m Text
43+textSeries' [] = pure "sample"
44+textSeries' vcs = do
45+ let enums = listToMaybe [x | VTEnum x <- vcs]
46+ case enums of
47+ Just e -> textEnumSeries e
48+ Nothing -> do
49+ let regexps = listToMaybe [x | VTRegex x _ _ <- vcs]
50+ case regexps of
51+ Just e -> regexSeries e
52+ Nothing -> textLengthSeries vcs
53+
54+numberSeries :: Monad m => [DemotedNumberConstraint] -> Series m Scientific
55+numberSeries cs = do
56+ let mvcs = verifyNumberConstraints cs
57+ case mvcs of
58+ Just vcs -> do
59+ n <- numberSeries' vcs
60+ pure $ n
61+ Nothing -> pure 0
62+
63+numberSeries' :: Monad m => VerifiedNumberConstraint -> Series m Scientific
64+numberSeries' =
65+ \case
66+ VNEq eq -> pure $ fromIntegral eq
67+ VNBounds ml mh -> do
68+ let l = fromMaybe minLow (fromIntegral <$> ml) + 1
69+ h = fromMaybe maxHigh (fromIntegral <$> mh) - 1
70+ n <- generate $ \depth -> take depth [l .. h]
71+ pure $ fromIntegral n
72+
73+arraySeries
74+ :: (Monad m, Serial m (JsonRepr s))
75+ => [DemotedArrayConstraint]
76+ -> Series m (V.Vector (JsonRepr s))
77+arraySeries cs = do
78+ let mvcs = verifyArrayConstraint cs
79+ case mvcs of
80+ Just vcs -> arraySeries' vcs
81+ Nothing -> pure V.empty
82+
83+arraySeries'
84+ :: forall m s. (Monad m, Serial m (JsonRepr s))
85+ => Maybe VerifiedArrayConstraint
86+ -> Series m (V.Vector (JsonRepr s))
87+arraySeries' ml = do
88+ objs <- V.replicateM (maybe minRepeat f ml) (series :: Series m (JsonRepr s))
89+ pure $ objs
90+ where
91+ f (VAEq l) = fromIntegral l
src/Data/Schematic/Generator/Regex.hsnew file+76
@@ -0,0 +1,76 @@
1+module Data.Schematic.Generator.Regex where
2+
3+import Control.Monad
4+import Data.List
5+import Data.Maybe
6+import qualified Data.Set as S
7+import Data.Text (Text, unpack)
8+import Data.Text.Lazy (toStrict)
9+import Data.Text.Lazy.Builder (Builder, singleton, toLazyText)
10+import Test.SmallCheck.Series
11+import Text.Regex.TDFA.Pattern
12+import Text.Regex.TDFA.ReadRegex (parseRegex)
13+
14+
15+minRepeat :: Int
16+minRepeat = 2
17+
18+maxRepeat :: Int
19+maxRepeat = 10
20+
21+regexSeries :: (Monad m) => Text -> Series m Text
22+regexSeries regexp =
23+ case parseRegex . unpack $ regexp of
24+ Right (p, _) -> toStrict . toLazyText <$> regexSeries' p
25+ Left _ -> pure ""
26+
27+regexSeries' :: (Monad m) => Pattern -> Series m Builder
28+regexSeries' pt =
29+ case pt of
30+ PEmpty -> pure mempty
31+ PChar {..} -> pure $ singleton getPatternChar
32+ PAny {getPatternSet = PatternSet (Just cset) _ _ _} -> do
33+ x <- generate $ \depth -> take depth $ S.toList cset
34+ pure $ singleton x
35+ PAnyNot {getPatternSet = PatternSet (Just cset) _ _ _} -> do
36+ x <-
37+ generate $ \depth ->
38+ take depth $ notChars $ concatMap expandEscape $ S.toList cset
39+ pure $ singleton x
40+ PQuest p -> regexSeries' p \/ pure mempty
41+ PPlus p -> regexSeries' $ PBound 1 Nothing p
42+ PStar _ p -> regexSeries' $ PBound 0 Nothing p
43+ PBound low mhigh p -> do
44+ let high = fromMaybe (low + maxRepeat) mhigh
45+ n <- generate $ \depth -> take depth [low .. high]
46+ decDepth $ do
47+ ps <- replicateM n $ regexSeries' p
48+ pure $ mconcat ps
49+ PConcat ps -> mconcat <$> mapM regexSeries' ps
50+ POr xs -> regexSeries' =<< (generate $ \depth -> take depth xs)
51+ PDot _ -> do
52+ x <- generate $ \depth -> take depth $ notChars []
53+ pure $ singleton x
54+ PEscape {..} -> do
55+ x <- generate $ \depth -> take depth $ expandEscape getPatternChar
56+ pure $ singleton x
57+ PCarat _ -> pure mempty
58+ PDollar _ -> pure mempty
59+ _ -> pure mempty
60+ where
61+ notChars = ([' ' .. '~'] \\)
62+ expandEscape ch =
63+ case ch of
64+ 'n' -> "\n"
65+ 't' -> "\t"
66+ 'r' -> "\r"
67+ 'f' -> "\f"
68+ 'a' -> "\a"
69+ 'e' -> "\ESC"
70+ 'd' -> ['0' .. '9']
71+ 'w' -> ['0' .. '9'] ++ '_' : ['a' .. 'z'] ++ ['A' .. 'Z']
72+ 's' -> "\9\32"
73+ 'D' -> notChars $ ['0' .. '9']
74+ 'W' -> notChars $ ['0' .. '9'] ++ '_' : ['a' .. 'z'] ++ ['A' .. 'Z']
75+ 'S' -> notChars "\9\32"
76+ ch' -> [ch']
src/Data/Schematic/Instances.hs+4
@@ -4,6 +4,7 @@
44module Data.Schematic.Instances where
55
66import Data.Scientific
7+import Data.Text (Text, pack)
78import Data.Vector as V
89import Data.Vinyl
910import Test.SmallCheck.Series
@@ -21,3 +22,6 @@ instance Serial m a => Serial m (V.Vector a) where
2122
2223instance Monad m => Serial m Scientific where
2324 series = scientific <$> series <*> series
25+
26+instance Monad m => Serial m Text where
27+ series = pack <$> series
src/Data/Schematic/JsonSchema.hs+29−10
@@ -12,8 +12,10 @@ import Control.Monad.State.Strict
1212import Data.Aeson as J
1313import Data.Foldable as F
1414import Data.HashMap.Strict as H
15+import Data.List as L
1516import Data.List.NonEmpty as NE
1617import Data.Schematic.Schema as S
18+import Data.Set as Set
1719import Data.Singletons
1820import Data.Text
1921import Data.Traversable
@@ -28,13 +30,13 @@ textConstraint :: DemotedTextConstraint -> State D4.Schema ()
2830textConstraint (DTEq n) = modify $ \s -> s
2931 { _schemaMinLength = pure $ fromIntegral n
3032 , _schemaMaxLength = pure $ fromIntegral n }
31−textConstraint (DTLt n) = modify $ \s -> s
32− { _schemaMaxLength = pure . fromIntegral $ n + 1 }
3333textConstraint (DTLe n) = modify $ \s -> s
3434 { _schemaMaxLength = pure . fromIntegral $ n }
35−textConstraint (DTGt n) =
35+textConstraint (DTLt n) =
3636 let n' = if n == 0 then 0 else n - 1
37− in modify $ \s -> s { _schemaMinLength = pure . fromIntegral $ n' }
37+ in modify $ \s -> s { _schemaMaxLength = pure . fromIntegral $ n' }
38+textConstraint (DTGt n) = modify $ \s -> s
39+ { _schemaMinLength = pure . fromIntegral $ n + 1 }
3840textConstraint (DTGe n) = modify $ \s -> s
3941 { _schemaMinLength = pure . fromIntegral $ n }
4042textConstraint (DTRegex r) = modify $ \s -> s { _schemaPattern = pure r }
@@ -46,18 +48,30 @@ numberConstraint :: DemotedNumberConstraint -> State D4.Schema ()
4648numberConstraint (DNLe n) = modify $ \s -> s
4749 { _schemaMaximum = pure . fromIntegral $ n }
4850numberConstraint (DNLt n) = modify $ \s -> s
49− { _schemaMaximum = pure . fromIntegral $ n + 1 }
51+ { _schemaMaximum = pure . fromIntegral $ n
52+ , _schemaExclusiveMaximum = pure True }
5053numberConstraint (DNGt n) = modify $ \s -> s
54+ { _schemaMinimum = pure . fromIntegral $ n
55+ , _schemaExclusiveMinimum = pure True }
56+numberConstraint (DNGe n) = modify $ \s -> s
5157 { _schemaMinimum = pure . fromIntegral $ n }
52−numberConstraint (DNGe n) =
53− let n' = if n == 0 then 0 else n - 1
54− in modify $ \s -> s { _schemaMinimum = pure . fromIntegral $ n' }
5558numberConstraint (DNEq n) = modify $ \s -> s
5659 { _schemaMinimum = pure $ fromIntegral n
5760 , _schemaMaximum = pure $ fromIntegral n }
5861
5962arrayConstraint :: DemotedArrayConstraint -> State D4.Schema ()
60−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 }
6175
6276toJsonSchema
6377 :: forall proxy schema
@@ -84,14 +98,19 @@ toJsonSchema' = \case
8498 res <- for objs $ \(n,s) -> do
8599 s' <- toJsonSchema' s
86100 pure (n, s')
101+ let
102+ nonOpt = \case
103+ (_, DSchemaOptional _) -> False
104+ _ -> True
87105 pure $ emptySchema
88106 { _schemaType = pure $ TypeValidatorString D4.SchemaObject
107+ , _schemaRequired = pure $ Set.fromList $ fst <$> L.filter nonOpt objs
89108 , _schemaProperties = pure $ H.fromList res }
90109 DSchemaArray acs sch -> do
91110 res <- toJsonSchema' sch
92111 pure $ execState (traverse_ arrayConstraint acs) $ emptySchema
93112 { _schemaType = pure $ TypeValidatorString D4.SchemaArray
94− , _schemaItems = pure $ ItemsArray [res] }
113+ , _schemaItems = pure $ ItemsObject res }
95114 DSchemaNull -> pure $ emptySchema
96115 { _schemaType = pure $ TypeValidatorString D4.SchemaNull }
97116 DSchemaOptional sch -> do
src/Data/Schematic/Lens.hs+61−37
@@ -9,6 +9,12 @@ module Data.Schematic.Lens
99 , FImage
1010 , FSubset(..)
1111 , obj
12+ , arr
13+ , uni
14+ , txt
15+ , num
16+ , opt
17+ , bln
1218 , textRepr
1319 , numberRepr
1420 , boolRepr
@@ -18,11 +24,11 @@ module Data.Schematic.Lens
1824 ) where
1925
2026import Data.Profunctor
21−import Data.Proxy
2227import Data.Schematic.Schema
2328import Data.Scientific
2429import Data.Singletons
2530import Data.Text
31+import Data.Union
2632import Data.Vector as V
2733import Data.Vinyl
2834import Data.Vinyl.Functor
@@ -35,51 +41,51 @@ type family FIndex (r :: Symbol) (rs :: [(Symbol, Schema)]) :: Nat where
3541 FIndex r ( '(r, s) ': rs) = 'Z
3642 FIndex r ( s ': rs) = 'S (FIndex r rs)
3743
44+type Flens fn f g rs i
45+ = Functor g
46+ => (f '(fn, (ByField fn rs i)) -> g (f '(fn, (ByField fn rs i))))
47+ -> Rec f rs
48+ -> g (Rec f rs)
49+
50+type FGetter fn f rs i = Rec f rs -> f '(fn, (ByField fn rs i))
51+
3852class i ~ FIndex fn rs => FElem (fn :: Symbol) (rs :: [(Symbol, Schema)]) (i :: Nat) where
3953 type ByField fn rs i :: Schema
40− flens
41− :: Functor g
42− => proxy fn
43− -> (FieldRepr '(fn, (ByField fn rs i)) -> g (FieldRepr '(fn, (ByField fn rs i))))
44− -> Rec FieldRepr rs
45− -> g (Rec FieldRepr rs)
54+ flens :: Flens fn f g rs i
4655
4756 -- | For Vinyl users who are not using the @lens@ package, we provide a getter.
48− fget
49− :: proxy fn
50− -> Rec FieldRepr rs
51− -> FieldRepr '(fn, (ByField fn rs i))
57+ fget :: FGetter fn f rs i
5258
5359 -- | For Vinyl users who are not using the @lens@ package, we also provide a
5460 -- setter. In general, it will be unambiguous what field is being written to,
5561 -- and so we do not take a proxy argument here.
5662 fput
57− :: FieldRepr '(fn, ByField fn rs i)
58− -> Rec FieldRepr rs
59− -> Rec FieldRepr rs
63+ :: f '(fn, ByField fn rs i)
64+ -> Rec f rs
65+ -> Rec f rs
6066
6167instance FElem fn ('(fn, r) ': rs) 'Z where
6268 type ByField fn ('(fn, r) ': rs) 'Z = r
6369
64− flens _ f (x :& xs) = fmap (:& xs) (f x)
70+ flens f (x :& xs) = fmap (:& xs) (f x)
6571 {-# INLINE flens #-}
6672
67− fget k = getConst . flens k Const
73+ fget = getConst . flens Const
6874 {-# INLINE fget #-}
6975
70− fput y = getIdentity . flens Proxy (\_ -> Identity y)
76+ fput y = getIdentity . flens (\_ -> Identity y)
7177 {-# INLINE fput #-}
7278
7379instance (FIndex r (s ': rs) ~ 'S i, FElem r rs i) => FElem r (s ': rs) ('S i) where
7480 type ByField r (s ': rs) ('S i) = ByField r rs i
7581
76− flens p f (x :& xs) = fmap (x :&) (flens p f xs)
82+ flens f (x :& xs) = fmap (x :&) (flens f xs)
7783 {-# INLINE flens #-}
7884
79− fget k = getConst . flens k Const
85+ fget = getConst . flens Const
8086 {-# INLINE fget #-}
8187
82− fput y = getIdentity . flens Proxy (\_ -> Identity y)
88+ fput y = getIdentity . flens (\_ -> Identity y)
8389 {-# INLINE fput #-}
8490
8591-- This is an internal convenience helpers stolen from the @lens@ library.
@@ -115,24 +121,24 @@ class is ~ FImage rs ss
115121 -- > fsubset :: Lens' (Rec FieldRepr ss) (Rec FieldRepr rs)
116122 fsubset
117123 :: Functor g
118− => (Rec FieldRepr rs -> g (Rec FieldRepr rs))
119− -> Rec FieldRepr ss
120− -> g (Rec FieldRepr ss)
124+ => (Rec f rs -> g (Rec f rs))
125+ -> Rec f ss
126+ -> g (Rec f ss)
121127
122128 -- | The getter of the 'fsubset' lens is 'fcast', which takes a larger record
123129 -- to a smaller one by forgetting fields.
124130 fcast
125− :: Rec FieldRepr ss
126− -> Rec FieldRepr rs
131+ :: Rec f ss
132+ -> Rec f rs
127133 fcast = getConst . fsubset Const
128134 {-# INLINE fcast #-}
129135
130136 -- | The setter of the 'fsubset' lens is 'freplace', which allows a slice of
131137 -- a record to be replaced with different values.
132138 freplace
133− :: Rec FieldRepr rs
134− -> Rec FieldRepr ss
135− -> Rec FieldRepr ss
139+ :: Rec f rs
140+ -> Rec f ss
141+ -> Rec f ss
136142 freplace rs = getIdentity . fsubset (\_ -> Identity rs)
137143 {-# INLINE freplace #-}
138144
@@ -143,41 +149,59 @@ instance
143149 ( ByField fn ss i ~ s
144150 , FElem fn ss i
145151 , FSubset rs ss is) => FSubset ( '(fn,s) ': rs) ss (i ': is) where
146− fsubset = lens (\ss -> fget Proxy ss :& fcast ss) set
152+ fsubset = lens (\ss -> fget @fn ss :& fcast ss) set
147153 where
148− set :: Rec FieldRepr ss -> Rec FieldRepr ( '(fn,s) ': rs) -> Rec FieldRepr ss
154+ set :: Rec f ss -> Rec f ( '(fn,s) ': rs) -> Rec f ss
149155 set ss (r :& rs) = fput r $ freplace rs ss
150156
151157-- A bunch of @Iso@morphisms
152158textRepr
153− :: (KnownSymbol fn, SingI fn, SingI cs)
159+ :: (KnownSymbol fn, SingI cs)
154160 => Iso' (FieldRepr '(fn, ('SchemaText cs))) Text
155161textRepr = iso (\(FieldRepr (ReprText t)) -> t) (FieldRepr . ReprText)
156162
157163numberRepr
158− :: (KnownSymbol fn, SingI fn, SingI cs)
164+ :: (KnownSymbol fn, SingI cs)
159165 => Iso' (FieldRepr '(fn, ('SchemaNumber cs))) Scientific
160166numberRepr = iso (\(FieldRepr (ReprNumber n)) -> n) (FieldRepr . ReprNumber)
161167
162168boolRepr
163− :: (KnownSymbol fn, SingI fn, SingI cs)
169+ :: (KnownSymbol fn)
164170 => Iso' (FieldRepr '(fn, 'SchemaBoolean)) Bool
165171boolRepr = iso (\(FieldRepr (ReprBoolean b)) -> b) (FieldRepr . ReprBoolean)
166172
167173arrayRepr
168− :: (KnownSymbol fn, SingI fn, SingI cs, SingI schema)
174+ :: (KnownSymbol fn, SingI cs, SingI schema)
169175 => Iso' (FieldRepr '(fn, ('SchemaArray cs schema))) (V.Vector (JsonRepr schema))
170176arrayRepr = iso (\(FieldRepr (ReprArray a)) -> a) (FieldRepr . ReprArray)
171177
172178objectRepr
173− :: (KnownSymbol fn, SingI fn, SingI fields)
179+ :: (KnownSymbol fn, SingI fields)
174180 => Iso' (FieldRepr '(fn, ('SchemaObject fields))) (Rec FieldRepr fields)
175181objectRepr = iso (\(FieldRepr (ReprObject o)) -> o) (FieldRepr . ReprObject)
176182
177183optionalRepr
178− :: (KnownSymbol fn, SingI fn, SingI schema)
184+ :: (KnownSymbol fn, SingI schema)
179185 => Iso' (FieldRepr '(fn, ('SchemaOptional schema))) (Maybe (JsonRepr schema))
180186optionalRepr = iso (\(FieldRepr (ReprOptional r)) -> r) (FieldRepr . ReprOptional)
181187
182−obj :: (SingI fields) => Iso' (JsonRepr ('SchemaObject fields)) (Rec FieldRepr fields)
188+obj :: Iso' (JsonRepr ('SchemaObject fields)) (Rec FieldRepr fields)
183189obj = iso (\(ReprObject r) -> r) ReprObject
190+
191+arr :: Iso' (JsonRepr ('SchemaArray cs schema)) (V.Vector (JsonRepr schema))
192+arr = iso (\(ReprArray r) -> r) ReprArray
193+
194+uni :: Iso' (JsonRepr ('SchemaUnion (h ': tl))) (Union JsonRepr (h ': tl))
195+uni = iso (\(ReprUnion u) -> u) ReprUnion
196+
197+txt :: Iso' (JsonRepr ('SchemaText cs)) Text
198+txt = iso (\(ReprText t) -> t) ReprText
199+
200+num :: Iso' (JsonRepr ('SchemaNumber cs)) Scientific
201+num = iso (\(ReprNumber t) -> t) ReprNumber
202+
203+bln :: Iso' (JsonRepr 'SchemaBoolean) Bool
204+bln = iso (\(ReprBoolean b) -> b) ReprBoolean
205+
206+opt :: Iso' (JsonRepr ('SchemaOptional schema)) (Maybe (JsonRepr schema))
207+opt = iso (\(ReprOptional o) -> o) ReprOptional
src/Data/Schematic/Migration.hs+45−8
@@ -1,13 +1,19 @@
11{-# LANGUAGE AllowAmbiguousTypes #-}
2−{-# LANGUAGE TemplateHaskell #-}
2+{-# LANGUAGE CPP #-}
3+{-# LANGUAGE TemplateHaskell #-}
34
45module Data.Schematic.Migration where
56
67import Data.Kind
8+import Data.Schematic.DSL
9+import Data.Schematic.Lens
710import Data.Schematic.Path
811import Data.Schematic.Schema
9−import Data.Singletons.Prelude hiding (All)
12+import Data.Singletons.Prelude hiding ((:.), All)
1013import Data.Singletons.TypeLits
14+import Data.Tagged
15+import Data.Vinyl
16+import Data.Vinyl.Functor
1117
1218
1319data Path
@@ -37,8 +43,8 @@ type family SchemaByKey (fs :: [(Symbol, Schema)]) (s :: Symbol) :: Schema where
3743 SchemaByKey ( '(a, s) ': tl) fn = SchemaByKey tl fn
3844
3945type family DeleteKey (acc :: [(Symbol, Schema)]) (fn :: Symbol) (fs :: [(Symbol, Schema)]) :: [(Symbol, Schema)] where
40− DeleteKey acc fn ('(fn, a) ': tl) = acc :++ tl
41− DeleteKey acc fn (fna ': tl) = acc :++ (fna ': tl)
46+ DeleteKey acc fn ('(fn, a) ': tl) = acc ++ tl
47+ DeleteKey acc fn (fna ': tl) = acc ++ (fna ': tl)
4248
4349type family UpdateKey
4450 (fn :: Symbol)
@@ -91,7 +97,8 @@ type family ElemOf (e :: k) (l :: [(a,k)]) :: Constraint where
9197type family AllVersions (vd :: Versioned) :: [(Revision, Schema)] where
9298 AllVersions ('Versioned s ms) = Reverse (AllVersions' '[ '("initial", s) ] ms)
9399
94−type family AllVersions' (acc :: [(Revision, Schema)]) (ms :: [Migration]) = (r :: [(Revision, Schema)]) where
100+type family AllVersions' (acc :: [(Revision, Schema)]) (ms :: [Migration])
101+ = (r :: [(Revision, Schema)]) where
95102 AllVersions' acc '[] = acc
96103 AllVersions' ( '(rh, sh) ': tl ) (m ': ms) =
97104 AllVersions' ( '(rh, sh) ': ApplyMigration m sh ': tl ) ms
@@ -138,13 +145,43 @@ data instance Sing (v :: Versioned) where
138145 -> Sing (ms :: [Migration]) -- a bunch of migrations
139146 -> Sing ('Versioned s ms)
140147
141−data MList :: (* -> *) -> [Schema] -> Type where
148+type DataMigration s m h = Tagged s (JsonRepr h -> m (JsonRepr s))
149+
150+data MList :: (Type -> Type) -> [Schema] -> Type where
142151 MNil :: (Monad m, SingI s, TopLevel s) => MList m '[s]
143152 (:&&)
144153 :: (TopLevel s, SingI s)
145− => proxy s
146− -> (JsonRepr h -> m (JsonRepr s))
154+ => DataMigration s m h
147155 -> MList m (h ': tl)
148156 -> MList m (s ': h ': tl)
149157
150158infixr 7 :&&
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
166+migrateObject
167+ :: forall m fs fh. (FSubset fs fs (FImage fs fs), Monad m)
168+ => (Rec (Tagged fs :. FieldRepr) fh -> m (Rec (Tagged fs :. FieldRepr) fs))
169+ -> Tagged ('SchemaObject fs) (JsonRepr ('SchemaObject fh) -> m (JsonRepr ('SchemaObject fs)))
170+#endif
171+migrateObject f = Tagged $ \(ReprObject r) -> do
172+ res <- f $ rmap (Compose . Tagged) r
173+ pure $ withRepr @('SchemaObject fs) res
174+
175+shrinkObject
176+ :: forall rs ss m
177+ . ( Monad m, FSubset rs ss (FImage rs ss) )
178+ => Tagged
179+ ('SchemaObject rs)
180+ (JsonRepr ('SchemaObject ss) -> m (JsonRepr ('SchemaObject rs)))
181+shrinkObject = Tagged $ \(ReprObject r) -> pure $ ReprObject $ fcast r
182+
183+type family MapSnd (l :: [(a,k)]) = (r :: [k]) where
184+ MapSnd '[] = '[]
185+ MapSnd ( '(a, b) ': tl) = b ': MapSnd tl
186+
187+type MigrationList m vs = MList m (MapSnd (AllVersions vs))
src/Data/Schematic/Path.hs+18−32
@@ -1,50 +1,36 @@
11module Data.Schematic.Path where
22
33import Data.Foldable as F
4−import Data.Monoid
5−import Data.Schematic.Utils
6−import Data.Singletons
74import Data.Singletons.Prelude
85import Data.Singletons.TypeLits
96import Data.Text as T
7+import Data.Aeson.Internal
108
119
12−data PathSegment = Key Symbol | Ix Nat
13−
14−data instance Sing (jp :: PathSegment) where
15− SKey :: (KnownSymbol k, Known (Sing k)) => Sing (k :: Symbol) -> Sing ('Key k)
16− SIx :: (KnownNat n, Known (Sing n)) => Sing (n :: Nat) -> Sing ('Ix n)
17−
18−instance (KnownSymbol k, Known (Sing k))
19− => Known (Sing ('Key k)) where
20− known = SKey known
21−
22−instance (KnownNat n, Known (Sing n))
23− => Known (Sing ('Ix n)) where
24− known = SIx known
25−
26−data DemotedPathSegment = DKey Text | DIx Integer
10+newtype JSONPathText = JSONPathText Text
2711 deriving (Show)
2812
29−-- | Textual representation of json path.
30−newtype JSONPath = JSONPath Text
31− deriving (Show)
13+data PathSegment = PathKey Symbol | PathIx Nat
14+
15+data instance Sing (jp :: PathSegment) where
16+ SKey :: (SingI k) => Sing (k :: Symbol) -> Sing ('PathKey k)
17+ SIx :: (SingI n) => Sing (n :: Nat) -> Sing ('PathIx n)
3218
33−demotePath :: Sing (ps :: [PathSegment]) -> [DemotedPathSegment]
19+demotePath :: Sing (ps :: [PathSegment]) -> JSONPath
3420demotePath = go []
3521 where
36− go :: [DemotedPathSegment] -> Sing (ps :: [PathSegment]) -> [DemotedPathSegment]
22+ go :: JSONPath -> Sing (ps :: [PathSegment]) -> JSONPath
3723 go acc SNil = acc
38− go acc (SCons p ps) = go (acc ++ [demote p]) ps
39− demote :: Sing (ps :: PathSegment) -> DemotedPathSegment
40− demote (SKey s) = DKey $ T.pack $ symbolVal s
41− demote (SIx n) = DIx $ natVal n
24+ go acc (SCons p ps) = go (acc ++ [demotePathSeg p]) ps
25+ demotePathSeg :: Sing (ps :: PathSegment) -> JSONPathElement
26+ demotePathSeg (SKey s) = Key $ T.pack $ withKnownSymbol s $ symbolVal s
27+ demotePathSeg (SIx n) = Index $ withKnownNat n $ fromIntegral $ natVal n
4228
43−demotedPathToText :: [DemotedPathSegment] -> JSONPath
44−demotedPathToText = JSONPath . F.foldl' renderPathSegment ""
29+demotedPathToText :: JSONPath -> JSONPathText
30+demotedPathToText = JSONPathText . F.foldl' renderPathSegment ""
4531 where
46− renderPathSegment acc (DKey t) = acc <> "." <> t
47− renderPathSegment acc (DIx n) = acc <> "[" <> T.pack (show n) <> "]"
32+ renderPathSegment acc (Key t) = acc <> "." <> t
33+ renderPathSegment acc (Index n) = acc <> "[" <> T.pack (show n) <> "]"
4834
49−pathToText :: Sing (ps :: [PathSegment]) -> JSONPath
35+pathToText :: Sing (ps :: [PathSegment]) -> JSONPathText
5036pathToText = demotedPathToText . demotePath
src/Data/Schematic/Schema.hs+148−60
@@ -1,6 +1,7 @@
11{-# LANGUAGE AllowAmbiguousTypes #-}
2−{-# LANGUAGE OverloadedLists #-}
3−{-# LANGUAGE OverloadedStrings #-}
2+{-# LANGUAGE CPP #-}
3+{-# LANGUAGE OverloadedLists #-}
4+{-# LANGUAGE OverloadedStrings #-}
45{-# OPTIONS_GHC -fprint-explicit-kinds #-}
56
67module Data.Schematic.Schema where
@@ -12,6 +13,7 @@ import Data.Aeson.Types as J
1213import Data.HashMap.Strict as H
1314import Data.Kind
1415import Data.Maybe
16+import Data.Schematic.Generator
1517import Data.Schematic.Instances ()
1618import Data.Scientific
1719import Data.Singletons.Prelude.List hiding (All, Union)
@@ -24,7 +26,8 @@ import Data.Vinyl hiding (Dict)
2426import qualified Data.Vinyl.TypeLevel as V
2527import GHC.Exts
2628import GHC.Generics (Generic)
27−import GHC.TypeLits (SomeNat(..), SomeSymbol(..), someSymbolVal, someNatVal)
29+import GHC.TypeLits
30+ (SomeNat(..), SomeSymbol(..), someNatVal, someSymbolVal)
2831import Prelude as P
2932import Test.SmallCheck.Series
3033
@@ -48,33 +51,33 @@ data TextConstraint
4851instance SingKind TextConstraint where
4952 type Demote TextConstraint = DemotedTextConstraint
5053 fromSing = \case
51− STEq n -> withKnownNat n (DTEq $ natVal n)
52− STLt n -> withKnownNat n (DTLt $ natVal n)
53− STLe n -> withKnownNat n (DTLe $ natVal n)
54− STGt n -> withKnownNat n (DTGt $ natVal n)
55− STGe n -> withKnownNat n (DTGe $ natVal n)
54+ STEq n -> withKnownNat n (DTEq . fromIntegral $ natVal n)
55+ STLt n -> withKnownNat n (DTLt . fromIntegral $ natVal n)
56+ STLe n -> withKnownNat n (DTLe . fromIntegral $ natVal n)
57+ STGt n -> withKnownNat n (DTGt . fromIntegral $ natVal n)
58+ STGe n -> withKnownNat n (DTGe . fromIntegral $ natVal n)
5659 STRegex s -> withKnownSymbol s (DTRegex $ T.pack $ symbolVal s)
5760 STEnum s -> let
5861 d :: Sing (s :: [Symbol]) -> [Text]
59− d SNil = []
62+ d SNil = []
6063 d (SCons ss@SSym fs) = T.pack (symbolVal ss) : d fs
6164 in DTEnum $ d s
6265 toSing = \case
6366 DTEq n -> case someNatVal n of
6467 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STEq (SNat :: Sing n))
65− Nothing -> error "Negative singleton nat"
68+ Nothing -> error "Negative singleton nat"
6669 DTLt n -> case someNatVal n of
6770 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STLt (SNat :: Sing n))
68− Nothing -> error "Negative singleton nat"
71+ Nothing -> error "Negative singleton nat"
6972 DTLe n -> case someNatVal n of
7073 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STLe (SNat :: Sing n))
71− Nothing -> error "Negative singleton nat"
74+ Nothing -> error "Negative singleton nat"
7275 DTGt n -> case someNatVal n of
7376 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STGt (SNat :: Sing n))
74− Nothing -> error "Negative singleton nat"
77+ Nothing -> error "Negative singleton nat"
7578 DTGe n -> case someNatVal n of
7679 Just (SomeNat (_ :: Proxy n)) -> SomeSing (STGe (SNat :: Sing n))
77− Nothing -> error "Negative singleton nat"
80+ Nothing -> error "Negative singleton nat"
7881 DTRegex s -> case someSymbolVal (T.unpack s) of
7982 SomeSymbol (_ :: Proxy n) -> SomeSing (STRegex (SSym :: Sing n))
8083 DTEnum ss -> case toSing ss of
@@ -88,7 +91,7 @@ data DemotedTextConstraint
8891 | DTGe Integer
8992 | DTRegex Text
9093 | DTEnum [Text]
91− deriving (Generic)
94+ deriving (Generic, Eq, Show)
9295
9396data instance Sing (tc :: TextConstraint) where
9497 STEq :: Sing n -> Sing ('TEq n)
@@ -129,7 +132,7 @@ data DemotedNumberConstraint
129132 | DNGt Integer
130133 | DNGe Integer
131134 | DNEq Integer
132− deriving (Generic)
135+ deriving (Generic, Eq, Show)
133136
134137data instance Sing (nc :: NumberConstraint) where
135138 SNEq :: Sing n -> Sing ('NEq n)
@@ -153,51 +156,87 @@ instance Eq (Sing ('NGe n)) where _ == _ = True
153156instance SingKind NumberConstraint where
154157 type Demote NumberConstraint = DemotedNumberConstraint
155158 fromSing = \case
156− SNEq n -> withKnownNat n (DNEq $ natVal n)
157− SNGt n -> withKnownNat n (DNGt $ natVal n)
158− SNGe n -> withKnownNat n (DNGe $ natVal n)
159− SNLt n -> withKnownNat n (DNLt $ natVal n)
160− SNLe n -> withKnownNat n (DNLe $ natVal n)
159+ SNEq n -> withKnownNat n (DNEq . fromIntegral $ natVal n)
160+ SNGt n -> withKnownNat n (DNGt . fromIntegral $ natVal n)
161+ SNGe n -> withKnownNat n (DNGe . fromIntegral $ natVal n)
162+ SNLt n -> withKnownNat n (DNLt . fromIntegral $ natVal n)
163+ SNLe n -> withKnownNat n (DNLe . fromIntegral $ natVal n)
161164 toSing = \case
162165 DNEq n -> case someNatVal n of
163166 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNEq (SNat :: Sing n))
164− Nothing -> error "Negative singleton nat"
167+ Nothing -> error "Negative singleton nat"
165168 DNGt n -> case someNatVal n of
166169 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNGt (SNat :: Sing n))
167− Nothing -> error "Negative singleton nat"
170+ Nothing -> error "Negative singleton nat"
168171 DNGe n -> case someNatVal n of
169172 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNGe (SNat :: Sing n))
170− Nothing -> error "Negative singleton nat"
173+ Nothing -> error "Negative singleton nat"
171174 DNLt n -> case someNatVal n of
172175 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNLt (SNat :: Sing n))
173− Nothing -> error "Negative singleton nat"
176+ Nothing -> error "Negative singleton nat"
174177 DNLe n -> case someNatVal n of
175178 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SNLe (SNat :: Sing n))
176− Nothing -> error "Negative singleton nat"
179+ Nothing -> error "Negative singleton nat"
177180
178181data ArrayConstraint
179182 = AEq Nat
183+ | AGt Nat
184+ | AGe Nat
185+ | ALt Nat
186+ | ALe Nat
180187 deriving (Generic)
181188
182189data DemotedArrayConstraint
183190 = DAEq Integer
184− deriving (Generic)
191+ | DAGt Integer
192+ | DAGe Integer
193+ | DALt Integer
194+ | DALe Integer
195+ deriving (Generic, Eq, Show)
185196
186197data instance Sing (ac :: ArrayConstraint) where
187198 SAEq :: Sing n -> Sing ('AEq n)
199+ SAGt :: Sing n -> Sing ('AGt n)
200+ SAGe :: Sing n -> Sing ('AGe n)
201+ SALt :: Sing n -> Sing ('ALt n)
202+ SALe :: Sing n -> Sing ('ALe n)
188203
189204instance KnownNat n => SingI ('AEq n) where sing = SAEq sing
205+instance KnownNat n => SingI ('AGt n) where sing = SAGt sing
206+instance KnownNat n => SingI ('AGe n) where sing = SAGe sing
207+instance KnownNat n => SingI ('ALt n) where sing = SALt sing
208+instance KnownNat n => SingI ('ALe n) where sing = SALe sing
190209
191210instance Eq (Sing ('AEq n)) where _ == _ = True
211+instance Eq (Sing ('AGt n)) where _ == _ = True
212+instance Eq (Sing ('AGe n)) where _ == _ = True
213+instance Eq (Sing ('ALt n)) where _ == _ = True
214+instance Eq (Sing ('ALe n)) where _ == _ = True
192215
193216instance SingKind ArrayConstraint where
194217 type Demote ArrayConstraint = DemotedArrayConstraint
195218 fromSing = \case
196− SAEq n -> withKnownNat n (DAEq $ 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)
197224 toSing = \case
198225 DAEq n -> case someNatVal n of
199226 Just (SomeNat (_ :: Proxy n)) -> SomeSing (SAEq (SNat :: Sing n))
200− Nothing -> error "Negative singleton nat"
227+ Nothing -> error "Negative singleton nat"
228+ DAGt n -> case someNatVal n of
229+ Just (SomeNat (_ :: Proxy n)) -> SomeSing (SAGt (SNat :: Sing n))
230+ Nothing -> error "Negative singleton nat"
231+ DAGe n -> case someNatVal n of
232+ Just (SomeNat (_ :: Proxy n)) -> SomeSing (SAGe (SNat :: Sing n))
233+ Nothing -> error "Negative singleton nat"
234+ DALt n -> case someNatVal n of
235+ Just (SomeNat (_ :: Proxy n)) -> SomeSing (SALt (SNat :: Sing n))
236+ Nothing -> error "Negative singleton nat"
237+ DALe n -> case someNatVal n of
238+ Just (SomeNat (_ :: Proxy n)) -> SomeSing (SALe (SNat :: Sing n))
239+ Nothing -> error "Negative singleton nat"
201240
202241data Schema
203242 = SchemaText [TextConstraint]
@@ -219,7 +258,7 @@ data DemotedSchema
219258 | DSchemaNull
220259 | DSchemaOptional DemotedSchema
221260 | DSchemaUnion [DemotedSchema]
222− deriving (Generic)
261+ deriving (Generic, Eq, Show)
223262
224263data instance Sing (schema :: Schema) where
225264 SSchemaText :: Sing tcs -> Sing ('SchemaText tcs)
@@ -334,6 +373,31 @@ data JsonRepr :: Schema -> Type where
334373 ReprOptional :: Maybe (JsonRepr s) -> JsonRepr ('SchemaOptional s)
335374 ReprUnion :: Union JsonRepr (h ': tl) -> JsonRepr ('SchemaUnion (h ': tl))
336375
376+instance (Monad m, Serial m Text, SingI cs)
377+ => Serial m (JsonRepr ('SchemaText cs)) where
378+ series = decDepth $ fmap ReprText $ textSeries $ fromSing (sing :: Sing cs)
379+
380+instance (Monad m, Serial m Scientific, SingI cs)
381+ => Serial m (JsonRepr ('SchemaNumber cs)) where
382+ series = decDepth $ fmap ReprNumber
383+ $ numberSeries $ fromSing (sing :: Sing cs)
384+
385+instance Monad m => Serial m (JsonRepr 'SchemaNull) where
386+ series = cons0 ReprNull
387+
388+instance (Serial m (JsonRepr s), Serial m (V.Vector (JsonRepr s)), SingI cs)
389+ => Serial m (JsonRepr ('SchemaArray cs s)) where
390+ series = decDepth $ fmap ReprArray
391+ $ arraySeries $ fromSing (sing :: Sing cs)
392+
393+instance (Serial m (JsonRepr s))
394+ => Serial m (JsonRepr ('SchemaOptional s)) where
395+ series = cons1 ReprOptional
396+
397+instance (Monad m, Serial m (Rec FieldRepr fs))
398+ => Serial m (JsonRepr ('SchemaObject fs)) where
399+ series = cons1 ReprObject
400+
337401-- | Move to the union package
338402instance Show (JsonRepr ('SchemaText cs)) where
339403 show (ReprText t) = "ReprText " P.++ show t
@@ -341,39 +405,31 @@ instance Show (JsonRepr ('SchemaText cs)) where
341405instance Show (JsonRepr ('SchemaNumber cs)) where
342406 show (ReprNumber n) = "ReprNumber " P.++ show n
343407
408+instance Show (JsonRepr 'SchemaBoolean) where
409+ show (ReprBoolean n) = "ReprBoolean " P.++ show n
410+
344411instance Show (JsonRepr 'SchemaNull) where show _ = "ReprNull"
345412
346413instance Show (JsonRepr s) => Show (JsonRepr ('SchemaArray acs s)) where
347414 show (ReprArray v) = "ReprArray " P.++ show v
348415
416+#if MIN_VERSION_base(4,12,0)
417+instance
418+ ( V.RecAll FieldRepr fs Show, RMap fs, ReifyConstraint Show FieldRepr fs
419+ , RecordToList fs )
420+ => Show (JsonRepr ('SchemaObject fs)) where
421+ show (ReprObject fs) = "ReprObject " P.++ show fs
422+#else
349423instance V.RecAll FieldRepr fs Show => Show (JsonRepr ('SchemaObject fs)) where
350424 show (ReprObject fs) = "ReprObject " P.++ show fs
425+#endif
351426
352427instance Show (JsonRepr s) => Show (JsonRepr ('SchemaOptional s)) where
353428 show (ReprOptional s) = "ReprOptional " P.++ show s
354429
355−instance (Monad m, Serial m Text)
356− => Serial m (JsonRepr ('SchemaText cs)) where
357− series = cons1 ReprText
358−
359−instance (Monad m, Serial m Scientific)
360− => Serial m (JsonRepr ('SchemaNumber cs)) where
361− series = cons1 ReprNumber
362−
363−instance Monad m => Serial m (JsonRepr 'SchemaNull) where
364− series = cons0 ReprNull
365−
366−instance (Serial m (V.Vector (JsonRepr s)))
367− => Serial m (JsonRepr ('SchemaArray cs s)) where
368− series = cons1 ReprArray
369−
370−instance (Serial m (JsonRepr s))
371− => Serial m (JsonRepr ('SchemaOptional s)) where
372− series = cons1 ReprOptional
373−
374−instance (Monad m, Serial m (Rec FieldRepr fs))
375− => Serial m (JsonRepr ('SchemaObject fs)) where
376− series = cons1 ReprObject
430+instance Show (Union JsonRepr (h ': tl))
431+ => Show (JsonRepr ('SchemaUnion (h ': tl))) where
432+ show (ReprUnion s) = "ReprUnion " P.++ show s
377433
378434instance Eq (Rec FieldRepr fs) => Eq (JsonRepr ('SchemaObject fs)) where
379435 ReprObject a == ReprObject b = a == b
@@ -384,6 +440,9 @@ instance Eq (JsonRepr ('SchemaText cs)) where
384440instance Eq (JsonRepr ('SchemaNumber cs)) where
385441 ReprNumber a == ReprNumber b = a == b
386442
443+instance Eq (JsonRepr 'SchemaBoolean) where
444+ ReprBoolean a == ReprBoolean b = a == b
445+
387446instance Eq (JsonRepr 'SchemaNull) where
388447 ReprNull == ReprNull = True
389448
@@ -393,6 +452,35 @@ instance Eq (JsonRepr s) => Eq (JsonRepr ('SchemaArray as s)) where
393452instance Eq (JsonRepr s) => Eq (JsonRepr ('SchemaOptional s)) where
394453 ReprOptional a == ReprOptional b = a == b
395454
455+instance Eq (Union JsonRepr (h ': tl))
456+ => Eq (JsonRepr ('SchemaUnion (h ': tl))) where
457+ ReprUnion a == ReprUnion b = a == b
458+
459+instance Ord (Rec FieldRepr fs) => Ord (JsonRepr ('SchemaObject fs)) where
460+ ReprObject a `compare` ReprObject b = a `compare` b
461+
462+instance Ord (JsonRepr ('SchemaText cs)) where
463+ ReprText a `compare` ReprText b = a `compare` b
464+
465+instance Ord (JsonRepr ('SchemaNumber cs)) where
466+ ReprNumber a `compare` ReprNumber b = a `compare` b
467+
468+instance Ord (JsonRepr 'SchemaBoolean) where
469+ ReprBoolean a `compare` ReprBoolean b = a `compare` b
470+
471+instance Ord (JsonRepr 'SchemaNull) where
472+ compare _ _ = EQ
473+
474+instance Ord (JsonRepr s) => Ord (JsonRepr ('SchemaArray as s)) where
475+ ReprArray a `compare` ReprArray b = a `compare` b
476+
477+instance Ord (JsonRepr s) => Ord (JsonRepr ('SchemaOptional s)) where
478+ ReprOptional a `compare` ReprOptional b = a `compare` b
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+
396484instance IsList (JsonRepr ('SchemaArray cs s)) where
397485 type Item (JsonRepr ('SchemaArray cs s)) = JsonRepr s
398486 fromList = ReprArray . GHC.Exts.fromList
@@ -454,25 +542,25 @@ instance SingI schema => J.FromJSON (JsonRepr schema) where
454542 fieldRepr <- case s of
455543 SSchemaText so -> case H.lookup fieldName h of
456544 Just v -> withSingI so $ FieldRepr <$> parseJSON v
457− Nothing -> fail "schematext"
545+ Nothing -> fail $ "No text field: " P.++ show fieldName
458546 SSchemaNumber so -> case H.lookup fieldName h of
459547 Just v -> withSingI so $ FieldRepr <$> parseJSON v
460− Nothing -> fail "schemanumber"
548+ Nothing -> fail $ "No number field: " P.++ show fieldName
461549 SSchemaBoolean -> case H.lookup fieldName h of
462550 Just v -> FieldRepr <$> parseJSON v
463− Nothing -> fail "schemaboolean"
551+ Nothing -> fail $ "No boolean field: " P.++ show fieldName
464552 SSchemaNull -> case H.lookup fieldName h of
465553 Just v -> FieldRepr <$> parseJSON v
466− Nothing -> fail "schemanull"
554+ Nothing -> fail $ "No null field: " P.++ show fieldName
467555 SSchemaArray sa sb -> case H.lookup fieldName h of
468556 Just v -> withSingI sa $ withSingI sb $ FieldRepr <$> parseJSON v
469− Nothing -> fail "schemaarray"
557+ Nothing -> fail $ "No array field: " P.++ show fieldName
470558 SSchemaObject so -> case H.lookup fieldName h of
471559 Just v -> withSingI so $ FieldRepr <$> parseJSON v
472− Nothing -> fail "schemaobject"
560+ Nothing -> fail $ "No object field" P.++ show fieldName
473561 SSchemaOptional so -> case H.lookup fieldName h of
474562 Just v -> withSingI so $ FieldRepr <$> parseJSON v
475− Nothing -> fail "schemaoptional"
563+ Nothing -> withSingI so $ pure $ FieldRepr $ ReprOptional Nothing
476564 SSchemaUnion ss -> withSingI ss $ FieldRepr <$> parseUnion ss value
477565 (fieldRepr :&) <$> demoteFields tl h
478566 ReprObject <$> withObject "Object" (demoteFields fs) value
@@ -484,7 +572,7 @@ instance J.ToJSON (JsonRepr a) where
484572 toJSON (ReprText t) = J.String t
485573 toJSON (ReprNumber n) = J.Number n
486574 toJSON (ReprOptional s) = case s of
487− Just v -> toJSON v
575+ Just v -> toJSON v
488576 Nothing -> J.Null
489577 toJSON (ReprArray v) = J.Array $ toJSON <$> v
490578 toJSON (ReprObject r) = J.Object . H.fromList . fold $ r
src/Data/Schematic/Schema.hs-bootnew file+95
@@ -0,0 +1,95 @@
1+module Data.Schematic.Schema where
2+
3+import Data.Kind
4+import Data.Maybe
5+import Data.Schematic.Instances ()
6+import Data.Scientific
7+import Data.Singletons.TH
8+import Data.Singletons.TypeLits
9+import Data.Text as T
10+import Data.Union
11+import Data.Vector as V
12+import Data.Vinyl hiding (Dict)
13+import Prelude as P
14+
15+data TextConstraint
16+ = TEq Nat
17+ | TLt Nat
18+ | TLe Nat
19+ | TGt Nat
20+ | TGe Nat
21+ | TRegex Symbol
22+ | TEnum [Symbol]
23+
24+data DemotedTextConstraint
25+ = DTEq Integer
26+ | DTLt Integer
27+ | DTLe Integer
28+ | DTGt Integer
29+ | DTGe Integer
30+ | DTRegex Text
31+ | DTEnum [Text]
32+
33+data NumberConstraint
34+ = NLe Nat
35+ | NLt Nat
36+ | NGt Nat
37+ | NGe Nat
38+ | NEq Nat
39+
40+data DemotedNumberConstraint
41+ = DNLe Integer
42+ | DNLt Integer
43+ | DNGt Integer
44+ | DNGe Integer
45+ | DNEq Integer
46+
47+data ArrayConstraint
48+ = AEq Nat
49+ | AGt Nat
50+ | AGe Nat
51+ | ALt Nat
52+ | ALe Nat
53+
54+data DemotedArrayConstraint
55+ = DAEq Integer
56+ | DAGt Integer
57+ | DAGe Integer
58+ | DALt Integer
59+ | DALe Integer
60+
61+data Schema
62+ = SchemaText [TextConstraint]
63+ | SchemaBoolean
64+ | SchemaNumber [NumberConstraint]
65+ | SchemaObject [(Symbol, Schema)]
66+ | SchemaArray [ArrayConstraint] Schema
67+ | SchemaNull
68+ | SchemaOptional Schema
69+ | SchemaUnion [Schema]
70+
71+data DemotedSchema
72+ = DSchemaText [DemotedTextConstraint]
73+ | DSchemaNumber [DemotedNumberConstraint]
74+ | DSchemaBoolean
75+ | DSchemaObject [(Text, DemotedSchema)]
76+ | DSchemaArray [DemotedArrayConstraint] DemotedSchema
77+ | DSchemaNull
78+ | DSchemaOptional DemotedSchema
79+ | DSchemaUnion [DemotedSchema]
80+
81+data FieldRepr :: (Symbol, Schema) -> Type where
82+ FieldRepr
83+ :: (SingI schema, KnownSymbol name)
84+ => JsonRepr schema
85+ -> FieldRepr '(name, schema)
86+
87+data JsonRepr :: Schema -> Type where
88+ ReprText :: Text -> JsonRepr ('SchemaText cs)
89+ ReprNumber :: Scientific -> JsonRepr ('SchemaNumber cs)
90+ ReprBoolean :: Bool -> JsonRepr 'SchemaBoolean
91+ ReprNull :: JsonRepr 'SchemaNull
92+ ReprArray :: V.Vector (JsonRepr s) -> JsonRepr ('SchemaArray cs s)
93+ ReprObject :: Rec FieldRepr fs -> JsonRepr ('SchemaObject fs)
94+ ReprOptional :: Maybe (JsonRepr s) -> JsonRepr ('SchemaOptional s)
95+ ReprUnion :: Union JsonRepr (h ': tl) -> JsonRepr ('SchemaUnion (h ': tl))
src/Data/Schematic/Utils.hsdeleted−42
@@ -1,42 +0,0 @@
1−{-# LANGUAGE AllowAmbiguousTypes #-}
2−
3−module Data.Schematic.Utils where
4−
5−import Data.Proxy
6−import Data.Singletons
7−import Data.Singletons.Prelude
8−import Data.Singletons.TypeLits
9−import Data.Vinyl hiding (Dict)
10−
11−
12−class Known a where
13− known :: a
14−
15−instance Known (Proxy a) where
16− known = Proxy
17−
18−instance KnownNat n => Known (Sing n) where
19− known = SNat
20−
21−instance KnownSymbol s => Known (Sing s) where
22− known = SSym
23−
24−instance (Known (Sing a), Known (Sing b)) => Known (Sing '(a,b)) where
25− known = STuple2 known known
26−
27−instance Known (Sing '[]) where known = SNil
28−
29−instance (Known (Sing a), Known (Sing as)) => Known (Sing (a ': as)) where
30− known = SCons known known
31−
32−instance Known (Rec Sing '[]) where
33− known = RNil
34−
35−instance (Known (Sing a), Known (Rec Sing tl)) => Known (Rec Sing (a ': tl)) where
36− known = known :& known
37−
38−data Dict c where
39− Dict :: c => Dict c
40−
41−instance c => Known (Dict c) where
42− known = Dict
src/Data/Schematic/Validation.hs+87−30
@@ -2,12 +2,14 @@ module Data.Schematic.Validation where
22
33import Control.Monad
44import Control.Monad.Validation
5+import Data.Aeson
6+import Data.Aeson.Internal
7+import Data.Aeson.Types
58import Data.Foldable
69import Data.Functor.Identity
710import Data.Monoid
811import Data.Schematic.Path
912import Data.Schematic.Schema
10−import Data.Schematic.Utils ()
1113import Data.Scientific
1214import Data.Singletons.Prelude
1315import Data.Singletons.TypeLits
@@ -31,6 +33,10 @@ data ParseResult a
3133 | ValidationError ErrorMap -- runtime
3234 deriving (Show, Eq, Functor, Foldable, Traversable)
3335
36+instance (TopLevel a, SingI a, FromJSON (JsonRepr a))
37+ => FromJSON (ParseResult (JsonRepr a)) where
38+ parseJSON = pure . parseAndValidateJson @a
39+
3440isValid :: ParseResult a -> Bool
3541isValid (Valid _) = True
3642isValid _ = False
@@ -44,51 +50,51 @@ isValidationError (ValidationError _) = True
4450isValidationError _ = False
4551
4652validateTextConstraint
47− :: JSONPath
53+ :: JSONPathText
4854 -> Text
4955 -> Sing (tcs :: TextConstraint)
5056 -> Validation ()
51−validateTextConstraint (JSONPath path) t = \case
57+validateTextConstraint (JSONPathText path) t = \case
5258 STEq n -> do
5359 let
5460 nlen = withKnownNat n $ natVal n
5561 predicate = nlen == (fromIntegral $ T.length t)
56− errMsg = "length of " <> path <> " should be == " <> T.pack (show nlen)
62+ errMsg = "length should be == " <> T.pack (show nlen)
5763 warn = vWarning $ mmSingleton path (pure errMsg)
5864 unless predicate warn
5965 STLt n -> do
6066 let
6167 nlen = withKnownNat n $ natVal n
62− predicate = nlen < (fromIntegral $ T.length t)
63− errMsg = "length of " <> path <> " should be < " <> T.pack (show nlen)
68+ predicate = nlen > (fromIntegral $ T.length t)
69+ errMsg = "length should be < " <> T.pack (show nlen)
6470 warn = vWarning $ mmSingleton path (pure errMsg)
6571 unless predicate warn
6672 STLe n -> do
6773 let
6874 nlen = withKnownNat n $ natVal n
69− predicate = nlen <= (fromIntegral $ T.length t)
70− errMsg = "length of " <> path <> " should be <= " <> T.pack (show nlen)
75+ predicate = nlen >= (fromIntegral $ T.length t)
76+ errMsg = "length should be <= " <> T.pack (show nlen)
7177 warn = vWarning $ mmSingleton path (pure errMsg)
7278 unless predicate warn
7379 STGt n -> do
7480 let
7581 nlen = withKnownNat n $ natVal n
76− predicate = nlen > (fromIntegral $ T.length t)
77− errMsg = "length of " <> path <> " should be > " <> T.pack (show nlen)
82+ predicate = nlen < (fromIntegral $ T.length t)
83+ errMsg = "length should be > " <> T.pack (show nlen)
7884 warn = vWarning $ mmSingleton path (pure errMsg)
7985 unless predicate warn
8086 STGe n -> do
8187 let
8288 nlen = withKnownNat n $ natVal n
83− predicate = nlen >= (fromIntegral $ T.length t)
84− errMsg = "length of " <> path <> " should be >= " <> T.pack (show nlen)
89+ predicate = nlen <= (fromIntegral $ T.length t)
90+ errMsg = "length should be >= " <> T.pack (show nlen)
8591 warn = vWarning $ mmSingleton path (pure errMsg)
8692 unless predicate warn
8793 STRegex r -> do
8894 let
8995 regex = withKnownSymbol r $ fromSing r
9096 predicate = matchTest (makeRegex (T.unpack regex) :: Regex) (T.unpack t)
91− errMsg = path <> " must match " <> regex
97+ errMsg = "must match " <> regex
9298 warn = vWarning $ mmSingleton path (pure errMsg)
9399 unless predicate warn
94100 STEnum ss -> do
@@ -96,69 +102,97 @@ validateTextConstraint (JSONPath path) t = \case
96102 matching :: Sing (s :: [Symbol]) -> Bool
97103 matching SNil = False
98104 matching (SCons s@SSym fs) = T.pack (symbolVal s) == t || matching fs
99− errMsg = path <> " must be one of " <> T.pack (show (fromSing ss))
105+ errMsg = "must be one of " <> T.pack (show (fromSing ss))
100106 warn = vWarning $ mmSingleton path (pure errMsg)
101107 unless (matching ss) warn
102108
103109validateNumberConstraint
104− :: JSONPath
110+ :: JSONPathText
105111 -> Scientific
106112 -> Sing (tcs :: NumberConstraint)
107113 -> Validation ()
108−validateNumberConstraint (JSONPath path) num = \case
114+validateNumberConstraint (JSONPathText path) num = \case
109115 SNEq n -> do
110116 let
111117 nlen = withKnownNat n $ natVal n
112118 predicate = fromIntegral nlen == num
113− errMsg = path <> " should be == " <> T.pack (show nlen)
119+ errMsg = "should be == " <> T.pack (show nlen)
114120 warn = vWarning $ mmSingleton path (pure errMsg)
115121 unless predicate warn
116122 SNGt n -> do
117123 let
118124 nlen = withKnownNat n $ natVal n
119125 predicate = num > fromIntegral nlen
120− errMsg = path <> " should be > " <> T.pack (show nlen)
126+ errMsg = "should be > " <> T.pack (show nlen)
121127 warn = vWarning $ mmSingleton path (pure errMsg)
122128 unless predicate warn
123129 SNGe n -> do
124130 let
125131 nlen = withKnownNat n $ natVal n
126132 predicate = num >= fromIntegral nlen
127− errMsg = path <> " should be >= " <> T.pack (show nlen)
133+ errMsg = "should be >= " <> T.pack (show nlen)
128134 warn = vWarning $ mmSingleton path (pure errMsg)
129135 unless predicate warn
130136 SNLt n -> do
131137 let
132138 nlen = withKnownNat n $ natVal n
133− predicate = fromIntegral nlen < num
134− errMsg = path <> " should be < " <> T.pack (show nlen)
139+ predicate = num < fromIntegral nlen
140+ errMsg = "should be < " <> T.pack (show nlen)
135141 warn = vWarning $ mmSingleton path (pure errMsg)
136142 unless predicate warn
137143 SNLe n -> do
138144 let
139145 nlen = withKnownNat n $ natVal n
140− predicate = fromIntegral nlen <= num
141− errMsg = path <> " should be <= " <> T.pack (show nlen)
146+ predicate = num <= fromIntegral nlen
147+ errMsg = "should be <= " <> T.pack (show nlen)
142148 warn = vWarning $ mmSingleton path (pure errMsg)
143149 unless predicate warn
144150
145151validateArrayConstraint
146− :: JSONPath
152+ :: JSONPathText
147153 -> V.Vector a
148154 -> Sing (tcs :: ArrayConstraint)
149155 -> Validation ()
150−validateArrayConstraint (JSONPath path) v = \case
156+validateArrayConstraint (JSONPathText path) v = \case
151157 SAEq n -> do
152158 let
153159 nlen = withKnownNat n $ natVal n
154160 predicate = nlen == fromIntegral (V.length v)
155− 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)
156190 warn = vWarning $ mmSingleton path (pure errMsg)
157191 unless predicate warn
158192
159193validateJsonRepr
160194 :: Sing schema
161− -> [DemotedPathSegment]
195+ -> JSONPath
162196 -> JsonRepr schema
163197 -> Validation ()
164198validateJsonRepr sschema dpath jr = case jr of
@@ -192,7 +226,7 @@ validateJsonRepr sschema dpath jr = case jr of
192226 process cs
193227 process acs
194228 for_ (V.indexed v) $ \(ix, jr') -> do
195− let newPath = dpath <> pure (DIx $ fromIntegral ix)
229+ let newPath = dpath <> pure (Index $ fromIntegral ix)
196230 validateJsonRepr s newPath jr'
197231 ReprOptional d -> case sschema of
198232 SSchemaOptional ss -> case d of
@@ -204,7 +238,7 @@ validateJsonRepr sschema dpath jr = case jr of
204238 go :: Rec FieldRepr (ts :: [(Symbol, Schema)] ) -> Validation ()
205239 go RNil = pure ()
206240 go (f@(FieldRepr d) :& ftl) = do
207− let newPath = dpath <> [DKey (knownFieldName f)]
241+ let newPath = dpath <> [Key (knownFieldName f)]
208242 validateJsonRepr (knownFieldSchema f) newPath d
209243 go ftl
210244 ReprUnion _ -> pure () -- FIXME
@@ -216,7 +250,7 @@ validateJsonRepr sschema dpath jr = case jr of
216250 -- fail "impossible to produce subUnion, please report this as a bug"
217251 -- Just x -> do
218252 -- let
219− -- JSONPath path = demotedPathToText dpath
253+ -- JSONPathText path = demotedPathToText dpath
220254 -- case stl of
221255 -- SNil -> void $ vWarning $ mmSingleton path
222256 -- $ pure "union handling error, please report this as bug"
@@ -247,3 +281,26 @@ toUnion _ = ReprUnion . urelax
247281
248282umatch' :: UElem a as i => Sing a -> Union f as -> Maybe (f a)
249283umatch' _ u = umatch u
284+
285+parseAndValidateJson
286+ :: forall schema
287+ . (FromJSON (JsonRepr schema), TopLevel schema, SingI schema)
288+ => Value
289+ -> ParseResult (JsonRepr schema)
290+parseAndValidateJson v =
291+ case parseEither parseJSON v of
292+ Left s -> DecodingError $ T.pack s
293+ Right jsonRepr ->
294+ let
295+ validate = validateJsonRepr (sing :: Sing schema) [] jsonRepr
296+ res = runIdentity . runValidationTEither $ validate
297+ in case res of
298+ Left em -> ValidationError em
299+ Right () -> Valid jsonRepr
300+
301+parseAndValidateJsonBy
302+ :: (FromJSON (JsonRepr schema), TopLevel schema, SingI schema)
303+ => proxy schema
304+ -> Value
305+ -> ParseResult (JsonRepr schema)
306+parseAndValidateJsonBy _ = parseAndValidateJson
src/Data/Schematic/Verifier.hsnew file+5
@@ -0,0 +1,5 @@
1+module Data.Schematic.Verifier (module X) where
2+
3+import Data.Schematic.Verifier.Array as X
4+import Data.Schematic.Verifier.Number as X
5+import Data.Schematic.Verifier.Text as X
src/Data/Schematic/Verifier/Array.hsnew file+14
@@ -0,0 +1,14 @@
1+module Data.Schematic.Verifier.Array where
2+
3+import {-# SOURCE #-} Data.Schematic.Schema
4+import Data.Schematic.Verifier.Common
5+
6+data VerifiedArrayConstraint =
7+ VAEq Integer
8+ deriving (Show)
9+
10+verifyArrayConstraint ::
11+ [DemotedArrayConstraint] -> Maybe (Maybe VerifiedArrayConstraint)
12+verifyArrayConstraint cs = do
13+ x <- verifyDNEq [x | DAEq x <- cs]
14+ pure $ VAEq <$> x
src/Data/Schematic/Verifier/Common.hsnew file+43
@@ -0,0 +1,43 @@
1+module Data.Schematic.Verifier.Common where
2+
3+import Data.List (nub)
4+
5+simplifyNumberConstraint :: ([Integer] -> Integer) -> [Integer] -> Maybe Integer
6+simplifyNumberConstraint f =
7+ \case
8+ [] -> Nothing
9+ x -> Just $ f x
10+
11+simplifyDNLs :: [Integer] -> Maybe Integer
12+simplifyDNLs = simplifyNumberConstraint minimum
13+
14+simplifyDNGs :: [Integer] -> Maybe Integer
15+simplifyDNGs = simplifyNumberConstraint maximum
16+
17+verifyDNEq :: [Integer] -> Maybe (Maybe Integer)
18+verifyDNEq x =
19+ case nub x of
20+ [] -> Just Nothing
21+ [y] -> Just $ Just y
22+ (_:_:_) -> Nothing
23+
24+verify3 :: Maybe Integer -> Maybe Integer -> Maybe Integer -> Maybe ()
25+verify3 (Just x) (Just y) (Just z) =
26+ if x < y && y < z
27+ then Just ()
28+ else Nothing
29+verify3 _ _ _ = Just ()
30+
31+verify2 :: Maybe Integer -> Maybe Integer -> Maybe ()
32+verify2 (Just x) (Just y) =
33+ if x < y
34+ then Just ()
35+ else Nothing
36+verify2 _ _ = Just ()
37+
38+verifyEquations :: Maybe Integer -> Maybe Integer -> Maybe Integer -> Maybe ()
39+verifyEquations mgt meq mlt = do
40+ verify3 mgt meq mlt
41+ verify2 mgt meq
42+ verify2 meq mlt
43+ verify2 mgt mlt
src/Data/Schematic/Verifier/Number.hsnew file+31
@@ -0,0 +1,31 @@
1+module Data.Schematic.Verifier.Number where
2+
3+import {-# SOURCE #-} Data.Schematic.Schema
4+import Data.Schematic.Verifier.Common
5+
6+toStrictNumber :: [DemotedNumberConstraint] -> [DemotedNumberConstraint]
7+toStrictNumber = map f
8+ where
9+ f (DNLe x) = DNLt (x + 1)
10+ f (DNGe x) = DNGt (x - 1)
11+ f x = x
12+
13+data VerifiedNumberConstraint
14+ = VNEq Integer
15+ | VNBounds (Maybe Integer) (Maybe Integer)
16+ deriving (Show)
17+
18+verifyNumberConstraints
19+ :: [DemotedNumberConstraint]
20+ -> Maybe VerifiedNumberConstraint
21+verifyNumberConstraints cs' = do
22+ let
23+ cs = toStrictNumber cs'
24+ mlt = simplifyDNLs [x | DNLt x <- cs]
25+ mgt = simplifyDNGs [x | DNGt x <- cs]
26+ meq <- verifyDNEq [x | DNEq x <- cs]
27+ verifyEquations mgt meq mlt
28+ Just $
29+ case meq of
30+ Just eq -> VNEq eq
31+ Nothing -> VNBounds mgt mlt
src/Data/Schematic/Verifier/Text.hsnew file+121
@@ -0,0 +1,121 @@
1+module Data.Schematic.Verifier.Text where
2+
3+import Control.Monad
4+import Data.Maybe
5+import {-# SOURCE #-} Data.Schematic.Schema
6+import Data.Schematic.Verifier.Common
7+import Data.Text (Text, unpack)
8+import Text.Regex.TDFA.Pattern
9+import Text.Regex.TDFA.ReadRegex (parseRegex)
10+
11+toStrictTextLength :: [DemotedTextConstraint] -> [DemotedTextConstraint]
12+toStrictTextLength = map f
13+ where
14+ f (DTLe x) = DTLt (x + 1)
15+ f (DTGe x) = DTGt (x - 1)
16+ f x = x
17+
18+data VerifiedTextConstraint
19+ = VTEq Integer
20+ | VTBounds (Maybe Integer) (Maybe Integer)
21+ | VTRegex Text Integer (Maybe Integer)
22+ | VTEnum [Text]
23+ deriving (Show)
24+
25+verifyTextLengthConstraints
26+ :: [DemotedTextConstraint]
27+ -> Maybe (Maybe VerifiedTextConstraint)
28+verifyTextLengthConstraints cs' = do
29+ let
30+ cs = toStrictTextLength cs'
31+ mlt = simplifyDNLs [x | DTLt x <- cs]
32+ mgt = simplifyDNGs [x | DTGt x <- cs]
33+ meq <- verifyDNEq [x | DTEq x <- cs]
34+ verifyEquations mgt meq mlt
35+ case all isNothing ([mgt, meq, mlt] :: [Maybe Integer]) of
36+ True -> Just Nothing
37+ _ ->
38+ Just $
39+ Just $
40+ case meq of
41+ Just eq -> VTEq eq
42+ Nothing -> VTBounds mgt mlt
43+
44+regexLength :: Text -> Maybe (Int, Maybe Int)
45+regexLength regexp =
46+ case parseRegex . unpack $ regexp of
47+ Right (p, _) -> Just (minRegexLength p, maxRegexLength p)
48+ Left _ -> Nothing
49+
50+minRegexLength :: Pattern -> Int
51+minRegexLength p =
52+ case p of
53+ PEmpty -> 0
54+ PChar {..} -> 1
55+ PAny {..} -> 1
56+ PAnyNot {..} -> 1
57+ PQuest _ -> 0
58+ PPlus sch -> minRegexLength $ PBound 1 Nothing sch
59+ PStar _ sch -> minRegexLength $ PBound 0 Nothing sch
60+ PBound low _ sch -> low * minRegexLength sch
61+ PConcat ps -> sum $ fmap minRegexLength ps
62+ POr xs -> minimum $ fmap minRegexLength xs
63+ PDot _ -> 1
64+ PEscape {..} -> 1
65+ PCarat _ -> 0
66+ PDollar _ -> 0
67+ _ -> 0
68+
69+maxRegexLength :: Pattern -> Maybe Int
70+maxRegexLength p =
71+ case p of
72+ PEmpty -> Just 0
73+ PChar _ _ -> Just 1
74+ PAny _ _ -> Just 1
75+ PAnyNot _ _ -> Just 1
76+ PQuest _ -> Just 0
77+ PPlus _ -> Nothing
78+ PStar _ _ -> Nothing
79+ PBound _ mhigh sch -> (*) <$> mhigh <*> maxRegexLength sch
80+ PConcat ps -> sum <$> mapM maxRegexLength ps
81+ POr xs -> maximum <$> mapM maxRegexLength xs
82+ PDot _ -> Just 1
83+ PEscape _ _ -> Just 1
84+ PCarat _ -> Just 0
85+ PDollar _ -> Just 0
86+ _ -> Just 0
87+
88+verifyTextRegexConstraint
89+ :: [DemotedTextConstraint]
90+ -> Maybe (Maybe VerifiedTextConstraint)
91+verifyTextRegexConstraint cs = do
92+ let regexps = [x | DTRegex x <- cs]
93+ case regexps of
94+ [] -> Just Nothing
95+ [x] -> do
96+ (l, mh) <- regexLength x
97+ Just $ Just $ VTRegex x (fromIntegral l) (fromIntegral <$> mh)
98+ _ -> Nothing
99+
100+verifyTextEnumConstraint
101+ :: [DemotedTextConstraint]
102+ -> Maybe (Maybe VerifiedTextConstraint)
103+verifyTextEnumConstraint cs = do
104+ let enums = concat [x | DTEnum x <- cs]
105+ case enums of
106+ [] -> Just Nothing
107+ x -> Just $ Just $ VTEnum x
108+
109+verifyTextConstraints
110+ :: [DemotedTextConstraint]
111+ -> Maybe [VerifiedTextConstraint]
112+verifyTextConstraints cs = do
113+ regexp <- verifyTextRegexConstraint cs
114+ void $
115+ case regexp of
116+ Just (VTRegex _ l mh) ->
117+ verifyTextLengthConstraints (DTGe l : cs ++ maybeToList (DTLe <$> mh))
118+ _ -> pure Nothing
119+ lengths <- verifyTextLengthConstraints cs
120+ enums <- verifyTextEnumConstraint cs
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−50
@@ -1,51 +1,6 @@
1−resolver: nightly-2017-09-17
2−
3−# User packages to be built.
4−# Various formats can be used as shown in the example below.
5−#
6−# packages:
7−# - some-directory
8−# - https://example.com/foo/bar/baz-0.0.2.tar.gz
9−# - location:
10−# git: https://github.com/commercialhaskell/stack.git
11−# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
12−# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a
13−# extra-dep: true
14−# subdirs:
15−# - auto-update
16−# - wai
17−#
18−# A package marked 'extra-dep: true' will only be built if demanded by a
19−# non-dependency (i.e. a user package), and its test suites and benchmarks
20−# will not be run. This is useful for tweaking upstream packages.
21−packages:
22−- '.'
23−
1+resolver: lts-14.22
242extra-deps:
25−- hjsonpointer-1.3.0
26−- hjsonschema-1.7.0
27−- validationt-0.2.0.0
28−
29−# Override default flag values for local packages and extra-deps
30−flags: {}
31−
32−# Extra package databases containing global packages
33−extra-package-dbs: []
34−
35−# Control whether we use the GHC we find on the path
36−# system-ghc: true
37−#
38−# Require a specific version of stack, using version ranges
39−# require-stack-version: -any # Default
40−# require-stack-version: ">=1.4"
41−#
42−# Override the architecture used by stack, especially useful on Windows
43−# arch: i386
44−# arch: x86_64
45−#
46−# Extra directories used by stack for building
47−# extra-include-dirs: [/path/to/dir]
48−# extra-lib-dirs: [/path/to/dir]
49−#
50−# Allow a newer minor version of GHC than the snapshot specifies
51−# compiler-check: newer-minor
3+- hjsonpointer-1.4.0@rev:0
4+- hjsonschema-1.9.0@rev:0
5+- git: https://github.com/typeable/validationt.git
6+ commit: 97fea97c4015ab5e99f3efb2c73e1fef4b8857d8
test/HelpersSpec.hs+6
@@ -1,5 +1,11 @@
11{-# OPTIONS_GHC -Wno-unticked-promoted-constructors #-}
22
3+{-# LANGUAGE LambdaCase #-}
4+
5+{-# LANGUAGE DataKinds #-}
6+{-# LANGUAGE TypeApplications #-}
7+{-# LANGUAGE OverloadedStrings #-}
8+
39module HelpersSpec (spec, main) where
410
511import Control.Lens
test/JsonSchemaSpec.hs+68−3
@@ -1,8 +1,16 @@
1+{-# LANGUAGE LambdaCase #-}
2+
3+{-# LANGUAGE DataKinds #-}
4+{-# LANGUAGE TypeApplications #-}
5+{-# LANGUAGE OverloadedLists #-}
6+{-# LANGUAGE OverloadedStrings #-}
7+
18module JsonSchemaSpec (spec, main) where
29
310import Data.Aeson as J
411import Data.Maybe
512import Data.Proxy
13+import Data.ByteString.Lazy as B
614import Data.Schematic
715import Data.Vinyl
816import JSONSchema.Draft4 as D4
@@ -20,9 +28,30 @@ type SchemaExample = 'SchemaObject FieldsSchema
2028
2129exampleData :: JsonRepr SchemaExample
2230exampleData = withRepr @SchemaExample $
23− field @"foo" [ReprNumber 13]
24− <:&> field @"bar" (pure (ReprText "foo"))
25− <:&> pure RNil
31+ field @"foo" [ReprNumber 13]
32+ :& field @"bar" (pure (ReprText "foo"))
33+ :& RNil
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+ ]
2655
2756spec :: Spec
2857spec = do
@@ -31,6 +60,42 @@ spec = do
3160 fetchHTTPAndValidate schema (toJSON exampleData) >>= \case
3261 Left _ -> fail "failed to validate test example"
3362 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 ()
3499
35100main :: IO ()
36101main = hspec spec
test/LensSpec.hs+9−4
@@ -1,3 +1,8 @@
1+{-# LANGUAGE DataKinds #-}
2+{-# LANGUAGE TypeApplications #-}
3+{-# LANGUAGE OverloadedLists #-}
4+{-# LANGUAGE OverloadedStrings #-}
5+
16module LensSpec (spec, main) where
27
38import Control.Lens
@@ -298,15 +303,15 @@ spec = do
298303 newFooVal = FieldRepr $ ReprArray [ReprNumber 15]
299304 fooProxy = Proxy @"foo"
300305 it "gets the field from an object" $ do
301− fget fooProxy objectData `shouldBe` arrayField
306+ fget @"foo" objectData `shouldBe` arrayField
302307 it "sets the object field" $ do
303− fget fooProxy (fput newFooVal objectData) `shouldBe` newFooVal
308+ fget @"foo" (fput newFooVal objectData) `shouldBe` newFooVal
304309
305310 describe "(using lens library) " $ do
306311 it "get the field from an object" $ do
307− objectData ^. flens (Proxy @"foo") `shouldBe` arrayField
312+ objectData ^. flens @"foo" `shouldBe` arrayField
308313 it "sets the object field" $ do
309− set (flens (Proxy @"foo")) newFooVal objectData ^. flens (Proxy @"foo")
314+ set (flens @"foo") newFooVal objectData ^. flens @"foo"
310315 `shouldBe` newFooVal
311316
312317main :: IO ()
test/SchemaSpec.hs+70−22
@@ -1,31 +1,78 @@
11{-# OPTIONS_GHC -fprint-potential-instances #-}
22
3+{-# LANGUAGE DataKinds #-}
4+{-# LANGUAGE FlexibleContexts #-}
5+{-# LANGUAGE GADTs #-}
6+{-# LANGUAGE OverloadedLists #-}
7+{-# LANGUAGE OverloadedStrings #-}
8+{-# LANGUAGE RankNTypes #-}
9+{-# LANGUAGE ScopedTypeVariables #-}
10+{-# LANGUAGE TypeApplications #-}
11+
312module SchemaSpec (spec, main) where
413
14+import Control.Lens
515import Data.Aeson
616import Data.ByteString.Lazy
717import Data.Functor.Identity
818import Data.Proxy
919import Data.Schematic
20+import Data.Schematic.Generator
21+import Data.Singletons
22+import Data.Tagged
1023import Data.Vinyl
1124import Test.Hspec
25+import Test.Hspec.SmallCheck
26+import Test.SmallCheck as SC
27+import Test.SmallCheck.Drivers as SC
28+import Test.SmallCheck.Series as SC
29+
30+import Debug.Trace
1231
1332type SchemaExample = 'SchemaObject
1433 '[ '("foo", 'SchemaArray '[ 'AEq 1] ('SchemaNumber '[ 'NGt 10]))
1534 , '("bar", 'SchemaOptional ('SchemaText '[ 'TEnum '["foo", "bar"]]))]
1635
36+type SchemaExample2 = 'SchemaObject
37+ '[ '("foo", 'SchemaArray '[ 'AEq 2] ('SchemaText '[ 'TGt 10]))
38+ , '("bar", 'SchemaOptional ('SchemaText '[ 'TRegex "[0-9]+"]))]
39+
1740jsonExample :: JsonRepr SchemaExample
18−jsonExample = withRepr @SchemaExample $
19− field @"bar" (Just $ ReprText "bar")
20− <:&> field @"foo" [ReprNumber 12]
21− <:&> pure RNil
41+jsonExample = withRepr @SchemaExample
42+ $ field @"bar" (Just "bar")
43+ :& field @"foo" [12]
44+ :& RNil
45+
46+type AddQuuz =
47+ 'Migration "add_field_quuz"
48+ '[ 'Diff '[] ('AddKey "quuz" (SchemaNumber '[])) ]
49+
50+type DeleteQuuz =
51+ 'Migration "remove_field_quuz"
52+ '[ 'Diff '[] ( 'DeleteKey "quuz") ]
2253
23−type TestMigration =
24− 'Migration "test_revision"
25− '[ 'Diff '[ 'PKey "bar" ] ('Update ('SchemaText '[]))
26− , 'Diff '[ 'PKey "foo" ] ('Update ('SchemaNumber '[])) ]
54+type SwapFields =
55+ 'Migration "swap_fields"
56+ '[ 'Diff '[ 'PKey "bar" ] ('Update
57+ ('SchemaArray '[ 'AEq 1] ('SchemaNumber '[ 'NGt 10])))
58+ , 'Diff '[ 'PKey "foo" ] ('Update
59+ ('SchemaOptional ('SchemaText '[ 'TEnum '["foo", "bar"]]))) ]
2760
28−type VS = 'Versioned SchemaExample '[ TestMigration ]
61+type Migrations = '[ AddQuuz
62+ , DeleteQuuz ]
63+ -- , SwapFields ]
64+
65+type VersionedJson = 'Versioned SchemaExample Migrations
66+
67+migrationList :: MigrationList Identity VersionedJson
68+migrationList
69+ = (migrateObject (\r -> Identity $ field @"quuz" 42 :& r))
70+ :&& shrinkObject
71+ -- :&& (migrateObject (\r -> Identity
72+ -- $ field @"foo" (r ^. flens (Proxy @"bar") . _Just . optionalRepr)
73+ -- :& field @"bar" (r ^. flens (Proxy @"foo") . arrayRepr)
74+ -- :& RNil))
75+ :&& MNil
2976
3077schemaJson :: ByteString
3178schemaJson = "{\"foo\": [13], \"bar\": null}"
@@ -33,15 +80,11 @@ schemaJson = "{\"foo\": [13], \"bar\": null}"
3380schemaJson2 :: ByteString
3481schemaJson2 = "{\"foo\": [3], \"bar\": null}"
3582
36−topObject
37− :: JsonRepr
38− ('SchemaObject
39− '[ '("foo", 'SchemaNumber '[])
40− , '("bar", 'SchemaText '[])])
41−topObject = ReprObject $
42− FieldRepr (ReprNumber 42)
43− :& FieldRepr (ReprText "test")
44− :& RNil
83+schemaJsonSeries :: Monad m => SC.Series m (JsonRepr SchemaExample)
84+schemaJsonSeries = series
85+
86+schemaJsonSeries2 :: Monad m => SC.Series m (JsonRepr SchemaExample2)
87+schemaJsonSeries2 = series
4588
4689spec :: Spec
4790spec = do
@@ -63,12 +106,17 @@ spec = do
63106 -- `shouldSatisfy` isValid
64107 it "validates versioned json with a migration list" $ do
65108 decodeAndValidateVersionedWithPureMList
66− (Proxy @VS)
67− ((:&&)
68− (Proxy @(SchemaByRevision "test_revision" VS))
69− (const $ Identity topObject) MNil)
109+ (Proxy @VersionedJson)
110+ migrationList
70111 schemaJson
71112 `shouldSatisfy` isValid
113+ it "validates json series" $ property $
114+ SC.over schemaJsonSeries $ \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))
119+
72120
73121main :: IO ()
74122main = hspec spec