From d654135ffebe935317a1f946c123bd25e4fb6aa3 Mon Sep 17 00:00:00 2001 From: Asko Nõmm Date: Thu, 9 Oct 2025 22:05:47 +0300 Subject: Do away with the $ macro for runtime-agnostic purposes --- resources/clj-kondo/config.edn | 6 +++--- resources/clj-kondo/hooks/dompa.clj | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'resources/clj-kondo') diff --git a/resources/clj-kondo/config.edn b/resources/clj-kondo/config.edn index 8ee11e4..e6b8708 100644 --- a/resources/clj-kondo/config.edn +++ b/resources/clj-kondo/config.edn @@ -1,5 +1,5 @@ {:hooks {:analyze-call {dompa.nodes/$ hooks.dompa/$ - dompa.nodes.shared/defhtml hooks.dompa/defhtml}} + dompa.nodes/defhtml hooks.dompa/defhtml}} :linters {:dompa.nodes/$-arg-validation {:level :warning} - :dompa.nodes.shared/defhtml-arg-validation {:level :warning}} - :lint-as {dompa.nodes.shared/defhtml clojure.core/defn}} + :dompa.nodes/defhtml-arg-validation {:level :warning}} + :lint-as {dompa.nodes/defhtml clojure.core/defn}} diff --git a/resources/clj-kondo/hooks/dompa.clj b/resources/clj-kondo/hooks/dompa.clj index dac5762..1712a02 100644 --- a/resources/clj-kondo/hooks/dompa.clj +++ b/resources/clj-kondo/hooks/dompa.clj @@ -41,8 +41,8 @@ (doseq [arg (filter #(not (api/list-node? %)) rest-args)] (api/reg-finding! (assoc (meta arg) - :message (str "Invalid argument type. Argument must be a $ macro " - "or a sequence of $ macros.") + :message (str "Invalid argument type. Argument must be a $ node " + "or a sequence of $ nodes.") :type :dompa.nodes/$-arg-validation))) ; if the first arg is a keyword, the second arg is a map, then from @@ -52,8 +52,8 @@ (not (every? #(api/list-node? %) (rest rest-args)))) (api/reg-finding! (assoc (meta (second rest-args)) - :message (str "Invalid argument type. Argument must be a $ macro " - "or a sequence of $ macros.") + :message (str "Invalid argument type. Argument must be a $ node. " + "or a sequence of $ nodes.") :type :dompa.nodes/$-arg-validation))))) (defn defhtml [{:keys [node]}] @@ -64,20 +64,20 @@ (api/reg-finding! (assoc (meta first-arg) :message "Invalid argument type. Binding name must be a symbol." - :type :dompa.templates/defhtml-arg-validation)) + :type :dompa.nodes/defhtml-arg-validation)) ; second argument should be a vector (not (api/vector-node? second-arg)) (api/reg-finding! (assoc (meta second-arg) :message "Invalid argument type. Must be a vector of arguments." - :type :dompa.templates/defhtml-arg-validation)) + :type :dompa.nodes/defhtml-arg-validation)) ; rest of the arguments should be a list (not (every? #(api/list-node? %) rest-args)) (doseq [arg rest-args] (api/reg-finding! (assoc (meta arg) - :message (str "Invalid argument type. Argument must be a $ macro " - "or a sequence of $ macros."))))))) + :message (str "Invalid argument type. Argument must be a $ node " + "or a sequence of $ nodes"))))))) -- cgit v1.2.3