small code style fixes

src/stencil/api.clj

@@ -10,25 +10,25 @@
 (set! *warn-on-reflection* true)
 (set! *unchecked-math* :warn-on-boxed)
 
-(defn ^PreparedTemplate prepare
+(defn prepare
   "Creates a prepared template instance from an input document."
-  [input]
+  ^PreparedTemplate [input]
   (cond
     (instance? PreparedTemplate input) input
     (nil? input)  (throw (ex-info "Template is missing!" {}))
     :else         (API/prepare (io/file input))))
 
 
-(defn- ^TemplateData make-template-data [x]
+(defn- make-template-data ^TemplateData [x]
   (if (map? x)
     (TemplateData/fromMap ^Map (stringify-keys x))
     (throw (ex-info (str "Unsupported template data type " (type x) "!")
                     {:template-data x}))))
 
 
-(defn ^PreparedFragment fragment
+(defn fragment
   "Converts input to a fragment instance"
-  [f]
+  ^PreparedFragment [f]
   (cond
     (instance? PreparedFragment f) f
     (nil? f)   (throw (ex-info "Fragment can not be null!" {}))

src/stencil/eval.clj

@@ -9,6 +9,7 @@
 
 (set! *warn-on-reflection* true)
 
+#_{:clj-kondo/ignore [:unused-binding]}
 (defmulti eval-step (fn [function data item] (:cmd item)))
 
 (defmethod eval-step :default [_ _ item] [item])

src/stencil/functions.clj

@@ -7,6 +7,7 @@
 
 (set! *warn-on-reflection* true)
 
+#_{:clj-kondo/ignore [:unused-binding]}
 (defmulti call-fn
   "Extend this multimethod to make additional functions available from the template files.
    The first argument is the lowercase function name which is used for dispatching the calls.

src/stencil/grammar.clj

@@ -7,7 +7,7 @@
 
 ;; left-associative chained infix expression
 (defn- chained [reader reader* reducer]
-  (fn [tokens] chained
+  (fn [tokens]
     (when-let [[result tokens] (reader tokens)]
       (loop [tokens tokens
              result result]
@@ -58,6 +58,7 @@
 (defn- optional [reader] ;; always matches
   (fn [t] (or (reader t) [nil t])))
 
+#_{:clj-kondo/ignore [:unresolved-symbol]}
 (def testlang
   (grammar [val  (some-fn iden-or-fncall
                           (parenthesed expression)

src/stencil/infix.clj

@@ -152,7 +152,7 @@
 (defmethod eval-tree :fncall [[_ f & args]]
   (let [args (mapv eval-tree args)]
     (try (apply call-fn (name f) args)
-         (catch clojure.lang.ArityException e
+         (catch clojure.lang.ArityException _
                 (throw (ex-info (format "Function '%s' was called with a wrong number of arguments (%d)" f (count args))
                                 {:fn f :args args}))))))
 

src/stencil/postprocess/fragments.clj

@@ -3,7 +3,7 @@
   (:import [stencil.types FragmentInvoke])
   (:require [clojure.zip :as zip]
             [clojure.data.xml :as xml]
-            [stencil.types :refer :all]
+            [stencil.types :refer [->FragmentInvoke control?]]
             [stencil.ooxml :as ooxml]
             [stencil.functions :refer [call-fn]]
             [stencil.util :refer :all]))

src/stencil/postprocess/html.clj

@@ -5,7 +5,7 @@
             [stencil.functions :refer [call-fn]]
             [stencil.postprocess.fragments :as fragments]
             [stencil.types :refer [ControlMarker]]
-            [stencil.util :refer :all]
+            [stencil.util :refer [find-first dfs-walk-xml dfs-walk-xml-node]]
             [stencil.ooxml :as ooxml]))
 
 (set! *warn-on-reflection* true)

src/stencil/spec.clj

@@ -2,6 +2,7 @@
   (:import [java.io File])
   (:require [clojure.spec.alpha :as s]
             [stencil.model :as m]
+            [stencil.model.relations :as relations]
             [stencil.process]))
 
 
@@ -13,10 +14,10 @@
 (s/def ::data map?)
 
 ;; other types are also possible
-(s/def :stencil.model/type #{stencil.model/rel-type-footer
-                             stencil.model/rel-type-header
-                             stencil.model/rel-type-main
-                             stencil.model/rel-type-slide})
+(s/def :stencil.model/type #{relations/rel-type-footer
+                             relations/rel-type-header
+                             relations/rel-type-main
+                             relations/rel-type-slide})
 
 (s/def :stencil.model/path (s/and string? not-empty #(not (.startsWith ^String % "/"))))
 

src/stencil/types.clj

@@ -15,6 +15,7 @@
 
 (def column-resize-modes #{:resize-first :resize-last :rational :cut})
 
+#_{:clj-kondo/ignore [:redefined-var]}
 (defn ->HideTableColumnMarker
   ([] (HideTableColumnMarker. :cut))
   ([x] (assert (column-resize-modes x))

src/stencil/util.clj

@@ -39,7 +39,7 @@
 (defn iterations [f elem] (eduction (take-while some?) (iterate f elem)))
 
 ;; same as (first (filter pred xs))
-(defn find-first [pred xs] (reduce (fn [_ x] (if (pred x) (reduced x))) nil xs))
+(defn find-first [pred xs] (reduce (fn [_ x] (when (pred x) (reduced x))) nil xs))
 (defn find-last [pred xs] (reduce (fn [a x] (if (pred x) x a)) nil xs))
 
 (def xml-zip
@@ -139,7 +139,7 @@
 (defn whitespace? [c] (whitespace?? c))
 
 ;; like clojure.string/trim but supports a wider range of whitespace characters
-(defn ^String trim [^CharSequence s]
+(defn trim ^String [^CharSequence s]
   (loop [right-idx (.length s)]
     (if (zero? right-idx)
       ""