CLJS-3287: selfhost: eval does not catch and return errors

in cljs.js, eval-str catches errors during analysis, compilation and evaluation, and returns a {:value … :error …} map. In contrast, the eval function doesn’t catch errors during the evaluation step. Attached patch + tests to make these behave consistently.

Author: Matthew Huebert

src/main/cljs/cljs/js.cljs

@@ -837,9 +837,15 @@
                         (filter ana/dep-has-global-exports? (:deps ast))
                         ns-name
                         (:def-emits-var opts))
-                      (cb {:value (*eval-fn* {:source (.toString sb)})})))))
+                      (cb (try
+                            {:ns ns-name :value (*eval-fn* {:source (.toString sb)})}
+                            (catch :default cause
+                              (wrap-error (ana/error aenv "ERROR" cause)))))))))
               (let [src (with-out-str (comp/emit ast))]
-                (cb {:value (*eval-fn* {:source src})})))))))))
+                (cb (try
+                      {:value (*eval-fn* {:source src})}
+                      (catch :default cause
+                        (wrap-error (ana/error aenv "ERROR" cause)))))))))))))
 
 (defn eval
   "Evaluate a single ClojureScript form. The parameters:

src/test/self/self_host/test.cljs

@@ -1557,6 +1557,28 @@
                       (ex-message (ex-cause (ex-cause error)))))
                 (inc! l)))))))))
 
+(deftest test-cljs-3287
+  (async done
+    (let [st (cljs/empty-state)
+          l (latch 2 done)]
+      (cljs/eval-str st
+                     "(throw (js/Error. \"eval error\"))"
+                     nil
+                     {:ns         'cljs.user
+                      :target     :nodejs
+                      :eval       node-eval}
+                     (fn [{:keys [error]}]
+                       (is (some? error))
+                       (inc! l)))
+      (cljs/eval st
+                 '(throw (js/Error. "eval error"))
+                 {:ns     'cljs.user
+                  :target :nodejs
+                  :eval   node-eval}
+                 (fn [{:keys [error]}]
+                   (is (some? error))
+                   (inc! l))))))
+
 (defn -main [& args]
   (run-tests))