Improve $ macro clj-kondo hook, impl fragment node (well, not really a node itself, but any node with a name of :<> will replace itself with its children.

2 files changed, 29 insertions, 20 deletions

diff --git a/src/dompa/nodes.cljc b/src/dompa/nodes.cljc
index 295e755..d72aa75 100644
--- a/src/dompa/nodes.cljc
+++ b/src/dompa/nodes.cljc
@@ -13,19 +13,27 @@
 (defn- node->html-reducer-fn
   [void-nodes nodes->html-fn]
   (fn [html node]
-    (when-not (nil? node)
-      (let [node-name (-> node :node/name name)
-            node-attrs (reduce-kv node-attrs-reducer "" (-> node :node/attrs))]
-        (cond
-          (= (-> node :node/name) :dompa/text)
-          (str html (-> node :node/value))
+    (cond
+      ; fragment nodes expand their children to replace themselves
+      (and (not (nil? node))
+           (= (:node/name node) :<>))
+      (str html (nodes->html-fn (:node/children node)))
 
-          (contains? void-nodes (-> node :node/name))
-          (str html "<" node-name node-attrs">")
+      ; otherwise business as usual
+      :else
+      (when-not (nil? node)
+        (let [node-name (-> node :node/name name)
+              node-attrs (reduce-kv node-attrs-reducer "" (-> node :node/attrs))]
+          (cond
+            (= (-> node :node/name) :dompa/text)
+            (str html (-> node :node/value))
 
-          :else
-          (let [value (nodes->html-fn (-> node :node/children))]
-            (str html "<" node-name node-attrs ">" value "</" node-name ">")))))))
+            (contains? void-nodes (-> node :node/name))
+            (str html "<" node-name node-attrs">")
+
+            :else
+            (let [value (nodes->html-fn (-> node :node/children))]
+              (str html "<" node-name node-attrs ">" value "</" node-name ">"))))))))
 
 (defn traverse
   "Recursively traverses given tree of `nodes` with a `traverser-fn`
diff --git a/src/dompa/utils.cljc b/src/dompa/utils.cljc
index 9e1cb27..0396e8a 100644
--- a/src/dompa/utils.cljc
+++ b/src/dompa/utils.cljc
@@ -12,12 +12,12 @@
   (fn [rf]
     (letfn [(step [result input]
               (if (sequential? input)
-                (reduce step result input)                  ;; recursively reduce over nested seq
-                (rf result input)))]                        ;; apply rf with accumulator + value
+                (reduce step result input)
+                (rf result input)))]
       (fn
-        ([] (rf))                                           ;; init
-        ([result] (rf result))                              ;; completion
-        ([result input] (step result input))))))            ;; step
+        ([] (rf))
+        ([result] (rf result))
+        ([result input] (step result input))))))
 
 (defn ->flat [children]
   (into [] (->flat-xf) children))
@@ -39,9 +39,10 @@
 
 (defhtml test-page []
   (let [n 123]
-    ($ :div
-      ($ "hello world" n))
-    ($ "hello")
-    ($ :div (map #(%) []) "test")))
+    ($ :<>
+      ($ :div
+        ($ "hello world" n))
+      ($ "hello")
+      ($ :div))))
 
 (test-page)