Merge pull request #528 from metosin/bumpup

Update deps & format files

.gitignore

@@ -13,4 +13,4 @@ pom.xml.asc
 /_book
 figwheel_server.log
 /.idea
-.clj-kondo/cache
+.clj-kondo

.lsp/config.edn

@@ -0,0 +1,2 @@
+{:cljfmt {:indents {for-all [[:inner 0]]
+                    are [[:inner 0]]}}}

CHANGELOG.md

@@ -18,6 +18,19 @@ We use [Break Versioning][breakver]. The version numbers follow a `<major>.<mino
 
 * Improved Reitit-frontend function docstrings
 
+* Updated deps:
+
+```clj
+[metosin/ring-swagger-ui "4.3.0"] is available but we use "3.46.0"
+[metosin/jsonista "0.3.5"] is available but we use "0.3.3"
+[metosin/malli "0.8.1"] is available but we use "0.5.1"
+[com.fasterxml.jackson.core/jackson-core "2.13.1"] is available but we use "2.12.4"
+[com.fasterxml.jackson.core/jackson-databind "2.13.1"] is available but we use "2.12.4"
+[fipp "0.6.25"] is available but we use "0.6.24"
+[expound "0.9.0"] is available but we use "0.8.9"
+[ring/ring-core "1.9.5"] is available but we use "1.9.4"
+```
+
 ## 0.5.15 (2021-08-05)
 
 **[compare](https://github.com/metosin/reitit/compare/0.5.14...0.5.15)**

doc/development.md

@@ -13,6 +13,13 @@
 ./scripts/test.sh cljs
 ```
 
+## Formatting
+
+```bash
+clojure-lsp format
+clojure-lsp clean-ns
+```
+
 ## Documentation
 
 The documentation lives under `doc` and it is hosted on [cljdoc](https://cljdoc.org). See their

modules/reitit-core/src/reitit/coercion.cljc

@@ -1,8 +1,10 @@
 (ns reitit.coercion
-  (:require [clojure.walk :as walk]
+  (:require
+   [clojure.walk :as walk]
    [reitit.impl :as impl])
   #?(:clj
-     (:import (java.io Writer))))
+     (:import
+      (java.io Writer))))
 
 ;;
 ;; Protocol

modules/reitit-core/src/reitit/core.cljc

@@ -1,6 +1,7 @@
 (ns reitit.core
-  (:require [reitit.impl :as impl]
+  (:require
    [reitit.exception :as exception]
+   [reitit.impl :as impl]
    [reitit.trie :as trie]))
 
 ;;

modules/reitit-core/src/reitit/dependency.cljc

@@ -1,6 +1,7 @@
 (ns reitit.dependency
   "Dependency resolution for middleware/interceptors."
-  (:require [reitit.exception :as exception]))
+  (:require
+   [reitit.exception :as exception]))
 
 (defn- providers
   "Map from provision key to provider. `get-provides` should return the provision keys of a dependent."

modules/reitit-core/src/reitit/exception.cljc

@@ -1,5 +1,6 @@
 (ns reitit.exception
-  (:require [clojure.string :as str]))
+  (:require
+   [clojure.string :as str]))
 
 (defn fail!
   ([type]

modules/reitit-core/src/reitit/impl.cljc

@@ -1,13 +1,15 @@
 (ns ^:no-doc reitit.impl
   #?(:cljs (:require-macros [reitit.impl]))
-  (:require [clojure.string :as str]
+  (:require
    [clojure.set :as set]
+   [clojure.string :as str]
    [meta-merge.core :as mm]
-            [reitit.trie :as trie]
+   [reitit.exception :as ex]
-            [reitit.exception :as ex])
+   [reitit.trie :as trie])
   #?(:clj
-     (:import (java.util HashMap Map)
+     (:import
-              (java.net URLEncoder URLDecoder))))
+      (java.net URLEncoder URLDecoder)
+      (java.util HashMap Map))))
 
 (defn parse [path opts]
   (let [path #?(:clj (.intern ^String (trie/normalize path opts)) :cljs (trie/normalize path opts))

modules/reitit-core/src/reitit/interceptor.cljc

@@ -1,9 +1,10 @@
 (ns reitit.interceptor
-  (:require [meta-merge.core :refer [meta-merge]]
+  (:require
    [clojure.pprint :as pprint]
+   [meta-merge.core :refer [meta-merge]]
    [reitit.core :as r]
-            [reitit.impl :as impl]
+   [reitit.exception :as exception]
-            [reitit.exception :as exception]))
+   [reitit.impl :as impl]))
 
 (defprotocol IntoInterceptor
   (into-interceptor [this data opts]))

modules/reitit-core/src/reitit/middleware.cljc

@@ -1,9 +1,10 @@
 (ns reitit.middleware
-  (:require [meta-merge.core :refer [meta-merge]]
+  (:require
    [clojure.pprint :as pprint]
+   [meta-merge.core :refer [meta-merge]]
    [reitit.core :as r]
-            [reitit.impl :as impl]
+   [reitit.exception :as exception]
-            [reitit.exception :as exception]))
+   [reitit.impl :as impl]))
 
 (defprotocol IntoMiddleware
   (into-middleware [this data opts]))

modules/reitit-core/src/reitit/spec.cljc

@@ -1,8 +1,9 @@
 (ns reitit.spec
-  (:require [clojure.spec.alpha :as s]
+  (:require
+   [clojure.spec.alpha :as s]
    [clojure.spec.gen.alpha :as gen]
-            [reitit.exception :as exception]
+   [reitit.core :as r]
-            [reitit.core :as r]))
+   [reitit.exception :as exception]))
 
 ;;
 ;; routes

modules/reitit-core/src/reitit/trie.cljc

