Restore top-level API / rename

Author: zampino

notebooks/tap_window.clj

@@ -1,11 +1,10 @@
 ;; # 🪟 Windows
-(ns notebook.tap-window
+(ns tap-window
   {:nextjournal.clerk/visibility {:code :hide :result :hide}
    :nextjournal.clerk/no-cache true}
   (:require [nextjournal.clerk :as clerk]
             [nextjournal.clerk.viewer :as v]))
 
-#_(clerk/window! ::clerk/taps)
 (clerk/window! :my-window (clerk/html [:div.w-8.h-8.bg-green-500]))
 
 (comment

src/nextjournal/clerk.clj

@@ -13,6 +13,7 @@
             [nextjournal.clerk.parser :as parser]
             [nextjournal.clerk.view :as view]
             [nextjournal.clerk.viewer :as v]
+            [nextjournal.clerk.window :as window]
             [nextjournal.clerk.webserver :as webserver]))
 
 (defonce ^:private !show-filter-fn (atom nil))
@@ -70,6 +71,9 @@
 #_(show! "https://raw.githubusercontent.com/nextjournal/clerk-demo/main/notebooks/rule_30.clj")
 #_(show! (java.io.StringReader. ";; # In Memory Notebook 👋\n(+ 41 1)"))
 
+(defn window! "todo" [& args] (apply window/open! args))
+(defn destroy-window! "todo" [id] (window/destroy! id))
+
 (defn recompute!
   "Recomputes the currently visible doc, without parsing it."
   []

src/nextjournal/clerk/window.clj

@@ -9,38 +9,40 @@
                        (nextjournal.clerk.viewer/inspect-children opts)
                        taps))})
 
-(defn window!
+(defn open!
   ([id]
    (case id
-     ::taps (window! id {:title "🚰 Taps" :css-class "p-0"}
-                     (v/with-viewers (v/add-viewers [tap/tap-viewer])
+     ::taps (open! id {:title "🚰 Taps" :css-class "p-0"}
+                   (v/with-viewers (v/add-viewers [tap/tap-viewer])
                        (v/with-viewer taps-viewer @tap/!taps)))))
-  ([id content] (window! id {} content))
+  ([id content] (open! id {} content))
   ([id opts content]
    (webserver/update-window! id (merge opts {:nextjournal/presented (update (v/present content) :nextjournal/css-class #(or % ["px-0"]))
                                              :nextjournal/hash (gensym)
                                              :nextjournal/fetch-opts {:blob-id (str id)}
                                              :nextjournal/blob-id (str id)}))))
 
-(defn destroy-window! [id] (webserver/destroy-window! id))
+(defn destroy! [id] (webserver/destroy-window! id))
 
-(doseq [w (keys @webserver/!windows)]
-  (destroy-window! w))
+(defn destroy-all! []
+  (doseq [w (keys @webserver/!windows)]
+    (destroy! w)))
 
-#_(window! ::taps)
+#_(open! ::taps)
 
-#_(defn tapped [x] (swap! !taps conj x) (window! ::taps))
+#_(defn tapped [x] (swap! !taps conj x) (open! ::taps))
 #_(defonce taps-setup (add-tap tapped))
 
 #_(doseq [f @@(resolve 'clojure.core/tapset)] (remove-tap f))
 #_(reset! !taps ())
 #_(tap> (range 30))
-#_(window! ::taps)
-#_(destroy-window! ::taps)
+#_(open! ::taps)
+#_(destroy! ::taps)
 #_(tap> (v/html [:h1 "Ahoi"]))
 #_(tap> (v/table [[1 2] [3 4]]))
-#_(window! ::my-window {:title "🔭 Rear Window"} (table [[1 2] [3 4]]))
-#_(window! ::my-window {:title "🔭 Rear Window"} (range 30))
-#_(window! ::my-window {:title "🔭 Rear Window"} (plotly {:data [{:y [1 2 3]}]}))
-#_(window! ::my-window-2 {:title "🪟"} (range 100))
-#_(destroy-window! ::my-window)
+#_(open! ::my-window {:title "🔭 Rear Window"} (v/table [[1 2] [3 4]]))
+#_(open! ::my-window {:title "🔭 Rear Window"} (range 30))
+#_(open! ::my-window {:title "🔭 Rear Window"} (v/plotly {:data [{:y [1 2 3]}]}))
+#_(open! ::my-window-2 {:title "🪟"} (range 100))
+#_(destroy! ::my-window)
+#_(destroy-all!)