refactor handle-js-modules

remove only-required? param, not used

in Node.js context we still need to build :node-module-index which
is just the entire Node.js top level. This is necessary in REPL contexts
where compilation is always incremental. We may for example need to
analyze dependencies without compiling them - but in this case we
won't know have information about deps from node_modules up front
(in a build this would not occur since we process files in dep order).

The REPL strategy could probably be refactored to remove these issues
but that is out of scope for the coming release.

Author: swannodette

src/main/clojure/cljs/closure.clj

@@ -2397,36 +2397,35 @@
   - index all the node node modules
   - process the JS modules (preprocess + convert to Closure JS)
   - save js-dependency-index for compilation"
-  ([opts js-sources compiler-env]
-    (handle-js-modules opts js-sources compiler-env true))
-  ([{:keys [npm-deps target] :as opts} js-sources compiler-env only-required?]
-   (let [;; Find all the top-level Node packages and their files
-         top-level (reduce
-                     (fn [acc m]
-                       (reduce (fn [acc p] (assoc acc p m)) acc (:provides m)))
-                     {} (index-node-modules-dir))
-         requires  (set (mapcat deps/-requires js-sources))
-         ;; Select Node files that are required by Cljs code,
-         ;; and create list of all their dependencies
-         node-required (if only-required?
-                         (set/intersection (set (keys top-level)) requires)
-                         (keys top-level))]
-     (if-not (= target :nodejs)
-       (let [opts (-> opts
-                    (update :foreign-libs
-                      (fn [libs]
-                        (into (if-not (empty? npm-deps)
-                                (index-node-modules node-required)
-                                [])
-                          (expand-libs libs))))
-                    process-js-modules)]
-         (swap! compiler-env assoc :js-dependency-index
-           (deps/js-dependency-index opts))
-         opts)
-       (do
-         (swap! compiler-env update-in [:node-module-index]
-           (fnil into #{}) (map str node-required))
-         opts)))))
+  [{:keys [npm-deps target] :as opts} js-sources compiler-env]
+  (let [;; Find all the top-level Node packages and their files
+        top-level (reduce
+                    (fn [acc m]
+                      (reduce (fn [acc p] (assoc acc p m)) acc (:provides m)))
+                    {} (index-node-modules-dir))
+        requires (set (mapcat deps/-requires js-sources))
+        ;; Select Node files that are required by Cljs code,
+        ;; and create list of all their dependencies
+        node-required (set/intersection (set (keys top-level)) requires)]
+    (if-not (= target :nodejs)
+      (let [opts (-> opts
+                   (update :foreign-libs
+                     (fn [libs]
+                       (into (if-not (empty? npm-deps)
+                               (index-node-modules node-required)
+                               [])
+                         (expand-libs libs))))
+                   process-js-modules)]
+        (swap! compiler-env merge
+          ;; we need to also track the whole top level - this is to support
+          ;; cljs.analyze/analyze-deps, particularly in REPL contexts - David
+          {:js-dependency-index (deps/js-dependency-index opts)
+           :node-module-index (into #{} (map str (keys top-level)))})
+        opts)
+      (do
+        (swap! compiler-env update-in [:node-module-index]
+          (fnil into #{}) (map str node-required))
+        opts))))
 
 (defn build
   "Given a source which can be compiled, produce runnable JavaScript."