Merge pull request #12 from vordgi/get-11

get-11 fix get-params for dynamic paths
vordgi · Feb 18, 2024 · 4320631 · 4320631
2 parents 29feeee + f5d77d2
commit 4320631
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next-impl-getters",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Repo for an example implementation of getters to retrieve page data in react server components",
   "files": [
     "**/*.js",

diff --git a/src/get-params.ts b/src/get-params.ts
@@ -19,8 +19,10 @@ export const getParams = () => {
 
     const isRootPage = cleanUrlPathname === '' && cleanPagePath === '';
     const isNotFoundPage = pagePath.match(/\/_not-found\/?$/);
+    const isValidCatchALl = cleanPagePath.match(/\[\.\.\.[^\]]+\]/) && pathnameParts.length >= pagePathInterceptedParts.length;
+    const isCorrectMatched = isRootPage || isNotFoundPage || pagePathInterceptedParts.length === pathnameParts.length || isValidCatchALl;
 
-    if (!isRootPage && !isNotFoundPage && pagePathInterceptedParts.length !== pathnameParts.length) {
+    if (!isCorrectMatched) {
         const createIssueUrl = new URL('https://github.com/vordgi/next-impl-getters/issues/new')
         createIssueUrl.searchParams.set('title', 'Error parsing segments in get-params');
         createIssueUrl.searchParams.set('body', `urlPathname: \`${urlPathname}\`;\n\npagePath: \`${pagePath}\`;`);