@@ -1,9 +1,11 @@
 (ns reitit.trie
   (:refer-clojure :exclude [compile])
-  (:require [clojure.string :as str]
+  (:require
+   [clojure.string :as str]
    [reitit.exception :as ex])
-  #?(:clj (:import [reitit Trie Trie$Match Trie$Matcher]
+  #?(:clj (:import
-                   (java.net URLDecoder))))
+           (java.net URLDecoder)
+           [reitit Trie Trie$Match Trie$Matcher])))
 
 (defn ^:no-doc into-set [x]
   (cond

modules/reitit-dev/src/reitit/dev/pretty.cljc

@@ -1,18 +1,17 @@
 (ns reitit.dev.pretty
-  (:require [clojure.string :as str]
+  (:require
+   [arrangement.core] ;; spell-spec
    [clojure.spec.alpha :as s]
-            [reitit.exception :as exception]
+   [clojure.string :as str]
-            [arrangement.core]
+   [expound.alpha] ;; fipp
-    ;; spell-spec
-            [spell-spec.expound]
-    ;; expound
    [expound.ansi]
-            [expound.alpha]
-    ;; fipp
-            [fipp.visit]
    [fipp.edn]
    [fipp.ednize]
-            [fipp.engine]))
+   [fipp.engine]
+   [fipp.visit]
+   [reitit.exception :as exception]
+   [spell-spec.expound] ;; expound
+))
 
 ;;
 ;; colors

modules/reitit-frontend/src/reitit/frontend.cljs

@@ -1,8 +1,10 @@
 (ns reitit.frontend
-  (:require [clojure.set :as set]
+  (:require
+   [clojure.set :as set]
    [reitit.coercion :as coercion]
    [reitit.core :as r])
-  (:import goog.Uri
+  (:import
+   goog.Uri
    goog.Uri.QueryData))
 
 (defn- query-param [^QueryData q k]

modules/reitit-frontend/src/reitit/frontend/easy.cljs

@@ -2,7 +2,8 @@
   "Easy wrapper over reitit.frontend.history,
   handling the state. Only one router can be active
   at a time."
-  (:require [reitit.frontend.history :as rfh]))
+  (:require
+   [reitit.frontend.history :as rfh]))
 
 (defonce history (atom nil))
 

modules/reitit-frontend/src/reitit/frontend/history.cljs

@@ -1,10 +1,12 @@
 (ns reitit.frontend.history
   "Provides integration to hash-change or HTML5 History
   events."
-  (:require [reitit.core :as reitit]
+  (:require
-            [reitit.frontend :as rf]
+   [goog.events :as gevents]
-            [goog.events :as gevents])
+   [reitit.core :as reitit]
-  (:import goog.Uri))
+   [reitit.frontend :as rf])
+  (:import
+   goog.Uri))
 
 (defprotocol History
   (-init [this] "Create event listeners")

modules/reitit-http/src/reitit/http.cljc

@@ -1,9 +1,10 @@
 (ns reitit.http
-  (:require [meta-merge.core :refer [meta-merge]]
+  (:require
-            [reitit.interceptor :as interceptor]
+   [meta-merge.core :refer [meta-merge]]
+   [reitit.core :as r]
    [reitit.exception :as ex]
-            [reitit.ring :as ring]
+   [reitit.interceptor :as interceptor]
-            [reitit.core :as r]))
+   [reitit.ring :as ring]))
 
 (defrecord Endpoint [data interceptors queue handler path method])
 

modules/reitit-http/src/reitit/http/coercion.cljc

@@ -1,7 +1,8 @@
 (ns reitit.http.coercion
-  (:require [reitit.coercion :as coercion]
+  (:require
-            [reitit.spec :as rs]
+   [reitit.coercion :as coercion]
-            [reitit.impl :as impl]))
+   [reitit.impl :as impl]
+   [reitit.spec :as rs]))
 
 (defn coerce-request-interceptor
   "Interceptor for pluggable request coercion.

modules/reitit-http/src/reitit/http/spec.cljc

@@ -1,8 +1,9 @@
 (ns reitit.http.spec
-  (:require [clojure.spec.alpha :as s]
+  (:require
-            [reitit.ring.spec :as rrs]
+   [clojure.spec.alpha :as s]
-            [reitit.interceptor :as interceptor]
    [reitit.exception :as exception]
+   [reitit.interceptor :as interceptor]
+   [reitit.ring.spec :as rrs]
    [reitit.spec :as rs]))
 
 ;;

modules/reitit-interceptors/src/reitit/http/interceptors/dev.clj

@@ -1,5 +1,6 @@
 (ns reitit.http.interceptors.dev
-  (:require [lambdaisland.deep-diff :as ddiff]
+  (:require
+   [lambdaisland.deep-diff :as ddiff]
    [lambdaisland.deep-diff.printer :as printer]
    [puget.color :as color]
    [reitit.core :as r]))

modules/reitit-interceptors/src/reitit/http/interceptors/exception.clj

@@ -1,10 +1,12 @@
 (ns reitit.http.interceptors.exception
-  (:require [reitit.coercion :as coercion]
+  (:require
-            [reitit.ring :as ring]
    [clojure.spec.alpha :as s]
-            [clojure.string :as str])
+   [clojure.string :as str]
-  (:import (java.time Instant)
+   [reitit.coercion :as coercion]
-           (java.io PrintWriter Writer)))
+   [reitit.ring :as ring])
+  (:import
+   (java.io PrintWriter Writer)
+   (java.time Instant)))
 
 (s/def ::handlers (s/map-of any? fn?))
 (s/def ::spec (s/keys :opt-un [::handlers]))

modules/reitit-interceptors/src/reitit/http/interceptors/multipart.clj

@@ -1,10 +1,12 @@
 (ns reitit.http.interceptors.multipart
-  (:require [reitit.coercion :as coercion]
+  (:require
+   [clojure.spec.alpha :as s]
+   [reitit.coercion :as coercion]
    [reitit.spec]
    [ring.middleware.multipart-params :as multipart-params]
-            [clojure.spec.alpha :as s]
    [spec-tools.core :as st])
-  (:import (java.io File)))
+  (:import
+   (java.io File)))
 
 (s/def ::filename string?)
 (s/def ::content-type string?)

modules/reitit-interceptors/src/reitit/http/interceptors/muuntaja.clj

@@ -1,7 +1,8 @@
 (ns reitit.http.interceptors.muuntaja
-  (:require [muuntaja.core :as m]
+  (:require
-            [muuntaja.interceptor]
+   [clojure.spec.alpha :as s]
-            [clojure.spec.alpha :as s]))
+   [muuntaja.core :as m]
+   [muuntaja.interceptor]))
 
 (s/def ::muuntaja m/muuntaja?)
 (s/def ::spec (s/keys :opt-un [::muuntaja]))

modules/reitit-interceptors/src/reitit/http/interceptors/parameters.clj

@@ -1,5 +1,6 @@
 (ns reitit.http.interceptors.parameters
-  (:require [ring.middleware.params :as params]))
+  (:require
+   [ring.middleware.params :as params]))
 
 (defn parameters-interceptor
   "Interceptor to parse urlencoded parameters from the query string and form

modules/reitit-malli/src/reitit/coercion/malli.cljc

@@ -1,13 +1,14 @@
 (ns reitit.coercion.malli
-  (:require [reitit.coercion :as coercion]
+  (:require
-            [malli.transform :as mt]
+   [clojure.set :as set]
+   [clojure.walk :as walk]
+   [malli.core :as m]
    [malli.edn :as edn]
    [malli.error :as me]
-            [malli.util :as mu]
    [malli.swagger :as swagger]
-            [malli.core :as m]
+   [malli.transform :as mt]
-            [clojure.set :as set]
+   [malli.util :as mu]
-            [clojure.walk :as walk]))
+   [reitit.coercion :as coercion]))
 
 ;;
 ;; coercion

