testing: vars live in session-ns

notebooks/session.clj

@@ -2,7 +2,7 @@
   (:require [nextjournal.clerk :as clerk]))
 
 ^{::clerk/sync true}
-(defonce ^:dynamic !offset
+(defonce !offset
   (atom 0))
 
 (clerk/col (clerk/with-viewer '(fn [_] [:div

src/nextjournal/clerk/eval.clj

@@ -20,9 +20,12 @@
   (nippy/get-recorded-serializable-classes))
 
 ;; nippy tweaks
-(alter-var-root #'nippy/*thaw-serializable-allowlist* (fn [_] (conj nippy/default-thaw-serializable-allowlist "java.io.File" "clojure.lang.Var" "clojure.lang.Namespace")))
-(nippy/extend-freeze BufferedImage :java.awt.image.BufferedImage [x out] (ImageIO/write x "png" (ImageIO/createImageOutputStream out)))
-(nippy/extend-thaw :java.awt.image.BufferedImage [in] (ImageIO/read in))
+
+(defonce nippy-tweaks
+  (do
+    (alter-var-root #'nippy/*thaw-serializable-allowlist* (fn [_] (conj nippy/default-thaw-serializable-allowlist "java.io.File" "clojure.lang.Var" "clojure.lang.Namespace")))
+    (nippy/extend-freeze BufferedImage :java.awt.image.BufferedImage [x out] (ImageIO/write x "png" (ImageIO/createImageOutputStream out)))
+    (nippy/extend-thaw :java.awt.image.BufferedImage [in] (ImageIO/read in))))
 
 #_(-> [(clojure.java.io/file "notebooks") (find-ns 'user)] nippy/freeze nippy/thaw)
 
@@ -192,7 +195,11 @@
                   (wrapped-with-metadata (:nextjournal/value cached-result-in-memory) hash))
                 (when (and cached-result? freezable?)
                   (lookup-cached-result (session/in-session-ns doc var) hash cas-hash))
-                (eval+cache! (assoc form-info :form form) hash digest-file))
+                (eval+cache! (-> form-info
+                                 (update :var (partial session/in-session-ns doc))
+                                 (assoc :form form))
+                             hash
+                             digest-file))
       (seq opts-from-form-meta)
       (merge opts-from-form-meta))))
 
@@ -298,3 +305,4 @@
    (eval-doc in-memory-cache (parser/parse-clojure-string {:doc? true} code-string))))
 
 #_(eval-string "(+ 39 3)")
+

src/nextjournal/clerk/session.clj

@@ -1,5 +1,6 @@
 (ns nextjournal.clerk.session
-  (:require [nextjournal.clerk.analyzer :as analyzer]))
+  (:require [clojure.string :as str]
+            [nextjournal.clerk.analyzer :as analyzer]))
 
 (defn in-session-ns [{:keys [ns session-ns]} var]
   (if (and var session-ns)
@@ -10,10 +11,17 @@
 (def session-ns-prefix
   "nextjournal.clerk.synthetic-session.")
 
+(def session-ns-pattern
+  (re-pattern (str "^" session-ns-prefix "\\w+\\.")))
+
 (defn session-ns-name [{:keys [ns session]}]
-  (symbol (str session-ns-prefix (ns-name ns) ".session=" (analyzer/valuehash session))))
+  (symbol (str session-ns-prefix (analyzer/valuehash session) "." (ns-name ns))))
 
-#_(session-ns-name {:ns (create-ns 'scratch) :session 'foo})
+(defn ->orignal-ns [sym]
+  (if (qualified-symbol? sym)
+    (symbol (str/replace (namespace sym) session-ns-pattern "")
+            (name sym))
+    sym))
 
 (defn rewrite-ns-form [doc session-ns]
   (update-in doc [:blocks 0 :form] (fn [ns-form]

test/nextjournal/clerk/eval_test.clj

@@ -5,6 +5,7 @@
             [nextjournal.clerk :as clerk]
             [nextjournal.clerk.eval :as eval]
             [nextjournal.clerk.parser :as parser]
+            [nextjournal.clerk.session :as session]
             [nextjournal.clerk.view :as view]
             [nextjournal.clerk.viewer :as viewer]))
 
@@ -206,6 +207,30 @@
     (intern (create-ns 'existing-var) 'foo :bar)
     (is (eval/eval-string "(in-ns 'existing-var) foo"))))
 
+(defn eval-string-in-session [code-string session]
+  (eval/eval-doc (assoc (parser/parse-clojure-string {:doc? true} code-string) :session session)))
+
+(deftest eval-in-session
+  (let [{:keys [blocks]} (eval-string-in-session "(ns my-session)
+(defonce !offset (atom 0))
+(defn get-offset [] @!offset)"
+                                                 :foo)]
+    (testing "var-from-def is correctly assigned"
+      (is (-> blocks
+              peek
+              :result
+              viewer/->value
+              viewer/var-from-def?)))
+
+
+    (testing "vars live in session-ns"
+      (is (= #{(session/session-ns-name {:ns (create-ns 'my-session)
+                                         :session :foo})}
+             (into #{}
+                   (map (comp symbol namespace symbol))
+                   (keep (comp :nextjournal.clerk/var-from-def :nextjournal/value :result)
+                         blocks)))))))
+
 (clerk/defcached my-expansive-thing
   (do (Thread/sleep 1 #_10000) 42))