(wip)

* revert cljs.loader change for now
* generalize munge-goog-module-lib
* add resolve-import helper
* fixup emission test

Author: swannodette

src/main/cljs/cljs/loader.cljs

@@ -8,9 +8,9 @@
 
 (ns cljs.loader
   (:require [goog.object :as gobj]
-            [goog.html.legacyconversions :as legacy]
-            [goog.module.ModuleLoader :as ModuleLoader])
-  (:import [goog.module ModuleManager]))
+            [goog.html.legacyconversions :as legacy])
+  (:import [goog.module ModuleManager]
+           [goog.module ModuleLoader]))
 
 (def module-infos MODULE_INFOS) ;; set by compiler
 (def module-uris

src/main/clojure/cljs/analyzer.cljc

@@ -1016,8 +1016,11 @@
   (str "node$module$" (munge (string/replace (str name) #"[.\/]" #?(:clj "\\$"
                                                                     :cljs "$$")))))
 
-(defn munge-goog-module-lib [name]
-  (str "goog$module$" (munge (string/replace (str name) #"[.\/]" #?(:clj "\\$" :cljs "$$")))))
+(defn munge-goog-module-lib
+  ([name]
+   (str "goog$module$" (munge (string/replace (str name) #"[.\/]" #?(:clj "\\$" :cljs "$$")))))
+  ([ns name]
+   (str (munge ns) "." (munge-goog-module-lib name))))
 
 (defn munge-global-export [name]
   (str "global$module$" (munge (string/replace (str name) #"[.\/]" #?(:clj "\\$"
@@ -1151,6 +1154,15 @@
                :op :js-var
                :ns current-ns})))
 
+(defn resolve-import
+  "goog.modules are deterministically assigned to a property of the namespace,
+   we cannot expect the reference will be globally available, so we resolve to
+   namespace local reference."
+  [env import]
+  (if (goog-module-dep? import)
+    (symbol (munge-goog-module-lib (-> env :ns :name) import))
+    import))
+
 ;; core.async calls `macroexpand-1` manually with an ill-formed
 ;; :locals map. Normally :locals maps symbols maps, but
 ;; core.async adds entries mapping symbols to symbols. We work

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

@@ -6,19 +6,23 @@
 
 (deftest test-glib-module-compile
   (testing "glib modules compiled to Closure Compile expectations"
-    (env/with-compiler-env (env/default-compiler-env)
-      (comp-tests/compile-form-seq
-        '[(ns test.foo
-            (:require [goog.module.ModuleLoader :as module-loader]))
-          (def EVENTS module-loader/EVENTS)]))))
+    (let [src (env/with-compiler-env (env/default-compiler-env)
+                (comp-tests/compile-form-seq
+                  '[(ns test.foo
+                      (: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)))))
 
 (comment
 
+  (test/run-tests)
+
   (println
     (env/with-compiler-env (env/default-compiler-env)
       (comp-tests/compile-form-seq
         '[(ns test.foo
-            (:require [goog.module.ModuleLoader :as module-loader]))
-          (def EVENTS module-loader/EVENTS)])))
+            (:import [goog.module ModuleLoader]))
+          (def module-loader (ModuleLoader.))])))
 
   )