fix(core): req.params cant use capital letter

chizukicn · Nov 29, 2023 · 4a86768 · 4a86768
1 parent 919dc58
commit 4a86768
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/packages/core/src/shared/matcher.ts b/packages/core/src/shared/matcher.ts
@@ -64,9 +64,6 @@ export function createRouteMatcher<T>(options: RouteMatcherOptions = {}): RouteM
     if (!options.strictTrailingSlash) {
       path = path.replace(/\/$/, "") || "/";
     }
-    if (!options.caseSensitive) {
-      path = path.toLowerCase();
-    }
     return path;
   };
 
@@ -89,7 +86,11 @@ export function createRouteMatcher<T>(options: RouteMatcherOptions = {}): RouteM
             type,
             parent: currentNode
           });
-          currentNode.children.set(segment, childNode);
+          if (type === NODE_TYPES.NORMAL && !options.caseSensitive) {
+            currentNode.children.set(segment.toLowerCase(), childNode);
+          } else {
+            currentNode.children.set(segment, childNode);
+          }
           if (type === NODE_TYPES.PLACEHOLDER) {
             const firstChar = segment[0];
             if (firstChar === "*") {
@@ -156,13 +157,14 @@ export function createRouteMatcher<T>(options: RouteMatcherOptions = {}): RouteM
           wildcardNode = currentNode;
           wildcardParam = segments.slice(i).join("/");
         }
-        const nextNode = currentNode.children.get(segments[i]);
+        const seg = segments[i];
+        const nextNode = currentNode.children.get(options.caseSensitive ? seg : seg.toLowerCase());
         if (nextNode) {
           currentNode = nextNode;
         } else {
           currentNode = currentNode.placeholderChildNode;
           if (currentNode) {
-            params[currentNode.paramName!] = segments[i];
+            params[currentNode.paramName!] = seg;
             paramsFound = true;
           } else {
             break;

diff --git a/packages/core/test/matcher.test.ts b/packages/core/test/matcher.test.ts
@@ -5,12 +5,12 @@ test("mock-matcher", async () => {
   const matcher = createRouteMatcher<string>();
 
   matcher.add("/hello/1", "get", "hello-1");
-  matcher.add("/hello/{abc}", "get", "hello-abc");
+  matcher.add("/hello/{userId}", "get", "hello-abc");
   matcher.add("/hello/1", "post", "hello-post");
   matcher.add("/hello/3", "all", "hello-3");
 
   expect(matcher.match("/hello/1", "get")).toEqual(["hello-1", null]);
-  expect(matcher.match("/hello/2", "get")).toEqual(["hello-abc", { abc: "2" }]);
+  expect(matcher.match("/hello/2", "get")).toEqual(["hello-abc", { userId: "2" }]);
   expect(matcher.match("/hello/1", "post")).toEqual(["hello-post", null]);
   expect(matcher.match("/hello/3", "get")).toEqual(["hello-3", null]);
   expect(matcher.match("/hello/3", "post")).toEqual(["hello-3", null]);