git.iko.soy/schematic
on master help sign in
Remove jsonpath from field.
3252307Evgenii Akentev
src/Data/Schematic/Validation.hs+13−13
compare with master
unifiedsplit
@@ -58,42 +58,42 @@ validateTextConstraint (JSONPath path) t = \case
58 let
58 let
59 nlen = withKnownNat n $ natVal n
59 nlen = withKnownNat n $ natVal n
60 predicate = nlen == (fromIntegral $ T.length t)
60 predicate = nlen == (fromIntegral $ T.length t)
61− errMsg = "length of " <> path <> " should be == " <> T.pack (show nlen)
61+ errMsg = "length should be == " <> T.pack (show nlen)
62 warn = vWarning $ mmSingleton path (pure errMsg)
62 warn = vWarning $ mmSingleton path (pure errMsg)
63 unless predicate warn
63 unless predicate warn
64 STLt n -> do
64 STLt n -> do
65 let
65 let
66 nlen = withKnownNat n $ natVal n
66 nlen = withKnownNat n $ natVal n
67 predicate = nlen > (fromIntegral $ T.length t)
67 predicate = nlen > (fromIntegral $ T.length t)
68− errMsg = "length of " <> path <> " should be < " <> T.pack (show nlen)
68+ errMsg = "length should be < " <> T.pack (show nlen)
69 warn = vWarning $ mmSingleton path (pure errMsg)
69 warn = vWarning $ mmSingleton path (pure errMsg)
70 unless predicate warn
70 unless predicate warn
71 STLe n -> do
71 STLe n -> do
72 let
72 let
73 nlen = withKnownNat n $ natVal n
73 nlen = withKnownNat n $ natVal n
74 predicate = nlen >= (fromIntegral $ T.length t)
74 predicate = nlen >= (fromIntegral $ T.length t)
75− errMsg = "length of " <> path <> " should be <= " <> T.pack (show nlen)
75+ errMsg = "length should be <= " <> T.pack (show nlen)
76 warn = vWarning $ mmSingleton path (pure errMsg)
76 warn = vWarning $ mmSingleton path (pure errMsg)
77 unless predicate warn
77 unless predicate warn
78 STGt n -> do
78 STGt n -> do
79 let
79 let
80 nlen = withKnownNat n $ natVal n
80 nlen = withKnownNat n $ natVal n
81 predicate = nlen < (fromIntegral $ T.length t)
81 predicate = nlen < (fromIntegral $ T.length t)
82− errMsg = "length of " <> path <> " should be > " <> T.pack (show nlen)
82+ errMsg = "length should be > " <> T.pack (show nlen)
83 warn = vWarning $ mmSingleton path (pure errMsg)
83 warn = vWarning $ mmSingleton path (pure errMsg)
84 unless predicate warn
84 unless predicate warn
85 STGe n -> do
85 STGe n -> do
86 let
86 let
87 nlen = withKnownNat n $ natVal n
87 nlen = withKnownNat n $ natVal n
88 predicate = nlen <= (fromIntegral $ T.length t)
88 predicate = nlen <= (fromIntegral $ T.length t)
89− errMsg = "length of " <> path <> " should be >= " <> T.pack (show nlen)
89+ errMsg = "length should be >= " <> T.pack (show nlen)
90 warn = vWarning $ mmSingleton path (pure errMsg)
90 warn = vWarning $ mmSingleton path (pure errMsg)
91 unless predicate warn
91 unless predicate warn
92 STRegex r -> do
92 STRegex r -> do
93 let
93 let
94 regex = withKnownSymbol r $ fromSing r
94 regex = withKnownSymbol r $ fromSing r
95 predicate = matchTest (makeRegex (T.unpack regex) :: Regex) (T.unpack t)
95 predicate = matchTest (makeRegex (T.unpack regex) :: Regex) (T.unpack t)
96− errMsg = path <> " must match " <> regex
96+ errMsg = "must match " <> regex
97 warn = vWarning $ mmSingleton path (pure errMsg)
97 warn = vWarning $ mmSingleton path (pure errMsg)
98 unless predicate warn
98 unless predicate warn
99 STEnum ss -> do
99 STEnum ss -> do
@@ -101,7 +101,7 @@ validateTextConstraint (JSONPath path) t = \case
101 matching :: Sing (s :: [Symbol]) -> Bool
101 matching :: Sing (s :: [Symbol]) -> Bool
102 matching SNil = False
102 matching SNil = False
103 matching (SCons s@SSym fs) = T.pack (symbolVal s) == t || matching fs
103 matching (SCons s@SSym fs) = T.pack (symbolVal s) == t || matching fs
104− errMsg = path <> " must be one of " <> T.pack (show (fromSing ss))
104+ errMsg = "must be one of " <> T.pack (show (fromSing ss))
105 warn = vWarning $ mmSingleton path (pure errMsg)
105 warn = vWarning $ mmSingleton path (pure errMsg)
106 unless (matching ss) warn
106 unless (matching ss) warn
107
107
@@ -115,35 +115,35 @@ validateNumberConstraint (JSONPath path) num = \case
115 let
115 let
116 nlen = withKnownNat n $ natVal n
116 nlen = withKnownNat n $ natVal n
117 predicate = fromIntegral nlen == num
117 predicate = fromIntegral nlen == num
118− errMsg = path <> " should be == " <> T.pack (show nlen)
118+ errMsg = "should be == " <> T.pack (show nlen)
119 warn = vWarning $ mmSingleton path (pure errMsg)
119 warn = vWarning $ mmSingleton path (pure errMsg)
120 unless predicate warn
120 unless predicate warn
121 SNGt n -> do
121 SNGt n -> do
122 let
122 let
123 nlen = withKnownNat n $ natVal n
123 nlen = withKnownNat n $ natVal n
124 predicate = num > fromIntegral nlen
124 predicate = num > fromIntegral nlen
125− errMsg = path <> " should be > " <> T.pack (show nlen)
125+ errMsg = "should be > " <> T.pack (show nlen)
126 warn = vWarning $ mmSingleton path (pure errMsg)
126 warn = vWarning $ mmSingleton path (pure errMsg)
127 unless predicate warn
127 unless predicate warn
128 SNGe n -> do
128 SNGe n -> do
129 let
129 let
130 nlen = withKnownNat n $ natVal n
130 nlen = withKnownNat n $ natVal n
131 predicate = num >= fromIntegral nlen
131 predicate = num >= fromIntegral nlen
132− errMsg = path <> " should be >= " <> T.pack (show nlen)
132+ errMsg = "should be >= " <> T.pack (show nlen)
133 warn = vWarning $ mmSingleton path (pure errMsg)
133 warn = vWarning $ mmSingleton path (pure errMsg)
134 unless predicate warn
134 unless predicate warn
135 SNLt n -> do
135 SNLt n -> do
136 let
136 let
137 nlen = withKnownNat n $ natVal n
137 nlen = withKnownNat n $ natVal n
138 predicate = num < fromIntegral nlen
138 predicate = num < fromIntegral nlen
139− errMsg = path <> " should be < " <> T.pack (show nlen)
139+ errMsg = "should be < " <> T.pack (show nlen)
140 warn = vWarning $ mmSingleton path (pure errMsg)
140 warn = vWarning $ mmSingleton path (pure errMsg)
141 unless predicate warn
141 unless predicate warn
142 SNLe n -> do
142 SNLe n -> do
143 let
143 let
144 nlen = withKnownNat n $ natVal n
144 nlen = withKnownNat n $ natVal n
145 predicate = num <= fromIntegral nlen
145 predicate = num <= fromIntegral nlen
146− errMsg = path <> " should be <= " <> T.pack (show nlen)
146+ errMsg = "should be <= " <> T.pack (show nlen)
147 warn = vWarning $ mmSingleton path (pure errMsg)
147 warn = vWarning $ mmSingleton path (pure errMsg)
148 unless predicate warn
148 unless predicate warn
149
149
@@ -157,7 +157,7 @@ validateArrayConstraint (JSONPath path) v = \case
157 let
157 let
158 nlen = withKnownNat n $ natVal n
158 nlen = withKnownNat n $ natVal n
159 predicate = nlen == fromIntegral (V.length v)
159 predicate = nlen == fromIntegral (V.length v)
160− errMsg = "length of " <> path <> " should be == " <> T.pack (show nlen)
160+ errMsg = "length should be == " <> T.pack (show nlen)
161 warn = vWarning $ mmSingleton path (pure errMsg)
161 warn = vWarning $ mmSingleton path (pure errMsg)
162 unless predicate warn
162 unless predicate warn
163
163