(wip)

* resolve goog.module imports in resolve-var
* test cases
* check that emission doesn't shadow import usage

Author: swannodette

src/main/clojure/cljs/analyzer.cljc

@@ -1235,7 +1235,13 @@
              ;; check if prefix is some existing def
              (if-let [resolved (resolve-var env prefix nil false)]
                (update resolved :name #(symbol (str % "." suffix)))
-               (let [idx (.lastIndexOf s ".")
+               ;; glib imports (i.e. (:import [goog.module ModuleLoader])
+               ;; are always just dotted symbols after the recursion
+               (let [s   (str
+                           (cond->> s
+                             (goog-module-dep? sym)
+                             (resolve-import env)))
+                     idx (.lastIndexOf (str s) ".")
                      pre (subs s 0 idx)
                      suf (subs s (inc idx))]
                  {:op   :var

src/test/clojure/cljs/analyzer/glib_module_test.clj

@@ -31,9 +31,32 @@
              (env/with-compiler-env cenv
                (ana/resolve-var aenv 'module-loader/EventType)))))))
 
+(deftest glib-module-resolve-import-test
+  (testing "glib module resolve import helper test"
+    (let [cenv   (env/default-compiler-env)
+          ns-ast (ana-tests/analyze-forms cenv
+                   '[(ns foo.core
+                       (:require [goog.module.ModuleLoader :as module-loader]))])
+          aenv   (assoc (ana/empty-env) :ns (ana/get-namespace cenv 'foo.core))]
+      (is (= 'foo.core.goog$module$goog$module$ModuleLoader
+             (env/with-compiler-env cenv
+               (ana/resolve-import aenv 'goog.module.ModuleLoader)))))))
+
+(deftest glib-module-resolve-import-var-test
+  (testing "glib module :import var resolution"
+    (let [cenv   (env/default-compiler-env)
+          ns-ast (ana-tests/analyze-forms cenv
+                   '[(ns foo.core
+                       (:import [goog.module ModuleLoader]))])
+          aenv   (assoc (ana/empty-env) :ns (ana/get-namespace cenv 'foo.core))]
+      (is (= '{:name foo.core.goog$module$goog$module$ModuleLoader
+               :ns goog.module ;; a bit odd, but doesn't matter, for emission we just :name
+               :op :var}
+            (env/with-compiler-env cenv
+              (ana/resolve-var aenv 'ModuleLoader)))))))
+
 (comment
 
-  (test/test-vars [#'glib-module-resolve-var-test])
   (test/run-tests)
 
   )

src/test/clojure/cljs/compiler/glib_module_test.clj

@@ -1,6 +1,5 @@
 (ns cljs.compiler.glib-module-test
-  (:require [cljs.compiler :as comp]
-            [cljs.compiler-tests :as comp-tests]
+  (:require [cljs.compiler-tests :as comp-tests]
             [cljs.env :as env]
             [clojure.test :as test :refer [deftest is testing]]))
 
@@ -12,17 +11,11 @@
                       (:import [goog.module ModuleLoader]))
                     (def module-loader (ModuleLoader.))]))]
       (is (re-find #"goog\.require\('goog\.module\.ModuleLoader'\)" src))
-      (is (re-find #"test\.foo\.goog\$module\$goog\$module\$ModuleLoader = goog\.module\.get\('goog.module.ModuleLoader'\)" src)))))
+      (is (re-find #"test\.foo\.goog\$module\$goog\$module\$ModuleLoader = goog\.module\.get\('goog.module.ModuleLoader'\)" src))
+      (is (re-find #"test\.foo\.module_loader = \(new test\.foo\.goog\$module\$goog\$module\$ModuleLoader\(\)\)" src)))))
 
 (comment
 
   (test/run-tests)
 
-  (println
-    (env/with-compiler-env (env/default-compiler-env)
-      (comp-tests/compile-form-seq
-        '[(ns test.foo
-            (:import [goog.module ModuleLoader]))
-          (def module-loader (ModuleLoader.))])))
-
   )