implement with simple regex matcher

unjs · Oct 4, 2023 · c3aa794 · c3aa794
1 parent 5fdecab
commit c3aa794
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/router.ts b/src/router.ts
@@ -65,7 +65,12 @@ function lookup(ctx: RadixRouterContext, path: string): MatchedRoute {
       if (node === null) {
         break;
       } else {
-        params[node.paramName] = section;
+        if (node.type === NODE_TYPES.MIXED && node.paramMatcher) {
+          const matches = section.match(node.paramMatcher);
+          Object.assign(params, matches.groups);
+        } else {
+          params[node.paramName] = section;
+        }
         paramsFound = true;
       }
     } else {
@@ -125,11 +130,11 @@ function insert(ctx: RadixRouterContext, path: string, data: any) {
             childNode.paramName = params[0].slice(1);
           } else {
             childNode.type = NODE_TYPES.MIXED;
-            childNode.mixedParams = params.map((p) =>
-              p[0] === ":"
-                ? { type: "dynamic", name: p.slice(1) }
-                : { type: "static", name: p }
+            const sectionRegexString = section.replace(
+              /:(\w+)/g,
+              (_, id) => `(?<${id}>\\w+)`,
             );
+            childNode.paramMatcher = new RegExp(`^${sectionRegexString}$`);
           }
         }
         node.placeholderChildNode = childNode;

diff --git a/src/types.ts b/src/types.ts
@@ -23,7 +23,7 @@ export interface RadixNode<T extends RadixNodeData = RadixNodeData> {
   children: Map<string, RadixNode<T>>;
   data: RadixNodeData | null;
   paramName: string | null;
-  mixedParams?: { type: "static" | "dynamic"; name: string }[];
+  paramMatcher?: string | RegExp;
   wildcardChildNode: RadixNode<T> | null;
   placeholderChildNode: RadixNode<T> | null;
 }

diff --git a/tests/router.test.ts b/tests/router.test.ts
@@ -94,9 +94,9 @@ describe("Router lookup", function () {
   });
 
   describe("mixed params in same segemnt", function () {
-    const mixedPath = "/files/:category/:id,name:name.txt";
+    const mixedPath = "/files/:category/:id,name=:name.txt";
     testRouter([mixedPath], {
-      "/files/test/id:123,name=foobar.txt": {
+      "/files/test/123,name=foobar.txt": {
         path: mixedPath,
         params: { category: "test", id: "123", name: "foobar" },
       },