@@ -166,16 +166,25 @@ validateArrayConstraint (JSONPath path) v = \case
166166 warn = vWarning $ mmSingleton path (pure errMsg)
167167 unless predicate warn
168168
169−class Validatable schema where
170− validateJsonRepr :: [DemotedPathSegment] -> JsonRepr schema -> Validation ()
171−
172−validateJsonRepr
173− :: forall schema. SingI schema
169+lookaheadJsonRepr
170+ :: forall schema. (SingI schema)
174171 => [DemotedPathSegment]
175172 -> JsonRepr schema
176173 -> Validation ()
177−validateJsonRepr dpath jr = withSingI (sing :: Sing schema) $ case jr of
178− ReprText t -> case sing :: Sing schema of
174+lookaheadJsonRepr dpath jr = case sing :: Sing schema of
175+ SSchemaText s -> validateJsonRepr @schema dpath jr
176+ SSchemaNumber s -> validateJsonRepr @schema dpath jr
177+ SSchemaNull -> validateJsonRepr @schema dpath jr
178+ SSchemaBoolean -> validateJsonRepr @schema dpath jr
179+ SSchemaArray _ _ -> validateJsonRepr @schema dpath jr
180+ SSchemaObject _ -> validateJsonRepr @schema dpath jr
181+ SSchemaUnion _ -> validateJsonRepr @schema dpath jr
182+
183+class Validatable schema where
184+ validateJsonRepr :: [DemotedPathSegment] -> JsonRepr schema -> Validation ()
185+
186+instance SingI (SchemaText s) => Validatable (SchemaText s) where
187+ validateJsonRepr dpath (ReprText t) = case sing :: Sing (SchemaText s) of
179188 SSchemaText scs -> do
180189 let
181190 process :: Sing (cs :: [TextConstraint]) -> Validation ()
@@ -184,7 +193,9 @@ validateJsonRepr dpath jr = withSingI (sing :: Sing schema) $ case jr of
184193 validateTextConstraint (demotedPathToText dpath) t c
185194 process cs
186195 process scs
187− ReprNumber n -> case sing :: Sing schema of
196+
197+instance SingI (SchemaNumber s) => Validatable (SchemaNumber s) where
198+ validateJsonRepr dpath (ReprNumber n) = case sing :: Sing (SchemaNumber s) of
188199 SSchemaNumber scs -> do
189200 let
190201 process :: Sing (cs :: [NumberConstraint]) -> Validation ()
@@ -193,9 +204,13 @@ validateJsonRepr dpath jr = withSingI (sing :: Sing schema) $ case jr of
193204 validateNumberConstraint (demotedPathToText dpath) n c
194205 process cs
195206 process scs
196− ReprNull -> pure ()
197− ReprBoolean _ -> pure ()
198− ReprArray v -> case sing :: Sing schema of
207+
208+instance Validatable SchemaNull where validateJsonRepr _ _ = pure ()
209+
210+instance Validatable SchemaBoolean where validateJsonRepr _ _ = pure ()
211+
212+instance SingI (SchemaArray css s) => Validatable (SchemaArray css s) where
213+ validateJsonRepr dpath (ReprArray v) = case sing :: Sing (SchemaArray css s) of
199214 SSchemaArray acs s -> do
200215 let
201216 process :: Sing (cs :: [ArrayConstraint]) -> Validation ()
@@ -206,12 +221,16 @@ validateJsonRepr dpath jr = withSingI (sing :: Sing schema) $ case jr of
206221 process acs
207222 for_ (V.indexed v) $ \(ix, jr') -> do
208223 let newPath = dpath <> pure (DIx $ fromIntegral ix)
209− withSingI s $ validateJsonRepr newPath jr'
210− ReprOptional d -> case sing :: Sing schema of
211− SSchemaOptional ss -> case d of
212− Just x -> withSingI ss $ validateJsonRepr dpath x
224+ withSingI s $ lookaheadJsonRepr newPath jr'
225+
226+instance SingI (SchemaOptional s) => Validatable (SchemaOptional s) where
227+ validateJsonRepr dpath (ReprOptional s) = case sing :: Sing (SchemaOptional s) of
228+ SSchemaOptional ss -> case s of
229+ Just x -> withSingI ss $ lookaheadJsonRepr dpath x
213230 Nothing -> pure ()
214− ReprObject fs -> case sing :: Sing schema of
231+
232+instance SingI (SchemaObject s) => Validatable (SchemaObject s) where
233+ validateJsonRepr dpath (ReprObject fs) = case sing :: Sing (SchemaObject s) of
215234 SSchemaObject _ -> go fs
216235 where
217236 go :: Rec FieldRepr (ts :: [(Symbol, Schema)] ) -> Validation ()
@@ -219,9 +238,12 @@ validateJsonRepr dpath jr = withSingI (sing :: Sing schema) $ case jr of
219238 go (f@(FieldRepr d) :& ftl) = do
220239 let newPath = dpath <> [DKey (knownFieldName f)]
221240 withSingI (knownFieldSchema f)
222− $ validateJsonRepr newPath d
241+ $ lookaheadJsonRepr newPath d
223242 go ftl
224− ReprUnion u -> pure () -- upeel u (sing :: Sing schema)
243+
244+instance SingI (SchemaUnion s) => Validatable (SchemaUnion s) where
245+ validateJsonRepr dpath (ReprUnion u) = pure ()
246+
225247 -- ReprUnion u -> do
226248 -- let
227249 -- v :: forall s. JsonRepr s -> Const (Validation ()) s
@@ -248,7 +270,7 @@ class UPeel ss where
248270
249271instance (UPeel stl) => UPeel (s ': stl) where
250272 upeel (That u) (SSchemaUnion (SCons _ stl)) = upeel @stl u (SSchemaUnion stl)
251− upeel (This j) (SSchemaUnion (SCons s _)) = withSingI s $ validateJsonRepr mempty j
273+ upeel (This j) (SSchemaUnion (SCons s _)) = withSingI s $ lookaheadJsonRepr mempty j
252274
253275umatch' :: UElem a as i => Sing a -> Union JsonRepr as -> Maybe (JsonRepr a)
254276umatch' _ = umatch
@@ -263,7 +285,7 @@ parseAndValidateJson v =
263285 Left s -> DecodingError $ T.pack s
264286 Right jsonRepr ->
265287 let
266− validate = validateJsonRepr [] jsonRepr
288+ validate = lookaheadJsonRepr [] jsonRepr
267289 res = runIdentity . runValidationTEither $ validate
268290 in case res of
269291 Left em -> ValidationError em