Use private not-found object as .valAt argument

metosin · Aug 2, 2024 · dcfcd0e · dcfcd0e
1 parent 9b469de
commit dcfcd0e
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/malli/core.cljc b/src/malli/core.cljc
@@ -542,11 +542,12 @@
                              (if-let [entry (find m k)]
                                (assoc m k (t (val entry)))
                                m)) x ts))
-     :clj  (apply -comp (map (fn child-transformer [[k t]]
-                               (fn [^Associative x]
-                                 (let [val (.valAt x k ::not-found)]
-                                   (if (identical? val ::not-found)
-                                     x (.assoc x k (t val)))))) (rseq ts)))
+     :clj  (let [not-found (Object.)]
+             (apply -comp (map (fn child-transformer [[k t]]
+                                 (fn [^Associative x]
+                                   (let [val (.valAt x k not-found)]
+                                     (if (identical? val not-found)
+                                       x (.assoc x k (t val)))))) (rseq ts))))
      :cljs (fn [x] (reduce (fn child-transformer [m [k t]]
                              (if-let [entry (find m k)]
                                (assoc m k (t (val entry)))
@@ -1038,11 +1039,12 @@
                                          (let [valid? (-validator value)
                                                default (boolean optional)]
                                            #?(:bb   (fn [m] (if-let [map-entry (find m key)] (valid? (val map-entry)) default))
-                                              :clj  (fn [^Associative m]
-                                                      (let [val (.valAt m key ::not-found)]
-                                                        (if (identical? val ::not-found)
-                                                          default
-                                                          (valid? val))))
+                                              :clj  (let [not-found (Object.)]
+                                                      (fn [^Associative m]
+                                                        (let [val (.valAt m key not-found)]
+                                                          (if (identical? val not-found)
+                                                            default
+                                                            (valid? val)))))
                                               :cljs (fn [m] (if-let [map-entry (find m key)] (valid? (val map-entry)) default)))))
                                        @explicit-children)
                                 default-validator