CLJS-2702: Accomodate new Closure Library dependency loading strategy

Author: mfikes

src/main/cljs/cljs/bootstrap_nodejs.js

@@ -73,7 +73,15 @@ global.CLOSURE_IMPORT_SCRIPT = function(src, opt_sourceText) {
     // Sources are always expressed relative to closure's base.js, but
     // require() is always relative to the current source.
     if (opt_sourceText === undefined) {
-        var flags = goog.dependencies_.loadFlags[src];
+        var flags = null;
+        if (goog.debugLoader_) {
+            var dep = goog.debugLoader_.dependencies_[src];
+            if (dep) {
+                flags = dep.loadFlags;
+            }
+        } else {
+            flags = goog.dependencies_.loadFlags[src];
+        }
         if (flags && flags["foreign-lib"]) {
             nodeGlobalRequire(path.resolve(__dirname, "..", src));
         } else {

src/main/cljs/clojure/browser/repl.cljs

@@ -199,6 +199,12 @@
           (do
             (set! load-queue #js [])
             (js/goog.writeScriptTag__ src opt_sourceText)))))
+    ;; In the latest Closure library implementation, there is no goog.writeScriptTag_,
+    ;; to monkey-patch. The behavior of interest is instead in goog.Dependency.prototype.load,
+    ;; which first checks and uses CLOSURE_IMPORT_SCRIPT if defined. So we hook our desired
+    ;; behavior here.
+    (when goog/debugLoader_
+      (set! js/CLOSURE_IMPORT_SCRIPT (.-writeScriptTag_ js/goog)))
     ;; we must reuse Closure library dev time dependency management, under namespace
     ;; reload scenarios we simply delete entries from the correct private locations
     (set! (.-require js/goog)
@@ -207,11 +213,16 @@
           (set! (.-cljsReloadAll_ js/goog) true))
         (let [reload? (or reload (.-cljsReloadAll__ js/goog))]
           (when reload?
-            (let [path (gobj/get js/goog.dependencies_.nameToPath src)]
-              (gobj/remove js/goog.dependencies_.visited path)
-              (gobj/remove js/goog.dependencies_.written path)
-              (gobj/remove js/goog.dependencies_.written
-                (str js/goog.basePath path))))
+            (if (some? goog/debugLoader_)
+              (let [path (.getPathFromDeps_ goog/debugLoader_ name)]
+                (gobj/remove (.-written_ goog/debugLoader_) path)
+                (gobj/remove (.-written_ goog/debugLoader_)
+                  (str js/goog.basePath path)))
+              (let [path (gobj/get js/goog.dependencies_.nameToPath src)]
+                (gobj/remove js/goog.dependencies_.visited path)
+                (gobj/remove js/goog.dependencies_.written path)
+                (gobj/remove js/goog.dependencies_.written
+                  (str js/goog.basePath path)))))
           (let [ret (.require__ js/goog src)]
             (when (= reload "reload-all")
               (set! (.-cljsReloadAll_ js/goog) false))

src/main/clojure/cljs/repl/nashorn.clj

@@ -127,7 +127,9 @@
                    (when (or (not (contains? *loaded-libs* name)) reload)
                      (set! *loaded-libs* (conj (or *loaded-libs* #{}) name))
                      (js/CLOSURE_IMPORT_SCRIPT
-                       (goog.object/get (.. js/goog -dependencies_ -nameToPath) name)))))))))
+                       (if (some? goog/debugLoader_)
+                         (.getPathFromDeps_ goog/debugLoader_ name)
+                         (goog.object/get (.. js/goog -dependencies_ -nameToPath) name))))))))))
       (-evaluate [{engine :engine :as this} filename line js]
         (when debug (println "Evaluating: " js))
         (try

src/main/clojure/cljs/repl/node.clj

@@ -197,7 +197,9 @@
            '(set! (.-require js/goog)
               (fn [name]
                 (js/CLOSURE_IMPORT_SCRIPT
-                  (unchecked-get (.. js/goog -dependencies_ -nameToPath) name)))))
+                  (if (some? goog/debugLoader_)
+                    (.getPathFromDeps_ goog/debugLoader_ name)
+                    (unchecked-get (.. js/goog -dependencies_ -nameToPath) name))))))
          ;; load cljs.core, setup printing
          (repl/evaluate-form repl-env env "<cljs repl>"
            '(do
@@ -213,7 +215,9 @@
                   (when (or (not (contains? *loaded-libs* name)) reload)
                     (set! *loaded-libs* (conj (or *loaded-libs* #{}) name))
                     (js/CLOSURE_IMPORT_SCRIPT
-                      (unchecked-get (.. js/goog -dependencies_ -nameToPath) name)))))))
+                      (if (some? goog/debugLoader_)
+                        (.getPathFromDeps_ goog/debugLoader_ name)
+                        (unchecked-get (.. js/goog -dependencies_ -nameToPath) name))))))))
          (node-eval repl-env
            (str "goog.global.CLOSURE_UNCOMPILED_DEFINES = "
              (json/write-str (:closure-defines opts)) ";")))))

