diff --git a/examples/ring-malli-swagger/src/example/server.clj b/examples/ring-malli-swagger/src/example/server.clj index 9969b618..b4f63582 100644 --- a/examples/ring-malli-swagger/src/example/server.clj +++ b/examples/ring-malli-swagger/src/example/server.clj @@ -70,7 +70,7 @@ ;;:reitit.spec/wrap spell/closed ;; strict top-level validation :exception pretty/exception :data {:coercion (reitit.coercion.malli/create - {:error-keys #{:type :coercion :in :humanized #_:schema #_:value #_:transformed #_:errors}}) + {:error-keys #{#_:type :coercion :in :humanized :schema :value #_:transformed #_:errors}}) :muuntaja m/instance :middleware [;; swagger feature swagger/swagger-feature diff --git a/modules/reitit-malli/src/reitit/coercion/malli.cljc b/modules/reitit-malli/src/reitit/coercion/malli.cljc index 05073955..89f2618f 100644 --- a/modules/reitit-malli/src/reitit/coercion/malli.cljc +++ b/modules/reitit-malli/src/reitit/coercion/malli.cljc @@ -26,6 +26,7 @@ (def default-transformer mt/strip-extra-keys-transformer) +;; TODO: are these needed? (defmulti coerce-response? identity :default ::default) (defmethod coerce-response? ::default [_] true) @@ -37,7 +38,7 @@ (m/explainer schema opts)))) {:keys [formats default]} (transformers type) default-coercer (->coercer default) - format-coercers (some->> (for [[f t] formats] [f (->coercer t)]) (keep second) (seq) (into {})) + format-coercers (some->> (for [[f t] formats] [f (->coercer t)]) (filter second) (seq) (into {})) get-coercer (cond format-coercers (fn [format] (or (get format-coercers format) default-coercer)) default-coercer (constantly default-coercer))] (if get-coercer @@ -152,7 +153,7 @@ (show? :schema) (update :schema edn/write-string opts) (show? :errors) (-> (me/with-error-messages opts) (update :errors (partial map #(update % :schema edn/write-string opts)))) - true (select-keys error-keys))) + (seq error-keys) (select-keys error-keys))) (-request-coercer [_ type schema] (-coercer schema type transformers :decode options)) (-response-coercer [_ schema] diff --git a/project.clj b/project.clj index 89a3dbcb..835f9907 100644 --- a/project.clj +++ b/project.clj @@ -33,7 +33,7 @@ [metosin/muuntaja "0.6.5"] [metosin/jsonista "0.2.5"] [metosin/sieppari "0.0.0-alpha7"] - [metosin/malli "0.0.1-SNAPSHOT"] + [metosin/malli "0.0.1-20191228.073043-6"] [meta-merge "1.0.0"] [fipp "0.6.21" :exclusions [org.clojure/core.rrb-vector]]