add additional test

Author: borkdude

src/nextjournal/clerk/viewer.cljc

@@ -446,15 +446,16 @@
   [{:as result :nextjournal/keys [value viewer]}]
   (if viewer
     (let [viewer-fn? (or (var? viewer) (fn? viewer))
-          unwrap? (and (var-from-def? value)
-                              (or viewer-fn?
-                                  (-> viewer normalize-viewer :var-from-def? not)))
-          value' (if unwrap? (unwrap-var-value value) value)
           value+viewer (if viewer-fn?
-                         (viewer value')
-                         {:nextjournal/value value'
-                          :nextjournal/viewer (normalize-viewer viewer)})]
-      (assoc result :nextjournal/value value+viewer))
+                         (viewer value)
+                         {:nextjournal/value value
+                          :nextjournal/viewer (normalize-viewer viewer)})
+          result-value (:nextjournal/value value+viewer)
+          unwrap? (and (var-from-def? result-value)
+                       (-> value+viewer ->viewer :var-from-def? not))]
+      (assoc result :nextjournal/value
+             (cond-> value+viewer
+               unwrap? (update :nextjournal/value unwrap-var-value))))
     result))
 
 #?(:clj

test/nextjournal/clerk/viewer_test.clj

@@ -229,11 +229,17 @@
                                :nextjournal/viewer (assoc v/html-viewer :var-from-def? true)}))))
 
     (testing "function viewer with var-from-def"
-      (is (= [1]
+      (is (= [{:nextjournal.clerk/var-from-def #'nextjournal.clerk.viewer-test/my-test-var2, :nextjournal.clerk/var-snapshot 1}]
              (apply+get-value {:nextjournal/value {:nextjournal.clerk/var-from-def #'my-test-var2
                                                    :nextjournal.clerk/var-snapshot 1}
-                               :nextjournal/viewer v/row}))))))
-
+                               :nextjournal/viewer v/row}))))
+    (testing "function viewer that preserves var-from-def"
+      (let [viewer-fn (fn [v] (v/with-viewer (assoc v/html-viewer :var-from-def? true) v))]
+        (is (= {:nextjournal.clerk/var-from-def #'my-test-var
+                :nextjournal.clerk/var-snapshot [:h1 "hi"]}
+               (apply+get-value {:nextjournal/value {:nextjournal.clerk/var-from-def #'my-test-var
+                                                     :nextjournal.clerk/var-snapshot [:h1 "hi"]}
+                                 :nextjournal/viewer viewer-fn})))))))
 
 (deftest resolve-aliases
   (testing "it resolves aliases"