CLJS-2367: Self-host: :def-emits-var leaks into loaded namespace processing

Author: mfikes

src/main/cljs/cljs/js.cljs

@@ -393,6 +393,7 @@
            (let [dep (first deps)
                  opts' (-> opts
                          (dissoc :context)
+                         (dissoc :def-emits-var)
                          (dissoc :ns))]
              (require bound-vars dep reload opts'
                (fn [res]
@@ -485,6 +486,7 @@
           opts' (-> opts
                   (assoc :macros-ns true)
                   (dissoc :context)
+                  (dissoc :def-emits-var)
                   (dissoc :ns))]
       (require bound-vars nsym k opts'
         (fn [res]

src/test/self/self_host/test.cljs

@@ -1319,6 +1319,47 @@
                 (is (nil? error))
                 (inc! l)))))))))
 
+(deftest test-cljs-2367
+  (async done
+    (let [st (cljs/empty-state)
+          l  (latch 2 done)]
+      (cljs.js/eval st
+        '(require (quote foo-2367.core))
+        {:context       :expr
+         :def-emits-var true
+         :eval          node-eval
+         :load          (fn [_ cb]
+                          (cb {:lang   :clj
+                               :source "(ns foo-2367.core) (def b (def a 3))"}))}
+        (fn [{:keys [error value]}]
+          (is (nil? error))
+          (cljs.js/eval st
+            'foo-2367.core/b
+            {:context :expr
+             :eval    node-eval}
+            (fn [{:keys [error value]}]
+              (is (nil? error))
+              (is (= 3 value))
+              (inc! l)))))
+      (cljs.js/eval st
+        '(require-macros (quote bar-2367.core))
+        {:context       :expr
+         :def-emits-var true
+         :eval          node-eval
+         :load          (fn [_ cb]
+                          (cb {:lang   :clj
+                               :source "(ns bar-2367.core) (def b (def a 4)) (defmacro c [] b)"}))}
+        (fn [{:keys [error value]}]
+          (is (nil? error))
+          (cljs.js/eval st
+            '(bar-2367.core/c)
+            {:context :expr
+             :eval    node-eval}
+            (fn [{:keys [error value]}]
+              (is (nil? error))
+              (is (= 4 value))
+              (inc! l))))))))
+
 (defn -main [& args]
   (run-tests))