diff --git a/src/huff2/core.clj b/src/huff2/core.clj index 4e3727e..1d97dad 100644 --- a/src/huff2/core.clj +++ b/src/huff2/core.clj @@ -100,7 +100,7 @@ (def ^:dynamic *escape?* true) -(def ^:private char->replacement {\& "&", \< "<", \> ">", \" """, \\ "'"}) +(def ^:private char->replacement {\& "&", \< "<", \> ">", \" """}) (defn maybe-escape-html "1. Change special characters into HTML character entities when *escape?* @@ -121,9 +121,9 @@ (defmethod emit :primative [append! {:keys [value]} _opts] (maybe-escape-html append! value)) -(defn- empty-or-div [seen] (if (empty? seen) "div" (str/join seen))) +(defn empty-or-div [seen] (if (empty? seen) "div" (str/join seen))) -(defn- emit-style [append! s] +(defn emit-style [append! s] (append! "style=\"") (cond (map? s) (doseq [[k v] (sort-by first s)] @@ -156,11 +156,13 @@ (step \.) ;; move "seen " into the right place (map [:tag :id :class]))) -(defn- tag->tag+id+classes [tag] +(defn tag->tag+id+classes [tag] (mapv (comp tag->tag+id+classes* keyword) (str/split (name tag) #">"))) -(defn- emit-attrs [append! attrs] - (doseq [[k value] attrs] +(defn emit-attrs [append! attrs {:keys [attr-mapper]}] + (doseq [[k value] (if attr-mapper + (map attr-mapper attrs) + attrs)] (when-not (or (contains? #{"" nil false} value) (and (coll? value) (empty? value))) @@ -194,7 +196,7 @@ (append! "<") (append! ^String (name tag)) (when (or tag-id (not-empty tag-classes')) - (emit-attrs append! {:id tag-id :class tag-classes'})) + (emit-attrs append! {:id tag-id :class tag-classes'} opts)) (if (contains? void-tags (name tag)) (append! " />") (append! ">")))) @@ -215,6 +217,7 @@ (string? %) (concat [%] final-tag-classes) (coll? %) (concat % final-tag-classes) (nil? %) final-tag-classes) + (map stringify) (remove str/blank?)))) ;; attrs go on the last tag-info: tag-infos' (update tag-infos (dec (count tag-infos)) (fn [l] (conj (vec l) attrs)))] @@ -222,8 +225,8 @@ (append! "<") (append! ^String (name tag)) (if attrs - (emit-attrs append! attrs) - (emit-attrs append! {:id tag-id :class (remove str/blank? tag-classes)})) + (emit-attrs append! attrs opts) + (emit-attrs append! {:id tag-id :class (remove str/blank? tag-classes)} opts)) (if (contains? void-tags (name tag)) (append! " />") (append! ">"))) @@ -269,16 +272,16 @@ Can I extend this by adding new types of nodes? Yes: see: [[huff2.extension]]!" ([h] (html {} h)) - ([{:keys [allow-raw *explainer *parser] :or {allow-raw false - *explainer explainer - *parser parser} :as _opts} h] + ([{:keys [allow-raw *explainer *parser attr-mapper] + :or {allow-raw false, *explainer explainer, *parser parser} + :as _opts} h] (let [parsed (*parser h)] (if (= parsed :malli.core/invalid) (let [{:keys [value]} (*explainer h)] (throw (ex-info "Invalid huff form passed to html. See [[hiccup-schema]] for more info" {:value value}))) (let [sb (StringBuilder.) append! (fn append! [& strings] (doseq [s strings :when s] (.append ^StringBuilder sb s)))] - (emit append! parsed {:allow-raw allow-raw :parser *parser}) + (emit append! parsed {:allow-raw allow-raw :parser *parser :attr-mapper attr-mapper}) (raw-string (str sb))))))) (defn page diff --git a/test/huff/core2_test.clj b/test/huff/core2_test.clj index b6a1cc1..778a9ed 100644 --- a/test/huff/core2_test.clj +++ b/test/huff/core2_test.clj @@ -8,7 +8,11 @@ (is (= (h/html [:div.c1#id1.c2 {:class ["c3"] :style {:border "1px solid red"}} "x"]) (h/html [:div.c1#id1.c2 {:class "c3" :style {:border "1px solid red"}} "x"]))) (is (= (h/html [:div {:class nil}]) (h/html [:div]))) - (is (= (h/html [:div.a]) (h/html [:div {:class ["a" nil "" ""]}])))) + (is (= (h/html [:div.a]) (h/html [:div {:class ["a" nil "" ""]}]))) + (is (= "
" + (str (h/html [:div {:class [:flex :flex-auto]}])))) + (is (= (h/html [:div {:class ["flex" "flex-auto"]}]) + (h/html [:div {:class [:flex :flex-auto]}])))) (defn as-string [f] (let [sb (StringBuilder.) @@ -73,10 +77,10 @@ (deftest attr-emission-test - (is (= " id=\"x\" class=\"x y\"" (as-string #(#'h/emit-attrs % {:id "x" :class ["x" "y"]})))) - (is (= " id=\"x\" class=\"x y\"" (as-string #(#'h/emit-attrs % {:id "x" :class "x y"})))) - (is (= " id=\"x\"" (as-string #(#'h/emit-attrs % {:id "x" :class []})))) - (is (= " x-data=\"{open: false}\"" (as-string #(#'h/emit-attrs % {:x-data "{open: false}"}))))) + (is (= " id=\"x\" class=\"x y\"" (as-string #(h/emit-attrs % {:id "x" :class ["x" "y"]} {})))) + (is (= " id=\"x\" class=\"x y\"" (as-string #(h/emit-attrs % {:id "x" :class "x y"} {})))) + (is (= " id=\"x\"" (as-string #(h/emit-attrs % {:id "x" :class []} {})))) + (is (= " x-data=\"{open: false}\"" (as-string #(h/emit-attrs % {:x-data "{open: false}"} {}))))) (deftest page-test (is (= (h/page {:allow-raw true} [:h1 "hi"]) "

hi

"))) @@ -86,8 +90,8 @@ (is (= "
<
" (str (h/html [:div "<"])))) (is (= "
>
" (str (h/html [:div ">"])))) (is (= "
"
" (str (h/html [:div "\""])))) - (is (= "
'
" (str (h/html [:div "\\"])))) - (is (= "
&
<
>
"
'
" + (is (= "
\\
" (str (h/html [:div "\\"])))) + (is (= "
&
<
>
"
\\
" (str (h/html [:<> [:div "&"] [:div "<"] @@ -114,8 +118,8 @@ (str (h/html [:h1 {:style {:width (-> 20 h/px) :opacity 1}}]))))) (deftest dot-shortcut-for-div-test - (is (= (#'h/tag->tag+id+classes :.) - (#'h/tag->tag+id+classes :div)))) + (is (= (h/tag->tag+id+classes :.) + (h/tag->tag+id+classes :div)))) (deftest lists-work-for-spreading (is (= "
ok
" (str (h/html [:div '([:span "ok"])])))) @@ -180,3 +184,12 @@ (str (h/html [:div {:style {:width (-> 10 h/vmin)}}])))) (is (= "
" (str (h/html [:div {:style {:width (-> 10 h/vmax)}}]))))) + +(deftest attr-mapper-test + (is (= "
text
" + (str (h/html + {:attr-mapper (fn [[k v]] + [k (if (keyword? v) + (str/lower-case (name v)) + v)])} + [:div {:id "Capitalized"} [:span {:id :LoWerCaSEd} "text"]]))))) diff --git a/test/huff/hiccup22_test.clj b/test/huff/hiccup22_test.clj index 4aea30e..c3b1e42 100644 --- a/test/huff/hiccup22_test.clj +++ b/test/huff/hiccup22_test.clj @@ -7,7 +7,7 @@ )) (deftest kw-tag-parsing - (are [x y] (= (#'h/tag->tag+id+classes x) y) + (are [x y] (= (h/tag->tag+id+classes x) y) :div [["div" nil []]] :div.a [["div" nil ["a"]]] :div.a#d [["div" "d" ["a"]]] @@ -64,7 +64,7 @@ (deftest kw-tag-validity (is (= "can't have 2 #'s in a tag." - (try (#'h/tag->tag+id+classes :div#id1#id2) + (try (h/tag->tag+id+classes :div#id1#id2) (catch Exception e (ex-message e)))))) (deftest tag-names