master..1190166 · schematic

git.iko.soy/schematic

on 1190166 help sign in

.travis.yml+2−2

since splitsnapshots

unifiedsplit

@@ -1,4 +1,4 @@

1−sudo: required

1+sudo: false

3language: c

@@ -22,4 +22,4 @@ script:

23cache:

24 directories:

25− - $HOME/.stack

25+ - $HOME/.stack

ChangeLog.md−25

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

1# Revision history for schematic

3−## 0.5.0.0 -- 2019-02-20

4−

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

6−parsing error messages.

7−

8−## 0.4.3.0 -- 2018-07-12

9−

10−GHC 8.4 support, dropping support for older GHC versions

11−

12−## 0.4.2.0

13−

14−Support ghc-8.4 and drop support for older versions

15−

16−## 0.4.1.0 -- 2017-11-05

17−

18−Convenience isomorphisms: txt, num, opt, bln etc

19−

20−## 0.4.1.0 -- 2017-11-01

21−

22−flens and fget now use type application syntax

23−

24−## 0.4.0.0 -- 2017-10-17

25−

26−Object building DSL, more convenience helpers, MCons simplified with Tagged

27−

28## 0.3.2.0 -- 2017-10-02

3## 0.3.2.0 -- 2017-10-02

30Fixed FIndex bug, added bunch of convenience isomorphism, re-exports.

5Fixed FIndex bug, added bunch of convenience isomorphism, re-exports.

README.md+26−145

@@ -22,35 +22,9 @@ Be aware that library is experimental and subject to change a lot. The current s

22$ stack install schematic

23```

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:

29−

30−```

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

25## Basic Examples

53−```haskell

27+```

54type SchemaExample

28type SchemaExample

55 = SchemaObject

29 = SchemaObject

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

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

@@ -68,21 +42,21 @@ type SchemaExample

69This one is valid for example

43This one is valid for example

71−```haskell

45+```

72schemaJson :: ByteString

46schemaJson :: ByteString

73schemaJson = "{\"foo\": [13], \"bar\": null}"

47schemaJson = "{\"foo\": [13], \"bar\": null}"

74```

48```

76Also valid

50Also valid

78−```haskell

52+```

79schemaJson :: ByteString

53schemaJson :: ByteString

80schemaJson = "{\"foo\": [13], \"bar\": \"bar\"}"

54schemaJson = "{\"foo\": [13], \"bar\": \"bar\"}"

81```

55```

83it can be parsed and validated like this:

57it can be parsed and validated like this:

85−```haskell

59+```

86decodeAndValidateJson schemaJson :: ParseResult (JsonRepr SchemaExample)

60decodeAndValidateJson schemaJson :: ParseResult (JsonRepr SchemaExample)

87```

61```

@@ -92,64 +66,24 @@ decodeAndValidateJson schemaJson :: ParseResult (JsonRepr SchemaExample)

92* some of the runtime validations have failed, but it's structurally correct

66* some of the runtime validations have failed, but it's structurally correct

93 overall

67 overall

95−It implies a transport layer representation of that data that can be traversed

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.

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

106

107−The most basic and sugar-free way of constructing the same object will look like this:

108

109```

72```

110−jsonExample' :: JsonRepr SchemaExample

73+jsonExample :: JsonRepr SchemaExample

111−jsonExample' = ReprObject $

74+jsonExample = ReprObject $

112 FieldRepr (ReprArray [ReprNumber 12])

75 FieldRepr (ReprArray [ReprNumber 12])

113 :& FieldRepr (ReprOptional (Just (ReprText "bar")))

76 :& FieldRepr (ReprOptional (Just (ReprText "bar")))

114 :& RNil

77 :& RNil

115```

78```

116

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−

138## Migrations

80## Migrations

139

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

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.

148−succession.

149

150This piece of code will apply a migration to the schema, decode and validate the latest version.

84This piece of code will apply a migration to the schema, decode and validate the latest version.

151

152−```haskell

86+```

153type SchemaExample

87type SchemaExample

154 = SchemaObject

88 = SchemaObject

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

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

@@ -157,8 +91,8 @@ type SchemaExample

157

158type TestMigration =

92type TestMigration =

159 'Migration "test_revision"

93 'Migration "test_revision"

160− '[ Diff '[ PKey "bar" ] (Update (SchemaText '[]))

94+ '[ 'Diff '[ 'PKey "bar" ] ('Update ('SchemaText '[]))

161− , Diff '[ PKey "foo" ] (Update (SchemaNumber '[])) ]

95+ , 'Diff '[ 'PKey "foo" ] ('Update ('SchemaNumber '[])) ]

162

163type VS = 'Versioned SchemaExample '[ TestMigration ]

97type VS = 'Versioned SchemaExample '[ TestMigration ]

164

@@ -172,84 +106,31 @@ It's possible to decode the latest version like this:

172decodeAndValidateJson schemaJsonTopVersion :: ParseResult (JsonRepr (TopVersion (AllVersions VS)))

106decodeAndValidateJson schemaJsonTopVersion :: ParseResult (JsonRepr (TopVersion (AllVersions VS)))

173```

107```

174

108

175−It's important to differentiate between schema migrations and data migrations.

109+## Lens-compatibility

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:

180−

181−```haskell

182−type SchemaExample = 'SchemaObject

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

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

185−

186−jsonExample :: JsonRepr SchemaExample

187−jsonExample = withRepr @SchemaExample

188− $ field @"bar" (Just "bar")

189− :& field @"foo" [12]

190− :& RNil

191−

192−type AddQuuz =

193− 'Migration "add_field_quuz"

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

195−

196−type DeleteQuuz =

197− 'Migration "remove_field_quuz"

198− '[ 'Diff '[] ( 'DeleteKey "quuz") ]

199−

200−type Migrations = '[ AddQuuz

201− , DeleteQuuz ]

202−

203−type VersionedJson = 'Versioned SchemaExample Migrations

204

110

205−migrationList :: MigrationList Identity VersionedJson

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:

206−migrationList

207− = (migrateObject (\r -> Identity $ field @"quuz" 42 :& r))

208− :&& shrinkObject

209− :&& MNil

210

112

211```

113```

114+type ArraySchema = 'SchemaArray '[AEq 1] ('SchemaNumber '[NGt 10])

212

115

213−In this instance `Migrations` is a list of schema migrations and

116+type ArrayField = '("foo", ArraySchema)

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.

223−

224−## How do I construct a value of `JsonRepr schema`?

225

117

226−`JsonRepr schema` is a primary representation of a value serializable/deserializable

118+type FieldsSchema =

227−to JSON, but with a twist. It's guaranteed to correspond a type-level schema,

119+ '[ ArrayField, '("bar", 'SchemaOptional ('SchemaText '[TEnum '["foo", "bar"]]))]

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:

232

120

233−```haskell

234−type SchemaExample = 'SchemaObject

121+type SchemaExample = 'SchemaObject FieldsSchema

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

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

237

122

238−jsonExample = withRepr @SchemaExample

239− $ field @"bar" (Just "bar")

240− :& field @"foo" [12]

241− :& RNil

242```

123```

243

124

244−`@foo` syntax is an explicit type application, which is a feature of GHC 8+, it

125+There are two ways of working with named fields in the objects:

245−makes type inference possible without relying on a bunch of `Proxy`s, which

126+

