add closure/add-implicit-options to share more logic between compiler

and REPLs

Author: swannodette

src/clj/cljs/closure.clj

@@ -1310,6 +1310,19 @@ should contain the source for the given namespace name."
   (and (satisfies? deps/IJavaScript js)
        (deps/-foreign? js)))
 
+(defn add-implicit-options [opts]
+  (let [{:keys [libs foreign-libs externs]} (get-upstream-deps)]
+    (cond->
+      (-> opts
+        (assoc
+          :ups-libs libs
+          :ups-foreign-libs foreign-libs
+          :ups-externs externs)
+        (update-in [:preamble] #(into (or % []) ["cljs/imul.js"])))
+      (:target opts)
+      (assoc-in [:closure-defines "cljs.core.target"]
+        (name (:target opts))))))
+
 (defn build
   "Given a source which can be compiled, produce runnable JavaScript."
   ([source opts]
@@ -1320,15 +1333,7 @@ should contain the source for the given namespace name."
   ([source opts compiler-env]
      (env/with-compiler-env compiler-env
        (let [compiler-stats (:compiler-stats opts)
-             ups-deps (get-upstream-deps)
-             all-opts (cond->
-                        (-> opts
-                          (assoc
-                            :ups-libs (:libs ups-deps)
-                            :ups-foreign-libs (:foreign-libs ups-deps)
-                            :ups-externs (:externs ups-deps))
-                          (update-in [:preamble] #(into (or % []) ["cljs/imul.js"])))
-                        (:target opts) (assoc-in [:closure-defines "cljs.core.target"] (name (:target opts))))
+             all-opts (add-implicit-options opts)
              emit-constants (or (and (= (:optimizations opts) :advanced)
                                      (not (false? (:optimize-constants opts))))
                                 (:optimize-constants opts))]

src/clj/cljs/repl.clj

@@ -638,25 +638,23 @@
                   source-map-inline true}
              :as opts}]
   (print "To quit, type:" :cljs/quit)
-  (let [ups-deps (cljsc/get-upstream-deps)
-        {:keys [analyze-path repl-verbose warn-on-undeclared special-fns static-fns] :as opts
+  (let [{:keys [analyze-path repl-verbose warn-on-undeclared special-fns static-fns] :as opts
          :or   {warn-on-undeclared true}}
         (merge
           {:cache-analysis true :source-map true}
-          (assoc (merge (-repl-options repl-env) opts)
-            :init init
-            :need-prompt prompt
-            :flush flush
-            :read read
-            :print print
-            :caught caught
-            :reader reader
-            :print-no-newline print-no-newline
-            :source-map-inline source-map-inline
-            :output-dir (or (:output-dir opts)
-                            (:default-output-dir repl-env))
-            :ups-libs (:libs ups-deps)
-            :ups-foreign-libs (:foreign-libs ups-deps)))]
+          (cljsc/add-implicit-options
+            (assoc (merge (-repl-options repl-env) opts)
+              :init init
+              :need-prompt prompt
+              :flush flush
+              :read read
+              :print print
+              :caught caught
+              :reader reader
+              :print-no-newline print-no-newline
+              :source-map-inline source-map-inline
+              :output-dir (or (:output-dir opts)
+                              (:default-output-dir repl-env)))))]
     (env/with-compiler-env
      (or (::env/compiler repl-env) (env/default-compiler-env opts))
      (binding [ana/*cljs-ns* 'cljs.user