CLJS-1564: Self-host: cached macro *loaded* update

When requiring namespaces, the namespace name symbol is conjed into the
*loaded* set, with the ana/macro-ns-name being conjed in the case of a
macros namespace. (So for example, 'foo.core for a regular namespace
and 'foo.core$macros for a macros namespace.)

But, if the namespace being loaded is a macros namespace for which
the client returns cached JavaScript, then the code instead conjes the
base namespace name.

This is actually the result of a simple oversight with the changes
made for CLJS-1504: One place where *loaded* is manipulated, name is
used instead of aname.

Author: mfikes

src/main/cljs/cljs/js.cljs

@@ -267,7 +267,7 @@
                                        (if (:error res)
                                          (cb res)
                                          (do
-                                           (swap! *loaded* conj name)
+                                           (swap! *loaded* conj aname)
                                            (cb {:value true}))))))))))
                      (cb (wrap-error
                            (ana/error env

src/test/self/self_host/test.cljs

@@ -50,6 +50,60 @@
 ;; NOTE: can't set passes because callbacks happen _inside_ binding
 ;; do so will effect other tests
 
+(deftest test-require-updates-*loading*
+  (async done
+    (let [l (latch 4 done)]
+      (cljs/require
+        {}
+        'load1.core
+        :reload-all
+        {:load (fn [_ cb] (cb {:lang   :clj
+                               :source "(ns load1.core)"}))
+         :eval (constantly nil)}
+        (fn [{:keys [error value]}]
+          (is (nil? error))
+          (is value)
+          (is (= #{'load1.core} @cljs/*loaded*))
+          (inc! l)))
+      (cljs/require
+        {}
+        'load2.core
+        :reload-all
+        {:macros-ns true
+         :load      (fn [_ cb] (cb {:lang   :clj
+                                    :source "(ns load2.core)"}))
+         :eval      (constantly nil)}
+        (fn [{:keys [error value]}]
+          (is (nil? error))
+          (is value)
+          (is (= #{'load2.core$macros} @cljs/*loaded*))
+          (inc! l)))
+      (cljs/require
+        {}
+        'load3.core
+        :reload-all
+        {:load (fn [_ cb] (cb {:lang   :js
+                               :source ""}))
+         :eval (constantly nil)}
+        (fn [{:keys [error value]}]
+          (is (nil? error))
+          (is value)
+          (is (= #{'load3.core} @cljs/*loaded*))
+          (inc! l)))
+      (cljs/require
+        {}
+        'load4.core
+        :reload-all
+        {:macros-ns true
+         :load      (fn [_ cb] (cb {:lang   :js
+                                    :source ""}))
+         :eval      (constantly nil)}
+        (fn [{:keys [error value]}]
+          (is (nil? error))
+          (is value)
+          (is (= #{'load4.core$macros} @cljs/*loaded*))
+          (inc! l))))))
+
 (deftest test-analyze-str
   (async done
     (let [l (latch 3 done)]