CLJS-1596: Self-host: :load-macros and :analyze-deps don't work in cljs.js

Only default to true if not set.

Author: mfikes

src/main/cljs/cljs/js.cljs

@@ -222,8 +222,8 @@
    (let [bound-vars (merge
                       {:*compiler*     (env/default-compiler-env)
                        :*data-readers* tags/*cljs-data-readers*
-                       :*load-macros*  (or (:load-macros opts) true)
-                       :*analyze-deps* (or (:analyze-deps opts) true)
+                       :*load-macros*  (:load-macros opts true)
+                       :*analyze-deps* (:analyze-deps opts true)
                        :*load-fn*      (or (:load opts) *load-fn*)
                        :*eval-fn*      (or (:eval opts) *eval-fn*)}
                       bound-vars)
@@ -523,8 +523,8 @@
      {:*compiler*     state
       :*data-readers* tags/*cljs-data-readers*
       :*passes*       (or (:passes opts) ana/*passes*)
-      :*analyze-deps* (or (:analyze-deps opts) true)
-      :*load-macros*  (or (:load-macros opts) true)
+      :*analyze-deps* (:analyze-deps opts true)
+      :*load-macros*  (:load-macros opts true)
       :*load-fn*      (or (:load opts) *load-fn*)
       :*eval-fn*      (or (:eval opts) *eval-fn*)}
      source name opts cb)))
@@ -594,8 +594,8 @@
    (eval*
      {:*compiler*     state
       :*data-readers* tags/*cljs-data-readers*
-      :*analyze-deps* (or (:analyze-deps opts) true)
-      :*load-macros*  (or (:load-macros opts) true)
+      :*analyze-deps* (:analyze-deps opts true)
+      :*load-macros*  (:load-macros opts true)
       :*load-fn*      (or (:load opts) *load-fn*)
       :*eval-fn*      (or (:eval opts) *eval-fn*)}
      form opts cb)))
@@ -690,8 +690,8 @@
    (compile-str*
      {:*compiler*     state
       :*data-readers* tags/*cljs-data-readers*
-      :*analyze-deps* (or (:analyze-deps opts) true)
-      :*load-macros*  (or (:load-macros opts) true)
+      :*analyze-deps* (:analyze-deps opts true)
+      :*load-macros*  (:load-macros opts true)
       :*load-fn*      (or (:load opts) *load-fn*)
       :*eval-fn*      (or (:eval opts) *eval-fn*)
       :*sm-data*      (when (:source-map opts) (sm-data))}
@@ -821,8 +821,8 @@
    (eval-str*
      {:*compiler*     state
       :*data-readers* tags/*cljs-data-readers*
-      :*analyze-deps* (or (:analyze-deps opts) true)
-      :*load-macros*  (or (:load-macros opts) true)
+      :*analyze-deps* (:analyze-deps opts true)
+      :*load-macros*  (:load-macros opts true)
       :*load-fn*      (or (:load opts) *load-fn*)
       :*eval-fn*      (or (:eval opts) *eval-fn*)}
      source name opts cb)))

src/test/self/self_host/test.cljs

@@ -243,6 +243,93 @@
           (is (= "1\n2\n" value))
           (inc! l))))))
 
+(deftest test-disable-analyze-deps
+  (cljs/analyze-str st
+    "(ns analyze-deps-as.core (:require [analyze-me.core :refer [abc]]))"
+    nil
+    {:context      :expr
+     :eval         cljs.js/js-eval
+     :analyze-deps false
+     :load         (fn [_ cb]
+                     (cb {:lang   :clj
+                          :source "(ns analyze-me.core)"}))}
+    (fn [{:keys [error]}]
+      (is (nil? error))))
+
+  (cljs/eval st
+    '(ns analyze-deps-e.core (:require [analyze-me.core :refer [abc]]))
+    {:context      :expr
+     :eval         cljs.js/js-eval
+     :analyze-deps false
+     :load         (fn [_ cb]
+                     (cb {:lang   :clj
+                          :source "(ns analyze-me.core)"}))}
+    (fn [{:keys [error]}]
+      (is (nil? error))))
+  (cljs/compile-str st
+    "(ns analyze-deps-c.core (:require [analyze-me.core :refer [abc]]))"
+    nil
+    {:context      :expr
+     :eval         cljs.js/js-eval
+     :analyze-deps false
+     :load         (fn [_ cb]
+                     (cb {:lang   :clj
+                          :source "(ns analyze-me.core)"}))}
+    (fn [{:keys [error]}]
+      (is (nil? error))))
+  (cljs/eval-str st
+    "(ns analyze-deps-es.core (:require [analyze-me.core :refer [abc]]))"
+    nil
+    {:context      :expr
+     :eval         cljs.js/js-eval
+     :analyze-deps false
+     :load         (fn [_ cb]
+                     (cb {:lang   :clj
+                          :source "(ns analyze-me.core)"}))}
+    (fn [{:keys [error]}]
+      (is (nil? error)))))
+
+(deftest test-disable-load-macros
+  (cljs/analyze-str st
+    "(ns load-macros-as.core (:require-macros [load-me.core]))"
+    nil
+    {:context     :expr
+     :eval        cljs.js/js-eval
+     :load-macros false
+     :load        (fn [_ _]
+                    (throw (ex-info "unexpected" {})))}
+    (fn [{:keys [error]}]
+      (is (nil? error))))
+  (cljs/eval st
+    '(ns load-macros-e.core (:require-macros [load-me.core]))
+    {:context     :expr
+     :eval        cljs.js/js-eval
+     :load-macros false
+     :load        (fn [_ _]
+                    (throw (ex-info "unexpected" {})))}
+    (fn [{:keys [error]}]
+      (is (nil? error))))
+  (cljs/compile-str st
+    "(ns load-macros-c.core (:require-macros [load-me.core]))"
+    nil
+    {:context     :expr
+     :eval        cljs.js/js-eval
+     :load-macros false
+     :load        (fn [_ _]
+                    (throw (ex-info "unexpected" {})))}
+    (fn [{:keys [error]}]
+      (is (nil? error))))
+  (cljs/eval-str st
+    "(ns load-macros-es.core (:require-macros [load-me.core]))"
+    nil
+    {:context     :expr
+     :eval        cljs.js/js-eval
+     :load-macros false
+     :load        (fn [_ _]
+                    (throw (ex-info "unexpected" {})))}
+    (fn [{:keys [error]}]
+      (is (nil? error)))))
+
 (deftest test-load-and-invoke-macros
   (async done
     (let [l (latch 9 done)]