clean up all REPL entry points

Author: dnolen

src/clj/cljs/repl/browser.clj

@@ -253,29 +253,12 @@
                (cljsc/js-dependencies opts cljs))]
     (disj (set (concat cljs goog)) nil)))
 
-(defn repl-env
-  "Create a browser-connected REPL environment.
-
-  Options:
+;; NOTE: REPL evaluation environment designers do not replicate the behavior
+;; of the browser REPL. The design is outdated, refer to the Node.js, Rhino or
+;; Nashorn REPLs.
 
-  port:           The port on which the REPL server will run. Defaults to 9000.
-  working-dir:    The directory where the compiled REPL client JavaScript will
-                  be stored. Defaults to \".repl\" with a ClojureScript version
-                  suffix, eg. \".repl-0.0-2138\".
-  serve-static:   Should the REPL server attempt to serve static content?
-                  Defaults to true.
-  static-dir:     List of directories to search for static content. Defaults to
-                  [\".\" \"out/\"].
-  preloaded-libs: List of namespaces that should not be sent from the REPL server
-                  to the browser. This may be required if the browser is already
-                  loading code and reloading it would cause a problem.
-  optimizations:  The level of optimization to use when compiling the client
-                  end of the REPL. Defaults to :simple.
-  src:            The source directory containing user-defined cljs files. Used to
-                  support reflection. Defaults to \"src/\".
-  "
-  [& {:as opts}]
-  (let [ups-deps (cljsc/get-upstream-deps (java.lang.ClassLoader/getSystemClassLoader))
+(defn repl-env* [opts]
+  (let [ups-deps (cljsc/get-upstream-deps)
         opts (assoc opts
                :ups-libs (:libs ups-deps)
                :ups-foreign-libs (:foreign-libs ups-deps))
@@ -284,8 +267,8 @@
                {:port           9000
                 :optimizations  :simple
                 :working-dir    (or (:output-dir opts)
-                                    (->> [".repl" (util/clojurescript-version)]
-                                      (remove empty?) (string/join "-")))
+                                  (->> [".repl" (util/clojurescript-version)]
+                                    (remove empty?) (string/join "-")))
                 :serve-static   true
                 :static-dir     (cond-> ["." "out/"]
                                   (:output-dir opts) (conj (:output-dir opts)))
@@ -304,12 +287,37 @@
       (swap! browser-state
         (fn [old]
           (assoc old :client-js
-            (create-client-js-file
-              opts
-              (io/file (:working-dir opts) "client.js")))))
+                     (create-client-js-file
+                       opts
+                       (io/file (:working-dir opts) "client.js")))))
       (println "Waiting for browser to connect ...")
       opts)))
 
+(defn repl-env
+  "Create a browser-connected REPL environment.
+
+  Options:
+
+  port:           The port on which the REPL server will run. Defaults to 9000.
+  working-dir:    The directory where the compiled REPL client JavaScript will
+                  be stored. Defaults to \".repl\" with a ClojureScript version
+                  suffix, eg. \".repl-0.0-2138\".
+  serve-static:   Should the REPL server attempt to serve static content?
+                  Defaults to true.
+  static-dir:     List of directories to search for static content. Defaults to
+                  [\".\" \"out/\"].
+  preloaded-libs: List of namespaces that should not be sent from the REPL server
+                  to the browser. This may be required if the browser is already
+                  loading code and reloading it would cause a problem.
+  optimizations:  The level of optimization to use when compiling the client
+                  end of the REPL. Defaults to :simple.
+  src:            The source directory containing user-defined cljs files. Used to
+                  support reflection. Defaults to \"src/\".
+  "
+  [& {:as opts}]
+  (assert (even? (count opts)) "Arguments must be interleaved key value pairs")
+  (repl-env* opts))
+
 (comment
 
   (require '[cljs.repl :as repl])

src/clj/cljs/repl/nashorn.clj

@@ -211,12 +211,7 @@
       opts)))
 
 (defn repl-env 
-  "Create a Nashorn repl-env for use with the repl/repl* method in Clojurescript and as the
-   :repl-env argument to piggieback/cljs-repl. Besides the usual repl options (e.g. :source-map),
-   opts has the following extra parameters:
-   
-   :output-dir  the directory of the compiled files, e.g. \"resources/public/my-app\" (mandatory).
-   :output-to   load this file initially into Nashorn, relative to output-dir.
-                Use a minimal bootstrapped cljs.core environment if not specified."
+  "Create a Nashorn repl-env for use with the repl/repl* method in Clojurescript."
   [& {:as opts}]
+  (assert (even? (count opts)) "Arguments must be interleaved key value pairs")
   (repl-env* opts))

src/clj/cljs/repl/node.clj

@@ -195,6 +195,8 @@
     (NodeEnv. host port (atom nil) (atom nil))))
 
 (defn repl-env
+  "Construct a Node.js evalution environment. Can supply :host and :port."
   [& {:as options}]
+  (assert (even? (count options)) "Arguments must be interleaved key value pairs")
   (repl-env* options))
 

src/clj/cljs/repl/rhino.clj

@@ -198,10 +198,8 @@
     (load-javascript this ns url))
   (-tear-down [_] (Context/exit)))
 
-(defn repl-env
-  "Returns a fresh JS environment, suitable for passing to repl.
-  Hang on to return for use across repl calls."
-  []
+(defn repl-env*
+  [opts]
   (let [cx (Context/enter)]
     ;; just avoid the 64K method limit
     ;; Rhino is slow even with optimizations enabled
@@ -210,6 +208,12 @@
       {:cx cx
        :scope (.initStandardObjects cx)})))
 
+(defn repl-env
+  "Returns a fresh JS environment, suitable for passing to repl.
+  Hang on to return for use across repl calls."
+  [& {:as opts}]
+  (repl-env* opts))
+
 (comment
 
   (repl/-parse-stacktrace (repl-env)