First side-effecting version of render-eval, factor out browse!

Author: mk

src/nextjournal/clerk.clj

@@ -2,7 +2,6 @@
   "Clerk's Public API."
   (:refer-clojure :exclude [comment])
   (:require [babashka.fs :as fs]
-            [clojure.java.browse :as browse]
             [clojure.java.io :as io]
             [clojure.set :as set]
             [clojure.string :as str]
@@ -476,8 +475,7 @@
         (reset! !watcher {:paths watch-paths
                           :watcher (apply beholder/watch #(file-event %) watch-paths)}))
       (when browse?
-        (let [{:keys [host port]} @webserver/!server]
-          (browse/browse-url (format "http://%s:%s" host port))))))
+        (webserver/browse!))))
   config)
 
 #_(serve! (with-meta {:help true} {:org.babashka/cli {}}))

src/nextjournal/clerk/builder.clj

@@ -117,8 +117,8 @@
   (when (= stage :init)
     (builder-ui/reset-build-state!)
     ((resolve 'nextjournal.clerk/show!) (find-ns 'nextjournal.clerk.builder-ui))
-    (when-let [{:keys [port]} (and (get-in build-event [:build-opts :browse]) @webserver/!server)]
-      (browse/browse-url (str "http://localhost:" port))))
+    (when (get-in build-event [:build-opts :browse])
+      (webserver/browse!)))
   (stdout-reporter build-event)
   (builder-ui/add-build-event! build-event)
   (binding [*out* (java.io.StringWriter.)]
@@ -208,8 +208,8 @@
                                           (cond-> ssr? ssr!)
                                           cleanup))))))
     (when browse?
-      (browse/browse-url (if-let [{:keys [port]} (and (= out-path "public/build") @webserver/!server)]
-                           (str "http://localhost:" port "/build/")
+      (browse/browse-url (if-let [server-url (and (= out-path "public/build") (webserver/server-url))]
+                           (str server-url "/build/")
                            (-> index-html fs/absolutize .toString path-to-url-canonicalize))))
     {:docs docs
      :index-html index-html

src/nextjournal/clerk/render.cljs

@@ -689,16 +689,6 @@
         (if error (reject error) (resolve reply)))
     (js/console.warn :process-eval-reply!/not-found :eval-id eval-id :keys (keys @!pending-clerk-eval-replies))))
 
-(defn ^:export dispatch [{:as msg :keys [type]}]
-  (let [dispatch-fn (get {:patch-state! patch-state!
-                          :set-state! set-state!
-                          :eval-reply process-eval-reply!}
-                         type
-                         (fn [_]
-                           (js/console.warn (str "no on-message dispatch for type `" type "`"))))]
-    #_(js/console.log :<= type := msg)
-    (dispatch-fn msg)))
-
 (defonce container-el
   (and (exists? js/document) (js/document.getElementById "clerk")))
 

src/nextjournal/clerk/sci_env.cljs

@@ -173,6 +173,7 @@
                                       'system-time (sci/copy-var system-time core-ns)}}
                       (sci-copy-nss
                        'cljs.math
+                       'cljs.repl
                        'nextjournal.clerk.parser
                        'nextjournal.clerk.render
                        'nextjournal.clerk.render.code
@@ -187,12 +188,27 @@
                       sci.configs.js-interop/namespaces
                       sci.configs.reagent/namespaces)})
 
-(defn ^:export onmessage [ws-msg]
-  (render/dispatch (read-string (.-data ws-msg))))
-
 (defn ^:export eval-form [f]
   (sci/eval-form (sci.ctx-store/get-ctx) f))
 
+(defn render-eval [{:keys [form]}]
+  (eval-form form))
+
+(def message-type->fn
+  {:patch-state! render/patch-state!
+   :set-state! render/set-state!
+   :eval-reply render/process-eval-reply!
+   :render-eval render-eval})
+
+(defn ^:export onmessage [ws-msg]
+  (let [{:as msg :keys [type]} (read-string (.-data ws-msg))
+        dispatch-fn (get message-type->fn
+                         type
+                         (fn [_]
+                           (js/console.warn (str "no on-message dispatch for type `" type "`"))))]
+    #_(js/console.log :<= type := msg)
+    (dispatch-fn msg)))
+
 (def ^:export init render/init)
 
 (defn ^:export ssr [state-str]

src/nextjournal/clerk/webserver.clj

@@ -1,6 +1,7 @@
 (ns nextjournal.clerk.webserver
   (:require [babashka.fs :as fs]
             [clojure.edn :as edn]
+            [clojure.java.browse :as browse]
             [clojure.java.io :as io]
             [clojure.pprint :as pprint]
             [clojure.set :as set]
@@ -25,6 +26,20 @@
 
 (def ^:dynamic *sender-ch* nil)
 
+(defn server-url []
+  (when-let [{:keys [host port]} @!server]
+    (format "http://%s:%s" host port)))
+
+(defn ex-server-not-running []
+  (Exception. "no server running, please run `(nextjournal.clerk/serve! {})` and try again."))
+
+(defn browse! []
+  (if-let [server-url (server-url)]
+    (browse/browse-url server-url)
+    (throw (ex-server-not-running))))
+
+#_(browse!)
+
 (defn send! [ch msg]
   (httpkit/send! ch (v/->edn msg)))
 
@@ -36,7 +51,18 @@
     (httpkit/send! ch (v/->edn msg)))
   (reset! !last-sender-ch *sender-ch*))
 
-#_(broadcast! [{:random (rand-int 10000) :range (range 100)}])
+#_(broadcast! [])
+
+(defn render-eval
+  "Evaluates the given `form` in Clerk's render environment in the browser."
+  [form]
+  (if-let [client (first @!clients)]
+    (send! client {:type :render-eval :form form})
+    (if (server-url)
+      (throw (ex-info (format "no client connected, please open %s in a browser and try again." (server-url)) {:clients @!clients}))
+      (throw (ex-server-not-running)))))
+
+#_(render-eval '(js/console.log :foo))
 
 (defn ^:private percent-decode [s]
   (java.net.URLDecoder/decode s java.nio.charset.StandardCharsets/UTF_8))