From e60d176a2d0e051b0b75e93a67a64216f9622ed0 Mon Sep 17 00:00:00 2001 From: Tommi Reiman Date: Sun, 10 Feb 2019 12:42:32 +0200 Subject: [PATCH] Validate after route conflicts --- modules/reitit-core/src/reitit/core.cljc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/reitit-core/src/reitit/core.cljc b/modules/reitit-core/src/reitit/core.cljc index fbab995f..7d89aba1 100644 --- a/modules/reitit-core/src/reitit/core.cljc +++ b/modules/reitit-core/src/reitit/core.cljc @@ -343,11 +343,11 @@ ;; (defn ^:no-doc default-router-options [] - {:lookup (fn [[_ {:keys [name]}] _] (if name #{name})) + {:lookup (fn lookup [[_ {:keys [name]}] _] (if name #{name})) :expand expand - :coerce (fn [route _] route) - :compile (fn [[_ {:keys [handler]}] _] handler) - :conflicts (partial throw-on-conflicts! path-conflicts-str)}) + :coerce (fn coerce [route _] route) + :compile (fn compile [[_ {:keys [handler]}] _] handler) + :conflicts (fn throw! [conflicts] (throw-on-conflicts! path-conflicts-str conflicts))}) (defn router "Create a [[Router]] from raw route data and optionally an options map. @@ -384,13 +384,13 @@ all-wilds? trie-router :else mixed-router)] - (when-let [validate (:validate opts)] - (validate compiled-routes opts)) - (when-let [conflicts (:conflicts opts)] (when path-conflicting (conflicts path-conflicting))) (when name-conflicting (throw-on-conflicts! name-conflicts-str name-conflicting)) + (when-let [validate (:validate opts)] + (validate compiled-routes opts)) + (router compiled-routes opts))))