Automatically load new dependencies when a ns form is compiled.

Author: brentonashworth

src/clj/cljs/repl.clj

@@ -22,11 +22,35 @@
   (-put [this k f])
   (-tear-down [this]))
 
+(defn load-namespace
+  "Load a namespace and all of its dependencies into the evaluation environment.
+  The environment is responsible for ensuring that each namespace is loaded once and
+  only once."
+  [repl-env sym]
+  (let [sym (if (and (seq? sym)
+                     (= (first sym) 'quote))
+              (second sym)
+              sym)
+        opts {:output-dir (get repl-env :working-dir ".repl")}
+        deps (->> (cljsc/add-dependencies opts {:requires [(name sym)] :type :seed})
+                  (remove (comp #{["goog"]} :provides))
+                  (remove (comp #{:seed} :type))
+                  (map #(select-keys % [:provides :url])))]
+    (doseq [{:keys [url provides]} deps]
+      (-load repl-env provides url))))
+
+(defn- load-dependencies
+  [repl-env requires]
+  (doseq [ns requires]
+    (load-namespace repl-env ns)))
+
 (defn evaluate-form
   [repl-env env form]
   (try
     (let [ast (comp/analyze env form)
           js (comp/emits ast)]
+      (when (= (:op ast) :ns)
+        (load-dependencies repl-env (vals (:requires ast))))
       (when *cljs-verbose*
         (print js))
       (let [ret (-evaluate repl-env (:line (meta form)) js)]
@@ -35,7 +59,7 @@
           ;;TODO - file bug with google, this is bs error
           ;;this is what you get when you try to 'teach new developers'
           ;;via errors (goog/base.js 104)
-          :error (when-not (and (seq? form) (= 'ns (first form)))
+          :error (when-not (and (seq? form) (= 'ns (first form))) ;; dry
                    (println (:value ret))
                    (when-let [st (:stacktrace ret)]
                      (println st)))
@@ -68,20 +92,6 @@
       (-put repl-env :filename f)
       (load-stream repl-env res))))
 
-(defn load-namespace
-  [repl-env sym]
-  (let [sym (if (and (seq? sym)
-                     (= (first sym) 'quote))
-              (second sym)
-              sym)
-        opts {:output-dir (get repl-env :working-dir ".repl")}
-        deps (->> (cljsc/add-dependencies opts {:requires [(name sym)] :type :seed})
-                  (remove (comp #{["goog"]} :provides))
-                  (remove (comp #{:seed} :type))
-                  (map #(select-keys % [:provides :url])))]
-    (doseq [{:keys [url provides]} deps]
-      (-load repl-env provides url))))
-
 (defn repl
   "Note - repl will reload core.cljs every time, even if supplied old repl-env"
   [repl-env & {:keys [verbose warn-on-undeclared]}]

src/clj/cljs/repl/browser.clj

@@ -247,17 +247,14 @@
           (browser-eval (slurp url))))
       (swap! loaded-libs (partial apply conj) missing))))
 
-(defrecord BrowserEnv [opts]
-  IJavaScriptEnv
+(extend-protocol repl/IJavaScriptEnv
+  clojure.lang.IPersistentMap
   (-setup [this]
-    (do (comp/with-core-cljs (start-server opts))
+    (do (comp/with-core-cljs (start-server this))
         (browser-eval "goog.provide('cljs.user');")))
-  (-evaluate [this line js]
-    (browser-eval js))
-  (-load [this ns url]
-    (load-javascript this ns url))
-  (-put [this k v]
-    nil)
+  (-evaluate [this line js] (browser-eval js))
+  (-load [this ns url] (load-javascript this ns url))
+  (-put [this k v] nil)
   (-tear-down [this]
     (do (stop-server)
         (reset! server-state {}))))
@@ -280,14 +277,14 @@
       (spit file (compile-client-js opts)))
     file))
 
-(defn repl-env [& {:keys [port root] :as opts}]
+(defn repl-env [& {:as opts}]
   (let [opts (merge {:port 9000 :optimizations :simple :working-dir ".repl"} opts)]
     (do (swap! server-state
                (fn [old] (assoc old :client-js
                                (future (create-client-js-file
                                         opts
                                         (io/file (:working-dir opts) "client.js"))))))
-        (BrowserEnv. opts))))
+        opts)))
 
 (comment
 

src/clj/cljs/repl/rhino.clj

@@ -125,7 +125,6 @@ goog.require = function(rule){Packages.clojure.lang.RT[\"var\"](\"cljs.repl.rhin
 
   (load-namespace 'clojure.set)
 
-  (load-namespace 'goog.crypt)
   (ns test.crypt
     (:require [goog.crypt :as c]))
   (c/stringToByteArray "Hello")