modules/reitit-malli/src/reitit/ring/malli.cljc

@@ -1,5 +1,6 @@
 (ns reitit.ring.malli
-  #?(:clj (:import (java.io File))))
+  #?(:clj (:import
+           (java.io File))))
 
 #?(:clj
    (def temp-file-part

modules/reitit-middleware/src/reitit/ring/middleware/dev.clj

@@ -1,5 +1,6 @@
 (ns reitit.ring.middleware.dev
-  (:require [lambdaisland.deep-diff :as ddiff]
+  (:require
+   [lambdaisland.deep-diff :as ddiff]
    [lambdaisland.deep-diff.printer :as printer]
    [puget.color :as color]
    [reitit.core :as r]))

modules/reitit-middleware/src/reitit/ring/middleware/exception.clj

@@ -1,10 +1,12 @@
 (ns reitit.ring.middleware.exception
-  (:require [reitit.coercion :as coercion]
+  (:require
-            [reitit.ring :as ring]
    [clojure.spec.alpha :as s]
-            [clojure.string :as str])
+   [clojure.string :as str]
-  (:import (java.time Instant)
+   [reitit.coercion :as coercion]
-           (java.io Writer PrintWriter)))
+   [reitit.ring :as ring])
+  (:import
+   (java.io Writer PrintWriter)
+   (java.time Instant)))
 
 (s/def ::handlers (s/map-of any? fn?))
 (s/def ::spec (s/keys :opt-un [::handlers]))

modules/reitit-middleware/src/reitit/ring/middleware/multipart.clj

@@ -1,10 +1,12 @@
 (ns reitit.ring.middleware.multipart
   (:refer-clojure :exclude [compile])
-  (:require [reitit.coercion :as coercion]
+  (:require
-            [ring.middleware.multipart-params :as multipart-params]
    [clojure.spec.alpha :as s]
+   [reitit.coercion :as coercion]
+   [ring.middleware.multipart-params :as multipart-params]
    [spec-tools.core :as st])
-  (:import (java.io File)))
+  (:import
+   (java.io File)))
 
 (s/def ::filename string?)
 (s/def ::content-type string?)

modules/reitit-middleware/src/reitit/ring/middleware/muuntaja.clj

@@ -1,7 +1,8 @@
 (ns reitit.ring.middleware.muuntaja
-  (:require [muuntaja.core :as m]
+  (:require
-            [muuntaja.middleware]
+   [clojure.spec.alpha :as s]
-            [clojure.spec.alpha :as s]))
+   [muuntaja.core :as m]
+   [muuntaja.middleware]))
 
 (s/def ::muuntaja m/muuntaja?)
 (s/def ::spec (s/keys :opt-un [::muuntaja]))

modules/reitit-middleware/src/reitit/ring/middleware/parameters.clj

@@ -1,5 +1,6 @@
 (ns reitit.ring.middleware.parameters
-  (:require [ring.middleware.params :as params]))
+  (:require
+   [ring.middleware.params :as params]))
 
 (def parameters-middleware
   "Middleware to parse urlencoded parameters from the query string and form

modules/reitit-pedestal/src/reitit/pedestal.clj

@@ -1,11 +1,13 @@
 (ns reitit.pedestal
-  (:require [io.pedestal.interceptor.chain :as chain]
+  (:require
-            [io.pedestal.interceptor :as interceptor]
    [io.pedestal.http :as http]
-            [reitit.interceptor]
+   [io.pedestal.interceptor :as interceptor]
-            [reitit.http])
+   [io.pedestal.interceptor.chain :as chain]
-  (:import (reitit.interceptor Executor)
+   [reitit.http]
-           (java.lang.reflect Method)))
+   [reitit.interceptor])
+  (:import
+   (java.lang.reflect Method)
+   (reitit.interceptor Executor)))
 
 ;; TODO: variadic
 (defn- arities [f]

modules/reitit-ring/src/reitit/ring.cljc

@@ -1,12 +1,13 @@
 (ns reitit.ring
-  (:require [meta-merge.core :refer [meta-merge]]
+  (:require
-            [reitit.middleware :as middleware]
+   [clojure.string :as str]
-            [reitit.exception :as ex]
+   [meta-merge.core :refer [meta-merge]]
-            [reitit.core :as r]
-            [reitit.impl :as impl]
    #?@(:clj [[ring.util.mime-type :as mime-type]
                       [ring.util.response :as response]])
-            [clojure.string :as str]))
+   [reitit.core :as r]
+   [reitit.exception :as ex]
+   [reitit.impl :as impl]
+   [reitit.middleware :as middleware]))
 
 (declare get-match)
 (declare get-router)

