fix: catch-all directory base name (#19)

jozefhruska · Dec 4, 2022 · 9949ffe · 9949ffe
1 parent 2a29cc8
commit 9949ffe
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 1 deletion.
diff --git a/src/utilities/search.ts b/src/utilities/search.ts
@@ -67,7 +67,7 @@ export const buildRouteTree = (
     );
   }
 
-  const baseName = parse(path).name;
+  const baseName = parse(path).base;
 
   // Check if the current folder is an auxiliary (helper)
   // Used to check for excluded files/folders (i.e. _document.*)

diff --git a/tests/1/in/app/dashboard/uploads/[...rest]/page.js b/tests/1/in/app/dashboard/uploads/[...rest]/page.js
diff --git a/tests/1/out/routeBuilder.expected.ts b/tests/1/out/routeBuilder.expected.ts
@@ -16,6 +16,11 @@ export type RouteBuilder = {
         getPath: () => string;
       },
     },
+    uploads: {
+      rest: {
+        getPath: (rest: string[]) => string;
+      },
+    },
   },
 };
 
@@ -37,5 +42,10 @@ export const routeBuilder: RouteBuilder = {
         getPath: () => `/dashboard/settings/profile`,
       },
     },
+    uploads: {
+      rest: {
+        getPath: (rest) => `/dashboard/uploads/${rest.join('/')}`,
+      },
+    },
   },
 };
diff --git a/tests/2/in/pages/test/[...rest]/index.js b/tests/2/in/pages/test/[...rest]/index.js
diff --git a/tests/2/out/routeBuilder.expected.ts b/tests/2/out/routeBuilder.expected.ts
@@ -15,6 +15,11 @@ export type RouteBuilder = {
       getPath: (slug: string) => string;
     },
   },
+  test: {
+    rest: {
+      getPath: (rest: string[]) => string;
+    },
+  },
 };
 
 export const routeBuilder: RouteBuilder = {
@@ -34,4 +39,9 @@ export const routeBuilder: RouteBuilder = {
       getPath: (slug) => `/services/${slug}`,
     },
   },
+  test: {
+    rest: {
+      getPath: (rest) => `/test/${rest.join('/')}`,
+    },
+  },
 };
diff --git a/tests/3/in/app/dashboard/uploads/[...rest]/page.js b/tests/3/in/app/dashboard/uploads/[...rest]/page.js
diff --git a/tests/3/in/pages/test/[...rest]/index.js b/tests/3/in/pages/test/[...rest]/index.js
diff --git a/tests/3/out/routeBuilder.expected.ts b/tests/3/out/routeBuilder.expected.ts
@@ -16,6 +16,11 @@ export type RouteBuilder = {
         getPath: () => string;
       },
     },
+    uploads: {
+      rest: {
+        getPath: (rest: string[]) => string;
+      },
+    },
   },
   getPath: () => string;
   contactUs: {
@@ -33,6 +38,11 @@ export type RouteBuilder = {
       getPath: (slug: string) => string;
     },
   },
+  test: {
+    rest: {
+      getPath: (rest: string[]) => string;
+    },
+  },
 };
 
 export const routeBuilder: RouteBuilder = {
@@ -53,6 +63,11 @@ export const routeBuilder: RouteBuilder = {
         getPath: () => `/dashboard/settings/profile`,
       },
     },
+    uploads: {
+      rest: {
+        getPath: (rest) => `/dashboard/uploads/${rest.join('/')}`,
+      },
+    },
   },
   getPath: () => `/`,
   contactUs: {
@@ -70,4 +85,9 @@ export const routeBuilder: RouteBuilder = {
       getPath: (slug) => `/services/${slug}`,
     },
   },
+  test: {
+    rest: {
+      getPath: (rest) => `/test/${rest.join('/')}`,
+    },
+  },
 };