CLJS-3130: UUID compares equal to other values

alexisvincent · Jun 23, 2020 · 25c9587 · 25c9587
1 parent ba048aa
commit 25c9587
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/cljs/cljs/core.cljs b/src/main/cljs/cljs/core.cljs
@@ -11293,8 +11293,10 @@ reduces them without incurring seq initialization"
     __hash)
 
   IComparable
-  (-compare [_ other]
-    (garray/defaultCompare uuid (.-uuid other))))
+  (-compare [this other]
+    (if (instance? UUID other)
+      (garray/defaultCompare uuid (.-uuid other))
+      (throw (js/Error. (str "Cannot compare " this " to " other))))))
 
 (defn uuid [s]
   (assert (string? s))

diff --git a/src/test/cljs/cljs/core_test.cljs b/src/test/cljs/cljs/core_test.cljs
@@ -1808,6 +1808,10 @@
   (is (= "a" (get "abc" -0.5)))
   (is (nil? (get "abc" -1))))
 
+(deftest test-cljs-3130
+  (is (thrown-with-msg? js/Error #"Cannot compare f151d12d-7bd5-4409-9352-5900ee07baf7 to a"
+        (compare (uuid "f151d12d-7bd5-4409-9352-5900ee07baf7") "a"))))
+
 (deftest test-cljs-3202
   (is (= :/ (keyword "/")))
   (is (= (hash :/) (hash (keyword "/")))))