(wip)

* bump glib
* :require module loader instead of :import - not a legacy namespace anymore
* add goog.module handling case to analyzer
* add goog.module handling case to compiler
* add tests

Author: swannodette

deps.edn

@@ -5,7 +5,7 @@
   org.clojure/clojure {:mvn/version "1.10.0"}
   org.clojure/core.specs.alpha {:mvn/version "0.1.24"}
   org.clojure/data.json {:mvn/version "0.2.6"}
-  org.clojure/google-closure-library {:mvn/version "0.0-20201211-3e6c510d"}
+  org.clojure/google-closure-library {:mvn/version "0.0-20210811-6da97fe1"}
   org.clojure/spec.alpha {:mvn/version "0.1.143"}
   org.clojure/tools.reader {:mvn/version "1.3.3"}
   org.clojure/test.check {:mvn/version "0.10.0-alpha3"}}

pom.template.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.clojure</groupId>
             <artifactId>google-closure-library</artifactId>
-            <version>0.0-20201211-3e6c510d</version>
+            <version>0.0-20210811-6da97fe1</version>
         </dependency>
         <dependency>
             <groupId>org.clojure</groupId>

project.clj

@@ -15,7 +15,7 @@
                  [org.clojure/tools.reader "1.3.3"]
                  [org.clojure/test.check "0.10.0-alpha3" :scope "test"]
                  [com.cognitect/transit-clj "0.8.309"]
-                 [org.clojure/google-closure-library "0.0-20201211-3e6c510d"]
+                 [org.clojure/google-closure-library "0.0-20210811-6da97fe1"]
                  [com.google.javascript/closure-compiler-unshaded "v20210808"]]
   :profiles {:1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
              :uberjar {:aot :all :main cljs.main}

script/bootstrap

@@ -8,7 +8,7 @@ CORE_SPECS_ALPHA_RELEASE="0.1.24"
 CLOSURE_RELEASE="20210808"
 DJSON_RELEASE="0.2.6"
 TRANSIT_RELEASE="0.8.309"
-GCLOSURE_LIB_RELEASE="0.0-20201211-3e6c510d"
+GCLOSURE_LIB_RELEASE="0.0-20210811-6da97fe1"
 TREADER_RELEASE="1.3.3"
 TEST_CHECK_RELEASE="0.10.0-alpha3"
 

src/main/cljs/cljs/loader.cljs

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

src/main/clojure/cljs/analyzer.cljc

@@ -812,6 +812,12 @@
     (or (contains? global-exports (symbol module))
         (contains? global-exports (name module)))))
 
+(defn goog-module-dep?
+  [module]
+  (let [[module _] (lib&sublib module)
+        module-type (get-in @env/*compiler* [:js-dependency-index (str module) :module])]
+    (= :goog module-type)))
+
 (defn confirm-var-exists
   ([env prefix suffix]
    (let [warn (confirm-var-exist-warning env prefix suffix)]
@@ -1010,6 +1016,9 @@
   (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-global-export [name]
   (str "global$module$" (munge (string/replace (str name) #"[.\/]" #?(:clj "\\$"
                                                                       :cljs "$$")))))
@@ -1031,6 +1040,7 @@
 
 (defn ns->module-type [ns]
   (cond
+    (goog-module-dep? ns) :goog-module
     (js-module-exists? ns) :js
     (node-module-dep? ns) :node
     (dep-has-global-exports? ns) :global))
@@ -1072,6 +1082,12 @@
      :op      :js-var
      :foreign true}))
 
+(defmethod resolve* :goog-module
+  [env sym full-ns current-ns]
+  {:name (symbol (str current-ns) (str (munge-goog-module-lib full-ns) "." (name sym)))
+   :ns current-ns
+   :op :var})
+
 (defmethod resolve* :global
   [env sym full-ns current-ns]
   (let [pre (extern-pre sym current-ns)]

src/main/clojure/cljs/compiler.cljc

@@ -1294,6 +1294,9 @@
                                      (let [{node-libs true libs-to-load false} (group-by ana/node-module-dep? libs)]
                                        [node-libs libs-to-load])
                                      [nil libs]))
+        [goog-modules libs-to-load] (let [{goog-modules true libs-to-load false}
+                                          (group-by ana/goog-module-dep? libs-to-load)]
+                                      [goog-modules libs-to-load])
         global-exports-libs (filter ana/dep-has-global-exports? libs-to-load)]
     (when (-> libs meta :reload-all)
       (emitln "if(!COMPILED) " loaded-libs-temp " = " loaded-libs " || cljs.core.set([\"cljs.core\"]);")
@@ -1336,11 +1339,21 @@
         :else
         (when-not (= lib 'goog)
           (emitln "goog.require('" (munge lib) "');"))))
+    ;; Node Libraries
     (doseq [lib node-libs]
       (let [[lib' sublib] (ana/lib&sublib lib)]
         (emitln (munge ns-name) "."
           (ana/munge-node-lib lib)
           " = require('" lib' "')" (sublib-select sublib) ";")))
+    ;; Google Closure Library Modules (i.e. goog.module(...))
+    ;; these must be assigned to vars
+    (doseq [lib goog-modules]
+      (let [[lib' sublib] (ana/lib&sublib lib)]
+        (emitln "goog.require('" lib' "');")
+        (emitln (munge ns-name) "."
+          (ana/munge-goog-module-lib lib)
+          " = goog.module.get('" lib' "')" (sublib-select sublib) ";")))
+    ;; Global Exports
     (doseq [lib global-exports-libs]
       (let [{:keys [global-exports]} (get js-dependency-index (name (-> lib ana/lib&sublib first)))]
         (emit-global-export ns-name global-exports lib)))

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

@@ -0,0 +1,39 @@
+(ns cljs.analyzer.glib-module-test
+  (:require [cljs.analyzer :as ana]
+            [cljs.analyzer-tests :as ana-tests]
+            [clojure.test :as test :refer [deftest is testing]]
+            [cljs.env :as env]))
+
+(deftest glib-module-detect-test
+  (testing "Basic glib module detection"
+    (is (= :goog (get-in @ana-tests/test-cenv [:js-dependency-index (munge "goog.module.ModuleLoader") :module])))))
+
+(deftest glib-module-predicate-test
+  (testing "glib module detection predicate"
+    (env/with-compiler-env ana-tests/test-cenv
+      (is (ana/goog-module-dep? 'goog.module.ModuleLoader)))))
+
+(deftest glib-module-classification-test
+  (testing "glib module classification"
+    (env/with-compiler-env ana-tests/test-cenv
+      (is (= :goog-module (ana/ns->module-type 'goog.module.ModuleLoader))))))
+
+(deftest glib-module-resolve-var-test
+  (testing "glib module var resolution"
+    (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 (= '{:name foo.core/goog$module$goog$module$ModuleLoader.EventType
+               :ns foo.core
+               :op :var}
+             (env/with-compiler-env cenv
+               (ana/resolve-var aenv 'module-loader/EventType)))))))
+
+(comment
+
+  (test/test-vars [#'glib-module-resolve-var-test])
+  (test/run-tests)
+
+  )

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

@@ -0,0 +1,24 @@
+(ns cljs.compiler.glib-module-test
+  (:require [cljs.compiler :as comp]
+            [cljs.compiler-tests :as comp-tests]
+            [cljs.env :as env]
+            [clojure.test :as test :refer [deftest is testing]]))
+
+(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)]))))
+
+(comment
+
+  (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)])))
+
+  )