fix: remove redundant param (#16)

close #15
yesmeck · Aug 17, 2022 · ae3dce7 · ae3dce7
1 parent 8247d12
commit ae3dce7
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 36 deletions.
diff --git a/fixture/app/routes/people/$personId.tsx b/fixture/app/routes/people/$personId.tsx
diff --git a/fixture/app/routes/people/$personId/$planId/remove-plan.tsx b/fixture/app/routes/people/$personId/$planId/remove-plan.tsx
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
   "author": "Wei Zhu",
   "license": "MIT",
   "devDependencies": {
-    "@remix-run/dev": "^1.6.4",
+    "@remix-run/dev": "^1.6.7",
     "@types/cli-table": "^0.3.0",
     "@types/jest": "^27.0.3",
     "@types/node": "^16.11.12",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/__tests__/__snapshots__/cli.test.ts.snap b/src/__tests__/__snapshots__/cli.test.ts.snap
@@ -12,6 +12,13 @@ const routes = {
     \\"season\\",
     \\"episode\\"
   ],
+  \\"/people/:personId\\": [
+    \\"personId\\"
+  ],
+  \\"/people/:personId/:planId/remove-plan\\": [
+    \\"personId\\",
+    \\"planId\\"
+  ],
   \\"/s/:query\\": [
     \\"query\\"
   ],
@@ -47,6 +54,16 @@ export declare function $path(
   params: { season: string | number; episode: string | number },
   query?: Record<string, string | number>
 ): string;
+export declare function $path(
+  route: \\"/people/:personId\\",
+  params: { personId: string | number },
+  query?: Record<string, string | number>
+): string;
+export declare function $path(
+  route: \\"/people/:personId/:planId/remove-plan\\",
+  params: { personId: string | number; planId: string | number },
+  query?: Record<string, string | number>
+): string;
 export declare function $path(
   route: \\"/blog/rss.xml\\",
   query?: Record<string, string | number>
@@ -115,6 +132,19 @@ export declare function $params(
   season: string,
   episode: string
 };
+export declare function $params(
+  route: \\"/people/:personId\\",
+  params: { readonly [key: string]: string | undefined }
+): {
+  personId: string
+};
+export declare function $params(
+  route: \\"/people/:personId/:planId/remove-plan\\",
+  params: { readonly [key: string]: string | undefined }
+): {
+  personId: string,
+  planId: string
+};
 export declare function $params(
   route: \\"/s/:query\\",
   params: { readonly [key: string]: string | undefined }

diff --git a/src/cli.ts b/src/cli.ts
@@ -172,17 +172,15 @@ function generateParamsDefinition(routesInfo: RoutesInfo) {
 function parse(routes: ConfigRoute[]) {
   const paramNames: string[] = [];
   routes.forEach((route) => {
-    if (route.path?.startsWith(':')) {
-      return paramNames.push(
-        ...route.path.split('/').map((param) => param.replace(':', '')),
-      );
-    }
-    const [_, ...paramOrActions] = route.path!.split('/');
-    paramOrActions.forEach((paramOrAction) => {
-      if (paramOrAction.startsWith(':')) {
-        paramNames.push(paramOrAction.replace(':', ''));
-      }
-    });
+    return (
+      route.path &&
+      paramNames.push(
+        ...route.path
+          .split('/')
+          .filter((seg) => seg.startsWith(':'))
+          .map((param) => param.replace(':', '')),
+      )
+    );
   });
   return paramNames;
 }