luciano/reitit
1
0
Fork 0
mirror of https://github.com/metosin/reitit.git synced 2025-12-18 17:01:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Validate after route conflicts

Browse source
This commit is contained in:
Tommi Reiman 2019-02-10 12:42:32 +02:00
parent 277faf48f5
commit e60d176a2d
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/reitit-core/src/reitit/core.cljc
View file

@ -343,11 +343,11 @@
;; ;;
(defn ^:no-doc default-router-options [] (defn ^:no-doc default-router-options []
{:lookup (fn [[_ {:keys [name]}] _] (if name #{name})) {:lookup (fn lookup [[_ {:keys [name]}] _] (if name #{name}))
:expand expand :expand expand
:coerce (fn [route _] route) :coerce (fn coerce [route _] route)
:compile (fn [[_ {:keys [handler]}] _] handler) :compile (fn compile [[_ {:keys [handler]}] _] handler)
:conflicts (partial throw-on-conflicts! path-conflicts-str)}) :conflicts (fn throw! [conflicts] (throw-on-conflicts! path-conflicts-str conflicts))})
(defn router (defn router
"Create a [[Router]] from raw route data and optionally an options map. "Create a [[Router]] from raw route data and optionally an options map.
@ -384,13 +384,13 @@
all-wilds? trie-router all-wilds? trie-router
:else mixed-router)] :else mixed-router)]
(when-let [validate (:validate opts)]
(validate compiled-routes opts))
(when-let [conflicts (:conflicts opts)] (when-let [conflicts (:conflicts opts)]
(when path-conflicting (conflicts path-conflicting))) (when path-conflicting (conflicts path-conflicting)))
(when name-conflicting (when name-conflicting
(throw-on-conflicts! name-conflicts-str name-conflicting)) (throw-on-conflicts! name-conflicts-str name-conflicting))
(when-let [validate (:validate opts)]
(validate compiled-routes opts))
(router compiled-routes opts)))) (router compiled-routes opts))))