fix: wrong path (#14)

yesmeck · Jul 23, 2022 · 8247d12 · 8247d12
1 parent fbed0ad
commit 8247d12
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/fixture/app/routes/auth/__auth.tsx b/fixture/app/routes/auth/__auth.tsx
diff --git a/fixture/app/routes/auth/__auth/login.tsx b/fixture/app/routes/auth/__auth/login.tsx
diff --git a/src/__tests__/__snapshots__/cli.test.ts.snap b/src/__tests__/__snapshots__/cli.test.ts.snap
@@ -51,6 +51,14 @@ export declare function $path(
   route: \\"/blog/rss.xml\\",
   query?: Record<string, string | number>
 ): string;
+export declare function $path(
+  route: \\"/auth\\",
+  query?: Record<string, string | number>
+): string;
+export declare function $path(
+  route: \\"/auth/login\\",
+  query?: Record<string, string | number>
+): string;
 export declare function $path(
   route: \\"/s/:query\\",
   params: { query: string | number },

diff --git a/src/cli.ts b/src/cli.ts
@@ -47,7 +47,7 @@ async function buildHelpers(remixRoot: string): Promise<RoutesInfo> {
       if (route.path) {
         currentPath = [...currentPath, route];
         const fullPath = currentPath.reduce(
-          (acc, curr) => [acc, curr.path].join('/'),
+          (acc, curr) => [acc, trimSlash(curr.path!)].join('/'),
           '',
         );
         const paramsNames = parse(currentPath);
@@ -199,6 +199,10 @@ if (require.main === module) {
   })();
 }
 
+function trimSlash(path: string) {
+  return path.replace(/\/+$/, '');
+}
+
 function findNearestNodeModulesPath(destDir: string) {
   let p = destDir;