git.iko.soy/typeable/hjsonschema
on master help sign in
Some internal renaming.
5f9e758Ian Grant Jeffries
src/Data/JsonSchema/Draft4/Internal.hs+15−15
compare with master
unifiedsplit
@@ -184,8 +184,8 @@ validateArray referenced (SchemaWithURI schema mUri) x = concat
184 recurse = descendNextLevel referenced (SchemaWithURI schema mUri)
184 recurse = descendNextLevel referenced (SchemaWithURI schema mUri)
185
185
186 fItems (AR.Items err) = Items err
186 fItems (AR.Items err) = Items err
187− fItems AR.AdditionalItemsBoolFailure = AdditionalItemsBool
187+ fItems AR.AdditionalItemsBoolInvalid = AdditionalItemsBool
188− fItems (AR.AdditionalItemsObjectFailure err) = AdditionalItemsObject err
188+ fItems (AR.AdditionalItemsObjectInvalid err) = AdditionalItemsObject err
189
189
190validateObject
190validateObject
191 :: ReferencedSchemas Schema
191 :: ReferencedSchemas Schema
@@ -221,24 +221,24 @@ validateObject referenced (SchemaWithURI schema mUri) x = concat
221
221
222 recurse = descendNextLevel referenced (SchemaWithURI schema mUri)
222 recurse = descendNextLevel referenced (SchemaWithURI schema mUri)
223
223
224− fDeps (OB.SchemaDependencyFailure err) = SchemaDependency err
224+ fDeps (OB.SchemaDependencyInvalid err) = SchemaDependency err
225− fDeps OB.PropertyDependencyFailure = PropertyDependency
225+ fDeps OB.PropertyDependencyInvalid = PropertyDependency
226
226
227− fProp (OB.PropertiesFailure err) = Properties err
227+ fProp (OB.PropertiesInvalid err) = Properties err
228− fProp (OB.PropPatternFailure err) = PatternProperties err
228+ fProp (OB.PropPatternInvalid err) = PatternProperties err
229− fProp (OB.PropAdditionalFailure a) =
229+ fProp (OB.PropAdditionalInvalid a) =
230 case a of
230 case a of
231− OB.APBoolFailure -> AdditionalPropertiesBool
231+ OB.APBoolInvalid -> AdditionalPropertiesBool
232− OB.APObjectFailure err -> AdditionalPropertiesObject err
232+ OB.APObjectInvalid err -> AdditionalPropertiesObject err
233
233
234− fPatProp (OB.PPFailure err) = PatternProperties err
234+ fPatProp (OB.PPInvalid err) = PatternProperties err
235− fPatProp (OB.PPAdditionalPropertiesFailure a) =
235+ fPatProp (OB.PPAdditionalPropertiesInvalid a) =
236 case a of
236 case a of
237− OB.APBoolFailure -> AdditionalPropertiesBool
237+ OB.APBoolInvalid -> AdditionalPropertiesBool
238− OB.APObjectFailure err -> AdditionalPropertiesObject err
238+ OB.APObjectInvalid err -> AdditionalPropertiesObject err
239
239
240− fAddProp OB.APBoolFailure = AdditionalPropertiesBool
240+ fAddProp OB.APBoolInvalid = AdditionalPropertiesBool
241− fAddProp (OB.APObjectFailure err) = AdditionalItemsObject err
241+ fAddProp (OB.APObjectInvalid err) = AdditionalItemsObject err
242
242
243--------------------------------------------------
243--------------------------------------------------
244-- * Validation (Internal utils)
244-- * Validation (Internal utils)
src/Data/Validator/Draft4/Array.hs+21−21
@@ -35,10 +35,10 @@ uniqueItems False _ = Nothing
35-- * items
35-- * items
36--------------------------------------------------
36--------------------------------------------------
37
37
38−data ItemsFailure err
38+data ItemsInvalid err
39 = Items err
39 = Items err
40− | AdditionalItemsBoolFailure
40+ | AdditionalItemsBoolInvalid
41− | AdditionalItemsObjectFailure err
41+ | AdditionalItemsObjectInvalid err
42 deriving (Eq, Show)
42 deriving (Eq, Show)
43
43
44data Items schema
44data Items schema
@@ -65,10 +65,10 @@ items
65 -> Maybe (AdditionalItems schema)
65 -> Maybe (AdditionalItems schema)
66 -> Items schema
66 -> Items schema
67 -> Vector Value
67 -> Vector Value
68− -> [Failure (ItemsFailure err)]
68+ -> [Failure (ItemsInvalid err)]
69items f _ (ItemsObject subSchema) xs = zip [0..] (V.toList xs) >>= g
69items f _ (ItemsObject subSchema) xs = zip [0..] (V.toList xs) >>= g
70 where
70 where
71− g :: (Int, Value) -> [Failure (ItemsFailure err)]
71+ g :: (Int, Value) -> [Failure (ItemsInvalid err)]
72 g (index,x) = modFailure Items
72 g (index,x) = modFailure Items
73 . addToPath (P.Token (T.pack (show index)))
73 . addToPath (P.Token (T.pack (show index)))
74 <$> f subSchema x
74 <$> f subSchema x
@@ -79,15 +79,15 @@ items f mAdditional (ItemsArray subSchemas) xs = itemFailures
79 indexedValues :: [(Int, Value)]
79 indexedValues :: [(Int, Value)]
80 indexedValues = zip [0..] (V.toList xs)
80 indexedValues = zip [0..] (V.toList xs)
81
81
82− itemFailures :: [Failure (ItemsFailure err)]
82+ itemFailures :: [Failure (ItemsInvalid err)]
83 itemFailures = join (zipWith g subSchemas indexedValues)
83 itemFailures = join (zipWith g subSchemas indexedValues)
84 where
84 where
85− g :: schema -> (Int, Value) -> [Failure (ItemsFailure err)]
85+ g :: schema -> (Int, Value) -> [Failure (ItemsInvalid err)]
86 g schema (index,x) = modFailure Items
86 g schema (index,x) = modFailure Items
87 . addToPath (P.Token (T.pack (show index)))
87 . addToPath (P.Token (T.pack (show index)))
88 <$> f schema x
88 <$> f schema x
89
89
90− additionalItemFailures :: [Failure (ItemsFailure err)]
90+ additionalItemFailures :: [Failure (ItemsInvalid err)]
91 additionalItemFailures =
91 additionalItemFailures =
92 case mAdditional of
92 case mAdditional of
93 Nothing -> mempty
93 Nothing -> mempty
@@ -105,8 +105,8 @@ items f mAdditional (ItemsArray subSchemas) xs = itemFailures
105 -- represent invalid data so they actually represent the correct
105 -- represent invalid data so they actually represent the correct
106 -- offsets.
106 -- offsets.
107 correctIndexes
107 correctIndexes
108− :: Failure (AdditionalItemsFailure err)
108+ :: Failure (AdditionalItemsInvalid err)
109− -> Failure (AdditionalItemsFailure err)
109+ -> Failure (AdditionalItemsInvalid err)
110 correctIndexes (Invalid a b c) = Invalid a b (fixIndex c)
110 correctIndexes (Invalid a b c) = Invalid a b (fixIndex c)
111 where
111 where
112 fixIndex :: P.Pointer -> P.Pointer
112 fixIndex :: P.Pointer -> P.Pointer
@@ -117,18 +117,18 @@ items f mAdditional (ItemsArray subSchemas) xs = itemFailures
117 (P.Token . T.pack . show $ n + length subSchemas):toks
117 (P.Token . T.pack . show $ n + length subSchemas):toks
118 fixIndex (P.Pointer []) = P.Pointer []
118 fixIndex (P.Pointer []) = P.Pointer []
119
119
120− correctName :: AdditionalItemsFailure err -> ItemsFailure err
120+ correctName :: AdditionalItemsInvalid err -> ItemsInvalid err
121− correctName AdditionalBoolFailure = AdditionalItemsBoolFailure
121+ correctName AdditionalBoolInvalid = AdditionalItemsBoolInvalid
122− correctName (AdditionalObjectFailure err) =
122+ correctName (AdditionalObjectInvalid err) =
123− AdditionalItemsObjectFailure err
123+ AdditionalItemsObjectInvalid err
124
124
125--------------------------------------------------
125--------------------------------------------------
126-- * additionalItems
126-- * additionalItems
127--------------------------------------------------
127--------------------------------------------------
128
128
129−data AdditionalItemsFailure err
129+data AdditionalItemsInvalid err
130− = AdditionalBoolFailure
130+ = AdditionalBoolInvalid
131− | AdditionalObjectFailure err
131+ | AdditionalObjectInvalid err
132 deriving (Eq, Show)
132 deriving (Eq, Show)
133
133
134data AdditionalItems schema
134data AdditionalItems schema
@@ -154,15 +154,15 @@ additionalItems
154 (schema -> Value -> [Failure err])
154 (schema -> Value -> [Failure err])
155 -> AdditionalItems schema
155 -> AdditionalItems schema
156 -> Vector Value
156 -> Vector Value
157− -> [Failure (AdditionalItemsFailure err)]
157+ -> [Failure (AdditionalItemsInvalid err)]
158additionalItems _ (AdditionalBool b) xs
158additionalItems _ (AdditionalBool b) xs
159 | b = mempty
159 | b = mempty
160− | V.length xs > 0 = pure (Invalid AdditionalBoolFailure (Bool b) mempty)
160+ | V.length xs > 0 = pure (Invalid AdditionalBoolInvalid (Bool b) mempty)
161 | otherwise = mempty
161 | otherwise = mempty
162additionalItems f (AdditionalObject subSchema) xs =
162additionalItems f (AdditionalObject subSchema) xs =
163 zip [0..] (V.toList xs) >>= g
163 zip [0..] (V.toList xs) >>= g
164 where
164 where
165− g :: (Int, Value) -> [Failure (AdditionalItemsFailure err)]
165+ g :: (Int, Value) -> [Failure (AdditionalItemsInvalid err)]
166− g (index,x) = modFailure AdditionalObjectFailure
166+ g (index,x) = modFailure AdditionalObjectInvalid
167 . addToPath (P.Token (T.pack (show index)))
167 . addToPath (P.Token (T.pack (show index)))
168 <$> f subSchema x
168 <$> f subSchema x
src/Data/Validator/Draft4/Number.hs+4−4
@@ -14,7 +14,7 @@ multipleOf n x
14 | x `mod'` n /= 0 = Just (Invalid () (toJSON n) mempty)
14 | x `mod'` n /= 0 = Just (Invalid () (toJSON n) mempty)
15 | otherwise = Nothing
15 | otherwise = Nothing
16
16
17−data MaximumFailure
17+data MaximumInvalid
18 = Maximum
18 = Maximum
19 | ExclusiveMaximum
19 | ExclusiveMaximum
20 deriving (Eq, Show)
20 deriving (Eq, Show)
@@ -23,7 +23,7 @@ maximumVal
23 :: Bool
23 :: Bool
24 -> Scientific
24 -> Scientific
25 -> Scientific
25 -> Scientific
26− -> Maybe (Failure MaximumFailure)
26+ -> Maybe (Failure MaximumInvalid)
27maximumVal exclusiveMaximum n x
27maximumVal exclusiveMaximum n x
28 | x `greaterThan` n = Just (Invalid err (toJSON n) mempty)
28 | x `greaterThan` n = Just (Invalid err (toJSON n) mempty)
29 | otherwise = Nothing
29 | otherwise = Nothing
@@ -32,7 +32,7 @@ maximumVal exclusiveMaximum n x
32 then ((>=), ExclusiveMaximum)
32 then ((>=), ExclusiveMaximum)
33 else ((>), Maximum)
33 else ((>), Maximum)
34
34
35−data MinimumFailure
35+data MinimumInvalid
36 = Minimum
36 = Minimum
37 | ExclusiveMinimum
37 | ExclusiveMinimum
38 deriving (Eq, Show)
38 deriving (Eq, Show)
@@ -41,7 +41,7 @@ minimumVal
41 :: Bool
41 :: Bool
42 -> Scientific
42 -> Scientific
43 -> Scientific
43 -> Scientific
44− -> Maybe (Failure MinimumFailure)
44+ -> Maybe (Failure MinimumInvalid)
45minimumVal exclusiveMinimum n x
45minimumVal exclusiveMinimum n x
46 | x `lessThan` n = Just (Invalid err (toJSON n) mempty)
46 | x `lessThan` n = Just (Invalid err (toJSON n) mempty)
47 | otherwise = Nothing
47 | otherwise = Nothing
src/Data/Validator/Draft4/Object.hs+7−7
@@ -89,9 +89,9 @@ required (Required ts) x
89-- * dependencies
89-- * dependencies
90--------------------------------------------------
90--------------------------------------------------
91
91
92−data DependencyFailure err
92+data DependencyInvalid err
93− = SchemaDependencyFailure err
93+ = SchemaDependencyInvalid err
94− | PropertyDependencyFailure
94+ | PropertyDependencyInvalid
95 deriving (Eq, Show)
95 deriving (Eq, Show)
96
96
97data Dependency schema
97data Dependency schema
@@ -128,17 +128,17 @@ dependencies
128 :: forall err schema. (schema -> Value -> [Failure err])
128 :: forall err schema. (schema -> Value -> [Failure err])
129 -> HashMap Text (Dependency schema)
129 -> HashMap Text (Dependency schema)
130 -> HashMap Text Value
130 -> HashMap Text Value
131− -> [Failure (DependencyFailure err)]
131+ -> [Failure (DependencyInvalid err)]
132dependencies f hm x = concat . fmap (uncurry g) . H.toList $ hm
132dependencies f hm x = concat . fmap (uncurry g) . H.toList $ hm
133 where
133 where
134− g :: Text -> Dependency schema -> [Failure (DependencyFailure err)]
134+ g :: Text -> Dependency schema -> [Failure (DependencyInvalid err)]
135 g k (SchemaDependency schema)
135 g k (SchemaDependency schema)
136 | H.member k x =
136 | H.member k x =
137− modFailure SchemaDependencyFailure <$> f schema (Object x)
137+ modFailure SchemaDependencyInvalid <$> f schema (Object x)
138 | otherwise = mempty
138 | otherwise = mempty
139 g k (PropertyDependency ts)
139 g k (PropertyDependency ts)
140 | H.member k x && not allPresent =
140 | H.member k x && not allPresent =
141− pure $ Invalid PropertyDependencyFailure
141+ pure $ Invalid PropertyDependencyInvalid
142 (toJSON (H.singleton k ts))
142 (toJSON (H.singleton k ts))
143 mempty
143 mempty
144 | otherwise = mempty
144 | otherwise = mempty
src/Data/Validator/Draft4/Object/Properties.hs+23−23
@@ -19,10 +19,10 @@ newtype Remaining = Remaining { _unRemaining :: HashMap Text Value }
19-- * properties
19-- * properties
20--------------------------------------------------
20--------------------------------------------------
21
21
22−data PropertiesFailure err
22+data PropertiesInvalid err
23− = PropertiesFailure err
23+ = PropertiesInvalid err
24− | PropPatternFailure err
24+ | PropPatternInvalid err
25− | PropAdditionalFailure (AdditionalPropertiesFailure err)
25+ | PropAdditionalInvalid (AdditionalPropertiesInvalid err)
26 deriving (Eq, Show)
26 deriving (Eq, Show)
27
27
28-- | In order of what's tried: "properties", "patternProperties",
28-- | In order of what's tried: "properties", "patternProperties",
@@ -34,11 +34,11 @@ properties
34 -> Maybe (AdditionalProperties schema)
34 -> Maybe (AdditionalProperties schema)
35 -> HashMap Text schema
35 -> HashMap Text schema
36 -> HashMap Text Value
36 -> HashMap Text Value
37− -> [Failure (PropertiesFailure err)]
37+ -> [Failure (PropertiesInvalid err)]
38properties f mPat mAdd propertiesHm x =
38properties f mPat mAdd propertiesHm x =
39− fmap (modFailure PropertiesFailure) propFailures
39+ fmap (modFailure PropertiesInvalid) propFailures
40− <> fmap (modFailure PropPatternFailure) patternFailures
40+ <> fmap (modFailure PropPatternInvalid) patternFailures
41− <> fmap (modFailure PropAdditionalFailure) additionalFailures
41+ <> fmap (modFailure PropAdditionalInvalid) additionalFailures
42 where
42 where
43 propertiesAndUnmatched :: ([Failure err], Remaining)
43 propertiesAndUnmatched :: ([Failure err], Remaining)
44 propertiesAndUnmatched = ( failures
44 propertiesAndUnmatched = ( failures
@@ -64,7 +64,7 @@ properties f mPat mAdd propertiesHm x =
64 Nothing -> remaining1
64 Nothing -> remaining1
65 Just val -> snd . val . _unRemaining $ remaining1
65 Just val -> snd . val . _unRemaining $ remaining1
66
66
67− additionalFailures :: [Failure (AdditionalPropertiesFailure err)]
67+ additionalFailures :: [Failure (AdditionalPropertiesInvalid err)]
68 additionalFailures = case additionalProperties f <$> mAdd of
68 additionalFailures = case additionalProperties f <$> mAdd of
69 Nothing -> mempty
69 Nothing -> mempty
70 Just val -> val (_unRemaining remaining2)
70 Just val -> val (_unRemaining remaining2)
@@ -73,9 +73,9 @@ properties f mPat mAdd propertiesHm x =
73-- * patternProperties
73-- * patternProperties
74--------------------------------------------------
74--------------------------------------------------
75
75
76−data PatternPropertiesFailure err
76+data PatternPropertiesInvalid err
77− = PPFailure err
77+ = PPInvalid err
78− | PPAdditionalPropertiesFailure (AdditionalPropertiesFailure err)
78+ | PPAdditionalPropertiesInvalid (AdditionalPropertiesInvalid err)
79 deriving (Eq, Show)
79 deriving (Eq, Show)
80
80
81patternProperties
81patternProperties
@@ -84,17 +84,17 @@ patternProperties
84 -> Maybe (AdditionalProperties schema)
84 -> Maybe (AdditionalProperties schema)
85 -> HashMap Text schema
85 -> HashMap Text schema
86 -> HashMap Text Value
86 -> HashMap Text Value
87− -> [Failure (PatternPropertiesFailure err)]
87+ -> [Failure (PatternPropertiesInvalid err)]
88patternProperties f mAdd patternPropertiesHm x =
88patternProperties f mAdd patternPropertiesHm x =
89− fmap (modFailure PPFailure) ppFailures
89+ fmap (modFailure PPInvalid) ppFailures
90− <> fmap (modFailure PPAdditionalPropertiesFailure) addFailures
90+ <> fmap (modFailure PPAdditionalPropertiesInvalid) addFailures
91 where
91 where
92 patternProps :: ([Failure err], Remaining)
92 patternProps :: ([Failure err], Remaining)
93 patternProps = patternAndUnmatched f patternPropertiesHm x
93 patternProps = patternAndUnmatched f patternPropertiesHm x
94
94
95 (ppFailures, remaining) = patternProps
95 (ppFailures, remaining) = patternProps
96
96
97− addFailures :: [Failure (AdditionalPropertiesFailure err)]
97+ addFailures :: [Failure (AdditionalPropertiesInvalid err)]
98 addFailures = case additionalProperties f <$> mAdd of
98 addFailures = case additionalProperties f <$> mAdd of
99 Nothing -> mempty
99 Nothing -> mempty
100 Just val -> val (_unRemaining remaining)
100 Just val -> val (_unRemaining remaining)
@@ -149,9 +149,9 @@ patternAndUnmatched f patPropertiesHm x =
149-- * additionalProperties
149-- * additionalProperties
150--------------------------------------------------
150--------------------------------------------------
151
151
152−data AdditionalPropertiesFailure err
152+data AdditionalPropertiesInvalid err
153− = APBoolFailure
153+ = APBoolInvalid
154− | APObjectFailure err
154+ | APObjectInvalid err
155 deriving (Eq, Show)
155 deriving (Eq, Show)
156
156
157data AdditionalProperties schema
157data AdditionalProperties schema
@@ -177,14 +177,14 @@ additionalProperties
177 (schema -> Value -> [Failure err])
177 (schema -> Value -> [Failure err])
178 -> AdditionalProperties schema
178 -> AdditionalProperties schema
179 -> HashMap Text Value
179 -> HashMap Text Value
180− -> [Failure (AdditionalPropertiesFailure err)]
180+ -> [Failure (AdditionalPropertiesInvalid err)]
181additionalProperties _ (AdditionalPropertiesBool False) x
181additionalProperties _ (AdditionalPropertiesBool False) x
182− | H.size x > 0 = pure $ Invalid APBoolFailure (Bool False) mempty
182+ | H.size x > 0 = pure $ Invalid APBoolInvalid (Bool False) mempty
183 | otherwise = mempty
183 | otherwise = mempty
184additionalProperties _ (AdditionalPropertiesBool True) _ = mempty
184additionalProperties _ (AdditionalPropertiesBool True) _ = mempty
185additionalProperties f (AdditionalPropertiesObject schema) x = H.toList x >>= g
185additionalProperties f (AdditionalPropertiesObject schema) x = H.toList x >>= g
186 where
186 where
187− g :: (Text, Value) -> [Failure (AdditionalPropertiesFailure err)]
187+ g :: (Text, Value) -> [Failure (AdditionalPropertiesInvalid err)]
188− g (k,v) = modFailure APObjectFailure
188+ g (k,v) = modFailure APObjectInvalid
189 . addToPath (P.Token k)
189 . addToPath (P.Token k)
190 <$> f schema v
190 <$> f schema v