From 38606b9224d61c8fe3a3736df126e1295db00acd Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Wed, 26 Jun 2024 11:13:06 +0200
Subject: [PATCH] refactor: avoid double decoding

---
 .../router/src/new-matcher/matcher-pattern.ts     |  2 +-
 packages/router/src/new-matcher/matcher.ts        | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/router/src/new-matcher/matcher-pattern.ts b/packages/router/src/new-matcher/matcher-pattern.ts
index bb993658..f368a04f 100644
--- a/packages/router/src/new-matcher/matcher-pattern.ts
+++ b/packages/router/src/new-matcher/matcher-pattern.ts
@@ -44,7 +44,7 @@ export interface MatcherPattern {
     path: string
     query: MatcherQueryParams
     hash: string
-  }): [path: MatcherPathParams, query: MatcherQueryParams, hash: string]
+  }): [path: MatcherPathParams, query: MatcherQueryParams, hash: string] | null
 
   /**
    * Takes encoded params object to form the `path`,
diff --git a/packages/router/src/new-matcher/matcher.ts b/packages/router/src/new-matcher/matcher.ts
index 5d204f7b..ec3b8d6c 100644
--- a/packages/router/src/new-matcher/matcher.ts
+++ b/packages/router/src/new-matcher/matcher.ts
@@ -220,8 +220,9 @@ export function createCompiledMatcher(): NEW_Matcher_Resolve {
         if (params) {
           parsedParams = matcher.formatParams(
             transformObject(String, decode, params[0]),
-            transformObject(decode, decode, params[1]),
-            decode(params[2])
+            // already decoded
+            params[1],
+            params[2]
           )
           if (parsedParams) break
         }
@@ -232,8 +233,9 @@ export function createCompiledMatcher(): NEW_Matcher_Resolve {
         return {
           ...url,
           ...NO_MATCH_LOCATION,
-          query: transformObject(decode, decode, url.query),
-          hash: decode(url.hash),
+          // already decoded
+          query: url.query,
+          hash: url.hash,
         }
       }
 
@@ -242,8 +244,9 @@ export function createCompiledMatcher(): NEW_Matcher_Resolve {
         ...url,
         name: matcher.name,
         params: parsedParams,
-        query: transformObject(decode, decode, url.query),
-        hash: decode(url.hash),
+        // already decoded
+        query: url.query,
+        hash: url.hash,
         matched: [],
       }
     } else {
-- 
2.47.2