Skip to content

Commit

Permalink
Merge pull request #22 from parenthesin/bump/deps-2024-10-28
Browse files Browse the repository at this point in the history 
bump: deps
  • Loading branch information
@rafaeldelboni
rafaeldelboni authored Oct 28, 2024
2 parents 9116b59 + 3622a1e commit 70ae7bf
Show file tree
Hide file tree
Showing 9 changed files with 248 additions and 24 deletions.
18 changes: 18 additions & 0 deletions .clj-kondo/io.pedestal/pedestal.log/config.edn
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
; Copyright 2024 Nubank NA

; The use and distribution terms for this software are covered by the
; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0)
; which can be found in the file epl-v10.html at the root of this distribution.
;
; By using this software in any fashion, you are agreeing to be bound by
; the terms of this license.
;
; You must not remove this notice, or any other, from this software.

{:hooks
{:analyze-call
{io.pedestal.log/trace hooks.io.pedestal.log/log-expr
io.pedestal.log/debug hooks.io.pedestal.log/log-expr
io.pedestal.log/info hooks.io.pedestal.log/log-expr
io.pedestal.log/warn hooks.io.pedestal.log/log-expr
io.pedestal.log/error hooks.io.pedestal.log/log-expr}}}
26 changes: 26 additions & 0 deletions .clj-kondo/io.pedestal/pedestal.log/hooks/io/pedestal/log.clj_kondo
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
; Copyright 2024 Nubank NA

; The use and distribution terms for this software are covered by the
; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0)
; which can be found in the file epl-v10.html at the root of this distribution.
;
; By using this software in any fashion, you are agreeing to be bound by
; the terms of this license.
;
; You must not remove this notice, or any other, from this software.

(ns hooks.io.pedestal.log
(:require [clj-kondo.hooks-api :as api]))

