CLJS-2079: Records and maps are not equal

Author: thomasmulvaney

src/main/cljs/cljs/core.cljs

@@ -5833,7 +5833,7 @@ reduces them without incurring seq initialization"
   false."
   [x y]
   (boolean
-    (when (map? y)
+    (when (and (map? y) (not (record? y)))
       ; assume all maps are counted
       (when (== (count x) (count y))
         (every? (fn [xkv] (= (get y (first xkv) never-equiv)
@@ -6338,7 +6338,7 @@ reduces them without incurring seq initialization"
 
   IEquiv
   (-equiv [coll other]
-    (if (implements? IMap other)
+    (if (and (implements? IMap other) (not (record? other)))
       (let [alen (alength arr)
             ^not-native other other]
         (if (== cnt (-count other))

src/main/clojure/cljs/core.cljc

@@ -1748,13 +1748,17 @@
                         'IHash
                         `(~'-hash [this#] (caching-hash this# ~'hash-imap ~'__hash))
                         'IEquiv
-                        `(~'-equiv [this# other#]
-                           (if (and other#
-                                 (identical? (.-constructor this#)
-                                   (.-constructor other#))
-                                 (equiv-map this# other#))
-                             true
-                             false))
+                        (let [this (gensym 'this) other (gensym 'other)]
+                          `(~'-equiv [~this ~other]
+                             (and (some? ~other)
+                                  (identical? (.-constructor ~this)
+                                              (.-constructor ~other))
+                                  ~@(map (fn [field]
+                                           `(= (.. ~this ~(to-property field))
+                                               (.. ~other ~(to-property field))))
+                                         base-fields)
+                                  (= (.-__extmap ~this)
+                                     (.-__extmap ~other)))))
                         'IMeta
                         `(~'-meta [this#] ~'__meta)
                         'IWithMeta
@@ -1821,7 +1825,7 @@
              ks (map keyword fields)
              getters (map (core/fn [k] `(~k ~ms)) ks)]
     `(defn ~fn-name [~ms]
-       (new ~rname ~@getters nil (dissoc ~ms ~@ks) nil))))
+       (new ~rname ~@getters nil (not-empty (dissoc ~ms ~@ks)) nil))))
 
 (core/defmacro defrecord
   "(defrecord name [fields*]  options* specs*)

src/test/cljs/cljs/core_test.cljs

@@ -1281,6 +1281,25 @@
     (let [sm (sorted-map 1 1, 2 2, 3 3, 4 4, 5 5, 6 6, 7 7)]
       (is (= [1 2 3 4] (reduce-kv (fn [m k v] (if (= 5 k) (reduced m) (conj m k))) [] sm))))))
 
+(defrecord CLJS2079 [a b])
+
+(deftest test-cljs-2079
+  (testing "Records and maps should not be equal"
+    (let [am (array-map :a 1 :b 2)
+          hm (hash-map :a 1 :b 2)
+          sm (sorted-map :a 1 :b 2)
+          r (->CLJS2079 1 2)]
+      (is (= am hm sm))
+
+      (is (not= r am))
+      (is (not= am r))
+
+      (is (not= r hm))
+      (is (not= hm r))
+
+      (is (not= r sm))
+      (is (not= sm r)))))
+
 (comment
   ;; ObjMap
   ;; (let [ks (map (partial str "foo") (range 500))