consistently provide the compiler state in the api nses if not provided by user

Author: dnolen

src/main/clojure/cljs/analyzer/api.clj

@@ -67,12 +67,14 @@
   facilitate code walking without knowing the details of the op set."
   ([env form] (analyze env form nil))
   ([env form name] (analyze env form name nil))
-  ([env form name opts] (analyze env/*compiler* env form name opts))
+  ([env form name opts]
+   (analyze
+     (if-not (nil? env/*compiler*)
+       env/*compiler*
+       (env/default-compiler-env opts))
+     env form name opts))
   ([state env form name opts]
-   (if state
-     (env/with-compiler-env state
-       (binding [ana/*cljs-warning-handlers* (:warning-handlers opts ana/*cljs-warning-handlers*)]
-         (ana/analyze env form name opts)))
+   (env/with-compiler-env state
      (binding [ana/*cljs-warning-handlers* (:warning-handlers opts ana/*cljs-warning-handlers*)]
        (ana/analyze env form name opts)))))
 
@@ -94,7 +96,12 @@
    requested via opts where :restore is false."
   ([src] (parse-ns src nil nil))
   ([src opts] (parse-ns src nil opts))
-  ([src dest opts] (parse-ns env/*compiler* src dest opts))
+  ([src dest opts]
+   (parse-ns
+     (if-not (nil? env/*compiler*)
+       env/*compiler*
+       (env/default-compiler-env opts))
+     src dest opts))
   ([state src dest opts]
    (env/with-compiler-env state
      (binding [ana/*cljs-warning-handlers* (:warning-handlers opts ana/*cljs-warning-handlers*)]
@@ -110,7 +117,12 @@
    \":output-dir/some/ns/foo.cljs.cache.edn\". This function does not return a
    meaningful value."
   ([f] (analyze-file f nil))
-  ([f opts] (analyze-file env/*compiler* f opts))
+  ([f opts]
+   (analyze-file
+     (if-not (nil? env/*compiler*)
+       env/*compiler*
+       (env/default-compiler-env opts))
+     f opts))
   ([state f opts]
    (env/with-compiler-env state
      (binding [ana/*cljs-warning-handlers* (:warning-handlers opts ana/*cljs-warning-handlers*)]

src/main/clojure/cljs/build/api.clj

@@ -57,19 +57,29 @@
   'example.macros :
   (cljs-dependents-for-macro-namespaces 'example.macros) ->
   ('example.core 'example.util)"
-  ([namespaces] (cljs-dependents-for-macro-namespaces env/*compiler* namespaces))
+  ([namespaces]
+   (cljs-dependents-for-macro-namespaces
+     (if-not (nil? env/*compiler*)
+       env/*compiler*
+       (env/default-compiler-env))
+     namespaces))
   ([state namespaces]
    (map :name
-        (let [namespaces-set (set namespaces)]
-          (filter (fn [x] (not-empty
-                            (intersection namespaces-set (-> x :require-macros vals set))))
-                  (vals (:cljs.analyzer/namespaces @state)))))))
+     (let [namespaces-set (set namespaces)]
+       (filter (fn [x] (not-empty
+                         (intersection namespaces-set (-> x :require-macros vals set))))
+         (vals (:cljs.analyzer/namespaces @state)))))))
 
 (defn cljs-ns-dependents
   "Given a namespace symbol return a seq of all dependent
   namespaces sorted in dependency order. Will include
   transient dependents."
-  ([ns] (cljs-ns-dependents env/*compiler* ns))
+  ([ns]
+   (cljs-ns-dependents
+     (if-not (nil? env/*compiler*)
+       env/*compiler*
+       (env/default-compiler-env))
+     ns))
   ([state ns]
    (env/with-compiler-env state
      (ana/ns-dependents ns))))
@@ -85,7 +95,12 @@
   "Given a ClojureScript source file return the target file. May optionally
   provide build options with :output-dir specified."
   ([src] (src-file->target-file src nil))
-  ([src opts] (src-file->target-file env/*compiler* src opts))
+  ([src opts]
+   (src-file->target-file
+     (if-not (nil? env/*compiler*)
+       env/*compiler*
+       (env/default-compiler-env opts))
+     src opts))
   ([state src opts]
    (env/with-compiler-env state
      (binding [ana/*cljs-warning-handlers* (:warning-handlers opts ana/*cljs-warning-handlers*)]
@@ -95,7 +110,12 @@
   "Given a ClojureScript or Google Closure style JavaScript source file return
   the goog.require statement for it."
   ([src] (src-file->goog-require src nil))
-  ([src options] (src-file->goog-require env/*compiler* src options))
+  ([src options]
+   (src-file->goog-require
+     (if-not (nil? env/*compiler*)
+       env/*compiler*
+       (env/default-compiler-env))
+     src options))
   ([state src options]
    (env/with-compiler-env state
      (binding [ana/*cljs-warning-handlers* (:warning-handlers options ana/*cljs-warning-handlers*)]
@@ -126,7 +146,11 @@
   uri of the corresponding source regardless of the source language extension:
   .cljs, .cljc, .js. Returns a map containing :relative-path a string, and
   :uri a URL."
-  ([ns] (ns->location ns env/*compiler*))
+  ([ns]
+   (ns->location ns
+     (if-not (nil? env/*compiler*)
+       env/*compiler*
+       (env/default-compiler-env))))
   ([ns compiler-env]
    (closure/source-for-namespace ns compiler-env)))
 
@@ -163,7 +187,12 @@
 
 (defn compile
   "Given a Compilable, compile it and return an IJavaScript."
-  ([opts compilable] (compile env/*compiler* opts compilable))
+  ([opts compilable]
+   (compile
+     (if-not (nil? env/*compiler*)
+       env/*compiler*
+       (env/default-compiler-env opts))
+     opts compilable))
   ([state opts compilable]
    (env/with-compiler-env state
      (closure/compile compilable opts))))
@@ -181,17 +210,21 @@
 (defn build
   "Given a source which can be compiled, produce runnable JavaScript."
   ([source opts]
-   (build source opts nil))
+   (build source opts
+     (if-not (nil? env/*compiler*)
+       env/*compiler*
+       (env/default-compiler-env opts))))
   ([source opts compiler-env]
    (binding [ana/*cljs-warning-handlers* (:warning-handlers opts ana/*cljs-warning-handlers*)]
      (closure/build source opts compiler-env))))
 
 (defn watch
   "Given a source which can be compiled, watch it for changes to produce."
   ([source opts]
-   (watch source opts (if-not (nil? env/*compiler*)
-                        env/*compiler*
-                        (env/default-compiler-env opts))))
+   (watch source opts
+     (if-not (nil? env/*compiler*)
+       env/*compiler*
+       (env/default-compiler-env opts))))
   ([source opts compiler-env]
    (watch source opts compiler-env nil))
   ([source opts compiler-env stop]

src/main/clojure/cljs/compiler/api.clj

@@ -19,7 +19,12 @@
 
 (defn emit
   "Given an AST node generated by the analyzer emit JavaScript as a string."
-  ([ast] (emit env/*compiler* ast))
+  ([ast]
+   (emit
+     (if-not (nil? env/*compiler*)
+       env/*compiler*
+       (env/default-compiler-env))
+     ast))
   ([state ast]
    (env/with-compiler-env state
      (with-out-str
@@ -29,7 +34,12 @@
   "Ensure that core.cljs has been loaded."
   ([] (comp/with-core-cljs nil))
   ([opts] (with-core-cljs opts (fn [])))
-  ([opts body] (with-core-cljs env/*compiler* opts body))
+  ([opts body]
+   (with-core-cljs
+     (if-not (nil? env/*compiler*)
+       env/*compiler*
+       (env/default-compiler-env opts))
+     opts body))
   ([state opts body]
    (env/with-compiler-env state
      (binding [ana/*cljs-warning-handlers* (:warning-handlers opts ana/*cljs-warning-handlers*)]
@@ -38,7 +48,12 @@
 (defn requires-compilation?
   "Return true if the src file requires compilation."
   ([src dest] (requires-compilation? src dest nil))
-  ([src dest opts] (requires-compilation? env/*compiler* src dest opts))
+  ([src dest opts]
+   (requires-compilation?
+     (if-not (nil? env/*compiler*)
+       env/*compiler*
+       (env/default-compiler-env opts))
+     src dest opts))
   ([state src dest opts]
    (env/with-compiler-env state
      (binding [ana/*cljs-warning-handlers* (:warning-handlers opts ana/*cljs-warning-handlers*)]
@@ -59,7 +74,12 @@
    If the file was not compiled returns only {:file ...}"
   ([src] (compile-file src))
   ([src dest] (compile-file src dest))
-  ([src dest opts] (compile-file env/*compiler* src dest opts))
+  ([src dest opts]
+   (compile-file
+     (if-not (nil? env/*compiler*)
+       env/*compiler*
+       (env/default-compiler-env opts))
+     src dest opts))
   ([state src dest opts]
    (env/with-compiler-env state
      (binding [ana/*cljs-warning-handlers* (:warning-handlers opts ana/*cljs-warning-handlers*)]
@@ -78,7 +98,12 @@
    in dependency order."
   ([src-dir] (compile-root src-dir "out"))
   ([src-dir target-dir] (compile-root src-dir target-dir nil))
-  ([src-dir target-dir opts] (compile-root env/*compiler* src-dir target-dir opts))
+  ([src-dir target-dir opts]
+   (compile-root
+     (if-not (nil? env/*compiler*)
+       env/*compiler*
+       (env/default-compiler-env opts))
+     src-dir target-dir opts))
   ([state src-dir target-dir opts]
    (env/with-compiler-env state
      (binding [ana/*cljs-warning-handlers* (:warning-handlers opts ana/*cljs-warning-handlers*)]