(defn log-expr
"Expands (log-expr :a :A :b :B ... )
to (hash-map :a :A :b :B ... ) per clj-kondo examples."
[{:keys [:node]}]
(let [[k v & _kvs] (rest (:children node))]
(when-not (and k v)
(throw (ex-info "No kv pair provided" {})))
(let [new-node (api/list-node
(list*
(api/token-node 'hash-map)
(rest (:children node))))]
{:node (vary-meta new-node assoc :clj-kondo/ignore [:unused-value])})))
23 changes: 23 additions & 0 deletions .clj-kondo/nubank/state-flow/nubank/state_flow.clj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
(ns nubank.state-flow
(:refer-clojure :exclude [with-redefs])
(:require [clj-kondo.hooks-api :as hooks]))

(defn- normalize-mlet-binds
Expand Down Expand Up @@ -33,3 +34,25 @@
(do-let body)])]
{:node (with-meta new-node (meta node))
:defined-by 'state-flow.cljtest/defflow}))

#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn with-redefs
"This transformation hook converts
(state-flow.labs.state/with-redefs [bindings & flows])
into
(clojure.core/with-redefs bindings
(state-flow.core/flow \"state-flow.labs.state/with-redefs\" flows))"
[{:keys [node]}]
(let [[bindings & flows] (rest (:children node))
new-node (hooks/list-node
[(hooks/token-node 'clojure.core/with-redefs)
bindings
(hooks/list-node
(concat [(hooks/token-node 'state-flow.api/flow)
(hooks/string-node "state-flow.labs.state/with-redefs")]
flows))])]
{:node (with-meta new-node (meta node))
:defined-by 'state-flow.labs.state/with-redefs}))
62 changes: 62 additions & 0 deletions .clj-kondo/potemkin/potemkin/config.edn
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{:lint-as {potemkin.collections/compile-if clojure.core/if
potemkin.collections/reify-map-type clojure.core/reify
potemkin.collections/def-map-type clj-kondo.lint-as/def-catch-all
potemkin.collections/def-derived-map clj-kondo.lint-as/def-catch-all

potemkin.types/reify+ clojure.core/reify
potemkin.types/defprotocol+ clojure.core/defprotocol
potemkin.types/deftype+ clojure.core/deftype
potemkin.types/defrecord+ clojure.core/defrecord
potemkin.types/definterface+ clojure.core/defprotocol
potemkin.types/extend-protocol+ clojure.core/extend-protocol
potemkin.types/def-abstract-type clj-kondo.lint-as/def-catch-all

potemkin.utils/doit clojure.core/doseq
potemkin.utils/doary clojure.core/doseq
potemkin.utils/condp-case clojure.core/condp
potemkin.utils/fast-bound-fn clojure.core/bound-fn

potemkin.walk/prewalk clojure.walk/prewalk
potemkin.walk/postwalk clojure.walk/postwalk
potemkin.walk/walk clojure.walk/walk

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;; top-level from import-vars
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

;; Have hooks
;;potemkin/import-fn potemkin.namespaces/import-fn
;;potemkin/import-macro potemkin.namespaces/import-macro
;;potemkin/import-def potemkin.namespaces/import-def

;; Internal, not transitive
;;potemkin/unify-gensyms potemkin.macros/unify-gensyms
;;potemkin/normalize-gensyms potemkin.macros/normalize-gensyms
;;potemkin/equivalent? potemkin.macros/equivalent?

potemkin/condp-case clojure.core/condp
potemkin/doit potemkin.utils/doit
potemkin/doary potemkin.utils/doary

potemkin/def-abstract-type clj-kondo.lint-as/def-catch-all
potemkin/reify+ clojure.core/reify
potemkin/defprotocol+ clojure.core/defprotocol
potemkin/deftype+ clojure.core/deftype
potemkin/defrecord+ clojure.core/defrecord
potemkin/definterface+ clojure.core/defprotocol
potemkin/extend-protocol+ clojure.core/extend-protocol

potemkin/reify-map-type clojure.core/reify
potemkin/def-derived-map clj-kondo.lint-as/def-catch-all
potemkin/def-map-type clj-kondo.lint-as/def-catch-all}

;; leave import-vars alone, kondo special-cases it
:hooks {:macroexpand {#_#_potemkin.namespaces/import-vars potemkin.namespaces/import-vars
potemkin.namespaces/import-fn potemkin.namespaces/import-fn
potemkin.namespaces/import-macro potemkin.namespaces/import-macro
potemkin.namespaces/import-def potemkin.namespaces/import-def

#_#_potemkin/import-vars potemkin.namespaces/import-vars
potemkin/import-fn potemkin.namespaces/import-fn
potemkin/import-macro potemkin.namespaces/import-macro
potemkin/import-def potemkin.namespaces/import-def}}}
56 changes: 56 additions & 0 deletions .clj-kondo/potemkin/potemkin/potemkin/namespaces.clj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
(ns potemkin.namespaces
(:require [clj-kondo.hooks-api :as api]))

(defn import-macro*
([sym]
`(def ~(-> sym name symbol) ~sym))
([sym name]
`(def ~name ~sym)))

(defmacro import-fn
([sym]
(import-macro* sym))
([sym name]
(import-macro* sym name)))

(defmacro import-macro
([sym]
(import-macro* sym))
([sym name]
(import-macro* sym name)))

(defmacro import-def
([sym]
(import-macro* sym))
([sym name]
(import-macro* sym name)))

#_
(defmacro import-vars
"Imports a list of vars from other namespaces."
[& syms]
(let [unravel (fn unravel [x]
(if (sequential? x)
(->> x
rest
(mapcat unravel)
(map
#(symbol
(str (first x)
(when-let [n (namespace %)]
(str "." n)))
(name %))))
[x]))
syms (mapcat unravel syms)
result `(do
~@(map
(fn [sym]
(let [vr (resolve sym)
m (meta vr)]
(cond
(nil? vr) `(throw (ex-info (format "`%s` does not exist" '~sym) {}))
(:macro m) `(def ~(-> sym name symbol) ~sym)
(:arglists m) `(def ~(-> sym name symbol) ~sym)
:else `(def ~(-> sym name symbol) ~sym))))
syms))]
result))
6 changes: 5 additions & 1 deletion .clj-kondo/taoensso/encore/config.edn
View file
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
{:hooks {:analyze-call {taoensso.encore/defalias taoensso.encore/defalias}}}
{:hooks
{:analyze-call
{taoensso.encore/defalias taoensso.encore/defalias
taoensso.encore/defn-cached taoensso.encore/defn-cached
taoensso.encore/defonce taoensso.encore/defonce}}}
57 changes: 46 additions & 11 deletions .clj-kondo/taoensso/encore/taoensso/encore.clj
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,51 @@
(ns taoensso.encore
"I don't personally use clj-kondo, so these hooks are
kindly authored and maintained by contributors.
PRs very welcome! - Peter Taoussanis"
(:refer-clojure :exclude [defonce])
(:require
[clj-kondo.hooks-api :as hooks]))

(defn defalias [{:keys [node]}]
(defn defalias
[{:keys [node]}]
(let [[sym-raw src-raw] (rest (:children node))
src (if src-raw src-raw sym-raw)
sym (if src-raw
sym-raw
(symbol (name (hooks/sexpr src))))]
{:node (with-meta
(hooks/list-node
[(hooks/token-node 'def)
(hooks/token-node (hooks/sexpr sym))
(hooks/token-node (hooks/sexpr src))])
(meta src))}))
src (or src-raw sym-raw)
sym (if src-raw sym-raw (symbol (name (hooks/sexpr src))))]
{:node
(with-meta
(hooks/list-node
[(hooks/token-node 'def)
(hooks/token-node (hooks/sexpr sym))
(hooks/token-node (hooks/sexpr src))])
(meta src))}))

(defn defn-cached
[{:keys [node]}]
(let [[sym _opts binding-vec & body] (rest (:children node))]
{:node
(hooks/list-node
(list
(hooks/token-node 'def)
sym
(hooks/list-node
(list*
(hooks/token-node 'fn)
binding-vec
body))))}))

(defn defonce
[{:keys [node]}]
;; args = [sym doc-string? attr-map? init-expr]
(let [[sym & args] (rest (:children node))
[doc-string args] (if (and (hooks/string-node? (first args)) (next args)) [(hooks/sexpr (first args)) (next args)] [nil args])
[attr-map init-expr] (if (and (hooks/map-node? (first args)) (next args)) [(hooks/sexpr (first args)) (fnext args)] [nil (first args)])

attr-map (if doc-string (assoc attr-map :doc doc-string) attr-map)
sym+meta (if attr-map (with-meta sym attr-map) sym)
rewritten
(hooks/list-node
[(hooks/token-node 'clojure.core/defonce)
sym+meta
init-expr])]

{:node rewritten}))
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Install clojure cli
uses: DeLaGuardo/setup-clojure@master
with:
cli: 1.11.3.1463
cli: 1.12.0.1479

- name: Cache Maven packages
uses: actions/cache@v4
Expand All @@ -60,12 +60,12 @@ jobs:
- name: Install clojure cli
uses: DeLaGuardo/setup-clojure@master
with:
cli: 1.11.3.1463
cli: 1.12.0.1479

- name: Setup clojure-lsp
uses: clojure-lsp/setup-clojure-lsp@v1.0.2
with:
clojure-lsp-version: 2024.03.13-13.11.00
clojure-lsp-version: 2024.08.05-18.16.00

- name: Execute lint checks
run: |
Expand Down
18 changes: 9 additions & 9 deletions deps.edn
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{:paths ["src" "resources"]
:deps {org.clojure/clojure {:mvn/version "1.11.3"}
com.github.parenthesin/components {:mvn/version "0.3.0"
:deps {org.clojure/clojure {:mvn/version "1.12.0"}
com.github.parenthesin/components {:mvn/version "0.3.1"
:exclusions [prismatic/schema]}
com.github.seancorfield/honeysql {:mvn/version "2.6.1147"}
metosin/malli {:mvn/version "0.16.2"}
org.postgresql/postgresql {:mvn/version "42.7.3"}}
com.github.seancorfield/honeysql {:mvn/version "2.6.1203"}
metosin/malli {:mvn/version "0.16.4"}
org.postgresql/postgresql {:mvn/version "42.7.4"}}
:aliases
{:dev {:extra-paths ["test" "dev"]}
:test {:extra-paths ["test"]
:extra-deps {org.clojars.bigsy/pg-embedded-clj {:mvn/version "1.0.1"}
lambdaisland/kaocha {:mvn/version "1.91.1392"}
lambdaisland/kaocha-cloverage {:mvn/version "1.1.89"}
nubank/matcher-combinators {:mvn/version "3.9.1"}
nubank/state-flow {:mvn/version "5.17.0"}}
nubank/state-flow {:mvn/version "5.18.0"}}
:main-opts ["-m" "kaocha.runner"]}

:clojure-lsp {:replace-deps {com.github.clojure-lsp/clojure-lsp-standalone {:mvn/version "2024.04.22-11.50.26"}}
:clojure-lsp {:replace-deps {com.github.clojure-lsp/clojure-lsp-standalone {:mvn/version "2024.08.05-18.16.00"}}
:main-opts ["-m" "clojure-lsp.main"]}

:nrepl {:extra-deps {cider/cider-nrepl {:mvn/version "0.49.1"}}
:nrepl {:extra-deps {cider/cider-nrepl {:mvn/version "0.50.2"}}
:main-opts ["-m" "nrepl.cmdline" "--middleware" "[cider.nrepl/cider-middleware]"]}

:migratus {:main-opts ["-m" "parenthesin.helpers.migrations"]}

:build {:deps {io.github.clojure/tools.build {:mvn/version "0.10.4"}}
:build {:deps {io.github.clojure/tools.build {:mvn/version "0.10.5"}}
:ns-default build
:exec-args {:uber-file "target/service.jar"}}}}

0 comments on commit 70ae7bf

Please sign in to comment.