modules/reitit-ring/src/reitit/ring/coercion.cljc

@@ -1,7 +1,8 @@
 (ns reitit.ring.coercion
-  (:require [reitit.coercion :as coercion]
+  (:require
-            [reitit.spec :as rs]
+   [reitit.coercion :as coercion]
-            [reitit.impl :as impl]))
+   [reitit.impl :as impl]
+   [reitit.spec :as rs]))
 
 (defn handle-coercion-exception [e respond raise]
   (let [data (ex-data e)]

modules/reitit-ring/src/reitit/ring/spec.cljc

@@ -1,8 +1,9 @@
 (ns reitit.ring.spec
-  (:require [clojure.spec.alpha :as s]
+  (:require
+   [clojure.spec.alpha :as s]
+   [reitit.exception :as exception]
    [reitit.middleware :as middleware]
-            [reitit.spec :as rs]
+   [reitit.spec :as rs]))
-            [reitit.exception :as exception]))
 
 ;;
 ;; Specs
@@ -19,7 +20,6 @@
 (s/def ::trace map?)
 (s/def ::patch map?)
 
-
 (s/def ::data
   (s/keys :opt-un [::rs/handler ::rs/name ::rs/no-doc ::middleware]))
 

modules/reitit-schema/src/reitit/coercion/schema.cljc

@@ -1,13 +1,14 @@
 (ns reitit.coercion.schema
-  (:require [clojure.walk :as walk]
+  (:require
-            [schema.core :as s]
+   [clojure.set :as set]
-            [schema-tools.core :as st]
+   [clojure.walk :as walk]
-            [schema.coerce :as sc]
-            [schema.utils :as su]
-            [schema-tools.coerce :as stc]
-            [schema-tools.swagger.core :as swagger]
    [reitit.coercion :as coercion]
-            [clojure.set :as set]))
+   [schema-tools.coerce :as stc]
+   [schema-tools.core :as st]
+   [schema-tools.swagger.core :as swagger]
+   [schema.coerce :as sc]
+   [schema.core :as s]
+   [schema.utils :as su]))
 
 (def string-coercion-matcher
   stc/string-coercion-matcher)

modules/reitit-schema/src/reitit/ring/schema.cljc

