Skip to content

Commit ef8ab4d

Browse files
authored
Merge pull request #19 from ak3n/master
Remove jsonpath from the error message.
2 parents 5e6c70a + 3252307 commit ef8ab4d

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

src/Data/Schematic/Validation.hs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,50 +58,50 @@ validateTextConstraint (JSONPath path) t = \case
5858
let
5959
nlen = withKnownNat n $ natVal n
6060
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)
6262
warn = vWarning $ mmSingleton path (pure errMsg)
6363
unless predicate warn
6464
STLt n -> do
6565
let
6666
nlen = withKnownNat n $ natVal n
6767
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)
6969
warn = vWarning $ mmSingleton path (pure errMsg)
7070
unless predicate warn
7171
STLe n -> do
7272
let
7373
nlen = withKnownNat n $ natVal n
7474
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)
7676
warn = vWarning $ mmSingleton path (pure errMsg)
7777
unless predicate warn
7878
STGt n -> do
7979
let
8080
nlen = withKnownNat n $ natVal n
8181
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)
8383
warn = vWarning $ mmSingleton path (pure errMsg)
8484
unless predicate warn
8585
STGe n -> do
8686
let
8787
nlen = withKnownNat n $ natVal n
8888
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)
9090
warn = vWarning $ mmSingleton path (pure errMsg)
9191
unless predicate warn
9292
STRegex r -> do
9393
let
9494
regex = withKnownSymbol r $ fromSing r
9595
predicate = matchTest (makeRegex (T.unpack regex) :: Regex) (T.unpack t)
96-
errMsg = path <> " must match " <> regex
96+
errMsg = "must match " <> regex
9797
warn = vWarning $ mmSingleton path (pure errMsg)
9898
unless predicate warn
9999
STEnum ss -> do
100100
let
101101
matching :: Sing (s :: [Symbol]) -> Bool
102102
matching SNil = False
103103
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))
105105
warn = vWarning $ mmSingleton path (pure errMsg)
106106
unless (matching ss) warn
107107

@@ -115,35 +115,35 @@ validateNumberConstraint (JSONPath path) num = \case
115115
let
116116
nlen = withKnownNat n $ natVal n
117117
predicate = fromIntegral nlen == num
118-
errMsg = path <> " should be == " <> T.pack (show nlen)
118+
errMsg = "should be == " <> T.pack (show nlen)
119119
warn = vWarning $ mmSingleton path (pure errMsg)
120120
unless predicate warn
121121
SNGt n -> do
122122
let
123123
nlen = withKnownNat n $ natVal n
124124
predicate = num > fromIntegral nlen
125-
errMsg = path <> " should be > " <> T.pack (show nlen)
125+
errMsg = "should be > " <> T.pack (show nlen)
126126
warn = vWarning $ mmSingleton path (pure errMsg)
127127
unless predicate warn
128128
SNGe n -> do
129129
let
130130
nlen = withKnownNat n $ natVal n
131131
predicate = num >= fromIntegral nlen
132-
errMsg = path <> " should be >= " <> T.pack (show nlen)
132+
errMsg = "should be >= " <> T.pack (show nlen)
133133
warn = vWarning $ mmSingleton path (pure errMsg)
134134
unless predicate warn
135135
SNLt n -> do
136136
let
137137
nlen = withKnownNat n $ natVal n
138138
predicate = num < fromIntegral nlen
139-
errMsg = path <> " should be < " <> T.pack (show nlen)
139+
errMsg = "should be < " <> T.pack (show nlen)
140140
warn = vWarning $ mmSingleton path (pure errMsg)
141141
unless predicate warn
142142
SNLe n -> do
143143
let
144144
nlen = withKnownNat n $ natVal n
145145
predicate = num <= fromIntegral nlen
146-
errMsg = path <> " should be <= " <> T.pack (show nlen)
146+
errMsg = "should be <= " <> T.pack (show nlen)
147147
warn = vWarning $ mmSingleton path (pure errMsg)
148148
unless predicate warn
149149

@@ -157,7 +157,7 @@ validateArrayConstraint (JSONPath path) v = \case
157157
let
158158
nlen = withKnownNat n $ natVal n
159159
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)
161161
warn = vWarning $ mmSingleton path (pure errMsg)
162162
unless predicate warn
163163

0 commit comments

Comments
 (0)