From 11fb5f2458ec2426724525ae8929e4a866b95de0 Mon Sep 17 00:00:00 2001 From: Vordgi Date: Sun, 18 Feb 2024 10:06:48 +0400 Subject: [PATCH 1/3] get-11 fix get-params for dynamic paths --- src/get-params.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/get-params.ts b/src/get-params.ts index bee9eec..d30e51a 100644 --- a/src/get-params.ts +++ b/src/get-params.ts @@ -20,7 +20,7 @@ export const getParams = () => { const isRootPage = cleanUrlPathname === '' && cleanPagePath === ''; const isNotFoundPage = pagePath.match(/\/_not-found\/?$/); - if (!isRootPage && !isNotFoundPage && pagePathInterceptedParts.length !== pathnameParts.length) { + if (!isRootPage && !isNotFoundPage && pagePathInterceptedParts.length !== pathnameParts.length && !cleanPagePath.match(/\[\.\.\.[^\]]+\]/)) { 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}\`;`); From bedbf972c8f54bfe428bd9720f1730ce22832088 Mon Sep 17 00:00:00 2001 From: Vordgi Date: Sun, 18 Feb 2024 10:08:30 +0400 Subject: [PATCH 2/3] get-11 update package version to v0.3.3 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 36df3ba..2cbbf15 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "next-impl-getters", - "version": "0.3.2", + "version": "0.3.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "next-impl-getters", - "version": "0.3.2", + "version": "0.3.3", "license": "MIT", "devDependencies": { "@types/node": "20.0.0", diff --git a/package.json b/package.json index be95e2c..058eb66 100644 --- 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", From f5d77d2435c664f43902bb23a6ec6ebfe996c2fb Mon Sep 17 00:00:00 2001 From: Vordgi Date: Sun, 18 Feb 2024 10:16:40 +0400 Subject: [PATCH 3/3] get-11 improve get-params result validity check --- src/get-params.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/get-params.ts b/src/get-params.ts index d30e51a..a39788b 100644 --- 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 && !cleanPagePath.match(/\[\.\.\.[^\]]+\]/)) { + 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}\`;`);