246−makes it syntactically more terse.

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`

247

129

248−[GHC Type Applications](https://ghc.haskell.org/trac/ghc/wiki/TypeApplication)

130+## Export to json-schema (draft 4)

249

131

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

132

133+## TODO

254

134

255−## Export to json-schema (draft 4)

135+* Overall user friendliness

136+* Versioned http endpoints

releasedeleted−43

@@ -1,43 +0,0 @@

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.nixdeleted−32

@@ -1,32 +0,0 @@

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+35−17

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

1name: schematic

2−version: 0.5.0.0

2+version: 0.3.2.0

3synopsis: JSON-biased spec and validation tool

4−description: JSON-biased spec and validation tool. Makes possible to have a schema as a haskell type and derive json instances, validation actions, JSON generation for property-test generically. Built-in lens support.

5license: BSD3

4license: BSD3

6license-file: LICENSE

5license-file: LICENSE

7author: Denis Redozubov

6author: Denis Redozubov

@@ -15,9 +14,6 @@ cabal-version: >=1.10

16library

15library

17 exposed-modules: Data.Schematic

16 exposed-modules: Data.Schematic

18− , Data.Schematic.DSL

19− , Data.Schematic.Generator

20− , Data.Schematic.Generator.Regex

21 , Data.Schematic.Instances

17 , Data.Schematic.Instances

22 , Data.Schematic.JsonSchema

18 , Data.Schematic.JsonSchema

23 , Data.Schematic.Helpers

19 , Data.Schematic.Helpers

@@ -26,11 +22,7 @@ library

26 , Data.Schematic.Path

22 , Data.Schematic.Path

27 , Data.Schematic.Schema

23 , Data.Schematic.Schema

28 , Data.Schematic.Validation

24 , Data.Schematic.Validation

29− , Data.Schematic.Verifier

25+ , Data.Schematic.Utils

30− , Data.Schematic.Verifier.Array

31− , Data.Schematic.Verifier.Common

32− , Data.Schematic.Verifier.Number

33− , Data.Schematic.Verifier.Text

34 ghc-options: -Wall

26 ghc-options: -Wall

35 default-extensions: ConstraintKinds

27 default-extensions: ConstraintKinds

36 , DataKinds

28 , DataKinds

@@ -65,7 +57,7 @@ library

65 , TypeOperators

57 , TypeOperators

66 , TypeSynonymInstances

58 , TypeSynonymInstances

67 , UndecidableInstances

59 , UndecidableInstances

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

60+ build-depends: base >=4.9 && <4.11

69 , bytestring

61 , bytestring

70 , aeson >= 1

62 , aeson >= 1

71 , containers

63 , containers

@@ -75,14 +67,13 @@ library

75 , regex-tdfa

67 , regex-tdfa

76 , regex-tdfa-text

68 , regex-tdfa-text

77 , scientific

69 , scientific

78− , singletons >= 2.4

70+ , singletons >= 2.2

79 , smallcheck

71 , smallcheck

80 , tagged

72 , tagged

81− , template-haskell

82 , text

73 , text

83 , union

74 , union

84 , unordered-containers

75 , unordered-containers

85− , validationt >= 0.2.1.0

76+ , validationt >= 0.1.0.1

86 , vector

77 , vector

87 , vinyl

78 , vinyl

88 hs-source-dirs: src

79 hs-source-dirs: src

@@ -93,9 +84,36 @@ test-suite spec

93 hs-source-dirs: test

84 hs-source-dirs: test

94 main-is: Spec.hs

85 main-is: Spec.hs

95 default-language: Haskell2010

86 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

96 build-depends: HUnit

114 build-depends: HUnit

97 , aeson >= 1

115 , aeson >= 1

98− , base >=4.11 && <4.13

116+ , base >=4.9 && <4.11

99 , bytestring

117 , bytestring

100 , containers

118 , containers

101 , hjsonschema

119 , hjsonschema

@@ -112,9 +130,9 @@ test-suite spec

112 , tagged

130 , tagged

113 , text

131 , text

114 , unordered-containers

132 , unordered-containers

115− , validationt >= 0.2.1.0

133+ , validationt >= 0.1.0.1

116 , vinyl

134 , vinyl

117 other-modules: SchemaSpec

135 other-modules: SchemaSpec

118 , HelpersSpec

136 , HelpersSpec

119 , LensSpec

137 , LensSpec

120− , JsonSchemaSpec

138+ , JsonSchemaSpec

src/Data/Schematic.hs+115−18

@@ -7,6 +7,7 @@ module Data.Schematic

7 , module Data.Schematic.Lens

8 , module Data.Schematic.Migration

9 , module Data.Schematic.Schema

10+ , module Data.Schematic.Utils

10 , decodeAndValidateJson

11 , decodeAndValidateJson

11 , parseAndValidateJson

12 , parseAndValidateJson

12 , parseAndValidateJsonBy

13 , parseAndValidateJsonBy

@@ -20,25 +21,56 @@ module Data.Schematic

20 , ParseResult(..)

21 , ParseResult(..)

21 , withRepr

22 , withRepr

22 , field

23 , field

24+ , (<:&>)

23 ) where

25 ) where

27+import Control.Applicative

25−import Control.Monad.Validation

28+import Control.Monad.Validation

26−import Data.Aeson as J

29+import Data.Aeson as J

27−import Data.Aeson.Types as J

30+import Data.Aeson.Types as J

28−import Data.ByteString.Lazy as BL

31+import Data.ByteString.Lazy as BL

29−import Data.Functor.Identity as F

32+import Data.Functor.Identity

30−import Data.Schematic.DSL

33+import Data.Kind

31−import Data.Schematic.Helpers

34+import Data.Schematic.Helpers

32−import Data.Schematic.JsonSchema

35+import Data.Schematic.JsonSchema

33−import Data.Schematic.Lens

36+import Data.Schematic.Lens

34−import Data.Schematic.Migration

37+import Data.Schematic.Migration

35−import Data.Schematic.Schema

38+import Data.Schematic.Schema

39+import Data.Schematic.Utils

36−import Data.Schematic.Validation

40+import Data.Schematic.Validation

41+import Data.Scientific

37−import Data.Singletons.Prelude hiding ((:.))

42+import Data.Singletons.Prelude

43+import Data.Singletons.TypeLits

38−import Data.Tagged

44+import Data.Tagged

39−import Data.Text as T

45+import Data.Text as T

46+import Data.Union

47+import qualified Data.Vector as V

48+import Data.Vinyl

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+

42parseAndValidateTopVersionJson

74parseAndValidateTopVersionJson

43 :: forall proxy (v :: Versioned)

75 :: forall proxy (v :: Versioned)

44 . (SingI (TopVersion (AllVersions v)))

76 . (SingI (TopVersion (AllVersions v)))

@@ -63,8 +95,7 @@ parseAndValidateWithMList

63 -> J.Value

95 -> J.Value

64 -> m (ParseResult (JsonRepr (Head revisions)))

96 -> m (ParseResult (JsonRepr (Head revisions)))

65parseAndValidateWithMList MNil v = pure $ parseAndValidateJson v

97parseAndValidateWithMList MNil v = pure $ parseAndValidateJson v

66−parseAndValidateWithMList (Tagged f :&& tl) v =

98+parseAndValidateWithMList ((:&&) p f tl) v = case parseAndValidateJsonBy p v of

67− case parseAndValidateJsonBy Proxy v of

68 Valid a -> pure $ Valid a

99 Valid a -> pure $ Valid a

69 DecodingError _ -> do

100 DecodingError _ -> do

70 pr <- parseAndValidateWithMList tl v

101 pr <- parseAndValidateWithMList tl v

@@ -84,6 +115,10 @@ decodeAndValidateJson bs = case decode bs of

84 Nothing -> DecodingError "malformed json"

115 Nothing -> DecodingError "malformed json"

85 Just x -> parseAndValidateJson x

116 Just x -> parseAndValidateJson x

117

118+type family MapSnd (l :: [(a,k)]) = (r :: [k]) where

119+ MapSnd '[] = '[]

120+ MapSnd ( '(a, b) ': tl) = b ': MapSnd tl

121+

87decodeAndValidateVersionedWithMList

122decodeAndValidateVersionedWithMList

88 :: Monad m

123 :: Monad m

89 => proxy versioned

124 => proxy versioned

@@ -96,8 +131,70 @@ decodeAndValidateVersionedWithMList _ mlist bs = case decode bs of

131

97decodeAndValidateVersionedWithPureMList

132decodeAndValidateVersionedWithPureMList

98 :: proxy versioned

133 :: proxy versioned

99− -> MList F.Identity (MapSnd (AllVersions versioned))

134+ -> MList Identity (MapSnd (AllVersions versioned))

100 -> BL.ByteString

135 -> BL.ByteString

101 -> ParseResult (JsonRepr (Head (MapSnd (AllVersions versioned))))

136 -> ParseResult (JsonRepr (Head (MapSnd (AllVersions versioned))))

102decodeAndValidateVersionedWithPureMList a b c =

137decodeAndValidateVersionedWithPureMList a b c =

103 runIdentity $ decodeAndValidateVersionedWithMList a b c

138 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.hsdeleted−92

@@ -1,92 +0,0 @@

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.hsdeleted−91

@@ -1,91 +0,0 @@

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.hsdeleted−76

@@ -1,76 +0,0 @@

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,7 +4,6 @@

4module Data.Schematic.Instances where

6import Data.Scientific

7−import Data.Text (Text, pack)

8import Data.Vector as V

7import Data.Vector as V

9import Data.Vinyl

8import Data.Vinyl

10import Test.SmallCheck.Series

9import Test.SmallCheck.Series

@@ -22,6 +21,3 @@ instance Serial m a => Serial m (V.Vector a) where

23instance Monad m => Serial m Scientific where

22instance Monad m => Serial m Scientific where

24 series = scientific <$> series <*> series

23 series = scientific <$> series <*> series

25−

26−instance Monad m => Serial m Text where

27− series = pack <$> series

src/Data/Schematic/JsonSchema.hs+10−29

@@ -12,10 +12,8 @@ import Control.Monad.State.Strict

12import Data.Aeson as J

13import Data.Foldable as F

14import Data.HashMap.Strict as H

15−import Data.List as L

16import Data.List.NonEmpty as NE

15import Data.List.NonEmpty as NE

17import Data.Schematic.Schema as S

16import Data.Schematic.Schema as S

18−import Data.Set as Set

19import Data.Singletons

17import Data.Singletons

20import Data.Text

18import Data.Text

21import Data.Traversable

19import Data.Traversable

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

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

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

31 { _schemaMinLength = pure $ fromIntegral n

29 { _schemaMinLength = pure $ fromIntegral n

32 , _schemaMaxLength = pure $ fromIntegral n }

30 , _schemaMaxLength = pure $ fromIntegral n }

31+textConstraint (DTLt n) = modify $ \s -> s

32+ { _schemaMaxLength = pure . fromIntegral $ n + 1 }

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

34 { _schemaMaxLength = pure . fromIntegral $ n }

35−textConstraint (DTLt n) =

35+textConstraint (DTGt n) =

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

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

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

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

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

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

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

41 { _schemaMinLength = pure . fromIntegral $ n }

39 { _schemaMinLength = pure . fromIntegral $ n }

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

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

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

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

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

49 { _schemaMaximum = pure . fromIntegral $ n }

47 { _schemaMaximum = pure . fromIntegral $ n }

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

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

51− { _schemaMaximum = pure . fromIntegral $ n

49+ { _schemaMaximum = pure . fromIntegral $ n + 1 }

52− , _schemaExclusiveMaximum = pure True }

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

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

54− { _schemaMinimum = pure . fromIntegral $ n

55− , _schemaExclusiveMinimum = pure True }

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

57 { _schemaMinimum = pure . fromIntegral $ n }

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

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

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

59 { _schemaMinimum = pure $ fromIntegral n

56 { _schemaMinimum = pure $ fromIntegral n

60 , _schemaMaximum = pure $ fromIntegral n }

57 , _schemaMaximum = pure $ fromIntegral n }

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

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

63−arrayConstraint (DALe n) = modify $ \s -> s

60+arrayConstraint (DAEq _) = pure ()

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 }

76toJsonSchema

62toJsonSchema

77 :: forall proxy schema

63 :: forall proxy schema

@@ -98,19 +84,14 @@ toJsonSchema' = \case

98 res <- for objs $ \(n,s) -> do

84 res <- for objs $ \(n,s) -> do

99 s' <- toJsonSchema' s

85 s' <- toJsonSchema' s

100 pure (n, s')

86 pure (n, s')

101− let

102− nonOpt = \case

103− (_, DSchemaOptional _) -> False

104− _ -> True

105 pure $ emptySchema

87 pure $ emptySchema

106 { _schemaType = pure $ TypeValidatorString D4.SchemaObject

88 { _schemaType = pure $ TypeValidatorString D4.SchemaObject

107− , _schemaRequired = pure $ Set.fromList $ fst <$> L.filter nonOpt objs

108 , _schemaProperties = pure $ H.fromList res }

89 , _schemaProperties = pure $ H.fromList res }

109 DSchemaArray acs sch -> do

90 DSchemaArray acs sch -> do

110 res <- toJsonSchema' sch

91 res <- toJsonSchema' sch

111 pure $ execState (traverse_ arrayConstraint acs) $ emptySchema

92 pure $ execState (traverse_ arrayConstraint acs) $ emptySchema

112 { _schemaType = pure $ TypeValidatorString D4.SchemaArray

93 { _schemaType = pure $ TypeValidatorString D4.SchemaArray

113− , _schemaItems = pure $ ItemsObject res }

94+ , _schemaItems = pure $ ItemsArray [res] }

114 DSchemaNull -> pure $ emptySchema

95 DSchemaNull -> pure $ emptySchema

115 { _schemaType = pure $ TypeValidatorString D4.SchemaNull }

96 { _schemaType = pure $ TypeValidatorString D4.SchemaNull }

116 DSchemaOptional sch -> do

97 DSchemaOptional sch -> do

src/Data/Schematic/Lens.hs+37−61

@@ -9,12 +9,6 @@ module Data.Schematic.Lens

9 , FImage

10 , FSubset(..)

11 , obj

12− , arr

13− , uni

14− , txt

15− , num

16− , opt

17− , bln

18 , textRepr

12 , textRepr

19 , numberRepr

13 , numberRepr

20 , boolRepr

14 , boolRepr

@@ -24,11 +18,11 @@ module Data.Schematic.Lens

24 ) where

18 ) where

26import Data.Profunctor

20import Data.Profunctor

21+import Data.Proxy

27import Data.Schematic.Schema

22import Data.Schematic.Schema

28import Data.Scientific

23import Data.Scientific

29import Data.Singletons

24import Data.Singletons

30import Data.Text

25import Data.Text

31−import Data.Union

32import Data.Vector as V

26import Data.Vector as V

33import Data.Vinyl

27import Data.Vinyl

34import Data.Vinyl.Functor

28import Data.Vinyl.Functor

@@ -41,51 +35,51 @@ type family FIndex (r :: Symbol) (rs :: [(Symbol, Schema)]) :: Nat where

41 FIndex r ( '(r, s) ': rs) = 'Z

35 FIndex r ( '(r, s) ': rs) = 'Z

42 FIndex r ( s ': rs) = 'S (FIndex r rs)

36 FIndex r ( s ': rs) = 'S (FIndex r rs)

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−

52class i ~ FIndex fn rs => FElem (fn :: Symbol) (rs :: [(Symbol, Schema)]) (i :: Nat) where

38class i ~ FIndex fn rs => FElem (fn :: Symbol) (rs :: [(Symbol, Schema)]) (i :: Nat) where

53 type ByField fn rs i :: Schema

39 type ByField fn rs i :: Schema

54− flens :: Flens fn f g rs i

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)

56 -- | For Vinyl users who are not using the @lens@ package, we provide a getter.

47 -- | For Vinyl users who are not using the @lens@ package, we provide a getter.

57− fget :: FGetter fn f rs i

48+ fget

49+ :: proxy fn

50+ -> Rec FieldRepr rs

51+ -> FieldRepr '(fn, (ByField fn rs i))

59 -- | For Vinyl users who are not using the @lens@ package, we also provide a

53 -- | For Vinyl users who are not using the @lens@ package, we also provide a

60 -- setter. In general, it will be unambiguous what field is being written to,

54 -- setter. In general, it will be unambiguous what field is being written to,

61 -- and so we do not take a proxy argument here.

55 -- and so we do not take a proxy argument here.

62 fput

56 fput

63− :: f '(fn, ByField fn rs i)

57+ :: FieldRepr '(fn, ByField fn rs i)

64− -> Rec f rs

58+ -> Rec FieldRepr rs

65− -> Rec f rs

59+ -> Rec FieldRepr rs

67instance FElem fn ('(fn, r) ': rs) 'Z where

61instance FElem fn ('(fn, r) ': rs) 'Z where

68 type ByField fn ('(fn, r) ': rs) 'Z = r

62 type ByField fn ('(fn, r) ': rs) 'Z = r

70− flens f (x :& xs) = fmap (:& xs) (f x)

64+ flens _ f (x :& xs) = fmap (:& xs) (f x)

71 {-# INLINE flens #-}

65 {-# INLINE flens #-}

73− fget = getConst . flens Const

67+ fget k = getConst . flens k Const

74 {-# INLINE fget #-}

68 {-# INLINE fget #-}

76− fput y = getIdentity . flens (\_ -> Identity y)

70+ fput y = getIdentity . flens Proxy (\_ -> Identity y)

77 {-# INLINE fput #-}

71 {-# INLINE fput #-}

79instance (FIndex r (s ': rs) ~ 'S i, FElem r rs i) => FElem r (s ': rs) ('S i) where

73instance (FIndex r (s ': rs) ~ 'S i, FElem r rs i) => FElem r (s ': rs) ('S i) where

80 type ByField r (s ': rs) ('S i) = ByField r rs i

74 type ByField r (s ': rs) ('S i) = ByField r rs i

82− flens f (x :& xs) = fmap (x :&) (flens f xs)

76+ flens p f (x :& xs) = fmap (x :&) (flens p f xs)

83 {-# INLINE flens #-}

77 {-# INLINE flens #-}

85− fget = getConst . flens Const

79+ fget k = getConst . flens k Const

86 {-# INLINE fget #-}

80 {-# INLINE fget #-}

88− fput y = getIdentity . flens (\_ -> Identity y)

82+ fput y = getIdentity . flens Proxy (\_ -> Identity y)

89 {-# INLINE fput #-}

83 {-# INLINE fput #-}

91-- This is an internal convenience helpers stolen from the @lens@ library.

85-- This is an internal convenience helpers stolen from the @lens@ library.

@@ -121,24 +115,24 @@ class is ~ FImage rs ss

121 -- > fsubset :: Lens' (Rec FieldRepr ss) (Rec FieldRepr rs)

115 -- > fsubset :: Lens' (Rec FieldRepr ss) (Rec FieldRepr rs)

122 fsubset

116 fsubset

123 :: Functor g

117 :: Functor g

124− => (Rec f rs -> g (Rec f rs))

118+ => (Rec FieldRepr rs -> g (Rec FieldRepr rs))

125− -> Rec f ss

119+ -> Rec FieldRepr ss

126− -> g (Rec f ss)

120+ -> g (Rec FieldRepr ss)

127

121

128 -- | The getter of the 'fsubset' lens is 'fcast', which takes a larger record

122 -- | The getter of the 'fsubset' lens is 'fcast', which takes a larger record

129 -- to a smaller one by forgetting fields.

123 -- to a smaller one by forgetting fields.

130 fcast

124 fcast

131− :: Rec f ss

125+ :: Rec FieldRepr ss

132− -> Rec f rs

126+ -> Rec FieldRepr rs

133 fcast = getConst . fsubset Const

127 fcast = getConst . fsubset Const

134 {-# INLINE fcast #-}

128 {-# INLINE fcast #-}

135

129

136 -- | The setter of the 'fsubset' lens is 'freplace', which allows a slice of

130 -- | The setter of the 'fsubset' lens is 'freplace', which allows a slice of

137 -- a record to be replaced with different values.

131 -- a record to be replaced with different values.

138 freplace

132 freplace

139− :: Rec f rs

133+ :: Rec FieldRepr rs

140− -> Rec f ss

134+ -> Rec FieldRepr ss

141− -> Rec f ss

135+ -> Rec FieldRepr ss

142 freplace rs = getIdentity . fsubset (\_ -> Identity rs)

136 freplace rs = getIdentity . fsubset (\_ -> Identity rs)

143 {-# INLINE freplace #-}

137 {-# INLINE freplace #-}

144

138

@@ -149,59 +143,41 @@ instance

149 ( ByField fn ss i ~ s

143 ( ByField fn ss i ~ s

150 , FElem fn ss i

144 , FElem fn ss i

151 , FSubset rs ss is) => FSubset ( '(fn,s) ': rs) ss (i ': is) where

145 , FSubset rs ss is) => FSubset ( '(fn,s) ': rs) ss (i ': is) where

152− fsubset = lens (\ss -> fget @fn ss :& fcast ss) set

146+ fsubset = lens (\ss -> fget Proxy ss :& fcast ss) set

153 where

147 where

154− set :: Rec f ss -> Rec f ( '(fn,s) ': rs) -> Rec f ss

148+ set :: Rec FieldRepr ss -> Rec FieldRepr ( '(fn,s) ': rs) -> Rec FieldRepr ss

155 set ss (r :& rs) = fput r $ freplace rs ss

149 set ss (r :& rs) = fput r $ freplace rs ss

156

150

157-- A bunch of @Iso@morphisms

151-- A bunch of @Iso@morphisms

158textRepr

152textRepr

159− :: (KnownSymbol fn, SingI cs)

153+ :: (KnownSymbol fn, SingI fn, SingI cs)

160 => Iso' (FieldRepr '(fn, ('SchemaText cs))) Text

154 => Iso' (FieldRepr '(fn, ('SchemaText cs))) Text

161textRepr = iso (\(FieldRepr (ReprText t)) -> t) (FieldRepr . ReprText)

155textRepr = iso (\(FieldRepr (ReprText t)) -> t) (FieldRepr . ReprText)

162

156

163numberRepr

157numberRepr

164− :: (KnownSymbol fn, SingI cs)

158+ :: (KnownSymbol fn, SingI fn, SingI cs)

165 => Iso' (FieldRepr '(fn, ('SchemaNumber cs))) Scientific

159 => Iso' (FieldRepr '(fn, ('SchemaNumber cs))) Scientific

166numberRepr = iso (\(FieldRepr (ReprNumber n)) -> n) (FieldRepr . ReprNumber)

160numberRepr = iso (\(FieldRepr (ReprNumber n)) -> n) (FieldRepr . ReprNumber)

167

161

168boolRepr

162boolRepr

169− :: (KnownSymbol fn)

163+ :: (KnownSymbol fn, SingI fn, SingI cs)

170 => Iso' (FieldRepr '(fn, 'SchemaBoolean)) Bool

164 => Iso' (FieldRepr '(fn, 'SchemaBoolean)) Bool

171boolRepr = iso (\(FieldRepr (ReprBoolean b)) -> b) (FieldRepr . ReprBoolean)

165boolRepr = iso (\(FieldRepr (ReprBoolean b)) -> b) (FieldRepr . ReprBoolean)

172

166

173arrayRepr

167arrayRepr

174− :: (KnownSymbol fn, SingI cs, SingI schema)

168+ :: (KnownSymbol fn, SingI fn, SingI cs, SingI schema)

175 => Iso' (FieldRepr '(fn, ('SchemaArray cs schema))) (V.Vector (JsonRepr schema))

169 => Iso' (FieldRepr '(fn, ('SchemaArray cs schema))) (V.Vector (JsonRepr schema))

176arrayRepr = iso (\(FieldRepr (ReprArray a)) -> a) (FieldRepr . ReprArray)

170arrayRepr = iso (\(FieldRepr (ReprArray a)) -> a) (FieldRepr . ReprArray)

177

171

178objectRepr

172objectRepr

179− :: (KnownSymbol fn, SingI fields)

173+ :: (KnownSymbol fn, SingI fn, SingI fields)

180 => Iso' (FieldRepr '(fn, ('SchemaObject fields))) (Rec FieldRepr fields)

174 => Iso' (FieldRepr '(fn, ('SchemaObject fields))) (Rec FieldRepr fields)

181objectRepr = iso (\(FieldRepr (ReprObject o)) -> o) (FieldRepr . ReprObject)

175objectRepr = iso (\(FieldRepr (ReprObject o)) -> o) (FieldRepr . ReprObject)

182

176

183optionalRepr

177optionalRepr

184− :: (KnownSymbol fn, SingI schema)

178+ :: (KnownSymbol fn, SingI fn, SingI schema)

185 => Iso' (FieldRepr '(fn, ('SchemaOptional schema))) (Maybe (JsonRepr schema))

179 => Iso' (FieldRepr '(fn, ('SchemaOptional schema))) (Maybe (JsonRepr schema))

186optionalRepr = iso (\(FieldRepr (ReprOptional r)) -> r) (FieldRepr . ReprOptional)

180optionalRepr = iso (\(FieldRepr (ReprOptional r)) -> r) (FieldRepr . ReprOptional)

187

181

188−obj :: Iso' (JsonRepr ('SchemaObject fields)) (Rec FieldRepr fields)

182+obj :: (SingI fields) => Iso' (JsonRepr ('SchemaObject fields)) (Rec FieldRepr fields)

189obj = iso (\(ReprObject r) -> r) ReprObject

183obj = 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+8−45

@@ -1,19 +1,13 @@

1{-# LANGUAGE AllowAmbiguousTypes #-}

2−{-# LANGUAGE CPP #-}

3−{-# LANGUAGE TemplateHaskell #-}

2+{-# LANGUAGE TemplateHaskell #-}

5module Data.Schematic.Migration where

4module Data.Schematic.Migration where

7import Data.Kind

6import Data.Kind

8−import Data.Schematic.DSL

9−import Data.Schematic.Lens

10import Data.Schematic.Path

7import Data.Schematic.Path

11import Data.Schematic.Schema

8import Data.Schematic.Schema

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

9+import Data.Singletons.Prelude hiding (All)

13import Data.Singletons.TypeLits

10import Data.Singletons.TypeLits

14−import Data.Tagged

15−import Data.Vinyl

16−import Data.Vinyl.Functor

19data Path

13data Path

@@ -43,8 +37,8 @@ type family SchemaByKey (fs :: [(Symbol, Schema)]) (s :: Symbol) :: Schema where

43 SchemaByKey ( '(a, s) ': tl) fn = SchemaByKey tl fn

37 SchemaByKey ( '(a, s) ': tl) fn = SchemaByKey tl fn

45type family DeleteKey (acc :: [(Symbol, Schema)]) (fn :: Symbol) (fs :: [(Symbol, Schema)]) :: [(Symbol, Schema)] where

39type family DeleteKey (acc :: [(Symbol, Schema)]) (fn :: Symbol) (fs :: [(Symbol, Schema)]) :: [(Symbol, Schema)] where

46− DeleteKey acc fn ('(fn, a) ': tl) = acc ++ tl

40+ DeleteKey acc fn ('(fn, a) ': tl) = acc :++ tl

47− DeleteKey acc fn (fna ': tl) = acc ++ (fna ': tl)

41+ DeleteKey acc fn (fna ': tl) = acc :++ (fna ': tl)

49type family UpdateKey

43type family UpdateKey

50 (fn :: Symbol)

44 (fn :: Symbol)

@@ -97,8 +91,7 @@ type family ElemOf (e :: k) (l :: [(a,k)]) :: Constraint where

97type family AllVersions (vd :: Versioned) :: [(Revision, Schema)] where

91type family AllVersions (vd :: Versioned) :: [(Revision, Schema)] where

98 AllVersions ('Versioned s ms) = Reverse (AllVersions' '[ '("initial", s) ] ms)

92 AllVersions ('Versioned s ms) = Reverse (AllVersions' '[ '("initial", s) ] ms)

100−type family AllVersions' (acc :: [(Revision, Schema)]) (ms :: [Migration])

94+type family AllVersions' (acc :: [(Revision, Schema)]) (ms :: [Migration]) = (r :: [(Revision, Schema)]) where

101− = (r :: [(Revision, Schema)]) where

102 AllVersions' acc '[] = acc

95 AllVersions' acc '[] = acc

103 AllVersions' ( '(rh, sh) ': tl ) (m ': ms) =

96 AllVersions' ( '(rh, sh) ': tl ) (m ': ms) =

104 AllVersions' ( '(rh, sh) ': ApplyMigration m sh ': tl ) ms

97 AllVersions' ( '(rh, sh) ': ApplyMigration m sh ': tl ) ms

@@ -145,43 +138,13 @@ data instance Sing (v :: Versioned) where

145 -> Sing (ms :: [Migration]) -- a bunch of migrations

138 -> Sing (ms :: [Migration]) -- a bunch of migrations

146 -> Sing ('Versioned s ms)

139 -> Sing ('Versioned s ms)

147

140

148−type DataMigration s m h = Tagged s (JsonRepr h -> m (JsonRepr s))

149−

150−data MList :: (Type -> Type) -> [Schema] -> Type where

141+data MList :: (* -> *) -> [Schema] -> Type where

151 MNil :: (Monad m, SingI s, TopLevel s) => MList m '[s]

142 MNil :: (Monad m, SingI s, TopLevel s) => MList m '[s]

152 (:&&)

143 (:&&)

153 :: (TopLevel s, SingI s)

144 :: (TopLevel s, SingI s)

154− => DataMigration s m h

145+ => proxy s

146+ -> (JsonRepr h -> m (JsonRepr s))

155 -> MList m (h ': tl)

147 -> MList m (h ': tl)

156 -> MList m (s ': h ': tl)

148 -> MList m (s ': h ': tl)

157

149

158infixr 7 :&&

150infixr 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+17−6

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

1module Data.Schematic.Path where

3import Data.Foldable as F

4+import Data.Monoid

5+import Data.Schematic.Utils

6+import Data.Singletons

4import Data.Singletons.Prelude

7import Data.Singletons.Prelude

5import Data.Singletons.TypeLits

8import Data.Singletons.TypeLits

6import Data.Text as T

9import Data.Text as T

@@ -9,8 +12,16 @@ import Data.Text as T

9data PathSegment = Key Symbol | Ix Nat

12data PathSegment = Key Symbol | Ix Nat

11data instance Sing (jp :: PathSegment) where

14data instance Sing (jp :: PathSegment) where

12− SKey :: (SingI k) => Sing (k :: Symbol) -> Sing ('Key k)

15+ SKey :: (KnownSymbol k, Known (Sing k)) => Sing (k :: Symbol) -> Sing ('Key k)

13− SIx :: (SingI n) => Sing (n :: Nat) -> Sing ('Ix n)

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

15data DemotedPathSegment = DKey Text | DIx Integer

26data DemotedPathSegment = DKey Text | DIx Integer

16 deriving (Show)

27 deriving (Show)

@@ -24,10 +35,10 @@ demotePath = go []

24 where

35 where

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

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

26 go acc SNil = acc

37 go acc SNil = acc

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

38+ go acc (SCons p ps) = go (acc ++ [demote p]) ps

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

39+ demote :: Sing (ps :: PathSegment) -> DemotedPathSegment

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

40+ demote (SKey s) = DKey $ T.pack $ symbolVal s

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

41+ demote (SIx n) = DIx $ natVal n

32demotedPathToText :: [DemotedPathSegment] -> JSONPath

43demotedPathToText :: [DemotedPathSegment] -> JSONPath

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

44demotedPathToText = JSONPath . F.foldl' renderPathSegment ""

src/Data/Schematic/Schema.hs+60−165

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

1{-# LANGUAGE AllowAmbiguousTypes #-}

2−{-# LANGUAGE CPP #-}

3−{-# LANGUAGE OverloadedLists #-}

2+{-# LANGUAGE OverloadedLists #-}

4−{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE OverloadedStrings #-}

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

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

7module Data.Schematic.Schema where

6module Data.Schematic.Schema where

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

13import Data.HashMap.Strict as H

12import Data.HashMap.Strict as H

14import Data.Kind

13import Data.Kind

15import Data.Maybe

14import Data.Maybe

16−import Data.Schematic.Generator

17import Data.Schematic.Instances ()

15import Data.Schematic.Instances ()

18import Data.Scientific

16import Data.Scientific

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

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

@@ -24,10 +22,8 @@ import Data.Union

24import Data.Vector as V

22import Data.Vector as V

25import Data.Vinyl hiding (Dict)

23import Data.Vinyl hiding (Dict)

26import qualified Data.Vinyl.TypeLevel as V

24import qualified Data.Vinyl.TypeLevel as V

27−import GHC.Exts

28import GHC.Generics (Generic)

25import GHC.Generics (Generic)

29−import GHC.TypeLits

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

26+import GHC.TypeLits (SomeNat(..), SomeSymbol(..), someSymbolVal, someNatVal)

31import Prelude as P

27import Prelude as P

32import Test.SmallCheck.Series

28import Test.SmallCheck.Series

@@ -51,33 +47,33 @@ data TextConstraint

51instance SingKind TextConstraint where

47instance SingKind TextConstraint where

52 type Demote TextConstraint = DemotedTextConstraint

48 type Demote TextConstraint = DemotedTextConstraint

53 fromSing = \case

49 fromSing = \case

54− STEq n -> withKnownNat n (DTEq . fromIntegral $ natVal n)

50+ STEq n -> withKnownNat n (DTEq $ natVal n)

55− STLt n -> withKnownNat n (DTLt . fromIntegral $ natVal n)

51+ STLt n -> withKnownNat n (DTLt $ natVal n)

56− STLe n -> withKnownNat n (DTLe . fromIntegral $ natVal n)

52+ STLe n -> withKnownNat n (DTLe $ natVal n)

57− STGt n -> withKnownNat n (DTGt . fromIntegral $ natVal n)

53+ STGt n -> withKnownNat n (DTGt $ natVal n)

58− STGe n -> withKnownNat n (DTGe . fromIntegral $ natVal n)

54+ STGe n -> withKnownNat n (DTGe $ natVal n)

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

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

60 STEnum s -> let

56 STEnum s -> let

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

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

62− d SNil = []

58+ d SNil = []

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

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

64 in DTEnum $ d s

60 in DTEnum $ d s

65 toSing = \case

61 toSing = \case

66 DTEq n -> case someNatVal n of

62 DTEq n -> case someNatVal n of

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

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

68− Nothing -> error "Negative singleton nat"

64+ Nothing -> error "Negative singleton nat"

69 DTLt n -> case someNatVal n of

65 DTLt n -> case someNatVal n of

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

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

71− Nothing -> error "Negative singleton nat"

67+ Nothing -> error "Negative singleton nat"

72 DTLe n -> case someNatVal n of

68 DTLe n -> case someNatVal n of

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

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

74− Nothing -> error "Negative singleton nat"

70+ Nothing -> error "Negative singleton nat"

75 DTGt n -> case someNatVal n of

71 DTGt n -> case someNatVal n of

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

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

77− Nothing -> error "Negative singleton nat"

73+ Nothing -> error "Negative singleton nat"

78 DTGe n -> case someNatVal n of

74 DTGe n -> case someNatVal n of

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

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

80− Nothing -> error "Negative singleton nat"

76+ Nothing -> error "Negative singleton nat"

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

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

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

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

83 DTEnum ss -> case toSing ss of

79 DTEnum ss -> case toSing ss of

@@ -91,7 +87,7 @@ data DemotedTextConstraint

91 | DTGe Integer

87 | DTGe Integer

92 | DTRegex Text

88 | DTRegex Text

93 | DTEnum [Text]

89 | DTEnum [Text]

94− deriving (Generic, Eq, Show)

90+ deriving (Generic)

96data instance Sing (tc :: TextConstraint) where

92data instance Sing (tc :: TextConstraint) where

97 STEq :: Sing n -> Sing ('TEq n)

93 STEq :: Sing n -> Sing ('TEq n)

@@ -132,7 +128,7 @@ data DemotedNumberConstraint

132 | DNGt Integer

128 | DNGt Integer

133 | DNGe Integer

129 | DNGe Integer

134 | DNEq Integer

130 | DNEq Integer

135− deriving (Generic, Eq, Show)

131+ deriving (Generic)

136

132

137data instance Sing (nc :: NumberConstraint) where

133data instance Sing (nc :: NumberConstraint) where

138 SNEq :: Sing n -> Sing ('NEq n)

134 SNEq :: Sing n -> Sing ('NEq n)

@@ -156,87 +152,51 @@ instance Eq (Sing ('NGe n)) where _ == _ = True

156instance SingKind NumberConstraint where

152instance SingKind NumberConstraint where

157 type Demote NumberConstraint = DemotedNumberConstraint

153 type Demote NumberConstraint = DemotedNumberConstraint

158 fromSing = \case

154 fromSing = \case

159− SNEq n -> withKnownNat n (DNEq . fromIntegral $ natVal n)

155+ SNEq n -> withKnownNat n (DNEq $ natVal n)

160− SNGt n -> withKnownNat n (DNGt . fromIntegral $ natVal n)

156+ SNGt n -> withKnownNat n (DNGt $ natVal n)

161− SNGe n -> withKnownNat n (DNGe . fromIntegral $ natVal n)

157+ SNGe n -> withKnownNat n (DNGe $ natVal n)

162− SNLt n -> withKnownNat n (DNLt . fromIntegral $ natVal n)

158+ SNLt n -> withKnownNat n (DNLt $ natVal n)

163− SNLe n -> withKnownNat n (DNLe . fromIntegral $ natVal n)

159+ SNLe n -> withKnownNat n (DNLe $ natVal n)

164 toSing = \case

160 toSing = \case

165 DNEq n -> case someNatVal n of

161 DNEq n -> case someNatVal n of

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

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

167− Nothing -> error "Negative singleton nat"

163+ Nothing -> error "Negative singleton nat"

168 DNGt n -> case someNatVal n of

164 DNGt n -> case someNatVal n of

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

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

170− Nothing -> error "Negative singleton nat"

166+ Nothing -> error "Negative singleton nat"

171 DNGe n -> case someNatVal n of

167 DNGe n -> case someNatVal n of

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

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

173− Nothing -> error "Negative singleton nat"

169+ Nothing -> error "Negative singleton nat"

174 DNLt n -> case someNatVal n of

170 DNLt n -> case someNatVal n of

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

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

176− Nothing -> error "Negative singleton nat"

172+ Nothing -> error "Negative singleton nat"

177 DNLe n -> case someNatVal n of

173 DNLe n -> case someNatVal n of

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

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

179− Nothing -> error "Negative singleton nat"

175+ Nothing -> error "Negative singleton nat"

180

176

181data ArrayConstraint

177data ArrayConstraint

182 = AEq Nat

178 = AEq Nat

183− | AGt Nat

184− | AGe Nat

185− | ALt Nat

186− | ALe Nat

187 deriving (Generic)

179 deriving (Generic)

188

180

189data DemotedArrayConstraint

181data DemotedArrayConstraint

190 = DAEq Integer

182 = DAEq Integer

191− | DAGt Integer

192− | DAGe Integer

193− | DALt Integer

194− | DALe Integer

195− deriving (Generic, Eq, Show)

183+ deriving (Generic)

196

184

197data instance Sing (ac :: ArrayConstraint) where

185data instance Sing (ac :: ArrayConstraint) where

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

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

203

187

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

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

209

189

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

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

215

191

216instance SingKind ArrayConstraint where

192instance SingKind ArrayConstraint where

217 type Demote ArrayConstraint = DemotedArrayConstraint

193 type Demote ArrayConstraint = DemotedArrayConstraint

218 fromSing = \case

194 fromSing = \case

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

195+ SAEq n -> withKnownNat n (DAEq $ 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)

224 toSing = \case

196 toSing = \case

225 DAEq n -> case someNatVal n of

197 DAEq n -> case someNatVal n of

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

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

227− Nothing -> error "Negative singleton nat"

228− DAGt n -> case someNatVal n of

229− Just (SomeNat (_ :: Proxy n)) -> SomeSing (SAGt (SNat :: Sing n))

230− Nothing -> error "Negative singleton nat"

231− DAGe n -> case someNatVal n of

232− Just (SomeNat (_ :: Proxy n)) -> SomeSing (SAGe (SNat :: Sing n))

233− Nothing -> error "Negative singleton nat"

234− DALt n -> case someNatVal n of

235− Just (SomeNat (_ :: Proxy n)) -> SomeSing (SALt (SNat :: Sing n))

236− Nothing -> error "Negative singleton nat"

237− DALe n -> case someNatVal n of

238− Just (SomeNat (_ :: Proxy n)) -> SomeSing (SALe (SNat :: Sing n))

239− Nothing -> error "Negative singleton nat"

199+ Nothing -> error "Negative singleton nat"

240

200

241data Schema

201data Schema

242 = SchemaText [TextConstraint]

202 = SchemaText [TextConstraint]

@@ -258,7 +218,7 @@ data DemotedSchema

258 | DSchemaNull

218 | DSchemaNull

259 | DSchemaOptional DemotedSchema

219 | DSchemaOptional DemotedSchema

260 | DSchemaUnion [DemotedSchema]

220 | DSchemaUnion [DemotedSchema]

261− deriving (Generic, Eq, Show)

221+ deriving (Generic)

262

222

263data instance Sing (schema :: Schema) where

223data instance Sing (schema :: Schema) where

264 SSchemaText :: Sing tcs -> Sing ('SchemaText tcs)

224 SSchemaText :: Sing tcs -> Sing ('SchemaText tcs)

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

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

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

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

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

375

335

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−

401-- | Move to the union package

336-- | Move to the union package

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

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

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

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

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

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

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

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

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

407

342

408−instance Show (JsonRepr 'SchemaBoolean) where

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

410−

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

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

412

344

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

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

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

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

415

347

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

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

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

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

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

425−#endif

426

350

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

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

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

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

429

353

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

354+instance (Monad m, Serial m Text)

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

355+ => Serial m (JsonRepr ('SchemaText cs)) where

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

356+ series = cons1 ReprText

357+

358+instance (Monad m, Serial m Scientific)

359+ => Serial m (JsonRepr ('SchemaNumber cs)) where

360+ series = cons1 ReprNumber

361+

362+instance Monad m => Serial m (JsonRepr 'SchemaNull) where

363+ series = cons0 ReprNull

364+

365+instance (Serial m (V.Vector (JsonRepr s)))

366+ => Serial m (JsonRepr ('SchemaArray cs s)) where

367+ series = cons1 ReprArray

368+

369+instance (Serial m (JsonRepr s))

370+ => Serial m (JsonRepr ('SchemaOptional s)) where

371+ series = cons1 ReprOptional

372+

373+instance (Monad m, Serial m (Rec FieldRepr fs))

374+ => Serial m (JsonRepr ('SchemaObject fs)) where

375+ series = cons1 ReprObject

433

376

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

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

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

378 ReprObject a == ReprObject b = a == b

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

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

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

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

384 ReprNumber a == ReprNumber b = a == b

442

385

443−instance Eq (JsonRepr 'SchemaBoolean) where

444− ReprBoolean a == ReprBoolean b = a == b

445−

446instance Eq (JsonRepr 'SchemaNull) where

386instance Eq (JsonRepr 'SchemaNull) where

447 ReprNull == ReprNull = True

387 ReprNull == ReprNull = True

448

388

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

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

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

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

393 ReprOptional a == ReprOptional b = a == b

454

394

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−

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

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

486− fromList = ReprArray . GHC.Exts.fromList

487− toList (ReprArray v) = GHC.Exts.toList v

488−

489−instance Num (JsonRepr ('SchemaNumber cs)) where

490− ReprNumber a + ReprNumber b = ReprNumber $ a + b

491− ReprNumber a - ReprNumber b = ReprNumber $ a - b

492− ReprNumber a * ReprNumber b = ReprNumber $ a * b

493− abs (ReprNumber a) = ReprNumber $ abs a

494− signum (ReprNumber a) = ReprNumber $ signum a

495− fromInteger = ReprNumber . fromIntegral

496−

497−instance IsString (JsonRepr ('SchemaText cs)) where

498− fromString = ReprText . fromString

499−

500fromOptional

395fromOptional

501 :: SingI s

396 :: SingI s

502 => Sing ('SchemaOptional s)

397 => Sing ('SchemaOptional s)

@@ -542,25 +437,25 @@ instance SingI schema => J.FromJSON (JsonRepr schema) where

542 fieldRepr <- case s of

437 fieldRepr <- case s of

543 SSchemaText so -> case H.lookup fieldName h of

438 SSchemaText so -> case H.lookup fieldName h of

544 Just v -> withSingI so $ FieldRepr <$> parseJSON v

439 Just v -> withSingI so $ FieldRepr <$> parseJSON v

545− Nothing -> fail $ "No text field: " P.++ show fieldName

440+ Nothing -> fail "schematext"

546 SSchemaNumber so -> case H.lookup fieldName h of

441 SSchemaNumber so -> case H.lookup fieldName h of

547 Just v -> withSingI so $ FieldRepr <$> parseJSON v

442 Just v -> withSingI so $ FieldRepr <$> parseJSON v

548− Nothing -> fail $ "No number field: " P.++ show fieldName

443+ Nothing -> fail "schemanumber"

549 SSchemaBoolean -> case H.lookup fieldName h of

444 SSchemaBoolean -> case H.lookup fieldName h of

550 Just v -> FieldRepr <$> parseJSON v

445 Just v -> FieldRepr <$> parseJSON v

551− Nothing -> fail $ "No boolean field: " P.++ show fieldName

446+ Nothing -> fail "schemaboolean"

552 SSchemaNull -> case H.lookup fieldName h of

447 SSchemaNull -> case H.lookup fieldName h of

553 Just v -> FieldRepr <$> parseJSON v

448 Just v -> FieldRepr <$> parseJSON v

554− Nothing -> fail $ "No null field: " P.++ show fieldName

449+ Nothing -> fail "schemanull"

555 SSchemaArray sa sb -> case H.lookup fieldName h of

450 SSchemaArray sa sb -> case H.lookup fieldName h of

556 Just v -> withSingI sa $ withSingI sb $ FieldRepr <$> parseJSON v

451 Just v -> withSingI sa $ withSingI sb $ FieldRepr <$> parseJSON v

557− Nothing -> fail $ "No array field: " P.++ show fieldName

452+ Nothing -> fail "schemaarray"

558 SSchemaObject so -> case H.lookup fieldName h of

453 SSchemaObject so -> case H.lookup fieldName h of

559 Just v -> withSingI so $ FieldRepr <$> parseJSON v

454 Just v -> withSingI so $ FieldRepr <$> parseJSON v

560− Nothing -> fail $ "No object field" P.++ show fieldName

455+ Nothing -> fail "schemaobject"

561 SSchemaOptional so -> case H.lookup fieldName h of

456 SSchemaOptional so -> case H.lookup fieldName h of

562 Just v -> withSingI so $ FieldRepr <$> parseJSON v

457 Just v -> withSingI so $ FieldRepr <$> parseJSON v

563− Nothing -> withSingI so $ pure $ FieldRepr $ ReprOptional Nothing

458+ Nothing -> fail "schemaoptional"

564 SSchemaUnion ss -> withSingI ss $ FieldRepr <$> parseUnion ss value

459 SSchemaUnion ss -> withSingI ss $ FieldRepr <$> parseUnion ss value

565 (fieldRepr :&) <$> demoteFields tl h

460 (fieldRepr :&) <$> demoteFields tl h

566 ReprObject <$> withObject "Object" (demoteFields fs) value

461 ReprObject <$> withObject "Object" (demoteFields fs) value

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

572 toJSON (ReprText t) = J.String t

467 toJSON (ReprText t) = J.String t

573 toJSON (ReprNumber n) = J.Number n

468 toJSON (ReprNumber n) = J.Number n

574 toJSON (ReprOptional s) = case s of

469 toJSON (ReprOptional s) = case s of

575− Just v -> toJSON v

470+ Just v -> toJSON v

576 Nothing -> J.Null

471 Nothing -> J.Null

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

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

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

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

src/Data/Schematic/Schema.hs-bootdeleted−95

@@ -1,95 +0,0 @@

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.hsnew file+42

@@ -0,0 +1,42 @@

1+{-# LANGUAGE AllowAmbiguousTypes #-}

3+module Data.Schematic.Utils where

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+20−76

@@ -2,13 +2,12 @@ module Data.Schematic.Validation where

3import Control.Monad

4import Control.Monad.Validation

5−import Data.Aeson

6−import Data.Aeson.Types

7import Data.Foldable

5import Data.Foldable

8import Data.Functor.Identity

6import Data.Functor.Identity

9import Data.Monoid

7import Data.Monoid

10import Data.Schematic.Path

8import Data.Schematic.Path

11import Data.Schematic.Schema

9import Data.Schematic.Schema

10+import Data.Schematic.Utils ()

12import Data.Scientific

11import Data.Scientific

13import Data.Singletons.Prelude

12import Data.Singletons.Prelude

14import Data.Singletons.TypeLits

13import Data.Singletons.TypeLits

@@ -32,10 +31,6 @@ data ParseResult a

32 | ValidationError ErrorMap -- runtime

31 | ValidationError ErrorMap -- runtime

33 deriving (Show, Eq, Functor, Foldable, Traversable)

32 deriving (Show, Eq, Functor, Foldable, Traversable)

35−instance (TopLevel a, SingI a, FromJSON (JsonRepr a))

36− => FromJSON (ParseResult (JsonRepr a)) where

37− parseJSON = pure . parseAndValidateJson @a

38−

39isValid :: ParseResult a -> Bool

34isValid :: ParseResult a -> Bool

40isValid (Valid _) = True

35isValid (Valid _) = True

41isValid _ = False

36isValid _ = False

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

58 let

53 let

59 nlen = withKnownNat n $ natVal n

54 nlen = withKnownNat n $ natVal n

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

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

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

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

62 warn = vWarning $ mmSingleton path (pure errMsg)

57 warn = vWarning $ mmSingleton path (pure errMsg)

63 unless predicate warn

58 unless predicate warn

64 STLt n -> do

59 STLt n -> do

65 let

60 let

66 nlen = withKnownNat n $ natVal n

61 nlen = withKnownNat n $ natVal n

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

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

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

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

69 warn = vWarning $ mmSingleton path (pure errMsg)

64 warn = vWarning $ mmSingleton path (pure errMsg)

70 unless predicate warn

65 unless predicate warn

71 STLe n -> do

66 STLe n -> do

72 let

67 let

73 nlen = withKnownNat n $ natVal n

68 nlen = withKnownNat n $ natVal n

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

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

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

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

76 warn = vWarning $ mmSingleton path (pure errMsg)

71 warn = vWarning $ mmSingleton path (pure errMsg)

77 unless predicate warn

72 unless predicate warn

78 STGt n -> do

73 STGt n -> do

79 let

74 let

80 nlen = withKnownNat n $ natVal n

75 nlen = withKnownNat n $ natVal n

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

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

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

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

83 warn = vWarning $ mmSingleton path (pure errMsg)

78 warn = vWarning $ mmSingleton path (pure errMsg)

84 unless predicate warn

79 unless predicate warn

85 STGe n -> do

80 STGe n -> do

86 let

81 let

87 nlen = withKnownNat n $ natVal n

82 nlen = withKnownNat n $ natVal n

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

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

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

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

90 warn = vWarning $ mmSingleton path (pure errMsg)

85 warn = vWarning $ mmSingleton path (pure errMsg)

91 unless predicate warn

86 unless predicate warn

92 STRegex r -> do

87 STRegex r -> do

93 let

88 let

94 regex = withKnownSymbol r $ fromSing r

89 regex = withKnownSymbol r $ fromSing r

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

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

96− errMsg = "must match " <> regex

91+ errMsg = path <> " must match " <> regex

97 warn = vWarning $ mmSingleton path (pure errMsg)

92 warn = vWarning $ mmSingleton path (pure errMsg)

98 unless predicate warn

93 unless predicate warn

99 STEnum ss -> do

94 STEnum ss -> do

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

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

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

102 matching SNil = False

97 matching SNil = False

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

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

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

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

105 warn = vWarning $ mmSingleton path (pure errMsg)

100 warn = vWarning $ mmSingleton path (pure errMsg)

106 unless (matching ss) warn

101 unless (matching ss) warn

107

102

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

115 let

110 let

116 nlen = withKnownNat n $ natVal n

111 nlen = withKnownNat n $ natVal n

117 predicate = fromIntegral nlen == num

112 predicate = fromIntegral nlen == num

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

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

119 warn = vWarning $ mmSingleton path (pure errMsg)

114 warn = vWarning $ mmSingleton path (pure errMsg)

120 unless predicate warn

115 unless predicate warn

121 SNGt n -> do

116 SNGt n -> do

122 let

117 let

123 nlen = withKnownNat n $ natVal n

118 nlen = withKnownNat n $ natVal n

124 predicate = num > fromIntegral nlen

119 predicate = num > fromIntegral nlen

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

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

126 warn = vWarning $ mmSingleton path (pure errMsg)

121 warn = vWarning $ mmSingleton path (pure errMsg)

127 unless predicate warn

122 unless predicate warn

128 SNGe n -> do

123 SNGe n -> do

129 let

124 let

130 nlen = withKnownNat n $ natVal n

125 nlen = withKnownNat n $ natVal n

131 predicate = num >= fromIntegral nlen

126 predicate = num >= fromIntegral nlen

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

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

133 warn = vWarning $ mmSingleton path (pure errMsg)

128 warn = vWarning $ mmSingleton path (pure errMsg)

134 unless predicate warn

129 unless predicate warn

135 SNLt n -> do

130 SNLt n -> do

136 let

131 let

137 nlen = withKnownNat n $ natVal n

132 nlen = withKnownNat n $ natVal n

138− predicate = num < fromIntegral nlen

133+ predicate = fromIntegral nlen < num

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

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

140 warn = vWarning $ mmSingleton path (pure errMsg)

135 warn = vWarning $ mmSingleton path (pure errMsg)

141 unless predicate warn

136 unless predicate warn

142 SNLe n -> do

137 SNLe n -> do

143 let

138 let

144 nlen = withKnownNat n $ natVal n

139 nlen = withKnownNat n $ natVal n

145− predicate = num <= fromIntegral nlen

140+ predicate = fromIntegral nlen <= num

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

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

147 warn = vWarning $ mmSingleton path (pure errMsg)

142 warn = vWarning $ mmSingleton path (pure errMsg)

148 unless predicate warn

143 unless predicate warn

149

144

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

157 let

152 let

158 nlen = withKnownNat n $ natVal n

153 nlen = withKnownNat n $ natVal n

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

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

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

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

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

162− unless predicate warn

163− SAGt n -> do

164− let

165− nlen = withKnownNat n $ natVal n

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

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

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

169− unless predicate warn

170− SAGe n -> do

171− let

172− nlen = withKnownNat n $ natVal n

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

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

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

176− unless predicate warn

177− SALt n -> do

178− let

179− nlen = withKnownNat n $ natVal n

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

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

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

183− unless predicate warn

184− SALe n -> do

185− let

186− nlen = withKnownNat n $ natVal n

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

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

189 warn = vWarning $ mmSingleton path (pure errMsg)

156 warn = vWarning $ mmSingleton path (pure errMsg)

190 unless predicate warn

157 unless predicate warn

191

158

@@ -280,26 +247,3 @@ toUnion _ = ReprUnion . urelax

280

247

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

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

282umatch' _ u = umatch u

249umatch' _ u = umatch u

283−

284−parseAndValidateJson

285− :: forall schema

286− . (FromJSON (JsonRepr schema), TopLevel schema, SingI schema)

287− => Value

288− -> ParseResult (JsonRepr schema)

289−parseAndValidateJson v =

290− case parseEither parseJSON v of

291− Left s -> DecodingError $ T.pack s

292− Right jsonRepr ->

293− let

294− validate = validateJsonRepr (sing :: Sing schema) [] jsonRepr

295− res = runIdentity . runValidationTEither $ validate

296− in case res of

297− Left em -> ValidationError em

298− Right () -> Valid jsonRepr

299−

300−parseAndValidateJsonBy

301− :: (FromJSON (JsonRepr schema), TopLevel schema, SingI schema)

302− => proxy schema

303− -> Value

304− -> ParseResult (JsonRepr schema)

305−parseAndValidateJsonBy _ = parseAndValidateJson

src/Data/Schematic/Verifier.hsdeleted−5

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

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.hsdeleted−14

@@ -1,14 +0,0 @@

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.hsdeleted−43

@@ -1,43 +0,0 @@

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.hsdeleted−31

@@ -1,31 +0,0 @@

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.hsdeleted−121

@@ -1,121 +0,0 @@

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

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

1−resolver: lts-13.7

2−extra-deps:

3− - hjsonpointer-1.4.0@rev:0

4− - hjsonschema-1.9.0@rev:0

5− - validationt-0.2.1.0

stack.yaml+50−4

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

1−resolver: lts-12.0

1+resolver: nightly-2017-09-17

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+

2extra-deps:

24extra-deps:

3− - hjsonpointer-1.4.0@rev:0

25+- hjsonpointer-1.3.0

4− - hjsonschema-1.9.0@rev:0

26+- hjsonschema-1.7.0

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

test/HelpersSpec.hs−6

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

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

3−{-# LANGUAGE LambdaCase #-}

4−

5−{-# LANGUAGE DataKinds #-}

6−{-# LANGUAGE TypeApplications #-}

7−{-# LANGUAGE OverloadedStrings #-}

8−

9module HelpersSpec (spec, main) where

3module HelpersSpec (spec, main) where

11import Control.Lens

5import Control.Lens

test/JsonSchemaSpec.hs+3−68

@@ -1,16 +1,8 @@

1−{-# LANGUAGE LambdaCase #-}

2−

3−{-# LANGUAGE DataKinds #-}

4−{-# LANGUAGE TypeApplications #-}

5−{-# LANGUAGE OverloadedLists #-}

6−{-# LANGUAGE OverloadedStrings #-}

7−

8module JsonSchemaSpec (spec, main) where

1module JsonSchemaSpec (spec, main) where

10import Data.Aeson as J

3import Data.Aeson as J

11import Data.Maybe

4import Data.Maybe

12import Data.Proxy

5import Data.Proxy

13−import Data.ByteString.Lazy as B

14import Data.Schematic

6import Data.Schematic

15import Data.Vinyl

7import Data.Vinyl

16import JSONSchema.Draft4 as D4

8import JSONSchema.Draft4 as D4

@@ -28,30 +20,9 @@ type SchemaExample = 'SchemaObject FieldsSchema

29exampleData :: JsonRepr SchemaExample

21exampleData :: JsonRepr SchemaExample

30exampleData = withRepr @SchemaExample $

22exampleData = withRepr @SchemaExample $

31− field @"foo" [ReprNumber 13]

23+ field @"foo" [ReprNumber 13]

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

24+ <:&> field @"bar" (pure (ReprText "foo"))

33− :& RNil

25+ <:&> pure 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− ]

56spec :: Spec

27spec :: Spec

57spec = do

28spec = do

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

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

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

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

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

62 Right _ -> pure ()

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

100main :: IO ()

35main :: IO ()

101main = hspec spec

36main = hspec spec

test/LensSpec.hs+4−9

@@ -1,8 +1,3 @@

1−{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE TypeApplications #-}

3−{-# LANGUAGE OverloadedLists #-}

4−{-# LANGUAGE OverloadedStrings #-}

5−

6module LensSpec (spec, main) where

1module LensSpec (spec, main) where

8import Control.Lens

3import Control.Lens

@@ -303,15 +298,15 @@ spec = do

303 newFooVal = FieldRepr $ ReprArray [ReprNumber 15]

298 newFooVal = FieldRepr $ ReprArray [ReprNumber 15]

304 fooProxy = Proxy @"foo"

299 fooProxy = Proxy @"foo"

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

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

306− fget @"foo" objectData `shouldBe` arrayField

301+ fget fooProxy objectData `shouldBe` arrayField

307 it "sets the object field" $ do

302 it "sets the object field" $ do

308− fget @"foo" (fput newFooVal objectData) `shouldBe` newFooVal

303+ fget fooProxy (fput newFooVal objectData) `shouldBe` newFooVal

309

304

310 describe "(using lens library) " $ do

305 describe "(using lens library) " $ do

311 it "get the field from an object" $ do

306 it "get the field from an object" $ do

312− objectData ^. flens @"foo" `shouldBe` arrayField

307+ objectData ^. flens (Proxy @"foo") `shouldBe` arrayField

313 it "sets the object field" $ do

308 it "sets the object field" $ do

314− set (flens @"foo") newFooVal objectData ^. flens @"foo"

309+ set (flens (Proxy @"foo")) newFooVal objectData ^. flens (Proxy @"foo")

315 `shouldBe` newFooVal

310 `shouldBe` newFooVal

316

311

317main :: IO ()

312main :: IO ()

test/SchemaSpec.hs+22−70

@@ -1,78 +1,31 @@

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

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−

12module SchemaSpec (spec, main) where

3module SchemaSpec (spec, main) where

14−import Control.Lens

15import Data.Aeson

5import Data.Aeson

16import Data.ByteString.Lazy

6import Data.ByteString.Lazy

17import Data.Functor.Identity

7import Data.Functor.Identity

18import Data.Proxy

8import Data.Proxy

19import Data.Schematic

9import Data.Schematic

20−import Data.Schematic.Generator

21−import Data.Singletons

22−import Data.Tagged

23import Data.Vinyl

10import Data.Vinyl

24import Test.Hspec

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

32type SchemaExample = 'SchemaObject

13type SchemaExample = 'SchemaObject

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

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

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

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

36−type SchemaExample2 = 'SchemaObject

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

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

39−

40jsonExample :: JsonRepr SchemaExample

17jsonExample :: JsonRepr SchemaExample

41−jsonExample = withRepr @SchemaExample

18+jsonExample = withRepr @SchemaExample $

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

19+ field @"bar" (Just $ ReprText "bar")

43− :& field @"foo" [12]

20+ <:&> field @"foo" [ReprNumber 12]

44− :& RNil

21+ <:&> pure 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") ]

54−type SwapFields =

23+type TestMigration =

55− 'Migration "swap_fields"

24+ 'Migration "test_revision"

56− '[ 'Diff '[ 'PKey "bar" ] ('Update

25+ '[ 'Diff '[ 'PKey "bar" ] ('Update ('SchemaText '[]))

57− ('SchemaArray '[ 'AEq 1] ('SchemaNumber '[ 'NGt 10])))

26+ , 'Diff '[ 'PKey "foo" ] ('Update ('SchemaNumber '[])) ]

58− , 'Diff '[ 'PKey "foo" ] ('Update

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

61−type Migrations = '[ AddQuuz

62− , DeleteQuuz ]

63− -- , SwapFields ]

64−

65−type VersionedJson = 'Versioned SchemaExample Migrations

28+type VS = 'Versioned SchemaExample '[ TestMigration ]

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

77schemaJson :: ByteString

30schemaJson :: ByteString

78schemaJson = "{\"foo\": [13], \"bar\": null}"

31schemaJson = "{\"foo\": [13], \"bar\": null}"

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

80schemaJson2 :: ByteString

33schemaJson2 :: ByteString

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

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

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

36+topObject

84−schemaJsonSeries = series

37+ :: JsonRepr

85−

38+ ('SchemaObject

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

39+ '[ '("foo", 'SchemaNumber '[])

87−schemaJsonSeries2 = series

40+ , '("bar", 'SchemaText '[])])

41+topObject = ReprObject $

42+ FieldRepr (ReprNumber 42)

43+ :& FieldRepr (ReprText "test")

44+ :& RNil

89spec :: Spec

46spec :: Spec

90spec = do

47spec = do

@@ -106,17 +63,12 @@ spec = do

106 -- `shouldSatisfy` isValid

63 -- `shouldSatisfy` isValid

107 it "validates versioned json with a migration list" $ do

64 it "validates versioned json with a migration list" $ do

108 decodeAndValidateVersionedWithPureMList

65 decodeAndValidateVersionedWithPureMList

109− (Proxy @VersionedJson)

66+ (Proxy @VS)

110− migrationList

67+ ((:&&)

68+ (Proxy @(SchemaByRevision "test_revision" VS))

69+ (const $ Identity topObject) MNil)

111 schemaJson

70 schemaJson

112 `shouldSatisfy` isValid

71 `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−

120

121main :: IO ()

73main :: IO ()

122main = hspec spec

74main = hspec spec