src/main/clojure/cljs/repl/rhino.clj

@@ -29,6 +29,7 @@
        "        name = \"load-file\","
        "        loadFile = Packages.clojure.lang.RT[\"var\"](ns,name);\n"
        "    if(src) loadFile.invoke(___repl_env, __repl_opts, src);\n"
+       "    return true;\n"
        "};\n"))
 
 ;; =============================================================================
@@ -155,7 +156,9 @@
              (when (or (not (contains? *loaded-libs* name)) reload)
                (set! *loaded-libs* (conj (or *loaded-libs* #{}) name))
                (js/CLOSURE_IMPORT_SCRIPT
-                 (goog.object/get (.. js/goog -dependencies_ -nameToPath) name)))))))
+                 (if (some? goog/debugLoader_)
+                   (.getPathFromDeps_ goog/debugLoader_ name)
+                   (goog.object/get (.. js/goog -dependencies_ -nameToPath) name))))))))
 
     ;; set closure-defines
     (rhino-eval repl-env "CLOSURE_UNCOMPILED_DEFINES" 1

src/test/clojure/cljs/build_api_tests.clj

@@ -187,6 +187,7 @@
    :opts
    {:output-dir output-dir
     :optimizations :none
+    :language-in :es6
     :verbose true
     :foreign-libs [{:file "src/test/cljs_build/loader_test/foreignA.js"
                     :provides ["foreign.a"]}

src/test/self/self_parity/auxiliary.cljs

@@ -87,7 +87,6 @@
     goog.iter.Iterable
     goog.iter.Iterator
     goog.json
-    goog.json.EvalJsonProcessor
     goog.json.NativeJsonProcessor
     goog.json.Replacer
     goog.json.Reviver

src/test/self/self_parity/test.cljs

@@ -42,7 +42,9 @@
   (set! (.-require js/goog)
     (fn [name]
       (js/CLOSURE_IMPORT_SCRIPT
-        (gobj/get (.. js/goog -dependencies_ -nameToPath) name))))
+        (if goog/debugLoader_
+          (.getPathFromDeps_ goog/debugLoader_ name)
+          (gobj/get (.. js/goog -dependencies_ -nameToPath) name)))))
   ;; setup printing
   (nodejs/enable-util-print!)
   ;; redef goog.require to track loaded libs
@@ -52,7 +54,9 @@
       (when (or (not (contains? *loaded-libs* name)) reload)
         (set! *loaded-libs* (conj (or *loaded-libs* #{}) name))
         (js/CLOSURE_IMPORT_SCRIPT
-          (gobj/get (.. js/goog -dependencies_ -nameToPath) name))))))
+          (if goog/debugLoader_
+            (.getPathFromDeps_ goog/debugLoader_ name)
+            (gobj/get (.. js/goog -dependencies_ -nameToPath) name)))))))
 
 ;; Node file reading fns