Merge branch 'main' into bump-sci

Author: mk

CHANGELOG.md

@@ -20,6 +20,8 @@ Changes can be:
 
 * 🐞 Always analyze doc (but not deps) when no-cache is set, @borkdude, fixes [#781](https://github.com/nextjournal/clerk/issues/781).
 
+* 🐞 Fix browse when using random port by passing 0, fixes [#801](https://github.com/nextjournal/clerk/issues/801)
+
 ## 0.18.1158 (2025-11-17)
 
 * ⭐️ Support macros defined in notebooks, @borkdude, fixes [#746](https://github.com/nextjournal/clerk/issues/746)

bb.edn

@@ -1,7 +1,7 @@
 {:min-bb-version "1.12.206"
  :paths ["bb"]
- :deps {io.github.nextjournal/dejavu {:git/sha "7276cd9cec1bad001d595b52cee9e83a60d43bf0"}
-        io.github.nextjournal/cas-client {:git/sha "114d3d88d38a2068ec844b0e6c808eaaa6aa64ef"}}
+ :deps {io.github.nextjournal/cas-client {:git/sha "114d3d88d38a2068ec844b0e6c808eaaa6aa64ef"}
+        io.github.nextjournal/clerk {:local/root "."}}
  :tasks
  {:requires
   ([tasks :as t]

deps.edn

@@ -23,7 +23,7 @@
 
         rewrite-clj/rewrite-clj {:mvn/version "1.1.45"}
 
-        juji/editscript {:mvn/version "0.6.4"}}
+        juji/editscript {:mvn/version "0.7.0"}}
 
  :aliases {:nextjournal/clerk {:extra-deps {org.clojure/clojure {:mvn/version "1.11.1"} ;; for `:as-alias` support in static build
                                             org.slf4j/slf4j-nop {:mvn/version "2.0.7"}

notebooks/js_import.clj

@@ -42,6 +42,6 @@
 ;; or use `js/import` directly:
 (nextjournal.clerk/with-viewer
   '(fn [_]
-     (let [confetti (nextjournal.clerk.render.hooks/use-promise (js/import "https://cdn.skypack.dev/canvas-confetti"))]
+     (let [confetti (nextjournal.clerk.render.hooks/use-promise (js/import "https://cdn.jsdelivr.net/npm/canvas-confetti/+esm"))]
        [:button.bg-teal-500.hover:bg-teal-700.text-white.font-bold.py-2.px-4.rounded.rounded-full.font-sans
         (if confetti {:on-click #(.default confetti)} {:class "bg-gray-200"}) "Peng 🎉!"])) {})

src/nextjournal/clerk.clj

@@ -596,7 +596,7 @@
   * a symbol representing the var name (qualified or not)
   * the form of an anonymous expression"
   ([]
-   (swap! webserver/!doc dissoc :blob->result)
+   (swap! webserver/!doc dissoc :blob->result ::webserver/presentation-cache)
    (if (fs/exists? config/cache-dir)
      (do (fs/delete-tree config/cache-dir)
          (prn :cache-dir/deleted config/cache-dir))

src/nextjournal/clerk/always_array_map.clj

@@ -1,7 +1,6 @@
 (ns nextjournal.clerk.always-array-map
   "A persistent data structure that is based on array-map, but doesn't turn into a hash-map by using assoc etc.
-   Prints like a normal Clojure map in the order of insertion."
-  (:require [nextjournal.clerk.utils :as utils]))
+   Prints like a normal Clojure map in the order of insertion.")
 
 (set! *warn-on-reflection* true)
 
@@ -10,100 +9,72 @@
 
 (declare ->AlwaysArrayMap)
 
-(utils/if-bb
- (defn ->AlwaysArrayMap [m]
-   (proxy [clojure.lang.APersistentMap clojure.lang.IMeta clojure.lang.IObj]
-       []
-     (valAt
-       ([k]
-        (get m k))
-       ([k default-value]
-        (get m k default-value)))
-     (iterator []
-       (.iterator ^java.lang.Iterable m))
-
-     (containsKey [k] (contains? m k))
-     (entryAt [k] (when (contains? m k)
-                    (get this k)))
-     (equiv [other] (= m other))
-     (empty [] (empty m))
-     (count [] (count m))
-     (assoc [k v] (if (< (count m) 8)
-                    (->AlwaysArrayMap (assoc m k v))
-                    (->AlwaysArrayMap (assoc-after m k v))))
-     (without [k] (->AlwaysArrayMap (dissoc m k)))
-     (seq [] (seq m))
-                                        ; a lot of map users expect meta to work
-     (meta [] (meta m))
-     (withMeta [meta] (->AlwaysArrayMap (with-meta m meta)))))
-
- (deftype AlwaysArrayMap [^clojure.lang.PersistentArrayMap the-map]
-   clojure.lang.ILookup
-   (valAt [_ k]
-     (get the-map k))
-
-   clojure.lang.Seqable
-   (seq [_]
-     (seq the-map))
-
-   clojure.lang.IPersistentMap
-   (assoc [_ k v]
-     (if (< (count the-map) 8)
-       (->AlwaysArrayMap (assoc the-map k v))
-       (->AlwaysArrayMap (assoc-after the-map k v))))
-
-   (assocEx [_ _k _v]
-     (throw (ex-info "Not implemented" {})))
-
-   (without [_ k]
-     (->AlwaysArrayMap (dissoc the-map k)))
-
-   clojure.lang.Associative
-   (containsKey [_ k]
-     (contains? the-map k))
-
-   clojure.lang.IPersistentCollection
-   (equiv [_ other]
-     (= the-map other))
-   (count [_]
-     (count the-map))
-
-   java.lang.Iterable
-   (iterator [_]
-     (.iterator the-map))
-
-   clojure.lang.IMeta
-   (meta [_]
-     (meta the-map))
-
-   clojure.lang.IObj
-   (withMeta [_ meta]
-     (->AlwaysArrayMap (with-meta the-map meta)))
-
-   Object
-   (toString [_]
-     "<always-array-map>")))
+(deftype AlwaysArrayMap [^clojure.lang.PersistentArrayMap the-map]
+  clojure.lang.ILookup
+  (valAt [_ k]
+    (get the-map k))
+
+  clojure.lang.Seqable
+  (seq [_]
+    (seq the-map))
+
+  clojure.lang.IPersistentMap
+  (assoc [_ k v]
+    (if (< (count the-map) 8)
+      (->AlwaysArrayMap (assoc the-map k v))
+      (->AlwaysArrayMap (assoc-after the-map k v))))
+
+  (assocEx [_ _k _v]
+    (throw (ex-info "Not implemented" {})))
+
+  (without [_ k]
+    (->AlwaysArrayMap (dissoc the-map k)))
+
+  clojure.lang.Associative
+  (containsKey [_ k]
+    (contains? the-map k))
+
+  clojure.lang.IPersistentCollection
+  (equiv [_ other]
+    (= the-map other))
+  (count [_]
+    (count the-map))
+
+  java.lang.Iterable
+  (iterator [_]
+    (.iterator the-map))
+
+  clojure.lang.IMeta
+  (meta [_]
+    (meta the-map))
+
+  clojure.lang.IObj
+  (withMeta [_ meta]
+    (->AlwaysArrayMap (with-meta the-map meta)))
+
+  Object
+  (toString [_]
+    "<always-array-map>"))
 
 (defn assoc-before [aam k v]
   (->AlwaysArrayMap (apply array-map (list* k v (interleave (keys aam) (vals aam))))))
 
 (defn always-array-map [& kvs]
   (->AlwaysArrayMap (apply array-map kvs)))
 
-(utils/when-not-bb
- (defmethod print-method AlwaysArrayMap
-   [v ^java.io.Writer writer]
-   (.write writer "{")
-   (let [write-kv! (fn [k v]
-                     (.write writer (pr-str k))
-                     (.write writer " ")
-                     (.write writer (pr-str v)))]
-     (doseq [[k v] (butlast v)]
-       (write-kv! k v)
-       (.write writer ", "))
-     (let [[k v] (last v)]
-       (write-kv! k v)))
-   (.write writer "}")))
+(defmethod print-method AlwaysArrayMap
+  [v ^java.io.Writer writer]
+  (.write writer "{")
+  (let [write-kv! (fn [k v]
+                    (.write writer (pr-str k))
+                    (.write writer " ")
+                    (.write writer (pr-str v)))]
+    (doseq [[k v] (butlast v)]
+      (write-kv! k v)
+      (.write writer ", "))
+    (let [[k v] (last v)]
+      (write-kv! k v)))
+  (.write writer "}"))
 
 (comment
   (pr-str (always-array-map 1 2))

src/nextjournal/clerk/cljs_libs.clj

@@ -7,7 +7,6 @@
    [nextjournal.clerk.always-array-map :as aam]
    [nextjournal.clerk.analyzer :refer [valuehash]]
    [nextjournal.clerk.viewer :as v]
-   [nextjournal.clerk.walk :as w]
    [rewrite-clj.node :as rnode]
    [rewrite-clj.parser :as rparse]
    [weavejester.dependency :as tnsd]))
@@ -187,18 +186,9 @@
     (slurp resource)))
 
 (defn prepend-required-cljs [doc {:keys [dedupe-cljs]}]
-  (let [state (new-cljs-state)]
-    (w/postwalk (fn [v]
-                  (if-let [viewer (v/get-safe v :nextjournal/viewer)]
-                    (if-let [r (:require-cljs viewer)]
-                      (let [cljs-ns (if (true? r)
-                                      ;; at this point, the render-fn has been transformed to a `ViewerFn`, which contains a :form
-                                      (-> viewer :render-fn :form namespace symbol)
-                                      r)]
-                        (require-cljs* state cljs-ns))
-                      v)
-                    v))
-                doc)
+  (let [state (new-cljs-state)
+        cljs-namespaces (:cljs-namespaces doc)]
+    (run! #(require-cljs* state %) cljs-namespaces)
     (if-let [cljs-sources (not-empty
                            (filter #(or (not dedupe-cljs)
                                         (when-not (contains? @dedupe-cljs %)

src/nextjournal/clerk/config.clj

@@ -45,4 +45,4 @@
           (some-> limit not-empty Integer/parseInt)
           (catch Exception _
             (throw (ex-info "Invalid value for property `clerk.bounded-count-limit`, must be integer." {:value limit})))))
-      1000000))
+      1000))

src/nextjournal/clerk/parser.cljc

@@ -479,7 +479,7 @@
                                 (assoc :add-comment-on-line? true)
                                 (update :nodes rest)
                                 (assoc :block-settings next-block-settings)
-                                (assoc-in [:md-context :opts] md-settings)
+                                (update-in [:md-context :opts] merge md-settings)
                                 (update :blocks conj (add-block-id code-block)))
                       (not (contains? state :ns))
                       (assoc :ns *ns*)))

src/nextjournal/clerk/utils.clj

@@ -7,17 +7,6 @@
 (defmacro if-bb [then else]
   (if bb? then else))
 
-(defmacro if-not-bb-and [conds then else]
-  (if bb?
-    else
-    `(if ~conds
-       ~then
-       ~else)))
-
-(defmacro when-bb [& body]
-  (when bb?
-    `(do ~@body)))
-
 (defmacro when-not-bb [& body]
   (when (not bb?)
     `(do ~@body)))