@@ -1,7 +1,9 @@
 (ns reitit.ring.schema
-  (:require [schema.core :as s]
+  (:require
-            [schema-tools.swagger.core :as swagger])
+   [schema-tools.swagger.core :as swagger]
-  #?(:clj (:import (java.io File))))
+   [schema.core :as s])
+  #?(:clj (:import
+           (java.io File))))
 
 (defrecord Upload [m]
   s/Schema

modules/reitit-sieppari/src/reitit/interceptor/sieppari.clj

@@ -1,7 +1,8 @@
 (ns reitit.interceptor.sieppari
-  (:require [reitit.interceptor :as interceptor]
+  (:require
-            [sieppari.queue :as queue]
+   [reitit.interceptor :as interceptor]
-            [sieppari.core :as sieppari]))
+   [sieppari.core :as sieppari]
+   [sieppari.queue :as queue]))
 
 (def executor
   (reify

modules/reitit-spec/src/reitit/coercion/spec.cljc

@@ -1,12 +1,14 @@
 (ns reitit.coercion.spec
-  (:require [clojure.spec.alpha :as s]
+  (:require
+   [clojure.set :as set]
+   [clojure.spec.alpha :as s]
+   [reitit.coercion :as coercion]
    [spec-tools.core :as st #?@(:cljs [:refer [Spec]])]
    [spec-tools.data-spec :as ds #?@(:cljs [:refer [Maybe]])]
-            [spec-tools.swagger.core :as swagger]
+   [spec-tools.swagger.core :as swagger])
-            [reitit.coercion :as coercion]
-            [clojure.set :as set])
   #?(:clj
-     (:import (spec_tools.core Spec)
+     (:import
+      (spec_tools.core Spec)
       (spec_tools.data_spec Maybe))))
 
 (def string-transformer

modules/reitit-swagger-ui/src/reitit/swagger_ui.cljc

@@ -1,6 +1,7 @@
 (ns reitit.swagger-ui
-  #?(:clj (:require [reitit.ring :as ring]
+  #?(:clj (:require
-                    [jsonista.core :as j])))
+           [jsonista.core :as j]
+           [reitit.ring :as ring])))
 
 #?(:clj
    (defn create-swagger-ui-handler

modules/reitit-swagger/src/reitit/swagger.cljc

@@ -1,10 +1,11 @@
 (ns reitit.swagger
-  (:require [reitit.core :as r]
+  (:require
-            [meta-merge.core :refer [meta-merge]]
-            [clojure.spec.alpha :as s]
    [clojure.set :as set]
+   [clojure.spec.alpha :as s]
    [clojure.string :as str]
+   [meta-merge.core :refer [meta-merge]]
    [reitit.coercion :as coercion]
+   [reitit.core :as r]
    [reitit.trie :as trie]))
 
 (s/def ::id (s/or :keyword keyword? :set (s/coll-of keyword? :into #{})))

project.clj

@@ -27,33 +27,33 @@
                          [metosin/reitit-frontend "0.5.15"]
                          [metosin/reitit-sieppari "0.5.15"]
                          [metosin/reitit-pedestal "0.5.15"]
-                         [metosin/ring-swagger-ui "3.46.0"]
+                         [metosin/ring-swagger-ui "4.3.0"]
                          [metosin/spec-tools "0.10.5"]
                          [metosin/schema-tools "0.12.3"]
                          [metosin/muuntaja "0.6.8"]
-                         [metosin/jsonista "0.3.3"]
+                         [metosin/jsonista "0.3.5"]
                          [metosin/sieppari "0.0.0-alpha13"]
-                         [metosin/malli "0.5.1"]
+                         [metosin/malli "0.8.1"]
 
                          ;; https://clojureverse.org/t/depending-on-the-right-versions-of-jackson-libraries/5111
-                         [com.fasterxml.jackson.core/jackson-core "2.12.4"]
+                         [com.fasterxml.jackson.core/jackson-core "2.13.1"]
-                         [com.fasterxml.jackson.core/jackson-databind "2.12.4"]
+                         [com.fasterxml.jackson.core/jackson-databind "2.13.1"]
 
                          [meta-merge "1.0.0"]
-                         [fipp "0.6.24" :exclusions [org.clojure/core.rrb-vector]]
+                         [fipp "0.6.25" :exclusions [org.clojure/core.rrb-vector]]
-                         [expound "0.8.9"]
+                         [expound "0.9.0"]
                          [lambdaisland/deep-diff "0.0-47"]
                          [com.bhauman/spell-spec "0.1.2"]
-                         [ring/ring-core "1.9.4"]
+                         [ring/ring-core "1.9.5"]
 
-                         [io.pedestal/pedestal.service "0.5.9"]]
+                         [io.pedestal/pedestal.service "0.5.10"]]
 
-  :plugins [[jonase/eastwood "0.9.6"]
+  :plugins [[jonase/eastwood "1.2.2"]
             ;[lein-virgil "0.1.7"]
             [lein-doo "0.1.11"]
             [lein-cljsbuild "1.1.8"]
             [lein-cloverage "1.2.2"]
-            [lein-codox "0.10.7"]
+            [lein-codox "0.10.8"]
             [metosin/bat-test "0.4.4"]]
 
   :profiles {:dev {:jvm-opts ^:replace ["-server"]
@@ -85,31 +85,31 @@
                                   [metosin/spec-tools "0.10.5"]
                                   [metosin/muuntaja "0.6.8"]
                                   [metosin/sieppari "0.0.0-alpha13"]
-                                  [metosin/jsonista "0.3.3"]
+                                  [metosin/jsonista "0.3.5"]
-                                  [metosin/malli "0.5.1"]
+                                  [metosin/malli "0.8.1"]
                                   [lambdaisland/deep-diff "0.0-47"]
                                   [meta-merge "1.0.0"]
                                   [com.bhauman/spell-spec "0.1.2"]
-                                  [expound "0.8.9"]
+                                  [expound "0.9.0"]
-                                  [fipp "0.6.24"]
+                                  [fipp "0.6.25"]
 
                                   [orchestra "2021.01.01-1"]
 
-                                  [ring "1.9.4"]
+                                  [ring "1.9.5"]
                                   [ikitommi/immutant-web "3.0.0-alpha1"]
-                                  [metosin/ring-http-response "0.9.2"]
+                                  [metosin/ring-http-response "0.9.3"]
-                                  [metosin/ring-swagger-ui "3.46.0"]
+                                  [metosin/ring-swagger-ui "4.3.0"]
 
                                   [criterium "0.4.6"]
-                                  [org.clojure/test.check "1.1.0"]
+                                  [org.clojure/test.check "1.1.1"]
-                                  [org.clojure/tools.namespace "1.1.0"]
+                                  [org.clojure/tools.namespace "1.2.0"]
-                                  [com.gfredericks/test.chuck "0.2.11"]
+                                  [com.gfredericks/test.chuck "0.2.13"]
 
-                                  [io.pedestal/pedestal.service "0.5.9"]
+                                  [io.pedestal/pedestal.service "0.5.10"]
 
-                                  [org.clojure/core.async "1.3.618"]
+                                  [org.clojure/core.async "1.5.648"]
-                                  [manifold "0.1.8"]
+                                  [manifold "0.2.3"]
-                                  [funcool/promesa "6.0.2"]
+                                  [funcool/promesa "6.1.434"]
 
                                   [com.clojure-goes-fast/clj-async-profiler "0.5.1"]
                                   [ring-cors "0.1.13"]
@@ -123,12 +123,12 @@
                     :dependencies [[compojure "1.6.2"]
                                    [ring/ring-defaults "0.3.3"]
                                    [ikitommi/immutant-web "3.0.0-alpha1"]
-                                   [io.pedestal/pedestal.service "0.5.9"]
+                                   [io.pedestal/pedestal.service "0.5.10"]
-                                   [io.pedestal/pedestal.jetty "0.5.9"]
+                                   [io.pedestal/pedestal.jetty "0.5.10"]
                                    [calfpath "0.8.1"]
-                                   [org.clojure/core.async "1.3.618"]
+                                   [org.clojure/core.async "1.5.648"]
-                                   [manifold "0.1.8"]
+                                   [manifold "0.2.3"]
-                                   [funcool/promesa "6.0.2"]
+                                   [funcool/promesa "6.1.434"]
                                    [metosin/sieppari]
                                    [yada "1.2.16"]
                                    [aleph "0.4.6"]

test/clj/cljdoc/reaper.clj

@@ -1,5 +1,6 @@
 (ns cljdoc.reaper
-  (:require [clojure.java.io :as io]
+  (:require
+   [clojure.java.io :as io]
    [clojure.pprint :as pprint]
    [clojure.string :as str]))
 
@@ -14,8 +15,7 @@
                    (fn [acc data]
                      (if (vector? (first data))
                        (update-in acc [(dec (count acc)) 2] (fnil into []) data)
-                        (conj acc data))
+                       (conj acc data))) [])
-                      ) [])
                   ;; third sweep to flatten chids...
                   (mapv (fn [[n o c]] (if c (into [n o] c) [n o]))))
         data {:cljdoc/include-namespaces-from-dependencies ['metosin/reitit

test/clj/reitit/http/interceptors/exception_test.clj

@@ -1,13 +1,15 @@
 (ns reitit.http.interceptors.exception-test
-  (:require [clojure.test :refer [deftest testing is]]
+  (:require
-            [reitit.ring :as ring]
+   [clojure.test :refer [deftest is testing]]
+   [muuntaja.core :as m]
+   [reitit.coercion.spec]
    [reitit.http :as http]
+   [reitit.http.coercion]
    [reitit.http.interceptors.exception :as exception]
    [reitit.interceptor.sieppari :as sieppari]
-            [reitit.coercion.spec]
+   [reitit.ring :as ring])
-            [reitit.http.coercion]
+  (:import
-            [muuntaja.core :as m])
+   (java.sql SQLException SQLWarning)))
-  (:import (java.sql SQLException SQLWarning)))
 
 (derive ::kikka ::kukka)
 

test/clj/reitit/http/interceptors/muuntaja_test.clj

@@ -1,10 +1,11 @@
 (ns reitit.http.interceptors.muuntaja-test
-  (:require [clojure.test :refer [deftest testing is]]
+  (:require
+   [clojure.test :refer [deftest is testing]]
+   [muuntaja.core :as m]
    [reitit.http :as http]
    [reitit.http.interceptors.muuntaja :as muuntaja]
-            [reitit.swagger :as swagger]
    [reitit.interceptor.sieppari :as sieppari]
-            [muuntaja.core :as m]))
+   [reitit.swagger :as swagger]))
 
 (deftest muuntaja-test
   (let [data {:kikka "kukka"}

test/clj/reitit/http/interceptors/parameters_test.clj

@@ -1,7 +1,8 @@
 (ns reitit.http.interceptors.parameters-test
-  (:require [clojure.test :refer [deftest testing is]]
+  (:require
-            [reitit.http.interceptors.parameters :as parameters]
+   [clojure.test :refer [deftest is testing]]
    [reitit.http :as http]
+   [reitit.http.interceptors.parameters :as parameters]
    [reitit.interceptor.sieppari :as sieppari]
    [reitit.swagger :as swagger]))
 
@@ -27,7 +28,7 @@
                ["/swagger.json" {:get {:no-doc true
                                        :handler (swagger/create-swagger-handler)}}]]
               {:data {:interceptors [(parameters/parameters-interceptor)]}})
-             　{:executor sieppari/executor})
+             {:executor sieppari/executor})
         spec (fn [path]
                (-> {:request-method :get :uri "/swagger.json"}
                    app

test/clj/reitit/http_coercion_test.clj

@@ -1,16 +1,18 @@
 (ns reitit.http-coercion-test
-  (:require [clojure.test :refer [deftest testing is]]
+  (:require
-            [schema.core :as s]
+   [clojure.test :refer [deftest is testing]]
+   [jsonista.core :as j]
+   [muuntaja.interceptor]
+   [reitit.coercion.malli :as malli]
+   [reitit.coercion.schema :as schema]
+   [reitit.coercion.spec :as spec]
+   [reitit.core :as r]
    [reitit.http :as http]
    [reitit.http.coercion :as rrc]
-            [reitit.coercion.spec :as spec]
-            [reitit.coercion.schema :as schema]
-            [muuntaja.interceptor]
-            [jsonista.core :as j]
    [reitit.interceptor.sieppari :as sieppari]
-            [reitit.coercion.malli :as malli]
+   [schema.core :as s])
-            [reitit.core :as r])
+  (:import
-  (:import (clojure.lang ExceptionInfo)
+   (clojure.lang ExceptionInfo)
    (java.io ByteArrayInputStream)))
 
 (defn mounted-interceptor [app path method]

test/clj/reitit/http_test.clj

@@ -1,14 +1,16 @@
 (ns reitit.http-test
   "just Clojure before Sieppari is ported into cljs"
-  (:require [clojure.test :refer [deftest testing is]]
+  (:require
+   [clojure.core.async :as a]
    [clojure.set :as set]
+   [clojure.test :refer [deftest is testing]]
+   [reitit.core :as r]
+   [reitit.http :as http]
    [reitit.interceptor :as interceptor]
    [reitit.interceptor.sieppari :as sieppari]
-            [reitit.http :as http]
+   [reitit.ring :as ring])
-            [reitit.ring :as ring]
+  (:import
-            [reitit.core :as r]
+   (clojure.lang ExceptionInfo)))
-            [clojure.core.async :as a])
-  (:import (clojure.lang ExceptionInfo)))
 
 (defn interceptor [name]
   {:enter (fn [ctx] (update-in ctx [:request ::i] (fnil conj []) name))})

test/clj/reitit/pedestal_test.clj

@@ -1,10 +1,11 @@
 (ns reitit.pedestal-test
-  (:require [clojure.test :refer [deftest testing is]]
+  (:require
-            [io.pedestal.test]
+   [clojure.test :refer [deftest is testing]]
    [io.pedestal.http]
+   [io.pedestal.test]
    [reitit.http :as http]
-            [reitit.pedestal :as pedestal]
+   [reitit.http.interceptors.exception :as exception]
-            [reitit.http.interceptors.exception :as exception]))
+   [reitit.pedestal :as pedestal]))
 
 (deftest arities-test
   (is (= #{0} (#'pedestal/arities (fn []))))

test/clj/reitit/ring/middleware/exception_test.clj

@@ -1,14 +1,16 @@
 (ns reitit.ring.middleware.exception-test
-  (:require [clojure.test :refer [deftest testing is]]
+  (:require
-            [reitit.ring :as ring]
-            [reitit.ring.middleware.exception :as exception]
-            [reitit.coercion :as coercion]
    [clojure.spec.alpha :as s]
-            [reitit.coercion.spec]
+   [clojure.test :refer [deftest is testing]]
-            [reitit.ring.coercion]
    [muuntaja.core :as m]
+   [reitit.coercion :as coercion]
+   [reitit.coercion.spec]
+   [reitit.ring :as ring]
+   [reitit.ring.coercion]
+   [reitit.ring.middleware.exception :as exception]
    [ring.util.http-response :as http-response])
-  (:import (java.sql SQLException SQLWarning)))
+  (:import
+   (java.sql SQLException SQLWarning)))
 
 (derive ::kikka ::kukka)
 
@@ -66,7 +68,6 @@
                                                                  :response response}))))]
         (is (= response (app {:request-method :post, :uri "/http-response"})))))
 
