CLJS-1585: Self-host: Alias-scoped keywords

Since cljs.tools.reader makes use of *alias-map* to resolve aliases,
bind it to the :requires map for the current namespace in the compiler
state. This allows alias-scoped keywords (such as ::alias-name/foo
to be properly expanded.

Author: mfikes

src/main/cljs/cljs/js.cljs

@@ -157,6 +157,10 @@
             "\n//# sourceMappingURL=data:application/json;base64,"
             (base64/encodeString json)))))
 
+(defn- current-alias-map
+  []
+  (get-in @env/*compiler* [:cljs.analyzer/namespaces ana/*cljs-ns* :requires]))
+
 ;; -----------------------------------------------------------------------------
 ;; Analyze
 
@@ -449,6 +453,7 @@
                  ana/*cljs-static-fns*  (:static-fns opts)
                  *ns*                   (create-ns ns)
                  ana/*passes*           (:*passes* bound-vars)
+                 r/*alias-map*          (current-alias-map)
                  r/*data-readers*       (:*data-readers* bound-vars)
                  r/resolve-symbol       resolve-symbol
                  comp/*source-map-data* (:*sm-data* bound-vars)]
@@ -536,6 +541,7 @@
               ana/*cljs-ns*          (:*cljs-ns* bound-vars)
               ana/*cljs-static-fns*  (:static-fns opts)
               *ns*                   (create-ns (:*cljs-ns* bound-vars))
+              r/*alias-map*          (current-alias-map)
               r/*data-readers*       (:*data-readers* bound-vars)
               r/resolve-symbol       resolve-symbol
               comp/*source-map-data* (:*sm-data* bound-vars)]
@@ -611,6 +617,7 @@
                  ana/*cljs-ns*          ns
                  ana/*cljs-static-fns*  (:static-fns opts)
                  *ns*                   (create-ns ns)
+                 r/*alias-map*          (current-alias-map)
                  r/*data-readers*       (:*data-readers* bound-vars)
                  r/resolve-symbol       resolve-symbol
                  comp/*source-map-data* (:*sm-data* bound-vars)]
@@ -709,6 +716,7 @@
                  ana/*cljs-ns*          ns
                  ana/*cljs-static-fns*  (:static-fns opts)
                  *ns*                   (create-ns ns)
+                 r/*alias-map*          (current-alias-map)
                  r/*data-readers*       (:*data-readers* bound-vars)
                  r/resolve-symbol       resolve-symbol
                  comp/*source-map-data* (:*sm-data* bound-vars)]

src/test/self/self_host/test.cljs

@@ -545,6 +545,27 @@
       (is (nil? error))
       (is (= 2 value)))))
 
+(deftest test-CLJS-1585
+  (cljs/eval-str st
+    "(ns alias-load.core (:require [aliased.core :as alias]))"
+    nil
+    {:ns      'cljs.user
+     :context :expr
+     :eval    cljs.js/js-eval
+     :load    (fn [_ cb]
+                (cb {:lang :clj :source "(ns aliased.core)"}))}
+    (fn [{:keys [error value]}]
+      (is (nil? error))
+      (cljs.js/eval-str st
+        "::alias/bar"
+        nil
+        {:ns      'alias-load.core
+         :context :expr
+         :eval    cljs.js/js-eval}
+        (fn [{:keys [error value]}]
+          (is (nil? error))
+          (is (= :aliased.core/bar value)))))))
+
 #_(deftest test-eval-str-with-require
   (async done
     (let [l (latch 3 done)]