fix ns :rename not properly using ns aliases

fixes #218
thheller · Mar 12, 2018 · 6e433a5 · 6e433a5
1 parent 0749e08
commit 6e433a5
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/src/main/shadow/build/ns_form.clj b/src/main/shadow/build/ns_form.clj
@@ -506,7 +506,7 @@
       )))
 
 (defn rewrite-ns-aliases
-  [{:keys [requires uses deps] :as ast}
+  [{:keys [requires uses deps renames] :as ast}
    {:keys [ns-aliases] :as state}]
 
   (if-not (seq ns-aliases)
@@ -537,6 +537,16 @@
         (rewrite-ns-map requires true)
         :uses
         (rewrite-ns-map uses false)
+        :renames
+        (reduce-kv
+          (fn [renames var fqn-name]
+            (let [ns (symbol (namespace fqn-name))
+                  alias-ns (get ns-aliases ns)]
+              (if-not alias-ns
+                renames
+                (assoc renames var (symbol (str alias-ns) (name fqn-name))))))
+          renames
+          renames)
         :ns-aliases
         ns-aliases
         ))))

diff --git a/src/repl/shadow/cljs/ns_form_test.clj b/src/repl/shadow/cljs/ns_form_test.clj
@@ -152,6 +152,27 @@
     (pprint ast)
     (pprint ast-resolved)))
 
+(deftest test-parse-and-rewrite-rename
+  (let [test
+        '(ns something
+           (:require [react-dnd-html5-backend :rename {default HTML5Backend}]))
+
+        ast
+        (ns-form/parse test)
+
+        ast-resolved
+        (ns-form/rewrite-ns-aliases ast
+          {:ns-aliases
+           '{react-dnd-html5-backend alias$react-dnd-html5-backend}})]
+
+    (is (= 'alias$react-dnd-html5-backend (get-in ast-resolved [:requires 'react-dnd-html5-backend])))
+    (is (= '[goog cljs.core alias$react-dnd-html5-backend] (:deps ast-resolved)))
+    (is (= 'alias$react-dnd-html5-backend/default (get-in ast-resolved [:renames 'HTML5Backend])))
+    (pprint ast)
+    (pprint ast-resolved)))
+
+
+
 (deftest test-parse-repl-require
   (let [test-ns
         '(ns cljs.user)