CLJS-2361: Self-host: circular dependency detection doesn't handle REPL self-require

Author: anmonteiro

src/main/cljs/cljs/js.cljs

@@ -366,14 +366,20 @@
     (patch-renames :renames)
     (patch-renames :rename-macros)))
 
+(defn- self-require? [deps opts]
+  (and (true? (:def-emits-var opts)) (some #{ana/*cljs-ns*} deps)))
+
 (defn- load-deps
   ([bound-vars ana-env lib deps cb]
    (load-deps bound-vars ana-env lib deps nil nil cb))
   ([bound-vars ana-env lib deps reload opts cb]
    (when (:verbose opts)
      (debug-prn "Loading dependencies for" lib))
-   (binding [ana/*cljs-dep-set* (vary-meta (conj (:*cljs-dep-set* bound-vars) lib)
-                                  update-in [:dep-path] conj lib)]
+   (binding [ana/*cljs-dep-set* (let [lib (if (self-require? deps opts)
+                                            'cljs.user
+                                            lib)]
+                                  (vary-meta (conj (:*cljs-dep-set* bound-vars) lib)
+                                    update-in [:dep-path] conj lib))]
      (let [bound-vars (assoc bound-vars :*cljs-dep-set* ana/*cljs-dep-set*)]
        (if-not (every? #(not (contains? ana/*cljs-dep-set* %)) deps)
          (cb (wrap-error

src/test/self/self_host/test.cljs

@@ -1298,6 +1298,27 @@
                    (.-message error)))
             (inc! l)))))))
 
+(deftest test-self-host-self-require
+  (async done
+    (let [st (cljs/empty-state)
+          l (latch 1 done)
+          load (fn [{:keys [name macros]} cb]
+                 (cb {:lang :clj
+                      :source "(ns foo.core)"}))]
+      (binding [ana/*cljs-dep-set* (with-meta #{} {:dep-path []})]
+        (cljs.js/eval-str st "(ns foo.core)" nil
+          {:eval node-eval}
+          (fn [{:keys [error value] :as m}]
+            (is (nil? error))
+            (cljs.js/eval-str st "(require 'foo.core :reload)" nil
+              {:load load
+               :eval node-eval
+               :def-emits-var true
+               :ns 'foo.core}
+              (fn [{:keys [error value] :as m}]
+                (is (nil? error))
+                (inc! l)))))))))
+
 (defn -main [& args]
   (run-tests))