CLJS-2585: Bad code gen for and / or expressions

Author: mfikes

src/main/clojure/cljs/core.cljc

@@ -855,6 +855,7 @@
            (map #(cljs.analyzer/no-warn (cljs.analyzer/analyze &env %)) forms))
        (core/let [and-str (core/->> (repeat (count forms) "(~{})")
                             (interpose " && ")
+                            (#(concat ["("] % [")"]))
                             (apply core/str))]
          (bool-expr `(~'js* ~and-str ~@forms)))
        `(let [and# ~x]
@@ -873,6 +874,7 @@
            (map #(cljs.analyzer/no-warn (cljs.analyzer/analyze &env %)) forms))
        (core/let [or-str (core/->> (repeat (count forms) "(~{})")
                            (interpose " || ")
+                           (#(concat ["("] % [")"]))
                            (apply core/str))]
          (bool-expr `(~'js* ~or-str ~@forms)))
        `(let [or# ~x]

src/test/cljs/cljs/core_test.cljs

@@ -1525,6 +1525,18 @@
 (deftest test-cljs-2552
   (is (boolean? (tap> nil))))
 
+;; Delete a bogus property from the beta? fn
+;; Without the fix this js-delete form code-gens to code that deletes the alpha? fn:
+;;   delete (cljs.core_test.alpha_2585_QMARK_) && (cljs.core_test.beta_2585_QMARK_)["bogus-property"]
+(defn ^boolean alpha-2585? [] true)
+(defn ^boolean beta-2585? [] true)
+(js-delete (and alpha-2585? beta-2585?) "bogus-property")
+
+(deftest test-cljs-2585
+  (is (= true ((or int? string?) 1)))
+  ;; Make sure we didn't delete the alpha? fn
+  (is (some? alpha-2585?)))
+
 (comment
   ;; ObjMap
   ;; (let [ks (map (partial str "foo") (range 500))