Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
"kit-sql-hikari" "1.0.7"
"kit-sql" "1.1.4"
"kit-undertow" "1.0.10"
"lein-template" "0.1.89"
"deps-template" "0.1.89"}
"lein-template" "0.1.90"
"deps-template" "0.1.90"}
14 changes: 13 additions & 1 deletion libs/deps-template/src/io/github/kit_clj/deps_template.clj
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,17 @@
[n]
(-> n (str) (str/replace "." "/") (str/replace "-" "_")))

(defn- expand-sql-flags
"Expands the :sql flag into individual SQL component flags for template rendering."
[{:keys [sql] :as data}]
(if sql
(assoc data
:conman true
:migratus true
:postgres true
:mysql true)
data))

(defn- selmer-opts
"Returns the data to be passed into the Selmer templates."
[{:keys [template-dir default-cookie-secret] :as data}]
Expand Down Expand Up @@ -105,7 +116,8 @@

This is the first step in the deps-new pipeline."
[data]
(assoc data ::template-files (render-templates data)))
(let [data' (expand-sql-flags data)]
(assoc data' ::template-files (render-templates data'))))

(defn- write-temporary-files
"Writes template files to the temp-dir."
Expand Down
2 changes: 1 addition & 1 deletion libs/lein-template/deps.edn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{:paths ["src"]
:deps {selmer/selmer {:mvn/version "1.13.1"}
com.github.seancorfield/clj-new {:mvn/version "1.3.415"}
io.github.kit-clj/deps-template {:mvn/version "0.1.89"}}}
io.github.kit-clj/deps-template {:mvn/version "0.1.90"}}}
Loading