fix double negation

Author: frenchy64

src/malli/error.cljc

@@ -18,22 +18,24 @@
         negated message))))
 
 (let [prefix (str "-en-humanize-negation-" (random-uuid))]
-  (defn- -en-humanize-negation [{:keys [schema] :as error} options]
-    (let [remove-prefix #(str/replace-first % prefix "")
-          negated? #(str/starts-with? % prefix)]
-      (loop [schema schema]
-        (or (when-some [s (error-message (assoc error :negated #(some->> % (str prefix))) options)]
-              (if (negated? s)
-                (remove-prefix s)
-                (or (when (and (string? s)
-                               (str/starts-with? s "should not "))
-                      (str/replace-first s "should not" "should"))
-                    (when (and (string? s)
-                               (str/starts-with? s "should "))
-                      (str/replace-first s "should" "should not")))))
-            (let [dschema (m/deref schema)]
-              (when-not (identical? schema dschema)
-                (recur dschema))))))))
+  (defn- -en-humanize-negation [{:keys [schema negated] :as error} options]
+    (if negated
+      (negated (error-message (dissoc error :negated) options))
+      (let [remove-prefix #(str/replace-first % prefix "")
+            negated? #(str/starts-with? % prefix)]
+        (loop [schema schema]
+          (or (when-some [s (error-message (assoc error :negated #(some->> % (str prefix))) options)]
+                (if (negated? s)
+                  (remove-prefix s)
+                  (or (when (and (string? s)
+                                 (str/starts-with? s "should not "))
+                        (str/replace-first s "should not" "should"))
+                      (when (and (string? s)
+                                 (str/starts-with? s "should "))
+                        (str/replace-first s "should" "should not")))))
+              (let [dschema (m/deref schema)]
+                (when-not (identical? schema dschema)
+                  (recur dschema)))))))))
 
 (defn- -forward-negation [?schema {:keys [negated] :as error} options]
   (let [schema (m/schema ?schema options)]

test/malli/error_test.cljc

@@ -886,12 +886,9 @@
 
   (is (= ["should be larger than 1"] (me/humanize (m/explain [:> 1] 0))))
   (is (= ["should be at most 1"]     (me/humanize (m/explain [:not [:> 1]] 2))))
-  ;;FIXME
   (is (= ["should be larger than 1"] (me/humanize (m/explain [:not [:not [:> 1]]] 0))))
   (is (= ["should be at most 1"]     (me/humanize (m/explain [:not [:not [:not [:> 1]]]] 2))))
-  ;;FIXME
-  (is (= ["should be larger than 1"] (me/humanize (m/explain [:not [:not [:not [:not [:> 1]]]]] 0))))
-)
+  (is (= ["should be larger than 1"] (me/humanize (m/explain [:not [:not [:not [:not [:> 1]]]]] 0)))))
 
 (deftest custom-negating-test
   (is (= ["should be a multiple of 3"]