@nimpl/getters 1.3.2 → 1.3.3-canary.0

package/get-params.js

@@ -12,18 +12,13 @@ const getParams = () => {
     const { urlPathname, pagePath = "/" } = store;
     const cleanUrlPathname = (0, utils_1.normalizePathname)(urlPathname);
     const cleanPagePath = (0, utils_1.normalizePagePath)(pagePath);
-    const pagePathParts = cleanPagePath
-        .split("/")
-        .slice(1)
-        .filter((part) => !part.match(/^(\([^)]+\)|\@.+)$/));
+    const pagePathParts = cleanPagePath.split("/");
     const pagePathInterceptedParts = (0, utils_1.normalizeInterceptingRoutes)(pagePathParts);
-    const pathnameParts = cleanUrlPathname.split("/").slice(1);
-    const isRootPage = cleanUrlPathname === "" && cleanPagePath === "";
+    const pathnameParts = cleanUrlPathname.split("/");
     const isNotFoundPage = pagePath.match(/\/_not-found\/?$/);
     const isValidCatchALl = cleanPagePath.match(/\/\[\.\.\.[^\]]+\]/) && pathnameParts.length >= pagePathInterceptedParts.length;
     const isValidOptionalCatchALl = cleanPagePath.match(/\/\[\[\.\.\.[^\]]+\]\]/) && pathnameParts.length >= pagePathInterceptedParts.length - 1;
-    const isCorrectMatched = isRootPage ||
-        isNotFoundPage ||
+    const isCorrectMatched = isNotFoundPage ||
         pagePathInterceptedParts.length === pathnameParts.length ||
         isValidCatchALl ||
         isValidOptionalCatchALl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nimpl/getters",
-  "version": "1.3.2",
+  "version": "1.3.3-canary.0",
   "description": "Implementation of server getters and server contexts in React Server Components without switching to SSR",
   "files": [
     "**/*.js",

package/utils.js

@@ -11,7 +11,8 @@ exports.normalizePathname = normalizePathname;
 const normalizePagePath = (pagePath) => {
     const cleanPagePath = pagePath && new URL(pagePath, "http://n").pathname;
     const pagePathWithoutFileType = cleanPagePath?.replace(/(\/page|\/_not-found)$/, "");
-    return pagePathWithoutFileType || "/";
+    const pagePathWithoutGroups = pagePathWithoutFileType.replace(/\/(\([^)]+\)|\@.+)/g, "");
+    return pagePathWithoutGroups || "/";
 };
 exports.normalizePagePath = normalizePagePath;
 const parseSegments = (pagePathParts, pathnameParts) => {