Bump nextjournal markdown (#752)

Author: borkdude

.gitignore

@@ -27,3 +27,4 @@ clerk.iml
 report.html
 /editor.clj
 package.json
+scratch.clj

deps.edn

@@ -6,9 +6,7 @@
         weavejester/dependency {:mvn/version "0.2.1"}
         com.nextjournal/beholder {:mvn/version "1.0.2"}
         org.flatland/ordered {:mvn/version "1.15.12"}
-        io.github.nextjournal/markdown {:mvn/version "0.6.157"
-                                        ;; only used in cljs
-                                        :exclusions [applied-science/js-interop]}
+        io.github.nextjournal/markdown {:mvn/version "0.7.184"}
         babashka/process {:mvn/version "0.4.16"}
         io.github.nextjournal/dejavu {:git/sha "4980e0cc18c9b09fb220874ace94ba6b57a749ca"}
         io.github.babashka/sci.nrepl {:mvn/version "0.0.2"}

notebooks/markdown.md

@@ -6,8 +6,7 @@ This notebook demoes feeding Clerk with markdown files. We currently make no ass
 ^:nextjournal.clerk/no-cache
 (ns markdown-example
   (:require [nextjournal.clerk :as clerk]
-            [nextjournal.markdown :as md]
-            [nextjournal.markdown.transform :as md.transform]))
+            [nextjournal.markdown :as md]))
 ```
 
 Nextjournal Markdown library is able to ingest a markdown string
@@ -932,12 +931,12 @@ and render back to hiccup with customisable elements.
 
 ```clojure
 (def renderers
-  (assoc md.transform/default-hiccup-renderers
-        :doc (partial md.transform/into-markup [:div.markdown-viewer])
+  (assoc md/default-hiccup-renderers
+        :doc (partial md/into-hiccup [:div.markdown-viewer])
         :ruler (constantly [:hr.mt-1.mb-10.border-0.w-full.h-5.bg-fuchsia-900.rounded-full])))
 
 (def hiccup
-  (md.transform/->hiccup renderers sliced))
+  (md/->hiccup renderers sliced))
 ```
 
 and finally render via Clerk's `html` helper.

src/nextjournal/clerk/parser.cljc

@@ -12,7 +12,6 @@
             [clojure.zip]
             [edamame.core :as edamame]
             [nextjournal.markdown :as markdown]
-            [nextjournal.markdown.transform :as markdown.transform]
             [rewrite-clj.node :as n]
             [rewrite-clj.parser :as p]
             [rewrite-clj.zip :as z]))
@@ -162,7 +161,7 @@
                             (comp (keep :doc)
                                   (mapcat :content)
                                   (filter (comp #{:paragraph} :type))
-                                  (map markdown.transform/->text))
+                                  (map markdown/node->text))
                             blocks))]
            (cond-> {:type "article:clerk"}
              title (assoc :title title)
@@ -505,7 +504,7 @@
   (parse-clojure-string ";; # Hello\n;; ## 👋 Section\n(do 123)\n;; ## 🤚🏽 Section"))
 
 (defn parse-markdown-cell [state opts]
-  (assoc (parse-clojure-string opts state (markdown.transform/->text (first (:nodes state))))
+  (assoc (parse-clojure-string opts state (markdown/node->text (first (:nodes state))))
          :nodes (rest (:nodes state))
          ::md-slice []))
 

src/nextjournal/clerk/viewer.cljc

@@ -1,9 +1,9 @@
 (ns nextjournal.clerk.viewer
   (:refer-clojure :exclude [var?])
-  (:require [clojure.string :as str]
+  (:require [clojure.datafy :as datafy]
             [clojure.pprint :as pprint]
-            [clojure.datafy :as datafy]
             [clojure.set :as set]
+            [clojure.string :as str]
             [flatland.ordered.map :as omap :refer [ordered-map]]
             #?@(:clj [[babashka.fs :as fs]
                       [clojure.repl :refer [demunge]]
@@ -21,8 +21,7 @@
             [nextjournal.clerk.parser :as parser]
             [nextjournal.clerk.walk :as w]
             [nextjournal.markdown :as md]
-            [nextjournal.markdown.utils :as md.utils]
-            [nextjournal.markdown.transform :as md.transform])
+            [nextjournal.markdown.utils :as md.utils])
   #?(:clj (:import (com.pngencoder PngEncoder)
                    (clojure.lang IDeref IAtom)
                    (java.lang Throwable)
@@ -788,7 +787,7 @@
                                  [:div.code-viewer.code-listing
                                   (with-viewer `code-viewer
                                     {:nextjournal/render-opts {:language (:language % "clojure")}}
-                                    (str/trim-newline (md.transform/->text %)))]))}
+                                    (str/trim-newline (md/node->text %)))]))}
 
    ;; marks
    {:name :nextjournal.markdown/em :transform-fn (into-markup [:em])}
@@ -824,9 +823,9 @@
    {:name :nextjournal.markdown/table-body :transform-fn (into-markup [:tbody])}
    {:name :nextjournal.markdown/table-row :transform-fn (into-markup [:tr])}
    {:name :nextjournal.markdown/table-header
-    :transform-fn (into-markup #(vector :th {:style (md.transform/table-alignment (:attrs %))}))}
+    :transform-fn (into-markup #(vector :th {:style (md/table-alignment %)}))}
    {:name :nextjournal.markdown/table-data
-    :transform-fn (into-markup #(vector :td {:style (md.transform/table-alignment (:attrs %))}))}
+    :transform-fn (into-markup #(vector :td {:style (md/table-alignment %)}))}
 
    ;; ToC via [[TOC]] placeholder ignored
    {:name :nextjournal.markdown/toc :transform-fn (into-markup [:div.toc])}
@@ -1243,7 +1242,7 @@
 
 (defn md-toc->navbar-items [{:keys [children]}]
   (mapv (fn [{:as node :keys [emoji attrs]}]
-          {:title (str/replace (md.transform/->text node) (re-pattern (str "^" emoji "[ ]?")) "")
+          {:title (str/replace (md/node->text node) (re-pattern (str "^" emoji "[ ]?")) "")
            :emoji emoji
            :path (str "#" (:id attrs))
            :items (md-toc->navbar-items node)}) children))