Support HTML blocks and inline HTML (#37)

Fixes #7.

Author: borkdude

CHANGELOG.md

@@ -2,11 +2,12 @@
 
 ## Unreleased
 
-* Hiccup JVM compatibiltiy for fragments (see [#34](https://github.com/nextjournal/markdown/issues/34))
+* Hiccup JVM compatibility for fragments (see [#34](https://github.com/nextjournal/markdown/issues/34))
+* Support HTML blocks and inline HTML (see [#7](https://github.com/nextjournal/markdown/issues/7))
 
 ## 0.6.157
 
-* Swap out GraalJS ([#28](https://github.com/nextjournal/markdown/issues/28)) in favour of [commonmark-java](https://github.com/markdown-it/markdown-it) on the JVM side.
+* Swap out GraalJS ([#28](https://github.com/nextjournal/markdown/issues/28)) in favour of [commonmark-java](https://github.com/commonmark/commonmark-java) on the JVM side.
   This makes the library compatible with Java 22 and yields an approximate speedup of 10x. The clojurescript implementation stays the same.
 * Comply with commonmark rendering of images by default (see [#18](https://github.com/nextjournal/markdown/issues/18)).
 

bb.edn

@@ -112,6 +112,11 @@
                (println "Building jar")
                (clojure (str "-T:build jar :version '\"" (read-version) "\"'")))}
 
+  install {:doc "Install jar locally"
+           :task (do
+                   (println "Installing locally")
+                   (clojure (str "-T:build install :version '\"" (read-version) "\"'")))}
+
   ci:publish {:doc "Publish task which will be run on CI"
               :depends [-current-tag -current-branch]
               :task (do

build.clj

@@ -38,6 +38,14 @@
   (b/jar {:class-dir class-dir
           :jar-file (jar-file version)}))
 
+(defn install [{:keys [version] :as opts}]
+  (jar opts)
+  (b/install {:basis basis
+              :lib lib
+              :version (:version opts)
+              :jar-file (jar-file version)
+              :class-dir class-dir}))
+
 (defn deploy [{:keys [version] :as opts}]
   (println "Deploying version" (jar-file version) "to Clojars.")
   (jar opts)

deps.edn

@@ -42,7 +42,8 @@
   :test
   {:extra-paths ["test"]
    :jvm-opts ["-Dclojure.main.report=stderr"]
-   :extra-deps {nubank/matcher-combinators {:mvn/version "3.8.3"}}
+   :extra-deps {nubank/matcher-combinators {:mvn/version "3.9.1"}
+                hiccup/hiccup {:mvn/version "2.0.0-RC5"}}
    :exec-fn test-runner/run}
 
   :shadow

src/deps.cljs

@@ -1,6 +1,6 @@
 {:npm-deps
  {"katex" "^0.12.0"
-  "markdown-it" "^12.2.0"
+  "markdown-it" "^14.1.0"
   "markdown-it-block-image" "^0.0.3"
   "markdown-it-footnote" "^3.0.3"
   "markdown-it-texmath" "^1.0.0"

src/nextjournal/markdown/impl.clj

@@ -1,8 +1,8 @@
 ;; # 🧩 Parsing
 (ns nextjournal.markdown.impl
   (:require [clojure.zip :as z]
-            [nextjournal.markdown.impl.types :as t]
             [nextjournal.markdown.impl.extensions :as extensions]
+            [nextjournal.markdown.impl.types :as t]
             [nextjournal.markdown.utils :as u])
   (:import (org.commonmark.ext.autolink AutolinkExtension)
            (org.commonmark.ext.footnotes FootnotesExtension FootnoteReference FootnoteDefinition InlineFootnote)
@@ -29,7 +29,9 @@
                                 ThematicBreak
                                 SoftLineBreak
                                 HardLineBreak
-                                Image)
+                                HtmlInline
+                                Image
+                                HtmlBlock)
            (org.commonmark.parser Parser)))
 
 (set! *warn-on-reflection* true)
@@ -102,7 +104,17 @@
 (defmethod close-node Heading [ctx ^Heading _node]
   (u/handle-close-heading ctx))
 
-(defmethod open-node BulletList [ctx ^ListBlock node]
+(defmethod open-node HtmlInline [ctx ^HtmlInline node]
+  (u/update-current-loc ctx (fn [loc] (u/zopen-node loc {:type :html-inline
+                                                         :content [{:type :text
+                                                                    :text (.getLiteral node)}]}))))
+
+(defmethod open-node HtmlBlock [ctx ^HtmlBlock node]
+  (u/update-current-loc ctx (fn [loc] (u/zopen-node loc {:type :html-block
+                                                         :content [{:type :text
+                                                                    :text (.getLiteral node)}]}))))
+
+(defmethod open-node BulletList [ctx ^ListBlock _node]
   (u/update-current-loc ctx (fn [loc] (u/zopen-node loc {:type :bullet-list :content [] #_#_:tight? (.isTight node)}))))
 
 (defmethod open-node OrderedList [ctx _node]

src/nextjournal/markdown/impl.cljs

@@ -244,9 +244,13 @@ _this #should be a tag_, but this [_actually #foo shouldnt_](/bar/) is not."
 (defmethod apply-token "link_close" [doc _token] (close-node doc))
 (defmethod apply-token "code_inline" [doc {text :content}] (-> doc (open-node :monospace) (push-node (text-node text)) close-node))
 
-;; html (ignored)
-(defmethod apply-token "html_inline" [doc _] doc)
-(defmethod apply-token "html_block" [doc _] doc)
+;; html
+(defmethod apply-token "html_inline" [doc token]
+  (-> doc (u/update-current-loc z/append-child {:type :html-inline :content [(text-node (j/get token :content))]})))
+
+(defmethod apply-token "html_block" [doc token]
+  (-> doc (u/update-current-loc z/append-child {:type :html-block :content [(text-node (j/get token :content))]})))
+
 ;; endregion
 
 ;; region data builder api