-
     (testing ":muuntaja/decode"
       (let [app (create (fn [_] (m/decode m/instance "application/json" "{:so \"invalid\"}")))]
         (is (= {:body "Malformed \"application/json\" request."

test/clj/reitit/ring/middleware/muuntaja_test.clj

@@ -1,9 +1,10 @@
 (ns reitit.ring.middleware.muuntaja-test
-  (:require [clojure.test :refer [deftest testing is]]
+  (:require
+   [clojure.test :refer [deftest is testing]]
+   [muuntaja.core :as m]
    [reitit.ring :as ring]
    [reitit.ring.middleware.muuntaja :as muuntaja]
-            [reitit.swagger :as swagger]
+   [reitit.swagger :as swagger]))
-            [muuntaja.core :as m]))
 
 (deftest muuntaja-test
   (let [data {:kikka "kukka"}

test/clj/reitit/ring/middleware/parameters_test.clj

@@ -1,7 +1,8 @@
 (ns reitit.ring.middleware.parameters-test
-  (:require [clojure.test :refer [deftest testing is]]
+  (:require
-            [reitit.ring.middleware.parameters :as parameters]
+   [clojure.test :refer [deftest is testing]]
    [reitit.ring :as ring]
+   [reitit.ring.middleware.parameters :as parameters]
    [reitit.swagger :as swagger]))
 
 (deftest parameters-test

test/cljc/reitit/coercion_test.cljc

@@ -1,14 +1,16 @@
 (ns reitit.coercion-test
-  (:require [clojure.test :refer [deftest testing is]]
+  (:require
-            [schema.core :as s]
+   [clojure.test :refer [deftest is testing]]
-            [spec-tools.data-spec :as ds]
-            [reitit.core :as r]
    [reitit.coercion :as coercion]
-            [reitit.coercion.spec]
    [reitit.coercion.malli]
-            [reitit.coercion.schema])
+   [reitit.coercion.schema]
+   [reitit.coercion.spec]
+   [reitit.core :as r]
+   [schema.core :as s]
+   [spec-tools.data-spec :as ds])
   #?(:clj
-     (:import (clojure.lang ExceptionInfo))))
+     (:import
+      (clojure.lang ExceptionInfo))))
 
 (deftest coercion-test
   (let [r (r/router

test/cljc/reitit/core_test.cljc

@@ -1,10 +1,12 @@
 (ns reitit.core-test
-  (:require [clojure.test :refer [deftest testing is are]]
+  (:require
+   [clojure.test :refer [are deftest is testing]]
    [reitit.core :as r #?@(:cljs [:refer [Router]])]
    [reitit.impl :as impl])
   #?(:clj
-     (:import (reitit.core Router)
+     (:import
-              (clojure.lang ExceptionInfo))))
+      (clojure.lang ExceptionInfo)
+      (reitit.core Router))))
 
 (deftest reitit-test
 

test/cljc/reitit/dependency_test.cljc

@@ -1,7 +1,9 @@
 (ns reitit.dependency-test
-  (:require [clojure.test :refer [deftest testing is are]]
+  (:require
+   [clojure.test :refer [are deftest is testing]]
    [reitit.dependency :as rc])
-  #?(:clj (:import [clojure.lang ExceptionInfo])))
+  #?(:clj (:import
+           [clojure.lang ExceptionInfo])))
 
 (deftest post-order-test
   (let [base-middlewares [{:name ::bar, :provides #{:bar}, :requires #{:foo}, :wrap identity}

test/cljc/reitit/exception_test.cljc

@@ -1,12 +1,14 @@
 (ns reitit.exception-test
-  (:require [clojure.test :refer [deftest testing is are]]
+  (:require
-            [reitit.spec :as rs]
+   [clojure.spec.alpha :as s]
+   [clojure.test :refer [are deftest is testing]]
    [reitit.core :as r]
    [reitit.dev.pretty :as pretty]
-            [clojure.spec.alpha :as s]
+   [reitit.exception :as exception]
-            [reitit.exception :as exception])
+   [reitit.spec :as rs])
   #?(:clj
-     (:import (clojure.lang ExceptionInfo))))
+     (:import
+      (clojure.lang ExceptionInfo))))
 
 (s/def ::role #{:admin :manager})
 (s/def ::roles (s/coll-of ::role :into #{}))

test/cljc/reitit/impl_test.cljc

@@ -1,5 +1,6 @@
 (ns reitit.impl-test
-  (:require [clojure.test :refer [deftest testing is are]]
+  (:require
+   [clojure.test :refer [are deftest is testing]]
    [reitit.impl :as impl]))
 
 (deftest strip-nils-test

test/cljc/reitit/interceptor_test.cljc

@@ -1,9 +1,11 @@
 (ns reitit.interceptor-test
-  (:require [clojure.test :refer [deftest testing is are]]
+  (:require
-            [reitit.interceptor :as interceptor]
+   [clojure.test :refer [are deftest is testing]]
-            [reitit.core :as r])
+   [reitit.core :as r]
+   [reitit.interceptor :as interceptor])
   #?(:clj
-     (:import (clojure.lang ExceptionInfo))))
+     (:import
+      (clojure.lang ExceptionInfo))))
 
 (def ctx (interceptor/context []))
 

test/cljc/reitit/middleware_test.cljc

@@ -1,9 +1,11 @@
 (ns reitit.middleware-test
-  (:require [clojure.test :refer [deftest testing is are]]
+  (:require
-            [reitit.middleware :as middleware]
+   [clojure.test :refer [are deftest is testing]]
-            [reitit.core :as r])
+   [reitit.core :as r]
+   [reitit.middleware :as middleware])
   #?(:clj
-     (:import (clojure.lang ExceptionInfo))))
+     (:import
+      (clojure.lang ExceptionInfo))))
 
 (def request [])
 

test/cljc/reitit/ring_coercion_test.cljc

@@ -1,17 +1,19 @@
 (ns reitit.ring-coercion-test
-  (:require [clojure.test :refer [deftest testing is]]
+  (:require
-            [schema.core :as s]
+   [clojure.test :refer [deftest is testing]]
-            [spec-tools.data-spec :as ds]
-            [reitit.ring :as ring]
-            [reitit.ring.coercion :as rrc]
-            [reitit.coercion.spec :as spec]
-            [reitit.coercion.malli :as malli]
-            [reitit.coercion.schema :as schema]
    #?@(:clj [[muuntaja.middleware]
                       [jsonista.core :as j]])
-            [reitit.core :as r])
+   [reitit.coercion.malli :as malli]
+   [reitit.coercion.schema :as schema]
+   [reitit.coercion.spec :as spec]
+   [reitit.core :as r]
+   [reitit.ring :as ring]
+   [reitit.ring.coercion :as rrc]
+   [schema.core :as s]
+   [spec-tools.data-spec :as ds])
   #?(:clj
-     (:import (clojure.lang ExceptionInfo)
+     (:import
+      (clojure.lang ExceptionInfo)
       (java.io ByteArrayInputStream))))
 
 (defn mounted-middleware [app path method]

test/cljc/reitit/ring_spec_test.cljc

@@ -1,13 +1,15 @@
 (ns reitit.ring-spec-test
-  (:require [clojure.test :refer [deftest testing is]]
+  (:require
-            [reitit.ring :as ring]
-            [reitit.ring.spec :as rrs]
-            [reitit.ring.coercion :as rrc]
-            [reitit.coercion.spec]
    [clojure.spec.alpha :as s]
-            [reitit.core :as r])
+   [clojure.test :refer [deftest is testing]]
+   [reitit.coercion.spec]
+   [reitit.core :as r]
+   [reitit.ring :as ring]
+   [reitit.ring.coercion :as rrc]
+   [reitit.ring.spec :as rrs])
   #?(:clj
-     (:import (clojure.lang ExceptionInfo))))
+     (:import
+      (clojure.lang ExceptionInfo))))
 
 (s/def ::role #{:admin :user})
 (s/def ::roles (s/and (s/coll-of ::role :into #{}) set?))

test/cljc/reitit/ring_test.cljc

@@ -1,12 +1,14 @@
 (ns reitit.ring-test
-  (:require [clojure.test :refer [deftest testing is]]
+  (:require
    [clojure.set :as set]
+   [clojure.test :refer [deftest is testing]]
+   [reitit.core :as r]
    [reitit.middleware :as middleware]
    [reitit.ring :as ring]
-            [reitit.core :as r]
    [reitit.trie :as trie])
   #?(:clj
-     (:import (clojure.lang ExceptionInfo))))
+     (:import
+      (clojure.lang ExceptionInfo))))
 
 (defn mw [handler name]
   (fn
@@ -638,7 +640,6 @@
                      (is (get-in @result [:headers "Last-Modified"]))
                      (is (= "<xml><hello>file</hello></xml>\n" (slurp (:body @result))))))))))))))
 
