From 1ecfd1ae0272e5c76954931968018a054238d01d Mon Sep 17 00:00:00 2001
From: Tommi Reiman <tommi@iki.fi>
Date: Tue, 5 Apr 2022 17:55:09 +0300
Subject: [PATCH] CHANGELOG, pass match too

---
 CHANGELOG.md                                     | 4 ++++
 modules/reitit-frontend/src/reitit/frontend.cljs | 2 +-
 test/cljs/reitit/frontend/core_test.cljs         | 8 ++++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc1d1aef..e06f39e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@ We use [Break Versioning][breakver]. The version numbers follow a `<major>.<mino
 
 [breakver]: https://github.com/ptaoussanis/encore/blob/master/BREAK-VERSIONING.md
 
+## UNRELEASED
+
+* FIX [#334](https://github.com/metosin/reitit/pull/549) - Frontend: there is no way to catch the exception if coercion fails (via [#549](https://github.com/metosin/reitit/pull/549))
+
 ## 0.5.17 (2022-03-10)
 
 * FIX match-by-path is broken if there are no non-conflicting wildcard routes [#538](https://github.com/metosin/reitit/issues/538)
diff --git a/modules/reitit-frontend/src/reitit/frontend.cljs b/modules/reitit-frontend/src/reitit/frontend.cljs
index 20d15b31..d50e9614 100644
--- a/modules/reitit-frontend/src/reitit/frontend.cljs
+++ b/modules/reitit-frontend/src/reitit/frontend.cljs
@@ -30,7 +30,7 @@
                    (fn [match]
                      (try (coercion/coerce! match)
                           (catch js/Error e
-                            (on-coercion-error e)
+                            (on-coercion-error match e)
                             (throw e))))
                    coercion/coerce!)]
      (if-let [match (r/match-by-path router (.getPath uri))]
diff --git a/test/cljs/reitit/frontend/core_test.cljs b/test/cljs/reitit/frontend/core_test.cljs
index 6acb5c1c..e5c1d13a 100644
--- a/test/cljs/reitit/frontend/core_test.cljs
+++ b/test/cljs/reitit/frontend/core_test.cljs
@@ -85,8 +85,12 @@
           (is (thrown? js/Error (m (rf/match-by-path router "/a")))))
 
         (testing "thows and calles on-coercion-error"
-          (let [exception (atom nil)]
-            (is (thrown? js/Error (m (rf/match-by-path router "/a" {:on-coercion-error (fn [e] (reset! exception e))}))))
+          (let [exception (atom nil)
+                match (atom nil)]
+            (is (thrown? js/Error (m (rf/match-by-path router "/a" {:on-coercion-error (fn [m e]
+                                                                                         (reset! match m)
+                                                                                         (reset! exception e))}))))
+            (is (= {:id "a"} (-> @match :path-params)))
             (is (= {:id "a"} (-> @exception (ex-data) :value))))))
 
       (testing "query param is read"