accomodate emoji namespace into utils (#51)

Author: borkdude

API.md

@@ -11,6 +11,7 @@
     -  [`toc->hiccup`](#nextjournal.markdown/toc->hiccup) - Transform a toc node into hiccup data, suitable for using as renderer function in hiccup transform, see [->hiccup](#markdown.transform/toc->hiccup).
 -  [`nextjournal.markdown.utils`](#nextjournal.markdown.utils) 
     -  [`block-formula`](#nextjournal.markdown.utils/block-formula)
+    -  [`emoji-regex`](#nextjournal.markdown.utils/emoji-regex)
     -  [`empty-doc`](#nextjournal.markdown.utils/empty-doc) - The empty doc.
     -  [`formula`](#nextjournal.markdown.utils/formula)
     -  [`hashtag-tokenizer`](#nextjournal.markdown.utils/hashtag-tokenizer)
@@ -19,8 +20,6 @@
     -  [`normalize-tokenizer`](#nextjournal.markdown.utils/normalize-tokenizer) - Normalizes a map of regex and handler into a Tokenizer.
     -  [`text-node`](#nextjournal.markdown.utils/text-node)
     -  [`tokenize-text-node`](#nextjournal.markdown.utils/tokenize-text-node)
--  [`nextjournal.markdown.utils.emoji`](#nextjournal.markdown.utils.emoji)  - https://github.com/mathiasbynens/emoji-test-regex-pattern MIT License Copyright Mathias Bynens <https://mathiasbynens.be/>.
-    -  [`regex`](#nextjournal.markdown.utils.emoji/regex)
 
 -----
 # <a name="nextjournal.markdown">nextjournal.markdown</a>
@@ -131,73 +130,62 @@ Transform a toc node into hiccup data, suitable for using as renderer function i
 
 
 
-<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils.cljc#L23-L23">Source</a></sub></p>
+<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils.cljc#L24-L24">Source</a></sub></p>
+
+## <a name="nextjournal.markdown.utils/emoji-regex">`emoji-regex`</a>
+
+
+
+<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils.cljc#L28-L28">Source</a></sub></p>
 
 ## <a name="nextjournal.markdown.utils/empty-doc">`empty-doc`</a>
 
 
 
 
 The empty doc
-<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils.cljc#L5-L7">Source</a></sub></p>
+<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils.cljc#L6-L8">Source</a></sub></p>
 
 ## <a name="nextjournal.markdown.utils/formula">`formula`</a>
 
 
 
-<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils.cljc#L21-L21">Source</a></sub></p>
+<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils.cljc#L22-L22">Source</a></sub></p>
 
 ## <a name="nextjournal.markdown.utils/hashtag-tokenizer">`hashtag-tokenizer`</a>
 
 
 
-<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils.cljc#L13-L13">Source</a></sub></p>
+<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils.cljc#L14-L14">Source</a></sub></p>
 
 ## <a name="nextjournal.markdown.utils/insert-sidenote-containers">`insert-sidenote-containers`</a>
 
 
 
-<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils.cljc#L17-L17">Source</a></sub></p>
+<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils.cljc#L18-L18">Source</a></sub></p>
 
 ## <a name="nextjournal.markdown.utils/internal-link-tokenizer">`internal-link-tokenizer`</a>
 
 
 
-<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils.cljc#L15-L15">Source</a></sub></p>
+<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils.cljc#L16-L16">Source</a></sub></p>
 
 ## <a name="nextjournal.markdown.utils/normalize-tokenizer">`normalize-tokenizer`</a>
 
 
 
 
 Normalizes a map of regex and handler into a Tokenizer
-<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils.cljc#L9-L11">Source</a></sub></p>
+<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils.cljc#L10-L12">Source</a></sub></p>
 
 ## <a name="nextjournal.markdown.utils/text-node">`text-node`</a>
 
 
 
-<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils.cljc#L19-L19">Source</a></sub></p>
+<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils.cljc#L20-L20">Source</a></sub></p>
 
 ## <a name="nextjournal.markdown.utils/tokenize-text-node">`tokenize-text-node`</a>
 
 
 
-<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils.cljc#L25-L25">Source</a></sub></p>
-
------
-# <a name="nextjournal.markdown.utils.emoji">nextjournal.markdown.utils.emoji</a>
-
-
-https://github.com/mathiasbynens/emoji-test-regex-pattern
-  MIT License
-  Copyright Mathias Bynens <https://mathiasbynens.be/>
-
-
-
-
-## <a name="nextjournal.markdown.utils.emoji/regex">`regex`</a>
-
-
-
-<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils/emoji.cljc#L15-L16">Source</a></sub></p>
+<p><sub><a href="https://github.com/nextjournal/markdown/blob/main/src/nextjournal/markdown/utils.cljc#L26-L26">Source</a></sub></p>

src/nextjournal/markdown/utils.cljc

@@ -1,6 +1,7 @@
 ;; # Markdown parsing shared utils
 (ns nextjournal.markdown.utils
-  (:require [nextjournal.markdown.impl.utils :as u]))
+  (:require [nextjournal.markdown.impl.utils :as u]
+            [nextjournal.markdown.utils.emoji :as emoji]))
 
 (def empty-doc
   "The empty doc"
@@ -23,3 +24,5 @@
 (def block-formula u/block-formula)
 
 (def tokenize-text-node u/tokenize-text-node)
+
+(def emoji-regex emoji/regex)

src/nextjournal/markdown/utils/emoji.cljc

@@ -1,7 +1,8 @@
 (ns nextjournal.markdown.utils.emoji
   "https://github.com/mathiasbynens/emoji-test-regex-pattern
   MIT License
-  Copyright Mathias Bynens <https://mathiasbynens.be/>")
+  Copyright Mathias Bynens <https://mathiasbynens.be/>"
+  {:skip-wiki true})
 
 ;; https://raw.githubusercontent.com/mathiasbynens/emoji-test-regex-pattern/f798c38987917b48e26d490590ba4f5481eb6e93/dist/latest/java.txt
 #?(:clj

test/nextjournal/markdown/public_api_test.clj

@@ -1,7 +1,7 @@
 (ns nextjournal.markdown.public-api-test
   (:require [clojure.string :as str]
             [clojure.test :refer [deftest is]]
-            [nextjournal.markdown]
+            [nextjournal.markdown] :reload-all
             [nextjournal.markdown.transform]
             [nextjournal.markdown.utils]))
 
@@ -17,15 +17,20 @@
        set))
 
 (deftest public-namespaces-test
-  (is (= '#{nextjournal.markdown.utils.emoji
-            nextjournal.markdown.transform
-            nextjournal.markdown
-            nextjournal.markdown.utils}
-         (-> (filter #(and (str/starts-with? (str %) "nextjournal.markdown")
-                           (not (str/includes? (str %) ".impl"))
-                           (not (str/ends-with? (str %) "-test")))
-                     (map ns-name (all-ns)))
-             set))))
+  (let [public-nss (-> (filter #(and (str/starts-with? (str %) "nextjournal.markdown")
+                                     (not (str/includes? (str %) ".impl"))
+                                     (not (str/ends-with? (str %) "-test")))
+                               (map ns-name (all-ns)))
+                       set)]
+    (is (= '#{nextjournal.markdown.utils.emoji
+              nextjournal.markdown.transform
+              nextjournal.markdown
+              nextjournal.markdown.utils}
+           public-nss))
+    (is (= '#{nextjournal.markdown
+              nextjournal.markdown.utils}
+           (set (remove #(-> (find-ns %) meta :skip-wiki)
+                       public-nss))))))
 
 (deftest public-vars-test
   (is (= '#{default-hiccup-renderers
@@ -53,7 +58,8 @@
             block-formula
             empty-doc
             hashtag-tokenizer
-            formula}
+            formula
+            emoji-regex}
          (public-vars 'nextjournal.markdown.utils)))
   (is (= '#{regex}
          (public-vars 'nextjournal.markdown.utils.emoji))))

test/nextjournal/markdown_test.cljc

@@ -5,7 +5,6 @@
             [matcher-combinators.matchers :as m]
             [matcher-combinators.test :refer [match?]]
             [nextjournal.markdown :as md]
-            [nextjournal.markdown.transform :as md.transform]
             [nextjournal.markdown.utils :as u]))
 
 ;; com.bhauman/cljs-test-display doesn't play well with ANSI codes
@@ -303,7 +302,7 @@ rupt me when I'm writing."))))
 ### Section 2.1
 "
           data (md/parse md)
-          hiccup (md.transform/->hiccup data)]
+          hiccup (md/->hiccup data)]
 
       (is (match? {:type :doc
                    :title "Title"
@@ -490,7 +489,7 @@ _this #should be a tag_, but this [_actually #foo shouldnt_](/bar/) is not."))))
               {:href "/tags/useful-123"}
               "#useful-123"]
              " tags"]]
-           (md.transform/->hiccup
+           (md/->hiccup
             (parse-hashtags "# Hello Tags
 par with #really_nice #useful-123 tags
 "))))))
@@ -568,7 +567,7 @@ Did we mention qtmphysics?
 and _interpret_
 softbreaks as
 spaces")
-             md.transform/->text))))
+             md/node->text))))
 
 (def parsed+sidenotes
   (-> "Text[^firstnote] and^[inline _note_ here].
@@ -821,7 +820,7 @@ c[^note3] d.
                 {:style {:margin-right "3px"}}
                 "3"]
                "Explain 2"]]]]
-           (md.transform/->hiccup parsed+sidenotes)))))
+           (md/->hiccup parsed+sidenotes)))))
 
 (deftest parse-multiple-inputs
   (testing "adding to the ToC"
@@ -1059,7 +1058,7 @@ Bye") :content)))
   #?(:clj
      (is (= "<div><p>Hello <a href=\"dude\"><em>Dude</em></a></p></div>"
             (str (hiccup/html (md/->hiccup
-                               (assoc md.transform/default-hiccup-renderers
+                               (assoc md/default-hiccup-renderers
                                       :html-inline (fn [_ m]
                                                      (hiccup/raw (-> m :content first :text)))
                                       :html-block (fn [_ m]
@@ -1068,7 +1067,7 @@ Bye") :content)))
   #?(:clj
      (is (= "<div><p>Hello <a href=\"dude\">multi</p><p>line</p><p>link</a></p></div>"
             (str (hiccup/html (md/->hiccup
-                               (assoc md.transform/default-hiccup-renderers
+                               (assoc md/default-hiccup-renderers
                                       :html-inline (fn [_ m]
                                                      (hiccup/raw (-> m :content first :text)))
                                       :html-block (fn [_ m]