-
 #?(:clj
    (deftest file-resource-handler-not-found-test
      (let [redirect (fn [uri] {:status 302, :body "", :headers {"Location" uri}})

test/cljc/reitit/spec_test.cljc

@@ -1,11 +1,13 @@
 (ns reitit.spec-test
-  (:require [clojure.test :refer [deftest testing is are use-fixtures]]
+  (:require
    [#?(:clj clojure.spec.test.alpha :cljs cljs.spec.test.alpha) :as stest]
    [clojure.spec.alpha :as s]
+   [clojure.test :refer [are deftest is testing use-fixtures]]
    [reitit.core :as r]
    [reitit.spec :as rs])
   #?(:clj
-     (:import (clojure.lang ExceptionInfo))))
+     (:import
+      (clojure.lang ExceptionInfo))))
 
 (defn instrument-all [f]
   (try

test/cljc/reitit/swagger_test.clj

@@ -1,15 +1,16 @@
 (ns reitit.swagger-test
-  (:require [clojure.test :refer [deftest is testing]]
+  (:require
-            [reitit.ring :as ring]
+   [clojure.test :refer [deftest is testing]]
-            [reitit.swagger :as swagger]
+   [muuntaja.core :as m]
-            [reitit.swagger-ui :as swagger-ui]
-            [reitit.ring.coercion :as rrc]
-            [reitit.coercion.spec :as spec]
    [reitit.coercion.malli :as malli]
    [reitit.coercion.schema :as schema]
-            [muuntaja.core :as m]
+   [reitit.coercion.spec :as spec]
-            [spec-tools.data-spec :as ds]
+   [reitit.ring :as ring]
-            [schema.core :as s]))
+   [reitit.ring.coercion :as rrc]
+   [reitit.swagger :as swagger]
+   [reitit.swagger-ui :as swagger-ui]
+   [schema.core :as s]
+   [spec-tools.data-spec :as ds]))
 
 (def app
   (ring/ring-handler

test/cljc/reitit/trie_test.cljc

@@ -1,5 +1,6 @@
 (ns reitit.trie-test
-  (:require [clojure.test :refer [deftest testing is are]]
+  (:require
+   [clojure.test :refer [are deftest is testing]]
    [reitit.trie :as trie]))
 
 (deftest into-set-test