Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Detect nil attributes at runtime #208

Merged
merged 1 commit into from
Jan 9, 2024
Merged

Detect nil attributes at runtime #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 23 additions & 15 deletions src/hiccup/compiler.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,26 +331,34 @@
(compile-element (apply vector tag {} content)))

(defmethod compile-element ::literal-tag
[[tag attrs & content]]
[[tag attrs-or-content & content]]
(let [[tag tag-attrs _] (normalize-element-form [tag])
attrs-sym (gensym "attrs")]
`(let [~attrs-sym ~attrs]
attrs-or-content-sym (gensym "attrs_or_content__")
attrs?-sym (gensym "attrs?__")
content?-sym (gensym "content?__")]
`(let [~attrs-or-content-sym ~attrs-or-content
~attrs?-sym (map? ~attrs-or-content-sym)
~content?-sym (and (not ~attrs?-sym)
(some? ~attrs-or-content-sym))]
(build-string
(if (map? ~attrs-sym)
~(if (container-tag? tag content)
`(build-string ~(str "<" tag)
(render-attr-map (merge ~tag-attrs ~attrs-sym))
">")
`(build-string ~(str "<" tag)
(render-attr-map (merge ~tag-attrs ~attrs-sym))
~(end-tag)))
(build-string ~(str "<" tag (render-attr-map tag-attrs) ">")
~@(compile-seq [attrs-sym])))
;; start tag
"<" ~tag
(if ~attrs?-sym
(render-attr-map (merge ~tag-attrs ~attrs-or-content-sym))
~(render-attr-map tag-attrs))
~(if (container-tag? tag content)
">"
`(if ~content?-sym ">" ~(end-tag)))

;; contents
(when ~content?-sym
(render-html ~attrs-or-content-sym))
~@(compile-seq content)
;; ending tag, when the above code did not emit an ending tag

;; end tag
~(if (container-tag? tag content)
(str "</" tag ">")
`(when-not (map? ~attrs-sym)
`(when ~content?-sym
~(str "</" tag ">")))))))

(defmethod compile-element ::default
Expand Down
15 changes: 7 additions & 8 deletions test/hiccup/compiler_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,17 @@
(is (= (str (html {:mode :sgml} [:br (identity "x")])) "<br>x</br>"))))

(testing "runtime nil,"
;; use case: a function which returns a map of attributes or nil
(testing "normal tag"
(is (= (str (html {:mode :xhtml} [:p (identity nil)])) "<p></p>"))
(is (= (str (html {:mode :html} [:p (identity nil)])) "<p></p>"))
(is (= (str (html {:mode :xml} [:p (identity nil)])) "<p></p>"))
(is (= (str (html {:mode :sgml} [:p (identity nil)])) "<p></p>")))
(is (= (str (html {:mode :xml} [:p (identity nil)])) "<p />"))
(is (= (str (html {:mode :sgml} [:p (identity nil)])) "<p>")))
(testing "void tag"
;; TODO: this might not be desired behavior (use case: the user has
;; a function which returns a map of attributes or nil)
(is (= (str (html {:mode :xhtml} [:br (identity nil)])) "<br></br>"))
(is (= (str (html {:mode :html} [:br (identity nil)])) "<br></br>"))
(is (= (str (html {:mode :xml} [:br (identity nil)])) "<br></br>"))
(is (= (str (html {:mode :sgml} [:br (identity nil)])) "<br></br>")))))
(is (= (str (html {:mode :xhtml} [:br (identity nil)])) "<br />"))
(is (= (str (html {:mode :html} [:br (identity nil)])) "<br>"))
(is (= (str (html {:mode :xml} [:br (identity nil)])) "<br />"))
(is (= (str (html {:mode :sgml} [:br (identity nil)])) "<br>")))))

(deftest test-compile-element-default
(testing "runtime tag"
Expand Down
2 changes: 1 addition & 1 deletion test/hiccup2/optimizations_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@
(partition 2 1)
(map (fn [[a b]] (- b a))))]
(is (< (apply max diffs)
(* 1.1 (apply min diffs)))))))
(* 1.2 (apply min diffs)))))))