Skip to content

Commit 9f871e0

Browse files
authored
test & ci: bump deps (#394)
Why the update to .clj-kondo/imports? Pretty sure these are brought down by clojure-lsp which brings down imports for bb included deps and there was recently a new bb version release.
1 parent bf3bad5 commit 9f871e0

File tree

6 files changed

+108
-25
lines changed

6 files changed

+108
-25
lines changed
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{:hooks
22
{:analyze-call
3-
{taoensso.encore/defalias taoensso.encore/defalias
4-
taoensso.encore/defn-cached taoensso.encore/defn-cached
5-
taoensso.encore/defonce taoensso.encore/defonce}}}
3+
{taoensso.encore/defalias taoensso.encore-hooks/defalias
4+
taoensso.encore/defaliases taoensso.encore-hooks/defaliases
5+
taoensso.encore/defn-cached taoensso.encore-hooks/defn-cached
6+
taoensso.encore/defonce taoensso.encore-hooks/defonce}}}
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
(ns taoensso.encore-hooks
2+
"I don't personally use clj-kondo, so these hooks are
3+
kindly authored and maintained by contributors.
4+
PRs very welcome! - Peter Taoussanis"
5+
(:refer-clojure :exclude [defonce])
6+
(:require
7+
[clj-kondo.hooks-api :as hooks]))
8+
9+
(defn defalias
10+
[{:keys [node]}]
11+
(let [[alias src-raw _attrs body] (rest (:children node))
12+
src (or src-raw alias)
13+
sym (if src-raw (hooks/sexpr alias) (symbol (name (hooks/sexpr src))))]
14+
{:node
15+
(with-meta
16+
(hooks/list-node
17+
[(hooks/token-node 'def)
18+
(hooks/token-node sym)
19+
(if body
20+
(hooks/list-node
21+
;; use :body in the def to avoid unused import/private var warnings
22+
[(hooks/token-node 'or) body src])
23+
src)])
24+
(meta src))}))
25+
26+
(defn defaliases
27+
[{:keys [node]}]
28+
(let [alias-nodes (rest (:children node))]
29+
{:node
30+
(hooks/list-node
31+
(into
32+
[(hooks/token-node 'do)]
33+
(map
34+
(fn alias->defalias [alias-node]
35+
(cond
36+
(hooks/token-node? alias-node)
37+
(hooks/list-node
38+
[(hooks/token-node 'taoensso.encore/defalias)
39+
alias-node])
40+
41+
(hooks/map-node? alias-node)
42+
(let [{:keys [src alias attrs body]} (hooks/sexpr alias-node)
43+
;; workaround as can't seem to (get) using a token-node
44+
;; and there's no update-keys (yet) in sci apparently
45+
[& {:as node-as-map}] (:children alias-node)
46+
{:keys [attrs body]} (zipmap (map hooks/sexpr (keys node-as-map))
47+
(vals node-as-map))]
48+
(hooks/list-node
49+
[(hooks/token-node 'taoensso.encore/defalias)
50+
(or alias src) (hooks/token-node src) attrs body])))))
51+
alias-nodes))}))
52+
53+
(defn defn-cached
54+
[{:keys [node]}]
55+
(let [[sym _opts binding-vec & body] (rest (:children node))]
56+
{:node
57+
(hooks/list-node
58+
(list
59+
(hooks/token-node 'def)
60+
sym
61+
(hooks/list-node
62+
(list*
63+
(hooks/token-node 'fn)
64+
binding-vec
65+
body))))}))
66+
67+
(defn defonce
68+
[{:keys [node]}]
69+
;; args = [sym doc-string? attr-map? init-expr]
70+
(let [[sym & args] (rest (:children node))
71+
[doc-string args] (if (and (hooks/string-node? (first args)) (next args)) [(hooks/sexpr (first args)) (next args)] [nil args])
72+
[attr-map init-expr] (if (and (hooks/map-node? (first args)) (next args)) [(hooks/sexpr (first args)) (fnext args)] [nil (first args)])
73+
74+
attr-map (if doc-string (assoc attr-map :doc doc-string) attr-map)
75+
sym+meta (if attr-map (with-meta sym attr-map) sym)
76+
rewritten
77+
(hooks/list-node
78+
[(hooks/token-node 'clojure.core/defonce)
79+
sym+meta
80+
init-expr])]
81+
82+
{:node rewritten}))

deps.edn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
{;; for disabling the official compiler
3737
:classpath-overrides {org.clojure/clojure nil}
3838
:extra-deps {com.github.flow-storm/clojure {:mvn/version "1.12.1"}
39-
com.github.flow-storm/flow-storm-dbg {:mvn/version "4.4.5"}}
39+
com.github.flow-storm/flow-storm-dbg {:mvn/version "4.4.6"}}
4040
:jvm-opts ["-Dclojure.storm.instrumentEnable=true"]}
4141

4242
:nrepl/jvm
@@ -130,7 +130,7 @@
130130
cli-matic/cli-matic {:mvn/version "0.5.4"}}}
131131

132132
:apply-import-vars {:override-deps {org.clojure/clojure {:mvn/version "1.12.1"}}
133-
:extra-deps {metosin/malli {:mvn/version "0.18.0"}
133+
:extra-deps {metosin/malli {:mvn/version "0.19.1"}
134134
io.aviso/pretty {:mvn/version "1.4.4"}}
135135
:ns-default lread.apply-import-vars}
136136

package-lock.json

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"karma-cljs-test": "^0.1.0",
77
"karma-junit-reporter": "^2.0.0",
88
"karma-spec-reporter": "^0.0.36",
9-
"shadow-cljs": "^3.1.5"
9+
"shadow-cljs": "^3.1.7"
1010
}
1111
}

script/test_libs.clj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,14 +329,14 @@
329329
"bin/test unit"]}
330330
{:name "clojure-lsp"
331331
:platforms [:clj]
332-
:version "2025.06.06-19.04.49"
332+
:version "2025.06.13-20.45.44"
333333
:github-release {:repo "clojure-lsp/clojure-lsp"}
334334
:patch-fn clojure-lsp-patch
335335
:show-deps-fn clojure-lsp-deps
336336
:test-cmds ["bb test"]}
337337
{:name "clojure-mcp"
338338
:platforms [:clj]
339-
:version "0.1.1-alpha"
339+
:version "0.1.4-alpha"
340340
:github-release {:repo "bhauman/clojure-mcp"
341341
:via :tag
342342
:version-prefix "v"}

0 commit comments

Comments
 (0)