From 037ffebe2681a1a1147431f5f2f2e158a65c964d Mon Sep 17 00:00:00 2001
From: Corentin Leruth <corentin.leruth@gmail.com>
Date: Sun, 16 Jun 2024 10:09:28 +0200
Subject: [PATCH] simplify code

---
 src/routes.ml | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/routes.ml b/src/routes.ml
index 490a2ed..02704b2 100644
--- a/src/routes.ml
+++ b/src/routes.ml
@@ -197,25 +197,22 @@ type 'a match_result =
 
 let parse_route path handler params =
   let rec match_target
-    : type a b. (a, b) path -> a -> string list -> string list -> b list
+    : type a b. (a, b) path -> a -> string list -> string list -> b match_result
     =
     fun t f seen s ->
     match t with
-    | End ->
-      (match s with
-       | [] | [ "" ] -> [ f ]
-       | _ -> [ f ])
-    | Wildcard -> [ f { Parts.prefix = List.rev seen; matched = s } ]
+    | End -> FullMatch [ f ]
+    | Wildcard -> FullMatch [ f { Parts.prefix = List.rev seen; matched = s } ]
     | Match (x, fmt) ->
       (match s with
        | x' :: xs when x = x' -> match_target fmt f (x' :: seen) xs
-       | _ -> [])
+       | _ -> NoMatch)
     | Conv ({ from_; _ }, fmt) ->
       (match s with
-       | [] -> []
+       | [] -> NoMatch
        | x :: xs ->
          (match from_ x with
-          | None -> []
+          | None -> NoMatch
           | Some x' -> match_target fmt (f x') (x :: seen) xs))
   in
   match_target path handler [] params
@@ -243,11 +240,11 @@ let map f (Route (r, h, g)) = Route (r, h, fun x -> f (g x))
 
 let rec match_routes target routes acc =
   match routes with
-  | [] -> acc
+  | [] -> FullMatch acc
   | Route (r, h, f) :: rs ->
     (match parse_route r h target with
-     | [] -> match_routes target rs acc
-     | r ->
+     | NoMatch -> match_routes target rs acc
+     | FullMatch r ->
        let r = List.map f r in
        match_routes target rs (r @ acc))
 ;;
@@ -255,10 +252,7 @@ let rec match_routes target routes acc =
 let match' router ~target =
   let target = Util.split_path target in
   let routes = PatternTrie.feed_params router target in
-  let res = match_routes target routes [] in
-  match res with
-  | [] -> NoMatch
-  | l -> FullMatch l
+  match_routes target routes []
 ;;
 
 let ( /~ ) m path = m path