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

one more time

Browse source
This commit is contained in:
Tommi Reiman 2022-03-10 15:21:15 +02:00
parent f9841363c5
commit b0602d60c9
2 changed files with 56 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,21 +69,6 @@
([match query-params]
(some-> match :path (cond-> (seq query-params) (str "?" (impl/query-string query-params))))))
(defn- matcher [router1 router2]
(if (and router1 router2)
(reify
Router
(match-by-path [_ path]
(or (match-by-path router1 path)
(match-by-path router2 path)))
(match-by-name [_ name]
(or (match-by-name router1 name)
(match-by-name router2 name)))
(match-by-name [_ name path-params]
(or (match-by-name router1 name path-params)
(match-by-name router2 name path-params))))
(or router1 router2)))
;;
;; Different routers
;;
@ -185,7 +170,6 @@
([compiled-routes]
(trie-router compiled-routes {}))
([compiled-routes opts]
(when compiled-routes
(let [compiler (::trie/trie-compiler opts (trie/compiler))
names (impl/find-names compiled-routes opts)
[pl nl] (reduce
@ -199,7 +183,7 @@
[nil {}]
compiled-routes)
matcher (trie/compile pl compiler)
match-by-path (trie/path-matcher matcher compiler)
match-by-path (if matcher (trie/path-matcher matcher compiler))
lookup (impl/fast-map nl)
routes (impl/uncompile-routes compiled-routes)]
^{:type ::router}
@ -211,7 +195,7 @@
(options [_] opts)
(route-names [_] names)
(match-by-path [_ path]
(if-let [match (match-by-path path)]
(if-let [match (and match-by-path (match-by-path path))]
(-> (:data match)
(assoc :path-params (:params match))
(assoc :path path))))
@ -220,7 +204,7 @@
(match nil)))
(match-by-name [_ name path-params]
(if-let [match (impl/fast-get lookup name)]
(match (impl/path-params path-params)))))))))
(match (impl/path-params path-params))))))))
(defn single-static-path-router
"Creates a fast router of 1 static route(s) and optional
@ -264,8 +248,7 @@
wildcard-router (trie-router wild opts)
static-router (->static-router lookup opts)
names (impl/find-names compiled-routes opts)
routes (impl/uncompile-routes compiled-routes)
router (matcher static-router wildcard-router)]
routes (impl/uncompile-routes compiled-routes)]
^{:type ::router}
(reify Router
(router-name [_] :mixed-router)
@ -273,9 +256,15 @@
(compiled-routes [_] compiled-routes)
(options [_] opts)
(route-names [_] names)
(match-by-path [_ path] (match-by-path router path))
(match-by-name [_ name] (match-by-name router name))
(match-by-name [_ name path-params] (match-by-name router name path-params))))))
(match-by-path [_ path]
(or (match-by-path static-router path)
(match-by-path wildcard-router path)))
(match-by-name [_ name]
(or (match-by-name static-router name)
(match-by-name wildcard-router name)))
(match-by-name [_ name path-params]
(or (match-by-name static-router name path-params)
(match-by-name wildcard-router name path-params)))))))
(defn quarantine-router
"Creates two routers: [[mixed-router]] for non-conflicting routes
@ -290,8 +279,7 @@
linear-router (linear-router conflicting opts)
mixed-router (mixed-router non-conflicting opts)
names (impl/find-names compiled-routes opts)
routes (impl/uncompile-routes compiled-routes)
router (matcher mixed-router linear-router)]
routes (impl/uncompile-routes compiled-routes)]
^{:type ::router}
(reify Router
(router-name [_] :quarantine-router)
@ -299,9 +287,15 @@
(compiled-routes [_] compiled-routes)
(options [_] opts)
(route-names [_] names)
(match-by-path [_ path] (match-by-path router path))
(match-by-name [_ name] (match-by-name router name))
(match-by-name [_ name path-params] (match-by-name router name path-params))))))
(match-by-path [_ path]
(or (match-by-path mixed-router path)
(match-by-path linear-router path)))
(match-by-name [_ name]
(or (match-by-name mixed-router name)
(match-by-name linear-router name)))
(match-by-name [_ name path-params]
(or (match-by-name mixed-router name path-params)
(match-by-name linear-router name path-params)))))))
;;
;; Creating Routers

3
modules/reitit-core/src/reitit/trie.cljc
View file

@ -364,8 +364,7 @@
(into (for [[p c] catch-all] (catch-all-matcher compiler (:value p) params (:data c)))))]
(cond
(> (count matchers) 1) (linear-matcher compiler matchers false)
(= (count matchers) 1) (first matchers)
:else (data-matcher compiler {} nil)))))
(= (count matchers) 1) (first matchers)))))
(defn pretty
"Returns a simplified EDN structure of a compiled trie for printing purposes."