Fix viewer tests

Author: mk

src/nextjournal/clerk/view.clj

@@ -10,7 +10,10 @@
 
 (defn ^:private extract-hash->viewer [presentation]
   (into {}
-        (map (juxt #(symbol "nextjournal.clerk" (str "viewer-fn$" (:hash %))) identity))
+        (map (juxt (fn [viewer]
+                     (or (when (qualified-symbol? (:name viewer))
+                           (symbol (namespace (:name viewer)) (str (name (:name viewer)) "$" (:hash viewer))))
+                         (symbol "nextjournal.clerk.viewer" (str "viewer-fn$" (:hash viewer))))) identity))
         (keep :nextjournal/viewer (tree-seq (some-fn map? vector?) #(cond-> % (map? %) vals) presentation))))
 
 (defn doc->viewer

src/nextjournal/clerk/viewer.cljc

@@ -801,13 +801,13 @@
                                                          (nextjournal.clerk.render/render-unreadable-edn x))))})
 
 (def vector-viewer
-  {:pred vector? :render-fn 'nextjournal.clerk.render/render-coll :opening-paren "[" :closing-paren "]" :page-size 20})
+  {:pred vector? :name `vector-viewer :render-fn 'nextjournal.clerk.render/render-coll :opening-paren "[" :closing-paren "]" :page-size 20})
 
 (def set-viewer
-  {:pred set? :render-fn 'nextjournal.clerk.render/render-coll :opening-paren "#{" :closing-paren "}" :page-size 20})
+  {:pred set? :name `set-viewer :render-fn 'nextjournal.clerk.render/render-coll :opening-paren "#{" :closing-paren "}" :page-size 20})
 
 (def sequential-viewer
-  {:pred sequential? :render-fn 'nextjournal.clerk.render/render-coll :opening-paren "(" :closing-paren ")" :page-size 20})
+  {:pred sequential? :name `sequential-viewer :render-fn 'nextjournal.clerk.render/render-coll :opening-paren "(" :closing-paren ")" :page-size 20})
 
 (def map-viewer
   {:pred map? :name `map-viewer :render-fn 'nextjournal.clerk.render/render-map :opening-paren "{" :closing-paren "}" :page-size 10})

test/nextjournal/clerk/viewer_test.clj

@@ -339,23 +339,26 @@
     (is (= 5
            (count
             (->> (eval/eval-string "^{:nextjournal.clerk/budget 5}(reduce (fn [acc _i] (vector acc)) :fin (range 100 0 -1))")
-                 view/doc->viewer v/->value :blocks
+                 view/doc->viewer  v/->value
+                 :blocks
                  (tree-seq coll? seq)
-                 (filter (every-pred map? (comp #{'nextjournal.clerk.render/render-coll} :form :render-fn)))))))
+                 (keep :nextjournal/viewer)
+                 (filter #(str/starts-with? (str %) "nextjournal.clerk.viewer/vector-viewer"))))))
 
     (is (= 5
            (count
             (->> (eval/eval-string "(nextjournal.clerk/with-viewer {} {:nextjournal.clerk/budget 5} (reduce (fn [acc i] (vector acc)) :fin (range 15 0 -1)))")
                  view/doc->viewer v/->value :blocks
                  (tree-seq coll? seq)
-                 (filter (every-pred map? (comp #{'nextjournal.clerk.render/render-coll} :form :render-fn)))))))
+                 (keep :nextjournal/viewer)
+                 (filter #(str/starts-with? (str %) "nextjournal.clerk.viewer/vector-viewer"))))))
 
     (is (= 101
            (count
             (->> (eval/eval-string "^{:nextjournal.clerk/budget nil}(reduce (fn [acc i] (vector i acc)) :fin (range 101 0 -1))")
                  view/doc->viewer v/->value :blocks
                  (tree-seq coll? seq)
-                 (filter (every-pred map? (comp #{'nextjournal.clerk.render/render-coll} :form :render-fn)))))))))
+                 (filter #(str/starts-with? (str %) "nextjournal.clerk.viewer/vector-viewer"))))))))
 
 (deftest ->edn
   (testing "normal symbols and keywords"