From cf55a6a6688c54527a3d27a8d6027858ced99257 Mon Sep 17 00:00:00 2001 From: Asko Nõmm Date: Thu, 25 Sep 2025 21:39:10 +0300 Subject: Rename utils to templates, as it is more appropriate. --- src/dompa/templates.cljc | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ src/dompa/utils.cljc | 48 ------------------------------------------------ 2 files changed, 48 insertions(+), 48 deletions(-) create mode 100644 src/dompa/templates.cljc delete mode 100644 src/dompa/utils.cljc (limited to 'src/dompa') diff --git a/src/dompa/templates.cljc b/src/dompa/templates.cljc new file mode 100644 index 0000000..8a7aae9 --- /dev/null +++ b/src/dompa/templates.cljc @@ -0,0 +1,48 @@ +(ns dompa.templates + (:require [dompa.nodes :as nodes])) + +(defmacro defhtml + {:clj-kondo/lint-as 'clojure.core/defn} + [name & args-and-elements] + (let [[args & elements] args-and-elements] + `(defn ~name ~args + (nodes/->html (vector ~@elements))))) + +(defn ->flat-xf [] + (fn [rf] + (letfn [(step [result input] + (if (sequential? input) + (reduce step result input) + (rf result input)))] + (fn + ([] (rf)) + ([result] (rf result)) + ([result input] (step result input)))))) + +(defn ->flat [children] + (into [] (->flat-xf) children)) + +(defmacro $ + [name & opts] + `(if (string? ~name) + {:node/name :dompa/text + :node/value (str ~name ~@opts)} + (let [opts# (list ~@opts) + first-opt# (first opts#) + attrs?# (and (map? first-opt#) + (not (contains? first-opt# :node/name))) + attrs# (if attrs?# first-opt# {}) + children# (if attrs?# (rest opts#) opts#)] + (cond-> {:node/name ~name} + attrs?# (assoc :node/attrs attrs#) + (seq children#) (assoc :node/children (->flat children#)))))) + +(defhtml test-page [] + (let [n 123] + ($ :<> + ($ :div + ($ "hello world" n)) + ($ "hello") + ($ :div)))) + +(test-page) diff --git a/src/dompa/utils.cljc b/src/dompa/utils.cljc deleted file mode 100644 index 0396e8a..0000000 --- a/src/dompa/utils.cljc +++ /dev/null @@ -1,48 +0,0 @@ -(ns dompa.utils - (:require [dompa.nodes :as nodes])) - -(defmacro defhtml - {:clj-kondo/lint-as 'clojure.core/defn} - [name & args-and-elements] - (let [[args & elements] args-and-elements] - `(defn ~name ~args - (nodes/->html (vector ~@elements))))) - -(defn ->flat-xf [] - (fn [rf] - (letfn [(step [result input] - (if (sequential? input) - (reduce step result input) - (rf result input)))] - (fn - ([] (rf)) - ([result] (rf result)) - ([result input] (step result input)))))) - -(defn ->flat [children] - (into [] (->flat-xf) children)) - -(defmacro $ - [name & opts] - `(if (string? ~name) - {:node/name :dompa/text - :node/value (str ~name ~@opts)} - (let [opts# (list ~@opts) - first-opt# (first opts#) - attrs?# (and (map? first-opt#) - (not (contains? first-opt# :node/name))) - attrs# (if attrs?# first-opt# {}) - children# (if attrs?# (rest opts#) opts#)] - (cond-> {:node/name ~name} - attrs?# (assoc :node/attrs attrs#) - (seq children#) (assoc :node/children (->flat children#)))))) - -(defhtml test-page [] - (let [n 123] - ($ :<> - ($ :div - ($ "hello world" n)) - ($ "hello") - ($ :div)))) - -(test-page) -- cgit v1.2.3