Merge pull request #61 from absurdprofit/development

Refactor resolveBaseURLFromPattern match groups filtering
absurdprofit · Aug 27, 2024 · 6568539 · 6568539
2 parents 1ed9a44 + e0d344e
commit 6568539
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/core/src/common/utils.ts b/packages/core/src/common/utils.ts
@@ -7,7 +7,11 @@ export function resolveBaseURLFromPattern(pattern: string, pathname: string) {
     const baseURLMatch = new URLPattern(pattern, origin).exec(pathname, origin);
     if (!baseURLMatch) return null;
 
-    const nestedPathnameGroup = baseURLMatch.pathname.groups[0] ?? '';
+    const groups = Object.keys(baseURLMatch.pathname.groups)
+        .filter((key) => !isNaN(Number(key)))
+        .map((key) => baseURLMatch.pathname.groups[key])
+        .filter((group) => group !== undefined);
+    const nestedPathnameGroup = groups.at(-1) ?? '';
     // derive concrete baseURL
     return new URL(pathname.replace(nestedPathnameGroup, ''), window.location.origin);
 }